fixed docbook warnings

This commit is contained in:
eeichinger
2009-01-17 13:55:14 +00:00
parent 0060e18f88
commit 244f94743f
9 changed files with 56 additions and 45 deletions

View File

@@ -20,7 +20,7 @@
</xsl:template>
<xsl:template match='xslthl:string' mode="xslthl">
<fo:inline color="#A31515"><xsl:apply-templates mode="xslthl"/></fo:inline>
<fo:inline color="#000000"><xsl:apply-templates mode="xslthl"/></fo:inline>
</xsl:template>
<xsl:template match='xslthl:comment' mode="xslthl">
@@ -39,6 +39,13 @@
<fo:inline color="#0000FF"><xsl:apply-templates mode="xslthl"/></fo:inline>
</xsl:template>
<xsl:template match='xslthl:html' mode="xslthl">
<fo:inline color="#A31515"><xsl:apply-templates mode="xslthl"/></fo:inline>
</xsl:template>
<xsl:template match='xslthl:xslt' mode="xslthl">
<fo:inline color="#0000FF"><xsl:apply-templates mode="xslthl"/></fo:inline>
</xsl:template>
<!--
<xsl:template match='xslthl:html'>
<span style='background:#AFF'><font color='blue'><xsl:apply-templates/></font></span>

View File

@@ -29,7 +29,7 @@
<xsl:choose>
<xsl:when test="$xhref
and (not($node/@xlink:type) or
and (not($node/@xlink:type) or
$node/@xlink:type='simple')">
<!-- Is it a local idref? -->
@@ -561,7 +561,7 @@
</xsl:template>
<xsl:template match="package">
<xsl:call-template name="inline.charseq"/>
<xsl:call-template name="inline.monoseq"/>
</xsl:template>
<xsl:template match="parameter">
@@ -767,7 +767,7 @@
<xsl:choose>
<xsl:when test="$target">
<fo:basic-link internal-destination="{@linkend}"
<fo:basic-link internal-destination="{@linkend}"
xsl:use-attribute-sets="xref.properties">
<xsl:call-template name="inline.italicseq"/>
</fo:basic-link>
@@ -1116,7 +1116,7 @@
<xsl:call-template name="inline.charseq"/>
</xsl:otherwise>
</xsl:choose>
</fo:basic-link>
<xsl:text>]</xsl:text>
</xsl:when>
@@ -1146,7 +1146,7 @@
</xsl:attribute>
<xsl:call-template name="inline.charseq"/>
</fo:basic-link>
<xsl:text>]</xsl:text>
</xsl:when>

View File

@@ -187,7 +187,7 @@
</xsl:attribute>
</xsl:attribute-set>
<xsl:param name="footer.rule" select="1"/>
<xsl:param name="footer.column.widths">1 1 1</xsl:param>
<xsl:param name="footer.column.widths">1 2 1</xsl:param>
<xsl:param name="footer.table.height">14pt</xsl:param>
<xsl:attribute-set name="footer.table.properties">
<xsl:attribute name="table-layout">fixed</xsl:attribute>
@@ -352,7 +352,7 @@ set toc,title
<xsl:attribute-set name="itemizedlist.label.properties">
</xsl:attribute-set>
<xsl:param name="itemizedlist.label.width">1.0em</xsl:param>
<xsl:param name="keep.relative.image.uris" select="0"/>
<xsl:param name="l10n.gentext.default.language">en</xsl:param>
@@ -416,7 +416,7 @@ set toc,title
<xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
<xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
</xsl:attribute-set>
<xsl:param name="olink.doctitle">no</xsl:param>
<xsl:param name="olink.doctitle">no</xsl:param>
<xsl:param name="olink.base.uri"/>
<xsl:param name="olink.debug" select="0"/>
<xsl:attribute-set name="olink.properties">
@@ -860,7 +860,7 @@ set toc,title
<xsl:param name="ulink.hyphenate.chars">/</xsl:param>
<xsl:param name="ulink.show" select="1"/>
<xsl:param name="use.extensions" select="0"/>
<xsl:param name="use.local.olink.style" select="0"/>
<xsl:param name="use.local.olink.style" select="0"/>
<xsl:param name="use.role.as.xrefstyle" select="1"/>
<xsl:param name="use.role.for.mediaobject" select="1"/>
<xsl:param name="use.svg" select="1"/>

View File

