List:Internals« Previous MessageNext Message »
From:paul Date:October 5 2005 5:49pm
Subject:bk commit - mysqldoc@docsrva tree (paul:1.3683)
View as plain text  
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.3683 05/10/05 12:49:41 paul@stripped +10 -0
  Add target rule for generating online version
  of world-setup.html.
  Add xhtml-section target rule.

  xsl.d/mysql-xhtml-section.xsl
    1.1 05/10/05 12:49:36 paul@stripped +36 -0
    New BitKeeper file ``xsl.d/mysql-xhtml-section.xsl''

  xsl.d/mysql-xhtml-section.xsl
    1.0 05/10/05 12:49:36 paul@stripped +0 -0
    BitKeeper file /Users/paul/bk/mysqldoc/xsl.d/mysql-xhtml-section.xsl

  xsl.d/mysqlweb-chunk.xsl
    1.11 05/10/05 12:49:35 paul@stripped +5 -0
    Revise comment.

  xsl.d/mysql-xhtml.xsl
    1.6 05/10/05 12:49:35 paul@stripped +11 -3
    Add namespace declaration.

  xsl.d/mysql-html.xsl
    1.6 05/10/05 12:49:35 paul@stripped +2 -2
    Revise comment.

  xsl.d/mysql-html-section.xsl
    1.6 05/10/05 12:49:35 paul@stripped +3 -2
    Revise comment.

  sample-data/world/Makefile
    1.5 05/10/05 12:49:35 paul@stripped +1 -0
    Add target rule for generating online version
    of world-setup.html.

  make.d/xml-html-web
    1.6 05/10/05 12:49:35 paul@stripped +1 -1
    Revise comment.

  xsl.d/mysqlweb-single.xsl
    1.1 05/10/05 12:44:33 paul@stripped +60 -0

  xsl.d/mysqlweb-single.xsl
    1.0 05/10/05 12:44:33 paul@stripped +0 -0
    BitKeeper file /Users/paul/bk/mysqldoc/xsl.d/mysqlweb-single.xsl

  make.d/xml-xhtml-section
    1.1 05/10/05 11:51:22 paul@stripped +26 -0

  make.d/xml-html-web-single
    1.1 05/10/05 11:51:22 paul@stripped +36 -0

  make.d/xml-xhtml-section
    1.0 05/10/05 11:51:22 paul@stripped +0 -0
    BitKeeper file /Users/paul/bk/mysqldoc/make.d/xml-xhtml-section

  make.d/xml-html-web-single
    1.0 05/10/05 11:51:22 paul@stripped +0 -0
    BitKeeper file /Users/paul/bk/mysqldoc/make.d/xml-html-web-single

# 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:	/Users/paul/bk/mysqldoc

--- 1.10/xsl.d/mysqlweb-chunk.xsl	2005-08-12 17:37:20 -05:00
+++ 1.11/xsl.d/mysqlweb-chunk.xsl	2005-10-05 12:49:35 -05:00
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
+<!--
+  mysqlweb-chunk.xsl - Generate chunked output, with PHP code that
+  provides information needed for display on MySQL web site.
+-->
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
 <xsl:import href="mysqldoc://xsl-current/html/chunkfast.xsl" />
--- New file ---
+++ make.d/xml-html-web-single	05/10/05 11:51:22
# Convert DocBook -> (kind of) HTML, single file.
# The output files contain PHP code suitable for use on mysql.com
# (Language sensitive)

# The l10n.gentext.default.language parameter MUST be set because
# mysqlweb-chunk.xsl includes its value in each output page.

MYSQL_HTML_WEB_SINGLE_XSL = $(XSL_DIR)/mysqlweb-single.xsl
MYSQL_HTML_WEB_SINGLE_XSL_DEPS = $(MYSQL_HTML_WEB_SINGLE_XSL)

# Assume document language is English unless it's set otherwise

DOC_LANG ?= en

