Fixed handling of template/titlepage.xsl namespace fixup.

diff --git a/releasetools/xslnons-build b/releasetools/xslnons-build
index 7ebafa2db271f04c60fdef2d5928198f3095ecd2..6a19f3412364ba94a64afea7bbc29db41619f6ef 100755 (executable)
--- a/releasetools/xslnons-build
+++ b/releasetools/xslnons-build
@@ -58,7 +58,6 @@ my @PassthruDirs = (
 'tools',
 'build',
 'slides',
-'template',
 'website',
 'wordml',
 );
@@ -272,6 +271,8 @@ sub nsfilter {
   # change namespace test from != to = 
   s|(namespace-uri\(/\*\)\s*)!=(\s*['"]http://docbook.org/ns/docbook['"])|$1=$2|sg;
 
+  # Set the db.prefix for template/titlepage.xsl
+  s|(<xsl:variable name="db.prefix">)d:(</xsl:variable>)|$1$2|sg;
   
   # remove d: prefix to literal tocentry in maketoc.xsl
   if ($infile =~ /maketoc/) {
@@ -459,7 +460,7 @@ sub namespacefilter {
     $newstring .= $pre;
 
     # pass through XSL key words and mixed case names and olink elements
-    if ( $name =~ /(^mod$|^div$|^and$|^or$|^ttl$|^xreftext$|^dir$|^sitemap$|^obj$|^document$|^.*[A-Z].*$)/ ) {
+    if ( $name =~ /(^mod$|^div$|^and$|^or$|^ttl$|^xreftext$|^dir$|^sitemap$|^obj$|^document$|^exsl$|^.*[A-Z].*$)/ ) {
 
       # pass this name through
       $newstring .= $name;

diff --git a/releasetools/xslns-build b/releasetools/xslns-build
index 3d371b5157942db1778b5bba377b5e393eb260c1..f5e3b28abfc919584b3f50b0261a1fc608296f3a 100755 (executable)
--- a/releasetools/xslns-build
+++ b/releasetools/xslns-build
@@ -58,7 +58,6 @@ my @PassthruDirs = (
 'tools',
 'build',
 'slides',
-'template',
 'website',
 'wordml',
 );
@@ -273,6 +272,9 @@ sub nsfilter {
   # change namespace test from = to != 
   s|(namespace-uri\(/\*\)\s*)=(\s*['"]http://docbook.org/ns/docbook['"])|$1!=$2|sg;
 
+  # Set the db.prefix for template/titlepage.xsl
+  s|(<xsl:variable name="db.prefix">)(</xsl:variable>)|$1d:$2|sg;
+
    
   # Add d: prefix to literal tocentry in maketoc.xsl
   if ($infile =~ /maketoc/) {
@@ -440,7 +442,7 @@ sub namespacefilter {
     $newstring .= $pre;
 
     # pass through XSL key words and mixed case names and olink elements
-    if ( $name =~ /(^mod$|^div$|^and$|^or$|^ttl$|^xreftext$|^dir$|^sitemap$|^obj$|^document$|^.*[A-Z].*$)/ ) {
+    if ( $name =~ /(^mod$|^div$|^and$|^or$|^ttl$|^xreftext$|^dir$|^sitemap$|^obj$|^document$|^exsl$|^.*[A-Z].*$)/ ) {
 
       # pass this name through
       $newstring .= $name;