- Added test documents.

* configure.in:
* test/testdoc1/Makefile.am:
* test/testdoc1/legal.xml:
* test/testdoc1/testdoc1.omf:
* test/testdoc1/testdoc1.xml:
- Added test documents.

* data/toc.xml.in:
- Handling System|... stuff from SK.

* stylesheets/Makefile.am:
- Removed db2html-tmp.xsl:

* stylesheets/db2html-biblio.xsl:
* stylesheets/db2html-index.xsl:
* stylesheets/db2html-navbar.xsl:
* stylesheets/db2html-synopsis.xsl:
* stylesheets/db2html.xsl:
- Various additions and improvements.

14 files changed, 400 insertions, 228 deletions

diff --git a/ChangeLog b/ChangeLog
index 20ccdd30..d4b579f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-12-26  Shaun McCance  <shaunm@gnome.org>
+
+	* configure.in:
+	* test/testdoc1/Makefile.am:
+	* test/testdoc1/legal.xml:
+	* test/testdoc1/testdoc1.omf:
+	* test/testdoc1/testdoc1.xml:
+	- Added test documents.
+
+	* data/toc.xml.in:
+	- Handling System|... stuff from SK.
+
 2003-12-24  Shaun McCance  <shaunm@gnome.org>
 
 	* src/Makefile.am:
diff --git a/configure.in b/configure.in
index 87ae651f..2ef23d5f 100644
--- a/configure.in
+++ b/configure.in
@@ -125,4 +125,5 @@ data/Makefile
 data/images/Makefile
 data/ui/Makefile
 po/Makefile.in
+test/testdoc1/Makefile
 ])
diff --git a/data/toc.xml.in b/data/toc.xml.in
index 216a8487..b39eaaa6 100644
--- a/data/toc.xml.in
+++ b/data/toc.xml.in
@@ -281,4 +281,53 @@
 		<category>General|Linux|Other</category>
 		<category>General|Other</category>
 	</toc>
+
+	<toc id="System">
+		<_title>System</_title>
+
+			<category>System</category>
+			<category>System|Administration</category>
+			<category>System|Administration|Backups</category>
+			<category>System|Administration|Backups|Local</category>
+			<category>System|Administration|Backups|Remote</category>
+			<category>System|Administration|Filesystems</category>
+			<category>System|Administration|Networking</category>
+			<category>System|Administration|Networking|AppleTalk</category>
+			<category>System|Administration|Networking|PPP</category>
+			<category>System|Administration|Networking|SMB</category>
+			<category>System|Administration|Networking|TCP/IP</category>
+			<category>System|Administration|Networking|DNS</category>
+			<category>System|Administration|Networking|Other</category>
+			<category>System|Administration|Users</category>
+			<category>System|Administration|Other</category>
+			<category>System|Configuration</category>
+			<category>System|Configuration|Config Files</category>
+			<category>System|Configuration|Configuration Tools</category>
+			<category>System|Configuration|Other</category>
+			<category>System|Hardware</category>
+			<category>System|Hardware|Processor</category>
+			<category>System|Hardware|Storage</category>
+			<category>System|Hardware|Video</category>
+			<category>System|Hardware|Input Devices</category>
+			<category>System|Hardware|Networking</category>
+			<category>System|Hardware|PCI/ISA/PCMCIA</category>
+			<category>System|Hardware|Other</category>
+			<category>System|Package Management</category>
+			<category>System|Security</category>
+			<category>System|Security|Firewall</category>
+			<category>System|Security|Intrusion Detection</category>
+			<category>System|Security|Virus</category>
+			<category>System|Security|Other</category>
+			<category>System|Services</category>
+			<category>System|Services|HTTP</category>
+			<category>System|Services|FTP</category>
+			<category>System|Services|SMB</category>
+			<category>System|Services|SSH</category>
+			<category>System|Services|Telnet</category>
+			<category>System|Services|Syslog</category>
+			<category>System|Services|BIND</category>
+			<category>System|Services|Printing</category>
+			<category>System|Services|Other</category>
+			<category>System|Other</category>
+	</toc>
 </toc>
