| 1 |
neysx 08/01/01 21:28:39 |
| 2 |
|
| 3 |
Modified: book.dtd common.dtd guide.dtd |
| 4 |
Log: |
| 5 |
Added support for included bits |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.29 xml/htdocs/dtd/book.dtd |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/dtd/book.dtd?rev=1.29&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/dtd/book.dtd?rev=1.29&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/dtd/book.dtd?r1=1.28&r2=1.29 |
| 13 |
|
| 14 |
Index: book.dtd |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/dtd/book.dtd,v |
| 17 |
retrieving revision 1.28 |
| 18 |
retrieving revision 1.29 |
| 19 |
diff -u -r1.28 -r1.29 |
| 20 |
--- book.dtd 6 Nov 2007 15:48:00 -0000 1.28 |
| 21 |
+++ book.dtd 1 Jan 2008 21:28:38 -0000 1.29 |
| 22 |
@@ -16,35 +16,9 @@ |
| 23 |
<!ELEMENT sections (abstract?, version, date, section+)> |
| 24 |
|
| 25 |
<!ELEMENT section (title, (body+ | subsection+) )> |
| 26 |
-<!ATTLIST section id CDATA #IMPLIED |
| 27 |
- test CDATA #IMPLIED> |
| 28 |
|
| 29 |
<!ELEMENT subsection (title?, body+)> |
| 30 |
<!ATTLIST subsection id CDATA #IMPLIED |
| 31 |
test CDATA #IMPLIED> |
| 32 |
|
| 33 |
<!ELEMENT body (%block.class;)+> |
| 34 |
-<!ATTLIST body test CDATA #IMPLIED> |
| 35 |
- |
| 36 |
-<!ATTLIST note test CDATA #IMPLIED> |
| 37 |
- |
| 38 |
-<!ATTLIST impo test CDATA #IMPLIED> |
| 39 |
- |
| 40 |
-<!ATTLIST warn test CDATA #IMPLIED> |
| 41 |
- |
| 42 |
-<!ATTLIST pre test CDATA #IMPLIED> |
| 43 |
- |
| 44 |
-<!ATTLIST p test CDATA #IMPLIED> |
| 45 |
- |
| 46 |
-<!ATTLIST table test CDATA #IMPLIED> |
| 47 |
- |
| 48 |
-<!ATTLIST tr test CDATA #IMPLIED> |
| 49 |
- |
| 50 |
-<!ATTLIST ul test CDATA #IMPLIED> |
| 51 |
- |
| 52 |
-<!ATTLIST ol test CDATA #IMPLIED> |
| 53 |
- |
| 54 |
-<!ATTLIST li test CDATA #IMPLIED> |
| 55 |
- |
| 56 |
-<!ELEMENT include EMPTY> |
| 57 |
-<!ATTLIST include href CDATA #REQUIRED> |
| 58 |
|
| 59 |
|
| 60 |
|
| 61 |
1.2 xml/htdocs/dtd/common.dtd |
| 62 |
|
| 63 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/dtd/common.dtd?rev=1.2&view=markup |
| 64 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/dtd/common.dtd?rev=1.2&content-type=text/plain |
| 65 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/dtd/common.dtd?r1=1.1&r2=1.2 |
| 66 |
|
| 67 |
Index: common.dtd |
| 68 |
=================================================================== |
| 69 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/dtd/common.dtd,v |
| 70 |
retrieving revision 1.1 |
| 71 |
retrieving revision 1.2 |
| 72 |
diff -u -r1.1 -r1.2 |
| 73 |
--- common.dtd 13 Jul 2007 20:55:28 -0000 1.1 |
| 74 |
+++ common.dtd 1 Jan 2008 21:28:38 -0000 1.2 |
| 75 |
@@ -52,13 +52,17 @@ |
| 76 |
<!ELEMENT br EMPTY> |
| 77 |
|
| 78 |
<!ELEMENT note (#PCDATA|%inline.class;)*> |
| 79 |
+<!ATTLIST note test CDATA #IMPLIED> |
| 80 |
|
| 81 |
<!ELEMENT impo (#PCDATA|%inline.class;)*> |
| 82 |
+<!ATTLIST impo test CDATA #IMPLIED> |
| 83 |
|
| 84 |
<!ELEMENT warn (#PCDATA|%inline.class;)*> |
| 85 |
+<!ATTLIST warn test CDATA #IMPLIED> |
| 86 |
|
| 87 |
<!ELEMENT pre (#PCDATA|%pre.class;)*> |
| 88 |
-<!ATTLIST pre caption CDATA #REQUIRED> |
| 89 |
+<!ATTLIST pre caption CDATA #REQUIRED |
| 90 |
+ test CDATA #IMPLIED> |
| 91 |
|
| 92 |
<!ELEMENT comment (#PCDATA|%pre.class;|b)*> |
| 93 |
<!ELEMENT i (#PCDATA|%pre.class;)*> |
| 94 |
@@ -72,16 +76,21 @@ |
| 95 |
<!ATTLIST glepindex status CDATA #IMPLIED |
| 96 |
index CDATA "/proj/en/glep/gleps.xml"> |
| 97 |
|
| 98 |
+<!ATTLIST body test CDATA #IMPLIED> |
| 99 |
+ |
| 100 |
<!ELEMENT p (#PCDATA|%inline.class;)*> |
| 101 |
-<!ATTLIST p by CDATA #IMPLIED> |
| 102 |
+<!ATTLIST p by CDATA #IMPLIED |
| 103 |
+ test CDATA #IMPLIED> |
| 104 |
|
| 105 |
<!ELEMENT table (tcolumn*, tr+)> |
| 106 |
+<!ATTLIST table test CDATA #IMPLIED> |
| 107 |
|
| 108 |
<!ELEMENT tcolumn EMPTY> |
| 109 |
<!ATTLIST tcolumn width CDATA #REQUIRED> |
| 110 |
|
| 111 |
<!ELEMENT tr (th|ti)+> |
| 112 |
-<!ATTLIST tr id CDATA #IMPLIED> |
| 113 |
+<!ATTLIST tr id CDATA #IMPLIED |
| 114 |
+ test CDATA #IMPLIED> |
| 115 |
|
| 116 |
<!ELEMENT th (#PCDATA|%inline.class;)*> |
| 117 |
<!ATTLIST th colspan CDATA #IMPLIED |
| 118 |
@@ -99,10 +108,13 @@ |
| 119 |
<!ELEMENT dd (#PCDATA|%inline.class;|ul|ol)*> |
| 120 |
|
| 121 |
<!ELEMENT ul (li+)> |
| 122 |
+<!ATTLIST ul test CDATA #IMPLIED> |
| 123 |
|
| 124 |
<!ELEMENT ol (li+)> |
| 125 |
+<!ATTLIST ol test CDATA #IMPLIED> |
| 126 |
|
| 127 |
<!ELEMENT li (#PCDATA|%inline.class;|ul|ol)*> |
| 128 |
+<!ATTLIST li test CDATA #IMPLIED> |
| 129 |
|
| 130 |
<!ELEMENT sup (#PCDATA|%inline.class;)*> |
| 131 |
<!ELEMENT sub (#PCDATA|%inline.class;)*> |
| 132 |
@@ -115,3 +127,9 @@ |
| 133 |
<!ELEMENT keyval EMPTY> |
| 134 |
<!ATTLIST keyval id CDATA #REQUIRED> |
| 135 |
|
| 136 |
+<!ATTLIST section id CDATA #IMPLIED |
| 137 |
+ test CDATA #IMPLIED> |
| 138 |
+ |
| 139 |
+<!ELEMENT included ( version, date, (chapter|section|body)+ )> |
| 140 |
+<!ELEMENT include EMPTY> |
| 141 |
+<!ATTLIST include href CDATA #REQUIRED> |
| 142 |
|
| 143 |
|
| 144 |
|
| 145 |
1.46 xml/htdocs/dtd/guide.dtd |
| 146 |
|
| 147 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/dtd/guide.dtd?rev=1.46&view=markup |
| 148 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/dtd/guide.dtd?rev=1.46&content-type=text/plain |
| 149 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/dtd/guide.dtd?r1=1.45&r2=1.46 |
| 150 |
|
| 151 |
Index: guide.dtd |
| 152 |
=================================================================== |
| 153 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/dtd/guide.dtd,v |
| 154 |
retrieving revision 1.45 |
| 155 |
retrieving revision 1.46 |
| 156 |
diff -u -r1.45 -r1.46 |
| 157 |
--- guide.dtd 24 Aug 2007 20:59:04 -0000 1.45 |
| 158 |
+++ guide.dtd 1 Jan 2008 21:28:38 -0000 1.46 |
| 159 |
@@ -10,7 +10,7 @@ |
| 160 |
|
| 161 |
<!ELEMENT devmap EMPTY> |
| 162 |
|
| 163 |
-<!ELEMENT guide (title, subtitle?, author+, abstract, summary?, license?, version, date, faqindex?, chapter+)> |
| 164 |
+<!ELEMENT guide (title, subtitle?, values?, author+, abstract, summary?, license?, version, date, faqindex?, chapter+)> |
| 165 |
<!ATTLIST guide link CDATA #IMPLIED |
| 166 |
type CDATA #IMPLIED |
| 167 |
disclaimer (articles|oldbook|draft|obsolete) #IMPLIED |
| 168 |
@@ -27,13 +27,12 @@ |
| 169 |
|
| 170 |
<!ELEMENT faqindex (title, section?)> |
| 171 |
|
| 172 |
-<!ELEMENT chapter (title, section+)> |
| 173 |
+<!ELEMENT chapter (include | (title, section+))> |
| 174 |
<!ATTLIST chapter id CDATA #IMPLIED> |
| 175 |
|
| 176 |
-<!ELEMENT section (title?, body+)> |
| 177 |
-<!ATTLIST section id CDATA #IMPLIED> |
| 178 |
+<!ELEMENT section (include | (title?, body+))> |
| 179 |
|
| 180 |
-<!ELEMENT body (%block.class;|glsa-latest|glsaindex|glepindex)+> |
| 181 |
+<!ELEMENT body (include | (%block.class;|glsa-latest|glsaindex|glepindex)+)> |
| 182 |
|
| 183 |
<!ELEMENT glsaindex EMPTY> |
| 184 |
<!ELEMENT glsa-latest EMPTY> |
| 185 |
|
| 186 |
|
| 187 |
|
| 188 |
-- |
| 189 |
gentoo-commits@g.o mailing list |
Archives