Reorganize CVS directory structure

diff --git a/docbook/relaxng/tests/skip/README b/docbook/relaxng/docbook/tests/skip/README
similarity index 100%
rename from docbook/relaxng/tests/skip/README
rename to docbook/relaxng/docbook/tests/skip/README

diff --git a/docbook/relaxng/docbook/tests/skip/bibliography.001.xml b/docbook/relaxng/docbook/tests/skip/bibliography.001.xml
new file mode 100644 (file)
index 0000000..c9d0f1e
--- /dev/null
+++ b/docbook/relaxng/docbook/tests/skip/bibliography.001.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bibliography xmlns="http://docbook.org/docbook-ng" version="hard cider">
+<info><title>Unit Test: bibliography.001</title>
+
+<releaseinfo role="CVS">$Id$</releaseinfo>
+<author><personname><firstname>Norman</firstname><surname>Walsh</surname></personname><affiliation><address><email>ndw@nwalsh.com</email></address></affiliation></author>
+</info>
+
+<biblioentry>
+  <abbrev>AhoSethiUllman96</abbrev>
+  <authorgroup>
+    <author><personname><firstname>Alfred V.</firstname><surname>Aho</surname></personname></author>  
+    <author><personname><firstname>Ravi</firstname><surname>Sethi</surname></personname></author>
+    <author><personname><firstname>Jeffrey D.</firstname><surname>Ullman</surname></personname></author>
+  </authorgroup>
+      
+  <publisher>
+    <publishername>Addison-Wesley Publishing Company</publishername>
+  </publisher>
+  <copyright><year>1996</year>
+             <holder>Bell Telephone Laboratories, Inc.</holder></copyright>
+  <biblioid class="isbn">0-201-10088-6</biblioid>    
+  <editor><personname><firstname>James T.</firstname><surname>DeWolf</surname></personname></editor>
+</biblioentry>
+
+<biblioentry>
+  <abbrev>AhoSethiUllman96</abbrev>
+  <authorgroup>
+    <author><personname><firstname>Alfred V.</firstname><surname>Aho</surname></personname></author>  
+    <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>
+  <copyright><year>1996</year>
+             <holder>Bell Telephone Laboratories, Inc.</holder></copyright>
+  <biblioid class="isbn">0-201-10088-6</biblioid>    
+  <editor><personname><firstname>James T.</firstname><surname>DeWolf</surname></personname></editor>
+</biblioentry>
+
+<biblioentry xml:id="Walsh97">
+  <abbrev>Walsh97</abbrev>
+  <biblioset relation="article">
+    
+    <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">
+    
+    <publisher>
+      <publishername>O'Reilly &amp; Associates, Inc.</publishername>
+    </publisher>
+    <biblioid class="issn">1085-2301</biblioid>
+    <editor><personname><firstname>Dan</firstname><surname>Connolly</surname></personname></editor>
+  </biblioset>
+</biblioentry>
+
+<biblioentry>
+<abbrev>Abbrev</abbrev>
+
+
+<abstract><para>
+Abstract, abstract, abstract. Abstract, abstract, abstract. 
+Abstract, abstract, abstract. Abstract, abstract, abstract. 
+Abstract, abstract, abstract. Abstract, abstract, abstract. 
+Abstract, abstract, abstract. Abstract, abstract, abstract. 
+Abstract, abstract, abstract. Abstract, abstract, abstract. 
+Abstract, abstract, abstract. Abstract, abstract, abstract. 
+</para></abstract>
+<address>Any Street
+Anywhere, XX 99999
+USA</address>
+<affiliation>
+<shortaffil>shortaffil</shortaffil>
+<jobtitle>jobtitle</jobtitle>
+<orgname>orgname</orgname>
+<orgdiv>orgdiv</orgdiv>
+<address>Any Street
+Anywhere, XX 99999
+USA</address>
+</affiliation>
+<artpagenums>ArtPageNums</artpagenums>
+<author><personname><firstname>AuthorFirstname</firstname><surname>AuthorSurname</surname></personname></author>
+<personblurb>
+<para>
+AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. 
+AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. 
+AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. 
+AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. 
+AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. 
+</para></personblurb>
+<!--<authorgroup>AuthorGroup</authorgroup>-->
+<authorinitials>AuthorInitials</authorinitials>
+<collab><orgname role="collabname">The names of some collaborators</orgname>
+<affiliation>
+<shortaffil>shortaffil</shortaffil>
+<jobtitle>jobtitle</jobtitle>
+<orgname>orgname</orgname>
+<orgdiv>orgdiv</orgdiv>
+<address>Any Street
+Anywhere, XX 99999
+USA</address>
+</affiliation></collab>
+<confgroup>
+<confdates>confdates</confdates>
+<conftitle>conftitle</conftitle>
+<confnum>confnum</confnum>
+<address>Any Street
+Anywhere, XX 99999
+USA</address>
+<confsponsor>confsponsor</confsponsor>
+</confgroup>
+
+<othercredit role="contractsponsor"><orgname>ContractSponsor</orgname><contrib role="contractnum">ContractNum</contrib></othercredit>
+<othercredit><orgname>???</orgname><contrib>Contrib</contrib></othercredit>
+<copyright><year>1998</year><holder>Copyright holder</holder></copyright>
+<!--<corpauthor>CorpAuthor</corpauthor>-->
+<orgname>CorpName</orgname>
+<date>Date</date>
+<edition>Edition</edition>
+<editor><personname><firstname>EditorFirstName</firstname><surname>EditorSurname</surname></personname></editor>
+<personname><firstname>FirstName</firstname><honorific>Honorific</honorific><lineage>Lineage</lineage><othername>OtherName</othername><surname>Surname</surname></personname>
+
+<biblioid class="isbn">ISBN</biblioid>
+<biblioid class="issn">ISSN</biblioid>
+<biblioid class="other" otherclass="invpartnumber">InvPartNumber</biblioid>
+<issuenum>IssueNum</issuenum>
+
+<orgname>OrgName</orgname>
+<othercredit><personname><firstname>OCFirstName</firstname><surname>OCSurname</surname></personname></othercredit>
+
+<pagenums>PageNums</pagenums>
+<printhistory>
+<para>
+PrintHistory, printhistory, printhistory. PrintHistory, printhistory.
+PrintHistory, printhistory, printhistory. PrintHistory, printhistory.
+PrintHistory, printhistory, printhistory. PrintHistory, printhistory.
+PrintHistory, printhistory, printhistory. PrintHistory, printhistory.
+</para></printhistory>
+<productname>ProductName</productname>
+<productnumber>ProductNumber</productnumber>
+<pubdate>PubDate</pubdate>
+<publisher><publishername>PubPublisherName</publishername>
+<address><street>Any Street</street>
+<city>Anywhere</city>, <state>XX</state> <postcode>99999</postcode>
+<country>USA</country></address>
+</publisher>
+<publishername>PublisherName</publishername>
+<biblioid class="pubnumber">PubsNumber</biblioid>
+<releaseinfo>ReleaseInfo</releaseinfo>
+<revhistory>
+<revision>
+<revnumber>1.0</revnumber><date>1998-11-20</date>
+  <authorinitials>ndw</authorinitials>
+  <revremark>Some remark about the revision</revremark></revision>
+<revision>
+<revnumber>0.9</revnumber><date>1998-11-19</date>
+  <authorinitials>ndw</authorinitials>
+  <revremark>Some remark about the revision</revremark></revision>
+<revision>
+<revnumber>0.4</revnumber><date>1998-11-18</date>
+  <authorinitials>ndw</authorinitials>
+  <revremark>Some remark about the revision</revremark></revision>
+</revhistory>
+<seriesvolnums>SeriesVolNums</seriesvolnums>
+
+
+<volumenum>VolumeNum</volumenum>
+</biblioentry>
+
+<bibliomixed xml:id="Walsh96">
+  <bibliomset relation="article">
+    <personname><surname>Walsh</surname><firstname>Norman</firstname></personname>, .
+    .
+  </bibliomset>
+  <bibliomset relation="journal">
+    .
+    <volumenum>2</volumenum>(<issuenum>1</issuenum>).
+    <publishername>O'Reilly &amp; Associates, Inc.</publishername> and
+    <orgname>The World Wide Web Consortium</orgname>.
+    <pubdate>Winter, 1996</pubdate></bibliomset>.
+</bibliomixed>
+
+</bibliography>

