From 81972a012b938ed35cb9e3a805f1a889b8195e61 Mon Sep 17 00:00:00 2001 From: Bob Stayton <bobs@sagehill.net> Date: Mon, 9 Aug 2010 18:57:41 +0000 Subject: [PATCH] Fix bug 2844927 Validity error for callout bugs. --- xsl/html/docbook.css.xml | 57 +++++++++++++++++++++++++++++++++++++--- xsl/html/verbatim.xsl | 15 ++++++++--- 2 files changed, 64 insertions(+), 8 deletions(-) diff --git a/xsl/html/docbook.css.xml b/xsl/html/docbook.css.xml index d12673f84..d93a25c8f 100644 --- a/xsl/html/docbook.css.xml +++ b/xsl/html/docbook.css.xml @@ -3,7 +3,7 @@ /********************************/ /* start of styles in block.xsl */ -/********************************/ + .formalpara-title { font-weight: bold; } @@ -44,17 +44,66 @@ span.msgexplan-title { font-weight: bold; } -/********************************/ /* end of styles in block.xsl */ /********************************/ /********************************/ /* start of styles in autotoc.xsl */ -/********************************/ -div.toc-title { + font-weight: bold; margin-top: 1em; margin-bottom: 1em; } + +/* end of styles in autotoc.xsl */ +/********************************/ + +/********************************/ +/* start of styles in formal.xsl */ + +div.figure-title { + font-weight: bold; +} + +div.example-title { + font-weight: bold; +} + +div.equation-title { + font-weight: bold; +} + +div.table-title { + font-weight: bold; +} + +div.sidebar-title { + font-weight: bold; +} + + +/* end of styles in formal.xsl */ +/********************************/ + +/********************************/ +/* start of styles in verbatim.xsl */ + +div.programlisting { + white-space: pre; + font-family: monospace; +} + +div.screen { + white-space: pre; + font-family: monospace; +} + +div.synopsis { + white-space: pre; + font-family: monospace; +} + +/* end of styles in verbatim.xsl */ +/********************************/ </style> diff --git a/xsl/html/verbatim.xsl b/xsl/html/verbatim.xsl index 7eed4a119..82cdbd1d3 100644 --- a/xsl/html/verbatim.xsl +++ b/xsl/html/verbatim.xsl @@ -34,6 +34,13 @@ <xsl:call-template name="anchor"/> + <xsl:variable name="div.element"> + <xsl:choose> + <xsl:when test="$make.clean.html != 0">div</xsl:when> + <xsl:otherwise>pre</xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:if test="$shade.verbatim != 0"> <xsl:message> <xsl:text>The shade.verbatim parameter is deprecated. </xsl:text> @@ -61,7 +68,7 @@ </xsl:otherwise> </xsl:choose> </xsl:variable> - <pre> + <xsl:element name="{$div.element}"> <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:if test="@width != ''"> <xsl:attribute name="width"> @@ -71,10 +78,10 @@ <xsl:call-template name="number.rtf.lines"> <xsl:with-param name="rtf" select="$rtf"/> </xsl:call-template> - </pre> + </xsl:element> </xsl:when> <xsl:otherwise> - <pre> + <xsl:element name="{$div.element}"> <xsl:apply-templates select="." mode="common.html.attributes"/> <xsl:if test="@width != ''"> <xsl:attribute name="width"> @@ -89,7 +96,7 @@ <xsl:apply-templates/> </xsl:otherwise> </xsl:choose> - </pre> + </xsl:element> </xsl:otherwise> </xsl:choose> </xsl:template> -- 2.40.0