Author: mcbrown
Date: 2007-09-10 15:53:12 +0200 (Mon, 10 Sep 2007)
New Revision: 7770
Log:
Re-enabling <see> and <seealso> processing
For CHM and TEXINFO formats the templates now remove these elements before starting processing
Added:
trunk/xsl.d/dbk-chm.xsl
Modified:
trunk/make.d/vars-docbook
trunk/make.d/xml-chm
trunk/refman-5.0/mysql-cluster.xml
trunk/refman-5.1/information-schema.xml
trunk/refman-5.1/mysql-cluster.xml
trunk/refman-5.1/sql-syntax.xml
trunk/xsl.d/dbk-texi.xsl
Modified: trunk/make.d/vars-docbook
===================================================================
--- trunk/make.d/vars-docbook 2007-09-10 12:14:43 UTC (rev 7769)
+++ trunk/make.d/vars-docbook 2007-09-10 13:53:12 UTC (rev 7770)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 0; 547 bytes
@@ -338,6 +338,11 @@
$(ADD_INDEX_NAVLINKS) \
$(REMAP_IMG_PATHS)
+# Stylesheet for prepping CHM input files, removes bad XML tags
+
+MYSQL_CHM_PREP_XSL = $(XSL_DIR)/dbk-chm.xsl
+MYSQL_CHM_PREP_DEPS = $(MYSQL_CHM_PREP_XSL)
+
# Driver stylesheet for Docbook -> Unix manpage format
MYSQL_MAN_XSL = $(XSL_DIR)/mysql-man.xsl
Modified: trunk/make.d/xml-chm
===================================================================
--- trunk/make.d/xml-chm 2007-09-10 12:14:43 UTC (rev 7769)
+++ trunk/make.d/xml-chm 2007-09-10 13:53:12 UTC (rev 7770)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 1; 510 bytes
@@ -12,7 +12,9 @@
-$(RM) -r $@ $@-tmp
mkdir $@-tmp
cp $(HTML_CSS_FILE) $@-tmp
- cp $< $@-tmp/source.xml
+ $(XSLTPROC) \
+ --output $@-tmp/source.xml $(MYSQL_CHM_PREP_XSL) $<
+# cp $< $@-tmp/source.xml
set -e; \
IMAGE_FILES="$(call target_images,$*)"; \
if [ "x$$IMAGE_FILES" != "x" ]; then \
Modified: trunk/refman-5.0/mysql-cluster.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster.xml 2007-09-10 12:14:43 UTC (rev 7769)
+++ trunk/refman-5.0/mysql-cluster.xml 2007-09-10 13:53:12 UTC (rev 7770)
Changed blocks: 10, Lines Added: 16, Lines Deleted: 16; 3577 bytes
@@ -15,12 +15,12 @@
<indexterm>
<primary><literal>NDB</literal> storage engine</primary>
-<!-- <see>MySQL Cluster</see> -->
+ <see>MySQL Cluster</see>
</indexterm>
<indexterm>
<primary>Clustering</primary>
-<!-- <see>MySQL Cluster</see> -->
+ <see>MySQL Cluster</see>
</indexterm>
<remark>
@@ -240,25 +240,25 @@
<indexterm>
<primary><command>ndbd</command> (MySQL Cluster)</primary>
<secondary>defined</secondary>
-<!-- <seealso>data node (MySQL Cluster)</seealso> -->
+ <seealso>data node (MySQL Cluster)</seealso> -->
</indexterm>
<indexterm>
<primary><command>mgmd</command> (MySQL Cluster)</primary>
<secondary>defined</secondary>
-<!-- <seealso>management node (MySQL Cluster)</seealso> -->
+ <seealso>management node (MySQL Cluster)</seealso> -->
</indexterm>
<indexterm>
<primary><command>ndb_mgmd</command> (MySQL Cluster)</primary>
<secondary>defined</secondary>
-<!-- <seealso>management node (MySQL Cluster)</seealso> -->
+ <seealso>management node (MySQL Cluster)</seealso> -->
</indexterm>
<indexterm>
<primary><command>mysqld</command></primary>
<secondary>role in MySQL Cluster</secondary>
-<!-- <see>SQL Node (MySQL Cluster)</see> -->
+ <see>SQL Node (MySQL Cluster)</see>
</indexterm>
<indexterm>
@@ -3064,7 +3064,7 @@
<indexterm>
<primary>connectstring</primary>
-<!-- <see>MySQL Cluster</see> -->
+ <see>MySQL Cluster</see>
</indexterm>
<para>
@@ -6695,7 +6695,7 @@
<indexterm>
<primary>shared memory transporter</primary>
-<!-- <see>MySQL Cluster</see> -->
+ <see>MySQL Cluster</see>
</indexterm>
<indexterm>
@@ -6851,7 +6851,7 @@
<indexterm>
<primary>SCI (Scalable Coherent Interface)</primary>
-<!-- <see>MySQL Cluster</see> -->
+ <see>MySQL Cluster</see>
</indexterm>
<indexterm>
@@ -8943,7 +8943,7 @@
<indexterm>
<primary>API nodes</primary>
-<!-- <see>SQL nodes</see> -->
+ <see>SQL nodes</see>
</indexterm>
<para>
@@ -9154,7 +9154,7 @@
<indexterm>
<primary>storage nodes - see data nodes, ndbd</primary>
-<!-- <see>data nodes, ndbd</see> -->
+ <see>data nodes, ndbd</see>
</indexterm>
<refmeta>
@@ -9449,12 +9449,12 @@
<indexterm>
<primary>management nodes (MySQL Cluster)</primary>
-<!-- <seealso>mgmd</seealso> -->
+ <seealso>mgmd</seealso> -->
</indexterm>
<indexterm>
<primary>ndb_mgmd</primary>
-<!-- <see>mgmd</see> -->
+ <see>mgmd</see>
</indexterm>
<refmeta>
@@ -9609,12 +9609,12 @@
<indexterm>
<primary>management client (MySQL Cluster)</primary>
-<!-- <seealso>mgm</seealso> -->
+ <seealso>mgm</seealso> -->
</indexterm>
<indexterm>
<primary>ndb_mgm</primary>
-<!-- <see>mgm</see> -->
+ <see>mgm</see>
</indexterm>
<indexterm>
@@ -16995,7 +16995,7 @@
<indexterm>
<primary>SCI (Scalable Coherent Interface)</primary>
-<!-- <see>MySQL Cluster</see> -->
+ <see>MySQL Cluster</see>
</indexterm>
<para>
Modified: trunk/refman-5.1/information-schema.xml
===================================================================
--- trunk/refman-5.1/information-schema.xml 2007-09-10 12:14:43 UTC (rev 7769)
+++ trunk/refman-5.1/information-schema.xml 2007-09-10 13:53:12 UTC (rev 7770)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 529 bytes
@@ -4592,7 +4592,7 @@
<indexterm>
<primary>FILES</primary>
<secondary>INFORMATION_SCHEMA table</secondary>
-<!-- <seealso>MySQL Cluster Disk Data</seealso> -->
+ <seealso>MySQL Cluster Disk Data</seealso>
</indexterm>
<para>
Modified: trunk/refman-5.1/mysql-cluster.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster.xml 2007-09-10 12:14:43 UTC (rev 7769)
+++ trunk/refman-5.1/mysql-cluster.xml 2007-09-10 13:53:12 UTC (rev 7770)
Changed blocks: 16, Lines Added: 31, Lines Deleted: 31; 7057 bytes
@@ -15,12 +15,12 @@
<indexterm>
<primary><literal>NDB</literal> storage engine</primary>
-<!-- <see>MySQL Cluster</see> -->
+ <see>MySQL Cluster</see>
</indexterm>
<indexterm>
<primary>Clustering</primary>
-<!-- <see>MySQL Cluster</see> -->
+ <see>MySQL Cluster</see>
</indexterm>
<remark>
@@ -254,25 +254,25 @@
<indexterm>
<primary><command>ndbd</command> (MySQL Cluster)</primary>
<secondary>defined</secondary>
-<!-- <seealso>data node (MySQL Cluster)</seealso> -->
+ <seealso>data node (MySQL Cluster)</seealso>
</indexterm>
<indexterm>
<primary><command>mgmd</command> (MySQL Cluster)</primary>
<secondary>defined</secondary>
-<!-- <seealso>management node (MySQL Cluster)</seealso> -->
+ <seealso>management node (MySQL Cluster)</seealso>
</indexterm>
<indexterm>
<primary><command>ndb_mgmd</command> (MySQL Cluster)</primary>
<secondary>defined</secondary>
-<!-- <seealso>management node (MySQL Cluster)</seealso> -->
+ <seealso>management node (MySQL Cluster)</seealso>
</indexterm>
<indexterm>
<primary><command>mysqld</command></primary>
<secondary>role in MySQL Cluster</secondary>
-<!-- <see>SQL Node (MySQL Cluster)</see> -->
+ <see>SQL Node (MySQL Cluster)</see>
</indexterm>
<indexterm>
@@ -3926,7 +3926,7 @@
<indexterm>
<primary>connectstring</primary>
-<!-- <see>MySQL Cluster</see> -->
+ <see>MySQL Cluster</see>
</indexterm>
<para>
@@ -7985,7 +7985,7 @@
<indexterm>
<primary>shared memory transporter</primary>
-<!-- <see>MySQL Cluster</see> -->
+ <see>MySQL Cluster</see>
</indexterm>
<indexterm>
@@ -8139,7 +8139,7 @@
<indexterm>
<primary>SCI (Scalable Coherent Interface)</primary>
-<!-- <see>MySQL Cluster</see> -->
+ <see>MySQL Cluster</see>
</indexterm>
<indexterm>
@@ -10503,7 +10503,7 @@
<indexterm>
<primary>API nodes</primary>
-<!-- <see>SQL nodes</see> -->
+ <see>SQL nodes</see>
</indexterm>
<para>
@@ -10714,7 +10714,7 @@
<indexterm>
<primary>storage nodes - see data nodes, ndbd</primary>
-<!-- <see>data nodes, ndbd</see> -->
+ <see>data nodes, ndbd</see>
</indexterm>
<refmeta>
@@ -11009,12 +11009,12 @@
<indexterm>
<primary>management nodes (MySQL Cluster)</primary>
-<!-- <seealso>mgmd</seealso> -->
+ <seealso>mgmd</seealso>
</indexterm>
<indexterm>
<primary>ndb_mgmd</primary>
-<!-- <see>mgmd</see> -->
+ <see>mgmd</see>
</indexterm>
<refmeta>
@@ -11169,12 +11169,12 @@
<indexterm>
<primary>management client (MySQL Cluster)</primary>
-<!-- <seealso>mgm</seealso> -->
+ <seealso>mgm</seealso>
</indexterm>
<indexterm>
<primary>ndb_mgm</primary>
-<!-- <see>mgm</see> -->
+ <see>mgm</see>
</indexterm>
<indexterm>
@@ -19153,13 +19153,13 @@
<indexterm>
<primary>MySQL Cluster</primary>
<secondary>replication</secondary>
-<!-- <seealso>MySQL Cluster replication</seealso> -->
+ <seealso>MySQL Cluster replication</seealso>
</indexterm>
<indexterm>
<primary>replication</primary>
<secondary>in MySQL Cluster</secondary>
-<!-- <seealso>MySQL Cluster replication</seealso> -->
+ <seealso>MySQL Cluster replication</seealso>
</indexterm>
<indexterm>
@@ -19168,12 +19168,12 @@
<indexterm>
<primary>asynchronous replication</primary>
-<!-- <see>MySQL Cluster replication</see> -->
+ <see>MySQL Cluster replication</see>
</indexterm>
<indexterm>
<primary>replication, asynchronous</primary>
-<!-- <see>MySQL Cluster replication</see> -->
+ <see>MySQL Cluster replication</see>
</indexterm>
<para>
@@ -19785,32 +19785,32 @@
<indexterm>
<primary><literal>cluster</literal> database (OBSOLETE)</primary>
-<!-- <seealso>MySQL Cluster replication</seealso> -->
+ <seealso>MySQL Cluster replication</seealso>
</indexterm>
<indexterm>
<primary><literal>cluster_replication</literal> database (OBSOLETE)</primary>
-<!-- <see>MySQL Cluster replication</see> -->
+ <see>MySQL Cluster replication</see>
</indexterm>
<indexterm>
<primary><literal>binlog_index</literal> table (OBSOLETE)</primary>
-<!-- <seealso>MySQL Cluster replication</seealso> -->
+ <seealso>MySQL Cluster replication</seealso>
</indexterm>
<indexterm>
<primary><literal>ndb_binlog_index</literal> table (MySQL Cluster replication)</primary>
-<!-- <seealso>MySQL Cluster replication</seealso> -->
+ <seealso>MySQL Cluster replication</seealso>
</indexterm>
<indexterm>
<primary><literal>cluster.binlog_index</literal> table (OBSOLETE)</primary>
-<!-- <see>MySQL Cluster replication</see> -->
+ <see>MySQL Cluster replication</see>
</indexterm>
<indexterm>
<primary><literal>mysql.ndb_binlog_index</literal> table</primary>
-<!-- <see>MySQL Cluster replication</see> -->
+ <see>MySQL Cluster replication</see>
</indexterm>
<para>
@@ -19886,12 +19886,12 @@
<indexterm>
<primary><literal>ndb_apply_status</literal> table (MySQL Cluster replication)</primary>
-<!-- <seealso>MySQL Cluster replication</seealso> -->
+ <seealso>MySQL Cluster replication</seealso>
</indexterm>
<indexterm>
<primary><literal>apply_status</literal> table (OBSOLETE)</primary>
-<!-- <seealso>MySQL Cluster replication</seealso> -->
+ <seealso>MySQL Cluster replication</seealso>
</indexterm>
<para>
@@ -21089,7 +21089,7 @@
<indexterm>
<primary><filename>reset-slave.pl</filename></primary>
-<!-- <see>MySQL Cluster replication</see> -->
+ <see>MySQL Cluster replication</see>
</indexterm>
<programlisting>
@@ -21725,12 +21725,12 @@
<indexterm>
<primary>MySQL Cluster</primary>
<secondary>Disk Data tables</secondary>
-<!-- <see>MySQL Cluster Disk Data</see> -->
+ <see>MySQL Cluster Disk Data</see>
</indexterm>
<indexterm>
<primary>Disk Data tables (MySQL Cluster)</primary>
-<!-- <see>MySQL Cluster Disk Data</see> -->
+ <see>MySQL Cluster Disk Data</see>
</indexterm>
<remark role="note">
@@ -22602,7 +22602,7 @@
<indexterm>
<primary>SCI (Scalable Coherent Interface)</primary>
-<!-- <see>MySQL Cluster</see> -->
+ <see>MySQL Cluster</see>
</indexterm>
<para>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2007-09-10 12:14:43 UTC (rev 7769)
+++ trunk/refman-5.1/sql-syntax.xml 2007-09-10 13:53:12 UTC (rev 7770)
Changed blocks: 6, Lines Added: 6, Lines Deleted: 6; 1756 bytes
@@ -160,7 +160,7 @@
<indexterm>
<primary><literal>ALTER LOGFILE GROUP</literal></primary>
-<!-- <seealso>MySQL Cluster Disk Data</seealso> -->
+ <seealso>MySQL Cluster Disk Data</seealso>
</indexterm>
<programlisting>
@@ -1561,7 +1561,7 @@
<indexterm>
<primary><literal>ALTER TABLESPACE</literal></primary>
-<!-- <seealso>MySQL Cluster Disk Data</seealso> -->
+ <seealso>MySQL Cluster Disk Data</seealso>
</indexterm>
<programlisting>
@@ -2212,7 +2212,7 @@
<indexterm>
<primary><literal>CREATE LOGFILE GROUP</literal></primary>
-<!-- <seealso>MySQL Cluster Disk Data</seealso> -->
+ <seealso>MySQL Cluster Disk Data</seealso>
</indexterm>
<programlisting>
@@ -4763,7 +4763,7 @@
<indexterm>
<primary><literal>CREATE TABLESPACE</literal></primary>
-<!-- <seealso>MySQL Cluster Disk Data</seealso> -->
+ <seealso>MySQL Cluster Disk Data</seealso>
</indexterm>
<programlisting>
@@ -5120,7 +5120,7 @@
<indexterm>
<primary><literal>DROP LOGFILE GROUP</literal></primary>
-<!-- <seealso>MySQL Cluster Disk Data</seealso> -->
+ <seealso>MySQL Cluster Disk Data</seealso>
</indexterm>
<programlisting>
@@ -5336,7 +5336,7 @@
<indexterm>
<primary><literal>DROP TABLESPACE</literal></primary>
-<!-- <seealso>MySQL Cluster Disk Data</seealso> -->
+ <seealso>MySQL Cluster Disk Data</seealso>
</indexterm>
<programlisting>
Added: trunk/xsl.d/dbk-chm.xsl
===================================================================
--- trunk/xsl.d/dbk-chm.xsl (rev 0)
+++ trunk/xsl.d/dbk-chm.xsl 2007-09-10 13:53:12 UTC (rev 7770)
Changed blocks: 1, Lines Added: 24, Lines Deleted: 0; 783 bytes
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<!--
+dbk-chm.xsl - DocBook-to-CHM stylesheet
+
+This template removes the <see> and <seealso> elements which cause
+CHM build failures.
+
+-->
+
+<xsl:output method="xml"/>
+
+<xsl:template match="seealso"/>
+<xsl:template match="see"/>
+
+<xsl:template match="node() | @* | processing-instruction()">
+ <xsl:copy>
+ <xsl:apply-templates select="node() | @* | processing-instruction()"/>
+ </xsl:copy>
+</xsl:template>
+
+
+</xsl:stylesheet>
Modified: trunk/xsl.d/dbk-texi.xsl
===================================================================
--- trunk/xsl.d/dbk-texi.xsl 2007-09-10 12:14:43 UTC (rev 7769)
+++ trunk/xsl.d/dbk-texi.xsl 2007-09-10 13:53:12 UTC (rev 7770)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 364 bytes
@@ -56,6 +56,8 @@
</xsl:copy>
</xsl:template>
+<xsl:template match="seealso"/>
+<xsl:template match="see"/>
<!-- Utility templates -->
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r7770 - in trunk: make.d refman-5.0 refman-5.1 xsl.d | mcbrown | 10 Sep |
