Skip to content

Commit 8be1805

Browse files
committed
small fixes for DTD validation
1 parent a26b847 commit 8be1805

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

format_standard/xdxf_description.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -283,26 +283,26 @@ Example of the RECCOMENDED logical format:
283283
<title>Webster's Dictionary</title>
284284
<full_title>Webster's Unabridged Dictionary</full_title>
285285
<description>Webster's Unabridged Dictionary published 1913 by the Webster Institute</description>
286+
<file_ver>001</file_ver>
287+
<creation_date>07-04-2013</creation_date>
288+
<last_edited_date>13-10-2017</last_edited_date>
286289
<abbreviations>
287290
<abbr_def><abbr_k>n.</abbr_k><abbr_v>noun</abbr_v></abbr_def>
288291
<abbr_def><abbr_k>v.</abbr_k><abbr_v>verb</abbr_v></abbr_def>
289292
<abbr_def><abbr_k>Av.</abbr_k><abbr_k>Ave.</abbr_k><abbr_v>Avenue</abbr_v> </abbr_def>
290293
</abbreviations>
291-
<file_ver>001</file_ver>
292-
<creation_date>07-04-2013</creation_date>
293294
</meta_info>
294295
<lexicon>
295296
<ar>
296297
<k>home</k>
297298
<def>
298299
<gr><abbr>n.</abbr> <tr>'həum</tr><rref start="16384" size="512" lctn="sounds_of_words.ogg"/></gr>
299300
<co>XDXF <iref href="http://xdxf.sourceforge.net"><b>Home</b> page</iref></co>
300-
<sr><kref type="rel">home-made</kref></sr>
301301
<def><deftext>One's own dwelling place; the house in which one lives.</deftext></def>
302302
<def><deftext>One's native land; the place or country in which one dwells.</deftext></def>
303303
<def>
304304
<deftext>The abiding place of the affections.</deftext>
305-
<ex>For without hearts there is no home.</ex>
305+
<ex><ex_orig>For without hearts there is no home.</ex_orig></ex>
306306
</def>
307307
<def>
308308
<deftext>
@@ -314,10 +314,11 @@ Example of the RECCOMENDED logical format:
314314
</ex>
315315
<categ><kref idref="fb982hk">Society</kref></categ>
316316
</def>
317+
<sr><kref type="rel">home-made</kref></sr>
317318
</def>
318319
</ar>
319320
<ar>
320-
<k>indices</k>
321+
<k id="fb982hk">Society</k>
321322
<def>
322323
<deftext>Plural form of word <kref>index</kref>.</deftext>
323324
</def>

format_standard/xdxf_strict.dtd

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@
2626
<!ELEMENT ar (k+,def)>
2727
<!ATTLIST ar f (v|l) "l">
2828
<!ELEMENT k (#PCDATA|opt|sup|sub)*>
29+
<!ATTLIST k id ID #IMPLIED>
2930
<!ELEMENT opt (#PCDATA|sup|sub)*>
3031
<!ENTITY % style "c|sup|sub|i|b|u">
3132
<!ENTITY % ref "kref|rref|iref">
32-
<!ELEMENT def (gr?,ex*,co*,sr?,etm?,categ*,(def+|deftext))>
33+
<!ELEMENT def (gr?,co*,(def+|deftext),ex*,sr?,etm?,categ*)>
3334
<!ELEMENT deftext (#PCDATA|tr|dtrn|abbr|co|di|%ref;|%style;|br)*>
3435
<!ATTLIST def id ID #IMPLIED>
3536
<!ATTLIST def cmt CDATA #IMPLIED>
@@ -53,12 +54,12 @@
5354
<!ELEMENT iref (#PCDATA|%style;)*>
5455
<!ATTLIST iref href CDATA #REQUIRED>
5556
<!ELEMENT abbr (#PCDATA)>
56-
<!ELEMENT ex (ex_orig+,ex_transl*,iref*)>
57+
<!ELEMENT ex (ex_orig+,ex_tran*,iref*)>
5758
<!ATTLIST ex type (exm|phr|prv|oth|PCDATA) "exm">
5859
<!ATTLIST ex source CDATA #IMPLIED>
5960
<!ATTLIST ex author CDATA #IMPLIED>
6061
<!ELEMENT ex_orig (#PCDATA|mrkd|co|%ref;|%style;|br)*>
61-
<!ELEMENT ex_transl (#PCDATA|mrkd|co|%ref;|%style;|br)*>
62+
<!ELEMENT ex_tran (#PCDATA|mrkd|co|%ref;|%style;|br)*>
6263
<!ELEMENT mrkd (#PCDATA|kref|%style;)*>
6364
<!ELEMENT co (#PCDATA|co|tr|abbr|di|%ref;|%style;|br)*>
6465
<!ATTLIST co type CDATA #IMPLIED>

0 commit comments

Comments
 (0)