--- lfdb.dtd.old        2004-10-11 16:48:45.000000000 +0100
+++ lfdb.dtd    2004-10-11 16:45:14.000000000 +0100
@@ -1,7 +1,17 @@
<!-- HTML elements allowed in <desc> sections -->

-<!ENTITY % xhtml-spec SYSTEM "/usr/share/sgml/W3C/dtd/XHTML_1.0_Strict">
-%xhtml-spec;
+<!-- next is to import XHTML -->
+<!ENTITY % XHTML PUBLIC
+    "-//W3C//DTD XHTML 1.0 Frameset//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+%XHTML;
+
+<!-- and this to import the XHTML escape chars -->
+<!ENTITY % HTMLlat1 PUBLIC
+ "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent">
+%HTMLlat1;
+
<!ENTITY % html-els "a">

<!-- LFDB ELEMENTS -->
@@ -20,14 +30,16 @@
      <!ELEMENT team        EMPTY>
  <!ELEMENT issues      (issue+)>
    <!ELEMENT issue       (title+, current?, published?, file*)>
+      <!ELEMENT title       (#PCDATA)>
      <!ELEMENT current     EMPTY>
      <!ELEMENT published   EMPTY>
      <!ELEMENT file        (#PCDATA)>
  <!ELEMENT articles    (article+)>
-    <!ELEMENT article     (title+, (file|personref|abstract|issueref|
themeref|nometa|nohtml|translation|proofread)*)>
+    <!ELEMENT article     (title+, (file|personref|abstract|issueref|
themeref|nometa|nohtml|translation|proofread|notpublished)*)>
      <!ELEMENT abstract    (#PCDATA)>
      <!ELEMENT nohtml      EMPTY>
      <!ELEMENT nometa      EMPTY>
+      <!ELEMENT notpublished EMPTY>
      <!ELEMENT translation (personref*, (reserved|finished|proofread)*)>
        <!ELEMENT reserved    (#PCDATA)>
        <!ELEMENT finished    (#PCDATA)>
@@ -46,13 +58,11 @@
<!ATTLIST title       xml:lang      NMTOKEN       #REQUIRED>
<!ATTLIST abstract    xml:lang      NMTOKEN       #REQUIRED>
<!ATTLIST img         src           CDATA         #REQUIRED>
-<!ATTLIST person      id            ID            #REQUIRED
+<!ATTLIST person      id            ID            #REQUIRED>
+<!ATTLIST desc        xml:lang      NMTOKEN       #REQUIRED>
+<!ATTLIST team        xml:lang      NMTOKEN       #REQUIRED
                      status        (non-active|active|idle)
                                                  "non-active">
-<!ATTLIST nometa      xml:lang      NMTOKEN       #REQUIRED>
-<!ATTLIST nohtml      xml:lang      NMTOKEN       #REQUIRED>
-<!ATTLIST desc        xml:lang      NMTOKEN       #REQUIRED>
-<!ATTLIST team        xml:lang      NMTOKEN       #REQUIRED>
<!ATTLIST issue       id            ID            #REQUIRED
                      code          CDATA         #IMPLIED>
<!ATTLIST article     id            ID            #REQUIRED