- Convert the test files to DocBook Slides 5.0

diff --git a/slides/tests/dbgentext.xml b/slides/tests/dbgentext.xml
index 81fbd5e60f7c0f6d2aa3ce8014a46e79c858b628..2122b26830c3c1444af39a616caf89ca01d7d90f 100644 (file)
--- a/slides/tests/dbgentext.xml
+++ b/slides/tests/dbgentext.xml
@@ -1,14 +1,13 @@
 <?xml version='1.0'?>
-<!DOCTYPE slides SYSTEM "../schema/dtd/slides.dtd">
 <!--
 <?dbhtml graphics-dir="../graphics" css-stylesheet-dir="../browser"?>
 <?dbhtml script-dir="../browser"?>
 -->
-<slides>
-<slidesinfo>
+<dbs:slides xmlns="http://docbook.org/ns/docbook" xmlns:dbs="http://docbook.org/ns/docbook-slides" xmlns:xlink="http://www.w3.org/1999/xlink">
+<info>
   <title>Supporting Localized Generated Text</title>
   <titleabbrev>Generated Text</titleabbrev>
-  <author><firstname>Norman</firstname><surname>Walsh</surname></author>
+  <author><personname><firstname>Norman</firstname><surname>Walsh</surname></personname></author>
   <pubdate>Sunday, 08 Apr 2001</pubdate>
   <confgroup>
     <conftitle>XSLTUK-01</conftitle>
@@ -19,26 +18,26 @@
   <releaseinfo role="version">Version TEST</releaseinfo>
   <copyright><year>2001</year>
              <holder>Sun Microsystems, Inc.</holder></copyright>
-</slidesinfo>
+</info>
 
-<foil><title>Introduction</title>
-
-<speakernotes>
+<dbs:speakernotes>
 <para>Say something pithy in the introduction</para>
-</speakernotes>
+</dbs:speakernotes>
 
-<para>This is the introductory slide</para>
-</foil>
+<dbs:foil><info><title>Introduction</title></info>
 
-<foilgroup><title>The Problem</title>
+<para>This is the introductory slide</para>
+</dbs:foil>
 
-<para>This is on the foilgroup slide.</para>
+<dbs:foilgroup><info><title>The Problem</title></info>
 
-<speakernotes>
+<dbs:speakernotes>
 <para>Remember to describe the use-caess</para>
-</speakernotes>
+</dbs:speakernotes>
+
+<para>This is on the foilgroup slide.</para>
 
-<foil><title>Generated Text</title>
+<dbs:foil><info><title>Generated Text</title></info>
 <itemizedlist>
 <listitem><para>Semantic markup often omits text that can be generated
 automatically
@@ -49,9 +48,9 @@ naturally
 <listitem><para>Generated text is locale-specific
 </para></listitem>
 </itemizedlist>
-</foil>
+</dbs:foil>
 
-<foil><title>An Example</title>
+<dbs:foil><info><title>An Example</title></info>
 <para>An obvious, common example is chapter title markup. Consider:</para>
 
 <programlisting><emphasis
@@ -69,12 +68,12 @@ naturally
 <para><emphasis>Chapitre 3. Some Title</emphasis></para>
 </listitem>
 </itemizedlist>
-</foil>
+</dbs:foil>
 
-</foilgroup>
-<foilgroup><title>A Solution</title>
+</dbs:foilgroup>
+<dbs:foilgroup><info><title>A Solution</title></info>
 
-<foil><title>The Old Solution</title>
+<dbs:foil><info><title>The Old Solution</title></info>
 
 <para>Replace this</para>
 
@@ -100,10 +99,10 @@ naturally
     <xsl:apply-templates select="title"/>
   </h1>
 </xsl:template>]]></screen>
-</foil>
+</dbs:foil>
 
-<foil><title>Generated from Localization Data</title>
-<titleabbrev>L10N Data</titleabbrev>
+<dbs:foil><info><title>Generated from Localization Data</title>
+<titleabbrev>L10N Data</titleabbrev></info>
 
 <para>Where the generated text for words like <quote>Chapter</quote>
 is taken from an independently maintained lookup table:</para>