diff --git a/docbook/relaxng/docbook/tests/skip/bibliography.002.xml b/docbook/relaxng/docbook/tests/skip/bibliography.002.xml
new file mode 100644 (file)
index 0000000..f17ddf6
--- /dev/null
+++ b/docbook/relaxng/docbook/tests/skip/bibliography.002.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bibliography xmlns="http://docbook.org/docbook-ng" version="hard cider">
+<info><title>Unit Test: bibliography.002</title>
+
+<releaseinfo role="CVS">$Id$</releaseinfo>
+<author><personname><firstname>Norman</firstname><surname>Walsh</surname></personname><affiliation><address><email>ndw@nwalsh.com</email></address></affiliation></author>
+</info>
+
+<bibliodiv><info><title>Entries using biblioentry</title></info>
+
+<biblioentry>
+  <abbrev>AhoSethiUllman96</abbrev>
+  <authorgroup>
+    <author><personname><firstname>Alfred V.</firstname><surname>Aho</surname></personname></author>  
+    <author><personname><firstname>Ravi</firstname><surname>Sethi</surname></personname></author>
+    <author><personname><firstname>Jeffrey D.</firstname><surname>Ullman</surname></personname></author>
+  </authorgroup>
+      
+  <publisher>
+    <publishername>Addison-Wesley Publishing Company</publishername>
+  </publisher>
+  <copyright><year>1996</year>
+             <holder>Bell Telephone Laboratories, Inc.</holder></copyright>
+  <biblioid class="isbn">0-201-10088-6</biblioid>    
+  <editor><personname><firstname>James T.</firstname><surname>DeWolf</surname></personname></editor>
+</biblioentry>
+
+<biblioentry xml:id="Walsh97">
+  <abbrev>Walsh97</abbrev>
+  <biblioset relation="article">
+    
+    <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">
+    
+    <publisher>
+      <publishername>O'Reilly &amp; Associates, Inc.</publishername>
+    </publisher>
+    <biblioid class="issn">1085-2301</biblioid>
+    <editor><personname><firstname>Dan</firstname><surname>Connolly</surname></personname></editor>
+  </biblioset>
+</biblioentry>
+
+<biblioentry>
+<abbrev>Abbrev</abbrev>
+
+
+<abstract><para>
+Abstract, abstract, abstract. Abstract, abstract, abstract. 
+Abstract, abstract, abstract. Abstract, abstract, abstract. 
+Abstract, abstract, abstract. Abstract, abstract, abstract. 
+Abstract, abstract, abstract. Abstract, abstract, abstract. 
+Abstract, abstract, abstract. Abstract, abstract, abstract. 
+Abstract, abstract, abstract. Abstract, abstract, abstract. 
+</para></abstract>
+<address>Any Street
+Anywhere, XX 99999
+USA</address>
+<affiliation>
+<shortaffil>shortaffil</shortaffil>
+<jobtitle>jobtitle</jobtitle>
+<orgname>orgname</orgname>
+<orgdiv>orgdiv</orgdiv>
+<address>Any Street
+Anywhere, XX 99999
+USA</address>
+</affiliation>
+<artpagenums>ArtPageNums</artpagenums>
+<author><personname><firstname>AuthorFirstname</firstname><surname>AuthorSurname</surname></personname></author>
+<personblurb>
+<para>
+AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. 
+AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. 
+AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. 
+AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. 
+AuthorBlurb, authorblurb, authorblurb. AuthorBlurb, authorblurb, authorblurb. 
+</para></personblurb>
+<!--<authorgroup>AuthorGroup</authorgroup>-->
+<authorinitials>AuthorInitials</authorinitials>
+<collab><orgname role="collabname">The names of some collaborators</orgname>
+<affiliation>
+<shortaffil>shortaffil</shortaffil>
+<jobtitle>jobtitle</jobtitle>
+<orgname>orgname</orgname>
+<orgdiv>orgdiv</orgdiv>
+<address>Any Street
+Anywhere, XX 99999
+USA</address>
+</affiliation></collab>
+<confgroup>
+<confdates>confdates</confdates>
+<conftitle>conftitle</conftitle>
+<confnum>confnum</confnum>
+<address>Any Street
+Anywhere, XX 99999
+USA</address>
+<confsponsor>confsponsor</confsponsor>
+</confgroup>
+
+<othercredit role="contractsponsor"><orgname>ContractSponsor</orgname><contrib role="contractnum">ContractNum</contrib></othercredit>
+<othercredit><orgname>???</orgname><contrib>Contrib</contrib></othercredit>
+<copyright><year>1998</year><holder>Copyright holder</holder></copyright>
+<!--<corpauthor>CorpAuthor</corpauthor>-->
+<orgname>CorpName</orgname>
+<date>Date</date>
+<edition>Edition</edition>
+<editor><personname><firstname>EditorFirstName</firstname><surname>EditorSurname</surname></personname></editor>
+<personname><firstname>FirstName</firstname><honorific>Honorific</honorific><lineage>Lineage</lineage><othername>OtherName</othername><surname>Surname</surname></personname>
+
+<biblioid class="isbn">ISBN</biblioid>
+<biblioid class="issn">ISSN</biblioid>
+<biblioid class="other" otherclass="invpartnumber">InvPartNumber</biblioid>
+<issuenum>IssueNum</issuenum>
+
+<orgname>OrgName</orgname>
+<othercredit><personname><firstname>OCFirstName</firstname><surname>OCSurname</surname></personname></othercredit>
+
+<pagenums>PageNums</pagenums>
+<printhistory>
+<para>
+PrintHistory, printhistory, printhistory. PrintHistory, printhistory.
+PrintHistory, printhistory, printhistory. PrintHistory, printhistory.
+PrintHistory, printhistory, printhistory. PrintHistory, printhistory.
+PrintHistory, printhistory, printhistory. PrintHistory, printhistory.
+</para></printhistory>
+<productname>ProductName</productname>
+<productnumber>ProductNumber</productnumber>
+<pubdate>PubDate</pubdate>
+<publisher><publishername>PubPublisherName</publishername>
+<address><street>Any Street</street>
+<city>Anywhere</city>, <state>XX</state> <postcode>99999</postcode>
+<country>USA</country></address>
+</publisher>
+<publishername>PublisherName</publishername>
+<biblioid class="pubnumber">PubsNumber</biblioid>
+<releaseinfo>ReleaseInfo</releaseinfo>
+<revhistory>
+<revision>
+<revnumber>1.0</revnumber><date>1998-11-20</date>
+  <authorinitials>ndw</authorinitials>
+  <revremark>Some remark about the revision</revremark></revision>
+<revision>
+<revnumber>0.9</revnumber><date>1998-11-19</date>
+  <authorinitials>ndw</authorinitials>
+  <revremark>Some remark about the revision</revremark></revision>
+<revision>
+<revnumber>0.4</revnumber><date>1998-11-18</date>
+  <authorinitials>ndw</authorinitials>
+  <revremark>Some remark about the revision</revremark></revision>
+</revhistory>
+<seriesvolnums>SeriesVolNums</seriesvolnums>
+
+
+<volumenum>VolumeNum</volumenum>
+</biblioentry>
+
+</bibliodiv>
+<bibliodiv><info><title>Entries using bibliomixed</title></info>
+
+<bibliomixed xml:id="Walsh96">
+  <bibliomset relation="article">
+    <personname><surname>Walsh</surname><firstname>Norman</firstname></personname>, .
+    .
+  </bibliomset>
+  <bibliomset relation="journal">
+    .
+    <volumenum>2</volumenum>(<issuenum>1</issuenum>).
+    <publishername>O'Reilly &amp; Associates, Inc.</publishername> and
+    <orgname>The World Wide Web Consortium</orgname>.
+    <pubdate>Winter, 1996</pubdate></bibliomset>.
+</bibliomixed>
+
+</bibliodiv>
+
+</bibliography>

