Author: paul
Date: 2006-08-14 21:59:25 +0200 (Mon, 14 Aug 2006)
New Revision: 3013
Log:
r12807@polar: paul | 2006-08-14 14:59:02 -0500
Updates from mysqldoc-internal.
Modified:
trunk/make.d/xml-prep
trunk/make.d/xml-remark
trunk/xsl.d/mysql-fo.xsl
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:12751
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:13559
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:9385
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:12807
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:13559
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:9385
Modified: trunk/make.d/xml-prep
===================================================================
--- trunk/make.d/xml-prep 2006-08-14 16:36:52 UTC (rev 3012)
+++ trunk/make.d/xml-prep 2006-08-14 19:59:25 UTC (rev 3013)
Changed blocks: 3, Lines Added: 12, Lines Deleted: 1; 1468 bytes
@@ -4,6 +4,7 @@
# for a final target. They are deleted by "make clean".
.PRECIOUS: %-prepped.xml
+.PRECIOUS: %-remrepped.xml
.PRECIOUS: %-manprepped.xml
# BUG_PREP fixes up "Bug #xxxx" bug references into <ulink> elements
@@ -15,6 +16,15 @@
--param map.remark.to.para $(MAP_REMARK_TO_PARA) \
$(DBK_PREP_XSL) $< | $(BUG_PREP) > $@
+# For <remark> preprocessing, prepping is the same as %-prepped.xml,
+# except that we must ignore the remark-mapping parameter (which causes
+# them not to be mapped because the default is off).
+
+%-remprepped.xml: %.xml $(DBK_PREP_XSL_DEPS) $(GET_SVN_REVISION) $(BUG_PREP)
+ $(XSLTPROC) \
+ --stringparam repository.revision "`$(GET_SVN_REVISION)`" \
+ $(DBK_PREP_XSL) $< | $(BUG_PREP) > $@
+
# For manpage preprocessing, suppress the mapping of <refentry>
# elements to <section> elements that is done by default.
@@ -25,8 +35,9 @@
$(DBK_PREP_XSL) $< | $(BUG_PREP) > $@
clean::
- $(RM) *-prepped.xml *-manprepped.xml
+ $(RM) *-prepped.xml *-remprepped.xml *-manprepped.xml
help::
@echo "make file-prepped.xml - preprocess file.xml for producing output"
+ @echo "make file-remprepped.xml - preprocess file.xml for remark-counting"
@echo "make file-manprepped.xml - preprocess file.xml for producing manpages"
Modified: trunk/make.d/xml-remark
===================================================================
--- trunk/make.d/xml-remark 2006-08-14 16:36:52 UTC (rev 3012)
+++ trunk/make.d/xml-remark 2006-08-14 19:59:25 UTC (rev 3013)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 4; 1134 bytes
@@ -12,22 +12,22 @@
# Extract <remark> elements
-%.remark: %-prepped.xml %-toc-entries.xml $(EXTRACT_REMARK_XSL_DEPS)
+%.remarks: %-remprepped.xml %-toc-entries.xml $(EXTRACT_REMARK_XSL_DEPS)
$(XSLTPROC) \
--stringparam toc.entry.file $$PWD/$*-toc-entries.xml \
--output - $(EXTRACT_REMARK_XSL) $< | $(WRAP_REMARK) > $@
# Count <remark> elements
-%.remark-count: %-prepped.xml %-toc-entries.xml $(COUNT_REMARK_XSL_DEPS)
+%.remark-count: %-remprepped.xml %-toc-entries.xml $(COUNT_REMARK_XSL_DEPS)
$(XSLTPROC) \
--stringparam toc.entry.file $$PWD/$*-toc-entries.xml \
--output $@ $(COUNT_REMARK_XSL) $<
clean::
- $(RM) *.remark
+ $(RM) *.remarks
$(RM) *.remark-count
help::
- @echo "make file.remark - extract <remark> elements from file.xml"
+ @echo "make file.remarks - extract <remark> elements from file.xml"
@echo "make file.remark-count - count <remark> elements in file.xml"
Modified: trunk/xsl.d/mysql-fo.xsl
===================================================================
--- trunk/xsl.d/mysql-fo.xsl 2006-08-14 16:36:52 UTC (rev 3012)
+++ trunk/xsl.d/mysql-fo.xsl 2006-08-14 19:59:25 UTC (rev 3013)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 3; 566 bytes
@@ -11,9 +11,7 @@
<xsl:import href="docbook-xsl/fo/docbook.xsl" />
<xsl:include href="mysql.titlepage.templates.fo.xsl" />
-<xsl:template match="command
- |guilabel
- |guibutton">
+<xsl:template match="command">
<xsl:call-template name="inline.monoseq"/>
</xsl:template>
<xsl:template match="guilabel">
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r3013 - in trunk: . make.d xsl.d | paul | 14 Aug |
