From 7c2df91f9257cc3d604ad4af855e92682541dc05 Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Sat, 23 Apr 2005 21:31:44 +0000
Subject: [PATCH] Still broken

---
 .../docbook/tests/skip/bibliography.001.xml    | 18 +++++++++---------
 .../docbook/tests/skip/bibliography.002.xml    | 18 +++++++++---------
 .../docbook/tests/skip/cmdsynopsis.002.xml     | 10 +++++-----
 .../docbook/tests/skip/legalnotice.001.xml     |  4 ++--
 docbook/relaxng/docbook/tests/skip/toc.001.xml |  2 +-
 .../docbook/tests/skip/variablelist.002.xml    |  4 ++--
 .../relaxng/docbook/tests/skip/xref.002.xml    |  6 +++---
 7 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/docbook/relaxng/docbook/tests/skip/bibliography.001.xml b/docbook/relaxng/docbook/tests/skip/bibliography.001.xml
index c9d0f1e2c..e8d467f4b 100644
--- a/docbook/relaxng/docbook/tests/skip/bibliography.001.xml
+++ b/docbook/relaxng/docbook/tests/skip/bibliography.001.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bibliography xmlns="http://docbook.org/docbook-ng" version="hard cider">
+<bibliography xmlns="http://docbook.org/ns/docbook" version="kahlúa">
 <info><title>Unit Test: bibliography.001</title>
 
 <releaseinfo role="CVS">$Id$</releaseinfo>
@@ -13,7 +13,7 @@
     <author><personname><firstname>Ravi</firstname><surname>Sethi</surname></personname></author>
     <author><personname><firstname>Jeffrey D.</firstname><surname>Ullman</surname></personname></author>
   </authorgroup>
-      
+  <citetitle>Compilers, Principles, Techniques, and Tools</citetitle>    
   <publisher>
     <publishername>Addison-Wesley Publishing Company</publishername>
   </publisher>
@@ -43,14 +43,14 @@
 <biblioentry xml:id="Walsh97">
   <abbrev>Walsh97</abbrev>
   <biblioset relation="article">
-    
+    <citetitle>A Guide to XML</citetitle>
     <author><personname><surname>Walsh</surname><firstname>Norman</firstname></personname></author>
     <pubdate>1997</pubdate>
     <copyright><year>1997</year><holder>ArborText, Inc.</holder></copyright>
     <pagenums>97-108</pagenums>
   </biblioset>
   <biblioset relation="journal">
-    
+    <citetitle>XML: Principles, Tools, and Techniques</citetitle>
     <publisher>
       <publishername>O'Reilly &amp; Associates, Inc.</publishername>
     </publisher>
@@ -61,8 +61,8 @@
 
 <biblioentry>
 <abbrev>Abbrev</abbrev>
-
-
+<citetitle>A Really Full BiblioEntry</citetitle>
+<subtitle>Subtitle</subtitle>
 <abstract><para>
 Abstract, abstract, abstract. Abstract, abstract, abstract. 
 Abstract, abstract, abstract. Abstract, abstract, abstract. 
@@ -168,17 +168,17 @@ PrintHistory, printhistory, printhistory. PrintHistory, printhistory.
 </revhistory>
 <seriesvolnums>SeriesVolNums</seriesvolnums>
 
-
+<titleabbrev>TitleAbbrev</titleabbrev>
 <volumenum>VolumeNum</volumenum>
 </biblioentry>
 
 <bibliomixed xml:id="Walsh96">
   <bibliomset relation="article">
     <personname><surname>Walsh</surname><firstname>Norman</firstname></personname>, .
-    .
+    <citetitle role="article">Introduction to Cascading Style Sheets</citetitle>.
   </bibliomset>
   <bibliomset relation="journal">
-    .
+    <citetitle>The World Wide Web Journal</citetitle>.
     <volumenum>2</volumenum>(<issuenum>1</issuenum>).
     <publishername>O'Reilly &amp; Associates, Inc.</publishername> and
     <orgname>The World Wide Web Consortium</orgname>.
