svn commit - mysqldoc@docsrva: r3028 - trunk/xsl.d

[mcbrown]

Author: mcbrown
Date: 2006-08-16 10:42:34 +0200 (Wed, 16 Aug 2006)
New Revision: 3028

Log:
Fixed the output of the TOC in a Q&A element so that only the ID of the question is a <link> on to the real question. 

This fixes the issue where the manual-prepped.xml version of these elements is invalid when it contains a <programlisting> element, which cannot be part of a <link>

Also had to update the list item to <para> to then resolve the issue that a <simpara> can't hold a <programlisting> either (which was hidden because the <link> error was highlighted first). 

As a side benefit, this makes the HTML look much nicer :)



Modified:
   trunk/xsl.d/dbk-prep.xsl
   trunk/xsl.d/userconfig.xml


Modified: trunk/xsl.d/dbk-prep.xsl
===================================================================
--- trunk/xsl.d/dbk-prep.xsl	2006-08-16 01:49:20 UTC (rev 3027)
+++ trunk/xsl.d/dbk-prep.xsl	2006-08-16 08:42:34 UTC (rev 3028)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 4; 1075 bytes

@@ -183,7 +183,7 @@
 
   <xsl:template match="question" mode="toc">
     <listitem>
-      <simpara>
+      <para>
         <link>
           <xsl:attribute name="linkend">
             <xsl:text>qandaitem-</xsl:text>

@@ -194,7 +194,7 @@
           <xsl:number
             count="chapter|appendix|preface|section|sect1[@id]|sect2[@id]|sect3[@id]|sect4[@id]|sect5[@id]|qandaentry"
             level="multiple" format="1.1.1.1.1.1"
-            />:<xsl:text> </xsl:text><xsl:for-each select="*">
+            />:<xsl:text> </xsl:text></link><xsl:for-each select="*">
             <xsl:choose>
               <xsl:when test="name() = 'para'">
                 <xsl:apply-templates/>

@@ -204,8 +204,7 @@
               </xsl:otherwise>
             </xsl:choose>
           </xsl:for-each>
-        </link>
-      </simpara>
+      </para>
     </listitem>
   </xsl:template>
 


Modified: trunk/xsl.d/userconfig.xml
===================================================================
--- trunk/xsl.d/userconfig.xml	2006-08-16 01:49:20 UTC (rev 3027)
+++ trunk/xsl.d/userconfig.xml	2006-08-16 08:42:34 UTC (rev 3028)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 281 bytes

@@ -75,7 +75,6 @@
 
 </fonts>
 
-
 </configuration>