[jboss-cvs] JBossAS SVN: r70931 - trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 17 17:31:38 EDT 2008
Author: newtonm
Date: 2008-03-17 17:31:38 -0400 (Mon, 17 Mar 2008)
New Revision: 70931
Modified:
trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/highlight-pdf.xsl
trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl
trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl
Log:
Chunk chapters, pad programlistings and change note,tip,important,caution,warning colours. Also don't indent body text and justify it using hyphenation to avoid excessive spacing of words.
Modified: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/highlight-pdf.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/highlight-pdf.xsl 2008-03-17 21:11:23 UTC (rev 70930)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/highlight-pdf.xsl 2008-03-17 21:31:38 UTC (rev 70931)
@@ -32,7 +32,11 @@
space-after="12pt"
linefeed-treatment="preserve"
white-space-collapse="false"
- white-space-treatment="preserve">
+ white-space-treatment="preserve"
+ padding-bottom="12pt"
+ padding-top="12pt"
+ padding-right="12pt"
+ padding-left="12pt">
<xsl:variable name="factory" select="rf:instance()"/>
<xsl:variable name="hiliter" select="rf:getRenderer($factory, string($role))"/>
Modified: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl 2008-03-17 21:11:23 UTC (rev 70930)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl 2008-03-17 21:31:38 UTC (rev 70931)
@@ -16,8 +16,8 @@
<xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/docbook.xsl"/>
<xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/chunk-common.xsl"/>
+<xsl:include href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/manifest.xsl"/>
<xsl:include href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/chunk-code.xsl"/>
-<xsl:include href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/manifest.xsl"/>
<xsl:include href="redhat.xsl"/>
<xsl:include href="xhtml-common.xsl"/>
@@ -28,7 +28,8 @@
<xsl:param name="generate.legalnotice.link" select="1"/>
<xsl:param name="generate.revhistory.link" select="0"/>
-<xsl:param name="chunk.section.depth" select="4"/>
+<!-- Set chunk.section.depth to 0 to just chunk chapters. -->
+<xsl:param name="chunk.section.depth" select="0"/>
<xsl:param name="chunk.first.sections" select="1"/>
<xsl:param name="chunk.toc" select="''"/>
Modified: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl 2008-03-17 21:11:23 UTC (rev 70930)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl 2008-03-17 21:31:38 UTC (rev 70931)
@@ -24,7 +24,7 @@
<xsl:import href="redhat.xsl"/>
<xsl:import href="highlight-pdf.xsl"/>
-<xsl:param name="alignment">left</xsl:param>
+<xsl:param name="alignment">justify</xsl:param>
<xsl:param name="use.extensions" select="0"/>
<xsl:param name="tablecolumns.extensions" select="0"/>
<xsl:param name="fop.extensions" select="1"/>
@@ -36,7 +36,7 @@
<xsl:param name="hyphenation-character">-</xsl:param>
<!--xsl:param name="hyphenate.verbatim" select="0"/-->
-<xsl:param name="hyphenate">false</xsl:param>
+<xsl:param name="hyphenate">true</xsl:param>
<!--xsl:param name="ulink.hyphenate" select="1"/-->
<xsl:param name="line-height" select="1.5"/>
@@ -73,21 +73,25 @@
<xsl:attribute name="wrap-option">wrap</xsl:attribute>
<xsl:attribute name="background-color">
<xsl:choose>
- <xsl:when test="ancestor::note or ancestor::caution or ancestor::important or ancestor::warning or ancestor::tip">
- <xsl:text>#333333</xsl:text>
- </xsl:when>
+ <xsl:when test="ancestor::note"> <xsl:text>#B5BCBD</xsl:text> </xsl:when>
+ <xsl:when test="ancestor::caution"> <xsl:text>#E3A835</xsl:text> </xsl:when>
+ <xsl:when test="ancestor::important"> <xsl:text>#4A5D75</xsl:text> </xsl:when>
+ <xsl:when test="ancestor::warning"> <xsl:text>#7B1E1E</xsl:text> </xsl:when>
+ <xsl:when test="ancestor::tip"> <xsl:text>#7E917F</xsl:text> </xsl:when>
<xsl:otherwise>
- <xsl:text>#e9e3cc</xsl:text>
+ <xsl:text>black</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
<xsl:attribute name="color">
<xsl:choose>
- <xsl:when test="ancestor::note or ancestor::caution or ancestor::important or ancestor::warning or ancestor::tip">
- <xsl:text>white</xsl:text>
- </xsl:when>
+ <xsl:when test="ancestor::note"> <xsl:text>#4C5253</xsl:text> </xsl:when>
+ <xsl:when test="ancestor::caution"> <xsl:text>#533500</xsl:text> </xsl:when>
+ <xsl:when test="ancestor::important"> <xsl:text>white</xsl:text> </xsl:when>
+ <xsl:when test="ancestor::warning"> <xsl:text>white</xsl:text> </xsl:when>
+ <xsl:when test="ancestor::tip"> <xsl:text>white</xsl:text> </xsl:when>
<xsl:otherwise>
- <xsl:text>black</xsl:text>
+ <xsl:text>red</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
@@ -123,7 +127,19 @@
<xsl:param name="admon.graphics.extension" select="'.svg'"/>
<xsl:attribute-set name="admonition.title.properties">
<xsl:attribute name="font-size">13pt</xsl:attribute>
- <xsl:attribute name="color">white</xsl:attribute>
+ <!--<xsl:attribute name="color">white</xsl:attribute>-->
+
+ <xsl:attribute name="color">
+ <xsl:choose>
+ <xsl:when test="self::note">#4C5253</xsl:when>
+ <xsl:when test="self::caution">#533500</xsl:when>
+ <xsl:when test="self::important">white</xsl:when>
+ <xsl:when test="self::warning">white</xsl:when>
+ <xsl:when test="self::tip">white</xsl:when>
+ <xsl:otherwise>white</xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
<xsl:attribute name="hyphenate">false</xsl:attribute>
<xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
@@ -133,8 +149,28 @@
<!--xsl:attribute-set name="admonition.properties"></xsl:attribute-set-->
<xsl:attribute-set name="graphical.admonition.properties">
- <xsl:attribute name="color">white</xsl:attribute>
- <xsl:attribute name="background-color">#404040</xsl:attribute>
+
+ <xsl:attribute name="color">
+ <xsl:choose>
+ <xsl:when test="self::note">#4C5253</xsl:when>
+ <xsl:when test="self::caution">#533500</xsl:when>
+ <xsl:when test="self::important">white</xsl:when>
+ <xsl:when test="self::warning">white</xsl:when>
+ <xsl:when test="self::tip">white</xsl:when>
+ <xsl:otherwise>white</xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <xsl:attribute name="background-color">
+ <xsl:choose>
+ <xsl:when test="self::note">#B5BCBD</xsl:when>
+ <xsl:when test="self::caution">#E3A835</xsl:when>
+ <xsl:when test="self::important">#4A5D75</xsl:when>
+ <xsl:when test="self::warning">#7B1E1E</xsl:when>
+ <xsl:when test="self::tip">#7E917F</xsl:when>
+ <xsl:otherwise>#404040</xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+
<xsl:attribute name="space-before.optimum">1em</xsl:attribute>
<xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
<xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
@@ -216,7 +252,8 @@
<xsl:param name="page.margin.inner">30mm</xsl:param>
<!-- No intendation of Titles -->
-<xsl:param name="title.margin.left">0pc</xsl:param>
+<!--<xsl:param name="title.margin.left">0pc</xsl:param>-->
+<xsl:param name="body.start.indent">0pt</xsl:param>
<xsl:param name="title.color">#4a5d75</xsl:param>
More information about the jboss-cvs-commits
mailing list