- Removed the xmllint of the source

* test/testdocs/Makefile:
- Removed the xmllint of the source

* test/testdocs/README:
* test/testdocs/classsynopsis.x001.xml:
* test/testdocs/epigraph.001.xml:
- Added classsynopsis.x001.xml
- Corrected the title of epigraph.001.xml

* test/testdocs/db2html.xsl:
- Got the title override for the source block better

* xslt/docbook/html/db2html-classsynopsis.xsl:
- Implemented classsynopsis for C++

* xslt/docbook/html/db2html-funcsynopsis.xsl:
- Match initializer

5 files changed, 75 insertions, 4 deletions

diff --git a/test/testdocs/Makefile b/test/testdocs/Makefile
index 33819c9..6e9fc43 100644
--- a/test/testdocs/Makefile
+++ b/test/testdocs/Makefile
@@ -12,7 +12,6 @@ htmlargs =							\
 
 $(htmls) : html/% : %.xml
 	@mkdir -p $@
-	xmllint $< > $@/$<
 	xsltproc $(call htmlargs,$@) $<
 
 test: $(htmls)
diff --git a/test/testdocs/README b/test/testdocs/README
index e251023..c1a7d90 100644
--- a/test/testdocs/README
+++ b/test/testdocs/README
@@ -5,5 +5,8 @@ change in this file so that change can be preserved when upgrading
 to newer versions of docbook-testdocs.
 
 These files are not found in docbook-testdocs:
+classsynopsis.x001.xml
 funcsynopsis.x001.xml
 simplelist.x001.xml
+
+The title of epigraph.001 was changed from article.001 to epigraph.001
diff --git a/test/testdocs/classsynopsis.x001.xml b/test/testdocs/classsynopsis.x001.xml
new file mode 100644
index 0000000..594fa18
--- /dev/null
+++ b/test/testdocs/classsynopsis.x001.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+                  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<article>
+<articleinfo>
+<title>Unit Test: classsynopsis.x001</title>
+<releaseinfo role="CVS">$Id$</releaseinfo>
+<author><firstname>Shaun</firstname><surname>McCance</surname>
+        <affiliation><address><email>shaunm@gnome.org</email></address></affiliation>
+</author>
+</articleinfo>
+
+<para>
+  Here is a <sgmltag>classsynopsis</sgmltag> for C++:
+</para>
+
+<classsynopsis language="cpp">
+  <ooclass><modifier>public</modifier><classname>FooBar</classname></ooclass>
+  <ooclass><modifier>public</modifier><classname>Foo</classname></ooclass>
+  <ooclass><modifier>public</modifier><classname>Bar</classname></ooclass>
+  <fieldsynopsis>
+    <modifier>public</modifier>
+    <type>int</type>
+    <varname>fooNum</varname>
+    <initializer>5</initializer>
+  </fieldsynopsis>
+  <constructorsynopsis>
+    <modifier>public</modifier>
+    <methodname>Catalog</methodname>
+    <void/>
+  </constructorsynopsis>
+  <constructorsynopsis>
+    <modifier>public</modifier>
+    <methodparam>
+      <type>Foo</type>
+      <parameter>arg1</parameter>
+    </methodparam>
+    <methodparam>
+      <type>Bar</type>
+      <parameter>arg2</parameter>
+    </methodparam>
+  </constructorsynopsis>
+  <destructorsynopsis>
+    <modifier>public</modifier>
+    <methodname>~FooBar</methodname>
+    <void/>
+  </destructorsynopsis>
+  <destructorsynopsis>
+    <modifier>public</modifier>
+    <methodparam>
+      <type>Foo</type>
+      <parameter>arg1</parameter>
+    </methodparam>
+    <methodparam>
+      <type>Bar</type>
+      <parameter>arg2</parameter>
+    </methodparam>
+  </destructorsynopsis>
+  <methodsynopsis>
+    <modifier>protected</modifier>
+    <methodname>frobnicate</methodname>
+    <methodparam>
+      <type>FooBar</type>
+      <parameter>frobFoo</parameter>
+    </methodparam>
+  </methodsynopsis>
+</classsynopsis>
+
+</article>
diff --git a/test/testdocs/db2html.xsl b/test/testdocs/db2html.xsl
index 82d25e5..137c1e1 100644
--- a/test/testdocs/db2html.xsl
+++ b/test/testdocs/db2html.xsl
@@ -5,7 +5,7 @@
 
 <xsl:include href="../../xslt/docbook/html/db2html.xsl"/>
 
-<xsl:template match="articleinfo/title | bookinfo/title">
+<xsl:template match="/*/*[1]/title | /*/title">
   <xsl:param name="title_for" select=".."/>
   <xsl:param name="depth_in_chunk">
     <xsl:call-template name="db.chunk.depth-in-chunk"/>
diff --git a/test/testdocs/epigraph.001.xml b/test/testdocs/epigraph.001.xml
index a6e8ddd..b6bc441 100644
--- a/test/testdocs/epigraph.001.xml
+++ b/test/testdocs/epigraph.001.xml
@@ -3,7 +3,7 @@
                   "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 <chapter>
 <chapterinfo>
-<title>Unit Test: article.001.xml</title>
+<title>Unit Test: epigraph.001.xml</title>
 <releaseinfo role="CVS">$Id$</releaseinfo>
 <authorgroup>
 <author><firstname>Norman</firstname><surname>Walsh</surname>
@@ -12,7 +12,7 @@
 <author><firstname>Jane</firstname><surname>Doe</surname></author>
 </authorgroup>
 </chapterinfo>
-<title>Unit Test: article.001.xml</title>
+<title>Unit Test: epigraph.001.xml</title>
 <epigraph><attribution>H. W. Longfellow</attribution>
 <para>If we could read the secret history
 of our enemies, we should find in in each one's life sorrow and