@@ -116,9 +115,9 @@ is taken from an independently maintained lookup table:</para>
 ...
 <localization language="cs">
 ...]]></screen>
-</foil>
+</dbs:foil>
 
-<foil><title>Problems</title>
+<dbs:foil><info><title>Problems</title></info>
 <itemizedlist>
 <listitem><para>Single-word localization (doesn't support Japanese)
 </para></listitem>
@@ -129,12 +128,12 @@ is taken from an independently maintained lookup table:</para>
 <listitem><para>Hard-coded number format
 </para></listitem>
 </itemizedlist>
-</foil>
+</dbs:foil>
 
-</foilgroup>
-<foilgroup><title>A Better Solution</title>
+</dbs:foilgroup>
+<dbs:foilgroup><info><title>A Better Solution</title></info>
 
-<foil><title>Use Markup Templates</title>
+<dbs:foil><info><title>Use Markup Templates</title></info>
 
 <para>Use a lookup function to determine the markup template in addition
 to the keywords. For example, the <quote>markup template</quote> lookup
@@ -157,9 +156,9 @@ table for a chapter title looks something like this:</para>
 <literal>%s</literal> (not shown) are replaced by the lable, title, and
 subtitle of the component, respectively.</para>
 
-</foil>
+</dbs:foil>
 
-<foil><title>The <quote>New</quote> Solution</title>
+<dbs:foil><info><title>The <quote>New</quote> Solution</title></info>
 
 <para>Find the template and fill it in:</para>
 
@@ -173,10 +172,10 @@ subtitle of the component, respectively.</para>
     <xsl:with-param name="template" select="$template"/>
   </xsl:call-template>
 </xsl:template>]]></screen>
-</foil>
+</dbs:foil>
 
-<foil><title>Generated from Localization Data</title>
-<titleabbrev>L10N Data</titleabbrev>
+<dbs:foil><info><title>Generated from Localization Data</title>
+<titleabbrev>L10N Data</titleabbrev></info>
 
 <para>In order to make this work, the localization data is extended:</para>
 
@@ -191,17 +190,17 @@ subtitle of the component, respectively.</para>
 <template name="chapter">]]><?Pub _font green?><![CDATA[<Chapter/>]]><?Pub /_font?><![CDATA[ %n. %t</template>
 ]]><?Pub /_font?><![CDATA[...
 ]]></screen>
-</foil>
+</dbs:foil>
 
-</foilgroup>
+</dbs:foilgroup>
 
-<foilgroup><title>Resources</title>
-<foil><title>Resources</title>
+<dbs:foilgroup><info><title>Resources</title></info>
+<dbs:foil><info><title>Resources</title></info>
 <itemizedlist>
-<listitem><para><ulink url="http://www.oasis-open.org/docbook/"/>, the
+<listitem><para><uri xlink:href="http://www.oasis-open.org/docbook/"/>, the
 DocBook Home Page.
 </para></listitem>
-<listitem><para><ulink url="http://sourceforge.net/projects/docbook/"/>, the
+<listitem><para><uri xlink:href="http://sourceforge.net/projects/docbook/"/>, the
 stylesheets and related document types (including the slides layer that
 was used to produce this presentation.)
 </para></listitem>
@@ -211,6 +210,6 @@ for questions about DocBook applications, stylesheets, and other tool-related
 queries.
 </para></listitem>
 </itemizedlist>
-</foil>
-</foilgroup>
-</slides>
+</dbs:foil>
+</dbs:foilgroup>
+</dbs:slides>

diff --git a/slides/tests/dbhtml-dir-test/.gitignore b/slides/tests/dbhtml-dir-test/.gitignore
deleted file mode 100644 (file)
index e7eb98b..0000000
--- a/slides/tests/dbhtml-dir-test/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.html
-ChangeLog

