Update the test TSN DTDs with the inferred ones.

diff --git a/test/xml/Heartbeat.dtd b/test/xml/Heartbeat.dtd
index 9a10b3e7ab7786d7d87856511a3e1121c56e4138..6caf3a38d53d27b3bcbaba1f455aa52d833b5714 100644 (file)
--- a/test/xml/Heartbeat.dtd
+++ b/test/xml/Heartbeat.dtd
@@ -1,8 +1,4 @@
-<!ELEMENT message  (XML_File_ID, heading , time_stamp )>\r
-\r
-<!ELEMENT XML_File_ID  (#PCDATA )>\r
-\r
-<!ELEMENT heading  (#PCDATA )>\r
-\r
-<!ELEMENT time_stamp  (#PCDATA )>\r
-\r
+<!ELEMENT XML_File_ID (#PCDATA)>
+<!ELEMENT heading (#PCDATA)>
+<!ELEMENT time_stamp (#PCDATA)>
+<!ELEMENT message ( ( XML_File_ID, heading, time_stamp ) )>

diff --git a/test/xml/Injuries_Detail_XML.dtd b/test/xml/Injuries_Detail_XML.dtd
index c10c07d92b89597a09dfd4c15f9238be1689f4ba..b77a44855fc7ae95231111a397ee4516712d5457 100644 (file)
--- a/test/xml/Injuries_Detail_XML.dtd
+++ b/test/xml/Injuries_Detail_XML.dtd
@@ -1,38 +1,19 @@
-<!ELEMENT message  (XML_File_ID , heading , category , sport , Listing+ , 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 Listing  (TeamID , FullName , PlayerListing+ )>\r
-\r
-<!ELEMENT TeamID  (#PCDATA )>\r
-\r
-<!ELEMENT FullName  (#PCDATA )>\r
-\r
-<!ELEMENT PlayerListing  (TeamID , PlayerID , Date , Pos , Name , Injury , Status , Fantasy , Injured , Type )>\r
-\r
-<!ELEMENT PlayerID  (#PCDATA )>\r
-\r
-<!ELEMENT Date  (#PCDATA )>\r
-\r
-<!ELEMENT Pos  (#PCDATA )>\r
-\r
-<!ELEMENT Name  (#PCDATA )>\r
-\r
-<!ELEMENT Injury  (#PCDATA )>\r
-\r
-<!ELEMENT Status  (#PCDATA )>\r
-\r
-<!ELEMENT Fantasy (#PCDATA )>\r
-\r
-<!ELEMENT Injured  (#PCDATA )>\r
-\r
-<!ELEMENT Type  (#PCDATA )>\r
-\r
-<!ELEMENT time_stamp  (#PCDATA )>\r
-\r
+<!ELEMENT XML_File_ID (#PCDATA)>
+<!ELEMENT heading (#PCDATA)>
+<!ELEMENT category (#PCDATA)>
+<!ELEMENT sport (#PCDATA)>
+<!ELEMENT TeamID (#PCDATA)>
+<!ELEMENT FullName (#PCDATA)>
+<!ELEMENT PlayerID (#PCDATA)>
+<!ELEMENT Date (#PCDATA)>
+<!ELEMENT Pos (#PCDATA)>
+<!ELEMENT Name (#PCDATA)>
+<!ELEMENT Injury (#PCDATA)>
+<!ELEMENT Status (#PCDATA)>
+<!ELEMENT Fantasy EMPTY>
+<!ELEMENT Injured (#PCDATA)>
+<!ELEMENT Type (#PCDATA)>
+<!ELEMENT PlayerListing ( ( TeamID, PlayerID, Date, Pos, Name, Injury, Status, Fantasy, Injured, Type ) )>
+<!ELEMENT Listing ( ( TeamID, FullName, PlayerListing* ) )>
+<!ELEMENT time_stamp (#PCDATA)>
+<!ELEMENT message ( ( XML_File_ID, heading, category, sport, Listing*, time_stamp ) )>

diff --git a/test/xml/Odds_XML.dtd b/test/xml/Odds_XML.dtd
index 51f6c52f242a9579825de37f7efc95375a6072dd..7355ababd0d567da02c22fc1a243147d3753f7ca 100644 (file)
--- a/test/xml/Odds_XML.dtd
+++ b/test/xml/Odds_XML.dtd
@@ -1,57 +1,28 @@
-<!ELEMENT message  (XML_File_ID , heading , category , sport , Title , Line_Time , League_Name , Game+ , Notes , Game+ , League_Name , Game+ , League_Name , Notes , Game , 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 Line_Time  (#PCDATA )>\r
-\r
-<!ELEMENT League_Name  (#PCDATA )>\r
-\r
-<!ELEMENT Game  (GameID , Game_Date , Game_Time , AwayTeam , HomeTeam , Over_Under )>\r
-\r
-<!ELEMENT GameID  (#PCDATA )>\r
-\r
-<!ELEMENT Game_Date  (#PCDATA )>\r
-\r
-<!ELEMENT Game_Time  (#PCDATA )>\r
-\r
-<!ELEMENT AwayTeam  (AwayTeamID , AwayRotationNumber , AwayAbbr , AwayTeamName , AStarter , Casino+ )>\r
-\r
-<!ELEMENT AwayTeamID  (#PCDATA )>\r
-\r
-<!ELEMENT AwayRotationNumber  (#PCDATA )>\r
-\r
-<!ELEMENT AwayAbbr  (#PCDATA )>\r
-\r
-<!ELEMENT AwayTeamName  (#PCDATA )>\r
-\r
-<!ELEMENT AStarter  (#PCDATA )>\r
-<!ATTLIST AStarter  ID CDATA  #REQUIRED >\r
-<!ELEMENT Casino  (#PCDATA )>\r
-<!ATTLIST Casino  Name     CDATA  #REQUIRED\r
-                  ClientID CDATA  #REQUIRED >\r
-<!ELEMENT HomeTeam  (HomeTeamID , HomeRotationNumber , HomeAbbr , HomeTeamName , HStarter , Casino+ )>\r
-\r
-<!ELEMENT HomeTeamID  (#PCDATA )>\r
-\r
-<!ELEMENT HomeRotationNumber  (#PCDATA )>\r
-\r
-<!ELEMENT HomeAbbr  (#PCDATA )>\r
-\r
-<!ELEMENT HomeTeamName  (#PCDATA )>\r
-\r
-<!ELEMENT HStarter  (#PCDATA )>\r
-<!ATTLIST HStarter  ID CDATA  #REQUIRED >\r
-<!ELEMENT Over_Under  (Casino+ )>\r
-\r
-<!ELEMENT Notes  (#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 Line_Time (#PCDATA)>
+<!ELEMENT Notes (#PCDATA)>
+<!ELEMENT GameID (#PCDATA)>
+<!ELEMENT Game_Date (#PCDATA)>
+<!ELEMENT Game_Time (#PCDATA)>
+<!ELEMENT AwayTeamID (#PCDATA)>
+<!ELEMENT AwayRotationNumber (#PCDATA)>
+<!ELEMENT AwayAbbr (#PCDATA)>
+<!ELEMENT AwayTeamName (#PCDATA)>
+<!ELEMENT Casino (#PCDATA)>
+<!ELEMENT AwayTeam ( ( AwayTeamID, AwayRotationNumber, AwayAbbr, AwayTeamName, Casino* ) )>
+<!ELEMENT HomeTeamID (#PCDATA)>
+<!ELEMENT HomeRotationNumber (#PCDATA)>
+<!ELEMENT HomeAbbr (#PCDATA)>
+<!ELEMENT HomeTeamName (#PCDATA)>
+<!ELEMENT HomeTeam ( ( HomeTeamID, HomeRotationNumber, HomeAbbr, HomeTeamName, Casino* ) )>
+<!ELEMENT Over_Under ( Casino* )>
+<!ELEMENT Game ( ( GameID, Game_Date, Game_Time, AwayTeam, HomeTeam, Over_Under ) )>
+<!ELEMENT time_stamp (#PCDATA)>
+<!ELEMENT message ( ( XML_File_ID | heading | category | sport | Title | Line_Time | Notes | Game | time_stamp )+ )>
+
+<!ATTLIST Casino ClientID CDATA #REQUIRED>
+<!ATTLIST Casino Name CDATA #REQUIRED>

diff --git a/test/xml/injuriesxml.dtd b/test/xml/injuriesxml.dtd
index dac66dfd57b7a169b40194af2868ecbac2ea3fdb..059e705740732a24559f4b70cfd451723d12f810 100644 (file)
--- a/test/xml/injuriesxml.dtd
+++ b/test/xml/injuriesxml.dtd
@@ -1,22 +1,13 @@
-<!ELEMENT message  (XML_File_ID, heading , category , sport , listing+ , 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 listing  (team , teamno , injuries , updated)>\r
-\r
-<!ELEMENT team  (#PCDATA )>\r
-<!ATTLIST team  league CDATA  #IMPLIED >\r
-<!ELEMENT teamno  (#PCDATA )>\r
-\r
-<!ELEMENT injuries  (#PCDATA )>\r
-\r
-<!ELEMENT updated  (#PCDATA )>\r
-\r
-<!ELEMENT time_stamp  (#PCDATA )>\r
-\r
+<!ELEMENT XML_File_ID (#PCDATA)>
+<!ELEMENT heading (#PCDATA)>
+<!ELEMENT category (#PCDATA)>
+<!ELEMENT sport (#PCDATA)>
+<!ELEMENT team (#PCDATA)>
+<!ELEMENT teamno (#PCDATA)>
+<!ELEMENT injuries (#PCDATA)>
+<!ELEMENT updated (#PCDATA)>
+<!ELEMENT listing ( ( team, teamno?, injuries, updated? ) )>
+<!ELEMENT time_stamp (#PCDATA)>
+<!ELEMENT message ( ( XML_File_ID, heading, category, sport, listing*, time_stamp ) )>
+
+<!ATTLIST team league CDATA #IMPLIED>

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>

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>