svn commit - mysqldoc@docsrva: r2706 - in trunk: . tools xsl.d

[paul]

Author: paul
Date: 2006-07-11 21:19:34 +0200 (Tue, 11 Jul 2006)
New Revision: 2706

Log:
 r11297@polar:  paul | 2006-07-11 14:20:02 -0500
 Handle links to para ids that begin with "function_".
 Extra fixup to .texi output to better detect @end example.


Modified:
   trunk/tools/fixup-texi.pl
   trunk/xsl.d/dbk-texi.xsl

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11290
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:12084
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11297
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:12084
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441


Modified: trunk/tools/fixup-texi.pl
===================================================================
--- trunk/tools/fixup-texi.pl	2006-07-11 19:08:52 UTC (rev 2705)
+++ trunk/tools/fixup-texi.pl	2006-07-11 19:19:34 UTC (rev 2706)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 412 bytes

@@ -27,6 +27,7 @@
 $doc =~ s/\@item\n+/\@item\n/g;
 $doc =~ s/^\n+/\n/gm;
 $doc =~ s/^\s+(\@end )/$1/gm;
+$doc =~ s/\s+(\@end )/\n$1/gm;
 
 # Delete leading spaces from non-@example lines
 


Modified: trunk/xsl.d/dbk-texi.xsl
===================================================================
--- trunk/xsl.d/dbk-texi.xsl	2006-07-11 19:08:52 UTC (rev 2705)
+++ trunk/xsl.d/dbk-texi.xsl	2006-07-11 19:19:34 UTC (rev 2706)
Changed blocks: 1, Lines Added: 19, Lines Deleted: 8; 1550 bytes

@@ -644,18 +644,29 @@
 </xsl:template>
 
 <!-- <link> -> @ref{} (use content as label) -->
-<!-- Now ignore items where the linked attribute includes 'qandaitem' 
+<!-- Now ignore items where the linked attribute includes 'qandaitem'
      to get round issue with nodes not being generated for paras with IDs
      and not relevant in context of Texi file anyway. -->
+<!--
+  [PD] Changed to also look for linkend attributes that begin with 'function'.
+  But now instead of fully ignoring qandaitem/function links, we emit their
+  content so that we don't totally lose the text.
+-->
 
 <xsl:template match="link">
-  <xsl:if test="not(contains(@linkend,'qandaitem'))">
-    <xsl:text>@ref{</xsl:text>
-    <xsl:value-of select="@linkend"/>
-    <xsl:text>,,</xsl:text>
-    <xsl:apply-templates select="@* | node()"/>
-    <xsl:text>}</xsl:text>
-  </xsl:if>
+  <xsl:choose>
+    <xsl:when test="not(contains(@linkend,'qandaitem')
+                      or starts-with(@linkend,'function_'))">
+      <xsl:text>@ref{</xsl:text>
+      <xsl:value-of select="@linkend"/>
+      <xsl:text>,,</xsl:text>
+      <xsl:apply-templates select="@* | node()"/>
+      <xsl:text>}</xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:apply-templates select="@* | node()"/>
+    </xsl:otherwise>
+  </xsl:choose>
 </xsl:template>
 
 <!-- <ulink> -> @uref{} -->