diff --git a/docbook/relaxng/tests/skip/cmdsynopsis.002.xml b/docbook/relaxng/docbook/tests/skip/cmdsynopsis.002.xml
similarity index 100%
rename from docbook/relaxng/tests/skip/cmdsynopsis.002.xml
rename to docbook/relaxng/docbook/tests/skip/cmdsynopsis.002.xml

diff --git a/docbook/relaxng/tests/skip/glossary.002.xml b/docbook/relaxng/docbook/tests/skip/glossary.002.xml
similarity index 100%
rename from docbook/relaxng/tests/skip/glossary.002.xml
rename to docbook/relaxng/docbook/tests/skip/glossary.002.xml

diff --git a/docbook/relaxng/tests/skip/indexterm.004.xml b/docbook/relaxng/docbook/tests/skip/indexterm.004.xml
similarity index 100%
rename from docbook/relaxng/tests/skip/indexterm.004.xml
rename to docbook/relaxng/docbook/tests/skip/indexterm.004.xml

diff --git a/docbook/relaxng/tests/skip/indexterm.005.xml b/docbook/relaxng/docbook/tests/skip/indexterm.005.xml
similarity index 100%
rename from docbook/relaxng/tests/skip/indexterm.005.xml
rename to docbook/relaxng/docbook/tests/skip/indexterm.005.xml

