Imported Upstream version 1.79.0upstream/1.79.0

133 files changed, 86 insertions, 77 deletions

diff --git a/slides/common/common.xsl b/slides/common/common.xsl
index 2d4f9e9..1dc6b2d 100644
--- a/slides/common/common.xsl
+++ b/slides/common/common.xsl
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="ASCII"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		xmlns:db="http://docbook.org/ns/docbook"
+		xmlns:d="http://docbook.org/ns/docbook"
 		xmlns:dbs="http://docbook.org/ns/docbook-slides"
-		exclude-result-prefixes="dbs db"
+		exclude-result-prefixes="dbs d"
                 version="1.0">
 
 <xsl:template name="get.title">
   <xsl:param name="ctx" select="."/>
 
-  <xsl:value-of select="($ctx/db:info/db:titleabbrev|$ctx/db:titleabbrev|$ctx/db:info/db:title|$ctx/db:title)[1]"/>
+  <xsl:value-of select="($ctx/d:info/d:titleabbrev|$ctx/d:titleabbrev|$ctx/d:info/d:title|$ctx/d:title)[1]"/>
 </xsl:template>
 
 <xsl:template name="get.subtitle">
   <xsl:param name="ctx" select="."/>
 
-  <xsl:value-of select="($ctx/db:info/db:subtitle|$ctx/db:subtitle)[1]"/>
+  <xsl:value-of select="($ctx/d:info/d:subtitle|$ctx/d:subtitle)[1]"/>
 </xsl:template>
 </xsl:stylesheet>
diff --git a/slides/fo/plain-titlepage.xml b/slides/fo/plain-titlepage.xml
index d817f13..ed66128 100644
--- a/slides/fo/plain-titlepage.xml
+++ b/slides/fo/plain-titlepage.xml
@@ -14,8 +14,10 @@
 ]>
 <t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
              xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
+             xmlns:dbs="http://docbook.org/ns/docbook-slides"
              xmlns:fo="http://www.w3.org/1999/XSL/Format"
-             xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+             xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+             t:copy-namespaces="dbs fo">
 
 <!-- ==================================================================== -->
 
diff --git a/slides/fo/plain-titlepage.xsl b/slides/fo/plain-titlepage.xsl
index f79cf81..90cd442 100644
--- a/slides/fo/plain-titlepage.xsl
+++ b/slides/fo/plain-titlepage.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" version="1.0" exclude-result-prefixes="exsl">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:dbs="http://docbook.org/ns/docbook-slides" version="1.0" exclude-result-prefixes="exsl">
 
 <!-- This stylesheet was created by template/titlepage.xsl-->
 
@@ -62,7 +62,7 @@
 </xsl:template>
 
 <xsl:template name="slides.titlepage">
-  <block>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="slides.titlepage.before.recto"/>
       <xsl:call-template name="slides.titlepage.recto"/>
@@ -76,7 +76,7 @@
       </xsl:choose>
     </xsl:variable>
     <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <block><xsl:copy-of select="$recto.content"/></block>
+      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
     </xsl:if>
     <xsl:variable name="verso.content">
       <xsl:call-template name="slides.titlepage.before.verso"/>
@@ -91,10 +91,10 @@
       </xsl:choose>
     </xsl:variable>
     <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <block><xsl:copy-of select="$verso.content"/></block>
+      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
     </xsl:if>
     <xsl:call-template name="slides.titlepage.separator"/>
-  </block>
+  </fo:block>
 </xsl:template>
 
 <xsl:template match="*" mode="slides.titlepage.recto.mode">
@@ -110,40 +110,40 @@
 </xsl:template>
 
 <xsl:template match="title" mode="slides.titlepage.recto.auto.mode">
-<block xsl:use-attribute-sets="slides.titlepage.title.properties">
+<fo:block xsl:use-attribute-sets="slides.titlepage.title.properties">
 <xsl:call-template name="presentation.title">
 </xsl:call-template>
-</block>
+</fo:block>
 </xsl:template>
 
 <xsl:template match="subtitle" mode="slides.titlepage.recto.auto.mode">
-<block xsl:use-attribute-sets="slides.titlepage.subtitle.properties">
+<fo:block xsl:use-attribute-sets="slides.titlepage.subtitle.properties">
 <xsl:apply-templates select="." mode="slides.titlepage.recto.mode"/>
-</block>
+</fo:block>
 </xsl:template>
 
 <xsl:template match="corpauthor" mode="slides.titlepage.recto.auto.mode">
-<block xsl:use-attribute-sets="slides.titlepage.corpauthor.properties">
+<fo:block xsl:use-attribute-sets="slides.titlepage.corpauthor.properties">
 <xsl:apply-templates select="." mode="slides.titlepage.recto.mode"/>
-</block>
+</fo:block>
 </xsl:template>
 
 <xsl:template match="authorgroup" mode="slides.titlepage.recto.auto.mode">
-<block xsl:use-attribute-sets="slides.titlepage.authorgroup.properties">
+<fo:block xsl:use-attribute-sets="slides.titlepage.authorgroup.properties">
 <xsl:apply-templates select="." mode="slides.titlepage.recto.mode"/>
-</block>
+</fo:block>
 </xsl:template>
 
 <xsl:template match="author" mode="slides.titlepage.recto.auto.mode">
-<block xsl:use-attribute-sets="slides.titlepage.author.properties">
+<fo:block xsl:use-attribute-sets="slides.titlepage.author.properties">
 <xsl:apply-templates select="." mode="slides.titlepage.recto.mode"/>
-</block>
+</fo:block>
 </xsl:template>
 
 <xsl:template match="pubdate" mode="slides.titlepage.recto.auto.mode">
-<block xsl:use-attribute-sets="slides.titlepage.pubdate.properties">
+<fo:block xsl:use-attribute-sets="slides.titlepage.pubdate.properties">
 <xsl:apply-templates select="." mode="slides.titlepage.recto.mode"/>
-</block>
+</fo:block>
 </xsl:template>
 
 </xsl:stylesheet>
diff --git a/slides/fo/plain.xsl b/slides/fo/plain.xsl
index 40217ea..d4a5863 100644
--- a/slides/fo/plain.xsl
+++ b/slides/fo/plain.xsl
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
-		xmlns:db="http://docbook.org/ns/docbook"
+		xmlns:d="http://docbook.org/ns/docbook"
 		xmlns:dbs="http://docbook.org/ns/docbook-slides"
 		xmlns:exsl="http://exslt.org/common"
-		exclude-result-prefixes="dbs db"
+		exclude-result-prefixes="dbs d"
 		extension-element-prefixes="exsl"
                 version="1.0">
 
@@ -109,7 +109,7 @@
 
 <xsl:template name="bibliography.titlepage"/>
 