diff --git a/slides/tests/dbhtml-dir.xml b/slides/tests/dbhtml-dir.xml
index 66bf286a85d29e0bbf5f96b071c4c8cd367275e9..138530db73b67b3ce9af2b8293f50f93e632b0a6 100644 (file)
--- a/slides/tests/dbhtml-dir.xml
+++ b/slides/tests/dbhtml-dir.xml
@@ -1,14 +1,14 @@
 <?xml version='1.0'?>
-<!DOCTYPE slides SYSTEM "../schema/dtd/slides.dtd">
+
 <!--
 <?dbhtml graphics-dir="../graphics" css-stylesheet-dir="../browser"?>
 <?dbhtml script-dir="../browser"?>
 -->
-<slides><?dbhtml dir="dbhtml-dir-test" ?>
-<slidesinfo>
+<dbs:slides xmlns="http://docbook.org/ns/docbook" xmlns:dbs="http://docbook.org/ns/docbook-slides" xmlns:xlink="http://www.w3.org/1999/xlink"><?dbhtml dir="dbhtml-dir-test" ?>
+<info>
   <title>Supporting Localized Generated Text</title>
   <titleabbrev>Generated Text</titleabbrev>
-  <author><firstname>Norman</firstname><surname>Walsh</surname></author>
+  <author><personname><firstname>Norman</firstname><surname>Walsh</surname></personname></author>
   <pubdate>Sunday, 08 Apr 2001</pubdate>
   <confgroup>
     <conftitle>XSLTUK-01</conftitle>
@@ -19,26 +19,26 @@
   <releaseinfo role="version">Version TEST</releaseinfo>
   <copyright><year>2001</year>
              <holder>Sun Microsystems, Inc.</holder></copyright>
-</slidesinfo>
+</info>
 
-<foil><title>Introduction</title>
+<dbs:foil><info><title>Introduction</title></info>
 
-<speakernotes>
+<dbs:speakernotes>
 <para>Say something pithy in the introduction</para>
-</speakernotes>
+</dbs:speakernotes>
 
 <para>This is the introductory slide</para>
-</foil>
-
-<foilgroup><title>The Problem</title>
+</dbs:foil>
 
-<para>This is on the foilgroup slide.</para>
+<dbs:foilgroup><info><title>The Problem</title></info>
 
-<speakernotes>
+<dbs:speakernotes>
 <para>Remember to describe the use-caess</para>
-</speakernotes>
+</dbs:speakernotes>
+
+<para>This is on the foilgroup slide.</para>
 
-<foil><title>Generated Text</title>
+<dbs:foil><info><title>Generated Text</title></info>
 <itemizedlist>
 <listitem><para>Semantic markup often omits text that can be generated
 automatically
@@ -49,9 +49,9 @@ naturally
 <listitem><para>Generated text is locale-specific
 </para></listitem>
 </itemizedlist>
-</foil>
+</dbs:foil>
 
-<foil><title>An Example</title>
+<dbs:foil><info><title>An Example</title></info>
 <para>An obvious, common example is chapter title markup. Consider:</para>
 
 <programlisting><emphasis
@@ -69,12 +69,12 @@ naturally
 <para><emphasis>Chapitre 3. Some Title</emphasis></para>
 </listitem>
 </itemizedlist>
-</foil>
+</dbs:foil>
 
-</foilgroup>
-<foilgroup><title>A Solution</title>
+</dbs:foilgroup>
+<dbs:foilgroup><info><title>A Solution</title></info>
 
-<foil><title>The Old Solution</title>
+<dbs:foil><info><title>The Old Solution</title></info>
 
 <para>Replace this</para>
 
@@ -100,10 +100,10 @@ naturally
     <xsl:apply-templates select="title"/>
   </h1>
 </xsl:template>]]></screen>
-</foil>
+</dbs:foil>
 
