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

[paul]

Author: paul
Date: 2006-10-05 04:07:41 +0200 (Thu, 05 Oct 2006)
New Revision: 3546

Log:
 r10143@frost:  paul | 2006-10-04 21:05:42 -0500
 Changes preparatory to better xref resolution for help tables.


Modified:
   trunk/xsl.d/help-prep1.xsl

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


Modified: trunk/xsl.d/help-prep1.xsl
===================================================================
--- trunk/xsl.d/help-prep1.xsl	2006-10-04 20:52:52 UTC (rev 3545)
+++ trunk/xsl.d/help-prep1.xsl	2006-10-05 02:07:41 UTC (rev 3546)
Changed blocks: 2, Lines Added: 20, Lines Deleted: 0; 1227 bytes

@@ -100,6 +100,17 @@
 <xsl:variable name="newline" select="'&#xA;'"/>
 
 <!--
+  Construct a key for TOC elements.
+  This is used to look up xref targets and then find the <remark>
+  elements under them that specify help topics.
+-->
+
+<xsl:key
+  name="toc-elt"
+  match="book|abstract|preface|chapter|appendix|section"
+  use="@id"/>
+
+<!--
   Match paired <remark> elements that are tagged as help text
   with a @role attribute of 'help-XXX-begin' or 'help-XXX-end'.
   Write out a corresponding <help-XXX> begin tag or </help-XXX>

@@ -309,6 +320,15 @@
 -->
 
 <xsl:template match="xref">
+<xsl:variable name="linkend" select="@linkend"/>
+<xsl:variable name="topic"
+  select="key('toc-elt',@linkend)//remark[@role='help-topic']/@condition"/>
+<!--
+<xsl:message>@linkend=<xsl:value-of select="$linkend"/>
+ title=<xsl:value-of select="key('toc-elt',@linkend)/title"/>
+ topic=<xsl:value-of select="$topic"/>
+</xsl:message>
+-->
   <xsl:text>[</xsl:text>
   <xsl:value-of select="@linkend"/>
   <xsl:text>]</xsl:text>