From 2c878f60e29f5fa8cb44dc000461aaf10d701ed8 Mon Sep 17 00:00:00 2001
From: Jirka Kosek <jirka@kosek.cz>
Date: Tue, 4 Oct 2011 21:36:11 +0000
Subject: [PATCH] Titlepage mechanism is now namespace aware to support XHTML.
Please note that when generating titlepage template stylesheets you have to
pass FO or XHTML namespace inside ns parameter. For HTML parameter should be
empty.
---
xsl/Makefile.incl | 5 +++++
xsl/epub3/Makefile | 6 ++++++
xsl/fo/Makefile | 1 +
xsl/template/titlepage.xsl | 13 ++++++++-----
xsl/xhtml/Makefile | 2 ++
5 files changed, 22 insertions(+), 5 deletions(-)
create mode 100644 xsl/epub3/Makefile
diff --git a/xsl/Makefile.incl b/xsl/Makefile.incl
index cab7e19ae..83c89be91 100644
--- a/xsl/Makefile.incl
+++ b/xsl/Makefile.incl
@@ -77,7 +77,12 @@ endif
titlepage.templates.xsl: titlepage.templates.xml $(NESTLEVEL)../template/titlepage.xsl
+ifdef TARGETNS
+ $(XSLT) $< $(NESTLEVEL)../template/titlepage.xsl $@ ns=$(TARGETNS)
+else
$(XSLT) $< $(NESTLEVEL)../template/titlepage.xsl $@
+endif
+
Makefile.param:
ifneq ($(shell uname -s | grep -i cygwin),)
diff --git a/xsl/epub3/Makefile b/xsl/epub3/Makefile
new file mode 100644
index 000000000..0c1913295
--- /dev/null
+++ b/xsl/epub3/Makefile
@@ -0,0 +1,6 @@
+include $(DOCBOOK_SVN)/buildtools/Makefile.incl
+
+TARGETNS=http://www.w3.org/1999/xhtml
+
+titlepage.templates.xsl: titlepage.templates.xml $(NESTLEVEL)../template/titlepage.xsl
+ $(XSLT) $< $(NESTLEVEL)../template/titlepage.xsl $@ ns=$(TARGETNS)
diff --git a/xsl/fo/Makefile b/xsl/fo/Makefile
index a72a1b1ac..90e933307 100644
--- a/xsl/fo/Makefile
+++ b/xsl/fo/Makefile
@@ -4,5 +4,6 @@ PARAMBASE=param
XSLFILES=param.xsl profile-docbook.xsl
ALLTARGETS=$(XSLFILES) titlepage.templates.xsl
PROFILECONDITION=fo
+TARGETNS=http://www.w3.org/1999/XSL/Format
include ../Makefile.incl
diff --git a/xsl/template/titlepage.xsl b/xsl/template/titlepage.xsl
index 45a7a44d0..99a44a17c 100644
--- a/xsl/template/titlepage.xsl
+++ b/xsl/template/titlepage.xsl
@@ -20,6 +20,9 @@
<!-- ==================================================================== -->
+<!-- Namespace for wrapper elements. Please set it for XHTML. -->
+<xsl:param name="ns"/>
+
<xsl:template match="/">
<xsl:text>
</xsl:text>
<xsl:apply-templates/>
@@ -178,7 +181,7 @@ and <quote>verso</quote> sides of the title page.</para>
<xsl:text>.titlepage</xsl:text>
</xsl:attribute>
<xsl:text>
 </xsl:text>
- <xsl:element name="{@t:wrapper}">
+ <xsl:element name="{@t:wrapper}" namespace="{$ns}">
<xsl:apply-templates select="@*" mode="copy.literal.atts"/>
<xsl:text>
 </xsl:text>
<xsl:element name="xsl:variable">
@@ -232,7 +235,7 @@ and <quote>verso</quote> sides of the title page.</para>
<xsl:element name="xsl:if">
<xsl:attribute name="test">(normalize-space($recto.content) != '') or ($recto.elements.count > 0)</xsl:attribute>
<xsl:text>
 </xsl:text>
- <xsl:element name="{@t:wrapper}">
+ <xsl:element name="{@t:wrapper}" namespace="{$ns}">
<xsl:apply-templates select="t:titlepage-content[@t:side='recto']/@*"
mode="copy.literal.atts"/>
<xsl:element name="xsl:copy-of">
@@ -293,7 +296,7 @@ and <quote>verso</quote> sides of the title page.</para>
<xsl:element name="xsl:if">
<xsl:attribute name="test">(normalize-space($verso.content) != '') or ($verso.elements.count > 0)</xsl:attribute>
<xsl:text>
 </xsl:text>
- <xsl:element name="{@t:wrapper}">
+ <xsl:element name="{@t:wrapper}" namespace="{$ns}">
<xsl:apply-templates select="t:titlepage-content[@t:side='verso']/@*"
mode="copy.literal.atts"/>
<xsl:element name="xsl:copy-of">
@@ -382,7 +385,7 @@ and <quote>verso</quote> sides of the title page.</para>
<xsl:text>.auto.mode</xsl:text>
</xsl:attribute>
<xsl:text>
</xsl:text>
- <xsl:element name="{../../@t:wrapper}">
+ <xsl:element name="{../../@t:wrapper}" namespace="{$ns}">
<xsl:attribute name="xsl:use-attribute-sets">
<xsl:value-of select="../../@t:element"/>
<xsl:text>.titlepage.</xsl:text>
@@ -884,7 +887,7 @@ names.</para>
<xsl:when test="@t:force and @t:force != '0'">
<xsl:choose>
<xsl:when test="@t:named-template">
- <xsl:element name="{../../@t:wrapper}">
+ <xsl:element name="{../../@t:wrapper}" namespace="{$ns}">
<xsl:attribute name="xsl:use-attribute-sets">
<xsl:value-of select="../../@t:element"/>
<xsl:text>.titlepage.</xsl:text>
diff --git a/xsl/xhtml/Makefile b/xsl/xhtml/Makefile
index 4bf5f1b2e..98cff4e3e 100644
--- a/xsl/xhtml/Makefile
+++ b/xsl/xhtml/Makefile
@@ -1,5 +1,7 @@
include $(DOCBOOK_SVN)/buildtools/Makefile.incl
+TARGETNS=http://www.w3.org/1999/xhtml
+
all: xsl-files profile-docbook.xsl profile-chunk.xsl profile-onechunk.xsl
remove-old:
--
2.40.0