Author: paul
Date: 2006-07-14 22:26:49 +0200 (Fri, 14 Jul 2006)
New Revision: 2739
Log:
r11433@polar: paul | 2006-07-14 14:35:04 -0500
Don't bother with the node-exclusion stuff for Texinfo any more.
MC found a better way around it.
Removed:
trunk/refman-4.1/exclusions-texi.xml
trunk/refman-5.0/exclusions-texi.xml
trunk/refman-5.1/exclusions-texi.xml
Modified:
trunk/make.d/vars-docbook
trunk/make.d/xml-prep
trunk/make.d/xml-texi
trunk/xsl.d/dbk-texi.xsl
trunk/xsl.d/exclude-element.xsl
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11432
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:12220
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11433
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:12220
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441
Modified: trunk/make.d/vars-docbook
===================================================================
--- trunk/make.d/vars-docbook 2006-07-14 20:26:14 UTC (rev 2738)
+++ trunk/make.d/vars-docbook 2006-07-14 20:26:49 UTC (rev 2739)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 5; 536 bytes
@@ -135,11 +135,6 @@
$(DBK_PREP_XSL) \
$(XSL_DIR)/map-refentry.xsl
-# Similar, but specific to Texinfo production
-
-DBK_TEXIPREP_XSL = $(XSL_DIR)/exclude-element.xsl
-DBK_TEXIPREP_XSL_DEPS = $(DBK_TEXIPREP_XSL)
-
# Transform that generates file containing all the TOC entries (section
# numbers and titles)
Modified: trunk/make.d/xml-prep
===================================================================
--- trunk/make.d/xml-prep 2006-07-14 20:26:14 UTC (rev 2738)
+++ trunk/make.d/xml-prep 2006-07-14 20:26:49 UTC (rev 2739)
Changed blocks: 2, Lines Added: 1, Lines Deleted: 28; 1623 bytes
@@ -5,7 +5,6 @@
.PRECIOUS: %-prepped.xml
.PRECIOUS: %-manprepped.xml
-.PRECIOUS: %-texiprepped.xml
# BUG_PREP fixes up "Bug #xxxx" bug references into <ulink> elements
# that point to htto://bugs.mysql.com bug reports.
@@ -25,31 +24,5 @@
--param map.refentry.to.section 0 \
$(DBK_PREP_XSL) $< | $(BUG_PREP) > $@
-# For Texinfo processing, we may need to exclude elements that cause
-# too-deep nesting. The ids of these elements should be listed in
-# the exclusions-texi.xml file if there are any. The -texiprepped.xml
-# file is created by running the regular -prepped.xml through an
-# element-exclusion stylesheet generated from the exclusions file.
-# Otherwise, if the exclusions-texi.xml file does not exist, just
-# copy the -prepped.xml file to the -texiprepped.xml file.
-
-# A better dependency here than $(DBK_TEXIPREP_XSL_DEPS) would be %-texi.xsl
-# but there is no guarantee the latter exists.
-
-%-texiprepped.xml: %-prepped.xml $(DBK_TEXIPREP_XSL_DEPS)
- if [ -f exclusions-texi.xml ]; then \
- make exclusions-texi.xsl ; \
- $(XSLTPROC) --output $@ exclusions-texi.xsl $< ; \
- else \
- cp $< $@ ; \
- fi
-
-# Generate exclusion stylesheet from XML file that lists excluded elements
-
-%-texi.xsl: %-texi.xml $(DBK_TEXIPREP_XSL_DEPS)
- $(XSLTPROC) \
- $(DBK_TEXIPREP_XSL) $< > $@
-
clean::
- $(RM) *-prepped.xml *-manprepped.xml *-texiprepped.xml
- $(RM) *-texi.xsl
+ $(RM) *-prepped.xml *-manprepped.xml
Modified: trunk/make.d/xml-texi
===================================================================
--- trunk/make.d/xml-texi 2006-07-14 20:26:14 UTC (rev 2738)
+++ trunk/make.d/xml-texi 2006-07-14 20:26:49 UTC (rev 2739)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 489 bytes
@@ -6,7 +6,7 @@
.PRECIOUS: %.texi
-%.texi: %-texiprepped.xml $(DBK_TEXI_XSL_DEPS) $(FIXUP_TEXI)
+%.texi: %-prepped.xml $(DBK_TEXI_XSL_DEPS) $(FIXUP_TEXI)
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
$(DBK_TEXI_XSL) $< | $(FIXUP_TEXI) > $@
Modified: trunk/xsl.d/dbk-texi.xsl
===================================================================
--- trunk/xsl.d/dbk-texi.xsl 2006-07-14 20:26:14 UTC (rev 2738)
+++ trunk/xsl.d/dbk-texi.xsl 2006-07-14 20:26:49 UTC (rev 2739)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 11; 962 bytes
@@ -117,18 +117,8 @@
<xsl:when test="$depth=3">
<xsl:text>appendixsubsec</xsl:text>
</xsl:when>
- <xsl:when test="$depth=4">
- <xsl:text>appendixsubsubsec</xsl:text>
- </xsl:when>
- <xsl:when test="$depth=5">
- <xsl:text>appendixsubsubsubsec</xsl:text>
- </xsl:when>
<xsl:otherwise>
- <xsl:message terminate="yes">
- Nesting too deep within appendix!
- ELEMENT: <xsl:value-of select="name()"/>
- TITLE: <xsl:value-of select="normalize-space(title)"/>
- </xsl:message>
+ <xsl:text>appendixsubsubsec</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
Modified: trunk/xsl.d/exclude-element.xsl
===================================================================
--- trunk/xsl.d/exclude-element.xsl 2006-07-14 20:26:14 UTC (rev 2738)
+++ trunk/xsl.d/exclude-element.xsl 2006-07-14 20:26:49 UTC (rev 2739)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 0; 573 bytes
@@ -10,6 +10,9 @@
<!--
exclude-element.xsl
+ NOTE: This transform is no longer used. Instead, we just map too-deep
+ sections to @subsubsection or @appendixsubsub
+
XSLT stylesheet that generates another stylesheet that is an identity
transform except that it excludes the elements with ids named in a
given XML file:
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r2739 - in trunk: . make.d refman-4.1 refman-5.0 refman-5.1 xsl.d | paul | 14 Jul |
