You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ne...@apache.org on 2003/01/16 22:00:17 UTC
cvs commit: xml-xerces/java/docs/dtd releases.dtd settings.dtd blocks.ent characters.ent
neilg 2003/01/16 13:00:15
Modified: java/docs/dtd releases.dtd settings.dtd blocks.ent
characters.ent
Log:
fixing bug #15255. Also, I have altered things so that we are able to validly parse our own documentation--there were several errors related to duplicate declarations to get rid of.
Revision Changes Path
1.3 +1 -2 xml-xerces/java/docs/dtd/releases.dtd
Index: releases.dtd
===================================================================
RCS file: /home/cvs/xml-xerces/java/docs/dtd/releases.dtd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- releases.dtd 23 Aug 2001 00:35:15 -0000 1.2
+++ releases.dtd 16 Jan 2003 21:00:14 -0000 1.3
@@ -2,8 +2,7 @@
<!ENTITY % include.blocks SYSTEM 'blocks.ent'>
%include.blocks;
-<!ELEMENT desc (#PCDATA|%blocks;|%markup;|%links;)*>
-<!ELEMENT note (#PCDATA|%markup;)*>
+<!ELEMENT desc (#PCDATA|%relBlocks;|%markup;|%links;)*>
<!ELEMENT releases (desc?,release+)>
<!ELEMENT release (desc?,changes?)>
1.3 +0 -3 xml-xerces/java/docs/dtd/settings.dtd
Index: settings.dtd
===================================================================
RCS file: /home/cvs/xml-xerces/java/docs/dtd/settings.dtd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- settings.dtd 23 Aug 2001 00:35:15 -0000 1.2
+++ settings.dtd 16 Jan 2003 21:00:14 -0000 1.3
@@ -1,8 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!ENTITY % include.blocks SYSTEM 'blocks.ent'>
-<!ENTITY % include.markup SYSTEM 'markup.ent'>
%include.blocks;
-%include.markup;
<!ENTITY % boolean '(true|false)'>
<!ENTITY % access-options '(read-only|read-write|write-only)'>
@@ -13,7 +11,6 @@
<!ELEMENT desc (#PCDATA|%markup;|%blocks;)*>
<!ATTLIST desc name CDATA #IMPLIED>
-<!ELEMENT note (#PCDATA|%markup;)*>
<!ELEMENT fcategory (desc?,feature+)>
<!ATTLIST fcategory name CDATA #REQUIRED>
<!ELEMENT pcategory (desc?,property+)>
1.3 +2 -1 xml-xerces/java/docs/dtd/blocks.ent
Index: blocks.ent
===================================================================
RCS file: /home/cvs/xml-xerces/java/docs/dtd/blocks.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- blocks.ent 23 Aug 2001 00:35:15 -0000 1.2
+++ blocks.ent 16 Jan 2003 21:00:14 -0000 1.3
@@ -2,6 +2,7 @@
<!-- BLOCKS ENTITY -->
<!ENTITY % blocks "p|note|ul|ol|gloss|table|source|anchor">
+<!ENTITY % relBlocks "p|note|ul|ol|gloss|table|source">
<!-- import the external markup.ent dtd -->
<!ENTITY % markupEntity SYSTEM "markup.ent">
@@ -37,4 +38,4 @@
<!ELEMENT td %content;>
<!ATTLIST td colspan CDATA "1"
rowspan CDATA "1">
-
\ No newline at end of file
+
1.3 +3 -3 xml-xerces/java/docs/dtd/characters.ent
Index: characters.ent
===================================================================
RCS file: /home/cvs/xml-xerces/java/docs/dtd/characters.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- characters.ent 23 Aug 2001 00:35:15 -0000 1.2
+++ characters.ent 16 Jan 2003 21:00:14 -0000 1.3
@@ -103,8 +103,8 @@
<!-- C0 Controls and Basic Latin -->
<!ENTITY quot """> <!-- U+0022 ISOnum - quotation mark = APL quote -->
-<!ENTITY amp "&"> <!-- U+0026 ISOnum - ampersand -->
-<!ENTITY lt "<"> <!-- U+003C ISOnum - less-than sign -->
+<!ENTITY amp "&&"> <!-- U+0026 ISOnum - ampersand -->
+<!ENTITY lt "&<"> <!-- U+003C ISOnum - less-than sign -->
<!ENTITY gt ">"> <!-- U+003E ISOnum - greater-than sign -->
<!-- Latin Extended-A -->
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org