Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html
ChangeSet
1.3118 05/07/25 18:06:43 paul@stripped +6 -0
Initial section-exclusion machinery.
make.d/xml-texi
1.4 05/07/25 18:06:41 paul@stripped +1 -1
Initial section-exclusion machinery.
make.d/xml-prep
1.6 05/07/25 18:06:41 paul@stripped +21 -1
Initial section-exclusion machinery.
refman-5.0/exclusions-texi.xml
1.1 05/07/25 18:04:43 paul@stripped +6 -0
refman-5.0/exclusions-texi.xml
1.0 05/07/25 18:04:43 paul@stripped +0 -0
BitKeeper file /Volumes/frost2/MySQL/bk/mysqldoc/refman-5.0/exclusions-texi.xml
refman-4.1/exclusions-texi.xml
1.1 05/07/25 18:04:34 paul@stripped +6 -0
refman-4.1/exclusions-texi.xml
1.0 05/07/25 18:04:34 paul@stripped +0 -0
BitKeeper file /Volumes/frost2/MySQL/bk/mysqldoc/refman-4.1/exclusions-texi.xml
refman/exclusions-texi.xml
1.1 05/07/25 18:04:18 paul@stripped +6 -0
refman/exclusions-texi.xml
1.0 05/07/25 18:04:18 paul@stripped +0 -0
BitKeeper file /Volumes/frost2/MySQL/bk/mysqldoc/refman/exclusions-texi.xml
xsl.d/exclude-element.xsl
1.1 05/07/25 18:03:58 paul@stripped +46 -0
xsl.d/exclude-element.xsl
1.0 05/07/25 18:03:58 paul@stripped +0 -0
BitKeeper file /Volumes/frost2/MySQL/bk/mysqldoc/xsl.d/exclude-element.xsl
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: paul
# Host: frost.snake.net
# Root: /Volumes/frost2/MySQL/bk/mysqldoc
--- 1.5/make.d/xml-prep 2005-07-20 18:36:17 -05:00
+++ 1.6/make.d/xml-prep 2005-07-25 18:06:41 -05:00
@@ -4,6 +4,9 @@
DBK_PREP_XSL = $(XSL_DIR)/dbk-prep.xsl
DBK_PREP_XSL_DEPS = $(DBK_PREP_XSL)
+DBK_TEXIPREP_XSL = $(XSL_DIR)/exclude-element.xsl
+DBK_TEXIPREP_XSL_DEPS = $(DBK_TEXIPREP_XSL)
+
# Do not delete these files when they are generated as intermediates
# for a final target. They are deleted by "make clean".
@@ -22,5 +25,22 @@
--param generate.manpages 1 \
$(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. Otherwise, if the exclusions-texi.xml
+# file does not exist, just copy the -prepped.xml file to the
+# -texiprepped.xml file.
+
+%-texiprepped.xml: %-prepped.xml $(DBK_TEXIPREP_XSL_DEPS)
+ if [ -f $$PWD/exclusions-texi.xml ]; then \
+ $(XSLTPROC) \
+ --stringparam id.exclusion.file "$$PWD/exclusions-texi.xml" \
+ $(DBK_TEXIPREP_XSL) $< > $@ ; \
+ else \
+ cp $< $@ ; \
+ fi
+
clean::
- $(RM) *-prepped.xml *-manprepped.xml
+ $(RM) *-prepped.xml *-manprepped.xml *-texiprepped.xml
--- 1.3/make.d/xml-texi 2005-07-13 11:26:18 -05:00
+++ 1.4/make.d/xml-texi 2005-07-25 18:06:41 -05:00
@@ -9,7 +9,7 @@
.PRECIOUS: %.texi
-%.texi: %-prepped.xml $(DBK_TEXI_XSL_DEPS)
+%.texi: %-texiprepped.xml $(DBK_TEXI_XSL_DEPS)
$(XSLTPROC) \
--output $*.texi $(DBK_TEXI_XSL) $<
--- New file ---
+++ refman-4.1/exclusions-texi.xml 05/07/25 18:04:34
<?xml version="1.0"?>
<idlist>
<id>mxj</id>
<id>connector-net</id>
<id>java-connector</id>
</idlist>
--- New file ---
+++ refman-5.0/exclusions-texi.xml 05/07/25 18:04:43
<?xml version="1.0"?>
<idlist>
<id>mxj</id>
<id>connector-net</id>
<id>java-connector</id>
</idlist>
--- New file ---
+++ refman/exclusions-texi.xml 05/07/25 18:04:18
<?xml version="1.0"?>
<idlist>
<id>mxj</id>
<id>connector-net</id>
<id>java-connector</id>
</idlist>
--- New file ---
+++ xsl.d/exclude-element.xsl 05/07/25 18:03:58
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<!--
exclude-element.xsl
Identity transform, with the following exception:
- Strip out elements with an id attribute that is listed in the
file named by the $id.exclusion.file parameter (which must be
defined on the command line).
Format of file:
<idlist>
<id>id-to-exclude-1</id>
<id>id-to-exclude-2</id>
<id>id-to-exclude-3</id>
etc
</idlist>
-->
<!-- define xml declaration and DOCTYPE information -->
<xsl:output
method="xml"
version="1.0"
encoding="utf-8"
standalone="no"
doctype-public="-//OASIS//DTD DocBook XML V4.3//EN"
doctype-system="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
/>
<!-- global variable containing the excluded-section ids -->
<xsl:variable name="excluded-ids" select="document($id.exclusion.file)"/>
<!--
Match excluded elements and do nothing with them (thus deleting them).
-->
<xsl:template match="*[@id=$excluded-ids/idlist/id]"/>
<xsl:template match="/ | node() | @* | comment() | processing-instruction()">
<xsl:copy>
<xsl:apply-templates select="@* | node()"/>
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
| Thread |
|---|
| • bk commit - mysqldoc@docsrva tree (paul:1.3118) | paul | 26 Jul |
