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.2793 05/06/15 14:12:11 paul@stripped +11 -0
A bunch of make tuning.
xsl.d/mysqlweb-chunk.xsl
1.9 05/06/15 14:12:10 paul@stripped +1 -2
Use the chunkfast.xsl stylesheet.
xsl.d/mysql-html-section.xsl
1.4 05/06/15 14:12:10 paul@stripped +1 -2
Use the chunkfast.xsl stylesheet.
xsl.d/esc-spchars-texi.xsl
1.4 05/06/15 14:12:10 paul@stripped +2 -2
Add corrections for a couple of special characters.
refman/chapterfmt.pl
1.3 05/06/15 14:12:10 paul@stripped +2 -0
Tweak make rules.
refman/Makefile
1.4 05/06/15 14:12:10 paul@stripped +70 -65
Tweak make rules.
make.d/xml-xhtml
1.4 05/06/15 14:12:10 paul@stripped +0 -3
Tweak make rules.
make.d/xml-xhtml-dir
1.2 05/06/15 14:12:10 paul@stripped +1 -11
Tweak make rules.
make.d/xml-html
1.4 05/06/15 14:12:10 paul@stripped +0 -3
Tweak make rules.
make.d/xml-html-help
1.3 05/06/15 14:12:10 paul@stripped +1 -1
Tweak make rules.
make.d/xml-html-dir
1.2 05/06/15 14:12:10 paul@stripped +1 -12
Tweak make rules.
make.d/xml-html-chapter
1.2 05/06/15 14:12:10 paul@stripped +1 -1
Tweak make rules.
# 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: snake-hub.snake.net
# Root: /src/extern/MySQL/bk/mysqldoc
--- 1.8/xsl.d/mysqlweb-chunk.xsl Sat Feb 19 12:30:58 2005
+++ 1.9/xsl.d/mysqlweb-chunk.xsl Wed Jun 15 14:12:10 2005
@@ -2,14 +2,13 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-<xsl:import href="mysqldoc://xsl-current/html/chunk.xsl" />
+<xsl:import href="mysqldoc://xsl-current/html/chunkfast.xsl" />
<xsl:param name="generate.section.toc.level" select="8"/>
<xsl:param name="section.autolabel" select="1"/>
<xsl:param name="section.label.includes.component.label" select="1"/>
<xsl:param name="use.id.as.filename" select="1"/>
-<xsl:param name="chunk.fast" select="1"/>
<xsl:param name="chunk.quietly" select="1"/>
<xsl:param name="chunk.first.sections" select="1"/>
<xsl:param name="chunk.section.depth" select="3"/>
--- 1.1/make.d/xml-html-chapter Fri May 6 22:15:23 2005
+++ 1.2/make.d/xml-html-chapter Wed Jun 15 14:12:10 2005
@@ -3,7 +3,6 @@
# Use html-section driver file, but set chunk.section.depth to 0,
# causes chunking at the chapter level.
-# (Language sensitive)
MYSQL_HTML_CHAPTER_XSL = $(XSL_DIR)/mysql-html-section.xsl
@@ -17,6 +16,7 @@
mkdir $@/
$(XSLTPROC) \
--stringparam l10n.gentext.default.language `$(STEM_LANG_CODE) $*` \
+ --param chunk.section.depth 0 \
--output $@/ \
$(MYSQL_HTML_CHAPTER_XSL) \
$<
--- 1.2/make.d/xml-html-help Sat May 28 22:57:02 2005
+++ 1.3/make.d/xml-html-help Wed Jun 15 14:12:10 2005
@@ -5,7 +5,6 @@
# Use html-section driver file, but set chunk.section.depth to 0,
# causes chunking at the chapter level.
-# (Language sensitive)
MYSQL_HTML_HELP_XSL = $(XSL_DIR)/mysql-html-help.xsl
@@ -19,6 +18,7 @@
mkdir $@/
$(XSLTPROC) \
--stringparam l10n.gentext.default.language `$(STEM_LANG_CODE) $*` \
+ --param chunk.section.depth 0 \
--output $@/ \
$(MYSQL_HTML_HELP_XSL) \
$<
--- 1.3/make.d/xml-xhtml Wed Jun 15 11:33:05 2005
+++ 1.4/make.d/xml-xhtml Wed Jun 15 14:12:10 2005
@@ -1,9 +1,6 @@
# Convert DocBook -> single XHTML file
# (Language sensitive)
-# This file or xml-xhtml-dir can be included in a Makefile,
-# but you should not include both.
-
MYSQL_XHTML_XSL = $(XSL_DIR)/mysql-xhtml.xsl
%.xhtml: %-prepped.xml $(MYSQL_XHTML_XSL)
--- 1.3/refman/Makefile Wed Jun 15 11:35:02 2005
+++ 1.4/refman/Makefile Wed Jun 15 14:12:10 2005
@@ -5,12 +5,13 @@
# html-chapter
# html-section
# html-web
-# html NOT TESTED
-# info NOT TESTED
+# html (using html-dir)
+# info
# pdf-a4
# pdf
-# txt NOT TESTED
-# xhtml NOT TESTED
+# txt
+# xhtml (using xhtml-dir)
+# fragment files
# Location of repository root relative to current directory
REPO_ROOT = ..
@@ -18,9 +19,6 @@
# Location of directory containing Makefile components
MAKE_DIR = $(REPO_ROOT)/make.d
-abc:
- echo $(GT)
-
all::
@echo "You must say what you want to do."
@echo "Some commands supported by this Makefile:"
@@ -31,68 +29,65 @@
# Dependency list for MySQL Reference Manual
-### THIS IS INCOMPLETE
-
MANUAL_SRCS = \
manual.xml \
- preface.xml \
- introduction.xml \
- installing.xml \
- tutorial.xml \
- using-mysql-programs.xml \
- mysql-database-administration.xml \
- replication.xml \
- mysql-optimization.xml \
- client-side-scripts.xml \
- language-structure.xml \
- charset.xml \
- column-types.xml \
- functions.xml \
- sql-syntax.xml \
- storage-engines.xml \
- innodb.xml \
- ndbcluster.xml \
- images/cluster-components-1.png \
- images/multi-comp-1.png \
- maxdb.xml \
- spatial-extensions-in-mysql.xml \
- stored-procedures.xml \
- triggers.xml \
- views.xml \
- information-schema.xml \
- precision-math.xml \
- mysql-apis.xml \
- mysql-connectors.xml \
- images/myarchitecture.png \
- images/mydsn-icon.png \
- images/mydsn.png \
- images/mydsn-setup.png \
- images/mydsn-example.png \
- images/mydsn-test-success.png \
- images/mydsn-test-fail.png \
- images/mydsn-options.png \
- images/mydsn-icon.png \
- images/mydsn.png \
- images/mydsn-trace.png \
- images/myaccess.png \
- images/myaccess-odbc.png \
- images/mydsn-trace.png \
- images/mydll-properties.png \
- images/mydsn-options.png \
- images/myflowchart.png \
- error-handling.xml \
- extending-mysql.xml \
- problems.xml \
- credits.xml \
- todo.xml \
- news.xml \
- porting.xml \
- environment-variables.xml \
- regexp.xml \
- gpl-license.xml \
+ preface.xml \
+ introduction.xml \
+ installing.xml \
+ tutorial.xml \
+ using-mysql-programs.xml \
+ mysql-database-administration.xml \
+ replication.xml \
+ mysql-optimization.xml \
+ client-side-scripts.xml \
+ language-structure.xml \
+ charset.xml \
+ column-types.xml \
+ functions.xml \
+ sql-syntax.xml \
+ storage-engines.xml \
+ innodb.xml \
+ ndbcluster.xml \
+ images/cluster-components-1.png \
+ images/multi-comp-1.png \
+ maxdb.xml \
+ spatial-extensions-in-mysql.xml \
+ stored-procedures.xml \
+ triggers.xml \
+ views.xml \
+ information-schema.xml \
+ precision-math.xml \
+ mysql-apis.xml \
+ mysql-connectors.xml \
+ images/myarchitecture.png \
+ images/mydsn-icon.png \
+ images/mydsn.png \
+ images/mydsn-setup.png \
+ images/mydsn-example.png \
+ images/mydsn-test-success.png \
+ images/mydsn-test-fail.png \
+ images/mydsn-options.png \
+ images/mydsn-icon.png \
+ images/mydsn.png \
+ images/mydsn-trace.png \
+ images/myaccess.png \
+ images/myaccess-odbc.png \
+ images/mydsn-trace.png \
+ images/mydll-properties.png \
+ images/mydsn-options.png \
+ images/myflowchart.png \
+ error-handling.xml \
+ extending-mysql.xml \
+ problems.xml \
+ credits.xml \
+ todo.xml \
+ news.xml \
+ porting.xml \
+ environment-variables.xml \
+ regexp.xml \
+ gpl-license.xml \
mysql-floss-license-exception.xml
-
manual-prepped.xml: $(MANUAL_SRCS)
# Overrides for generic rules
@@ -200,7 +195,16 @@
mv mac-os-x-installation.html ReadMe.html
#$(RM) mac-os-x-installation.*
+clean::
+ $(RM) $(TEXT_FRAGMENT_FILES)
+ $(RM) $(HTML_FRAGMENT_FILES)
+ $(RM) manual.txt
+
# Import standard variables and target rules
+
+# Need xml-html-dir for formatting the manual itself into a subdir,
+# but also need xml-html for formatting ReadMe.html
+
include $(MAKE_DIR)/vars-layout
include $(MAKE_DIR)/vars-shell
include $(MAKE_DIR)/vars-docbook
@@ -208,6 +212,7 @@
include $(MAKE_DIR)/xml-format
include $(MAKE_DIR)/xml-useless
include $(MAKE_DIR)/xml-prep
+include $(MAKE_DIR)/xml-html
include $(MAKE_DIR)/xml-html-dir
include $(MAKE_DIR)/xml-html-section
include $(MAKE_DIR)/xml-html-chapter
--- 1.3/xsl.d/esc-spchars-texi.xsl Sat Feb 19 12:30:57 2005
+++ 1.4/xsl.d/esc-spchars-texi.xsl Wed Jun 15 14:12:10 2005
@@ -76,7 +76,7 @@
<!-- map special entities to appropriate Texinfo sequences -->
<xsl:when test="$text='…'">
- <xsl:text>{[el]}</xsl:text>
+ <xsl:text>@dots{}</xsl:text>
</xsl:when>
<xsl:when test="$text='—'">
<xsl:text>---</xsl:text>
@@ -140,7 +140,7 @@
</xsl:when>
<xsl:when test="$text='™'">
<xsl:message>WARNING: FOUND TRADEMARK</xsl:message>
- <xsl:text>{[tm]}</xsl:text>
+ <xsl:text>(tm)</xsl:text>
</xsl:when>
<xsl:when test="$text='©'">
<xsl:text>@copyright{}</xsl:text>
--- 1.3/xsl.d/mysql-html-section.xsl Sat Feb 19 12:30:58 2005
+++ 1.4/xsl.d/mysql-html-section.xsl Wed Jun 15 14:12:10 2005
@@ -7,10 +7,9 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-<xsl:import href="mysqldoc://xsl-current/html/chunk.xsl" />
+<xsl:import href="mysqldoc://xsl-current/html/chunkfast.xsl" />
<xsl:param name="generate.section.toc.level" select="8"/>
-<xsl:param name="section.autolabel" select="1"/>
<xsl:param name="section.label.includes.component.label" select="1"/>
<xsl:param name="use.id.as.filename" select="1"/>
--- 1.3/make.d/xml-html Wed Jun 15 11:33:05 2005
+++ 1.4/make.d/xml-html Wed Jun 15 14:12:10 2005
@@ -1,9 +1,6 @@
# Convert DocBook -> single HTML file
# (Language sensitive)
-# This file or xml-html-dir can be included in a Makefile,
-# but you should not include both.
-
MYSQL_HTML_XSL = $(XSL_DIR)/mysql-html.xsl
%.html: %-prepped.xml $(MYSQL_HTML_XSL)
--- 1.1/make.d/xml-html-dir Wed Jun 15 11:15:56 2005
+++ 1.2/make.d/xml-html-dir Wed Jun 15 14:12:10 2005
@@ -3,21 +3,10 @@
# image files. (Presumed use is that you will override the generic
# %.html-dir rule below with one that copies images into the output
# directory after formatting the document.)
-# image files.
# (Language sensitive)
-# This file or xml-html can be included in a Makefile,
-# but you should not include both.
-
MYSQL_HTML_XSL = $(XSL_DIR)/mysql-html.xsl
-%.html: %-prepped.xml $(MYSQL_HTML_XSL)
- $(XSLTPROC) \
- --stringparam l10n.gentext.default.language `$(STEM_LANG_CODE) $*` \
- --output $*.html \
- $(MYSQL_HTML_XSL) \
- $<
-
%.html-dir: %.html-dir.d
touch $@
@@ -28,7 +17,7 @@
mkdir $@/
$(XSLTPROC) \
--stringparam l10n.gentext.default.language `$(STEM_LANG_CODE) $*` \
- --output $@/ \
+ --output $@/$*.html \
$(MYSQL_HTML_XSL) \
$<
--- 1.1/make.d/xml-xhtml-dir Wed Jun 15 11:15:57 2005
+++ 1.2/make.d/xml-xhtml-dir Wed Jun 15 14:12:10 2005
@@ -5,18 +5,8 @@
# directory after formatting the document.)
# (Language sensitive)
-# This file or xml-xhtml can be included in a Makefile,
-# but you should not include both.
-
MYSQL_XHTML_XSL = $(XSL_DIR)/mysql-xhtml.xsl
-%.xhtml: %-prepped.xml $(MYSQL_XHTML_XSL)
- $(XSLTPROC) \
- --stringparam l10n.gentext.default.language `$(STEM_LANG_CODE) $*` \
- --output $*.xhtml \
- $(MYSQL_XHTML_XSL) \
- $<
-
%.xhtml-dir: %.xhtml-dir.d
touch $@
@@ -27,7 +17,7 @@
mkdir $@/
$(XSLTPROC) \
--stringparam l10n.gentext.default.language `$(STEM_LANG_CODE) $*` \
- --output $@/ \
+ --output $@/$*.xhtml \
$(MYSQL_XHTML_XSL) \
$<
--- 1.2/refman/chapterfmt.pl Wed Jun 15 11:35:02 2005
+++ 1.3/refman/chapterfmt.pl Wed Jun 15 14:12:10 2005
@@ -105,4 +105,6 @@
system "make chapter-$chapname$lang.$ofmt"
. " XSLTPROC_EXTRA_FLAGS=\"--stringparam rootid $chapname\"";
system "mv chapter-$chapname$lang.$ofmt $chapname$lang.$ofmt";
+ system "rm -f chapter-$chapname$lang.xml";
+ system "rm -f chapter-$chapname$lang-prepped.xml";
}
| Thread |
|---|
| • bk commit - mysqldoc@docsrva tree (paul:1.2793) | paul | 16 Jun |