-<foil><title>Generated from Localization Data</title>
-<titleabbrev>L10N Data</titleabbrev>
+<dbs:foil><info><title>Generated from Localization Data</title>
+<titleabbrev>L10N Data</titleabbrev></info>
 
 <para>Where the generated text for words like <quote>Chapter</quote>
 is taken from an independently maintained lookup table:</para>
@@ -116,9 +116,9 @@ is taken from an independently maintained lookup table:</para>
 ...
 <localization language="cs">
 ...]]></screen>
-</foil>
+</dbs:foil>
 
-<foil><title>Problems</title>
+<dbs:foil><info><title>Problems</title></info>
 <itemizedlist>
 <listitem><para>Single-word localization (doesn't support Japanese)
 </para></listitem>
@@ -129,12 +129,12 @@ is taken from an independently maintained lookup table:</para>
 <listitem><para>Hard-coded number format
 </para></listitem>
 </itemizedlist>
-</foil>
+</dbs:foil>
 
-</foilgroup>
-<foilgroup><title>A Better Solution</title>
+</dbs:foilgroup>
+<dbs:foilgroup><info><title>A Better Solution</title></info>
 
-<foil><title>Use Markup Templates</title>
+<dbs:foil><info><title>Use Markup Templates</title></info>
 
 <para>Use a lookup function to determine the markup template in addition
 to the keywords. For example, the <quote>markup template</quote> lookup
@@ -157,9 +157,9 @@ table for a chapter title looks something like this:</para>
 <literal>%s</literal> (not shown) are replaced by the lable, title, and
 subtitle of the component, respectively.</para>
 
-</foil>
+</dbs:foil>
 
-<foil><title>The <quote>New</quote> Solution</title>
+<dbs:foil><info><title>The <quote>New</quote> Solution</title></info>
 
 <para>Find the template and fill it in:</para>
 
@@ -173,10 +173,10 @@ subtitle of the component, respectively.</para>
     <xsl:with-param name="template" select="$template"/>
   </xsl:call-template>
 </xsl:template>]]></screen>
-</foil>
+</dbs:foil>
 
-<foil><title>Generated from Localization Data</title>
-<titleabbrev>L10N Data</titleabbrev>
+<dbs:foil><info><title>Generated from Localization Data</title>
+<titleabbrev>L10N Data</titleabbrev></info>
 
 <para>In order to make this work, the localization data is extended:</para>
 
@@ -191,17 +191,17 @@ subtitle of the component, respectively.</para>
 <template name="chapter">]]><?Pub _font green?><![CDATA[<Chapter/>]]><?Pub /_font?><![CDATA[ %n. %t</template>
 ]]><?Pub /_font?><![CDATA[...
 ]]></screen>
-</foil>
+</dbs:foil>
 
-</foilgroup>
+</dbs:foilgroup>
 
-<foilgroup><title>Resources</title>
-<foil><title>Resources</title>
+<dbs:foilgroup><info><title>Resources</title></info>
+<dbs:foil><info><title>Resources</title></info>
 <itemizedlist>
-<listitem><para><ulink url="http://www.oasis-open.org/docbook/"/>, the
+<listitem><para><uri xlink:href="http://www.oasis-open.org/docbook/"/>, the
 DocBook Home Page.
 </para></listitem>
-<listitem><para><ulink url="http://sourceforge.net/projects/docbook/"/>, the
+<listitem><para><uri xlink:href="http://sourceforge.net/projects/docbook/"/>, the
 stylesheets and related document types (including the slides layer that
 was used to produce this presentation.)
 </para></listitem>
@@ -211,6 +211,6 @@ for questions about DocBook applications, stylesheets, and other tool-related
 queries.
 </para></listitem>
 </itemizedlist>
-</foil>
-</foilgroup>
-</slides>
+</dbs:foil>
+</dbs:foilgroup>
+</dbs:slides>

diff --git a/slides/tests/minimal.xml b/slides/tests/minimal.xml
index 94eef34a6f7efdf081789de5803e249b11b5389c..ad118d853622818b2ab67d9578e5e22cc6be7444 100644 (file)
--- a/slides/tests/minimal.xml
+++ b/slides/tests/minimal.xml
@@ -1,16 +1,16 @@
 <?xml version='1.0'?>
