X-Git-Url: https://git.ladys.computer/Fortune/blobdiff_plain/67849dd8598e05ce4095f9ff5df6ace13991659f..refs/heads/current:/DTD

diff --git a/DTD b/DTD
index 4786781..671b3c4 100644
--- a/DTD
+++ b/DTD
@@ -13,15 +13,25 @@ Users of this corpus should check for additions and changes to this D·T·D when
 <!--
 The following are “ordinary” phrase‐level elements usable inside of paragraphs.
 -->
-<!ELEMENT seg (#PCDATA|soCalled|pc)*>
-<!ATTLIST seg
-	type (callout) #IMPLIED
+<!ELEMENT abbr (#PCDATA)>
+<!ELEMENT emph (#PCDATA)>
+<!ELEMENT gap (#PCDATA)>
+<!ATTLIST gap
+	reason (editorial) #REQUIRED
+>
+<!ELEMENT note (p)>
+<!ATTLIST note
+	n CDATA #IMPLIED
 >
-<!ELEMENT soCalled (#PCDATA)>
 <!ELEMENT pc (#PCDATA)>
 <!ATTLIST pc
 	unit (paragraph|phrase|sentence) #REQUIRED
 >
+<!ELEMENT seg (#PCDATA|emph)*>
+<!ATTLIST seg
+	type (callout) #IMPLIED
+>
+<!ELEMENT soCalled (#PCDATA)>
 
 <!--
 The following encode links.
@@ -32,6 +42,13 @@ The following encode links.
 	mimeType CDATA #IMPLIED
 >
 
+<!--
+The following encode choices.
+-->
+<!ELEMENT metamark (#PCDATA)>
+<!ELEMENT supplied (#PCDATA)>
+<!ELEMENT ellipsis (metamark,supplied?)>
+
 <!--
 The following encode names and name components.
 -->
@@ -107,7 +124,8 @@ For single pages, `@from´ and `@to´ should be equal.
 <!--
 The following are paragraph‐level elements.
 -->
-<!ELEMENT p (#PCDATA|pc|ptr|seg)*>
+<!ELEMENT p (#PCDATA|abbr|ellipsis|emph|gap|note|pc|ptr|seg)*>
+<!ELEMENT quote (p|quote)+>
 
 <!--
 The following encapsulate paragraph information within bibliographies.
@@ -117,7 +135,7 @@ The following encapsulate paragraph information within bibliographies.
 <!--
 The following provide structured bibliographic information.
 -->
-<!ELEMENT analytic (title,idno*,author*,editor*,availability?)>
+<!ELEMENT analytic (title,idno*,author*,editor*,availability?,date?)>
 <!ELEMENT monogr (title,idno*,author*,editor*,availability?,imprint,biblScope*)>
 <!ELEMENT series (title,idno*,editor*,availability?,biblScope*)>
 
@@ -136,7 +154,7 @@ All of these require an `@xmlns´ which provides the T·E·I namespace, and an `
 	xmlns CDATA #FIXED 'http://www.tei-c.org/ns/1.0'
 	xml:lang NMTOKEN #REQUIRED
 >
-<!ELEMENT cit (p+,bibl*)>
+<!ELEMENT cit (quote,bibl*)>
 <!ATTLIST cit
 	xmlns CDATA #FIXED 'http://www.tei-c.org/ns/1.0'
 	xml:lang NMTOKEN #REQUIRED