diff --git a/docbook/relaxng/docbook/tests/skip/bibliography.002.xml b/docbook/relaxng/docbook/tests/skip/bibliography.002.xml
index f17ddf66b..e9e8b267d 100644
--- a/docbook/relaxng/docbook/tests/skip/bibliography.002.xml
+++ b/docbook/relaxng/docbook/tests/skip/bibliography.002.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bibliography xmlns="http://docbook.org/docbook-ng" version="hard cider">
+<bibliography xmlns="http://docbook.org/ns/docbook" version="kahlúa">
 <info><title>Unit Test: bibliography.002</title>
 
 <releaseinfo role="CVS">$Id$</releaseinfo>
@@ -15,7 +15,7 @@
     <author><personname><firstname>Ravi</firstname><surname>Sethi</surname></personname></author>
     <author><personname><firstname>Jeffrey D.</firstname><surname>Ullman</surname></personname></author>
   </authorgroup>
-      
+  <citetitle>Compilers, Principles, Techniques, and Tools</citetitle>    
   <publisher>
     <publishername>Addison-Wesley Publishing Company</publishername>
   </publisher>
@@ -28,14 +28,14 @@
 <biblioentry xml:id="Walsh97">
   <abbrev>Walsh97</abbrev>
   <biblioset relation="article">
-    
+    <citetitle>A Guide to XML</citetitle>
     <author><personname><surname>Walsh</surname><firstname>Norman</firstname></personname></author>
     <pubdate>1997</pubdate>
     <copyright><year>1997</year><holder>ArborText, Inc.</holder></copyright>
     <pagenums>97-108</pagenums>
   </biblioset>
   <biblioset relation="journal">
-    
+    <citetitle>XML: Principles, Tools, and Techniques</citetitle>
     <publisher>
       <publishername>O'Reilly &amp; Associates, Inc.</publishername>
     </publisher>
@@ -46,8 +46,8 @@
 
 <biblioentry>
 <abbrev>Abbrev</abbrev>
-
-
+<citetitle>A Really Full BiblioEntry</citetitle>
+<subtitle>Subtitle</subtitle>
 <abstract><para>
 Abstract, abstract, abstract. Abstract, abstract, abstract. 
 Abstract, abstract, abstract. Abstract, abstract, abstract. 
@@ -153,7 +153,7 @@ PrintHistory, printhistory, printhistory. PrintHistory, printhistory.
 </revhistory>
 <seriesvolnums>SeriesVolNums</seriesvolnums>
 
-
+<titleabbrev>TitleAbbrev</titleabbrev>
 <volumenum>VolumeNum</volumenum>
 </biblioentry>
 
@@ -163,10 +163,10 @@ PrintHistory, printhistory, printhistory. PrintHistory, printhistory.
 <bibliomixed xml:id="Walsh96">
   <bibliomset relation="article">
     <personname><surname>Walsh</surname><firstname>Norman</firstname></personname>, .
-    .
+    <citetitle role="article">Introduction to Cascading Style Sheets</citetitle>.
   </bibliomset>
   <bibliomset relation="journal">
-    .
+    <citetitle>The World Wide Web Journal</citetitle>.
     <volumenum>2</volumenum>(<issuenum>1</issuenum>).
     <publishername>O'Reilly &amp; Associates, Inc.</publishername> and
     <orgname>The World Wide Web Consortium</orgname>.
diff --git a/docbook/relaxng/docbook/tests/skip/cmdsynopsis.002.xml b/docbook/relaxng/docbook/tests/skip/cmdsynopsis.002.xml
index b18fc8a12..8f57a14a1 100644
--- a/docbook/relaxng/docbook/tests/skip/cmdsynopsis.002.xml
+++ b/docbook/relaxng/docbook/tests/skip/cmdsynopsis.002.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<article>
+<article xmlns="http://docbook.org/ns/docbook" version="kahlúa">
 <info><title>Unit test: cmdsynopsis.002</title>
 
 <releaseinfo role="CVS">$Id$</releaseinfo>
@@ -15,12 +15,12 @@
 
       <glossentry>
         <glossterm>
-          <cmdsynopsis sepchar=" ">
+          <cmdsynopsis>
             <command>command</command>
