*** empty log message ***

3 files changed, 195 insertions, 3 deletions

diff --git a/app-text/gentoo-guide-xml-dtd/files/catalog b/app-text/gentoo-guide-xml-dtd/files/catalog
index a3827684c7d5..48f011faf9c3 100644
--- a/app-text/gentoo-guide-xml-dtd/files/catalog
+++ b/app-text/gentoo-guide-xml-dtd/files/catalog
@@ -1,11 +1,10 @@
 
-  -- Catalog data for Gentoo Guide XML V1.0 --
+  -- Catalog data for Gentoo Guide XML V2.1 --
   -- File catalog  --
 
   -- Gentoo Guide driver file .................................................. --
 
-PUBLIC "-//Gentoo//DTD Guide XML V1.0//EN" "xml-dtd-1.0/guide.dtd"
-PUBLIC "-//Gentoo//DTD Guide XML V2.0//EN" "xml-dtd-2.0/guide.dtd"
+PUBLIC "-//Gentoo//DTD Guide XML V2.1//EN" "xml-dtd-2.1/guide.dtd"
 
   -- ISO entity sets ...................................................... --
 
diff --git a/app-text/gentoo-guide-xml-dtd/files/guide/guide-2.1.dtd b/app-text/gentoo-guide-xml-dtd/files/guide/guide-2.1.dtd
new file mode 100644
index 000000000000..eff2db9d8bc9
--- /dev/null
+++ b/app-text/gentoo-guide-xml-dtd/files/guide/guide-2.1.dtd
@@ -0,0 +1,163 @@
+<!-- This is a DTD, but will be read as -*- sgml -*-   -->
+<!-- ================================================= -->
+
+<!-- ==== Title Elements ====-->
+    <!ENTITY % guide.title "title">
+    <!ENTITY % chapter.title "title">
+    <!ENTITY % sect.title "title">
+
+<!-- ==== List Elements ==== -->
+
+    <!ENTITY % list.class "ul|ol">
+
+<!-- ==== Elements which are admonitions. ==== -->
+
+    <!ENTITY % admon.class "note|warn|impo">
+
+<!-- ==== Elements which are "line specific". Spaces and line breaks are significant in line specific elements. ==== -->
+
+    <!ENTITY % linespecific.class "pre">
+    <!ENTITY % linespecific.sub.class "i|codenote">
+
+<!-- ==== Paragraph Elements ==== -->
+
+    <!ENTITY % para.class "p">
+
+<!-- ==== Formal objects (objects with titles). ==== -->
+
+    <!ENTITY % formal.class "figure|table">
+
+<!-- ==== Elements which are descriptive in nature. ==== -->
+
+    <!ENTITY % descobj.class "abstract">
+
+<!-- ==== The class of general inline elements. ==== -->
+
+    <!ENTITY % gen.class "e">
+
+    <!ENTITY % link.class "mail|link">
+
+    <!ENTITY % tech.class "c|path">
+
+    <!ENTITY % guideinfo.class "author|version|date">
+
+
+<!-- ===== ATTRIBUTE ENTITIES =====-->
+
+    <!ENTITY % link.attributes
+            "link  CDATA   #IMPLIED">
+
+    <!ENTITY % figure.attributes
+            "link       CDATA   #REQUIRED
+             short      CDATA   #IMPLIED
+             caption    CDATA   #IMPLIED">
+
+    <!ENTITY % author.attributes
+            "title   CDATA   #IMPLIED">
+
+<!-- ==== Mix Objects ==== -->
+
+    <!ENTITY % admon.mix
+            "%list.class;
+            |%linespecific.class;
+            |%para.class;
+            |%formal.class;">
+
+    <!ENTITY % para.mix
+            "#PCDATA
+            |%list.class;
+            |%gen.class;
+            |%link.class;
+            |%tech.class;">
+
+    <!ENTITY % list.mix
+            "#PCDATA
+            |%gen.class;
+            |%link.class;
+            |%tech.class;">
+
+    <!ENTITY % pre.mix
+            "#PCDATA
+            |%linespecific.sub.class;
+            |%gen.class;
+            |%link.class;
+            |%tech.class;">
+
+    <!ENTITY % title.mix
+            "#PCDATA
+            |%gen.class;
+            |%link.class;	|%tech.class;">
+
+    <!ENTITY % cptr.mix
+            "#PCDATA
+            |%link.class;	|%tech.class;">
+
+    <!ENTITY % smallcptr.mix "#PCDATA">
+
+    <!ENTITY % docinfo.mix
+            "#PCDATA
+            |%link.class;
+            |e">
+
+    <!ENTITY % body.mix
+            "%admon.class;
+            |%linespecific.class;
+            |%para.class;
+            |%formal.class;">
+
+
+<!-- ==== Objects ==== -->
+
+    <!ELEMENT title (%title.mix;)*>
+
+    <!ELEMENT ul (li+)>
+    <!ELEMENT ol (li+)>
+    <!ELEMENT li (%list.mix;)*>
+
+    <!ELEMENT note (%para.mix;)*>
+    <!ELEMENT warn (%para.mix;)*>
+    <!ELEMENT impo (%para.mix;)*>
+
+    <!ELEMENT pre (%pre.mix;)*>
+    <!ELEMENT codenote (#PCDATA)>
+    <!ELEMENT i (#PCDATA)>
+
+    <!ELEMENT p (%para.mix;)*>
+
+    <!ELEMENT figure EMPTY>
+    <!ATTLIST figure %figure.attributes;>
+
+    <!ELEMENT table (tr*)>
+    <!ELEMENT tr ((ti|th)*)>
+    <!ELEMENT ti (%para.mix;)*>
+    <!ELEMENT th (%para.mix;)*>
+
+
+    <!ELEMENT e (%smallcptr.mix;)>
+
+    <!ELEMENT link (#PCDATA)>
+    <!ATTLIST link %link.attributes;>
+
+    <!ELEMENT mail (#PCDATA)>
+    <!ATTLIST mail %link.attributes;>
+
+    <!ELEMENT c (%smallcptr.mix;)>
+
+    <!ELEMENT abstract (%para.mix;)*>
+
+    <!ELEMENT author (%smallcptr.mix;)>
+    <!ATTLIST author %author.attributes;>
+    <!ELEMENT version (%smallcptr.mix;)>
+    <!ELEMENT date (%smallcptr.mix;)>
+
+    <!ELEMENT chapter (%chapter.title;,(section)+)>
+
+    <!ELEMENT section (%sect.title;,body)>
+
+    <!ELEMENT body (%body.mix;)+>
+
+<!-- ==== The ARTICLE element ==== -->
+
+    <!ELEMENT guide ((%guide.title;), (%guideinfo.class;)*, (chapter)+)>
+
+
diff --git a/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-2.1.ebuild b/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-2.1.ebuild
new file mode 100644
index 000000000000..1cf0b9c2ea3a
--- /dev/null
+++ b/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Your Name <your email>
+# $Header: /var/cvsroot/gentoo-x86/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-2.1.ebuild,v 1.1 2001/04/05 05:09:39 achim Exp $
+
+S=${WORKDIR}
+DESCRIPTION="DTD for Gentoo-Guide Style XML Files"
+
+DEPEND=">=app-text/sgml-common-0.6.1"
+
+src_install () {
+
+    cd ${FILESDIR}
+
+    insinto /usr/share/sgml/guide
+    doins catalog
+    insinto /usr/share/sgml/guide/ent
+    doins ent/*.ent
+    insinto /usr/share/sgml/guide/xml-dtd-2.1
+    newins guide/guide-2.1.dtd guide.dtd
+
+}
+
+pkg_postinst() {
+    install-catalog --add /etc/sgml/gentoo-guide.cat /usr/share/sgml/guide/catalog
+}
+
+pkg_prerm() {
+    install-catalog --remove /etc/sgml/gentoo-guide.cat /usr/share/sgml/guide/catalog
+}