-<!DOCTYPE slides SYSTEM "../schema/dtd/slides.dtd">
-<slides>
-<slidesinfo>
+
+<dbs:slides xmlns="http://docbook.org/ns/docbook" xmlns:dbs="http://docbook.org/ns/docbook-slides">
+<info>
 <title>Presentation Title</title>
-</slidesinfo>
-<foilgroup><title>Foilgroup Title</title>
-<subtitle>Foilgroup Subtitle</subtitle>
+</info>
+<dbs:foilgroup><info><title>Foilgroup Title</title>
+<subtitle>Foilgroup Subtitle</subtitle></info>
 <para>Some premable.</para>
-<foil><title>Foil Title</title>
-<subtitle>Foil Subtitle</subtitle>
+<dbs:foil><info><title>Foil Title</title>
+<subtitle>Foil Subtitle</subtitle></info>
 <para>Foil content</para>
-</foil>
-</foilgroup>
-</slides>
+</dbs:foil>
+</dbs:foilgroup>
+</dbs:slides>
 

diff --git a/slides/tests/test-full.xml b/slides/tests/test-full.xml
index e57eee6990613bff84507054ab6087943ac0f9da..e322c2ee8c071b6b6e0f20b119a2456252063218 100644 (file)
--- a/slides/tests/test-full.xml
+++ b/slides/tests/test-full.xml
@@ -1,38 +1,38 @@
 <?xml version='1.0'?>
-<!DOCTYPE slides SYSTEM "../schema/dtd/slides-full.dtd">
-<slides>
-<slidesinfo>
+
+<dbs:slides xmlns="http://docbook.org/ns/docbook" xmlns:dbs="http://docbook.org/ns/docbook-slides">
+<info>
   <title>Test Slides Title</title>
   <copyright><year>2001</year><holder>Norman Walsh</holder></copyright>
-</slidesinfo>
+</info>
 
-<foilgroup><title>Section 1</title>
+<dbs:foilgroup><info><title>Section 1</title></info>
 
-<foil><title>Test Slides Title 1</title>
+<dbs:foil><info><title>Test Slides Title 1</title></info>
 <para>...<keycombo><keycap>X</keycap></keycombo></para>
-</foil>
+</dbs:foil>
 
-<foil><title>Test Slides Title 2</title>
+<dbs:foil><info><title>Test Slides Title 2</title></info>
 <para>...</para>
 <screen>
 this is a screen
 </screen>
-</foil>
+</dbs:foil>
 
-</foilgroup>
-<foilgroup><title>Section 2</title>
+</dbs:foilgroup>
+<dbs:foilgroup><info><title>Section 2</title></info>
 
-<foil><title>Test Slides Title 1</title>
+<dbs:foil><info><title>Test Slides Title 1</title></info>
 <para>...</para>
-</foil>
+</dbs:foil>
 
-<foil><title>Test Slides Title 2</title>
+<dbs:foil><info><title>Test Slides Title 2</title></info>
 <para>...</para>
 <screen>
 this is a screen
 </screen>
-</foil>
+</dbs:foil>
 
-</foilgroup>
+</dbs:foilgroup>
 
-</slides>
+</dbs:slides>

diff --git a/slides/tests/test.xml b/slides/tests/test.xml
index 3b168a1af9f245d36a2bb5c5a6e854e8a1fc68e9..1fb05db724de656138c17819f5c0fbf28fb54c15 100644 (file)
--- a/slides/tests/test.xml
+++ b/slides/tests/test.xml
@@ -1,34 +1,34 @@
 <?xml version='1.0'?>
-<!DOCTYPE slides SYSTEM "../schema/dtd/slides.dtd">
+
 <?dbhtml graphics-dir="../graphics"?>
 <?dbhtml css-stylesheet="../browser/slides.css"?>
 <?dbhtml script-dir="../browser"?>