diff --git a/stylesheets/ChangeLog b/stylesheets/ChangeLog
index 20819db8..e8941143 100644
--- a/stylesheets/ChangeLog
+++ b/stylesheets/ChangeLog
@@ -1,3 +1,15 @@
+2003-12-26  Shaun McCance  <shaunm@gnome.org>
+
+	* Makefile.am:
+	- Removed db2html-tmp.xsl:
+
+	* db2html-biblio.xsl:
+	* db2html-index.xsl:
+	* db2html-navbar.xsl:
+	* db2html-synopsis.xsl:
+	* db2html.xsl:
+	- Various additions and improvements.
+
 2003-12-24  Shaun McCance  <shaunm@gnome.org>
 
 	* Makefile.am:
diff --git a/stylesheets/Makefile.am b/stylesheets/Makefile.am
index 49e523ee..784b6503 100644
--- a/stylesheets/Makefile.am
+++ b/stylesheets/Makefile.am
@@ -27,7 +27,6 @@ yelpcustomization_DATA = 	\
 	db2html-table.xsl	\
 	db2html-title.xsl	\
 	db2html-titlepage.xsl	\
-	db2html-tmp.xsl		\
 	db2html-toc.xsl		\
 	db2html-xref.xsl	\
 	db2html.xsl		\
diff --git a/stylesheets/db2html-biblio.xsl b/stylesheets/db2html-biblio.xsl
index d2333990..11c6afe8 100644
--- a/stylesheets/db2html-biblio.xsl
+++ b/stylesheets/db2html-biblio.xsl
@@ -8,7 +8,7 @@
 </xsl:template>
 
 <xsl:template match="bibliodiv">
-	<xsl:call-template name="FIXME"/>
+	<xsl:call-template name="block.simple"/>
 </xsl:template>
 
 <xsl:template match="biblioentry">
diff --git a/stylesheets/db2html-index.xsl b/stylesheets/db2html-index.xsl
index e3a9d423..f5d7c256 100644
--- a/stylesheets/db2html-index.xsl
+++ b/stylesheets/db2html-index.xsl
@@ -4,7 +4,7 @@
                 version="1.0">
 
 <xsl:template match="indexdiv">
-	<xsl:call-template name="FIXME"/>
+	<xsl:call-template name="block.simple"/>
 </xsl:template>
 
 <xsl:template match="indexentry">
diff --git a/stylesheets/db2html-navbar.xsl b/stylesheets/db2html-navbar.xsl
index 050d0d34..7f3b38ea 100644
--- a/stylesheets/db2html-navbar.xsl
+++ b/stylesheets/db2html-navbar.xsl
@@ -2,30 +2,30 @@
 <!DOCTYPE xsl:stylesheet [
 <!ENTITY is-division "(
 	(name(.) = 'appendix')	or (name(.) = 'article')      or
-	(name(.) = 'book')	or (name(.) = 'bibliography') or
+	(name(.) = 'book')		or (name(.) = 'bibliography') or
 	(name(.) = 'chapter')	or (name(.) = 'colophon')     or
 	(name(.) = 'glossary')	or (name(.) = 'index')        or
-	(name(.) = 'part')	or (name(.) = 'preface')      or
+	(name(.) = 'part')		or (name(.) = 'preface')      or
 	(name(.) = 'reference')	or (name(.) = 'refentry')     or
 	(name(.) = 'refsect1')	or (name(.) = 'refsect2')     or
 	(name(.) = 'refsect3')	or (name(.) = 'refsection')   or
-	(name(.) = 'sect1')	or (name(.) = 'sect2')        or
-	(name(.) = 'sect3')	or (name(.) = 'sect4')        or
-	(name(.) = 'sect5')	or (name(.) = 'section')      or
-	(name(.) = 'set')	or (name(.) = 'setindex')     or
+	(name(.) = 'sect1')		or (name(.) = 'sect2')        or
+	(name(.) = 'sect3')		or (name(.) = 'sect4')        or
+	(name(.) = 'sect5')		or (name(.) = 'section')      or
+	(name(.) = 'set')			or (name(.) = 'setindex')     or
 	(name(.) = 'simplesect'))">
 <!ENTITY is-info "(
