From 18416b2b8a9797af985c231b33516575e7f79cfc Mon Sep 17 00:00:00 2001
From: Josh Hadro <josh.hadro@gmail.com>
Date: Mon, 5 Mar 2018 14:00:11 -0500
Subject: [PATCH] Update DTD

---
 CopyrightEntries.dtd | 54 ++++++++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 19 deletions(-)
 mode change 100755 => 100644 CopyrightEntries.dtd

diff --git a/CopyrightEntries.dtd b/CopyrightEntries.dtd
old mode 100755
new mode 100644
index ba3f2d7ee..64f56a987
--- a/CopyrightEntries.dtd
+++ b/CopyrightEntries.dtd
@@ -1,29 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!ELEMENT copyrightEntries (copyrightEntry+) >
-<!ELEMENT copyrightEntry (workTitle?, author*, workDescription?, editionStatement?, placeOfPublication?, firstNamedPublisher?, numberOfVolumes?, seriesSatement?, issuedInAnotherWork?, otherAuthor*, employerName*, earlierVersion?,
-                          newMatterClaimed?, pubDate?, claimant*, registrationNumber?, registrationDate?, classCode?, copiesDeposited?, copiesDepositedDate?, affidavitDate?, otherCopyrightInfo? )>
-<!ELEMENT workTitle (#PCDATA)>
+<!ELEMENT copyrightEntry (title?, author*, desc?, edition?, pubPlace?, publisher?, volumes?, series?, issuedInAnotherWork?, otherauthor*, employerName*, prev-regnum?,
+                          newMatterClaimed?, pubDate?, pubName?, claimant?, claimantPlace?, regDate?, classCode?, copies?, affDate?,
+			  vol?, noticeDate?, see?)>
+<!ATTLIST copyrightEntry
+	  id NMTOKEN #REQUIRED
+	  regnum NMTOKEN #IMPLIED>
+<!ELEMENT title (#PCDATA)>
+<!ELEMENT author (authorName, authorBirth?, authorDeath?)>
+<!ATTLIST author
+	  role NMTOKEN #IMPLIED>
 <!ELEMENT authorName (#PCDATA)>
 <!ELEMENT authorBirth (#PCDATA)>
 <!ELEMENT authorDeath (#PCDATA)>
-<!ELEMENT author (authorName, authorBirth?, authorDeath?)>
-<!ELEMENT workDescription (#PCDATA)>
-<!ELEMENT editionStatement (#PCDATA)>
-<!ELEMENT placeOfPublication (#PCDATA)>
-<!ELEMENT firstNamedPublisher (#PCDATA)>
-<!ELEMENT numberOfVolumes (#PCDATA)>
-<!ELEMENT seriesSatement (#PCDATA)>
+<!ELEMENT desc (#PCDATA)>
+<!ELEMENT edition (#PCDATA)>
+<!ELEMENT pubPlace (#PCDATA)>
+<!ELEMENT pubName (#PCDATA)>
+<!ELEMENT pubDate (#PCDATA)>
+<!ELEMENT publisher (pubName?, pubPlace?, pubDate?)>
+<!ELEMENT volumes (#PCDATA)>
+<!ELEMENT vol (#PCDATA)>
+<!ELEMENT series (#PCDATA)>
 <!ELEMENT issuedInAnotherWork (#PCDATA)>
-<!ELEMENT otherAuthor (#PCDATA)>
+<!ELEMENT otherauthor (#PCDATA)>
+<!ATTLIST otherauthor
+	  role NMTOKEN #IMPLIED>
 <!ELEMENT employerName (#PCDATA)>
-<!ELEMENT earlierVersion (#PCDATA)>
+<!ELEMENT prev-regnum (#PCDATA)>
 <!ELEMENT newMatterClaimed (#PCDATA)>
-<!ELEMENT pubDate (#PCDATA)>
 <!ELEMENT claimant (#PCDATA)>
-<!ELEMENT registrationNumber (#PCDATA)>
-<!ELEMENT registrationDate (#PCDATA)>
+<!ELEMENT claimantPlace (#PCDATA)>
+<!ELEMENT regDate (#PCDATA)>
 <!ELEMENT classCode (#PCDATA)>
-<!ELEMENT copiesDeposited (#PCDATA)>
-<!ELEMENT copiesDepositedDate (#PCDATA)>
-<!ELEMENT affidavitDate (#PCDATA)>
-<!ELEMENT otherCopyrightInfo (#PCDATA)>
\ No newline at end of file
+<!ELEMENT copies (#PCDATA)>
+<!ATTLIST copies
+	  Date NMTOKEN #IMPLIED>
+<!ELEMENT affDate (#PCDATA)>
+<!ELEMENT noticeDate (#PCDATA)>
+<!ELEMENT see (#PCDATA)>
+<!ATTLIST see
+	  rid NMTOKEN #REQUIRED>
+
+