%.html-web-single: %.html-web-single.d
	touch $@

.PRECIOUS: %.html-web-single.d

# Note: This rule builds the single output file for abc.xml as abc.html,
# but does so in a subdirectory named abc.html-single.d to avoid conflicts
# in case abc.html is built in the current directory with the xml-html
# rule. 

%.html-web-single.d: %-prepped.xml $(MYSQL_HTML_WEB_SINGLE_XSL_DEPS)
	-$(RM) -r $@/
	mkdir $@/
	$(XSLTPROC) \
		--stringparam l10n.gentext.default.language $(DOC_LANG) \
		--stringparam document.name.stem $* \
		--output $@/$*.html \
		$(MYSQL_HTML_WEB_SINGLE_XSL) \
		$<

clean::
	$(RM) -r *.html-web-single *.html-web-single.d


--- 1.5/make.d/xml-html-web	2005-09-28 14:02:47 -05:00
+++ 1.6/make.d/xml-html-web	2005-10-05 12:49:35 -05:00
@@ -1,5 +1,5 @@
 # Convert DocBook -> (kind of) HTML, with one file per section.
-# The output files contain TOC stuff suitable for use on mysql.com
+# The output files contain PHP code suitable for use on mysql.com
 # (Language sensitive)
 
 # The l10n.gentext.default.language parameter MUST be set because
--- New file ---
+++ make.d/xml-xhtml-section	05/10/05 11:51:22
# Convert DocBook -> XHTML, with one file per section.
# (Language sensitive)

MYSQL_XHTML_SECTION_XSL = $(XSL_DIR)/mysql-xhtml-section.xsl
MYSQL_XHTML_SECTION_XSL_DEPS = $(MYSQL_XHTML_SECTION_XSL)

# Assume document language is English unless it's set otherwise

DOC_LANG ?= en

%.xhtml-section: %.xhtml-section.d
	touch $@

.PRECIOUS: %.xhtml-section.d

%.xhtml-section.d: %-prepped.xml $(MYSQL_XHTML_SECTION_XSL_DEPS)
	-$(RM) -r $@/
	mkdir $@/
	$(XSLTPROC) \
		--stringparam l10n.gentext.default.language $(DOC_LANG) \
		--output $@/ \
		$(MYSQL_XHTML_SECTION_XSL) \
		$<

clean::
	$(RM) -r *.xhtml-section *.xhtml-section.d

--- New file ---
+++ xsl.d/mysql-xhtml-section.xsl	05/10/05 12:49:36
<?xml version="1.0" encoding="iso-8859-1"?>

<!--
  mysql-xhtml-section.xsl - Driver stylesheet for generating XHTML
  per-section output, but with <remark> elements stripped and several
  parameters preset.
-->

<!--
  Include the xhtml namespace declaration so that it becomes
  the default namespace for literal output elements.
-->

<xsl:stylesheet
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  xmlns="http://www.w3.org/1999/xhtml"
  version="1.0">

<xsl:import href="mysqldoc://xsl-current/xhtml/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.quietly" select="1"/>
<xsl:param name="chunk.first.sections" select="1"/>
<xsl:param name="chunk.fast" select="1"/>

<!-- we always want utf-8 - makes it easier to deal with comments -->
<xsl:param name="chunker.output.encoding" select="'utf-8'"/>

<!-- strip remark elements -->
<xsl:template match="remark" />

</xsl:stylesheet>

--- New file ---
+++ xsl.d/mysqlweb-single.xsl	05/10/05 12:44:33
<?xml version="1.0" encoding="iso-8859-1"?>

<!--
  mysqlweb-single.xsl - Generate single-page output, with PHP code that
  provides information needed for display on MySQL web site.
-->

<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">

<xsl:import href="mysqldoc://xsl-current/html/docbook.xsl" />

<xsl:output method="html" encoding="utf-8" indent="no"/>

