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

[paul]

Author: paul
Date: 2006-05-10 05:16:35 +0200 (Wed, 10 May 2006)
New Revision: 2063

Log:
 r10258@frost:  paul | 2006-05-09 22:14:28 -0500
 Account for admonition elements (<note>, <caution>, etc.)
 (Still doesn't handle embedded <title>, though.)


Modified:
   trunk/
   trunk/tools/xmlformat.conf
   trunk/xsl.d/dbk-texi.xsl


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:7365
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:10245
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4886
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:7365
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:10258
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4886

Modified: trunk/tools/xmlformat.conf
===================================================================
--- trunk/tools/xmlformat.conf	2006-05-10 01:34:54 UTC (rev 2062)
+++ trunk/tools/xmlformat.conf	2006-05-10 03:16:35 UTC (rev 2063)
@@ -33,14 +33,8 @@
 itemizedlist orderedlist
     format          block
 
-listitem
+listitem note caution tip warning important
     format          block
-    ## this causes following <para> to be on same line
-	# (now disabled)
-    #entry-break     0
-    #element-break   2
-    #exit-break      0
-    #subindent       0
     entry-break     1
     exit-break      1
 

Modified: trunk/xsl.d/dbk-texi.xsl
===================================================================
--- trunk/xsl.d/dbk-texi.xsl	2006-05-10 01:34:54 UTC (rev 2062)
+++ trunk/xsl.d/dbk-texi.xsl	2006-05-10 03:16:35 UTC (rev 2063)
@@ -471,6 +471,26 @@
   <xsl:apply-templates select="@* | node()"/>
 </xsl:template>
 
+<!-- <note> -> newline + @strong{Note}: + newline + contents -->
+<!-- <caution>, <tip>, <warning>, <important>: similar -->
+
+<xsl:template match="note|important|warning|caution|tip">
+  <xsl:value-of select="$newline"/>
+  <xsl:text>@strong{</xsl:text>
+  <xsl:choose>
+    <xsl:when test="local-name(.)='note'">Note</xsl:when>
+    <xsl:when test="local-name(.)='warning'">Warning</xsl:when>
+    <xsl:when test="local-name(.)='caution'">Caution</xsl:when>
+    <xsl:when test="local-name(.)='tip'">Tip</xsl:when>
+    <xsl:when test="local-name(.)='important'">Important</xsl:when>
+    <xsl:otherwise>Note</xsl:otherwise>
+  </xsl:choose>
+  <xsl:text>}:</xsl:text>
+  <xsl:value-of select="$newline"/>
+  <xsl:apply-templates select="@* | node()"/>
+</xsl:template>
+
+
 <!-- <indexterm> -> @[cft]index + value of
<primary>/<secondary/<tertiary> -->
 <!--
 Use the type attribute to determine what kind of index tag to use.