From e2bd0e03c0cc7539640f7ee37f6d2ef6ef1b907e Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Mon, 7 Jan 2002 18:39:40 +0000
Subject: [PATCH] Refactored to make a website-full.dtd possible; based on
 Simplified DocBook 1.0b2

---
 website/extensions.mod     |  50 +++++++++++++++
 website/website-custom.dtd | 126 ++++---------------------------------
 website/website-full.dtd   |  29 +++++++++
 website/website.mod        |  81 ++++++++++++++++++++++++
 4 files changed, 171 insertions(+), 115 deletions(-)
 create mode 100644 website/extensions.mod
 create mode 100644 website/website-full.dtd
 create mode 100644 website/website.mod

diff --git a/website/extensions.mod b/website/extensions.mod
new file mode 100644
index 000000000..80d6dbf21
--- /dev/null
+++ b/website/extensions.mod
@@ -0,0 +1,50 @@
+<!-- ====================================================================== -->
+<!-- Website Extensions V2.1b1
+     Copyright (C) 2002 Norman Walsh
+     http://sourceforge.net/projects/docbook/
+
+     $Id$
+
+     Please direct all questions and comments about this DTD to
+     Norman Walsh, <ndw@nwalsh.com>.
+                                                                            -->
+<!-- ====================================================================== -->
+
+<!-- allow webtoc to occur anywhere a para can occur -->
+<!ENTITY % local.para.class "|webtoc">
+
+<!ENTITY % namespaces.mod SYSTEM "namespaces.mod">
+%namespaces.mod;
+
+<!-- RDDL? -->
+<!ENTITY % allowrddl "INCLUDE">
+<![%allowrddl;[
+<!ENTITY % rddl.elements "|%rddl-resource.element;">
+<!ENTITY % local.section.attrib
+	"rddl	IDREF	#IMPLIED"
+>
+]]>
+<!ENTITY % rddl.elements "">
+
+<!-- Forms? -->
+<!ENTITY % allowforms "INCLUDE">
+<![%allowforms;[
+<!ENTITY % local.para.char.mix "|%html-input.element;|%html-button.element;|%html-label.element;|%html-select.element;|%html-textarea.element; %rddl.elements;">
+<!ENTITY % local.divcomponent.mix "|%html-form.element;">
+]]>
+<!ENTITY % local.para.char.mix "%rddl.elements;">
+
+
+<!-- the XML notation; this really should go in DocBook -->
+<!NOTATION XML SYSTEM "http://www.w3.org/TR/REC-xml">
+<!ENTITY % local.notation.class "">
+<!ENTITY % notation.class
+		"BMP| CGM-CHAR | CGM-BINARY | CGM-CLEAR | DITROFF | DVI
+		| EPS | EQN | FAX | GIF | GIF87a | GIF89a 
+		| JPG | JPEG | IGES | PCX
+		| PIC | PNG | PS | SGML | XML | TBL | TEX | TIFF | WMF | WPG
+		| linespecific
+		%local.notation.class;">
+
+<!-- End of Website Extensions V2.1b1 ..................................... -->
+<!-- ...................................................................... -->
diff --git a/website/website-custom.dtd b/website/website-custom.dtd
index 17286a15a..e1b57803e 100644
--- a/website/website-custom.dtd
+++ b/website/website-custom.dtd
@@ -1,6 +1,6 @@
 <!-- ====================================================================== -->
-<!-- Website DTD V2.0b1
-     Copyright (C) 1997-2001 Norman Walsh
+<!-- Website DTD V2.1b1
+     Copyright (C) 1997-2002 Norman Walsh
      http://sourceforge.net/projects/docbook/
 
      $Id$
@@ -12,8 +12,8 @@
 
      <?xml version="1.0"?>
      <!DOCTYPE website
-       PUBLIC "-//Norman Walsh//DTD Website V2.0b1//EN"
-       "http://docbook.sourceforge.net/release/website/2.0b1/website.dtd">
+       PUBLIC "-//Norman Walsh//DTD Website V2.1b1//EN"
+       "http://docbook.sourceforge.net/release/website/2.1b1/website.dtd">
                                                                             -->
 <!-- ====================================================================== -->
 
@@ -36,122 +36,18 @@
 <!ENTITY % label.module "INCLUDE">
 <!ENTITY % local.compound.class "|qandaset">
 
