| 1 |
neysx 09/01/31 11:57:04 |
| 2 |
|
| 3 |
Modified: metadoc.dtd |
| 4 |
Log: |
| 5 |
Simplify DTD and use shared parts |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.16 xml/htdocs/dtd/metadoc.dtd |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/dtd/metadoc.dtd?rev=1.16&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/dtd/metadoc.dtd?rev=1.16&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/dtd/metadoc.dtd?r1=1.15&r2=1.16 |
| 13 |
|
| 14 |
Index: metadoc.dtd |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/dtd/metadoc.dtd,v |
| 17 |
retrieving revision 1.15 |
| 18 |
retrieving revision 1.16 |
| 19 |
diff -u -r1.15 -r1.16 |
| 20 |
--- metadoc.dtd 9 Mar 2008 21:16:34 -0000 1.15 |
| 21 |
+++ metadoc.dtd 31 Jan 2009 11:57:04 -0000 1.16 |
| 22 |
@@ -1,7 +1,10 @@ |
| 23 |
+<!ENTITY % common SYSTEM "common.dtd"> |
| 24 |
+ |
| 25 |
+%common; |
| 26 |
+ |
| 27 |
<!ELEMENT metadoc (version,members,categories,files,docs)> |
| 28 |
<!ATTLIST metadoc lang CDATA #REQUIRED |
| 29 |
parent CDATA #IMPLIED> |
| 30 |
-<!ELEMENT version (#PCDATA)> |
| 31 |
<!ELEMENT members (lead*,member*)> |
| 32 |
<!ELEMENT lead (#PCDATA)*> <!-- <lead>nickname</lead> --> |
| 33 |
<!ELEMENT member (#PCDATA)*> |
| 34 |
@@ -28,7 +31,6 @@ |
| 35 |
|
| 36 |
<!ELEMENT dynamic (version?, title, intro?, (listing|catid*|overview))> |
| 37 |
<!ATTLIST dynamic metadoc CDATA #REQUIRED> |
| 38 |
-<!ELEMENT title (#PCDATA)*> |
| 39 |
<!ELEMENT intro (section)*> <!-- Section stuff copy/pasted from guide.dtd --> |
| 40 |
<!ELEMENT listing (list)*> |
| 41 |
<!ELEMENT list (#PCDATA)*> |
| 42 |
@@ -36,130 +38,6 @@ |
| 43 |
<!ELEMENT overview EMPTY> |
| 44 |
|
| 45 |
|
| 46 |
-<!ENTITY % inline.class "b|brite|c|e|path|img|br|mail|uri"> |
| 47 |
-<!ENTITY % pre.class "comment|i"> |
| 48 |
-<!ENTITY % block.class "box|figure|fig|note|impo|warn|pre|p|table|ul|ol"> |
| 49 |
- |
| 50 |
-<!ELEMENT section (title?, body)> |
| 51 |
-<!ATTLIST section id CDATA #IMPLIED> |
| 52 |
-<!ELEMENT body (%block.class;|glsa-latest|glsaindex)*> |
| 53 |
-<!ELEMENT figure EMPTY> |
| 54 |
-<!ATTLIST figure caption CDATA #IMPLIED |
| 55 |
- short CDATA #IMPLIED |
| 56 |
- link CDATA #REQUIRED> |
| 57 |
-<!ELEMENT fig EMPTY> |
| 58 |
-<!ATTLIST fig short CDATA #IMPLIED |
| 59 |
- linkto CDATA #IMPLIED |
| 60 |
- link CDATA #REQUIRED> |
| 61 |
-<!ELEMENT img EMPTY> |
| 62 |
-<!ATTLIST img src CDATA #REQUIRED> |
| 63 |
-<!ELEMENT br (#PCDATA)> |
| 64 |
-<!ELEMENT note (#PCDATA|%inline.class;)*> |
| 65 |
-<!ELEMENT impo (#PCDATA|%inline.class;)*> |
| 66 |
-<!ELEMENT warn (#PCDATA|%inline.class;)*> |
| 67 |
-<!ELEMENT pre (#PCDATA|%pre.class;)*> |
| 68 |
-<!ATTLIST pre caption CDATA #REQUIRED> |
| 69 |
-<!ELEMENT p (#PCDATA|%inline.class;)*> |
| 70 |
-<!ELEMENT table (tcolumn*, tr+)> |
| 71 |
-<!ELEMENT tcolumn EMPTY> |
| 72 |
-<!ATTLIST tcolumn width CDATA #REQUIRED> |
| 73 |
-<!ELEMENT tr (th|ti)+> |
| 74 |
-<!ELEMENT th (#PCDATA|%inline.class;)*> |
| 75 |
-<!ELEMENT ti (#PCDATA|%inline.class;|%block.class;)*> |
| 76 |
-<!ELEMENT ul (li+)> |
| 77 |
-<!ELEMENT ol (li+)> |
| 78 |
-<!ELEMENT li (#PCDATA|%inline.class;|ul|ol)*> |
| 79 |
- |
| 80 |
-<!--STYLE TAGS--> |
| 81 |
-<!ELEMENT b (#PCDATA|%inline.class;)*> |
| 82 |
-<!ELEMENT brite (#PCDATA|%inline.class;)*> |
| 83 |
-<!ELEMENT box (#PCDATA|%inline.class;)*> |
| 84 |
-<!ELEMENT c (#PCDATA|%inline.class;)*> |
| 85 |
-<!ELEMENT comment (#PCDATA|%pre.class;)*> |
| 86 |
-<!ELEMENT e (#PCDATA|%inline.class;)*> |
| 87 |
-<!ELEMENT i (#PCDATA|%pre.class;)*> |
| 88 |
-<!ELEMENT path (#PCDATA|%inline.class;)*> |
| 89 |
- |
| 90 |
-<!--LINK TAGS--> |
| 91 |
-<!ELEMENT mail (#PCDATA)*> |
| 92 |
-<!ATTLIST mail link CDATA #IMPLIED> |
| 93 |
-<!ELEMENT uri (#PCDATA)*> |
| 94 |
-<!ATTLIST uri link CDATA #IMPLIED> |
| 95 |
- |
| 96 |
- |
| 97 |
-<!ENTITY half "½"> <!-- VULGAR FRACTION ONE HALF --> |
| 98 |
-<!ENTITY frac12 "½"> <!-- VULGAR FRACTION ONE HALF --> |
| 99 |
-<!ENTITY frac14 "¼"> <!-- VULGAR FRACTION ONE QUARTER --> |
| 100 |
-<!ENTITY frac34 "¾"> <!-- VULGAR FRACTION THREE QUARTERS --> |
| 101 |
-<!ENTITY frac18 "⅛"> <!-- --> |
| 102 |
-<!ENTITY frac38 "⅜"> <!-- --> |
| 103 |
-<!ENTITY frac58 "⅝"> <!-- --> |
| 104 |
-<!ENTITY frac78 "⅞"> <!-- --> |
| 105 |
-<!ENTITY sup1 "¹"> <!-- SUPERSCRIPT ONE --> |
| 106 |
-<!ENTITY sup2 "²"> <!-- SUPERSCRIPT TWO --> |
| 107 |
-<!ENTITY sup3 "³"> <!-- SUPERSCRIPT THREE --> |
| 108 |
-<!ENTITY plus "+"> <!-- PLUS SIGN --> |
| 109 |
-<!ENTITY plusmn "±"> <!-- PLUS-MINUS SIGN --> |
| 110 |
-<!ENTITY lt "&#60;"> <!-- LESS-THAN SIGN --> |
| 111 |
-<!ENTITY equals "="> <!-- EQUALS SIGN --> |
| 112 |
-<!ENTITY gt ">"> <!-- GREATER-THAN SIGN --> |
| 113 |
-<!ENTITY divide "÷"> <!-- DIVISION SIGN --> |
| 114 |
-<!ENTITY times "×"> <!-- MULTIPLICATION SIGN --> |
| 115 |
-<!ENTITY curren "¤"> <!-- CURRENCY SIGN --> |
| 116 |
-<!ENTITY pound "£"> <!-- POUND SIGN --> |
| 117 |
-<!ENTITY dollar "$"> <!-- DOLLAR SIGN --> |
| 118 |
-<!ENTITY cent "¢"> <!-- CENT SIGN --> |
| 119 |
-<!ENTITY yen "¥"> <!-- YEN SIGN --> |
| 120 |
-<!ENTITY num "#"> <!-- NUMBER SIGN --> |
| 121 |
-<!ENTITY percnt "%"> <!-- PERCENT SIGN --> |
| 122 |
-<!ENTITY amp "&#38;"> <!-- AMPERSAND --> |
| 123 |
-<!ENTITY ast "∗"> <!-- ASTERISK OPERATOR --> |
| 124 |
-<!ENTITY commat "@"> <!-- COMMERCIAL AT --> |
| 125 |
-<!ENTITY lsqb "["> <!-- LEFT SQUARE BRACKET --> |
| 126 |
-<!ENTITY bsol "\"> <!-- REVERSE SOLIDUS --> |
| 127 |
-<!ENTITY rsqb "]"> <!-- RIGHT SQUARE BRACKET --> |
| 128 |
-<!ENTITY lcub "{"> <!-- LEFT CURLY BRACKET --> |
| 129 |
-<!ENTITY horbar "―"> <!-- HORIZONTAL BAR --> |
| 130 |
-<!ENTITY verbar "|"> <!-- VERTICAL LINE --> |
| 131 |
-<!ENTITY rcub "}"> <!-- RIGHT CURLY BRACKET --> |
| 132 |
-<!ENTITY micro "µ"> <!-- MICRO SIGN --> |
| 133 |
-<!ENTITY ohm "Ω"> <!-- OHM SIGN --> |
| 134 |
-<!ENTITY deg "°"> <!-- DEGREE SIGN --> |
| 135 |
-<!ENTITY ordm "º"> <!-- MASCULINE ORDINAL INDICATOR --> |
| 136 |
-<!ENTITY ordf "ª"> <!-- FEMININE ORDINAL INDICATOR --> |
| 137 |
-<!ENTITY sect "§"> <!-- SECTION SIGN --> |
| 138 |
-<!ENTITY para "¶"> <!-- PILCROW SIGN --> |
| 139 |
-<!ENTITY middot "·"> <!-- MIDDLE DOT --> |
| 140 |
-<!ENTITY larr "←"> <!-- LEFTWARDS DOUBLE ARROW --> |
| 141 |
-<!ENTITY rarr "→"> <!-- RIGHTWARDS DOUBLE ARROW --> |
| 142 |
-<!ENTITY uarr "↑"> <!-- UPWARDS ARROW --> |
| 143 |
-<!ENTITY darr "↓"> <!-- DOWNWARDS ARROW --> |
| 144 |
-<!ENTITY copy "©"> <!-- COPYRIGHT SIGN --> |
| 145 |
-<!ENTITY reg "®"> <!-- REG TRADE MARK SIGN --> |
| 146 |
-<!ENTITY trade "™"> <!-- TRADE MARK SIGN --> |
| 147 |
-<!ENTITY brvbar "¦"> <!-- BROKEN BAR --> |
| 148 |
-<!ENTITY not "¬"> <!-- NOT SIGN --> |
| 149 |
-<!ENTITY sung "♩"> <!-- --> |
| 150 |
-<!ENTITY excl "!"> <!-- EXCLAMATION MARK --> |
| 151 |
-<!ENTITY iexcl "¡"> <!-- INVERTED EXCLAMATION MARK --> |
| 152 |
-<!ENTITY quot """> <!-- QUOTATION MARK --> |
| 153 |
-<!ENTITY apos "'"> <!-- APOSTROPHE --> |
| 154 |
-<!ENTITY lpar "("> <!-- LEFT PARENTHESIS --> |
| 155 |
-<!ENTITY rpar ")"> <!-- RIGHT PARENTHESIS --> |
| 156 |
-<!ENTITY comma ","> <!-- COMMA --> |
| 157 |
-<!ENTITY lowbar "_"> <!-- LOW LINE --> |
| 158 |
-<!ENTITY hyphen ""> <!-- --> |
| 159 |
-<!ENTITY period "."> <!-- FULL STOP --> |
| 160 |
-<!ENTITY sol "/"> <!-- SOLIDUS --> |
| 161 |
-<!ENTITY colon ":"> <!-- COLON --> |
| 162 |
-<!ENTITY semi ";"> <!-- SEMICOLON --> |
| 163 |
-<!ENTITY quest "?"> <!-- QUESTION MARK --> |
| 164 |
-<!ENTITY iquest "¿"> <!-- INVERTED QUESTION MARK --> |
| 165 |
-<!ENTITY laquo "«"> <!-- LEFT-POINTING DOUBLE ANGLE QUOTATION MARK --> |
| 166 |
-<!ENTITY raquo "»"> <!-- RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK --> |
| 167 |
-<!ENTITY lsquo "‘"> <!-- --> |
| 168 |
-<!ENTITY rsquo "’"> <!-- RIGHT SINGLE QUOTATION MARK --> |
| 169 |
-<!ENTITY ldquo "“"> <!-- --> |
| 170 |
-<!ENTITY rdquo "”"> <!-- RIGHT DOUBLE QUOTATION MARK --> |
| 171 |
-<!ENTITY nbsp " "> <!-- NO-BREAK SPACE --> |
| 172 |
-<!ENTITY shy "­"> <!-- SOFT HYPHEN --> |
| 173 |
+<!ELEMENT section (include | (title?, body+))> |
| 174 |
+ |
| 175 |
+<!ELEMENT body (include | (%block.class;)+)> |
Archives