-<slides>
-<slidesinfo>
+<dbs:slides xmlns="http://docbook.org/ns/docbook" xmlns:dbs="http://docbook.org/ns/docbook-slides">
+<info>
   <title>Test Slides Title That's Really Really Long and Would Never Really Be Used Exactly Like This</title>
   <copyright><year>2001</year><holder>Norman Walsh</holder></copyright>
-</slidesinfo>
+</info>
 
-<speakernotes>
+<dbs:speakernotes>
 <para>Welcome the audience</para>
-</speakernotes>
+</dbs:speakernotes>
 
-<foilgroup><title>Foilgroup 1</title>
+<dbs:foilgroup><info><title>Foilgroup 1</title></info>
 
-<speakernotes>
+<dbs:speakernotes>
 <para>Introduce the foilgroup</para>
-</speakernotes>
+</dbs:speakernotes>
 
-<foil><title>Test Slides Title 1</title>
+<dbs:foil><info><title>Test Slides Title 1</title></info>
 
-<speakernotes>
+<dbs:speakernotes>
 <para>Tell a funny joke. Remember, I said a funny one.</para>
-</speakernotes>
+</dbs:speakernotes>
 
 <para>...</para>
-</foil>
+</dbs:foil>
 
-<foil><title>Test Slides Title 2</title>
+<dbs:foil><info><title>Test Slides Title 2</title></info>
 <para>...</para>
 <screen>
 this is a screen
@@ -103,22 +103,22 @@ this is a long screen
 this is a long screen
 this is a long screen
 </screen>
-</foil>
+</dbs:foil>
 
-</foilgroup>
-<foilgroup><title>Foilgroup 2</title>
+</dbs:foilgroup>
+<dbs:foilgroup><info><title>Foilgroup 2</title></info>
 
-<foil><title>Test Slides Title 1</title>
+<dbs:foil><info><title>Test Slides Title 1</title></info>
 <para>...<footnote><para>This is a footnote.</para></footnote></para>
-</foil>
+</dbs:foil>
 
-<foil><title>Test Slides Title 2</title>
+<dbs:foil><info><title>Test Slides Title 2</title></info>
 <para>...</para>
 <screen>
 this is a screen
 </screen>
-</foil>
+</dbs:foil>
 
-</foilgroup>
+</dbs:foilgroup>
 
-</slides>
+</dbs:slides>

diff --git a/slides/tests/testcust.xml b/slides/tests/testcust.xml
index 0b14f3dab64c487a3685f55d41ba13b12604ab71..69e19e46313d80b72d78b942d534c77b371e2e8c 100644 (file)
--- a/slides/tests/testcust.xml
+++ b/slides/tests/testcust.xml
@@ -1,19 +1,19 @@
 <?xml version='1.0'?>
-<!DOCTYPE slides SYSTEM "../schema/dtd/slides-custom.dtd">
+
 <?dbhtml graphics-dir="../graphics"?>
 <?dbhtml css-stylesheet="../browser/slides.css"?>
 <?dbhtml script-dir="../browser"?>
-<slides>
-<slidesinfo>
+<dbs:slides xmlns="http://docbook.org/ns/docbook" xmlns:dbs="http://docbook.org/ns/docbook-slides">
+<info>
 <title>Test Slides Title</title>
-</slidesinfo>
-<foil><title>Test Slides Title</title>
+</info>
+<dbs:foil><info><title>Test Slides Title</title></info>
 <para>...</para>
-</foil>
-<foil><title>Test Slides Title</title>
+</dbs:foil>
+<dbs:foil><info><title>Test Slides Title</title></info>
 <para>...</para>
 <screen>
 this is a screen
 </screen>
-</foil>
-</slides>
+</dbs:foil>
+</dbs:slides>