-<!-- Do not add db namespace to dbs elements -->
+<!-- Do not add d namespace to dbs elements -->
 <xsl:template match="*[namespace-uri() = 'http://docbook.org/ns/docbook-slides']" mode="addNS">
   <xsl:copy-of select="."/>
 </xsl:template>
@@ -179,17 +179,17 @@
   </fo:bookmark>
 </xsl:template>
 
-<xsl:template match="db:author" mode="titlepage.mode">
+<xsl:template match="d:author" mode="titlepage.mode">
   <fo:block>
-    <xsl:apply-templates select="db:personname" mode="titlepage.mode"/>
+    <xsl:apply-templates select="d:personname" mode="titlepage.mode"/>
   </fo:block>
 
   <fo:block>
-    <xsl:apply-templates select="db:affiliation" mode="titlepage.mode"/>
+    <xsl:apply-templates select="d:affiliation" mode="titlepage.mode"/>
   </fo:block>
 
   <fo:block>
-    <xsl:apply-templates select="db:email" mode="titlepage.mode"/>
+    <xsl:apply-templates select="d:email" mode="titlepage.mode"/>
   </fo:block>
 </xsl:template>
 
@@ -280,7 +280,7 @@
       <fo:block xsl:use-attribute-sets="foil.properties">
 	<xsl:choose>
 	  <xsl:when test="$mode = 'normal'">
-	    <xsl:apply-templates select="*[not(self::dbs:foil)][not(self::db:info)][not(self::db:title)][not(self::db:titleabbrev)][not(self::db:subtitle)][not(self::dbs:speakernotes)][not(self::dbs:handoutnotes)]"/>
+	    <xsl:apply-templates select="*[not(self::dbs:foil)][not(self::d:info)][not(self::d:title)][not(self::d:titleabbrev)][not(self::d:subtitle)][not(self::dbs:speakernotes)][not(self::dbs:handoutnotes)]"/>
 
 	    <xsl:if test="self::dbs:foilgroup and ($generate.foilgroup.toc != 0)">
 	      <xsl:call-template name="foilgroup.generate.toc"/>
@@ -385,7 +385,7 @@
 </xsl:template>
 
 <xsl:template name="footer.center">
-  <xsl:if test="($generate.copyright != 0) and /dbs:slides/db:info/db:copyright">
+  <xsl:if test="($generate.copyright != 0) and /dbs:slides/d:info/d:copyright">
     <fo:block>
       <xsl:call-template name="gentext">
 	<xsl:with-param name="key" select="'Copyright'"/>
@@ -393,13 +393,13 @@
       <xsl:call-template name="gentext.space"/>
       <xsl:text>&#xa9;</xsl:text>
       <xsl:call-template name="gentext.space"/>
-      <xsl:value-of select="/dbs:slides/db:info/db:copyright/db:year"/>
+      <xsl:value-of select="/dbs:slides/d:info/d:copyright/d:year"/>
       <xsl:call-template name="gentext.space"/>
-      <xsl:value-of select="/dbs:slides/db:info/db:copyright/db:holder"/>
+      <xsl:value-of select="/dbs:slides/d:info/d:copyright/d:holder"/>
     </fo:block>
   </xsl:if>
 
-  <xsl:if test="($generate.pubdate != 0) and /dbs:slides/db:info/db:pubdate">
+  <xsl:if test="($generate.pubdate != 0) and /dbs:slides/d:info/d:pubdate">
     <xsl:call-template name="slide.pubdate"/>
   </xsl:if>
 </xsl:template>
@@ -429,7 +429,7 @@
       <xsl:with-param name="key" select="'Published'"/>
     </xsl:call-template>
     <xsl:text>: </xsl:text>
-    <xsl:value-of select="/dbs:slides/db:info/db:pubdate"/>
+    <xsl:value-of select="/dbs:slides/d:info/d:pubdate"/>
   </fo:block>
 </xsl:template>
 
