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

[paul]

Author: paul
Date: 2007-02-16 21:34:26 +0100 (Fri, 16 Feb 2007)
New Revision: 4966

Log:
 r19923@polar:  paul | 2007-02-15 14:01:25 -0600
 Make it configurable whether xref resolution includes section type name.


Modified:
   trunk/make.d/xml-txt
   trunk/xsl.d/target-resolvers.xsl

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


Modified: trunk/make.d/xml-txt
===================================================================
--- trunk/make.d/xml-txt	2007-02-16 06:28:06 UTC (rev 4965)
+++ trunk/make.d/xml-txt	2007-02-16 20:34:26 UTC (rev 4966)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 1; 612 bytes

@@ -20,7 +20,9 @@
 # This is an intermediate target for the .txt target.
 
 %-nolink.xml: %-prepped.xml $(EXPAND_LINKS_XSL_DEPS)
-	$(XSLTPROC) --output $@-tmp $(EXPAND_LINKS_XSL) $*-prepped.xml
+	$(XSLTPROC) \
+		--param generate.toc.section.type $(GENERATE_TOC_SECTION_TYPE) \
+		--output $@-tmp $(EXPAND_LINKS_XSL) $*-prepped.xml
 	mv $@-tmp $@
 
 # Use standard HTML driver to convert -nolink.xml to HTML


Modified: trunk/xsl.d/target-resolvers.xsl
===================================================================
--- trunk/xsl.d/target-resolvers.xsl	2007-02-16 06:28:06 UTC (rev 4965)
+++ trunk/xsl.d/target-resolvers.xsl	2007-02-16 20:34:26 UTC (rev 4966)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 4; 1200 bytes

@@ -26,6 +26,13 @@
 -->
 
 <!--
+  Whether resolved xrefs should include the section type ("Chapter",
+  "Appendix", "Section", etc.
+-->
+
+<xsl:param name="generate.toc.section.type" select="1"/>
+
+<!--
   Construct a key for all elements with an @id attribute, except
   <xref id="xxx"/>, which occurs in studyguide-DTD documents.
  -->

@@ -98,10 +105,12 @@
         </xsl:variable>
 
         <xsl:if test="$toc-num != ''">
-          <xsl:call-template name="target-elt-type">
-            <xsl:with-param name="target" select="$target"/>
-          </xsl:call-template>
-          <xsl:text> </xsl:text>
+          <xsl:if test="$generate.toc.section.type != 0">
+            <xsl:call-template name="target-elt-type">
+              <xsl:with-param name="target" select="$target"/>
+            </xsl:call-template>
+            <xsl:text> </xsl:text>
+          </xsl:if>
           <xsl:value-of select="$toc-num"/>
           <xsl:text>, </xsl:text>
         </xsl:if>