@@ -284,7 +284,7 @@
<!-- Verbatim text formatting (programlistings) -->
<xsl:attribute-set name="monospace.verbatim.properties">
<xsl:attribute name="font-size">
<xsl:value-of select="$body.font.small * 1.0"/>
<xsl:value-of select="$body.font.small * 0.9"/>
<xsl:text>pt</xsl:text>
</xsl:attribute>
</xsl:attribute-set>
@@ -313,7 +313,7 @@
################################################### -->
<!-- Use images for callouts instead of (1) (2) (3) -->
<xsl:param name="callout.graphics">1</xsl:param>
<xsl:param name="callout.graphics.path">../lib/docbook-xsl-snapshot/images/callouts/</xsl:param>
<xsl:param name="callout.graphics.path">../../lib/docbook-xsl-snapshot/images/callouts/</xsl:param>
<!-- Place callout marks at this column in annotated areas -->
<xsl:param name="callout.defaultcolumn">90</xsl:param>
@@ -322,7 +322,7 @@
################################################### -->
<!-- Use nice graphics for admonitions -->
<xsl:param name="admon.graphics">1</xsl:param>
<xsl:param name="admon.graphics.path">../lib/docbook-xsl-snapshot/images/admons/</xsl:param>
<xsl:param name="admon.graphics.path">../../lib/docbook-xsl-snapshot/images/admons/</xsl:param>
<!--###################################################
Misc

View File

