Author: paul
Date: 2007-01-11 18:59:18 +0100 (Thu, 11 Jan 2007)
New Revision: 4453
Log:
r17968@polar: paul | 2007-01-11 11:56:08 -0600
Fix some variable definitions.
Add toc-file target for GUI help files.
Indent xhtml output (temporarily) to make it easier to examine.
Modified:
trunk/guihelp/Makefile
trunk/make.d/vars-docbook
trunk/make.d/xml-guihelp
trunk/xsl.d/mysql-guihelp.xsl
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:17967
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:14416
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13015
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:17968
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:14416
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13015
Modified: trunk/guihelp/Makefile
===================================================================
--- trunk/guihelp/Makefile 2007-01-11 17:59:06 UTC (rev 4452)
+++ trunk/guihelp/Makefile 2007-01-11 17:59:18 UTC (rev 4453)
Changed blocks: 1, Lines Added: 16, Lines Deleted: 0; 839 bytes
@@ -72,8 +72,24 @@
mysqlqb_statements.xml: ../refman-5.0/sql-syntax.xml
cp $^ $@
+toc: $(MYSQLQB_SRCS) $(XSL_DIR)/mysql-guihelp-toc.xsl
+ -$(RM) -r $@ $@-tmp
+ mkdir $@-tmp
+ $(XSLTPROC) \
+ --param extract.list.items 1 \
+ --output $@-tmp/mysqlqb_functions.xml \
+ $(XSL_DIR)/mysql-guihelp-toc.xsl \
+ mysqlqb_functions.xml
+ $(XSLTPROC) \
+ --param extract.list.items 0 \
+ --output $@-tmp/mysqlqb_statements.xml \
+ $(XSL_DIR)/mysql-guihelp-toc.xsl \
+ mysqlqb_statements.xml
+ mv $@-tmp $@
+
clean::
$(RM) versions.ent mysqlqb_functions.xml mysqlqb_statements.xml
+ $(RM) -r toc toc-tmp
# Import standard target rules
Modified: trunk/make.d/vars-docbook
===================================================================
--- trunk/make.d/vars-docbook 2007-01-11 17:59:06 UTC (rev 4452)
+++ trunk/make.d/vars-docbook 2007-01-11 17:59:18 UTC (rev 4453)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 645 bytes
@@ -262,8 +262,8 @@
# Driver stylesheet for Docbook -> XHTML GUI help,
# one file per chapter or section
-MYSQL_GUIHELP_XHTML_SECTION_XSL = $(XSL_DIR)/mysql-guihelp-xhtml-section.xsl
-MYSQL_GUIHELP_XHTML_SECTION_XSL_DEPS = $(MYSQL_GUIHELP_XHTML_SECTION_XSL) \
+MYSQL_GUIHELP_XSL = $(XSL_DIR)/mysql-guihelp.xsl
+MYSQL_GUIHELP_XSL_DEPS = $(MYSQL_GUIHELP_XSL) \
$(XSL_DIR)/mysql-disclaimer-xhtml.xsl \
$(HTML_CSS_FILE)
Modified: trunk/make.d/xml-guihelp
===================================================================
--- trunk/make.d/xml-guihelp 2007-01-11 17:59:06 UTC (rev 4452)
+++ trunk/make.d/xml-guihelp 2007-01-11 17:59:18 UTC (rev 4453)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 946 bytes
@@ -10,7 +10,7 @@
# The %_SRCS variable must be set to the list of target dependencies.
-%.guihelp: %-prepped.xml $(MYSQL_GUIHELP_XHTML_SECTION_XSL_DEPS)
+%.guihelp: %-prepped.xml $(MYSQL_GUIHELP_XSL_DEPS)
-$(RM) -r $@ $@-tmp
mkdir $@-tmp
$(XSLTPROC) \
@@ -18,7 +18,7 @@
--stringparam html.stylesheet $(notdir $(HTML_CSS_FILE)) \
--param chunk.section.depth 0 \
--output $@-tmp/ \
- $(MYSQL_GUIHELP_XHTML_SECTION_XSL) \
+ $(MYSQL_GUIHELP_XSL) \
$<
cd $@-tmp; \
mv -f functions.html mysqlqb_functions.html; \
@@ -35,7 +35,7 @@
mv $@-tmp $@
clean::
- $(RM) -r *.guihelp *.guihelp
+ $(RM) -r *.guihelp *.guihelp-tmp
help::
@echo "make file.guihelp - convert file.xml to XHTML GUI help, 1 file/chapter"
Modified: trunk/xsl.d/mysql-guihelp.xsl
===================================================================
--- trunk/xsl.d/mysql-guihelp.xsl 2007-01-11 17:59:06 UTC (rev 4452)
+++ trunk/xsl.d/mysql-guihelp.xsl 2007-01-11 17:59:18 UTC (rev 4453)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 512 bytes
@@ -33,6 +33,7 @@
<!-- we always want utf-8 - makes it easier to deal with comments -->
<xsl:param name="chunker.output.encoding" select="'utf-8'"/>
+<xsl:param name="chunker.output.indent" select="'yes'"/>
<!-- strip remark elements -->
<xsl:template match="remark" />
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r4453 - in trunk: . guihelp make.d xsl.d | paul | 11 Jan |