-	(name(.) = 'appendixinfo')	or (name(.) = 'articleinfo')    or
+	(name(.) = 'appendixinfo')			or (name(.) = 'articleinfo')    or
 	(name(.) = 'bibliographyinfo')	or (name(.) = 'bookinfo')       or
-	(name(.) = 'chapterinfo')	or (name(.) = 'glossaryinfo')   or
-	(name(.) = 'indexinfo')		or (name(.) = 'partinfo')       or
-	(name(.) = 'prefaceinfo')	or (name(.) = 'refentryinfo')   or
-	(name(.) = 'referenceinfo')	or (name(.) = 'refsect1info')   or
-	(name(.) = 'refsect2info')	or (name(.) = 'refsect3info')   or
-	(name(.) = 'refsectioninfo')	or (name(.) = 'sect1info')      or
-	(name(.) = 'sect2info')		or (name(.) = 'sect3info')      or
-	(name(.) = 'sect4info')		or (name(.) = 'sect5info')      or
-	(name(.) = 'sectioninfo')	or (name(.) = 'setinfo')        or
+	(name(.) = 'chapterinfo')			or (name(.) = 'glossaryinfo')   or
+	(name(.) = 'indexinfo')				or (name(.) = 'partinfo')       or
+	(name(.) = 'prefaceinfo')			or (name(.) = 'refentryinfo')   or
+	(name(.) = 'referenceinfo')		or (name(.) = 'refsect1info')   or
+	(name(.) = 'refsect2info')			or (name(.) = 'refsect3info')   or
+	(name(.) = 'refsectioninfo')		or (name(.) = 'sect1info')      or
+	(name(.) = 'sect2info')				or (name(.) = 'sect3info')      or
+	(name(.) = 'sect4info')				or (name(.) = 'sect5info')      or
+	(name(.) = 'sectioninfo')			or (name(.) = 'setinfo')        or
 	(name(.) = 'setindexinfo'))">
 ]>
 
diff --git a/stylesheets/db2html-synopsis.xsl b/stylesheets/db2html-synopsis.xsl
index 31173c44..620e021c 100644
--- a/stylesheets/db2html-synopsis.xsl
+++ b/stylesheets/db2html-synopsis.xsl
@@ -15,6 +15,19 @@
 	</xsl:if>
 </xsl:template>
 
+<xsl:variable name="tab_cpp">
+	<xsl:text>&#160;&#160;&#160;&#160;</xsl:text>
+</xsl:variable>
+<xsl:variable name="tab_idl">
+	<xsl:text>&#160;&#160;&#160;&#160;</xsl:text>
+</xsl:variable>
+<xsl:variable name="tab_java">
+	<xsl:text>&#160;&#160;&#160;&#160;</xsl:text>
+</xsl:variable>
+<xsl:variable name="tab_python">
+	<xsl:text>&#160;&#160;&#160;&#160;</xsl:text>
+</xsl:variable>
+
 <!-- == classsynopsis ====================================================== -->
 
 <xsl:template match="classsynopsisinfo">
@@ -45,11 +58,20 @@
 		<xsl:when test="$language = 'java'">
 			<xsl:apply-templates select="." mode="classsynopsis.java"/>
 		</xsl:when>
-		<xsl:when test="$language = 'perl'">
-			<xsl:apply-templates select="." mode="classsynopsis.perl"/>
-		</xsl:when>
 		<xsl:when test="$language = 'python'">
-			<xsl:apply-templates select="." mode="classsynopsis.perl"/>
+			<xsl:apply-templates select="." mode="classsynopsis.python"/>
+		</xsl:when>
+		<xsl:when test="$language = $classsynopsis_default_language">
+			<!--
+				If we are using the default language and we got this
+				far, we should error out, rather than re-applying with
+				the default language.  Otherwise we get an infinite loop.
+			-->
+			<xsl:message>
+				<xsl:text>No information about the language '</xsl:text>
+				<xsl:value-of select="$language"/>
+				<xsl:text>' for classsynopsis.</xsl:text>
+			</xsl:message>
 		</xsl:when>
 		<xsl:otherwise>
 			<xsl:apply-templates select=".">
