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

[paul]

Author: paul
Date: 2007-01-17 18:38:56 +0100 (Wed, 17 Jan 2007)
New Revision: 4547

Log:
 r18349@polar:  paul | 2007-01-17 11:28:13 -0600
 Minor dbk-texi.xsl cleanups.


Modified:
   trunk/xsl.d/dbk-texi.xsl

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:18324
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:14717
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13520
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:18349
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:14717
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13520


Modified: trunk/xsl.d/dbk-texi.xsl
===================================================================
--- trunk/xsl.d/dbk-texi.xsl	2007-01-17 15:38:06 UTC (rev 4546)
+++ trunk/xsl.d/dbk-texi.xsl	2007-01-17 17:38:56 UTC (rev 4547)
Changed blocks: 4, Lines Added: 19, Lines Deleted: 14; 2681 bytes

@@ -11,8 +11,6 @@
 - Should parameterize the document name that goes into the
   START-INFO-DIR-ENTRY section. Currently it is hardwired to a value
   that is appropriate for the Reference manual.
-- Is there some way to recognize which <itemizedlist> elements came from
-  @table originally (rather than from @itemize)?
 -->
 
 <!--

@@ -362,19 +360,24 @@
 
 <!-- tables -->
 <!--
-In our mapping <informaltable> elements always come from @multitable
-and the @columfractions values appear in the <colspec> elements.
-A fraction of .nn will appear as nn*, so add the '.' back in and strip
-off the '*'.
+  <table> and <informaltable> elements map to @multitable directives.
+  (In addition, <table> contains a <title>, which is written out
+  in bold preceding the @multitable.)
 
-<table> is handled similarly, but has a <title>
+  The @columnfraction values come from the <colspec> elements, which
+  MUST be present and MUST have values that are specified as percentages.
+  That is the values must be numbers followed by a '*' character.
+  Example: <colspec colwidth="25*"/>
+
+  The assumed table syntax is:
+  <table><title><tgroup><colspec>*(<thead><row>*)<tbody>(<row>*)
+  <informaltable><tgroup><colspec>*(<thead><row>*)<tbody>(<row>*)
+
+  Use of fancier syntax will probably kill this transform.
 -->
 
 <xsl:template match="informaltable|table">
   <xsl:value-of select="$newline"/>
-<!--
-  <xsl:text>@table @asis</xsl:text>
--->
   <!-- table has title, so grab it here -->
   <xsl:if test="title">
     <xsl:text>@strong{</xsl:text>

@@ -383,6 +386,7 @@
     <xsl:value-of select="$newline"/>
     <xsl:value-of select="$newline"/>
   </xsl:if>
+  <!-- produce contents of table -->
   <xsl:text>@multitable @columnfractions</xsl:text>
   <xsl:for-each select="tgroup/colspec">
     <xsl:text> .</xsl:text>

@@ -398,17 +402,18 @@
   <tgroup>, <colspec>, <thead> <tbody>, <row> -> nothing
                                                  (just delete the tags)
 
-  Information from colspec was already used earlier for @multitable
+  Information from colspec was already used earlier for @columnfractions
 -->
 
 <xsl:template match="tgroup|colspec|thead|tbody|row">
   <xsl:apply-templates/>
 </xsl:template>
 
-<!-- <entry> -> item in @multitable row -->
 <!--
-First entry in row is preceded by @item. Following entries are preceded
-by @tab
+  <entry> -> item in @multitable row
+
+  First entry in row is preceded by @item.
+  Following entries are preceded by @tab
 -->
 
 <xsl:template match="entry[1]">