diff --git a/docbook/relaxng/tests/skip/legalnotice.001.xml b/docbook/relaxng/docbook/tests/skip/legalnotice.001.xml
similarity index 100%
rename from docbook/relaxng/tests/skip/legalnotice.001.xml
rename to docbook/relaxng/docbook/tests/skip/legalnotice.001.xml

diff --git a/docbook/relaxng/tests/skip/olink.001.xml b/docbook/relaxng/docbook/tests/skip/olink.001.xml
similarity index 100%
rename from docbook/relaxng/tests/skip/olink.001.xml
rename to docbook/relaxng/docbook/tests/skip/olink.001.xml

diff --git a/docbook/relaxng/tests/skip/refentry.006.xml b/docbook/relaxng/docbook/tests/skip/refentry.006.xml
similarity index 100%
rename from docbook/relaxng/tests/skip/refentry.006.xml
rename to docbook/relaxng/docbook/tests/skip/refentry.006.xml

diff --git a/docbook/relaxng/tests/skip/template.xml b/docbook/relaxng/docbook/tests/skip/template.xml
similarity index 100%
rename from docbook/relaxng/tests/skip/template.xml
rename to docbook/relaxng/docbook/tests/skip/template.xml

diff --git a/docbook/relaxng/tests/skip/toc.001.xml b/docbook/relaxng/docbook/tests/skip/toc.001.xml
similarity index 100%
rename from docbook/relaxng/tests/skip/toc.001.xml
rename to docbook/relaxng/docbook/tests/skip/toc.001.xml

diff --git a/docbook/relaxng/tests/skip/variablelist.002.xml b/docbook/relaxng/docbook/tests/skip/variablelist.002.xml
similarity index 100%
rename from docbook/relaxng/tests/skip/variablelist.002.xml
rename to docbook/relaxng/docbook/tests/skip/variablelist.002.xml

diff --git a/docbook/relaxng/tests/skip/xref.002.xml b/docbook/relaxng/docbook/tests/skip/xref.002.xml
similarity index 100%
rename from docbook/relaxng/tests/skip/xref.002.xml
rename to docbook/relaxng/docbook/tests/skip/xref.002.xml

diff --git a/docbook/relaxng/tests/.cvsignore b/docbook/relaxng/tests/.cvsignore
deleted file mode 100644 (file)
index b0aad4d..0000000
--- a/docbook/relaxng/tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-passed