@@ -186,433 +208,367 @@
 	<xsl:text>void</xsl:text>
 </xsl:template>
 
-<!-- == synopsis.cpp.mode ================================================== -->
-
-<xsl:template mode="synopsis.cpp.mode" match="*">
-	<xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template mode="synopsis.cpp.mode" match="classsynopsis">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.cpp.mode" match="classsynopsisinfo">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.cpp.mode" match="classname">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.cpp.mode" match="constructorsynopsis">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.cpp.mode" match="destructorsynopsis">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.cpp.mode" match="exceptionname">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.cpp.mode" match="fieldsynopsis">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.cpp.mode" match="initializer">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.cpp.mode" match="interfacename">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.cpp.mode" match="methodname">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.cpp.mode" match="methodparam">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.cpp.mode" match="methodsynopsis">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.cpp.mode" match="modifier">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.cpp.mode" match="ooclass">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.cpp.mode" match="ooexception">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.cpp.mode" match="oointerface">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.cpp.mode" match="parameter">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.cpp.mode" match="type">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.cpp.mode" match="varname">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.cpp.mode" match="void">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<!-- == synopsis.idl.mode ================================================== -->
+<!-- == classsynopsis.cpp ================================================== -->
 
-<xsl:template mode="synopsis.idl.mode" match="*">
+<xsl:template mode="classsynopsis.cpp" match="*">
 	<xsl:apply-templates select="."/>
 </xsl:template>
 
-<xsl:template mode="synopsis.idl.mode" match="classsynopsis">
+<xsl:template mode="classsynopsis.cpp" match="classsynopsis">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.idl.mode" match="classsynopsisinfo">
+<xsl:template mode="classsynopsis.cpp" match="classsynopsisinfo">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.idl.mode" match="classname">
+<xsl:template mode="classsynopsis.cpp" match="classname">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.idl.mode" match="constructorsynopsis">
+<xsl:template mode="classsynopsis.cpp" match="constructorsynopsis">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.idl.mode" match="destructorsynopsis">
+<xsl:template mode="classsynopsis.cpp" match="destructorsynopsis">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.idl.mode" match="exceptionname">
+<xsl:template mode="classsynopsis.cpp" match="exceptionname">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.idl.mode" match="fieldsynopsis">
+<xsl:template mode="classsynopsis.cpp" match="fieldsynopsis">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.idl.mode" match="initializer">
+<xsl:template mode="classsynopsis.cpp" match="initializer">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.idl.mode" match="interfacename">
+<xsl:template mode="classsynopsis.cpp" match="interfacename">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.idl.mode" match="methodname">
+<xsl:template mode="classsynopsis.cpp" match="methodname">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.idl.mode" match="methodparam">
+<xsl:template mode="classsynopsis.cpp" match="methodparam">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.idl.mode" match="methodsynopsis">
+<xsl:template mode="classsynopsis.cpp" match="methodsynopsis">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.idl.mode" match="modifier">
+<xsl:template mode="classsynopsis.cpp" match="modifier">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.idl.mode" match="ooclass">
+<xsl:template mode="classsynopsis.cpp" match="ooclass">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.idl.mode" match="ooexception">
+<xsl:template mode="classsynopsis.cpp" match="ooexception">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.idl.mode" match="oointerface">
+<xsl:template mode="classsynopsis.cpp" match="oointerface">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.idl.mode" match="parameter">
+<xsl:template mode="classsynopsis.cpp" match="parameter">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.idl.mode" match="type">
+<xsl:template mode="classsynopsis.cpp" match="type">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.idl.mode" match="varname">
+<xsl:template mode="classsynopsis.cpp" match="varname">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.idl.mode" match="void">
+<xsl:template mode="classsynopsis.cpp" match="void">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<!-- == synopsis.java.mode ================================================= -->
+<!-- == classsynopsis.idl ================================================== -->
 
