You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by cr...@apache.org on 2002/06/13 10:09:01 UTC
cvs commit: xml-forrest/src/resources/schema/dtd common-charents-v10.mod document-v11.dtd
crossley 2002/06/13 01:09:01
Modified: src/resources/schema catalog catalog.xcat
src/resources/schema/dtd document-v11.dtd
Added: src/resources/schema/dtd common-charents-v10.mod
Log:
Moved the declarations of ISO character entity sets to a module, enable re-use.
Revision Changes Path
1.7 +4 -3 xml-forrest/src/resources/schema/catalog
Index: catalog
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/schema/catalog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- catalog 11 Jun 2002 11:28:18 -0000 1.6
+++ catalog 13 Jun 2002 08:09:01 -0000 1.7
@@ -23,6 +23,8 @@
"dtd/xgump-draft.dtd"
PUBLIC "-//APACHE//DTD Contributors V1.0//EN"
"dtd/contributors-v10.dtd"
+PUBLIC "-//Outerthought//DTD Libre Configuration V0.1//EN"
+ "dtd/libre-v01.dtd"
-- Reusable modules --
PUBLIC "-//APACHE//ENTITIES Documentation V1.1//EN"
@@ -33,6 +35,8 @@
"dtd/todo-v11.mod"
PUBLIC "-//APACHE//ENTITIES Common Elements V1.0//EN"
"dtd/common-elems-v10.mod"
+PUBLIC "-//APACHE//ENTITIES Common Character Entity Sets V1.0//EN"
+ "dtd/common-charents-v10.mod"
-- ISO public identifiers for sets of character entities --
PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN//XML"
@@ -49,7 +53,4 @@
"entity/ISOdia.pen"
PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
"entity/ISOlat1.pen"
-
-PUBLIC "-//Outerthought//DTD Libre Configuration V0.1//EN"
- "dtd/libre-v01.dtd"
1.5 +2 -0 xml-forrest/src/resources/schema/catalog.xcat
Index: catalog.xcat
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/schema/catalog.xcat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- catalog.xcat 11 Jun 2002 11:28:18 -0000 1.4
+++ catalog.xcat 13 Jun 2002 08:09:01 -0000 1.5
@@ -34,6 +34,8 @@
uri="dtd/todo-v11.mod"/>
<public publicId="-//APACHE//ENTITIES Common Elements V1.0//EN"
uri="dtd/common-elems-v10.mod"/>
+<public publicId="-//APACHE//ENTITIES Common Character Entity Sets V1.0//EN"
+ uri="dtd/common-charents-v10.mod"/>
<!-- ISO public identifiers for sets of character entities -->
<public publicId="ISO 8879-1986//ENTITIES Added Latin 1//EN//XML"
1.4 +7 -27 xml-forrest/src/resources/schema/dtd/document-v11.dtd
Index: document-v11.dtd
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/schema/dtd/document-v11.dtd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- document-v11.dtd 6 Jun 2002 14:33:43 -0000 1.3
+++ document-v11.dtd 13 Jun 2002 08:09:01 -0000 1.4
@@ -97,7 +97,9 @@
20011218 Removed "sl" since not really different from "ul". (SM)
20020214 Moved empty placeholder entity declarations up front (SNS)
20020214 Corrected content model of content.mix parameter entity (SNS)
+ 20020519 The DTDs are now modular so various parts can be re-used (SNS)
20020606 Made title into an child element of its parent instead of an attribute (SNS)
+ 20020613 Move the declarations of ISO character entity sets to module (DC)
COPYRIGHT:
Copyright (c) @year@ The Apache Software Foundation.
@@ -110,36 +112,14 @@
==================================================================== -->
-
-
<!-- =============================================================== -->
-<!-- Common character entities (included from external file) -->
+<!-- Include the Common ISO Character Entity Sets -->
<!-- =============================================================== -->
-<!ENTITY % ISOlat1 PUBLIC
- "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
- "ISOlat1.pen">
-%ISOlat1;
-
-<!ENTITY % ISOpub PUBLIC
- "ISO 8879:1986//ENTITIES Publishing//EN//XML"
- "ISOpub.pen">
-%ISOpub;
-
-<!ENTITY % ISOtech PUBLIC
- "ISO 8879:1986//ENTITIES General Technical//EN//XML"
- "ISOtech.pen">
-%ISOtech;
-
-<!ENTITY % ISOnum PUBLIC
- "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
- "ISOnum.pen">
-%ISOnum;
-
-<!ENTITY % ISOdia PUBLIC
- "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
- "ISOdia.pen">
-%ISOdia;
+<!ENTITY % common-charents PUBLIC
+ "-//APACHE//ENTITIES Common Character Entity Sets V1.0//EN"
+ "common-charents-v10.mod">
+%common-charents;
<!-- =============================================================== -->
<!-- Document -->
1.1 xml-forrest/src/resources/schema/dtd/common-charents-v10.mod
Index: common-charents-v10.mod
===================================================================
<!-- ===================================================================
Apache Common Character Entity Sets (Version 1.0)
PURPOSE:
Common elements across all DTDs.
TYPICAL INVOCATION:
<!ENTITY % common-charents PUBLIC
"-//APACHE//ENTITIES Common Character Entity Sets Vx.y//EN"
"common-charents-vxy.mod">
%common-charents;
where
x := major version
y := minor version
AUTHORS:
David Crossley <cr...@apache.org>
FIXME:
CHANGE HISTORY:
[Version 1.0]
20020613 Initial version. (DC)
COPYRIGHT:
Copyright (c) @year@ The Apache Software Foundation.
Permission to copy in any form is granted provided this notice is
included in all copies. Permission to redistribute is granted
provided this file is distributed untouched in all its parts and
included files.
==================================================================== -->
<!-- =============================================================== -->
<!-- Common ISO character entity sets -->
<!-- =============================================================== -->
<!ENTITY % ISOlat1 PUBLIC
"ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
"ISOlat1.pen">
%ISOlat1;
<!ENTITY % ISOpub PUBLIC
"ISO 8879:1986//ENTITIES Publishing//EN//XML"
"ISOpub.pen">
%ISOpub;
<!ENTITY % ISOtech PUBLIC
"ISO 8879:1986//ENTITIES General Technical//EN//XML"
"ISOtech.pen">
%ISOtech;
<!ENTITY % ISOnum PUBLIC
"ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
"ISOnum.pen">
%ISOnum;
<!ENTITY % ISOdia PUBLIC
"ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
"ISOdia.pen">
%ISOdia;
<!-- =============================================================== -->
<!-- End of DTD -->
<!-- =============================================================== -->