diff --git a/slides/images/callouts/1.png b/slides/images/callouts/1.png
index 3d02a32..864d45d 100644
--- a/slides/images/callouts/1.png
+++ b/slides/images/callouts/1.png
diff --git a/slides/images/callouts/10.png b/slides/images/callouts/10.png
index a0bd8b6..a65f060 100644
--- a/slides/images/callouts/10.png
+++ b/slides/images/callouts/10.png
diff --git a/slides/images/callouts/11.png b/slides/images/callouts/11.png
index c08a9ee..d7d31a4 100644
--- a/slides/images/callouts/11.png
+++ b/slides/images/callouts/11.png
diff --git a/slides/images/callouts/12.png b/slides/images/callouts/12.png
index 6603447..676c9e3 100644
--- a/slides/images/callouts/12.png
+++ b/slides/images/callouts/12.png
diff --git a/slides/images/callouts/13.png b/slides/images/callouts/13.png
index d6db3b0..8c6a0f2 100644
--- a/slides/images/callouts/13.png
+++ b/slides/images/callouts/13.png
diff --git a/slides/images/callouts/14.png b/slides/images/callouts/14.png
index 5d6c899..cf5220b 100644
--- a/slides/images/callouts/14.png
+++ b/slides/images/callouts/14.png
diff --git a/slides/images/callouts/15.png b/slides/images/callouts/15.png
index ef8b5f5..a8046eb 100644
--- a/slides/images/callouts/15.png
+++ b/slides/images/callouts/15.png
diff --git a/slides/images/callouts/16.png b/slides/images/callouts/16.png
index 6a63d66..2fc0812 100644
--- a/slides/images/callouts/16.png
+++ b/slides/images/callouts/16.png
diff --git a/slides/images/callouts/17.png b/slides/images/callouts/17.png
index 1efe639..6bbef28 100644
--- a/slides/images/callouts/17.png
+++ b/slides/images/callouts/17.png
diff --git a/slides/images/callouts/18.png b/slides/images/callouts/18.png
index 486ccbf..711da9f 100644
--- a/slides/images/callouts/18.png
+++ b/slides/images/callouts/18.png
diff --git a/slides/images/callouts/19.png b/slides/images/callouts/19.png
index d8bca82..5496deb 100644
--- a/slides/images/callouts/19.png
+++ b/slides/images/callouts/19.png
diff --git a/slides/images/callouts/2.png b/slides/images/callouts/2.png
index 1a77a86..8f27c7d 100644
--- a/slides/images/callouts/2.png
+++ b/slides/images/callouts/2.png
diff --git a/slides/images/callouts/20.png b/slides/images/callouts/20.png
index 6d53768..3d6e187 100644
--- a/slides/images/callouts/20.png
+++ b/slides/images/callouts/20.png
diff --git a/slides/images/callouts/21.png b/slides/images/callouts/21.png
index 2384215..5b3beaa 100644
--- a/slides/images/callouts/21.png
+++ b/slides/images/callouts/21.png
diff --git a/slides/images/callouts/22.png b/slides/images/callouts/22.png
index 717ae94..1f16c3b 100644
--- a/slides/images/callouts/22.png
+++ b/slides/images/callouts/22.png
diff --git a/slides/images/callouts/23.png b/slides/images/callouts/23.png
index 8edfe8a..3b39cf1 100644
--- a/slides/images/callouts/23.png
+++ b/slides/images/callouts/23.png
diff --git a/slides/images/callouts/24.png b/slides/images/callouts/24.png
index 93f7d8a..20bede2 100644
--- a/slides/images/callouts/24.png
+++ b/slides/images/callouts/24.png
diff --git a/slides/images/callouts/25.png b/slides/images/callouts/25.png
index 724ccfe..a41e1d5 100644
--- a/slides/images/callouts/25.png
+++ b/slides/images/callouts/25.png
diff --git a/slides/images/callouts/26.png b/slides/images/callouts/26.png
index 9190642..00c3c3b 100644
--- a/slides/images/callouts/26.png
+++ b/slides/images/callouts/26.png
diff --git a/slides/images/callouts/27.png b/slides/images/callouts/27.png
index 4103d55..dbef97a 100644
--- a/slides/images/callouts/27.png
+++ b/slides/images/callouts/27.png
diff --git a/slides/images/callouts/28.png b/slides/images/callouts/28.png
index 7f09200..40f2837 100644
--- a/slides/images/callouts/28.png
+++ b/slides/images/callouts/28.png
diff --git a/slides/images/callouts/29.png b/slides/images/callouts/29.png
index 8e6646f..842498e 100644
--- a/slides/images/callouts/29.png
+++ b/slides/images/callouts/29.png
diff --git a/slides/images/callouts/3.png b/slides/images/callouts/3.png
index 7728b4d..957fdb8 100644
--- a/slides/images/callouts/3.png
+++ b/slides/images/callouts/3.png
diff --git a/slides/images/callouts/30.png b/slides/images/callouts/30.png
index 460c1c3..864a90a 100644
--- a/slides/images/callouts/30.png
+++ b/slides/images/callouts/30.png
diff --git a/slides/images/callouts/4.png b/slides/images/callouts/4.png
index d4702fd..b56cfdb 100644
--- a/slides/images/callouts/4.png
+++ b/slides/images/callouts/4.png
diff --git a/slides/images/callouts/5.png b/slides/images/callouts/5.png
index f44526c..6b02b2c 100644
--- a/slides/images/callouts/5.png
+++ b/slides/images/callouts/5.png
diff --git a/slides/images/callouts/6.png b/slides/images/callouts/6.png
index 4105338..9fe8661 100644
--- a/slides/images/callouts/6.png
+++ b/slides/images/callouts/6.png
diff --git a/slides/images/callouts/7.png b/slides/images/callouts/7.png
index d56a240..9c7e685 100644
--- a/slides/images/callouts/7.png
+++ b/slides/images/callouts/7.png
diff --git a/slides/images/callouts/8.png b/slides/images/callouts/8.png
index 6715b4a..7714d26 100644
--- a/slides/images/callouts/8.png
+++ b/slides/images/callouts/8.png
diff --git a/slides/images/callouts/9.png b/slides/images/callouts/9.png
index 59c7fa6..81b29ea 100644
--- a/slides/images/callouts/9.png
+++ b/slides/images/callouts/9.png
diff --git a/slides/images/face1.gif b/slides/images/face1.gif
index 04e50cd..04e50cd 100755..100644
--- a/slides/images/face1.gif
+++ b/slides/images/face1.gif
diff --git a/slides/images/face2.gif b/slides/images/face2.gif
index 12d8240..12d8240 100755..100644
--- a/slides/images/face2.gif
+++ b/slides/images/face2.gif
diff --git a/slides/images/face3.gif b/slides/images/face3.gif
index ac6e5e4..ac6e5e4 100755..100644
--- a/slides/images/face3.gif
+++ b/slides/images/face3.gif
diff --git a/slides/images/face4.gif b/slides/images/face4.gif
index 3f68740..3f68740 100755..100644
--- a/slides/images/face4.gif
+++ b/slides/images/face4.gif
diff --git a/slides/s5/index-osf.html b/slides/s5/index-osf.html
index abe5e85..abe5e85 100755..100644
--- a/slides/s5/index-osf.html
+++ b/slides/s5/index-osf.html
diff --git a/slides/s5/index-xoxo.html b/slides/s5/index-xoxo.html
index 4ca9fbc..4ca9fbc 100755..100644
--- a/slides/s5/index-xoxo.html
+++ b/slides/s5/index-xoxo.html
diff --git a/slides/s5/pix/S501.jpg b/slides/s5/pix/S501.jpg
index 102f955..102f955 100755..100644
--- a/slides/s5/pix/S501.jpg
+++ b/slides/s5/pix/S501.jpg
diff --git a/slides/s5/pix/S502.jpg b/slides/s5/pix/S502.jpg
index 1ae9f5d..1ae9f5d 100755..100644
--- a/slides/s5/pix/S502.jpg
+++ b/slides/s5/pix/S502.jpg
diff --git a/slides/s5/pix/S503.jpg b/slides/s5/pix/S503.jpg
index 6daddb3..6daddb3 100755..100644
--- a/slides/s5/pix/S503.jpg
+++ b/slides/s5/pix/S503.jpg
diff --git a/slides/s5/pix/S504.jpg b/slides/s5/pix/S504.jpg
index 782f620..782f620 100755..100644
--- a/slides/s5/pix/S504.jpg
+++ b/slides/s5/pix/S504.jpg
diff --git a/slides/s5/pix/mememe01.png b/slides/s5/pix/mememe01.png
index 8c0730f..8c0730f 100755..100644
--- a/slides/s5/pix/mememe01.png
+++ b/slides/s5/pix/mememe01.png
diff --git a/slides/s5/pix/mememe02.png b/slides/s5/pix/mememe02.png
index 90ff451..90ff451 100755..100644
--- a/slides/s5/pix/mememe02.png
+++ b/slides/s5/pix/mememe02.png
diff --git a/slides/s5/pix/mememe03.png b/slides/s5/pix/mememe03.png
index 2256b06..2256b06 100755..100644
--- a/slides/s5/pix/mememe03.png
+++ b/slides/s5/pix/mememe03.png
diff --git a/slides/s5/pix/mememe04.png b/slides/s5/pix/mememe04.png
index 5b079cc..5b079cc 100755..100644
--- a/slides/s5/pix/mememe04.png
+++ b/slides/s5/pix/mememe04.png
diff --git a/slides/s5/pix/mememe05.png b/slides/s5/pix/mememe05.png
index f32b699..f32b699 100755..100644
--- a/slides/s5/pix/mememe05.png
+++ b/slides/s5/pix/mememe05.png
diff --git a/slides/s5/pix/s5filemap.png b/slides/s5/pix/s5filemap.png
index 5d9201f..5d9201f 100755..100644
--- a/slides/s5/pix/s5filemap.png
+++ b/slides/s5/pix/s5filemap.png
diff --git a/slides/s5/ui/bg-shade.png b/slides/s5/ui/bg-shade.png
index 172c914..172c914 100755..100644
--- a/slides/s5/ui/bg-shade.png
+++ b/slides/s5/ui/bg-shade.png
diff --git a/slides/s5/ui/default/blank.gif b/slides/s5/ui/default/blank.gif
index 75b945d..75b945d 100755..100644
--- a/slides/s5/ui/default/blank.gif
+++ b/slides/s5/ui/default/blank.gif
diff --git a/slides/s5/ui/default/bodybg.gif b/slides/s5/ui/default/bodybg.gif
index 5f448a1..5f448a1 100755..100644
--- a/slides/s5/ui/default/bodybg.gif
+++ b/slides/s5/ui/default/bodybg.gif
diff --git a/slides/s5/ui/default/framing.css b/slides/s5/ui/default/framing.css
index 2a27daf..2a27daf 100755..100644
--- a/slides/s5/ui/default/framing.css
+++ b/slides/s5/ui/default/framing.css
diff --git a/slides/s5/ui/default/iepngfix.htc b/slides/s5/ui/default/iepngfix.htc
index bba2db7..bba2db7 100755..100644
--- a/slides/s5/ui/default/iepngfix.htc
+++ b/slides/s5/ui/default/iepngfix.htc
diff --git a/slides/s5/ui/default/notes.css b/slides/s5/ui/default/notes.css
index 5858cf2..5858cf2 100755..100644
--- a/slides/s5/ui/default/notes.css
+++ b/slides/s5/ui/default/notes.css
diff --git a/slides/s5/ui/default/opera.css b/slides/s5/ui/default/opera.css
index 9e9d2a3..9e9d2a3 100755..100644
--- a/slides/s5/ui/default/opera.css
+++ b/slides/s5/ui/default/opera.css
diff --git a/slides/s5/ui/default/outline.css b/slides/s5/ui/default/outline.css
index 62db519..62db519 100755..100644
--- a/slides/s5/ui/default/outline.css
+++ b/slides/s5/ui/default/outline.css
diff --git a/slides/s5/ui/default/pretty.css b/slides/s5/ui/default/pretty.css
index 838a7cf..838a7cf 100755..100644
--- a/slides/s5/ui/default/pretty.css
+++ b/slides/s5/ui/default/pretty.css
diff --git a/slides/s5/ui/default/print.css b/slides/s5/ui/default/print.css
index 4a3554d..4a3554d 100755..100644
--- a/slides/s5/ui/default/print.css
+++ b/slides/s5/ui/default/print.css
diff --git a/slides/s5/ui/default/s5-core.css b/slides/s5/ui/default/s5-core.css
index ad1530b..ad1530b 100755..100644
--- a/slides/s5/ui/default/s5-core.css
+++ b/slides/s5/ui/default/s5-core.css
diff --git a/slides/s5/ui/default/slides.css b/slides/s5/ui/default/slides.css
index 0786d7d..0786d7d 100755..100644
--- a/slides/s5/ui/default/slides.css
+++ b/slides/s5/ui/default/slides.css
diff --git a/slides/s5/ui/default/slides.js b/slides/s5/ui/default/slides.js
index ab2a4b2..ab2a4b2 100755..100644
--- a/slides/s5/ui/default/slides.js
+++ b/slides/s5/ui/default/slides.js
diff --git a/slides/s5/ui/s5-notes.html b/slides/s5/ui/s5-notes.html
index 875f95a..875f95a 100755..100644
--- a/slides/s5/ui/s5-notes.html
+++ b/slides/s5/ui/s5-notes.html
diff --git a/slides/schema/relaxng/slides.rnc b/slides/schema/relaxng/slides.rnc
index 4d37f6f..4297410 100644
--- a/slides/schema/relaxng/slides.rnc
+++ b/slides/schema/relaxng/slides.rnc
@@ -55,8 +55,8 @@ include "../../../../docbook/relaxng/docbook/docbook/docbook.rnc" inherit = db {
 dbs._any.attribute = attribute * { text }
 
 dbs.all.content = db.all.blocks? &
-  dbs.speakernotes &
-  dbs.handoutnotes &
+  dbs.speakernotes? &
+  dbs.handoutnotes? &
   db._any.svg? &
   db._any.mml? &
   dbs.block?
diff --git a/slides/schema/relaxng/slides.rng b/slides/schema/relaxng/slides.rng
index 9a38eb1..de54f98 100644
--- a/slides/schema/relaxng/slides.rng
+++ b/slides/schema/relaxng/slides.rng
@@ -94,8 +94,12 @@
       <optional>
         <ref name="db.all.blocks"/>
       </optional>
-      <ref name="dbs.speakernotes"/>
-      <ref name="dbs.handoutnotes"/>
+      <optional>
+        <ref name="dbs.speakernotes"/>
+      </optional>
+      <optional>
+        <ref name="dbs.handoutnotes"/>
+      </optional>
       <optional>
         <ref name="db._any.svg"/>
       </optional>
diff --git a/slides/slidy/.htaccess b/slides/slidy/.htaccess
index d395348..d395348 100755..100644
--- a/slides/slidy/.htaccess
+++ b/slides/slidy/.htaccess
diff --git a/slides/slidy/Overview.html b/slides/slidy/Overview.html
index 69f72f6..69f72f6 100755..100644
--- a/slides/slidy/Overview.html
+++ b/slides/slidy/Overview.html
diff --git a/slides/slidy/Overview.xhtml b/slides/slidy/Overview.xhtml
index 69f72f6..69f72f6 100755..100644
--- a/slides/slidy/Overview.xhtml
+++ b/slides/slidy/Overview.xhtml
diff --git a/slides/slidy/blank.html b/slides/slidy/blank.html
index c9081eb..c9081eb 100755..100644
--- a/slides/slidy/blank.html
+++ b/slides/slidy/blank.html
diff --git a/slides/slidy/graphics/bullet-fold-dim.gif b/slides/slidy/graphics/bullet-fold-dim.gif
index bce1a2a..bce1a2a 100755..100644
--- a/slides/slidy/graphics/bullet-fold-dim.gif
+++ b/slides/slidy/graphics/bullet-fold-dim.gif
diff --git a/slides/slidy/graphics/bullet-fold-dim.png b/slides/slidy/graphics/bullet-fold-dim.png
index 4e28cfa..4e28cfa 100755..100644
--- a/slides/slidy/graphics/bullet-fold-dim.png
+++ b/slides/slidy/graphics/bullet-fold-dim.png
diff --git a/slides/slidy/graphics/bullet-fold.gif b/slides/slidy/graphics/bullet-fold.gif
index d4b063c..d4b063c 100755..100644
--- a/slides/slidy/graphics/bullet-fold.gif
+++ b/slides/slidy/graphics/bullet-fold.gif
diff --git a/slides/slidy/graphics/bullet-fold.png b/slides/slidy/graphics/bullet-fold.png
index b5334f3..b5334f3 100755..100644
--- a/slides/slidy/graphics/bullet-fold.png
+++ b/slides/slidy/graphics/bullet-fold.png
diff --git a/slides/slidy/graphics/bullet-nofold-dim.gif b/slides/slidy/graphics/bullet-nofold-dim.gif
index 98a4c39..98a4c39 100755..100644
--- a/slides/slidy/graphics/bullet-nofold-dim.gif
+++ b/slides/slidy/graphics/bullet-nofold-dim.gif
diff --git a/slides/slidy/graphics/bullet-nofold-dim.png b/slides/slidy/graphics/bullet-nofold-dim.png
index 27bccb2..27bccb2 100755..100644
--- a/slides/slidy/graphics/bullet-nofold-dim.png
+++ b/slides/slidy/graphics/bullet-nofold-dim.png
diff --git a/slides/slidy/graphics/bullet-nofold.gif b/slides/slidy/graphics/bullet-nofold.gif
index 76102a3..76102a3 100755..100644
--- a/slides/slidy/graphics/bullet-nofold.gif
+++ b/slides/slidy/graphics/bullet-nofold.gif
diff --git a/slides/slidy/graphics/bullet-nofold.png b/slides/slidy/graphics/bullet-nofold.png
index 28215ec..28215ec 100755..100644
--- a/slides/slidy/graphics/bullet-nofold.png
+++ b/slides/slidy/graphics/bullet-nofold.png
diff --git a/slides/slidy/graphics/bullet-unfold-dim.gif b/slides/slidy/graphics/bullet-unfold-dim.gif
index b758cbe..b758cbe 100755..100644
--- a/slides/slidy/graphics/bullet-unfold-dim.gif
+++ b/slides/slidy/graphics/bullet-unfold-dim.gif
diff --git a/slides/slidy/graphics/bullet-unfold-dim.png b/slides/slidy/graphics/bullet-unfold-dim.png
index 1dec59d..1dec59d 100755..100644
--- a/slides/slidy/graphics/bullet-unfold-dim.png
+++ b/slides/slidy/graphics/bullet-unfold-dim.png
diff --git a/slides/slidy/graphics/bullet-unfold.gif b/slides/slidy/graphics/bullet-unfold.gif
index e5ecd5b..e5ecd5b 100755..100644
--- a/slides/slidy/graphics/bullet-unfold.gif
+++ b/slides/slidy/graphics/bullet-unfold.gif
diff --git a/slides/slidy/graphics/bullet-unfold.png b/slides/slidy/graphics/bullet-unfold.png
index ce9de96..ce9de96 100755..100644
--- a/slides/slidy/graphics/bullet-unfold.png
+++ b/slides/slidy/graphics/bullet-unfold.png
diff --git a/slides/slidy/graphics/bullet.png b/slides/slidy/graphics/bullet.png
index 14ebd95..14ebd95 100755..100644
--- a/slides/slidy/graphics/bullet.png
+++ b/slides/slidy/graphics/bullet.png
diff --git a/slides/slidy/graphics/example.png b/slides/slidy/graphics/example.png
index 7ce9b3f..7ce9b3f 100755..100644
--- a/slides/slidy/graphics/example.png
+++ b/slides/slidy/graphics/example.png
diff --git a/slides/slidy/graphics/example.svg b/slides/slidy/graphics/example.svg
index 581358e..581358e 100755..100644
--- a/slides/slidy/graphics/example.svg
+++ b/slides/slidy/graphics/example.svg
diff --git a/slides/slidy/graphics/face1.gif b/slides/slidy/graphics/face1.gif
index 04e50cd..04e50cd 100755..100644
--- a/slides/slidy/graphics/face1.gif
+++ b/slides/slidy/graphics/face1.gif
diff --git a/slides/slidy/graphics/face2.gif b/slides/slidy/graphics/face2.gif
index 12d8240..12d8240 100755..100644
--- a/slides/slidy/graphics/face2.gif
+++ b/slides/slidy/graphics/face2.gif
diff --git a/slides/slidy/graphics/face3.gif b/slides/slidy/graphics/face3.gif
index ac6e5e4..ac6e5e4 100755..100644
--- a/slides/slidy/graphics/face3.gif
+++ b/slides/slidy/graphics/face3.gif
diff --git a/slides/slidy/graphics/face4.gif b/slides/slidy/graphics/face4.gif
index 3f68740..3f68740 100755..100644
--- a/slides/slidy/graphics/face4.gif
+++ b/slides/slidy/graphics/face4.gif
diff --git a/slides/slidy/graphics/fold-bright.gif b/slides/slidy/graphics/fold-bright.gif
index 7e38faa..7e38faa 100755..100644
--- a/slides/slidy/graphics/fold-bright.gif
+++ b/slides/slidy/graphics/fold-bright.gif
diff --git a/slides/slidy/graphics/fold-dim.bmp b/slides/slidy/graphics/fold-dim.bmp
index 117f91a..117f91a 100755..100644
--- a/slides/slidy/graphics/fold-dim.bmp
+++ b/slides/slidy/graphics/fold-dim.bmp
diff --git a/slides/slidy/graphics/fold-dim.gif b/slides/slidy/graphics/fold-dim.gif
index 346fcbf..346fcbf 100755..100644
--- a/slides/slidy/graphics/fold-dim.gif
+++ b/slides/slidy/graphics/fold-dim.gif
diff --git a/slides/slidy/graphics/fold.bmp b/slides/slidy/graphics/fold.bmp
index 6ba9e56..6ba9e56 100755..100644
--- a/slides/slidy/graphics/fold.bmp
+++ b/slides/slidy/graphics/fold.bmp
diff --git a/slides/slidy/graphics/fold.gif b/slides/slidy/graphics/fold.gif
index 133e594..133e594 100755..100644
--- a/slides/slidy/graphics/fold.gif
+++ b/slides/slidy/graphics/fold.gif
diff --git a/slides/slidy/graphics/icon-blue.png b/slides/slidy/graphics/icon-blue.png
index 58bf969..58bf969 100755..100644
--- a/slides/slidy/graphics/icon-blue.png
+++ b/slides/slidy/graphics/icon-blue.png
diff --git a/slides/slidy/graphics/keys2.jpg b/slides/slidy/graphics/keys2.jpg
index 4739be0..4739be0 100755..100644
--- a/slides/slidy/graphics/keys2.jpg
+++ b/slides/slidy/graphics/keys2.jpg
diff --git a/slides/slidy/graphics/nofold-dim.bmp b/slides/slidy/graphics/nofold-dim.bmp
index 8a12826..8a12826 100755..100644
--- a/slides/slidy/graphics/nofold-dim.bmp
+++ b/slides/slidy/graphics/nofold-dim.bmp
diff --git a/slides/slidy/graphics/nofold-dim.gif b/slides/slidy/graphics/nofold-dim.gif
index 996fb5e..996fb5e 100755..100644
--- a/slides/slidy/graphics/nofold-dim.gif
+++ b/slides/slidy/graphics/nofold-dim.gif
diff --git a/slides/slidy/graphics/nofold.bmp b/slides/slidy/graphics/nofold.bmp
index 0937d32..0937d32 100755..100644
--- a/slides/slidy/graphics/nofold.bmp
+++ b/slides/slidy/graphics/nofold.bmp
diff --git a/slides/slidy/graphics/unfold-bright.gif b/slides/slidy/graphics/unfold-bright.gif
index 2748131..2748131 100755..100644
--- a/slides/slidy/graphics/unfold-bright.gif
+++ b/slides/slidy/graphics/unfold-bright.gif
diff --git a/slides/slidy/graphics/unfold-dim.bmp b/slides/slidy/graphics/unfold-dim.bmp
index c2a6baf..c2a6baf 100755..100644
--- a/slides/slidy/graphics/unfold-dim.bmp
+++ b/slides/slidy/graphics/unfold-dim.bmp
diff --git a/slides/slidy/graphics/unfold-dim.gif b/slides/slidy/graphics/unfold-dim.gif
index bee5671..bee5671 100755..100644
--- a/slides/slidy/graphics/unfold-dim.gif
+++ b/slides/slidy/graphics/unfold-dim.gif
diff --git a/slides/slidy/graphics/unfold.bmp b/slides/slidy/graphics/unfold.bmp
index 30af625..30af625 100755..100644
--- a/slides/slidy/graphics/unfold.bmp
+++ b/slides/slidy/graphics/unfold.bmp
diff --git a/slides/slidy/graphics/unfold.gif b/slides/slidy/graphics/unfold.gif
index 0753ae4..0753ae4 100755..100644
--- a/slides/slidy/graphics/unfold.gif
+++ b/slides/slidy/graphics/unfold.gif
diff --git a/slides/slidy/graphics/w3c-logo-blue.gif b/slides/slidy/graphics/w3c-logo-blue.gif
index 890bc97..890bc97 100755..100644
--- a/slides/slidy/graphics/w3c-logo-blue.gif
+++ b/slides/slidy/graphics/w3c-logo-blue.gif
diff --git a/slides/slidy/graphics/w3c-logo-blue.svg b/slides/slidy/graphics/w3c-logo-blue.svg
index 6595d01..6595d01 100755..100644
--- a/slides/slidy/graphics/w3c-logo-blue.svg
+++ b/slides/slidy/graphics/w3c-logo-blue.svg
diff --git a/slides/slidy/graphics/w3c-logo-slanted.jpg b/slides/slidy/graphics/w3c-logo-slanted.jpg
index 54e0ac3..54e0ac3 100755..100644
--- a/slides/slidy/graphics/w3c-logo-slanted.jpg
+++ b/slides/slidy/graphics/w3c-logo-slanted.jpg
diff --git a/slides/slidy/graphics/w3c-logo-white.gif b/slides/slidy/graphics/w3c-logo-white.gif
index 3b3c6fd..3b3c6fd 100755..100644
--- a/slides/slidy/graphics/w3c-logo-white.gif
+++ b/slides/slidy/graphics/w3c-logo-white.gif
diff --git a/slides/slidy/graphics/w3c-logo-white.svg b/slides/slidy/graphics/w3c-logo-white.svg
index d63907f..d63907f 100755..100644
--- a/slides/slidy/graphics/w3c-logo-white.svg
+++ b/slides/slidy/graphics/w3c-logo-white.svg
diff --git a/slides/slidy/help/.htaccess b/slides/slidy/help/.htaccess
index d395348..d395348 100755..100644
--- a/slides/slidy/help/.htaccess
+++ b/slides/slidy/help/.htaccess
diff --git a/slides/slidy/help/help.html b/slides/slidy/help/help.html
index c2f8614..c2f8614 100755..100644
--- a/slides/slidy/help/help.html
+++ b/slides/slidy/help/help.html
diff --git a/slides/slidy/help/help.html.ca b/slides/slidy/help/help.html.ca
index fef10cf..fef10cf 100755..100644
--- a/slides/slidy/help/help.html.ca
+++ b/slides/slidy/help/help.html.ca
diff --git a/slides/slidy/help/help.html.de b/slides/slidy/help/help.html.de
index 55a8e48..55a8e48 100755..100644
--- a/slides/slidy/help/help.html.de
+++ b/slides/slidy/help/help.html.de
diff --git a/slides/slidy/help/help.html.en b/slides/slidy/help/help.html.en
index f7e9e5c..f7e9e5c 100755..100644
--- a/slides/slidy/help/help.html.en
+++ b/slides/slidy/help/help.html.en
diff --git a/slides/slidy/help/help.html.es b/slides/slidy/help/help.html.es
index a3059aa..a3059aa 100755..100644
--- a/slides/slidy/help/help.html.es
+++ b/slides/slidy/help/help.html.es
diff --git a/slides/slidy/help/help.html.fr b/slides/slidy/help/help.html.fr
index daa7605..daa7605 100755..100644
--- a/slides/slidy/help/help.html.fr
+++ b/slides/slidy/help/help.html.fr
diff --git a/slides/slidy/help/help.html.hu b/slides/slidy/help/help.html.hu
index 64eb205..64eb205 100755..100644
--- a/slides/slidy/help/help.html.hu
+++ b/slides/slidy/help/help.html.hu
diff --git a/slides/slidy/help/help.html.nl b/slides/slidy/help/help.html.nl
index b2e9043..b2e9043 100755..100644
--- a/slides/slidy/help/help.html.nl
+++ b/slides/slidy/help/help.html.nl
diff --git a/slides/slidy/help/help.html.pl b/slides/slidy/help/help.html.pl
index 91d8571..91d8571 100755..100644
--- a/slides/slidy/help/help.html.pl
+++ b/slides/slidy/help/help.html.pl
diff --git a/slides/slidy/help/help.html.pt-br b/slides/slidy/help/help.html.pt-br
index c2aee81..c2aee81 100755..100644
--- a/slides/slidy/help/help.html.pt-br
+++ b/slides/slidy/help/help.html.pt-br
diff --git a/slides/slidy/help/help.html.pt_br b/slides/slidy/help/help.html.pt_br
index c2aee81..c2aee81 100755..100644
--- a/slides/slidy/help/help.html.pt_br
+++ b/slides/slidy/help/help.html.pt_br
diff --git a/slides/slidy/help/help.html.sv b/slides/slidy/help/help.html.sv
index 3d019a7..3d019a7 100755..100644
--- a/slides/slidy/help/help.html.sv
+++ b/slides/slidy/help/help.html.sv
diff --git a/slides/slidy/help/help.pt-br.html b/slides/slidy/help/help.pt-br.html
index 72d9891..72d9891 100755..100644
--- a/slides/slidy/help/help.pt-br.html
+++ b/slides/slidy/help/help.pt-br.html
diff --git a/slides/slidy/scripts/.htaccess b/slides/slidy/scripts/.htaccess
index d395348..d395348 100755..100644
--- a/slides/slidy/scripts/.htaccess
+++ b/slides/slidy/scripts/.htaccess
diff --git a/slides/slidy/scripts/slidy.js.gz b/slides/slidy/scripts/slidy.js.gz
index b1c58e4..b1c58e4 100755..100644
--- a/slides/slidy/scripts/slidy.js.gz
+++ b/slides/slidy/scripts/slidy.js.gz
diff --git a/slides/slidy/styles/.htaccess b/slides/slidy/styles/.htaccess
index d395348..d395348 100755..100644
--- a/slides/slidy/styles/.htaccess
+++ b/slides/slidy/styles/.htaccess
diff --git a/slides/slidy/styles/slidy.css b/slides/slidy/styles/slidy.css
index 0197e64..0197e64 100755..100644
--- a/slides/slidy/styles/slidy.css
+++ b/slides/slidy/styles/slidy.css
diff --git a/slides/slidy/styles/w3c-blue.css b/slides/slidy/styles/w3c-blue.css
index 6c4ff4f..6c4ff4f 100755..100644
--- a/slides/slidy/styles/w3c-blue.css
+++ b/slides/slidy/styles/w3c-blue.css
diff --git a/slides/xhtml/plain-titlepage.xml b/slides/xhtml/plain-titlepage.xml
index fb6569d..cd12272 100644
--- a/slides/xhtml/plain-titlepage.xml
+++ b/slides/xhtml/plain-titlepage.xml
@@ -1,6 +1,9 @@
 <t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
              xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
-             xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+             xmlns:dbs="http://docbook.org/ns/docbook-slides"
+             xmlns="http://www.w3.org/1999/xhtml"
+             xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+             t:copy-namespaces="dbs">
 
 <t:titlepage t:element="slides" t:wrapper="div" class="slide cover title">
   <t:titlepage-content t:side="recto">
diff --git a/slides/xhtml/plain-titlepage.xsl b/slides/xhtml/plain-titlepage.xsl
index 3af53f4..f0a916b 100644
--- a/slides/xhtml/plain-titlepage.xsl
+++ b/slides/xhtml/plain-titlepage.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" version="1.0" exclude-result-prefixes="exsl">
+<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:dbs="http://docbook.org/ns/docbook-slides" version="1.0" exclude-result-prefixes="exsl">
 
 <!-- This stylesheet was created by template/titlepage.xsl-->
 
diff --git a/slides/xhtml/plain.xsl b/slides/xhtml/plain.xsl
index 05d5e51..b99ec4e 100644
--- a/slides/xhtml/plain.xsl
+++ b/slides/xhtml/plain.xsl
@@ -2,10 +2,10 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		xmlns="http://www.w3.org/1999/xhtml"
 		xmlns:xlink="http://www.w3.org/1999/xlink"
-		xmlns:db="http://docbook.org/ns/docbook"
+		xmlns:d="http://docbook.org/ns/docbook"
 		xmlns:dbs="http://docbook.org/ns/docbook-slides"
 		xmlns:exsl="http://exslt.org/common"
-		exclude-result-prefixes="dbs db xlink"
+		exclude-result-prefixes="dbs d xlink"
 		extension-element-prefixes="exsl"
 		version="1.0">
 
@@ -284,29 +284,29 @@
   </div>
 </xsl:template>
 
-<xsl:template match="db:info">
-  <xsl:apply-templates select="db:title|db:titleabbrev|db:subtitle|db:author|db:authorgroup/db:author"/>
+<xsl:template match="d:info">
+  <xsl:apply-templates select="d:title|d:titleabbrev|d:subtitle|d:author|d:authorgroup/d:author"/>
 </xsl:template>
 
-<xsl:template match="db:title|db:titleabbrev">
-  <xsl:if test="not(self::db:title) or (not(preceding-sibling::db:titleabbrev) and not(following-sibling::db:titleabbrev))">
+<xsl:template match="d:title|d:titleabbrev">
+  <xsl:if test="not(self::d:title) or (not(preceding-sibling::d:titleabbrev) and not(following-sibling::d:titleabbrev))">
     <h1 class="title"><xsl:value-of select="."/></h1>
   </xsl:if>
 </xsl:template>
 
-<xsl:template match="db:subtitle">
+<xsl:template match="d:subtitle">
   <h1 class="subtitle"><xsl:value-of select="."/></h1>
 </xsl:template>
 
-<xsl:template match="db:author">
-  <h3 class="author"><xsl:apply-templates select="db:personname|db:orgname"/></h3>
-  <h4 class="email"><xsl:apply-templates select="db:email"/></h4>
-  <xsl:if test="db:affiliation">
-    <h4 class="affiliation"><xsl:value-of select="db:affiliation"/></h4>
+<xsl:template match="d:author">
+  <h3 class="author"><xsl:apply-templates select="d:personname|d:orgname"/></h3>
+  <h4 class="email"><xsl:apply-templates select="d:email"/></h4>
+  <xsl:if test="d:affiliation">
+    <h4 class="affiliation"><xsl:value-of select="d:affiliation"/></h4>
   </xsl:if>
 </xsl:template>
 
-<xsl:template match="db:email">
+<xsl:template match="d:email">
   <a>
     <xsl:attribute name="href">
       <xsl:text>mailto:</xsl:text><xsl:value-of select="."/>
@@ -330,19 +330,19 @@
   <xsl:apply-templates select="*"/>
 </xsl:template>
 
-<xsl:template match="db:itemizedlist">
+<xsl:template match="d:itemizedlist">
   <ul>
     <xsl:call-template name="list.content"/>
   </ul>
 </xsl:template>
 
-<xsl:template match="db:orderedlist">
+<xsl:template match="d:orderedlist">
   <ol>
     <xsl:call-template name="list.content"/>
   </ol>
 </xsl:template>
 
-<xsl:template match="db:mediaobject">
+<xsl:template match="d:mediaobject">
   <xsl:variable name="classValue">
     <xsl:call-template name="process.dbs.attributes">
       <xsl:with-param name="attributeSet" select="(ancestor-or-self::*/@dbs:incremental)[last()] | (ancestor-or-self::*/@dbs:collapsible)[last()] | self::*/@dbs:style"/>
@@ -350,13 +350,13 @@
   </xsl:variable>
 
   <div class="{$classValue}">
-    <xsl:apply-templates select="db:imageobject[1]"/>
+    <xsl:apply-templates select="d:imageobject[1]"/>
   </div>
 </xsl:template>
 
 <xsl:template name="bibliography.titlepage"/>
 
-<xsl:template match="db:bibliosource" mode="bibliography.mode">
+<xsl:template match="d:bibliosource" mode="bibliography.mode">
   <span>
     <xsl:call-template name="common.html.attributes"/>
     <xsl:call-template name="id.attribute"/>
@@ -506,9 +506,9 @@
     <xsl:call-template name="gentext.space"/>
     <xsl:text>&#xa9;</xsl:text>
     <xsl:call-template name="gentext.space"/>
-    <xsl:value-of select="/dbs:slides/db:info/db:copyright/db:year"/>
+    <xsl:value-of select="/dbs:slides/d:info/d:copyright/d:year"/>
     <xsl:call-template name="gentext.space"/>
-    <xsl:value-of select="/dbs:slides/db:info/db:copyright/db:holder"/>
+    <xsl:value-of select="/dbs:slides/d:info/d:copyright/d:holder"/>
   </div>
 </xsl:template>
 
@@ -518,17 +518,17 @@
       <xsl:with-param name="key" select="'Published'"/>
     </xsl:call-template>
     <xsl:text>: </xsl:text>
-    <xsl:value-of select="/dbs:slides/db:info/db:pubdate"/>
+    <xsl:value-of select="/dbs:slides/d:info/d:pubdate"/>
   </div>
 </xsl:template>
 
 <xsl:template match="/" mode="slide.header.mode"/>
 
 <xsl:template match="/" mode="slide.footer.mode">
-  <xsl:if test="($generate.copyright != 0) and /dbs:slides/db:info/db:copyright">
+  <xsl:if test="($generate.copyright != 0) and /dbs:slides/d:info/d:copyright">
     <xsl:call-template name="slide.copyright"/>
   </xsl:if>
-  <xsl:if test="($generate.pubdate != 0) and /dbs:slides/db:info/db:pubdate">
+  <xsl:if test="($generate.pubdate != 0) and /dbs:slides/d:info/d:pubdate">
     <xsl:call-template name="slide.pubdate"/>
   </xsl:if>
 </xsl:template>
diff --git a/slides/xhtml/s5.xsl b/slides/xhtml/s5.xsl
index 9447db3..82c1a85 100644
--- a/slides/xhtml/s5.xsl
+++ b/slides/xhtml/s5.xsl
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="ASCII"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		xmlns="http://www.w3.org/1999/xhtml"
-		xmlns:db="http://docbook.org/ns/docbook"
+		xmlns:d="http://docbook.org/ns/docbook"
 		xmlns:dbs="http://docbook.org/ns/docbook-slides"
-		exclude-result-prefixes="dbs db"
+		exclude-result-prefixes="dbs d"
 		version="1.0">
 
 <xsl:import href="plain.xsl"/>
@@ -50,7 +50,7 @@
   </div>
 </xsl:template>
 
-<xsl:template match="db:xref">
+<xsl:template match="d:xref">
   <xsl:variable name="target" select="id(./@linkend)"/>
 
   <xsl:choose>
@@ -66,12 +66,12 @@
   </xsl:choose>
 </xsl:template>
 
-<xsl:template match="db:biblioentry" mode="xref-to">
+<xsl:template match="d:biblioentry" mode="xref-to">
   <xsl:variable name="id" select="@xml:id"/>
 
   <xsl:choose>
     <xsl:when test="$bibliography.numbered != 0">
-      <xsl:number from="db:bibliography" count="db:biblioentry|db:bibliomixed" level="any" format="1"/>
+      <xsl:number from="d:bibliography" count="d:biblioentry|d:bibliomixed" level="any" format="1"/>
     </xsl:when>
 
     <xsl:otherwise>
@@ -80,7 +80,7 @@
   </xsl:choose>
 </xsl:template>
 
-<xsl:template match="db:mediaobject">
+<xsl:template match="d:mediaobject">
   <p>
     <xsl:if test="@dbs:style">
       <xsl:attribute name="class">
diff --git a/slides/xhtml/slidy.xsl b/slides/xhtml/slidy.xsl
index d286c55..b0cacdb 100644
--- a/slides/xhtml/slidy.xsl
+++ b/slides/xhtml/slidy.xsl
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="ASCII"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		xmlns="http://www.w3.org/1999/xhtml"
-		xmlns:db="http://docbook.org/ns/docbook"
+		xmlns:d="http://docbook.org/ns/docbook"
 		xmlns:dbs="http://docbook.org/ns/docbook-slides"
-		exclude-result-prefixes="dbs db"
+		exclude-result-prefixes="dbs d"
 		version="1.0">
 
 <xsl:import href="plain.xsl"/>
@@ -13,7 +13,7 @@
 <xsl:template name="xhtml.head">
   <meta name="copyright">
     <xsl:attribute name="content">
-      <xsl:if test="/dbs:slides/db:info/db:copyright">
+      <xsl:if test="/dbs:slides/d:info/d:copyright">
 	<xsl:call-template name="slide.copyright"/>
       </xsl:if>
     </xsl:attribute>
@@ -43,7 +43,7 @@
   <xsl:apply-templates select="/dbs:slides/dbs:foil|dbs:slides/dbs:foilgroup"/>
 </xsl:template>
 
-<xsl:template match="db:xref">
+<xsl:template match="d:xref">
   <xsl:variable name="target" select="id(./@linkend)"/>
 
   <xsl:choose>
@@ -62,9 +62,9 @@
   </xsl:choose>
 </xsl:template>
 
-<xsl:template match="db:biblioentry" mode="xref-to">
+<xsl:template match="d:biblioentry" mode="xref-to">
   <xsl:variable name="id" select="@xml:id"/>
-  <xsl:variable name="entry" select="//db:bibliography/*[@xml:id=$id][1]"/>
+  <xsl:variable name="entry" select="//d:bibliography/*[@xml:id=$id][1]"/>
 
   <a>
     <xsl:attribute name="href">
@@ -72,7 +72,7 @@
     </xsl:attribute>
     <xsl:choose>
       <xsl:when test="$bibliography.numbered != 0">
-        <xsl:number from="db:bibliography" count="db:biblioentry|db:bibliomixed" level="any" format="1"/>
+        <xsl:number from="d:bibliography" count="d:biblioentry|d:bibliomixed" level="any" format="1"/>
       </xsl:when>
 
       <xsl:otherwise>