List:Commits« Previous MessageNext Message »
From:mcbrown Date:August 2 2006 5:23pm
Subject:svn commit - mysqldoc@docsrva: r2930 - in trunk: refman-4.1 refman-5.0 refman-5.1 xsl.d
View as plain text  
Author: mcbrown
Date: 2006-08-02 19:23:16 +0200 (Wed, 02 Aug 2006)
New Revision: 2930

Log:
Found a better solution to the <example id=""> issue. 

Now we generate a Texinfo @anchor{} element, which can be cross referenced and so doesn't cause a build problem. 



Modified:
   trunk/refman-4.1/connector-j.xml
   trunk/refman-5.0/connector-j.xml
   trunk/refman-5.1/connector-j.xml
   trunk/xsl.d/dbk-texi.xsl


Modified: trunk/refman-4.1/connector-j.xml
===================================================================
--- trunk/refman-4.1/connector-j.xml	2006-08-02 17:00:58 UTC (rev 2929)
+++ trunk/refman-4.1/connector-j.xml	2006-08-02 17:23:16 UTC (rev 2930)
Changed blocks: 1, Lines Added: 12, Lines Deleted: 12; 3021 bytes

@@ -788,73 +788,73 @@
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-connection-drivermanager" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-connection-drivermanager"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-execute-select" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-execute-select"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-stored-procedure" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-stored-procedure"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-preparecall" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-preparecall"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-output-param" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-output-param"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-callablestatement" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-callablestatement"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-retrieving-results-params" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-retrieving-results-params"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-autoincrement-getgeneratedkeys" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-autoincrement-getgeneratedkeys"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-autoincrement-select" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-autoincrement-select"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-autoincrement-updateable-resultsets" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-autoincrement-updateable-resultsets"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-connectionpool-j2ee" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-connectionpool-j2ee"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-transaction-retry" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-transaction-retry"/>
         </para>
       </listitem>
 


Modified: trunk/refman-5.0/connector-j.xml
===================================================================
--- trunk/refman-5.0/connector-j.xml	2006-08-02 17:00:58 UTC (rev 2929)
+++ trunk/refman-5.0/connector-j.xml	2006-08-02 17:23:16 UTC (rev 2930)
Changed blocks: 1, Lines Added: 12, Lines Deleted: 12; 3033 bytes

@@ -788,73 +788,73 @@
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-connection-drivermanager" condition="notextinfo"/>
+          <xref linkend="connector-j-examples-connection-drivermanager"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-execute-select" condition="notextinfo"/>
+          <xref linkend="connector-j-examples-execute-select"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-stored-procedure" condition="notextinfo"/>
+          <xref linkend="connector-j-examples-stored-procedure"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-preparecall" condition="notextinfo"/>
+          <xref linkend="connector-j-examples-preparecall"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-output-param" condition="notextinfo"/>
+          <xref linkend="connector-j-examples-output-param"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-callablestatement" condition="notextinfo"/>
+          <xref linkend="connector-j-examples-callablestatement"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-retrieving-results-params" condition="notextinfo"/>
+          <xref linkend="connector-j-examples-retrieving-results-params"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-autoincrement-getgeneratedkeys" condition="notextinfo"/>
+          <xref linkend="connector-j-examples-autoincrement-getgeneratedkeys"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-autoincrement-select" condition="notextinfo"/>
+          <xref linkend="connector-j-examples-autoincrement-select"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-autoincrement-updateable-resultsets" condition="notextinfo"/>
+          <xref linkend="connector-j-examples-autoincrement-updateable-resultsets"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-connectionpool-j2ee" condition="notextinfo"/>
+          <xref linkend="connector-j-examples-connectionpool-j2ee"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-transaction-retry" condition="notextinfo"/>
+          <xref linkend="connector-j-examples-transaction-retry"/>
         </para>
       </listitem>
 


Modified: trunk/refman-5.1/connector-j.xml
===================================================================
--- trunk/refman-5.1/connector-j.xml	2006-08-02 17:00:58 UTC (rev 2929)
+++ trunk/refman-5.1/connector-j.xml	2006-08-02 17:23:16 UTC (rev 2930)
Changed blocks: 1, Lines Added: 12, Lines Deleted: 12; 3021 bytes

@@ -788,73 +788,73 @@
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-connection-drivermanager" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-connection-drivermanager"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-execute-select" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-execute-select"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-stored-procedure" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-stored-procedure"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-preparecall" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-preparecall"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-output-param" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-output-param"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-callablestatement" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-callablestatement"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-retrieving-results-params" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-retrieving-results-params"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-autoincrement-getgeneratedkeys" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-autoincrement-getgeneratedkeys"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-autoincrement-select" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-autoincrement-select"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-autoincrement-updateable-resultsets" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-autoincrement-updateable-resultsets"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-connectionpool-j2ee" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-connectionpool-j2ee"/>
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <xref linkend="connector-j-examples-transaction-retry" condition="notexinfo"/>
+          <xref linkend="connector-j-examples-transaction-retry"/>
         </para>
       </listitem>
 


Modified: trunk/xsl.d/dbk-texi.xsl
===================================================================
--- trunk/xsl.d/dbk-texi.xsl	2006-08-02 17:00:58 UTC (rev 2929)
+++ trunk/xsl.d/dbk-texi.xsl	2006-08-02 17:23:16 UTC (rev 2930)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 4; 811 bytes

@@ -238,6 +238,13 @@
   <xsl:value-of select="$newline"/>
 </xsl:template>
 
+<xsl:template match="example">
+  <xsl:text>@anchor{</xsl:text>
+  <xsl:value-of select="@id"/>
+  <xsl:text>}</xsl:text>
+  <xsl:apply-templates select="@* | node()"/>
+</xsl:template>
+
 <!--
 generate-menu: generate a @menu structure if there are subsections
 

@@ -646,10 +653,6 @@
   <xsl:text>@ref{Top}</xsl:text>
 </xsl:template>
 
-<!-- We remove links with a 'notexinfo' condition (quick and dirty fix) -->
-
-<xsl:template match="xref[@condition='notexinfo']"/>
-
 <!-- <link> -> @ref{} (use content as label) -->
 
 <!--


Thread
svn commit - mysqldoc@docsrva: r2930 - in trunk: refman-4.1 refman-5.0 refman-5.1 xsl.dmcbrown2 Aug