Author: paul
Date: 2007-09-20 11:18:01 +0200 (Thu, 20 Sep 2007)
New Revision: 7886
Log:
r25082@frost: paul | 2007-09-20 11:16:02 +0200
Strip ads from manpages. (Noticed by LenZ)
Modified:
trunk/make.d/xml-prep
trunk/xsl.d/dbk-prep.xsl
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:30392
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:25080
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:30392
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:25082
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
Modified: trunk/make.d/xml-prep
===================================================================
--- trunk/make.d/xml-prep 2007-09-20 08:18:15 UTC (rev 7885)
+++ trunk/make.d/xml-prep 2007-09-20 09:18:01 UTC (rev 7886)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 483 bytes
@@ -61,6 +61,7 @@
--param map.refentry.to.section 0 \
--stringparam legalnotice.type "legalnotice-gpl" \
--stringparam qandaset.style "$(QANDASET_STYLE)" \
+ --param strip.ads 1 \
$(DBK_PREP_XSL) $< > $@.tmp2
$(BUG_PREP) < $@.tmp2 > $@.tmp
ifdef IDMAP_REFS
Modified: trunk/xsl.d/dbk-prep.xsl
===================================================================
--- trunk/xsl.d/dbk-prep.xsl 2007-09-20 08:18:15 UTC (rev 7885)
+++ trunk/xsl.d/dbk-prep.xsl 2007-09-20 09:18:01 UTC (rev 7886)
Changed blocks: 2, Lines Added: 21, Lines Deleted: 0; 1394 bytes
@@ -37,6 +37,7 @@
the command that invokes this stylesheet).
- Map other <remark> elements to <para> if $map.remark.to.para is
non-zero. (But only for remarks that have no special purpose.)
+ - Strip advertisements if $strip.ads is non-zero.
It is REQUIRED that processing instructions be preserved, because we
use the <?dbtimestamp?> PI to produce a timestamp in the stylesheets
@@ -216,6 +217,26 @@
</xsl:template>
<!--
+ Strip advertisements if $strip.ads is non-zero. Setting this non-zero
+ can be done for prep formats where we know that we don't need the ads.
+ (For example, manpage prep.) For prep formats that are used in common
+ for several output formats, where only some of them need the ads
+ stripped, perform the stripping in "upstream" transforms.
+ -->
+
+ <xsl:param name="strip.ads" select="0"/>
+
+ <xsl:template match="formalpara[@role='mnmas']">
+ <xsl:if test="$strip.ads = 0">
+ <!-- pass formalpara through unchanged -->
+ <formalpara>
+ <xsl:copy-of select="@*"/>
+ <xsl:apply-templates/>
+ </formalpara>
+ </xsl:if>
+ </xsl:template>
+
+ <!--
Map glossary tags to variable list
-->
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r7886 - in trunk: . make.d xsl.d | paul | 20 Sep |