diff --git a/slides/tests/testfull.xml b/slides/tests/testfull.xml
index cb806ddc66d4be47ce0a9e4122df700f3e25c79f..69e19e46313d80b72d78b942d534c77b371e2e8c 100644 (file)
--- a/slides/tests/testfull.xml
+++ b/slides/tests/testfull.xml
@@ -1,19 +1,19 @@
 <?xml version='1.0'?>
-<!DOCTYPE slides SYSTEM "../schema/dtd/slides-full.dtd">
+
 <?dbhtml graphics-dir="../graphics"?>
 <?dbhtml css-stylesheet="../browser/slides.css"?>
 <?dbhtml script-dir="../browser"?>
-<slides>
-<slidesinfo>
+<dbs:slides xmlns="http://docbook.org/ns/docbook" xmlns:dbs="http://docbook.org/ns/docbook-slides">
+<info>
 <title>Test Slides Title</title>
-</slidesinfo>
-<foil><title>Test Slides Title</title>
+</info>
+<dbs:foil><info><title>Test Slides Title</title></info>
 <para>...</para>
-</foil>
-<foil><title>Test Slides Title</title>
+</dbs:foil>
+<dbs:foil><info><title>Test Slides Title</title></info>
 <para>...</para>
 <screen>
 this is a screen
 </screen>
-</foil>
-</slides>
+</dbs:foil>
+</dbs:slides>

diff --git a/slides/tests/tr-862918.xml b/slides/tests/tr-862918.xml
index 56eb166698bb62431ec9fb550d38a651cf7dd094..a3fc8ff79c23fe7df111e8c2058ffb8ad3dcb899 100644 (file)
--- a/slides/tests/tr-862918.xml
+++ b/slides/tests/tr-862918.xml
@@ -1,23 +1,27 @@
 <?xml version='1.0' encoding="utf-8"?>
-<!DOCTYPE slides SYSTEM "../schema/dtd/slides-full.dtd">
-<slides>
 
-<slidesinfo>
+<dbs:slides xmlns="http://docbook.org/ns/docbook" xmlns:dbs="http://docbook.org/ns/docbook-slides">
+
+<info>
 <title>GITK - Generalized Interface ToolKit</title>
 <subtitle>Dynamically generated multi-modal application interfaces</subtitle>
 <titleabbrev>GITK</titleabbrev>
 
 <authorgroup>
 <author>
+<personname>
 <honorific>Dipl. Inf</honorific>
 <firstname>Stefan</firstname>
 <surname>Kost</surname>
+</personname>
 </author>
 
 <othercredit>
+<personname>
 <honorific>Prof. Dr</honorific>
 <firstname>Wolfgang</firstname>
 <surname>Wünschmann</surname>
+</personname>
 <contrib>Betreuer der Arbeit</contrib>
 <affiliation>
 <orgname>TU Dresden</orgname>
@@ -27,9 +31,11 @@ Informatik</orgdiv>
 </othercredit>
 
 <othercredit>
+<personname>
 <honorific>Prof. Dr</honorific>
 <firstname>Klaus</firstname>
 <surname>Bastian</surname>
+</personname>
 <contrib>Betreuer der Arbeit</contrib>
 <affiliation>
 <orgname>HTWK Leipzig</orgname>
@@ -44,14 +50,14 @@ Informatik</orgdiv>
 <holder>Stefan Kost</holder>
 </copyright>
 <pubdate>16.12.2003</pubdate>
-</slidesinfo>
+</info>
 
-<foilgroup><title>Foilgroup Title</title>
-<subtitle>Foilgroup Subtitle</subtitle>
+<dbs:foilgroup><info><title>Foilgroup Title</title>
+<subtitle>Foilgroup Subtitle</subtitle></info>
 <para>Some premable.</para>
-<foil><title>Foil Title</title>
-<subtitle>Foil Subtitle</subtitle>
+<dbs:foil><info><title>Foil Title</title>
+<subtitle>Foil Subtitle</subtitle></info>
 <para>Foil content</para>
-</foil>
-</foilgroup>
-</slides>
+</dbs:foil>
+</dbs:foilgroup>
+</dbs:slides>