-<xsl:template mode="synopsis.java.mode" match="*">
+<xsl:template mode="classsynopsis.idl" match="*">
 	<xsl:apply-templates select="."/>
 </xsl:template>
 
-<xsl:template mode="synopsis.java.mode" match="classsynopsis">
+<xsl:template mode="classsynopsis.idl" match="classsynopsis">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.java.mode" match="classsynopsisinfo">
+<xsl:template mode="classsynopsis.idl" match="classsynopsisinfo">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.java.mode" match="classname">
+<xsl:template mode="classsynopsis.idl" match="classname">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.java.mode" match="constructorsynopsis">
+<xsl:template mode="classsynopsis.idl" match="constructorsynopsis">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.java.mode" match="destructorsynopsis">
+<xsl:template mode="classsynopsis.idl" match="destructorsynopsis">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.java.mode" match="exceptionname">
+<xsl:template mode="classsynopsis.idl" match="exceptionname">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.java.mode" match="fieldsynopsis">
+<xsl:template mode="classsynopsis.idl" match="fieldsynopsis">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.java.mode" match="initializer">
+<xsl:template mode="classsynopsis.idl" match="initializer">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.java.mode" match="interfacename">
+<xsl:template mode="classsynopsis.idl" match="interfacename">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.java.mode" match="methodname">
+<xsl:template mode="classsynopsis.idl" match="methodname">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.java.mode" match="methodparam">
+<xsl:template mode="classsynopsis.idl" match="methodparam">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.java.mode" match="methodsynopsis">
+<xsl:template mode="classsynopsis.idl" match="methodsynopsis">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.java.mode" match="modifier">
+<xsl:template mode="classsynopsis.idl" match="modifier">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.java.mode" match="ooclass">
+<xsl:template mode="classsynopsis.idl" match="ooclass">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.java.mode" match="ooexception">
+<xsl:template mode="classsynopsis.idl" match="ooexception">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.java.mode" match="oointerface">
+<xsl:template mode="classsynopsis.idl" match="oointerface">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.java.mode" match="parameter">
+<xsl:template mode="classsynopsis.idl" match="parameter">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.java.mode" match="type">
+<xsl:template mode="classsynopsis.idl" match="type">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.java.mode" match="varname">
+<xsl:template mode="classsynopsis.idl" match="varname">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.java.mode" match="void">
+<xsl:template mode="classsynopsis.idl" match="void">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<!-- == synopsis.perl.mode ================================================= -->
+<!-- == classsynopsis.java ================================================= -->
 
-<xsl:template mode="synopsis.perl.mode" match="*">
+<xsl:template mode="classsynopsis.java" match="*">
 	<xsl:apply-templates select="."/>
 </xsl:template>
 
