Update the test TSN DTDs with the inferred ones.

[dead/htsn-import.git] / test / xml / newsxml.dtd

diff --git a/test/xml/newsxml.dtd b/test/xml/newsxml.dtd
index 5f24baac1cb9238056a3964e93422d410cec87a7..20938a28ceecf1ec695cbd712fd63e2fe5895330 100644 (file)
--- a/test/xml/newsxml.dtd
+++ b/test/xml/newsxml.dtd
@@ -1,24 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v3.5 NT (http://www.xmlspy.com) by  () -->
-<!--DTD generated by XML Spy v3.5 NT (http://www.xmlspy.com)-->
-<!ELEMENT Editor (#PCDATA)>
-<!ELEMENT P (#PCDATA)>
-<!ELEMENT SMS (#PCDATA)>
 <!ELEMENT XML_File_ID (#PCDATA)>
-<!ELEMENT category (#PCDATA)>
-<!ELEMENT city (#PCDATA)>
-<!ELEMENT continue (P+)>
-<!ELEMENT country (#PCDATA)>
 <!ELEMENT heading (#PCDATA)>
-<!ELEMENT location (city, state, country)>
-<!ELEMENT message (XML_File_ID, heading, msg_id, category, sport, url, team+, location+, SMS, Editor?, text, continue, time_stamp)>
 <!ELEMENT msg_id (#PCDATA)>
-<!ATTLIST msg_id
-       EventId CDATA #REQUIRED
->
+<!ELEMENT category (#PCDATA)>
 <!ELEMENT sport (#PCDATA)>
-<!ELEMENT state (#PCDATA)>
+<!ELEMENT url (#PCDATA)>
 <!ELEMENT team (#PCDATA)>
+<!ELEMENT city (#PCDATA)>
+<!ELEMENT state (#PCDATA)>
+<!ELEMENT country (#PCDATA)>
+<!ELEMENT location ( ( ( city, state )?, country ) )>
+<!ELEMENT SMS (#PCDATA)>
 <!ELEMENT text (#PCDATA)>
+<!ELEMENT P (#PCDATA)>
+<!ELEMENT continue ( P* )>
 <!ELEMENT time_stamp (#PCDATA)>
-<!ELEMENT url (#PCDATA)>
+<!ELEMENT message ( ( XML_File_ID, heading, msg_id, category, sport, url, team*, location*, SMS, ( Editor?, text, continue )?, time_stamp ) )>
+<!ELEMENT Editor (#PCDATA)>
+
+<!ATTLIST msg_id EventId CDATA #REQUIRED>