diff options
| author |   neysx <neysx> | 2009-01-31 11:57:04 +0000 |
|---|---|---|
| committer | neysx <neysx> | 2009-01-31 11:57:04 +0000 |
| commit | ca98c00b71c729b55fd2e81b5d57d58751006d0c (patch) | |
| tree | 30eaf07bef4f69d91fafdf061a7c221def7aa02b | |
| parent | #204402 & #252157 Reorg menu & display GLSA/new packages/blog entries on fron... (diff) | |
| download | www-redesign-ca98c00b71c729b55fd2e81b5d57d58751006d0c.tar.gz www-redesign-ca98c00b71c729b55fd2e81b5d57d58751006d0c.tar.bz2 www-redesign-ca98c00b71c729b55fd2e81b5d57d58751006d0c.zip | |
Simplify DTD and use shared parts
| -rw-r--r-- | xml/htdocs/dtd/metadoc.dtd | 134 |
1 files changed, 6 insertions, 128 deletions
diff --git a/xml/htdocs/dtd/metadoc.dtd b/xml/htdocs/dtd/metadoc.dtd index 32cfe8f1..20e73b26 100644 --- a/xml/htdocs/dtd/metadoc.dtd +++ b/xml/htdocs/dtd/metadoc.dtd @@ -1,7 +1,10 @@ +<!ENTITY % common SYSTEM "common.dtd"> + +%common; + <!ELEMENT metadoc (version,members,categories,files,docs)> <!ATTLIST metadoc lang CDATA #REQUIRED parent CDATA #IMPLIED> -<!ELEMENT version (#PCDATA)> <!ELEMENT members (lead*,member*)> <!ELEMENT lead (#PCDATA)*> <!-- <lead>nickname</lead> --> <!ELEMENT member (#PCDATA)*> @@ -28,7 +31,6 @@ <!ELEMENT dynamic (version?, title, intro?, (listing|catid*|overview))> <!ATTLIST dynamic metadoc CDATA #REQUIRED> -<!ELEMENT title (#PCDATA)*> <!ELEMENT intro (section)*> <!-- Section stuff copy/pasted from guide.dtd --> <!ELEMENT listing (list)*> <!ELEMENT list (#PCDATA)*> @@ -36,130 +38,6 @@ <!ELEMENT overview EMPTY> -<!ENTITY % inline.class "b|brite|c|e|path|img|br|mail|uri"> -<!ENTITY % pre.class "comment|i"> -<!ENTITY % block.class "box|figure|fig|note|impo|warn|pre|p|table|ul|ol"> - -<!ELEMENT section (title?, body)> -<!ATTLIST section id CDATA #IMPLIED> -<!ELEMENT body (%block.class;|glsa-latest|glsaindex)*> -<!ELEMENT figure EMPTY> -<!ATTLIST figure caption CDATA #IMPLIED - short CDATA #IMPLIED - link CDATA #REQUIRED> -<!ELEMENT fig EMPTY> -<!ATTLIST fig short CDATA #IMPLIED - linkto CDATA #IMPLIED - link CDATA #REQUIRED> -<!ELEMENT img EMPTY> -<!ATTLIST img src CDATA #REQUIRED> -<!ELEMENT br (#PCDATA)> -<!ELEMENT note (#PCDATA|%inline.class;)*> -<!ELEMENT impo (#PCDATA|%inline.class;)*> -<!ELEMENT warn (#PCDATA|%inline.class;)*> -<!ELEMENT pre (#PCDATA|%pre.class;)*> -<!ATTLIST pre caption CDATA #REQUIRED> -<!ELEMENT p (#PCDATA|%inline.class;)*> -<!ELEMENT table (tcolumn*, tr+)> -<!ELEMENT tcolumn EMPTY> -<!ATTLIST tcolumn width CDATA #REQUIRED> -<!ELEMENT tr (th|ti)+> -<!ELEMENT th (#PCDATA|%inline.class;)*> -<!ELEMENT ti (#PCDATA|%inline.class;|%block.class;)*> -<!ELEMENT ul (li+)> -<!ELEMENT ol (li+)> -<!ELEMENT li (#PCDATA|%inline.class;|ul|ol)*> - -<!--STYLE TAGS--> -<!ELEMENT b (#PCDATA|%inline.class;)*> -<!ELEMENT brite (#PCDATA|%inline.class;)*> -<!ELEMENT box (#PCDATA|%inline.class;)*> -<!ELEMENT c (#PCDATA|%inline.class;)*> -<!ELEMENT comment (#PCDATA|%pre.class;)*> -<!ELEMENT e (#PCDATA|%inline.class;)*> -<!ELEMENT i (#PCDATA|%pre.class;)*> -<!ELEMENT path (#PCDATA|%inline.class;)*> - -<!--LINK TAGS--> -<!ELEMENT mail (#PCDATA)*> -<!ATTLIST mail link CDATA #IMPLIED> -<!ELEMENT uri (#PCDATA)*> -<!ATTLIST uri link CDATA #IMPLIED> - +<!ELEMENT section (include | (title?, body+))> -<!ENTITY half "½"> <!-- VULGAR FRACTION ONE HALF --> -<!ENTITY frac12 "½"> <!-- VULGAR FRACTION ONE HALF --> -<!ENTITY frac14 "¼"> <!-- VULGAR FRACTION ONE QUARTER --> -<!ENTITY frac34 "¾"> <!-- VULGAR FRACTION THREE QUARTERS --> -<!ENTITY frac18 "⅛"> <!-- --> -<!ENTITY frac38 "⅜"> <!-- --> -<!ENTITY frac58 "⅝"> <!-- --> -<!ENTITY frac78 "⅞"> <!-- --> -<!ENTITY sup1 "¹"> <!-- SUPERSCRIPT ONE --> -<!ENTITY sup2 "²"> <!-- SUPERSCRIPT TWO --> -<!ENTITY sup3 "³"> <!-- SUPERSCRIPT THREE --> -<!ENTITY plus "+"> <!-- PLUS SIGN --> -<!ENTITY plusmn "±"> <!-- PLUS-MINUS SIGN --> -<!ENTITY lt "&#60;"> <!-- LESS-THAN SIGN --> -<!ENTITY equals "="> <!-- EQUALS SIGN --> -<!ENTITY gt ">"> <!-- GREATER-THAN SIGN --> -<!ENTITY divide "÷"> <!-- DIVISION SIGN --> -<!ENTITY times "×"> <!-- MULTIPLICATION SIGN --> -<!ENTITY curren "¤"> <!-- CURRENCY SIGN --> -<!ENTITY pound "£"> <!-- POUND SIGN --> -<!ENTITY dollar "$"> <!-- DOLLAR SIGN --> -<!ENTITY cent "¢"> <!-- CENT SIGN --> -<!ENTITY yen "¥"> <!-- YEN SIGN --> -<!ENTITY num "#"> <!-- NUMBER SIGN --> -<!ENTITY percnt "%"> <!-- PERCENT SIGN --> -<!ENTITY amp "&#38;"> <!-- AMPERSAND --> -<!ENTITY ast "∗"> <!-- ASTERISK OPERATOR --> -<!ENTITY commat "@"> <!-- COMMERCIAL AT --> -<!ENTITY lsqb "["> <!-- LEFT SQUARE BRACKET --> -<!ENTITY bsol "\"> <!-- REVERSE SOLIDUS --> -<!ENTITY rsqb "]"> <!-- RIGHT SQUARE BRACKET --> -<!ENTITY lcub "{"> <!-- LEFT CURLY BRACKET --> -<!ENTITY horbar "―"> <!-- HORIZONTAL BAR --> -<!ENTITY verbar "|"> <!-- VERTICAL LINE --> -<!ENTITY rcub "}"> <!-- RIGHT CURLY BRACKET --> -<!ENTITY micro "µ"> <!-- MICRO SIGN --> -<!ENTITY ohm "Ω"> <!-- OHM SIGN --> -<!ENTITY deg "°"> <!-- DEGREE SIGN --> -<!ENTITY ordm "º"> <!-- MASCULINE ORDINAL INDICATOR --> -<!ENTITY ordf "ª"> <!-- FEMININE ORDINAL INDICATOR --> -<!ENTITY sect "§"> <!-- SECTION SIGN --> -<!ENTITY para "¶"> <!-- PILCROW SIGN --> -<!ENTITY middot "·"> <!-- MIDDLE DOT --> -<!ENTITY larr "←"> <!-- LEFTWARDS DOUBLE ARROW --> -<!ENTITY rarr "→"> <!-- RIGHTWARDS DOUBLE ARROW --> -<!ENTITY uarr "↑"> <!-- UPWARDS ARROW --> -<!ENTITY darr "↓"> <!-- DOWNWARDS ARROW --> -<!ENTITY copy "©"> <!-- COPYRIGHT SIGN --> -<!ENTITY reg "®"> <!-- REG TRADE MARK SIGN --> -<!ENTITY trade "™"> <!-- TRADE MARK SIGN --> -<!ENTITY brvbar "¦"> <!-- BROKEN BAR --> -<!ENTITY not "¬"> <!-- NOT SIGN --> -<!ENTITY sung "♩"> <!-- --> -<!ENTITY excl "!"> <!-- EXCLAMATION MARK --> -<!ENTITY iexcl "¡"> <!-- INVERTED EXCLAMATION MARK --> -<!ENTITY quot """> <!-- QUOTATION MARK --> -<!ENTITY apos "'"> <!-- APOSTROPHE --> -<!ENTITY lpar "("> <!-- LEFT PARENTHESIS --> -<!ENTITY rpar ")"> <!-- RIGHT PARENTHESIS --> -<!ENTITY comma ","> <!-- COMMA --> -<!ENTITY lowbar "_"> <!-- LOW LINE --> -<!ENTITY hyphen ""> <!-- --> -<!ENTITY period "."> <!-- FULL STOP --> -<!ENTITY sol "/"> <!-- SOLIDUS --> -<!ENTITY colon ":"> <!-- COLON --> -<!ENTITY semi ";"> <!-- SEMICOLON --> -<!ENTITY quest "?"> <!-- QUESTION MARK --> -<!ENTITY iquest "¿"> <!-- INVERTED QUESTION MARK --> -<!ENTITY laquo "«"> <!-- LEFT-POINTING DOUBLE ANGLE QUOTATION MARK --> -<!ENTITY raquo "»"> <!-- RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK --> -<!ENTITY lsquo "‘"> <!-- --> -<!ENTITY rsquo "’"> <!-- RIGHT SINGLE QUOTATION MARK --> -<!ENTITY ldquo "“"> <!-- --> -<!ENTITY rdquo "”"> <!-- RIGHT DOUBLE QUOTATION MARK --> -<!ENTITY nbsp " "> <!-- NO-BREAK SPACE --> -<!ENTITY shy "­"> <!-- SOFT HYPHEN --> +<!ELEMENT body (include | (%block.class;)+)> |