-<xsl:template mode="synopsis.perl.mode" match="classsynopsis">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.perl.mode" match="classsynopsisinfo">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.perl.mode" match="classname">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.perl.mode" match="constructorsynopsis">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.perl.mode" match="destructorsynopsis">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.perl.mode" match="exceptionname">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.perl.mode" match="fieldsynopsis">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.perl.mode" match="initializer">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.perl.mode" match="interfacename">
-	<xsl:call-template name="FIXME"/>
-</xsl:template>
-
-<xsl:template mode="synopsis.perl.mode" match="methodname">
-	<xsl:call-template name="FIXME"/>
+<xsl:template mode="classsynopsis.java" match="classsynopsis">
+	<div class="{name(.)}"><pre class="java">
+		<xsl:choose>
+			<xsl:when test="@class = 'interface'">
+				<xsl:call-template name="FIXME"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-template mode="classsynopsis.java" select="ooclass[1]"/>
+				<xsl:if test="ooclass[position() &gt; 1]">
+					<xsl:text> extends</xsl:text>
+					<xsl:foreach match="ooclass[position() &gt; 1]">
+						<xsl:text> </xsl:text>
+						<xsl:apply-template mode="classsynopis.java" select="."/>
+						<xsl:if test="following-sibling::ooclass">
+							<xsl:text>,</xsl:text>
+						</xsl:if>
+					</xsl:foreach>
+					<xsl:if test="oointerface|ooexception">
+						<xsl:value-of select="concat($newline, $tab_java)"/>
+					</xsl:if>
+				</xsl:if>
+				<xsl:if test="oointerface">
+					<xsl:text>implements</xsl:text>
+					<xsl:foreach match="oointerface">
+						<xsl:text> </xsl:text>
+						<xsl:apply-template mode="classsynopis.java" select="."/>
+						<xsl:if test="following-sibling::oointerface">
+							<xsl:text>,</xsl:text>
+						</xsl:if>
+					</xsl:foreach>
+					<xsl:if test="ooexception">
+						<xsl:value-of select="concat($newline, $tab_java)"/>
+					</xsl:if>
+				</xsl:if>
+				<xsl:if text="ooexception">
+					<xsl:text>throws</xsl:text>
+					<xsl:foreach match="ooexception">
+						<xsl:text> </xsl:text>
+						<xsl:apply-template mode="classsynopis.java" select="."/>
+						<xsl:if test="following-sibling::ooexception">
+							<xsl:text>,</xsl:text>
+						</xsl:if>
+					</xsl:foreach>
+				</xsl:if>
+			</xsl:otherwise>
+		</xsl:choose>
+		<xsl:value-of select="$newline"/>
+		<xsl:text>{</xsl:text>
+		<xsl:apply-templates mode="classsynopsis.java" select="
+			constructorsynopsis	| destructorsynopsis	| fieldsynopsis	|
+			methodsynopsis			| classsynopsis		"/>
+		<xsl:text>}</xsl:text>
+	</pre></div>
 </xsl:template>
 
-<xsl:template mode="synopsis.perl.mode" match="methodparam">
-	<xsl:call-template name="FIXME"/>
+<xsl:template mode="classsynopsis.java" match="classsynopsisinfo">
+	<xsl:apply-template mode="classsynopsis.java"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.perl.mode" match="methodsynopsis">
+<xsl:template mode="classsynopsis.java" match="constructorsynopsis">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.perl.mode" match="modifier">
+<xsl:template mode="classsynopsis.java" match="destructorsynopsis">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.perl.mode" match="ooclass">
+<xsl:template mode="classsynopsis.java" match="exceptionname">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.perl.mode" match="ooexception">
+<xsl:template mode="classsynopsis.java" match="fieldsynopsis">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.perl.mode" match="oointerface">
+<xsl:template mode="classsynopsis.java" match="initializer">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.perl.mode" match="parameter">
+<xsl:template mode="classsynopsis.java" match="methodparam">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.perl.mode" match="type">
+<xsl:template mode="classsynopsis.java" match="methodsynopsis">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.perl.mode" match="varname">
-	<xsl:call-template name="FIXME"/>
+<xsl:template mode="classsynopsis.java" match="
+		classname		| exceptionname	| interfacename	| methodname	|
+		modifier			| ooclass			| ooexception		| oointerface	|
+		parameter		| type				| varname			">
+	<span class="{name(.)}">
+		<xsl:apply-templates mode="classsynopsis.java"/>
+	</span>
 </xsl:template>
 
-<xsl:template mode="synopsis.perl.mode" match="void">
-	<xsl:call-template name="FIXME"/>
+<xsl:template mode="classsynopsis.java" match="void">
+	<span class="{name(.)}">void</span>
 </xsl:template>
 
-<!-- == synopsis.python.mode ================================================= -->
+<!-- == classsynopsis.python ================================================= -->
 
-<xsl:template mode="synopsis.python.mode" match="*">
+<xsl:template mode="classsynopsis.python" match="*">
 	<xsl:apply-templates select="."/>
 </xsl:template>
 