@@ -188,8 +188,8 @@
<xsl:template name="table.container">
<xsl:param name="table.block"/>
<xsl:choose>
<xsl:when test="@orient='land' and
$fop.extensions = 0 and
<xsl:when test="@orient='land' and
$fop.extensions = 0 and
$passivetex.extensions = 0" >
<fo:block-container reference-orientation="90"
padding="6pt"
@@ -473,11 +473,11 @@
$passivetex.extensions != 0">
<xsl:attribute name="table-layout">fixed</xsl:attribute>
</xsl:if>
<xsl:attribute name="width">
<xsl:value-of select="$table.width"/>
</xsl:attribute>
<xsl:choose>
<xsl:when test="$use.extensions != 0
and $tablecolumns.extension != 0">
@@ -1080,7 +1080,7 @@
</xsl:call-template>
</xsl:if>
<xsl:if test="$colsep.inherit &gt; 0 and
<xsl:if test="$colsep.inherit &gt; 0 and
$col &lt; (ancestor::tgroup/@cols|ancestor::entrytbl/@cols)[last()]">
<xsl:call-template name="border">
<xsl:with-param name="side" select="'right'"/>
@@ -1121,7 +1121,7 @@
</xsl:when>
<xsl:otherwise>
<!-- HTML table -->
<xsl:variable name="border"
<xsl:variable name="border"
select="(ancestor::table |
ancestor::informaltable)[last()]/@border"/>
<xsl:if test="$border != '' and $border != 0">
@@ -1334,11 +1334,11 @@
<xsl:variable name="colwidth">
<xsl:call-template name="calc.column.width"/>
</xsl:variable>
<xsl:if test="$colwidth != 'proportional-column-width(1)'">
<!-- xsl:if test="$colwidth != 'proportional-column-width(1)'" -->
<xsl:attribute name="column-width">
<xsl:value-of select="$colwidth"/>
</xsl:attribute>
</xsl:if>
<!-- /xsl:if -->
</fo:table-column>
</xsl:when>
<xsl:otherwise>
@@ -1374,11 +1374,11 @@
</xsl:with-param>
</xsl:call-template>
</xsl:variable>
<xsl:if test="$colwidth != 'proportional-column-width(1)'">
<!-- xsl:if test="$colwidth != 'proportional-column-width(1)'" -->
<xsl:attribute name="column-width">
<xsl:value-of select="$colwidth"/>
</xsl:attribute>
</xsl:if>
<!-- /xsl:if -->
</fo:table-column>
</xsl:when>
<xsl:otherwise>
@@ -1488,7 +1488,7 @@ proportional-column-width() function.</para>
<xsl:if test="contains($colwidth, '*')">
<xsl:text>proportional-column-width(</xsl:text>
<xsl:choose>
<xsl:when test="substring-before($colwidth, '*') != ''">
<xsl:when test="substring-before($colwidth, '*') != ''">
<xsl:value-of select="substring-before($colwidth, '*')"/>
</xsl:when>
<xsl:otherwise>

View File

@@ -1,21 +1,21 @@
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:d="http://docbook.org/ns/docbook"
xmlns:s6hl="http://net.sf.xslthl/ConnectorSaxon6"
xmlns:sbhl="http://net.sf.xslthl/ConnectorSaxonB"
xmlns:d="http://docbook.org/ns/docbook"
xmlns:s6hl="http://net.sf.xslthl/ConnectorSaxon6"
xmlns:sbhl="http://net.sf.xslthl/ConnectorSaxonB"
xmlns:xhl="http://net.sf.xslthl/ConnectorXalan"
xmlns:saxon6="http://icl.com/saxon"
xmlns:saxonb="http://saxon.sf.net/"
xmlns:saxon6="http://icl.com/saxon"
xmlns:saxonb="http://saxon.sf.net/"
xmlns:xalan="http://xml.apache.org/xalan"
xmlns:exsl="http://exslt.org/common"
xmlns:xslthl="http://xslthl.sf.net"
exclude-result-prefixes="exsl d xslthl s6hl sbhl xhl"
exclude-result-prefixes="exsl xslthl s6hl sbhl xhl d"
version='1.0'>
<!-- ********************************************************************
$Id: common.xsl 8092 2008-07-18 21:26:36Z kosek $
$Id: common.xsl 8123 2008-09-14 15:08:33Z mzjn $
********************************************************************
This file is part of the XSL DocBook Stylesheet distribution.
@@ -33,7 +33,7 @@
<saxon6:script implements-prefix="s6hl" language="java" src="java:net.sf.xslthl.ConnectorSaxon6" />
<!-- for saxon 8.5 and later -->
<saxonb:script implements-prefix="sbhl" language="java" src="java:net.sf.xslthl.ConnectorSaxonB" />
<saxonb:script implements-prefix="sbhl" language="java" src="java:net.sf.xslthl.ConnectorSaxonB" />
<!-- You can override this template to do more complex mapping of
@@ -97,10 +97,13 @@
<!-- A fallback when the specific style isn't recognized -->
<xsl:template match="xslthl:*" mode="xslthl">
<!-- we can safely ignore this message - it just means, that an element wasn't highlighted -->
<!--
<xsl:message>
<xsl:text>unprocessed xslthl style: </xsl:text>
<xsl:value-of select="local-name(.)" />
<xsl:value-of select="text()" />
</xsl:message>
-->
<xsl:apply-templates mode="xslthl"/>
</xsl:template>

View File

@@ -13,6 +13,7 @@
<wholehighlighter type='xml'>
<elementSet>
<style>html</style>
<ignoreCase />
<element>A</element>
<element>ABBR</element>
<element>ACRONYM</element>
@@ -68,11 +69,11 @@
<element>LI</element>
<element>LINK</element>
<element>MAP</element>
<!--<element>MENU</element>-->
<element>MENU</element>
<element>META</element>
<element>NOFRAMES</element>
<element>NOSCRIPT</element>
<!--<element>OBJECT</element>-->
<element>OBJECT</element>
<element>OL</element>
<element>OPTGROUP</element>
<element>OPTION</element>
@@ -113,4 +114,4 @@
</elementPrefix>
</wholehighlighter>
</highlighters>
</highlighters>

View File

@@ -19,7 +19,7 @@
</xsl:template>
<xsl:template match='xslthl:string' mode="xslthl">
<span style="color: #A31515"><xsl:apply-templates mode="xslthl"/></span>
<span style="color: #000000"><xsl:apply-templates mode="xslthl"/></span>
</xsl:template>
<xsl:template match='xslthl:comment' mode="xslthl">
@@ -43,7 +43,7 @@
</xsl:template>
<xsl:template match='xslthl:html' mode="xslthl">
<b><i><xsl:apply-templates mode="xslthl"/></i></b>
<span style="color: #A31515"><xsl:apply-templates mode="xslthl"/></span>
</xsl:template>
<xsl:template match='xslthl:xslt' mode="xslthl">

View File

@@ -37,8 +37,8 @@
<xsl:variable name="link">
<xsl:choose>
<xsl:when test="$xhref and
(not($node/@xlink:type) or
<xsl:when test="$xhref and
(not($node/@xlink:type) or
$node/@xlink:type='simple')">
<!-- Is it a local idref or a uri? -->
@@ -155,7 +155,7 @@
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
<xsl:copy-of select="$content"/>
</a>
</xsl:otherwise>
@@ -181,7 +181,7 @@
<xsl:apply-templates select="$target" mode="html.title.attribute"/>
<xsl:copy-of select="$content"/>
</a>
</xsl:when>
<xsl:otherwise>
@@ -630,7 +630,7 @@
</xsl:template>
<xsl:template match="package">
<xsl:call-template name="inline.charseq"/>
<xsl:call-template name="inline.monoseq"/>
</xsl:template>
<xsl:template match="parameter">
@@ -803,7 +803,7 @@
<xsl:call-template name="language.attribute"/>
</xsl:if>
<!-- We don't want empty @class values, so do not propagate empty @roles -->
<xsl:if test="@role and
<xsl:if test="@role and
normalize-space(@role) != '' and
$phrase.propagates.style != 0">
<xsl:apply-templates select="." mode="class.attribute">