Update the test TSN DTDs with the inferred ones.

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

diff --git a/test/xml/weatherxml.dtd b/test/xml/weatherxml.dtd
index 25560dec637e4fc3339d3d475eb5775bde1bc2fc..cce90b3089622e00293471bf9445db202b31d127 100644 (file)
--- a/test/xml/weatherxml.dtd
+++ b/test/xml/weatherxml.dtd
@@ -1,24 +1,15 @@
-<!ELEMENT message  (XML_File_ID, heading , category , sport , title , forecast+ , time_stamp )>\r
-\r
-<!ELEMENT XML_File_ID  (#PCDATA )>\r
-\r
-<!ELEMENT heading  (#PCDATA )>\r
-\r
-<!ELEMENT category  (#PCDATA )>\r
-\r
-<!ELEMENT sport  (#PCDATA )>\r
-\r
-<!ELEMENT title  (#PCDATA )>\r
-\r
-<!ELEMENT forecast  (league+ )>\r
-<!ATTLIST forecast  gamedate CDATA  #REQUIRED >\r
-<!ELEMENT league  (listing+ )>\r
-<!ATTLIST league  name CDATA  #REQUIRED >\r
-<!ELEMENT listing  (teams , weather )>\r
-\r
-<!ELEMENT teams  (#PCDATA )>\r
-\r
-<!ELEMENT weather  (#PCDATA )>\r
-\r
-<!ELEMENT time_stamp  (#PCDATA )>\r
-\r
+<!ELEMENT XML_File_ID (#PCDATA)>
+<!ELEMENT heading (#PCDATA)>
+<!ELEMENT category (#PCDATA)>
+<!ELEMENT sport (#PCDATA)>
+<!ELEMENT title (#PCDATA)>
+<!ELEMENT teams (#PCDATA)>
+<!ELEMENT weather (#PCDATA)>
+<!ELEMENT listing ( ( teams, weather ) )>
+<!ELEMENT league ( listing* )>
+<!ELEMENT forecast ( league )>
+<!ELEMENT time_stamp (#PCDATA)>
+<!ELEMENT message ( ( XML_File_ID, heading, category, sport, title, forecast*, time_stamp ) )>
+
+<!ATTLIST league name CDATA #REQUIRED>
+<!ATTLIST forecast gamedate CDATA #REQUIRED>