-<xsl:template mode="synopsis.python.mode" match="classsynopsis">
+<xsl:template mode="classsynopsis.python" match="classsynopsis">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.python.mode" match="classsynopsisinfo">
+<xsl:template mode="classsynopsis.python" match="classsynopsisinfo">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.python.mode" match="classname">
+<xsl:template mode="classsynopsis.python" match="classname">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.python.mode" match="constructorsynopsis">
+<xsl:template mode="classsynopsis.python" match="constructorsynopsis">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.python.mode" match="destructorsynopsis">
+<xsl:template mode="classsynopsis.python" match="destructorsynopsis">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.python.mode" match="exceptionname">
+<xsl:template mode="classsynopsis.python" match="exceptionname">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.python.mode" match="fieldsynopsis">
+<xsl:template mode="classsynopsis.python" match="fieldsynopsis">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.python.mode" match="initializer">
+<xsl:template mode="classsynopsis.python" match="initializer">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.python.mode" match="interfacename">
+<xsl:template mode="classsynopsis.python" match="interfacename">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.python.mode" match="methodname">
+<xsl:template mode="classsynopsis.python" match="methodname">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.python.mode" match="methodparam">
+<xsl:template mode="classsynopsis.python" match="methodparam">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.python.mode" match="methodsynopsis">
+<xsl:template mode="classsynopsis.python" match="methodsynopsis">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.python.mode" match="modifier">
+<xsl:template mode="classsynopsis.python" match="modifier">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.python.mode" match="ooclass">
+<xsl:template mode="classsynopsis.python" match="ooclass">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.python.mode" match="ooexception">
+<xsl:template mode="classsynopsis.python" match="ooexception">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.python.mode" match="oointerface">
+<xsl:template mode="classsynopsis.python" match="oointerface">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.python.mode" match="parameter">
+<xsl:template mode="classsynopsis.python" match="parameter">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.python.mode" match="type">
+<xsl:template mode="classsynopsis.python" match="type">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.python.mode" match="varname">
+<xsl:template mode="classsynopsis.python" match="varname">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
-<xsl:template mode="synopsis.python.mode" match="void">
+<xsl:template mode="classsynopsis.python" match="void">
 	<xsl:call-template name="FIXME"/>
 </xsl:template>
 
diff --git a/stylesheets/db2html.xsl b/stylesheets/db2html.xsl
index cf9863aa..d44ab9fb 100644
--- a/stylesheets/db2html.xsl
+++ b/stylesheets/db2html.xsl
@@ -2,6 +2,9 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
 
+<xsl:variable name="newline"><xsl:text>
+</xsl:text></xsl:variable>
+
 <xsl:include href="db2html-param.xsl"/>
 
 <xsl:include href="gettext.xsl"/>