-<!-- allow webtoc to occur anywhere a para can occur -->
-<!ENTITY % local.para.class "|webtoc">
-
-<!ENTITY % namespaces.mod SYSTEM "namespaces.mod">
-%namespaces.mod;
-
-<!-- RDDL? -->
-<!ENTITY % allowrddl "INCLUDE">
-<![%allowrddl;[
-<!ENTITY % rddl.elements "|%rddl-resource.element;">
-<!ENTITY % local.section.attrib
-	"rddl	IDREF	#IMPLIED"
->
-]]>
-<!ENTITY % rddl.elements "">
-
-<!-- Forms? -->
-<!ENTITY % allowforms "INCLUDE">
-<![%allowforms;[
-<!ENTITY % local.para.char.mix "|%html-input.element;|%html-button.element;|%html-label.element;|%html-select.element;|%html-textarea.element; %rddl.elements;">
-<!ENTITY % local.divcomponent.mix "|%html-form.element;">
-]]>
-<!ENTITY % local.para.char.mix "%rddl.elements;">
-
-<!-- the XML notation; this really should go in DocBook -->
-<!NOTATION XML SYSTEM "http://www.w3.org/TR/REC-xml">
-<!ENTITY % local.notation.class "">
-<!ENTITY % notation.class
-		"BMP| CGM-CHAR | CGM-BINARY | CGM-CLEAR | DITROFF | DVI
-		| EPS | EQN | FAX | GIF | GIF87a | GIF89a 
-		| JPG | JPEG | IGES | PCX
-		| PIC | PNG | PS | SGML | XML | TBL | TEX | TIFF | WMF | WPG
-		| linespecific
-		%local.notation.class;">
+<!ENTITY % extensions.mod SYSTEM "extensions.mod">
+%extensions.mod;
 
 <!-- Now that individual XML pages are possible; it makes sense to use the -->
 <!-- simple subset for maximum utility in sending these pages across the -->
 <!-- web directly. -->
-<!ENTITY % sdocbook 
-           PUBLIC "-//Norman Walsh//DTD Simplified DocBook Custom XML V4.1.2.4//EN"
-           "../docbook/simple/sdocbook-custom.dtd">
-<!--
-<!ENTITY % docbook
-           PUBLIC "-//Norman Walsh//DTD Simplified DocBook XML V4.1.2.4//EN"
-          "http://nwalsh.com/docbook/simple/4.1.2.4/sdocbook.dtd">
--->
+<!ENTITY % sdocbook PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0b2//EN"
+      "http://www.oasis-open.org/docbook/xml/simple/1.0b2/sdocbook-custom.dtd">
 %sdocbook;
 
