diff options
27 files changed, 624 insertions, 480 deletions
@@ -1,5 +1,35 @@ 2007-04-25 Shaun McCance <shaunm@gnome.org> + * doc/xslt/C/gnome-doc-xslt.xml: + * test/testbook/Makefile: + * xslt/docbook/html/Makefile.am: + * xslt/docbook/html/db2html-autotoc.xsl: + * xslt/docbook/html/db2html-bibliography.xsl: + * xslt/docbook/html/db2html-block.xsl: + * xslt/docbook/html/db2html-callout.xsl: + * xslt/docbook/html/db2html-classsynopsis.xsl: + * xslt/docbook/html/db2html-cmdsynopsis.xsl: + * xslt/docbook/html/db2html-css.xsl: + * xslt/docbook/html/db2html-division.xsl: + * xslt/docbook/html/db2html-ebnf.xsl: + * xslt/docbook/html/db2html-footnote.xsl: + * xslt/docbook/html/db2html-funcsynopsis.xsl: + * xslt/docbook/html/db2html-info.xsl: + * xslt/docbook/html/db2html-inline.xsl: + * xslt/docbook/html/db2html-l10n.xsl: + * xslt/docbook/html/db2html-list.xsl: + * xslt/docbook/html/db2html-media.xsl: + * xslt/docbook/html/db2html-qanda.xsl: + * xslt/docbook/html/db2html-refentry.xsl: + * xslt/docbook/html/db2html-table.xsl: + * xslt/docbook/html/db2html-title.xsl: + * xslt/docbook/html/db2html-xref.xsl: + * xslt/docbook/html/db2html.xsl: + * xslt/docbook/html/db2xhtml.xsl: + - Output to either HTML or XHTML + +2007-04-25 Shaun McCance <shaunm@gnome.org> + * xslt/docbook/html/db2html-division.xsl: - Don't output an empty <ul class="linktrail"/> diff --git a/doc/xslt/C/gnome-doc-xslt.xml b/doc/xslt/C/gnome-doc-xslt.xml index 3084cf4d..37519255 100644 --- a/doc/xslt/C/gnome-doc-xslt.xml +++ b/doc/xslt/C/gnome-doc-xslt.xml @@ -206,6 +206,7 @@ <include href="db-xref.xml" xmlns="http://www.w3.org/2001/XInclude"/> <include href="db2html.xml" xmlns="http://www.w3.org/2001/XInclude"/> + <include href="db2xhtml.xml" xmlns="http://www.w3.org/2001/XInclude"/> <include href="db2html-autotoc.xml" xmlns="http://www.w3.org/2001/XInclude"/> <include href="db2html-bibliography.xml" xmlns="http://www.w3.org/2001/XInclude"/> <include href="db2html-block.xml" xmlns="http://www.w3.org/2001/XInclude"/> diff --git a/test/testbook/Makefile b/test/testbook/Makefile index 9fad6f5b..ab8c9d65 100644 --- a/test/testbook/Makefile +++ b/test/testbook/Makefile @@ -1,5 +1,5 @@ -.ALL: html -.PHONY: html +.ALL: html xhtml +.PHONY: html xhtml html: if [ ! -d html ]; then mkdir html; fi @@ -11,3 +11,13 @@ html: --stringparam theme.icon.nav.next "../../../data/icons/nav-next.png" \ ../../xslt/docbook/html/db2html.xsl \ testbook.xml +xhtml: + if [ ! -d xhtml ]; then mkdir xhtml; fi + rm -f xhtml/*.* + xsltproc --timing --nonet --xinclude -o xhtml/ \ + --param db.chunk.chunk_top 1 \ + --stringparam theme.icon.admon.path "../../../data/icons/" \ + --stringparam theme.icon.nav.previous "../../../data/icons/nav-previous.png" \ + --stringparam theme.icon.nav.next "../../../data/icons/nav-next.png" \ + ../../xslt/docbook/html/db2xhtml.xsl \ + testbook.xml diff --git a/xslt/docbook/html/Makefile.am b/xslt/docbook/html/Makefile.am index 4dc363c5..ae29711a 100644 --- a/xslt/docbook/html/Makefile.am +++ b/xslt/docbook/html/Makefile.am @@ -23,7 +23,8 @@ xsl_DATA = \ db2html-table.xsl \ db2html-title.xsl \ db2html-xref.xsl \ - db2html.xsl + db2html.xsl \ + db2xhtml.xsl EXTRA_DIST=$(xsl_DATA) diff --git a/xslt/docbook/html/db2html-autotoc.xsl b/xslt/docbook/html/db2html-autotoc.xsl index 1a851c9f..82c94319 100644 --- a/xslt/docbook/html/db2html-autotoc.xsl +++ b/xslt/docbook/html/db2html-autotoc.xsl @@ -17,7 +17,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="msg html" version="1.0"> <!--!!========================================================================== @@ -53,17 +54,17 @@ REMARK: Extra explanation of the parameters would be good <xsl:param name="labels" select="true()"/> <xsl:param name="titleabbrev" select="false()"/> <xsl:if test="($selected = false()) or ($node = $selected/ancestor-or-self::*)"> - <div class="autotoc"> + <html:div class="autotoc"> <xsl:if test="$show_title"> - <div class="title autotoc-title"> + <html:div class="title autotoc-title"> <xsl:call-template name="l10n.gettext"> <xsl:with-param name="msgid" select="'Contents'"/> </xsl:call-template> - </div> + </html:div> </xsl:if> - <ul> + <html:ul> <xsl:if test="$show_info"> - <li> + <html:li> <xsl:choose> <xsl:when test="$is_info"> <xsl:call-template name="l10n.gettext"> @@ -71,7 +72,7 @@ REMARK: Extra explanation of the parameters would be good </xsl:call-template> </xsl:when> <xsl:otherwise> - <a> + <html:a> <xsl:attribute name="href"> <xsl:call-template name="db.xref.target"> <xsl:with-param name="linkend" select="$db.chunk.info_basename"/> @@ -87,10 +88,10 @@ REMARK: Extra explanation of the parameters would be good <xsl:value-of select="$text"/> </xsl:attribute> <xsl:value-of select="$text"/> - </a> + </html:a> </xsl:otherwise> </xsl:choose> - </li> + </html:li> </xsl:if> <xsl:for-each select="$divisions"> <xsl:apply-templates mode="db2html.autotoc.mode" select="."> @@ -101,8 +102,8 @@ REMARK: Extra explanation of the parameters would be good <xsl:with-param name="titleabbrev" select="$titleabbrev"/> </xsl:apply-templates> </xsl:for-each> - </ul> - </div> + </html:ul> + </html:div> </xsl:if> </xsl:template> @@ -130,14 +131,14 @@ REMARK: Describe this mode <xsl:text>abbrev</xsl:text> </xsl:if> </xsl:variable> - <li> + <html:li> <xsl:if test="$labels"> - <span class="label"> + <html:span class="label"> <xsl:call-template name="db.label"> <xsl:with-param name="node" select="."/> <xsl:with-param name="role" select="'li'"/> </xsl:call-template> - </span> + </html:span> </xsl:if> <xsl:choose> <xsl:when test=". = $selected and not($is_info)"> @@ -166,7 +167,7 @@ REMARK: Describe this mode <xsl:with-param name="titleabbrev" select="$titleabbrev"/> </xsl:call-template> </xsl:if> - </li> + </html:li> </xsl:template> <!-- = refentry % db2html.autotoc.mode = --> @@ -182,7 +183,7 @@ REMARK: Describe this mode <xsl:text>abbrev</xsl:text> </xsl:if> </xsl:variable> - <li> + <html:li> <xsl:call-template name="db2html.xref"> <xsl:with-param name="linkend" select="@id"/> <xsl:with-param name="target" select="."/> @@ -193,7 +194,7 @@ REMARK: Describe this mode <xsl:text> — </xsl:text> <xsl:apply-templates select="refnamediv/refpurpose[1]"/> </xsl:if> - </li> + </html:li> </xsl:template> </xsl:stylesheet> diff --git a/xslt/docbook/html/db2html-bibliography.xsl b/xslt/docbook/html/db2html-bibliography.xsl index 305e11e0..e0fab7f6 100644 --- a/xslt/docbook/html/db2html-bibliography.xsl +++ b/xslt/docbook/html/db2html-bibliography.xsl @@ -17,7 +17,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="html" version="1.0"> <!--!!========================================================================== @@ -82,7 +83,7 @@ Outputs CSS that controls the appearance of bibliograpies <!-- = bibliomixed = --> <xsl:template match="bibliomixed"> - <div class="bibliomixed block-indent"> + <html:div class="bibliomixed block-indent"> <xsl:call-template name="db2html.anchor"/> <xsl:choose> <xsl:when test="*[1]/self::abbrev"> @@ -102,7 +103,7 @@ Outputs CSS that controls the appearance of bibliograpies <xsl:apply-templates/> </xsl:otherwise> </xsl:choose> - </div> + </html:div> </xsl:template> <!-- = bibliomset = --> diff --git a/xslt/docbook/html/db2html-block.xsl b/xslt/docbook/html/db2html-block.xsl index 7707c786..394a70d0 100644 --- a/xslt/docbook/html/db2html-block.xsl +++ b/xslt/docbook/html/db2html-block.xsl @@ -18,8 +18,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:msg="http://www.gnome.org/~shaunm/gnome-doc-utils/l10n" - xmlns="http://www.w3.org/1999/xhtml" - exclude-result-prefixes="msg" + xmlns:html="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="msg html" version="1.0"> <!--!!========================================================================== @@ -60,7 +60,7 @@ is then used by the CSS for styling. <xsl:param name="formal" select="false()"/> <xsl:param name="title" select="$node/title"/> <xsl:param name="caption" select="$node/caption"/> - <div> + <html:div> <xsl:attribute name="class"> <xsl:value-of select="concat($class, ' block ', local-name($node))"/> <xsl:if test="$first"> @@ -79,34 +79,34 @@ is then used by the CSS for styling. <xsl:choose> <xsl:when test="$formal"> <xsl:if test="$title"> - <div class="block block-first title title-formal"> + <html:div class="block block-first title title-formal"> <xsl:call-template name="db2html.anchor"> <xsl:with-param name="node" select="$title"/> </xsl:call-template> - <span class="label"> + <html:span class="label"> <xsl:call-template name="db.label"> <xsl:with-param name="node" select="$node"/> <xsl:with-param name="role" select="'header'"/> </xsl:call-template> - </span> + </html:span> <xsl:apply-templates select="$title/node()"/> - </div> + </html:div> </xsl:if> - <div class="{local-name($node)}-inner"> + <html:div class="{local-name($node)}-inner"> <xsl:apply-templates select="$node/node()[not(. = $title) and not(. = $caption)]"/> - </div> + </html:div> <xsl:apply-templates select="$caption"/> </xsl:when> <xsl:when test="$node/self::title"> - <span class="title"> + <html:span class="title"> <xsl:apply-templates select="$node/node()"/> - </span> + </html:span> </xsl:when> <xsl:otherwise> <xsl:apply-templates select="$node/node()"/> </xsl:otherwise> </xsl:choose> - </div> + </html:div> </xsl:template> @@ -125,7 +125,7 @@ element. select="not($node/preceding-sibling::* [not(self::blockinfo) and not(self::title) and not(self::titleabbrev) and not(self::attribution) ])"/> - <div> + <html:div> <xsl:attribute name="class"> <xsl:value-of select="local-name($node)"/> <xsl:text> block block-indent</xsl:text> @@ -137,12 +137,12 @@ element. <xsl:with-param name="node" select="$node"/> </xsl:call-template> <xsl:apply-templates select="$node/title"/> - <blockquote class="{local-name($node)}"> + <html:blockquote class="{local-name($node)}"> <xsl:apply-templates select="$node/node()[name(.) != 'title' and name(.) != 'attribution']"/> - </blockquote> + </html:blockquote> <xsl:apply-templates select="$node/attribution"/> - </div> + </html:div> </xsl:template> @@ -160,7 +160,7 @@ This template creates an HTML #{p} element for the given DocBook element. select="not($node/preceding-sibling::* [not(self::blockinfo) and not(self::title) and not(self::titleabbrev) and not(self::attribution) ])"/> - <p> + <html:p> <xsl:attribute name="class"> <xsl:value-of select="local-name($node)"/> <xsl:text> block</xsl:text> @@ -172,7 +172,7 @@ This template creates an HTML #{p} element for the given DocBook element. <xsl:with-param name="node" select="$node"/> </xsl:call-template> <xsl:apply-templates select="$node/node()"/> - </p> + </html:p> </xsl:template> @@ -201,7 +201,7 @@ is then used by the CSS for styling. @format @startinglinenumber --> - <div> + <html:div> <xsl:attribute name="class"> <xsl:value-of select="local-name($node)"/> <xsl:text> block</xsl:text> @@ -216,11 +216,11 @@ is then used by the CSS for styling. <xsl:with-param name="node" select="$node"/> </xsl:call-template> <xsl:if test="$node/@linenumbering = 'numbered'"> - <pre class="linenumbering"><xsl:call-template name="db.linenumbering"> + <html:pre class="linenumbering"><xsl:call-template name="db.linenumbering"> <xsl:with-param name="node" select="$node"/> - </xsl:call-template></pre> + </xsl:call-template></html:pre> </xsl:if> - <pre class="{local-name($node)}"> + <html:pre class="{local-name($node)}"> <!-- Strip off a leading newline --> <xsl:if test="$node/node()[1]/self::text()"> <xsl:choose> @@ -246,8 +246,8 @@ is then used by the CSS for styling. </xsl:choose> </xsl:if> <xsl:apply-templates select="$node/node()[not(position() = 1 and self::text())]"/> - </pre> - </div> + </html:pre> + </html:div> </xsl:template> @@ -348,31 +348,31 @@ dd.glossdef, dd.glosssee, dd.glossseealso <!-- = glossdef = --> <xsl:template match="glossdef"> - <dd class="glossdef"> + <html:dd class="glossdef"> <xsl:apply-templates select="*[local-name(.) != 'glossseealso']"/> - </dd> + </html:dd> <xsl:apply-templates select="glossseealso[1]"/> </xsl:template> <!-- = glossentry = --> <xsl:template match="glossentry"> - <dt class="glossterm"> + <html:dt class="glossterm"> <xsl:apply-templates select="glossterm"/> - </dt> + </html:dt> <xsl:apply-templates select="glossdef | glosssee[1]"/> </xsl:template> <!-- = glosssee = --> <xsl:template match="glosssee | glossseealso"> - <dd class="{local-name(.)}"> - <p> + <html:dd class="{local-name(.)}"> + <html:p> <xsl:call-template name="l10n.gettext"> <xsl:with-param name="msgid" select="concat(local-name(.), '.format')"/> <xsl:with-param name="node" select="."/> <xsl:with-param name="format" select="true()"/> </xsl:call-template> - </p> - </dd> + </html:p> + </html:dd> </xsl:template> <!--#% l10n.format.mode --> @@ -387,7 +387,7 @@ dd.glossdef, dd.glosssee, dd.glossseealso </xsl:if> <xsl:choose> <xsl:when test="@otherterm"> - <a> + <html:a> <xsl:attribute name="href"> <xsl:call-template name="db.xref.target"> <xsl:with-param name="linkend" select="@otherterm"/> @@ -398,7 +398,7 @@ dd.glossdef, dd.glosssee, dd.glossseealso <xsl:with-param name="linkend" select="@otherterm"/> </xsl:call-template> </xsl:attribute> - </a> + </html:a> <xsl:choose> <xsl:when test="normalize-space(.) != ''"> <xsl:apply-templates/> diff --git a/xslt/docbook/html/db2html-callout.xsl b/xslt/docbook/html/db2html-callout.xsl index bba60069..67378c70 100644 --- a/xslt/docbook/html/db2html-callout.xsl +++ b/xslt/docbook/html/db2html-callout.xsl @@ -17,7 +17,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="html" version="1.0"> <!--!!========================================================================== @@ -84,9 +85,9 @@ REMARK: Describe this template --> <xsl:template name="db2html.co.dingbat"> <xsl:param name="co" select="."/> - <span class="co"> + <html:span class="co"> <xsl:value-of select="count(preceding::co) + 1"/> - </span> + </html:span> </xsl:template> diff --git a/xslt/docbook/html/db2html-classsynopsis.xsl b/xslt/docbook/html/db2html-classsynopsis.xsl index f1e6e2c3..35bd034d 100644 --- a/xslt/docbook/html/db2html-classsynopsis.xsl +++ b/xslt/docbook/html/db2html-classsynopsis.xsl @@ -17,7 +17,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="html" version="1.0"> <!--!!========================================================================== @@ -68,9 +69,9 @@ REMARK: Describe this param </xsl:choose> </xsl:variable> - <div class="{local-name(.)}"> + <html:div class="{local-name(.)}"> <xsl:call-template name="db2html.anchor"/> - <pre class="$language"> + <html:pre class="$language"> <xsl:choose> <xsl:when test="$language = 'cpp'"> <xsl:apply-templates mode="db2html.class.cpp.mode" select="."/> @@ -88,8 +89,8 @@ REMARK: Describe this param </xsl:message> </xsl:otherwise> </xsl:choose> - </pre> - </div> + </html:pre> + </html:div> </xsl:template> <!-- = classsynopsisinfo = --> @@ -99,14 +100,14 @@ REMARK: Describe this param <!-- = methodparam = --> <xsl:template match="methodparam"> - <span class="methodparam"> + <html:span class="methodparam"> <xsl:for-each select="*"> <xsl:if test="position() != 1"> <xsl:text> </xsl:text> </xsl:if> <xsl:apply-templates select="."/> </xsl:for-each> - </span> + </html:span> </xsl:template> <!-- = methodparam/parameter = --> @@ -119,38 +120,38 @@ REMARK: Describe this param <!-- = ooclass = --> <xsl:template match="ooclass"> - <span class="ooclass" style="font-family: monospace;"> + <html:span class="ooclass" style="font-family: monospace;"> <xsl:for-each select="modifier | classname"> <xsl:if test="position() != 1"> <xsl:text> </xsl:text> </xsl:if> <xsl:apply-templates select="."/> </xsl:for-each> - </span> + </html:span> </xsl:template> <!-- = ooexception = --> <xsl:template match="ooexception"> - <span class="ooexception" style="font-family: monospace;"> + <html:span class="ooexception" style="font-family: monospace;"> <xsl:for-each select="modifier | exceptionname"> <xsl:if test="position() != 1"> <xsl:text> </xsl:text> </xsl:if> <xsl:apply-templates select="."/> </xsl:for-each> - </span> + </html:span> </xsl:template> <!-- = oointerface = --> <xsl:template match="oointerface"> - <span class="oointerface" style="font-family: monospace;"> + <html:span class="oointerface" style="font-family: monospace;"> <xsl:for-each select="modifier | interfacename"> <xsl:if test="position() != 1"> <xsl:text> </xsl:text> </xsl:if> <xsl:apply-templates select="."/> </xsl:for-each> - </span> + </html:span> </xsl:template> <!--#* class.cpp.modifier --> @@ -196,7 +197,7 @@ REMARK: Describe this mode } --> <xsl:if test="@class = 'class' or not(@class)"> - <span class="ooclass"> + <html:span class="ooclass"> <xsl:for-each select="ooclass[1]/modifier"> <xsl:if test="position() != 1"> <xsl:text> </xsl:text> @@ -206,7 +207,7 @@ REMARK: Describe this mode <xsl:text> class </xsl:text> <xsl:apply-templates mode="db2html.class.cpp.mode" select="ooclass[1]/classname"/> - </span> + </html:span> <xsl:if test="ooclass[2]"> <xsl:text> : </xsl:text> <xsl:for-each select="ooclass[position() != 1]"> @@ -252,9 +253,9 @@ REMARK: Describe this mode <xsl:apply-templates mode="db2html.class.cpp.mode" select="methodname"/> </xsl:when> <xsl:when test="../self::classsynopsis[ooclass]"> - <span class="methodname"> + <html:span class="methodname"> <xsl:value-of select="../ooclass/classname"/> - </span> + </html:span> </xsl:when> </xsl:choose> <xsl:text>(</xsl:text> @@ -293,10 +294,10 @@ REMARK: Describe this mode <xsl:apply-templates mode="db2html.class.cpp.mode" select="methodname"/> </xsl:when> <xsl:when test="../self::classsynopsis[ooclass]"> - <span class="methodname"> + <html:span class="methodname"> <xsl:text>~</xsl:text> <xsl:value-of select="../ooclass/classname"/> - </span> + </html:span> </xsl:when> </xsl:choose> <xsl:text>(</xsl:text> @@ -348,14 +349,14 @@ REMARK: Describe this mode <!-- = methodparam % db2html.class.cpp.mode = --> <xsl:template mode="db2html.class.cpp.mode" match="methodparam"> - <span class="methodparam"> + <html:span class="methodparam"> <xsl:for-each select="*"> <xsl:if test="position() != 1"> <xsl:text> </xsl:text> </xsl:if> <xsl:apply-templates mode="db2html.class.cpp.mode" select="."/> </xsl:for-each> - </span> + </html:span> </xsl:template> <!-- = methodsynopsis % db2html.class.cpp.mode = --> @@ -409,7 +410,7 @@ REMARK: Describe this mode <!-- <xsl:template mode="db2html.class.python.mode" match="classsynopsis"> <xsl:if test="@class = 'class' or not(@class)"> - <span class="ooclass"> + <html:span class="ooclass"> <xsl:for-each select="ooclass[1]/modifier"> <xsl:if test="position() != 1"> <xsl:text> </xsl:text> @@ -419,7 +420,7 @@ REMARK: Describe this mode <xsl:text> class </xsl:text> <xsl:apply-templates mode="db2html.class.python.mode" select="ooclass[1]/classname"/> - </span> + </html:span> <xsl:if test="ooclass[2]"> <xsl:text> : </xsl:text> <xsl:for-each select="ooclass[position() != 1]"> @@ -459,9 +460,9 @@ REMARK: Describe this mode <xsl:apply-templates mode="db2html.class.python.mode" select="methodname"/> </xsl:when> <xsl:when test="../self::classsynopsis[ooclass]"> - <span class="methodname"> + <html:span class="methodname"> <xsl:value-of select="../ooclass/classname"/> - </span> + </html:span> </xsl:when> </xsl:choose> <xsl:text>(</xsl:text> @@ -494,10 +495,10 @@ REMARK: Describe this mode <xsl:apply-templates mode="db2html.class.python.mode" select="methodname"/> </xsl:when> <xsl:when test="../self::classsynopsis[ooclass]"> - <span class="methodname"> + <html:span class="methodname"> <xsl:text>~</xsl:text> <xsl:value-of select="../ooclass/classname"/> - </span> + </html:span> </xsl:when> </xsl:choose> <xsl:text>(</xsl:text> @@ -543,14 +544,14 @@ REMARK: Describe this mode <!-- = methodparam % db2html.class.python.mode = --> <!-- <xsl:template mode="db2html.class.python.mode" match="methodparam"> - <span class="methodparam"> + <html:span class="methodparam"> <xsl:for-each select="*"> <xsl:if test="position() != 1"> <xsl:text> </xsl:text> </xsl:if> <xsl:apply-templates mode="db2html.class.python.mode" select="."/> </xsl:for-each> - </span> + </html:span> </xsl:template> --> diff --git a/xslt/docbook/html/db2html-cmdsynopsis.xsl b/xslt/docbook/html/db2html-cmdsynopsis.xsl index 5f6d9215..4e9565a0 100644 --- a/xslt/docbook/html/db2html-cmdsynopsis.xsl +++ b/xslt/docbook/html/db2html-cmdsynopsis.xsl @@ -18,7 +18,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="html" version="1.0"> <!--!!========================================================================== @@ -121,7 +122,7 @@ div.cmdsynopsis { font-family: monospace; } </xsl:choose> </xsl:param> - <span class="arg-punc"> + <html:span class="arg-punc"> <xsl:choose> <xsl:when test="$choice = 'plain'"/> <xsl:when test="$choice = 'req'"> @@ -131,11 +132,11 @@ div.cmdsynopsis { font-family: monospace; } <xsl:text>[</xsl:text> </xsl:otherwise> </xsl:choose> - <span class="arg"> + <html:span class="arg"> <xsl:apply-templates> <xsl:with-param name="sepchar" select="$sepchar"/> </xsl:apply-templates> - </span> + </html:span> <xsl:if test="$rep = 'repeat'"> <xsl:text>...</xsl:text> </xsl:if> @@ -148,7 +149,7 @@ div.cmdsynopsis { font-family: monospace; } <xsl:text>]</xsl:text> </xsl:otherwise> </xsl:choose> - </span> + </html:span> </xsl:template> <!-- = cmdsynopsis = --> @@ -163,7 +164,7 @@ div.cmdsynopsis { font-family: monospace; } </xsl:otherwise> </xsl:choose> </xsl:param> - <div class="cmdsynopsis"> + <html:div class="cmdsynopsis"> <xsl:call-template name="db2html.anchor"/> <xsl:for-each select="command | arg | group | sbr"> <xsl:if test="position() != 1"> @@ -176,7 +177,7 @@ div.cmdsynopsis { font-family: monospace; } <xsl:apply-templates select="synopfragment"> <xsl:with-param name="sepchar" select="$sepchar"/> </xsl:apply-templates> - </div> + </html:div> </xsl:template> <!-- = group = --> @@ -212,7 +213,7 @@ div.cmdsynopsis { font-family: monospace; } </xsl:choose> </xsl:param> - <span class="group-punc"> + <html:span class="group-punc"> <xsl:choose> <xsl:when test="$choice = 'plain'"> <xsl:text>(</xsl:text> @@ -224,7 +225,7 @@ div.cmdsynopsis { font-family: monospace; } <xsl:text>[</xsl:text> </xsl:otherwise> </xsl:choose> - <span class="group"> + <html:span class="group"> <xsl:for-each select="*"> <xsl:if test="local-name(.) = 'arg' and position() != 1"> <xsl:value-of select="concat($sepchar, '|', $sepchar)"/> @@ -233,7 +234,7 @@ div.cmdsynopsis { font-family: monospace; } <xsl:with-param name="sepchar" select="$sepchar"/> </xsl:apply-templates> </xsl:for-each> - </span> + </html:span> <xsl:choose> <xsl:when test="$choice = 'plain'"> <xsl:text>)</xsl:text> @@ -248,12 +249,12 @@ div.cmdsynopsis { font-family: monospace; } <xsl:if test="$rep = 'repeat'"> <xsl:text>...</xsl:text> </xsl:if> - </span> + </html:span> </xsl:template> <!-- = sbr = --> <xsl:template match="sbr"> - <br class="sbr"/> + <html:br class="sbr"/> </xsl:template> <!-- = synopfragment = --> @@ -268,13 +269,13 @@ div.cmdsynopsis { font-family: monospace; } </xsl:otherwise> </xsl:choose> </xsl:param> - <div class="synopfragment"> + <html:div class="synopfragment"> <xsl:call-template name="db2html.anchor"/> - <i><xsl:call-template name="db.label"/></i> + <html:i><xsl:call-template name="db.label"/></html:i> <xsl:apply-templates> <xsl:with-param name="sepchar" select="$sepchar"/> </xsl:apply-templates> - </div> + </html:div> </xsl:template> <!-- = synopfragmentref = --> diff --git a/xslt/docbook/html/db2html-css.xsl b/xslt/docbook/html/db2html-css.xsl index 5359edfa..fdcbe5c1 100644 --- a/xslt/docbook/html/db2html-css.xsl +++ b/xslt/docbook/html/db2html-css.xsl @@ -18,8 +18,9 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" extension-element-prefixes="exsl" + exclude-result-prefixes="html" version="1.0"> <!--!!========================================================================== @@ -60,12 +61,12 @@ avoid creating the same file multiple times. <xsl:call-template name="db2html.css.content"/> </exsl:document> </xsl:if> - <link rel="stylesheet" type="text/css" href="{$db2html.css.file}"/> + <html:link rel="stylesheet" type="text/css" href="{$db2html.css.file}"/> </xsl:when> <xsl:otherwise> - <style type="text/css"> + <html:style type="text/css"> <xsl:call-template name="db2html.css.content"/> - </style> + </html:style> </xsl:otherwise> </xsl:choose> </xsl:template> diff --git a/xslt/docbook/html/db2html-division.xsl b/xslt/docbook/html/db2html-division.xsl index 2220f76f..d62d72fa 100644 --- a/xslt/docbook/html/db2html-division.xsl +++ b/xslt/docbook/html/db2html-division.xsl @@ -17,7 +17,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="html" version="1.0"> <!--!!========================================================================== @@ -119,18 +120,18 @@ REMARK: Put in a word about the chunk flow; talk about what templates get called <xsl:variable name="prev_node" select="key('idkey', $prev_id)"/> <xsl:variable name="next_node" select="key('idkey', $next_id)"/> <!-- FIXME --> - <html> - <head> - <title> + <html:html> + <html:head> + <html:title> <xsl:variable name="title"> <xsl:call-template name="db.title"> <xsl:with-param name="node" select="$node"/> </xsl:call-template> </xsl:variable> <xsl:value-of select="normalize-space($title)"/> - </title> + </html:title> <xsl:if test="string($prev_id) != ''"> - <link rel="previous"> + <html:link rel="previous"> <xsl:attribute name="href"> <xsl:call-template name="db.xref.target"> <xsl:with-param name="linkend" select="$prev_id"/> @@ -143,10 +144,10 @@ REMARK: Put in a word about the chunk flow; talk about what templates get called <xsl:with-param name="node" select="$prev_node"/> </xsl:call-template> </xsl:attribute> - </link> + </html:link> </xsl:if> <xsl:if test="string($next_id) != ''"> - <link rel="next"> + <html:link rel="next"> <xsl:attribute name="href"> <xsl:call-template name="db.xref.target"> <xsl:with-param name="linkend" select="$next_id"/> @@ -159,10 +160,10 @@ REMARK: Put in a word about the chunk flow; talk about what templates get called <xsl:with-param name="node" select="$next_node"/> </xsl:call-template> </xsl:attribute> - </link> + </html:link> </xsl:if> <xsl:if test="/*[1] != $node"> - <link rel="top"> + <html:link rel="top"> <xsl:attribute name="href"> <xsl:call-template name="db.xref.target"> <xsl:with-param name="linkend" select="/*[1]/@id"/> @@ -175,14 +176,14 @@ REMARK: Put in a word about the chunk flow; talk about what templates get called <xsl:with-param name="node" select="/*[1]"/> </xsl:call-template> </xsl:attribute> - </link> + </html:link> </xsl:if> <xsl:call-template name="db2html.css"> <xsl:with-param name="css_file" select="$depth_of_chunk = 0"/> </xsl:call-template> <xsl:call-template name="db2html.division.head.extra"/> - </head> - <body> + </html:head> + <html:body> <xsl:call-template name="db2html.division.top"> <xsl:with-param name="node" select="$node"/> <xsl:with-param name="info" select="$info"/> @@ -206,7 +207,7 @@ REMARK: Put in a word about the chunk flow; talk about what templates get called </xsl:call-template> </xsl:variable> <xsl:copy-of select="$sidebar"/> - <div> + <html:div> <xsl:attribute name="class"> <xsl:text>body</xsl:text> <xsl:if test="$sidebar != ''"> @@ -228,7 +229,7 @@ REMARK: Put in a word about the chunk flow; talk about what templates get called </xsl:apply-templates> </xsl:otherwise> </xsl:choose> - </div> + </html:div> <xsl:call-template name="db2html.division.bottom"> <xsl:with-param name="node" select="$node"/> <xsl:with-param name="info" select="$info"/> @@ -239,8 +240,8 @@ REMARK: Put in a word about the chunk flow; talk about what templates get called <xsl:with-param name="prev_node" select="$prev_node"/> <xsl:with-param name="next_node" select="$next_node"/> </xsl:call-template> - </body> - </html> + </html:body> + </html:html> </xsl:template> @@ -293,7 +294,7 @@ REMARK: Talk about some of the parameters ($depth_in_chunk = 0 and $info)"/> <xsl:param name="autotoc_depth" select="number(boolean($divisions))"/> - <div class="division {local-name($node)}"> + <html:div class="division {local-name($node)}"> <xsl:call-template name="db2html.anchor"> <xsl:with-param name="node" select="$node"/> </xsl:call-template> @@ -318,12 +319,12 @@ REMARK: Talk about some of the parameters <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/> </xsl:apply-templates> <xsl:if test="$entries"> - <dl class="{local-name($node)}"> + <html:dl class="{local-name($node)}"> <xsl:apply-templates select="$entries"> <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk + 1"/> <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/> </xsl:apply-templates> - </dl> + </html:dl> </xsl:if> <xsl:if test="$autotoc_depth != 0"> <xsl:call-template name="db2html.autotoc"> @@ -346,7 +347,7 @@ REMARK: Talk about some of the parameters <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/> </xsl:call-template> </xsl:if> - </div> + </html:div> </xsl:template> @@ -403,26 +404,25 @@ REMARK: Talk about the different kinds of title blocks </xsl:choose> </xsl:variable> - <div class="header"> - <xsl:element name="{$title_h}" - namespace="http://www.w3.org/1999/xhtml"> + <html:div class="header"> + <xsl:element name="{$title_h}" namespace="{$db2html.namespace}"> <xsl:attribute name="class"> <xsl:value-of select="concat(local-name($node), ' ', local-name($title_node))"/> </xsl:attribute> - <span class="title"> + <html:span class="title"> <xsl:if test="$title_node"> <xsl:call-template name="db2html.anchor"> <xsl:with-param name="node" select="$title_node"/> </xsl:call-template> </xsl:if> <xsl:if test="$generate_label"> - <span class="label"> + <html:span class="label"> <xsl:call-template name="db.label"> <xsl:with-param name="node" select="$node"/> <xsl:with-param name="role" select="'header'"/> <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/> </xsl:call-template> - </span> + </html:span> </xsl:if> <xsl:choose> <xsl:when test="$title_content"> @@ -432,11 +432,10 @@ REMARK: Talk about the different kinds of title blocks <xsl:apply-templates select="$title_node/node()"/> </xsl:otherwise> </xsl:choose> - </span> + </html:span> </xsl:element> <xsl:if test="$subtitle_node or $subtitle_content"> - <xsl:element name="{$subtitle_h}" - namespace="http://www.w3.org/1999/xhtml"> + <xsl:element name="{$subtitle_h}" namespace="{$db2html.namespace}"> <xsl:attribute name="class"> <xsl:value-of select="concat(local-name($node), ' ', local-name($subtitle_node))"/> </xsl:attribute> @@ -450,7 +449,7 @@ REMARK: Talk about the different kinds of title blocks </xsl:choose> </xsl:element> </xsl:if> - </div> + </html:div> </xsl:template> @@ -464,10 +463,10 @@ REMARK: Describe this <xsl:template name="db2html.linktrail"> <xsl:param name="node"/> <xsl:if test="$node/ancestor::*"> - <ul class="linktrail"> + <html:ul class="linktrail"> <!-- The parens put the nodes back in document order --> <xsl:for-each select="($node/ancestor::*)"> - <li> + <html:li> <xsl:attribute name="class"> <xsl:text>linktrail</xsl:text> <xsl:choose> @@ -482,7 +481,7 @@ REMARK: Describe this </xsl:when> </xsl:choose> </xsl:attribute> - <a class="linktrail"> + <html:a class="linktrail"> <xsl:attribute name="href"> <xsl:call-template name="db.xref.target"> <xsl:with-param name="linkend" select="@id"/> @@ -499,10 +498,10 @@ REMARK: Describe this <xsl:call-template name="db.titleabbrev"> <xsl:with-param name="node" select="."/> </xsl:call-template> - </a> - </li> + </html:a> + </html:li> </xsl:for-each> - </ul> + </html:ul> </xsl:if> </xsl:template> @@ -549,12 +548,12 @@ REMARK: Document this template <xsl:param name="prev_node" select="key('idkey', $prev_id)"/> <xsl:param name="next_node" select="key('idkey', $next_id)"/> <xsl:param name="position" select="'top'"/> - <div class="navbar navbar-{$position}"> + <html:div class="navbar navbar-{$position}"> <!-- FIXME: rtl --> - <table class="navbar"><tr> - <td class="navbar-prev"> + <html:table class="navbar"><html:tr> + <html:td class="navbar-prev"> <xsl:if test="$prev_id != ''"> - <a class="navbar-prev"> + <html:a class="navbar-prev"> <xsl:attribute name="href"> <xsl:call-template name="db.xref.target"> <xsl:with-param name="linkend" select="$prev_id"/> @@ -590,12 +589,12 @@ REMARK: Document this template </xsl:call-template> </xsl:otherwise> </xsl:choose> - </a> + </html:a> </xsl:if> - </td> - <td class="navbar-next"> + </html:td> + <html:td class="navbar-next"> <xsl:if test="$next_id != ''"> - <a class="navbar-prev"> + <html:a class="navbar-next"> <xsl:attribute name="href"> <xsl:call-template name="db.xref.target"> <xsl:with-param name="linkend" select="$next_id"/> @@ -613,14 +612,14 @@ REMARK: Document this template </xsl:call-template> <xsl:text>  </xsl:text> <xsl:copy-of select="$navbar.icon.next"/> - </a> + </html:a> </xsl:if> - </td> - </tr></table> - </div> + </html:td> + </html:tr></html:table> + </html:div> </xsl:template> <xsl:variable name="navbar.icon.previous"> - <img> + <html:img> <xsl:attribute name="src"> <xsl:value-of select="$theme.icon.nav.previous"/> </xsl:attribute> @@ -630,10 +629,10 @@ REMARK: Document this template <xsl:attribute name="width"> <xsl:value-of select="$theme.icon.nav.size"/> </xsl:attribute> - </img> + </html:img> </xsl:variable> <xsl:variable name="navbar.icon.next"> - <img> + <html:img> <xsl:attribute name="src"> <xsl:value-of select="$theme.icon.nav.next"/> </xsl:attribute> @@ -643,7 +642,7 @@ REMARK: Document this template <xsl:attribute name="width"> <xsl:value-of select="$theme.icon.nav.size"/> </xsl:attribute> - </img> + </html:img> </xsl:variable> @@ -658,7 +657,7 @@ REMARK: Document this template <xsl:template name="db2html.sidenav"> <xsl:param name="node" select="."/> <xsl:param name="template"/> - <div class="sidenav"> + <html:div class="sidenav"> <xsl:call-template name="db2html.autotoc"> <xsl:with-param name="node" select="/"/> <xsl:with-param name="show_info" select="$db.chunk.info_chunk"/> @@ -669,7 +668,7 @@ REMARK: Document this template <xsl:with-param name="labels" select="false()"/> <xsl:with-param name="titleabbrev" select="true()"/> </xsl:call-template> - </div> + </html:div> </xsl:template> @@ -797,12 +796,12 @@ REMARK: Describe this template <xsl:param name="prev_node" select="key('idkey', $prev_id)"/> <xsl:param name="next_node" select="key('idkey', $next_id)"/> <xsl:if test="$db2html.sidenav"> - <div class="sidebar"> + <html:div class="sidebar"> <xsl:call-template name="db2html.sidenav"> <xsl:with-param name="node" select="$node"/> <xsl:with-param name="template" select="$template"/> </xsl:call-template> - </div> + </html:div> </xsl:if> </xsl:template> diff --git a/xslt/docbook/html/db2html-ebnf.xsl b/xslt/docbook/html/db2html-ebnf.xsl index 35121684..339bd67a 100644 --- a/xslt/docbook/html/db2html-ebnf.xsl +++ b/xslt/docbook/html/db2html-ebnf.xsl @@ -17,7 +17,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="html" version="1.0"> <!--!!========================================================================== @@ -43,13 +44,13 @@ REMARK: Describe this module <!-- = productionset = --> <xsl:template match="productionset"> - <div class="productionset"> + <html:div class="productionset"> <xsl:call-template name="db2html.anchor"/> <xsl:apply-templates select="title"/> - <table class="productionset"> + <html:table class="productionset"> <xsl:apply-templates select="production | productionrecap"/> - </table> - </div> + </html:table> + </html:div> </xsl:template> <!-- = productionset/title = --> diff --git a/xslt/docbook/html/db2html-footnote.xsl b/xslt/docbook/html/db2html-footnote.xsl index d36c40ce..7ff86c72 100644 --- a/xslt/docbook/html/db2html-footnote.xsl +++ b/xslt/docbook/html/db2html-footnote.xsl @@ -17,7 +17,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="html" version="1.0"> <!--!!========================================================================== @@ -59,14 +60,14 @@ REMARK: Describe this template </xsl:otherwise> </xsl:choose> </xsl:variable> - <a name="{$anchor}"/> - <sup> - <a class="footnote" href="{$href}"> + <html:a name="{$anchor}"/> + <html:sup> + <html:a class="footnote" href="{$href}"> <xsl:call-template name="db.number"> <xsl:with-param name="node" select="$node"/> </xsl:call-template> - </a> - </sup> + </html:a> + </html:sup> </xsl:template> @@ -102,17 +103,17 @@ REMARK: Describe this template </xsl:otherwise> </xsl:choose> </xsl:variable> - <div class="footnote"> - <a name="{$anchor}"/> - <span class="footnote-number"> - <a class="footnote-ref" href="{$href}"> + <html:div class="footnote"> + <html:a name="{$anchor}"/> + <html:span class="footnote-number"> + <html:a class="footnote-ref" href="{$href}"> <xsl:call-template name="db.number"> <xsl:with-param name="node" select="$node"/> </xsl:call-template> - </a> - </span> + </html:a> + </html:span> <xsl:apply-templates select="$node/node()"/> - </div> + </html:div> </xsl:template> @@ -156,7 +157,7 @@ REMARK: Describe this template </xsl:variable> <xsl:choose> <xsl:when test="($depth = $depth_of_chunk) and not($div)"> - <div class="footnotes"> + <html:div class="footnotes"> <xsl:call-template name="db2html.footnote.note"> <xsl:with-param name="node" select="$this"/> </xsl:call-template> @@ -169,7 +170,7 @@ REMARK: Describe this template <xsl:with-param name="div" select="true()"/> </xsl:call-template> </xsl:if> - </div> + </html:div> </xsl:when> <xsl:otherwise> <xsl:if test="$depth = $depth_of_chunk"> diff --git a/xslt/docbook/html/db2html-funcsynopsis.xsl b/xslt/docbook/html/db2html-funcsynopsis.xsl index 83eae94b..cf17959b 100644 --- a/xslt/docbook/html/db2html-funcsynopsis.xsl +++ b/xslt/docbook/html/db2html-funcsynopsis.xsl @@ -18,8 +18,9 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:str="http://exslt.org/strings" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" extension-element-prefixes="str" + exclude-result-prefixes="html" version="1.0"> <!--!!========================================================================== @@ -118,13 +119,13 @@ elements. Supported values are #{'KR'} and #{'ANSI'}. </xsl:otherwise> </xsl:choose> </xsl:param> - <pre class="funcsynopsis"> + <html:pre class="funcsynopsis"> <xsl:call-template name="db2html.anchor"/> <!-- The select is needed to avoid extra whitespace --> <xsl:apply-templates select="*"> <xsl:with-param name="style" select="$style"/> </xsl:apply-templates> - </pre> + </html:pre> </xsl:template> <!-- = funcsynopsisinfo = --> diff --git a/xslt/docbook/html/db2html-info.xsl b/xslt/docbook/html/db2html-info.xsl index f4872ed4..05b540f1 100644 --- a/xslt/docbook/html/db2html-info.xsl +++ b/xslt/docbook/html/db2html-info.xsl @@ -17,7 +17,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="html" version="1.0"> <!--!!========================================================================== @@ -44,11 +45,11 @@ REMARK: Describe this template <xsl:with-param name="node" select="$node"/> </xsl:call-template> </xsl:param> - <div class="division {local-name($info)}"> + <html:div class="division {local-name($info)}"> <xsl:call-template name="db2html.anchor"> <xsl:with-param name="name" select="local-name($info)"/> </xsl:call-template> - <div class="header"> + <html:div class="header"> <xsl:call-template name="db2html.info.title"> <xsl:with-param name="node" select="$node"/> <xsl:with-param name="info" select="$info"/> @@ -57,7 +58,7 @@ REMARK: Describe this template <xsl:with-param name="node" select="$node"/> <xsl:with-param name="info" select="$info"/> </xsl:call-template> - </div> + </html:div> <xsl:call-template name="db2html.info.authors"> <xsl:with-param name="node" select="$node"/> <xsl:with-param name="info" select="$info"/> @@ -88,7 +89,7 @@ REMARK: Describe this template </xsl:call-template> <xsl:apply-templates mode="db2html.info.mode" select="$info/legalnotice"/> <xsl:apply-templates mode="db2html.info.mode" select="$info/revhistory"/> - </div> + </html:div> </xsl:template> @@ -105,16 +106,16 @@ REMARK: Describe this template <xsl:param name="info" select="'FIXME'"/> <xsl:choose> <xsl:when test="$info/title"> - <h1> + <html:h1 class="title"> <xsl:apply-templates mode="db2html.info.mode" select="$info/title/node()"/> - </h1> + </html:h1> </xsl:when> <xsl:when test="$node/title"> - <h1> + <html:h1 class="title"> <xsl:apply-templates mode="db2html.info.mode" select="$node/title/node()"/> - </h1> + </html:h1> </xsl:when> </xsl:choose> </xsl:template> @@ -133,16 +134,16 @@ REMARK: Describe this template <xsl:param name="info" select="'FIXME'"/> <xsl:choose> <xsl:when test="$info/subtitle"> - <h1> + <html:h2 class="subtitle"> <xsl:apply-templates mode="db2html.info.mode" select="$info/subtitle/node()"/> - </h1> + </html:h2> </xsl:when> <xsl:when test="$node/subtitle"> - <h1> + <html:h2 class="subtitle"> <xsl:apply-templates mode="db2html.info.mode" select="$node/subtitle/node()"/> - </h1> + </html:h2> </xsl:when> </xsl:choose> </xsl:template> @@ -163,19 +164,19 @@ REMARK: Describe this template $info/author | $info/authorgroup/author | $info/corpauthor | $info/authorgroup/corpauthor "/> <xsl:if test="$authors"> - <div class="division"> - <h2 class="title author"> + <html:div class="division"> + <html:h2 class="title author"> <xsl:call-template name="l10n.gettext"> <xsl:with-param name="msgid" select="'Author'"/> <xsl:with-param name="number" select="count($authors)"/> </xsl:call-template> - </h2> - <div class="block block-first"> - <dl> + </html:h2> + <html:div class="block block-first"> + <html:dl> <xsl:apply-templates mode="db2html.info.mode" select="$authors"/> - </dl> - </div> - </div> + </html:dl> + </html:div> + </html:div> </xsl:if> </xsl:template> @@ -194,19 +195,19 @@ REMARK: Describe this template <xsl:variable name="editors" select=" $info/editor | $info/authorgroup/editor"/> <xsl:if test="$editors"> - <div class="division"> - <h2 class="title editor"> + <html:div class="division"> + <html:h2 class="title editor"> <xsl:call-template name="l10n.gettext"> <xsl:with-param name="msgid" select="'Editor'"/> <xsl:with-param name="number" select="count($editors)"/> </xsl:call-template> - </h2> - <div class="block block-first"> - <dl> + </html:h2> + <html:div class="block block-first"> + <html:dl> <xsl:apply-templates mode="db2html.info.mode" select="$editors"/> - </dl> - </div> - </div> + </html:dl> + </html:div> + </html:div> </xsl:if> </xsl:template> @@ -225,19 +226,19 @@ REMARK: Describe this template <xsl:variable name="collabs" select=" $info/collab | $info/authorgroup/collab"/> <xsl:if test="$collabs"> - <div class="division"> - <h2 class="title collab"> + <html:div class="division"> + <html:h2 class="title collab"> <xsl:call-template name="l10n.gettext"> <xsl:with-param name="msgid" select="'Collaborator'"/> <xsl:with-param name="number" select="count($collabs)"/> </xsl:call-template> - </h2> - <div class="block block-first"> - <dl> + </html:h2> + <html:div class="block block-first"> + <html:dl> <xsl:apply-templates mode="db2html.info.mode" select="$collabs"/> - </dl> - </div> - </div> + </html:dl> + </html:div> + </html:div> </xsl:if> </xsl:template> @@ -259,19 +260,19 @@ REMARK: Describe this template $info/authorgroup/corpcredit[@role = 'translator'] | $info/authorgroup/othercredit[@role = 'translator'] "/> <xsl:if test="$translators"> - <div class="division"> - <h2 class="title translator"> + <html:div class="division"> + <html:h2 class="title translator"> <xsl:call-template name="l10n.gettext"> <xsl:with-param name="msgid" select="'Translator'"/> <xsl:with-param name="number" select="count($translators)"/> </xsl:call-template> - </h2> - <div class="block block-first"> - <dl> + </html:h2> + <html:div class="block block-first"> + <html:dl> <xsl:apply-templates mode="db2html.info.mode" select="$translators"/> - </dl> - </div> - </div> + </html:dl> + </html:div> + </html:div> </xsl:if> </xsl:template> @@ -289,19 +290,19 @@ REMARK: Describe this template <xsl:param name="info" select="'FIXME'"/> <xsl:variable name="publishers" select="$info/publisher"/> <xsl:if test="$publishers"> - <div class="division"> - <h2 class="title publisher"> + <html:div class="division"> + <html:h2 class="title publisher"> <xsl:call-template name="l10n.gettext"> <xsl:with-param name="msgid" select="'Publisher'"/> <xsl:with-param name="number" select="count($publishers)"/> </xsl:call-template> - </h2> - <div class="block block-first"> - <dl> + </html:h2> + <html:div class="block block-first"> + <html:dl> <xsl:apply-templates mode="db2html.info.mode" select="$publishers"/> - </dl> - </div> - </div> + </html:dl> + </html:div> + </html:div> </xsl:if> </xsl:template> @@ -324,19 +325,19 @@ REMARK: Describe this template $info/authorgroup/corpcredit[@role != 'translator'] | $info/authorgroup/othercredit[@role != 'translator'] "/> <xsl:if test="$othercredits"> - <div class="division"> - <h2 class="title othercredit"> + <html:div class="division"> + <html:h2 class="title othercredit"> <xsl:call-template name="l10n.gettext"> <xsl:with-param name="msgid" select="'Other Contributor'"/> <xsl:with-param name="number" select="count($othercredits)"/> </xsl:call-template> - </h2> - <div class="block block-first"> - <dl> + </html:h2> + <html:div class="block block-first"> + <html:dl> <xsl:apply-templates mode="db2html.info.mode" select="$othercredits"/> - </dl> - </div> - </div> + </html:dl> + </html:div> + </html:div> </xsl:if> </xsl:template> @@ -354,19 +355,19 @@ REMARK: Describe this template <xsl:param name="info" select="'FIXME'"/> <xsl:variable name="copyrights" select="$info/copyright"/> <xsl:if test="$copyrights"> - <div class="division"> - <h2 class="title copyright"> + <html:div class="division"> + <html:h2 class="title copyright"> <xsl:call-template name="l10n.gettext"> <xsl:with-param name="msgid" select="'Copyright'"/> <xsl:with-param name="number" select="count($copyrights)"/> </xsl:call-template> - </h2> - <div class="block block-first"> - <dl> + </html:h2> + <html:div class="block block-first"> + <html:dl> <xsl:apply-templates mode="db2html.info.mode" select="$copyrights"/> - </dl> - </div> - </div> + </html:dl> + </html:div> + </html:div> </xsl:if> </xsl:template> @@ -380,25 +381,26 @@ REMARK: Describe this mode. <!-- = affiliation % db2html.info.mode = --> <xsl:template mode="db2html.info.mode" match="affiliation"> - <dd class="affiliation"> - <i> + <html:dd class="affiliation"> + <!-- FIXME: no style tags --> + <html:i> <xsl:call-template name="l10n.gettext"> <xsl:with-param name="msgid" select="'Affiliation'"/> </xsl:call-template> <xsl:text>: </xsl:text> - </i> + </html:i> <xsl:apply-templates mode="db2html.info.mode" select="orgname"/> - </dd> + </html:dd> </xsl:template> <!-- = author % db2html.info.mode = --> <xsl:template mode="db2html.info.mode" match="author"> - <dt class="author"> + <html:dt class="author"> <xsl:variable name="node" select="(. | personname)[last()]"/> <xsl:call-template name="db.personname"> <xsl:with-param name="node" select="$node"/> </xsl:call-template> - </dt> + </html:dt> <xsl:apply-templates mode="db2html.info.mode" select="affiliation[orgname]"/> <xsl:apply-templates mode="db2html.info.mode" @@ -414,38 +416,38 @@ REMARK: Describe this mode. <!-- = authorblurb % db2html.info.mode = --> <xsl:template mode="db2html.info.mode" match="authorblurb"> - <dd class="authorblurb"> + <html:dd class="authorblurb"> <xsl:apply-templates/> - </dd> + </html:dd> </xsl:template> <!-- = collab % db2html.info.mode = --> <xsl:template mode="db2html.info.mode" match="collab"> - <dt class="collab"> + <html:dt class="collab"> <xsl:apply-templates mode="db2html.info.mode" select="collabname"/> - </dt> + </html:dt> <xsl:apply-templates mode="db2html.info.mode" select="affiliation[orgname]"/> </xsl:template> <!-- = collabname % db2html.info.mode = --> <xsl:template mode="db2html.info.mode" match="collabname"> - <span class="collabname"> + <html:span class="collabname"> <xsl:apply-templates/> - </span> + </html:span> </xsl:template> <!-- = corpauthor % db2html.info.mode = --> <xsl:template mode="db2html.info.mode" match="corpauthor"> - <dt class="corpauthor"> + <html:dt class="corpauthor"> <!-- Can occur outside db2html.info.mode, so apply those templates --> <xsl:apply-templates select="."/> - </dt> + </html:dt> </xsl:template> <!-- = corpcredit % db2html.info.mode = --> <xsl:template mode="db2html.info.mode" match="corpname"> - <dt> + <html:dt> <xsl:attribute name="class"> <xsl:choose> <xsl:when test="@role = 'translator'"> @@ -458,12 +460,12 @@ REMARK: Describe this mode. </xsl:attribute> <!-- Can occur outside db2html.info.mode, so apply those templates --> <xsl:apply-templates select="."/> - </dt> + </html:dt> </xsl:template> <!-- = copyright % db2html.info.mode = --> <xsl:template mode="db2html.info.mode" match="copyright"> - <dt class="copyright"> + <html:dt class="copyright"> <xsl:call-template name="l10n.gettext"> <xsl:with-param name="msgid" select="'Copyright'"/> </xsl:call-template> @@ -481,7 +483,7 @@ REMARK: Describe this mode. </xsl:if> <xsl:apply-templates mode="db2html.info.mode" select="."/> </xsl:for-each> - </dt> + </html:dt> </xsl:template> <!-- = editor % db2html.info.mode = --> @@ -491,12 +493,12 @@ REMARK: Describe this mode. <!-- = editor % db2html.info.mode = --> <xsl:template mode="db2html.info.mode" match="editor"> - <dt class="editor"> + <html:dt class="editor"> <xsl:variable name="node" select="(. | personname)[last()]"/> <xsl:call-template name="db.personname"> <xsl:with-param name="node" select="$node"/> </xsl:call-template> - </dt> + </html:dt> <xsl:apply-templates mode="db2html.info.mode" select="affiliation[orgname]"/> <xsl:apply-templates mode="db2html.info.mode" @@ -507,38 +509,39 @@ REMARK: Describe this mode. <!-- = email % db2html.info.mode = --> <xsl:template mode="db2html.info.mode" match="email"> - <dd class="affiliation"> - <i> + <html:dd class="affiliation"> + <!-- FIXME: no style tags --> + <html:i> <xsl:call-template name="l10n.gettext"> <xsl:with-param name="msgid" select="'Email'"/> </xsl:call-template> <xsl:text>: </xsl:text> - </i> + </html:i> <!-- Can occur outside db2html.info.mode, so apply those templates --> <xsl:apply-templates select="."/> - </dd> + </html:dd> </xsl:template> <!-- = holder % db2html.info.mode = --> <xsl:template mode="db2html.info.mode" match="holder"> - <span class="holder"> + <html:span class="holder"> <xsl:apply-templates/> - </span> + </html:span> </xsl:template> <!-- = legalnotice % db2html.info.mode = --> <xsl:template mode="db2html.info.mode" match="legalnotice"> - <div class="division legalnotice"> + <html:div class="division legalnotice"> <xsl:call-template name="db2html.anchor"/> <xsl:if test="not(title)"> - <h2 class="title legalnotice"> + <html:h2 class="title legalnotice"> <xsl:call-template name="l10n.gettext"> <xsl:with-param name="msgid" select="'Legal Notice'"/> </xsl:call-template> - </h2> + </html:h2> </xsl:if> <xsl:apply-templates/> - </div> + </html:div> </xsl:template> <!-- = orgname % db2html.info.mode = --> @@ -549,7 +552,7 @@ REMARK: Describe this mode. <!-- = othercredit % db2html.info.mode = --> <xsl:template mode="db2html.info.mode" match="othercredit"> - <dt> + <html:dt> <xsl:attribute name="class"> <xsl:choose> <xsl:when test="@role = 'translator'"> @@ -564,7 +567,7 @@ REMARK: Describe this mode. <xsl:call-template name="db.personname"> <xsl:with-param name="node" select="$node"/> </xsl:call-template> - </dt> + </html:dt> <xsl:apply-templates mode="db2html.info.mode" select="affiliation[orgname]"/> <xsl:apply-templates mode="db2html.info.mode" @@ -575,23 +578,23 @@ REMARK: Describe this mode. <!-- = personblurb % db2html.info.mode = --> <xsl:template mode="db2html.info.mode" match="personblurb"> - <dd class="personblurb"> + <html:dd class="personblurb"> <xsl:apply-templates/> - </dd> + </html:dd> </xsl:template> <!-- = publisher % db2html.info.mode = --> <xsl:template mode="db2html.info.mode" match="publisher"> - <dt class="publisher"> + <html:dt class="publisher"> <xsl:apply-templates mode="db2html.info.mode"/> - </dt> + </html:dt> </xsl:template> <!-- = publishername % db2html.info.mode = --> <xsl:template mode="db2html.info.mode" match="publishername"> - <span class="publishername"> + <html:span class="publishername"> <xsl:apply-templates/> - </span> + </html:span> </xsl:template> <!-- = revdescription % db2html.info.mode = --> @@ -601,20 +604,20 @@ REMARK: Describe this mode. <!-- = revhistory % db2html.info.mode = --> <xsl:template mode="db2html.info.mode" match="revhistory"> - <div class="division revhistory"> + <html:div class="division revhistory"> <xsl:call-template name="db2html.anchor"/> - <h2 class="title revhistory"> + <html:h2 class="title revhistory"> <xsl:call-template name="l10n.gettext"> <xsl:with-param name="msgid" select="'Revision History'"/> </xsl:call-template> - </h2> + </html:h2> <xsl:apply-templates mode="db2html.info.mode"/> - </div> + </html:div> </xsl:template> <!-- = revision % db2html.info.mode = --> <xsl:template mode="db2html.info.mode" match="revision"> - <div class="block revision"> + <html:div class="block revision"> <xsl:apply-templates mode="db2html.info.mode" select="date"/> <xsl:text>: </xsl:text> <xsl:apply-templates mode="db2html.info.mode" select="revnumber"/> @@ -653,7 +656,7 @@ REMARK: Describe this mode. </xsl:for-each> <xsl:text>)</xsl:text> </xsl:if> - </div> + </html:div> </xsl:template> <!-- = revnumber % db2html.info.mode = --> @@ -668,9 +671,9 @@ REMARK: Describe this mode. <!-- = year % db2html.info.mode = --> <xsl:template mode="db2html.info.mode" match="year"> - <span class="year"> + <html:span class="year"> <xsl:apply-templates/> - </span> + </html:span> </xsl:template> @@ -802,7 +805,7 @@ REMARK: Describe this mode. <!-- = legalnotice/title = --> <xsl:template match="legalnotice/title"> - <h2 class="title legalnotice"><xsl:apply-templates/></h2> + <html:h2 class="title legalnotice"><xsl:apply-templates/></html:h2> </xsl:template> </xsl:stylesheet> diff --git a/xslt/docbook/html/db2html-inline.xsl b/xslt/docbook/html/db2html-inline.xsl index cedad6a9..651ef4ad 100644 --- a/xslt/docbook/html/db2html-inline.xsl +++ b/xslt/docbook/html/db2html-inline.xsl @@ -17,7 +17,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="html" version="1.0"> <!--!!========================================================================== @@ -48,7 +49,7 @@ REMARK: Document this template <xsl:param name="sans" select="false()"/> <!-- FIXME: do CSS classes, rather than inline styles --> - <span class="{local-name($node)}"> + <html:span class="{local-name($node)}"> <xsl:if test="$bold or $italic or $mono or $underline or $sans"> <xsl:variable name="style"> <xsl:if test="$bold"> @@ -77,7 +78,7 @@ REMARK: Document this template <xsl:with-param name="node" select="$node"/> </xsl:call-template> <xsl:apply-templates select="$node/node()"/> - </span> + </html:span> </xsl:template> @@ -141,11 +142,11 @@ REMARK: Document this template <!-- = citation = --> <xsl:template match="citation"> - <span class="citation-punc"> + <html:span class="citation-punc"> <xsl:text>[</xsl:text> <xsl:call-template name="db2html.inline"/> <xsl:text>]</xsl:text> - </span> + </html:span> </xsl:template> <!-- = classname = --> @@ -215,10 +216,11 @@ REMARK: Document this template <!-- = email = --> <xsl:template match="email"> - <span class="email-punc"> - <tt> + <html:span class="email-punc"> + <!-- FIXME: no style tags --> + <html:tt> <xsl:text><</xsl:text> - <a> + <html:a> <xsl:attribute name="href"> <xsl:text>mailto:</xsl:text> <xsl:value-of select="string(.)"/> @@ -231,10 +233,10 @@ REMARK: Document this template </xsl:call-template> </xsl:attribute> <xsl:call-template name="db2html.inline"/> - </a> + </html:a> <xsl:text>></xsl:text> - </tt> - </span> + </html:tt> + </html:span> </xsl:template> <!-- = emphasis = --> @@ -427,14 +429,14 @@ REMARK: Document this template <xsl:otherwise>+</xsl:otherwise> </xsl:choose> </xsl:variable> - <span class="keycombo"> + <html:span class="keycombo"> <xsl:for-each select="*"> <xsl:if test="position() != 1"> <xsl:value-of select="$joinchar"/> </xsl:if> <xsl:apply-templates select="."/> </xsl:for-each> - </span> + </html:span> </xsl:template> <!-- = keysym = --> @@ -477,7 +479,7 @@ REMARK: Document this template <!-- = menuchoice = --> <xsl:template match="menuchoice"> - <span class="menuchoice"> + <html:span class="menuchoice"> <xsl:for-each select="*[local-name(.) != 'shortcut']"> <xsl:if test="position() != 1"> <xsl:text> → </xsl:text> @@ -485,13 +487,13 @@ REMARK: Document this template <xsl:apply-templates select="."/> </xsl:for-each> <xsl:if test="shortcut"> - <span class="shortcut-punc"> + <html:span class="shortcut-punc"> <xsl:text> (</xsl:text> <xsl:apply-templates select="shortcut"/> <xsl:text>)</xsl:text> - </span> + </html:span> </xsl:if> - </span> + </html:span> </xsl:template> <!-- = methodname = --> @@ -515,11 +517,11 @@ REMARK: Document this template <!-- = optional = --> <xsl:template match="optional"> - <span class="optional-punc"> + <html:span class="optional-punc"> <xsl:text>[</xsl:text> <xsl:call-template name="db2html.inline"/> <xsl:text>]</xsl:text> - </span> + </html:span> </xsl:template> <!-- = orgdiv = --> @@ -546,9 +548,9 @@ REMARK: Document this template <!-- = personname = --> <xsl:template match="personname"> - <div class="personname"> + <html:div class="personname"> <xsl:call-template name="db.personname"/> - </div> + </html:div> </xsl:template> <!-- = phone = --> @@ -573,14 +575,14 @@ REMARK: Document this template <!-- = productname = --> <xsl:template match="productname"> - <span class="productname-punc"> + <html:span class="productname-punc"> <xsl:call-template name="db2html.inline"/> <xsl:if test="@class"> <xsl:call-template name="db.dingbat"> <xsl:with-param name="dingbat" select="@class"/> </xsl:call-template> </xsl:if> - </span> + </html:span> </xsl:template> <!-- = productnumber = --> @@ -612,7 +614,7 @@ REMARK: Document this template <!-- = quote = --> <xsl:template match="quote"> - <span class="quote"> + <html:span class="quote"> <xsl:call-template name="l10n.gettext"> <xsl:with-param name="msgid" select="'quote.format'"/> <xsl:with-param name="role"> @@ -628,7 +630,7 @@ REMARK: Document this template <xsl:with-param name="node" select="."/> <xsl:with-param name="format" select="true()"/> </xsl:call-template> - </span> + </html:span> </xsl:template> <!-- = replaceable = --> @@ -655,7 +657,8 @@ REMARK: Document this template <xsl:otherwise>element</xsl:otherwise> </xsl:choose> </xsl:variable> - <tt class="sgmltag-{$class}"> + <!-- FIXME: no style tags --> + <html:tt class="sgmltag-{$class}"> <xsl:call-template name="db2html.anchor"/> <xsl:choose> <xsl:when test="$class = 'attribute'"> @@ -719,7 +722,7 @@ REMARK: Document this template <xsl:apply-templates/> </xsl:otherwise> </xsl:choose> - </tt> + </html:tt> </xsl:template> <!-- = shortcut = --> @@ -756,18 +759,18 @@ REMARK: Document this template <!-- = subscript = --> <xsl:template match="subscript"> - <sub> + <html:sub> <xsl:call-template name="db2html.anchor"/> <xsl:apply-templates/> - </sub> + </html:sub> </xsl:template> <!-- = superscript = --> <xsl:template match="superscript"> - <sup> + <html:sup> <xsl:call-template name="db2html.anchor"/> <xsl:apply-templates/> - </sup> + </html:sup> </xsl:template> <!-- = surname = --> @@ -804,12 +807,12 @@ REMARK: Document this template </xsl:otherwise> </xsl:choose> </xsl:variable> - <span class="trademark"> + <html:span class="trademark"> <xsl:apply-templates/> <xsl:call-template name="db.dingbat"> <xsl:with-param name="dingbat" select="$class"/> </xsl:call-template> - </span> + </html:span> </xsl:template> <!-- = type = --> diff --git a/xslt/docbook/html/db2html-l10n.xsl b/xslt/docbook/html/db2html-l10n.xsl index 079c63c5..88c75a97 100644 --- a/xslt/docbook/html/db2html-l10n.xsl +++ b/xslt/docbook/html/db2html-l10n.xsl @@ -18,7 +18,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:msg="http://www.gnome.org/~shaunm/gnome-doc-utils/l10n" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="msg html" version="1.0"> <!--!!========================================================================== @@ -52,7 +53,7 @@ the parameters can do. <xsl:param name="font_stretch" select="string($span/@font-stretch)"/> <xsl:param name="font_size" select="string($span/@font-size)"/> <xsl:param name="text_decoration" select="string($span/@text-decoration)"/> - <span> + <html:span> <xsl:attribute name="style"> <xsl:if test="$font_family != ''"> <xsl:value-of select="concat('font-family: ', $font_family, '; ')"/> @@ -80,7 +81,7 @@ the parameters can do. <xsl:apply-templates mode="l10n.format.mode"> <xsl:with-param name="node" select="$node"/> </xsl:apply-templates> - </span> + </html:span> </xsl:template> <!--#% l10n.format.mode ==================================================== --> @@ -119,20 +120,20 @@ the parameters can do. <xsl:template mode="l10n.format.mode" match="msg:sub"> <xsl:param name="node"/> - <sub> + <html:sub> <xsl:apply-templates mode="l10n.format.mode"> <xsl:with-param name="node" select="$node"/> </xsl:apply-templates> - </sub> + </html:sub> </xsl:template> <xsl:template mode="l10n.format.mode" match="msg:sup"> <xsl:param name="node"/> - <sup> + <html:sup> <xsl:apply-templates mode="l10n.format.mode"> <xsl:with-param name="node" select="$node"/> </xsl:apply-templates> - </sup> + </html:sup> </xsl:template> <xsl:template mode="l10n.format.mode" match="msg:small"> diff --git a/xslt/docbook/html/db2html-list.xsl b/xslt/docbook/html/db2html-list.xsl index edba81bc..e0099bc5 100644 --- a/xslt/docbook/html/db2html-list.xsl +++ b/xslt/docbook/html/db2html-list.xsl @@ -17,7 +17,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="html" version="1.0"> <!--!!========================================================================== @@ -63,11 +64,11 @@ determines the number to use for the first #{listitem} in an #{orderedlist}. <!-- = itemizedlist = --> <xsl:template match="itemizedlist"> - <div class="block list"> - <div class="itemizedlist"> + <html:div class="block list"> + <html:div class="itemizedlist"> <xsl:call-template name="db2html.anchor"/> <xsl:apply-templates select="*[name(.) != 'listitem']"/> - <ul> + <html:ul> <xsl:if test="@mark"> <xsl:attribute name="style"> <xsl:text>list-style-type: </xsl:text> @@ -84,9 +85,9 @@ determines the number to use for the first #{listitem} in an #{orderedlist}. </xsl:attribute> </xsl:if> <xsl:apply-templates select="listitem"/> - </ul> - </div> - </div> + </html:ul> + </html:div> + </html:div> </xsl:template> <!-- = itemizedlist/listitem = --> @@ -94,7 +95,7 @@ determines the number to use for the first #{listitem} in an #{orderedlist}. <xsl:variable name="first" select="not(preceding-sibling::* [not(self::blockinfo) and not(self::title) and not(self::titleabbrev)])"/> - <li> + <html:li> <xsl:if test="$first"> <xsl:attribute name="class"> <xsl:text>li-first</xsl:text> @@ -112,7 +113,7 @@ determines the number to use for the first #{listitem} in an #{orderedlist}. </xsl:if> <xsl:call-template name="db2html.anchor"/> <xsl:apply-templates/> - </li> + </html:li> </xsl:template> <!-- = member = --> @@ -132,11 +133,11 @@ determines the number to use for the first #{listitem} in an #{orderedlist}. </xsl:choose> </xsl:variable> <!-- FIXME: auto-numeration for nested lists --> - <div class="block list"> - <div class="orderedlist"> + <html:div class="block list"> + <html:div class="orderedlist"> <xsl:call-template name="db2html.anchor"/> <xsl:apply-templates select="*[name(.) != 'listitem']"/> - <ol> + <html:ol> <xsl:if test="@numeration"> <xsl:attribute name="type"> <xsl:choose> @@ -161,9 +162,9 @@ determines the number to use for the first #{listitem} in an #{orderedlist}. </xsl:if> <!-- FIXME: @inheritnum --> <xsl:apply-templates select="listitem"/> - </ol> - </div> - </div> + </html:ol> + </html:div> + </html:div> </xsl:template> <!-- = orderedlist/listitem = --> @@ -171,7 +172,7 @@ determines the number to use for the first #{listitem} in an #{orderedlist}. <xsl:variable name="first" select="not(preceding-sibling::* [not(self::blockinfo) and not(self::title) and not(self::titleabbrev)])"/> - <li> + <html:li> <xsl:if test="$first"> <xsl:attribute name="class"> <xsl:text>li-first</xsl:text> @@ -184,35 +185,35 @@ determines the number to use for the first #{listitem} in an #{orderedlist}. </xsl:if> <xsl:call-template name="db2html.anchor"/> <xsl:apply-templates/> - </li> + </html:li> </xsl:template> <!-- = procedure = --> <xsl:template match="procedure"> - <div class="block list"> - <div class="procedure"> + <html:div class="block list"> + <html:div class="procedure"> <xsl:call-template name="db2html.anchor"/> <xsl:apply-templates select="*[name(.) != 'step']"/> <xsl:choose> <xsl:when test="count(step) = 1"> - <ul> + <html:ul> <xsl:apply-templates select="step"/> - </ul> + </html:ul> </xsl:when> <xsl:otherwise> - <ol> + <html:ol> <xsl:apply-templates select="step"/> - </ol> + </html:ol> </xsl:otherwise> </xsl:choose> - </div> - </div> + </html:div> + </html:div> </xsl:template> <!-- = seg = --> <xsl:template match="seg"> <xsl:variable name="position" select="count(preceding-sibling::seg) + 1"/> - <p> + <html:p> <xsl:if test="$position = 1"> <xsl:attribute name="class"> <xsl:text>segfirst</xsl:text> @@ -220,14 +221,14 @@ determines the number to use for the first #{listitem} in an #{orderedlist}. </xsl:if> <xsl:apply-templates select="../../segtitle[position() = $position]"/> <xsl:apply-templates/> - </p> + </html:p> </xsl:template> <!-- = seglistitem = --> <xsl:template match="seglistitem"> <xsl:param name="position" select="count(preceding-sibling::seglistitem) + 1"/> - <div class="seglistitem"> - <div> + <html:div class="seglistitem"> + <html:div> <xsl:attribute name="class"> <xsl:choose> <xsl:when test="($position mod 2) = 1"> @@ -239,27 +240,28 @@ determines the number to use for the first #{listitem} in an #{orderedlist}. </xsl:choose> </xsl:attribute> <xsl:apply-templates/> - </div> - </div> + </html:div> + </html:div> </xsl:template> <!-- FIXME: Implement tabular segmentedlists --> <!-- = segmentedlist = --> <xsl:template match="segmentedlist"> - <div class="segmentedlist"> + <html:div class="segmentedlist"> <xsl:call-template name="db2html.anchor"/> <xsl:apply-templates select="title"/> <xsl:apply-templates select="seglistitem"/> - </div> + </html:div> </xsl:template> <!-- = segtitle = --> <xsl:template match="segtitle"> - <b> + <!-- FIXME: no style tags --> + <html:b> <xsl:apply-templates/> <!-- FIXME: i18n --> <xsl:text>: </xsl:text> - </b> + </html:b> </xsl:template> <!-- = simplelist = --> @@ -276,7 +278,7 @@ determines the number to use for the first #{listitem} in an #{orderedlist}. </xsl:variable> <xsl:choose> <xsl:when test="@type = 'inline'"> - <span class="simplelist"> + <html:span class="simplelist"> <xsl:call-template name="db2html.anchor"/> <xsl:for-each select="member"> <xsl:if test="position() != 1"> @@ -286,63 +288,63 @@ determines the number to use for the first #{listitem} in an #{orderedlist}. </xsl:if> <xsl:apply-templates select="."/> </xsl:for-each> - </span> + </html:span> </xsl:when> <xsl:when test="@type = 'horiz'"> - <div class="block list"> - <div class="simplelist"> + <html:div class="block list"> + <html:div class="simplelist"> <xsl:call-template name="db2html.anchor"/> - <table> + <html:table> <xsl:for-each select="member[$columns = 1 or position() mod $columns = 1]"> - <tr> - <td class="td-first"> + <html:tr> + <html:td class="td-first"> <xsl:apply-templates select="."/> - </td> + </html:td> <xsl:for-each select="following-sibling::member[ position() < $columns]"> - <td> + <html:td> <xsl:apply-templates select="."/> - </td> + </html:td> </xsl:for-each> <xsl:variable name="fcount" select="count(following-sibling::member)"/> <xsl:if test="$fcount < ($columns - 1)"> - <td colspan="{$columns - $fcount - 1}"/> + <html:td colspan="{$columns - $fcount - 1}"/> </xsl:if> - </tr> + </html:tr> </xsl:for-each> - </table> - </div> - </div> + </html:table> + </html:div> + </html:div> </xsl:when> <xsl:otherwise> - <div class="block list"> - <div class="simplelist"> + <html:div class="block list"> + <html:div class="simplelist"> <xsl:call-template name="db2html.anchor"/> <xsl:variable name="rows" select="ceiling(count(member) div $columns)"/> - <table> + <html:table> <xsl:for-each select="member[position() <= $rows]"> - <tr> - <td class="td-first"> + <html:tr> + <html:td class="td-first"> <xsl:apply-templates select="."/> - </td> + </html:td> <xsl:for-each select="following-sibling::member[ position() mod $rows = 0]"> - <td> + <html:td> <xsl:apply-templates select="."/> - </td> + </html:td> </xsl:for-each> <xsl:if test="position() = $rows"> <xsl:variable name="fcount" select="count(following-sibling::member[position() mod $rows = 0])"/> <xsl:if test="$fcount < ($columns - 1)"> - <td colspan="{$columns - $fcount - 1}"/> + <html:td colspan="{$columns - $fcount - 1}"/> </xsl:if> </xsl:if> - </tr> + </html:tr> </xsl:for-each> - </table> - </div> - </div> + </html:table> + </html:div> + </html:div> </xsl:otherwise> </xsl:choose> </xsl:template> @@ -353,23 +355,23 @@ determines the number to use for the first #{listitem} in an #{orderedlist}. <xsl:variable name="first" select="not(preceding-sibling::* [not(self::blockinfo) and not(self::title) and not(self::titleabbrev)])"/> - <li> + <html:li> <xsl:if test="$first"> <xsl:attribute name="class"> <xsl:text>li-first</xsl:text> </xsl:attribute> </xsl:if> <xsl:apply-templates/> - </li> + </html:li> </xsl:template> <!-- FIXME: Do something with @performance --> <!-- = substeps = --> <xsl:template match="substeps"> <xsl:variable name="depth" select="count(ancestor::substeps)"/> - <div class="substeps"> + <html:div class="substeps"> <xsl:call-template name="db2html.anchor"/> - <ol> + <html:ol> <xsl:attribute name="type"> <xsl:choose> <xsl:when test="$depth mod 3 = 0">a</xsl:when> @@ -378,33 +380,33 @@ determines the number to use for the first #{listitem} in an #{orderedlist}. </xsl:choose> </xsl:attribute> <xsl:apply-templates/> - </ol> - </div> + </html:ol> + </html:div> </xsl:template> <!-- = term = --> <xsl:template match="term"> - <dt class="term"> + <html:dt class="term"> <xsl:if test="../varlistentry/@id and not(preceding-sibling::term)"> <xsl:call-template name="db2html.anchor"> <xsl:with-param name="node" select=".."/> </xsl:call-template> </xsl:if> <xsl:apply-templates/> - </dt> + </html:dt> </xsl:template> <!-- = variablelist = --> <xsl:template match="variablelist"> - <div class="block list"> - <div class="variablelist"> + <html:div class="block list"> + <html:div class="variablelist"> <xsl:call-template name="db2html.anchor"/> <xsl:apply-templates select="*[name(.) != 'varlistentry']"/> - <dl> + <html:dl> <xsl:apply-templates select="varlistentry"/> - </dl> - </div> - </div> + </html:dl> + </html:div> + </html:div> </xsl:template> <!-- = varlistentry = --> @@ -415,10 +417,10 @@ determines the number to use for the first #{listitem} in an #{orderedlist}. <!-- = varlistentry/listitem = --> <xsl:template match="varlistentry/listitem"> - <dd> + <html:dd> <xsl:call-template name="db2html.anchor"/> <xsl:apply-templates/> - </dd> + </html:dd> </xsl:template> diff --git a/xslt/docbook/html/db2html-media.xsl b/xslt/docbook/html/db2html-media.xsl index 56577f73..4e725587 100644 --- a/xslt/docbook/html/db2html-media.xsl +++ b/xslt/docbook/html/db2html-media.xsl @@ -17,7 +17,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="html" version="1.0"> <!--!!========================================================================== @@ -42,7 +43,7 @@ REMARK: calls db2html.imagedata.src, how other attrs are gotten --> <xsl:template name="db2html.imagedata"> <xsl:param name="node" select="."/> - <img> + <html:img> <xsl:attribute name="src"> <xsl:call-template name="db2html.imagedata.src"> <xsl:with-param name="node" select="$node"/> @@ -78,7 +79,7 @@ REMARK: calls db2html.imagedata.src, how other attrs are gotten </xsl:if> --> <!-- FIXME: longdesc --> - </img> + </html:img> </xsl:template> @@ -158,10 +159,10 @@ as a text-only mode. <!-- = graphic = --> <xsl:template match="graphic"> - <div class="graphic"> + <html:div class="graphic"> <xsl:call-template name="db2html.anchor"/> <xsl:call-template name="db2html.imagedata"/> - </div> + </html:div> </xsl:template> <!-- = imagedata = --> @@ -176,23 +177,23 @@ as a text-only mode. <!-- = inlinegraphic = --> <xsl:template match="inlinegraphic"> - <span class="inlinegraphic"> + <html:span class="inlinegraphic"> <xsl:call-template name="db2html.anchor"/> <xsl:call-template name="db2html.imagedata"/> - </span> + </html:span> </xsl:template> <!-- = inlinemediaobject = --> <xsl:template match="inlinemediaobject"> - <span class="inlinemediaobject"> + <html:span class="inlinemediaobject"> <xsl:call-template name="db2html.anchor"/> <xsl:call-template name="db2html.mediaobject"/> - </span> + </html:span> </xsl:template> <!-- = mediaojbect = --> <xsl:template match="mediaobject"> - <div class="mediaobject"> + <html:div class="mediaobject"> <xsl:call-template name="db2html.anchor"/> <xsl:call-template name="db2html.mediaobject"/> <!-- When a figure contains only a single mediaobject, it eats the caption --> @@ -201,7 +202,7 @@ as a text-only mode. not(self::titleabbrev) and not(. = current()) ]"> <xsl:apply-templates select="caption"/> </xsl:if> - </div> + </html:div> </xsl:template> <!-- = screenshot = --> diff --git a/xslt/docbook/html/db2html-qanda.xsl b/xslt/docbook/html/db2html-qanda.xsl index 922b7a03..6af80d6f 100644 --- a/xslt/docbook/html/db2html-qanda.xsl +++ b/xslt/docbook/html/db2html-qanda.xsl @@ -17,7 +17,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="html" version="1.0"> <!--!!========================================================================== @@ -52,14 +53,14 @@ dd.answer div.label { float: left; } <!-- = answer = --> <xsl:template match="answer"> - <dd class="answer"> - <div class="label"> + <html:dd class="answer"> + <html:div class="label"> <xsl:call-template name="db.label"> <xsl:with-param name="role" select="'header'"/> </xsl:call-template> - </div> + </html:div> <xsl:apply-templates/> - </dd> + </html:dd> </xsl:template> <!-- = qandadiv = --> @@ -109,14 +110,14 @@ dd.answer div.label { float: left; } <!-- = question = --> <xsl:template match="question"> - <dt class="question"> - <div class="label"> + <html:dt class="question"> + <html:div class="label"> <xsl:call-template name="db.label"> <xsl:with-param name="role" select="'header'"/> </xsl:call-template> - </div> + </html:div> <xsl:apply-templates/> - </dt> + </html:dt> </xsl:template> </xsl:stylesheet> diff --git a/xslt/docbook/html/db2html-refentry.xsl b/xslt/docbook/html/db2html-refentry.xsl index dab6a7ca..4d1b99bf 100644 --- a/xslt/docbook/html/db2html-refentry.xsl +++ b/xslt/docbook/html/db2html-refentry.xsl @@ -17,7 +17,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="html" version="1.0"> <!--!!========================================================================== @@ -67,7 +68,7 @@ div.refentry + div.refentry { <xsl:call-template name="db.chunk.depth-of-chunk"/> </xsl:param> - <div class="refentry"> + <html:div class="refentry"> <xsl:choose> <xsl:when test="refmeta/refentrytitle"> <xsl:call-template name="db2html.title.header"> @@ -100,7 +101,7 @@ div.refentry + div.refentry { </xsl:otherwise> </xsl:choose> - <div class="refnamedivs"> + <html:div class="refnamedivs"> <xsl:call-template name="db2html.title.header"> <xsl:with-param name="node" select="refnamediv"/> <xsl:with-param name="referent" select="refnamediv"/> @@ -114,12 +115,12 @@ div.refentry + div.refentry { </xsl:with-param> </xsl:call-template> <xsl:apply-templates select="refnamediv"/> - </div> + </html:div> <xsl:apply-templates select="refsynopsisdiv | refsect1 | refsection"> <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk + 1"/> <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/> </xsl:apply-templates> - </div> + </html:div> </xsl:template> <!-- = refname = --> @@ -129,7 +130,7 @@ div.refentry + div.refentry { <!-- = refnamediv = --> <xsl:template match="refnamediv"> - <div class="refnamediv"> + <html:div class="refnamediv"> <xsl:call-template name="db2html.anchor"/> <xsl:for-each select="refname"> <xsl:if test="position() != 1"> @@ -139,7 +140,7 @@ div.refentry + div.refentry { </xsl:for-each> <xsl:text> — </xsl:text> <xsl:apply-templates select="refpurpose"/> - </div> + </html:div> </xsl:template> <!-- = refpurpose = --> @@ -223,7 +224,7 @@ div.refentry + div.refentry { <xsl:param name="depth_of_chunk"> <xsl:call-template name="db.chunk.depth-of-chunk"/> </xsl:param> - <div class="refsynopsisdiv"> + <html:div class="refsynopsisdiv"> <xsl:call-template name="db2html.anchor"/> <xsl:if test="not(title)"> <xsl:call-template name="db2html.title.header"> @@ -242,7 +243,7 @@ div.refentry + div.refentry { <xsl:apply-templates> <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk + 1"/> </xsl:apply-templates> - </div> + </html:div> </xsl:template> <!-- = refsect*/title = --> diff --git a/xslt/docbook/html/db2html-table.xsl b/xslt/docbook/html/db2html-table.xsl index e5e6809d..1bc9bf17 100644 --- a/xslt/docbook/html/db2html-table.xsl +++ b/xslt/docbook/html/db2html-table.xsl @@ -17,7 +17,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="html" version="1.0"> <!--!!========================================================================== @@ -542,14 +543,14 @@ REMARK: This template needs to be explained in detail, but I forgot how it works </xsl:apply-templates> </xsl:when> <xsl:when test="$entry.colnum > $colnum"> - <td> + <html:td> <xsl:if test="$style"> <xsl:attribute name="style"> <xsl:value-of select="$style"/> </xsl:attribute> </xsl:if> <xsl:text> </xsl:text> - </td> + </html:td> <xsl:apply-templates select="."> <xsl:with-param name="colspecs" select="$colspecs"/> <xsl:with-param name="spanspecs" select="$spanspecs"/> @@ -604,7 +605,7 @@ REMARK: This template needs to be explained in detail, but I forgot how it works </xsl:when> </xsl:choose> </xsl:variable> - <xsl:element name="{$element}" namespace="http://www.w3.org/1999/xhtml"> + <xsl:element name="{$element}" namespace="{$db2html.namespace}"> <xsl:if test="$style != ''"> <xsl:attribute name="style"> <xsl:value-of select="$style"/> @@ -651,7 +652,7 @@ REMARK: This template needs to be explained in detail, but I forgot how it works <xsl:param name="colsep" select="false()"/> <xsl:param name="rowsep" select="false()"/> <xsl:param name="spanstr"/> - <tr> + <html:tr> <xsl:if test="name(..) = 'tbody'"> <xsl:attribute name="class"> <xsl:choose> @@ -668,7 +669,7 @@ REMARK: This template needs to be explained in detail, but I forgot how it works (@rowsep = '1') or ((@rowsep != '0') and $rowsep)"/> <xsl:with-param name="spanstr" select="$spanstr"/> </xsl:apply-templates> - </tr> + </html:tr> <xsl:if test="following-sibling::row"> <xsl:apply-templates select="following-sibling::row[1]"> <xsl:with-param name="colspecs" select="$colspecs"/> @@ -688,7 +689,7 @@ REMARK: This template needs to be explained in detail, but I forgot how it works <!-- = table = --> <xsl:template match="table | informaltable"> - <div class="table block-indent"> + <html:div class="table block-indent"> <xsl:call-template name="db2html.anchor"/> <xsl:apply-templates select="title"/> <!-- FIXME: I have no idea what I'm supposed to do with textobject --> @@ -712,7 +713,7 @@ REMARK: This template needs to be explained in detail, but I forgot how it works <xsl:apply-templates select="caption"/> </xsl:otherwise> </xsl:choose> - </div> + </html:div> </xsl:template> <!-- = tgroup = --> @@ -734,7 +735,7 @@ REMARK: This template needs to be explained in detail, but I forgot how it works <xsl:text>border-left: solid 1px; border-right: outset 1px; </xsl:text> </xsl:if> </xsl:variable> - <table> + <html:table> <xsl:if test="../title"> <xsl:attribute name="summary"> <xsl:value-of select="../title"/> @@ -766,7 +767,7 @@ REMARK: This template needs to be explained in detail, but I forgot how it works <xsl:with-param name="colsep" select="@colsep = '1'"/> <xsl:with-param name="rowsep" select="@rowsep = '1'"/> </xsl:apply-templates> - </table> + </html:table> </xsl:template> <!-- = tbody | tfoot | thead = --> @@ -775,7 +776,7 @@ REMARK: This template needs to be explained in detail, but I forgot how it works <xsl:param name="spanspecs"/> <xsl:param name="colsep" select="false()"/> <xsl:param name="rowsep" select="false()"/> - <xsl:element name="{local-name(.)}" namespace="http://www.w3.org/1999/xhtml"> + <xsl:element name="{local-name(.)}" namespace="{$db2html.namespace}"> <xsl:if test="@valign"> <xsl:attribute name="valign"> <xsl:value-of select="@valign"/> diff --git a/xslt/docbook/html/db2html-title.xsl b/xslt/docbook/html/db2html-title.xsl index ae452f76..17263f2d 100644 --- a/xslt/docbook/html/db2html-title.xsl +++ b/xslt/docbook/html/db2html-title.xsl @@ -17,7 +17,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="html" version="1.0"> <!--!!========================================================================== @@ -43,21 +44,21 @@ REMARK: Talk about the different kinds of title blocks <xsl:with-param name="node" select="$referent"/> </xsl:call-template> </xsl:variable> - <div class="block block-first {local-name($node)}"> - <span class="{local-name($node)}"> + <html:div class="block block-first {local-name($node)}"> + <html:span class="{local-name($node)}"> <xsl:call-template name="db2html.anchor"> <xsl:with-param name="node" select="$node"/> </xsl:call-template> - <span class="label"> + <html:span class="label"> <xsl:call-template name="db.label"> <xsl:with-param name="node" select="$referent"/> <xsl:with-param name="role" select="'header'"/> <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/> </xsl:call-template> - </span> + </html:span> <xsl:apply-templates select="$node/node()"/> - </span> - </div> + </html:span> + </html:div> </xsl:template> diff --git a/xslt/docbook/html/db2html-xref.xsl b/xslt/docbook/html/db2html-xref.xsl index 67897af9..ee771a26 100644 --- a/xslt/docbook/html/db2html-xref.xsl +++ b/xslt/docbook/html/db2html-xref.xsl @@ -17,7 +17,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="html" version="1.0"> <!--!!========================================================================== @@ -38,7 +39,7 @@ REMARK: Describe this template <xsl:template name="db2html.anchor" match="anchor"> <xsl:param name="node" select="."/> <xsl:param name="name" select="$node/@id"/> - <xsl:if test="$name"><a name="{$name}"/></xsl:if> + <xsl:if test="$name"><html:a name="{$name}"/></xsl:if> </xsl:template> @@ -53,7 +54,7 @@ REMARK: Describe this template <xsl:template name="db2html.link" match="link"> <xsl:param name="linkend" select="@linkend"/> <xsl:param name="target" select="key('idkey', $linkend)"/> - <a class="link"> + <html:a class="link"> <xsl:attribute name="href"> <xsl:call-template name="db.xref.target"> <xsl:with-param name="linkend" select="$linkend"/> @@ -73,7 +74,7 @@ REMARK: Describe this template <xsl:apply-templates select="key('idkey', @endterm)/node()"/> </xsl:when> </xsl:choose> - </a> + </html:a> </xsl:template> @@ -88,7 +89,7 @@ REMARK: Describe this template <xsl:template name="db2html.ulink" match="ulink"> <xsl:param name="url" select="@url"/> <xsl:param name="content" select="false()"/> - <a class="ulink" href="{$url}"> + <html:a class="ulink" href="{$url}"> <xsl:attribute name="title"> <xsl:call-template name="db.ulink.tooltip"/> </xsl:attribute> @@ -103,7 +104,7 @@ REMARK: Describe this template <xsl:value-of select="$url"/> </xsl:otherwise> </xsl:choose> - </a> + </html:a> </xsl:template> @@ -124,7 +125,7 @@ REMARK: Describe this template <xsl:param name="endterm" select="@endterm"/> <xsl:param name="xrefstyle" select="@xrefstyle"/> <xsl:param name="content" select="false()"/> - <a class="xref"> + <html:a class="xref"> <xsl:attribute name="href"> <xsl:call-template name="db.xref.target"> <xsl:with-param name="linkend" select="$linkend"/> @@ -152,7 +153,7 @@ REMARK: Describe this template </xsl:call-template> </xsl:otherwise> </xsl:choose> - </a> + </html:a> </xsl:template> </xsl:stylesheet> diff --git a/xslt/docbook/html/db2html.xsl b/xslt/docbook/html/db2html.xsl index 3428f7b0..43c14fa7 100644 --- a/xslt/docbook/html/db2html.xsl +++ b/xslt/docbook/html/db2html.xsl @@ -17,17 +17,22 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns="http://www.w3.org/1999/xhtml" + xmlns:html="http://www.w3.org/1999/xhtml" version="1.0"> <xsl:import href="../../gettext/gettext.xsl"/> +<xsl:output method="html"/> +<xsl:namespace-alias stylesheet-prefix="html" result-prefix="#default"/> +<!--#@ db2html.namespace --> +<xsl:param name="db2html.namespace" select="''"/> + <!--!!========================================================================== DocBook to HTML --> <!--#@ db.chunk.extension --> -<xsl:param name="db.chunk.extension" select="'.xhtml'"/> +<xsl:param name="db.chunk.extension" select="'.html'"/> <xsl:include href="../../common/theme.xsl"/> diff --git a/xslt/docbook/html/db2xhtml.xsl b/xslt/docbook/html/db2xhtml.xsl new file mode 100644 index 00000000..a5ad1aad --- /dev/null +++ b/xslt/docbook/html/db2xhtml.xsl @@ -0,0 +1,74 @@ +<?xml version='1.0' encoding='UTF-8'?><!-- -*- indent-tabs-mode: nil -*- --> +<!-- +This program is free software; you can redistribute it and/or modify it under +the terms of the GNU Lesser General Public License as published by the Free +Software Foundation; either version 2 of the License, or (at your option) any +later version. + +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +details. + +You should have received a copy of the GNU Lesser General Public License +along with this program; see the file COPYING.LGPL. If not, write to the +Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +--> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns="http://www.w3.org/1999/xhtml" + version="1.0"> + +<xsl:import href="../../gettext/gettext.xsl"/> + +<!--#@ db2html.namespace --> +<xsl:param name="db2html.namespace" select="'http://www.w3.org/1999/xhtml'"/> + +<!--!!========================================================================== +DocBook to XHTML +--> + +<!--#@ db.chunk.extension --> +<xsl:param name="db.chunk.extension" select="'.xhtml'"/> + +<xsl:include href="../../common/theme.xsl"/> + +<xsl:include href="../common/db-chunk.xsl"/> +<xsl:include href="../common/db-common.xsl"/> +<xsl:include href="../common/db-label.xsl"/> +<xsl:include href="../common/db-title.xsl"/> +<xsl:include href="../common/db-xref.xsl"/> + +<xsl:include href="db2html-autotoc.xsl"/> +<xsl:include href="db2html-bibliography.xsl"/> +<xsl:include href="db2html-block.xsl"/> +<xsl:include href="db2html-callout.xsl"/> +<xsl:include href="db2html-classsynopsis.xsl"/> +<xsl:include href="db2html-cmdsynopsis.xsl"/> +<xsl:include href="db2html-css.xsl"/> +<xsl:include href="db2html-division.xsl"/> +<xsl:include href="db2html-ebnf.xsl"/> +<xsl:include href="db2html-funcsynopsis.xsl"/> +<xsl:include href="db2html-info.xsl"/> +<xsl:include href="db2html-inline.xsl"/> +<xsl:include href="db2html-l10n.xsl"/> +<xsl:include href="db2html-media.xsl"/> +<xsl:include href="db2html-list.xsl"/> +<xsl:include href="db2html-qanda.xsl"/> +<xsl:include href="db2html-refentry.xsl"/> +<xsl:include href="db2html-suppressed.xsl"/> +<xsl:include href="db2html-table.xsl"/> +<xsl:include href="db2html-title.xsl"/> +<xsl:include href="db2html-xref.xsl"/> +<xsl:include href="db2html-footnote.xsl"/> + +<xsl:template match="*"> + <xsl:message> + <xsl:text>Unmatched element: </xsl:text> + <xsl:value-of select="local-name(.)"/> + </xsl:message> + <xsl:apply-templates select="node()"/> +</xsl:template> + +</xsl:stylesheet> |