diff --git a/test/testdoc1/Makefile.am b/test/testdoc1/Makefile.am
new file mode 100644
index 00000000..ac4b9696
--- /dev/null
+++ b/test/testdoc1/Makefile.am
@@ -0,0 +1,6 @@
+docname = testdoc1
+lang = C
+omffile = testdoc1.omf
+entities = legal.xml
+include $(top_srcdir)/xmldocs.make
+dist-hook: app-dist-hook
diff --git a/test/testdoc1/legal.xml b/test/testdoc1/legal.xml
new file mode 100644
index 00000000..d6906f9b
--- /dev/null
+++ b/test/testdoc1/legal.xml
@@ -0,0 +1,76 @@
+   <legalnotice id="legalnotice">
+         <para>
+           Permission is granted to copy, distribute and/or modify this
+           document under the terms of the GNU Free Documentation
+           License (GFDL), Version 1.1 or any later version published
+           by the Free Software Foundation with no Invariant Sections,
+           no Front-Cover Texts, and no Back-Cover Texts.  You can find
+           a copy of the GFDL at this <ulink type="help"
+           url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
+           distributed with this manual.
+          </para>
+          <para> This manual is part of a collection of GNOME manuals
+           distributed under the GFDL.  If you want to distribute this
+           manual separately from the collection, you can do so by
+           adding a copy of the license to the manual, as described in
+           section 6 of the license.
+         </para>
+ 
+         <para>
+           Many of the names used by companies to distinguish their
+           products and services are claimed as trademarks. Where those
+           names appear in any GNOME documentation, and the members of
+           the GNOME Documentation Project are made aware of those
+           trademarks, then the names are in capital letters or initial
+           capital letters.
+         </para>
+ 
+         <para>
+           DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED
+           UNDER  THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE
+           WITH THE FURTHER UNDERSTANDING THAT:
+ 
+           <orderedlist>
+                 <listitem>
+                   <para>DOCUMENT IS PROVIDED ON AN "AS IS" BASIS,
+                     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
+                     IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
+                     THAT THE DOCUMENT OR MODIFIED VERSION OF THE
+                     DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR
+                     A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE
+                     RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE
+                     OF THE DOCUMENT OR MODIFIED VERSION OF THE
+                     DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR
+                     MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT,
+                     YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY
+                     CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
+                     SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+                     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
+                     LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED
+                     VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER
+                     EXCEPT UNDER THIS DISCLAIMER; AND
+                   </para>
+                 </listitem>
+                 <listitem>
+                   <para>UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL
+                        THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE),
+                        CONTRACT, OR OTHERWISE, SHALL THE AUTHOR,
+                        INITIAL WRITER, ANY CONTRIBUTOR, OR ANY
+                        DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION
+                        OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH
+                        PARTIES, BE LIABLE TO ANY PERSON FOR ANY
+                        DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
+                        CONSEQUENTIAL DAMAGES OF ANY CHARACTER
+                        INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS
+                        OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
+                        MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR
+                        LOSSES ARISING OUT OF OR RELATING TO USE OF THE
+                        DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT,
+                        EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
+                        THE POSSIBILITY OF SUCH DAMAGES.
+                   </para>
+                 </listitem>
+           </orderedlist>
+         </para>
+   </legalnotice>
+ 
\ No newline at end of file
diff --git a/test/testdoc1/testdoc1.omf b/test/testdoc1/testdoc1.omf
new file mode 100644
index 00000000..dc55a41d
--- /dev/null
+++ b/test/testdoc1/testdoc1.omf
@@ -0,0 +1,16 @@
+<?xml version="1.0" standalone="no"?>
+<omf>
+  <resource>
+    <creator>Shaun McCance</creator>
+    <maintainer>Shaun McCance</maintainer>
+    <title>Yelp Test Document 1</title>
+    <date>2003-12-26</date>
+    <subject category="System|Other"/>
+    <type>user's guide</type>
+    <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.2.0//EN"/>
+    <identifier url="testdoc1.xml"/>
+    <language code="C"/>
+    <relation seriesid="0dfaa0a4-3814-11d8-96fc-ef3fefca084b"/>
+    <rights type="GNU FDL" license.version="1.1" holder="Shaun McCance"/>
+  </resource>
+</omf>
diff --git a/test/testdoc1/testdoc1.xml b/test/testdoc1/testdoc1.xml
new file mode 100644
index 00000000..a1fcfcf0
--- /dev/null
+++ b/test/testdoc1/testdoc1.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2.2//EN" 
+"http://www.oasis-open.org/docbook/xml/4.2.2/docbookx.dtd" [
+	<!ENTITY legal SYSTEM "legal.xml">
+  <!ENTITY yelp "<application>Yelp</application>">
+]>
+
+<article id="index" lang="en">
+<articleinfo> 
+	<title>Yelp Test Document 1</title>
+
+	<copyright>
+		<year>2003</year>
+		<holder>Shaun McCance</holder>
+	</copyright>
+
+	<publisher> 
+		<publishername>GNOME Documentation Project</publishername>
+	</publisher> 
+
+	&legal;
+
+	<authorgroup> 
+		<author>
+			<firstname>Shaun</firstname>
+			<surname>McCance</surname> 
+			<affiliation> 
+				<orgname>GNOME Documentation Project</orgname> 
+				<address><email>patanjali@codito.com</email></address> 
+			</affiliation> 
+		</author> 
+	</authorgroup>
+</articleinfo>
+
+<sect1 id="td-introduction">
+	<title>Introduction</title>
+	<para>
+		This document tests the DocBook transformations in &yelp;.
+	</para>
+</sect1>
+
+</article>