-<!-- define webpage elements -->
-
-<!ENTITY % webpage.mix "(config*, head, (%bookcomponent.content;),
-                        appendix*, bibliography*)">
-
-<!ELEMENT head (title, titleabbrev?, subtitle?, summary?, base?, keywords?,
-               (copyright | author | edition
-                | meta | script | style | abstract | revhistory
-                %rddl.elements;)*)>
-
-<!ELEMENT meta EMPTY>
-<!ATTLIST meta
-	http-equiv	CDATA	#IMPLIED
-	name	CDATA	#IMPLIED
-	content	CDATA	#REQUIRED
->
-
-<!ELEMENT script (#PCDATA)>
-<!ATTLIST script
-	src	CDATA	#IMPLIED
-	language	CDATA	#IMPLIED
->
-
-<!ELEMENT style (#PCDATA)>
-<!ATTLIST style
-	src	CDATA	#IMPLIED
-	type	CDATA	#IMPLIED
->
-
-<!ELEMENT config EMPTY>
-<!ATTLIST config
-	param	CDATA	#REQUIRED
-	value	CDATA	#REQUIRED
-	altval	CDATA	#IMPLIED
->
-
-<!ELEMENT summary (%word.char.mix;)*>
-
-<!ELEMENT base EMPTY>
-<!ATTLIST base
-	href	CDATA	#REQUIRED
-	target	CDATA	#IMPLIED
->
-
-<!ELEMENT keywords (#PCDATA)>
-
-
-<!ELEMENT webpage (%webpage.mix;)>
-<!ATTLIST webpage
-	%html-xmlns;	CDATA	#FIXED %html-namespace;
-	%xlink-xmlns;	CDATA	#FIXED %xlink-namespace;
-	%rddl-xmlns;	CDATA	#FIXED %rddl-namespace;
-	navto		(yes|no)	"yes"
-	role		CDATA	#IMPLIED
-	id		ID	#REQUIRED
->
-
-<!ELEMENT webtoc EMPTY>
-
-<![%allowrddl;[
-<!ENTITY % rddl.mod SYSTEM "rddl.mod">
-%rddl.mod;
-]]>
-
-<![%allowforms;[
-<!ENTITY % forms.mod SYSTEM "forms.mod">
-%forms.mod;
-]]>
+<!ENTITY % website.mod SYSTEM "website.mod">
+%website.mod;
 
-<!-- End of Website DTD V2.0b1 ............................................ -->
+<!-- End of Website DTD V2.1b1 ............................................ -->
 <!-- ...................................................................... -->
diff --git a/website/website-full.dtd b/website/website-full.dtd
new file mode 100644
index 000000000..f476ac03c
--- /dev/null
+++ b/website/website-full.dtd
@@ -0,0 +1,29 @@
+<!-- ====================================================================== -->
+<!-- Website Full DTD V2.1b1
+     Copyright (C) 2002 Norman Walsh
+     http://sourceforge.net/projects/docbook/
+
+     $Id$
+
+     Please direct all questions and comments about this DTD to
+     Norman Walsh, <ndw@nwalsh.com>.
+
+     Common declaration:
+
+     <?xml version="1.0"?>
+     <!DOCTYPE website
+       PUBLIC "-//Norman Walsh//DTD Website Full V2.1b1//EN"
+       "http://docbook.sourceforge.net/release/website/2.1b1/website-full.dtd">
+                                                                            -->
+<!-- ====================================================================== -->
+
+<!ENTITY % extensions.mod SYSTEM "extensions.mod">
+%extensions.mod;
+
+<!-- In this version, we use full DocBook -->
+<!ENTITY % docbook.dtd PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+%docbook.dtd;
+
+<!ENTITY % website.mod SYSTEM "website.mod">
+%website.mod;
diff --git a/website/website.mod b/website/website.mod
new file mode 100644
index 000000000..8cf1b1814
--- /dev/null
+++ b/website/website.mod
@@ -0,0 +1,81 @@
+<!-- ====================================================================== -->
+<!-- Website Module V2.1b1
+     Copyright (C) 2002 Norman Walsh
+     http://sourceforge.net/projects/docbook/
+
+     $Id$
+
+     Please direct all questions and comments about this DTD to
+     Norman Walsh, <ndw@nwalsh.com>.
+                                                                            -->
+<!-- ====================================================================== -->
+
+<!ENTITY % webpage.mix "(config*, head, (%bookcomponent.content;),
+                        appendix*, bibliography*)">
+
+<!ELEMENT head (title, titleabbrev?, subtitle?, summary?, base?, keywords?,
+               (copyright | author | edition
+                | meta | script | style | abstract | revhistory
+                %rddl.elements;)*)>
+
+<!ELEMENT meta EMPTY>
+<!ATTLIST meta
+	http-equiv	CDATA	#IMPLIED
+	name	CDATA	#IMPLIED
+	content	CDATA	#REQUIRED
+>
+
+<!ELEMENT script (#PCDATA)>
+<!ATTLIST script
+	src	CDATA	#IMPLIED
+	language	CDATA	#IMPLIED
+>
+
+<!ELEMENT style (#PCDATA)>
+<!ATTLIST style
+	src	CDATA	#IMPLIED
+	type	CDATA	#IMPLIED
+>
+
+<!ELEMENT config EMPTY>
+<!ATTLIST config
+	param	CDATA	#REQUIRED
+	value	CDATA	#REQUIRED
+	altval	CDATA	#IMPLIED
+>
+
+<!ELEMENT summary (%word.char.mix;)*>
+
+<!ELEMENT base EMPTY>
+<!ATTLIST base
+	href	CDATA	#REQUIRED
+	target	CDATA	#IMPLIED
+>
+
+<!ELEMENT keywords (#PCDATA)>
+
+
+<!ELEMENT webpage (%webpage.mix;)>
+<!ATTLIST webpage
+	%html-xmlns;	CDATA	#FIXED %html-namespace;
+	%xlink-xmlns;	CDATA	#FIXED %xlink-namespace;
+	%rddl-xmlns;	CDATA	#FIXED %rddl-namespace;
+	navto		(yes|no)	"yes"
+	role		CDATA	#IMPLIED
+	id		ID	#REQUIRED
+>
+
+<!ELEMENT webtoc EMPTY>
+
+<![%allowrddl;[
+<!ENTITY % rddl.mod SYSTEM "rddl.mod">
+%rddl.mod;
+]]>
+
+<![%allowforms;[
+<!ENTITY % forms.mod SYSTEM "forms.mod">
+%forms.mod;
+]]>
+
+<!-- End of Website Module V2.1b1 ......................................... -->
+<!-- ...................................................................... -->
-- 
2.40.0