<xsl:param name="section.autolabel" select="1"/>
<xsl:param name="section.label.includes.component.label" select="1"/>

<!-- sections get own TOC if they have subsections -->
<xsl:param name="generate.section.toc.level" select="2"/>

<!--
  This template overrides the default one and acts to eliminate the
  <html>, <head>, and <body> tags that are emitted by the default.
-->

<xsl:template match="*" mode="process.root">
  <xsl:variable name="doc" select="self::*"/>

  <xsl:call-template name="user.preroot"/>
  <xsl:call-template name="root.messages"/>

  <xsl:call-template name="user.header.content">
    <xsl:with-param name="node" select="$doc"/>
  </xsl:call-template>
  <xsl:apply-templates select="."/>
  <xsl:call-template name="user.footer.content">
    <xsl:with-param name="node" select="$doc"/>
  </xsl:call-template>
</xsl:template>

<!--
  Add PHP header that includes top-level title.
-->

<xsl:template name="user.header.content">
 <xsl:processing-instruction name="php">
  <xsl:text>
  $pagedata['charset'] = 'utf-8';
  $pagedata['lang'] = '</xsl:text><xsl:value-of select="$l10n.gentext.default.language" /><xsl:text>';
  $pagedata['title'] = '</xsl:text><xsl:value-of select="/*/title[1]"/><xsl:text>';
</xsl:text>
 <xsl:text>?</xsl:text>
 </xsl:processing-instruction>
 <xsl:text>
</xsl:text>
</xsl:template>

<!-- strip remark elements -->
<xsl:template match="remark" />

</xsl:stylesheet>


--- 1.5/xsl.d/mysql-html-section.xsl	2005-09-02 15:45:01 -05:00
+++ 1.6/xsl.d/mysql-html-section.xsl	2005-10-05 12:49:35 -05:00
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
 <!--
-Driver stylesheet for generating HTML per-section output, but with <remark>
-elements stripped and several parameters preset.
+  mysql-html-section.xsl - Driver stylesheet for generating HTML
+  per-section output, but with <remark> elements stripped and several
+  parameters preset.
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">

--- 1.5/xsl.d/mysql-html.xsl	2005-09-09 08:48:18 -05:00
+++ 1.6/xsl.d/mysql-html.xsl	2005-10-05 12:49:35 -05:00
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
 <!--
-Driver stylesheet for generating HTML output, but with <remark>
-elements stripped and several parameters preset.
+  mysql-html.xsl - Driver stylesheet for generating HTML output,
+  but with <remark> elements stripped and several parameters preset.
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">

--- 1.5/xsl.d/mysql-xhtml.xsl	2005-09-09 08:48:37 -05:00
+++ 1.6/xsl.d/mysql-xhtml.xsl	2005-10-05 12:49:35 -05:00
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
 <!--
-Driver stylesheet for generating XHTML output, but with <remark>
-elements stripped and several parameters preset.
+  mysql-xhtml.xsl - Driver stylesheet for generating XHTML output,
+  but with <remark> elements stripped and several parameters preset.
 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<!--
+  Include the xhtml namespace declaration so that it becomes
+  the default namespace for literal output elements.
+-->
+
+<xsl:stylesheet
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml"
+  version="1.0">
 
 <xsl:import href="mysqldoc://xsl-current/xhtml/docbook.xsl" />
 

--- 1.4/sample-data/world/Makefile	2005-09-27 12:14:38 -05:00
+++ 1.5/sample-data/world/Makefile	2005-10-05 12:49:35 -05:00
@@ -40,5 +40,6 @@
 include $(MAKE_DIR)/xml-format
 include $(MAKE_DIR)/xml-prep
 include $(MAKE_DIR)/xml-html
+include $(MAKE_DIR)/xml-html-web-single
 include $(MAKE_DIR)/xml-pdf
 include $(MAKE_DIR)/xml-depend
Thread
bk commit - mysqldoc@docsrva tree (paul:1.3683)paul5 Oct