-            <arg choice="req" rep="norepeat">req</arg>
+            <arg choice="req">req</arg>
             <arg choice="req" rep="repeat">repeatandreq</arg>
-            <arg rep="repeat" choice="opt">repeat</arg>
-            <arg choice="opt" rep="norepeat">optional</arg>
+            <arg rep="repeat">repeat</arg>
+            <arg>optional</arg>
           </cmdsynopsis>
         </glossterm>
         <glossdef>
diff --git a/docbook/relaxng/docbook/tests/skip/legalnotice.001.xml b/docbook/relaxng/docbook/tests/skip/legalnotice.001.xml
index f2b7b5d35..845c36737 100644
--- a/docbook/relaxng/docbook/tests/skip/legalnotice.001.xml
+++ b/docbook/relaxng/docbook/tests/skip/legalnotice.001.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<book id="legalnotice.001">
+<book xmlns="http://docbook.org/ns/docbook" version="kahlúa" xml:id="legalnotice.001">
 <info><title>Unit Test: legalnotice.001</title>
 
 <releaseinfo role="CVS">$Id$</releaseinfo>
@@ -15,7 +15,7 @@
         available. It is available. It is available. It is available.
       </para>
       <para>
-        We're testing how <xmltag class="element">productname</xmltag> looks inside of <xmltag class="element">legalnotice</xmltag>.
+        We're testing how <tag class="element">productname</tag> looks inside of <tag class="element">legalnotice</tag>.
       </para>
     </legalnotice>
 </info>
diff --git a/docbook/relaxng/docbook/tests/skip/toc.001.xml b/docbook/relaxng/docbook/tests/skip/toc.001.xml
index 170bcc05b..c024b1da0 100644
--- a/docbook/relaxng/docbook/tests/skip/toc.001.xml
+++ b/docbook/relaxng/docbook/tests/skip/toc.001.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<book>
+<book xmlns="http://docbook.org/ns/docbook" version="kahlúa">
 <info><title>Unit Test: toc.001</title>
 
 <releaseinfo role="CVS">$Id$</releaseinfo>
diff --git a/docbook/relaxng/docbook/tests/skip/variablelist.002.xml b/docbook/relaxng/docbook/tests/skip/variablelist.002.xml
index 318f69e58..28d9a7464 100644
--- a/docbook/relaxng/docbook/tests/skip/variablelist.002.xml
+++ b/docbook/relaxng/docbook/tests/skip/variablelist.002.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<article>
+<article xmlns="http://docbook.org/ns/docbook" version="kahlúa">
 <info><title>Unit Test: variablelist.002</title>
 
 <releaseinfo role="CVS">$Id$</releaseinfo>
@@ -16,7 +16,7 @@
         <type>void</type>
         <methodname>import</methodname>
 
-        <methodparam choice="req" rep="norepeat">
+        <methodparam>
           <type>HttpServletRequest</type>
           <parameter>req</parameter>
         </methodparam>
diff --git a/docbook/relaxng/docbook/tests/skip/xref.002.xml b/docbook/relaxng/docbook/tests/skip/xref.002.xml
index 5476f97c7..21eca15db 100644
--- a/docbook/relaxng/docbook/tests/skip/xref.002.xml
+++ b/docbook/relaxng/docbook/tests/skip/xref.002.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<article id="article">
+<article xmlns="http://docbook.org/ns/docbook" version="kahlúa" xml:id="article">
 <info><title>Unit Test: xref.002.xml</title>
 
 <releaseinfo role="CVS">$Id$</releaseinfo>
@@ -19,14 +19,14 @@
 <para>Cross reference to section two with endterm:
 <xref linkend="s2" endterm="xreftext"/>.</para>
 
-<section id="s1"><info><title>Section One Title</title></info>
+<section xml:id="s1"><info><title>Section One Title</title></info>
 
 
 <para>This text is irrelevant.</para>
 
 </section>
 
-<section id="s2" xreflabel="Section Two XRefLabel"><info><title>Section Two Title</title></info>
+<section xml:id="s2" xreflabel="Section Two XRefLabel"><info><title>Section Two Title</title></info>
 
 
 <para>This text is irrelevant.</para>
-- 
2.40.0