small fixes for DTD validation

soshial · Oct 14, 2017 · 8be1805 · 8be1805
1 parent a26b847
commit 8be1805
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/format_standard/xdxf_description.md b/format_standard/xdxf_description.md
@@ -283,26 +283,26 @@ Example of the RECCOMENDED logical format:
         <title>Webster's Dictionary</title>
         <full_title>Webster's Unabridged Dictionary</full_title>
         <description>Webster's Unabridged Dictionary published 1913 by the Webster Institute</description>
+        <file_ver>001</file_ver>
+        <creation_date>07-04-2013</creation_date>
+        <last_edited_date>13-10-2017</last_edited_date>
         <abbreviations>
           <abbr_def><abbr_k>n.</abbr_k><abbr_v>noun</abbr_v></abbr_def>
           <abbr_def><abbr_k>v.</abbr_k><abbr_v>verb</abbr_v></abbr_def>
           <abbr_def><abbr_k>Av.</abbr_k><abbr_k>Ave.</abbr_k><abbr_v>Avenue</abbr_v> </abbr_def>
         </abbreviations>
-        <file_ver>001</file_ver>
-        <creation_date>07-04-2013</creation_date>
     </meta_info>
     <lexicon>
         <ar>
             <k>home</k>
             <def>
                 <gr><abbr>n.</abbr> <tr>'həum</tr><rref start="16384" size="512" lctn="sounds_of_words.ogg"/></gr>
                 <co>XDXF <iref href="http://xdxf.sourceforge.net"><b>Home</b> page</iref></co>
-                <sr><kref type="rel">home-made</kref></sr>
                 <def><deftext>One's own dwelling place; the house in which one lives.</deftext></def>
                 <def><deftext>One's native land; the place or country in which one dwells.</deftext></def>
                 <def>
                     <deftext>The abiding place of the affections.</deftext>
-                    <ex>For without hearts there is no home.</ex>
+                    <ex><ex_orig>For without hearts there is no home.</ex_orig></ex>
                 </def>
                 <def>
                     <deftext>
@@ -314,10 +314,11 @@ Example of the RECCOMENDED logical format:
                     </ex>
                     <categ><kref idref="fb982hk">Society</kref></categ>
                 </def>
+                <sr><kref type="rel">home-made</kref></sr>
             </def>
         </ar>
         <ar>
-            <k>indices</k>
+            <k id="fb982hk">Society</k>
             <def>
                 <deftext>Plural form of word <kref>index</kref>.</deftext>
             </def>

diff --git a/format_standard/xdxf_strict.dtd b/format_standard/xdxf_strict.dtd
@@ -26,10 +26,11 @@
 <!ELEMENT ar (k+,def)>
     <!ATTLIST ar f (v|l) "l">
 <!ELEMENT k (#PCDATA|opt|sup|sub)*>
+    <!ATTLIST k id ID #IMPLIED>
 <!ELEMENT opt (#PCDATA|sup|sub)*>
 <!ENTITY % style "c|sup|sub|i|b|u">
 <!ENTITY % ref "kref|rref|iref">
-<!ELEMENT def (gr?,ex*,co*,sr?,etm?,categ*,(def+|deftext))>
+<!ELEMENT def (gr?,co*,(def+|deftext),ex*,sr?,etm?,categ*)>
 <!ELEMENT deftext (#PCDATA|tr|dtrn|abbr|co|di|%ref;|%style;|br)*>
     <!ATTLIST def id ID #IMPLIED>
     <!ATTLIST def cmt CDATA #IMPLIED>
@@ -53,12 +54,12 @@
 <!ELEMENT iref (#PCDATA|%style;)*>
     <!ATTLIST iref href CDATA #REQUIRED>
 <!ELEMENT abbr (#PCDATA)>
-<!ELEMENT ex (ex_orig+,ex_transl*,iref*)>
+<!ELEMENT ex (ex_orig+,ex_tran*,iref*)>
     <!ATTLIST ex type (exm|phr|prv|oth|PCDATA) "exm">
     <!ATTLIST ex source CDATA #IMPLIED>
     <!ATTLIST ex author CDATA #IMPLIED>
 <!ELEMENT ex_orig (#PCDATA|mrkd|co|%ref;|%style;|br)*>
-<!ELEMENT ex_transl (#PCDATA|mrkd|co|%ref;|%style;|br)*>
+<!ELEMENT ex_tran (#PCDATA|mrkd|co|%ref;|%style;|br)*>
 <!ELEMENT mrkd (#PCDATA|kref|%style;)*>
 <!ELEMENT co (#PCDATA|co|tr|abbr|di|%ref;|%style;|br)*>
     <!ATTLIST co type CDATA #IMPLIED>