Skip to content

Commit

Permalink
update schemas
Browse files Browse the repository at this point in the history
  • Loading branch information
@kermitt2
kermitt2 committed Aug 21, 2021
1 parent 73506a8 commit f1265a1
Show file tree
Hide file tree
Showing 6 changed files with 992 additions and 785 deletions.
1,118 changes: 624 additions & 494 deletions grobid-home/schemas/doc/Grobid_doc.html
View file

Large diffs are not rendered by default.

87 changes: 57 additions & 30 deletions grobid-home/schemas/dtd/Grobid.dtd
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

<!--
DTD generated from ODD source 2021-08-19T15:16:30Z. .
DTD generated from ODD source 2021-08-21T05:34:32Z. .
TEI Edition: Version 4.2.2. Last updated on
9th April 2021, revision 609a109b1
TEI Edition Location: https://www.tei-c.org/Vault/P5/Version 4.2.2/
Expand Down Expand Up @@ -109,16 +109,21 @@ subtype %teidata.enumerated; #IMPLIED'>
<!ENTITY % model.placeNamePart_sequenceOptional "country?, region?, settlement?">
<!ENTITY % model.placeNamePart_sequenceOptionalRepeatable "country*, region*, settlement*">
<!ENTITY % model.placeNamePart_sequenceRepeatable "country+, region+, settlement+">
<!ENTITY % model.placeStateLike "%model.placeNamePart;">
<!ENTITY % model.placeStateLike_sequence "%model.placeNamePart;">
<!ENTITY % model.placeStateLike_sequenceOptional "%model.placeNamePart;?">
<!ENTITY % model.placeStateLike_sequenceOptionalRepeatable "%model.placeNamePart;*">
<!ENTITY % model.placeStateLike_sequenceRepeatable "%model.placeNamePart;+">
<!ENTITY % model.placeStateLike "%model.placeNamePart; |state">
<!ENTITY % model.placeStateLike_sequence "%model.placeNamePart;, state">
<!ENTITY % model.placeStateLike_sequenceOptional "%model.placeNamePart;?, state?">
<!ENTITY % model.placeStateLike_sequenceOptionalRepeatable "%model.placeNamePart;*, state*">
<!ENTITY % model.placeStateLike_sequenceRepeatable "%model.placeNamePart;+, state+">
<!ENTITY % model.orgPart "">
<!ENTITY % model.orgPart_sequence "">
<!ENTITY % model.orgPart_sequenceOptional "">
<!ENTITY % model.orgPart_sequenceOptionalRepeatable "">
<!ENTITY % model.orgPart_sequenceRepeatable "">
<!ENTITY % model.resource "text |standOff |facsimile">
<!ENTITY % model.resource_sequence "text, standOff, facsimile">
<!ENTITY % model.resource_sequenceOptional "text?, standOff?, facsimile?">
<!ENTITY % model.resource_sequenceOptionalRepeatable "text*, standOff*, facsimile*">
<!ENTITY % model.resource_sequenceRepeatable "text+, standOff+, facsimile+">
<!ENTITY % model.objectLike "object |listObject">
<!ENTITY % model.objectLike_sequence "object, listObject">
<!ENTITY % model.objectLike_sequenceOptional "object?, listObject?">
Expand Down Expand Up @@ -152,11 +157,11 @@ datingMethod %teidata.pointer; #IMPLIED'>
%tei_att.datable.custom.attribute.to-custom;
%tei_att.datable.custom.attribute.datingPoint;
%tei_att.datable.custom.attribute.datingMethod;'>
<!ENTITY % model.persNamePart "surname |forename |roleName |persPronouns">
<!ENTITY % model.persNamePart_sequence "surname, forename, roleName, persPronouns">
<!ENTITY % model.persNamePart_sequenceOptional "surname?, forename?, roleName?, persPronouns?">
<!ENTITY % model.persNamePart_sequenceOptionalRepeatable "surname*, forename*, roleName*, persPronouns*">
<!ENTITY % model.persNamePart_sequenceRepeatable "surname+, forename+, roleName+, persPronouns+">
<!ENTITY % model.persNamePart "surname |forename |addName |roleName |persPronouns">
<!ENTITY % model.persNamePart_sequence "surname, forename, addName, roleName, persPronouns">
<!ENTITY % model.persNamePart_sequenceOptional "surname?, forename?, addName?, roleName?, persPronouns?">
<!ENTITY % model.persNamePart_sequenceOptionalRepeatable "surname*, forename*, addName*, roleName*, persPronouns*">
<!ENTITY % model.persNamePart_sequenceRepeatable "surname+, forename+, addName+, roleName+, persPronouns+">
<!ENTITY % tei_att.datable.iso.attribute.when-iso '
when-iso %teidata.temporal.iso; #IMPLIED'>

Expand Down Expand Up @@ -288,7 +293,7 @@ cRef %teidata.text; #IMPLIED'>
<!ENTITY % tei_att.cReferencing.attributes '
%tei_att.cReferencing.attribute.cRef;'>
<!ENTITY % tei_att.datable.w3c.attribute.when '
when %teidata.temporal.w3c; #IMPLIED'>
when %teidata.temporal.iso; #IMPLIED'>

<!ENTITY % tei_att.datable.w3c.attribute.notBefore '
notBefore %teidata.temporal.w3c; #IMPLIED'>
Expand Down Expand Up @@ -672,11 +677,11 @@ to %teidata.word; #IMPLIED'>
<!ENTITY % model.divPart_sequenceOptional "%model.pLike;?">
<!ENTITY % model.divPart_sequenceOptionalRepeatable "%model.pLike;*">
<!ENTITY % model.divPart_sequenceRepeatable "%model.pLike;+">
<!ENTITY % model.persStateLike "persName |affiliation |persona |persPronouns">
<!ENTITY % model.persStateLike_sequence "persName, affiliation, persona, persPronouns">
<!ENTITY % model.persStateLike_sequenceOptional "persName?, affiliation?, persona?, persPronouns?">
<!ENTITY % model.persStateLike_sequenceOptionalRepeatable "persName*, affiliation*, persona*, persPronouns*">
<!ENTITY % model.persStateLike_sequenceRepeatable "persName+, affiliation+, persona+, persPronouns+">
<!ENTITY % model.persStateLike "persName |affiliation |persona |persPronouns |state">
<!ENTITY % model.persStateLike_sequence "persName, affiliation, persona, persPronouns, state">
<!ENTITY % model.persStateLike_sequenceOptional "persName?, affiliation?, persona?, persPronouns?, state?">
<!ENTITY % model.persStateLike_sequenceOptionalRepeatable "persName*, affiliation*, persona*, persPronouns*, state*">
<!ENTITY % model.persStateLike_sequenceRepeatable "persName+, affiliation+, persona+, persPronouns+, state+">
<!ENTITY % model.personLike "org">
<!ENTITY % model.personLike_sequence "org">
<!ENTITY % model.personLike_sequenceOptional "org?">
Expand All @@ -692,11 +697,11 @@ to %teidata.word; #IMPLIED'>
<!ENTITY % model.placeNamePart_sequenceOptional "country?, region?, settlement?">
<!ENTITY % model.placeNamePart_sequenceOptionalRepeatable "country*, region*, settlement*">
<!ENTITY % model.placeNamePart_sequenceRepeatable "country+, region+, settlement+">
<!ENTITY % model.placeStateLike "%model.placeNamePart;">
<!ENTITY % model.placeStateLike_sequence "%model.placeNamePart;">
<!ENTITY % model.placeStateLike_sequenceOptional "%model.placeNamePart;?">
<!ENTITY % model.placeStateLike_sequenceOptionalRepeatable "%model.placeNamePart;*">
<!ENTITY % model.placeStateLike_sequenceRepeatable "%model.placeNamePart;+">
<!ENTITY % model.placeStateLike "%model.placeNamePart; |state">
<!ENTITY % model.placeStateLike_sequence "%model.placeNamePart;, state">
<!ENTITY % model.placeStateLike_sequenceOptional "%model.placeNamePart;?, state?">
<!ENTITY % model.placeStateLike_sequenceOptionalRepeatable "%model.placeNamePart;*, state*">
<!ENTITY % model.placeStateLike_sequenceRepeatable "%model.placeNamePart;+, state+">
<!ENTITY % model.orgPart "">
<!ENTITY % model.orgPart_sequence "">
<!ENTITY % model.orgPart_sequenceOptional "">
Expand Down Expand Up @@ -910,6 +915,11 @@ formula %teidata.xpath; #IMPLIED'>
<!ENTITY % model.correspDescPart_sequenceOptional "note?, noteGrp?, correspAction?, correspContext?">
<!ENTITY % model.correspDescPart_sequenceOptionalRepeatable "note*, noteGrp*, correspAction*, correspContext*">
<!ENTITY % model.correspDescPart_sequenceRepeatable "note+, noteGrp+, correspAction+, correspContext+">
<!ENTITY % model.resource "text |standOff |facsimile">
<!ENTITY % model.resource_sequence "text, standOff, facsimile">
<!ENTITY % model.resource_sequenceOptional "text?, standOff?, facsimile?">
<!ENTITY % model.resource_sequenceOptionalRepeatable "text*, standOff*, facsimile*">
<!ENTITY % model.resource_sequenceRepeatable "text+, standOff+, facsimile+">
<!ENTITY % model.objectLike "object |listObject">
<!ENTITY % model.objectLike_sequence "object, listObject">
<!ENTITY % model.objectLike_sequenceOptional "object?, listObject?">
Expand Down Expand Up @@ -956,11 +966,11 @@ datingMethod %teidata.pointer; #IMPLIED'>
%tei_att.datable.custom.attribute.to-custom;
%tei_att.datable.custom.attribute.datingPoint;
%tei_att.datable.custom.attribute.datingMethod;'>
<!ENTITY % model.persNamePart "surname |forename |roleName |persPronouns">
<!ENTITY % model.persNamePart_sequence "surname, forename, roleName, persPronouns">
<!ENTITY % model.persNamePart_sequenceOptional "surname?, forename?, roleName?, persPronouns?">
<!ENTITY % model.persNamePart_sequenceOptionalRepeatable "surname*, forename*, roleName*, persPronouns*">
<!ENTITY % model.persNamePart_sequenceRepeatable "surname+, forename+, roleName+, persPronouns+">
<!ENTITY % model.persNamePart "surname |forename |addName |roleName |persPronouns">
<!ENTITY % model.persNamePart_sequence "surname, forename, addName, roleName, persPronouns">
<!ENTITY % model.persNamePart_sequenceOptional "surname?, forename?, addName?, roleName?, persPronouns?">
<!ENTITY % model.persNamePart_sequenceOptionalRepeatable "surname*, forename*, addName*, roleName*, persPronouns*">
<!ENTITY % model.persNamePart_sequenceRepeatable "surname+, forename+, addName+, roleName+, persPronouns+">
<!ENTITY % tei_att.datable.iso.attribute.when-iso '
when-iso %teidata.temporal.iso; #IMPLIED'>

Expand Down Expand Up @@ -1078,7 +1088,7 @@ ana CDATA #IMPLIED'>
<!-- start elements -->

<!--doc:(TEI document) contains a single TEI-conformant document, combining a single TEI header with one or more members of the model.resource class. Multiple TEI elements may be combined within a TEI (or teiCorpus) element. [4. Default Text Structure 15.1. Varieties of Composite Text] -->
<!ELEMENT TEI (teiHeader,(facsimile,text)?)>
<!ELEMENT TEI ((teiHeader,(%model.resource;)*))>
<!ATTLIST TEI xmlns CDATA "http://www.tei-c.org/ns/1.0">
<!ATTLIST TEI
%tei_att.global.attributes;
Expand All @@ -1092,6 +1102,13 @@ version %teidata.version; #IMPLIED >
<!ATTLIST abstract xmlns CDATA "http://www.tei-c.org/ns/1.0">
<!ATTLIST abstract
%tei_att.global.attributes; >
<!--doc:(additional name) contains an additional name component, such as a nickname, epithet, or alias, or any other descriptive phrase used within a personal name. [13.2.1. Personal Names] -->
<!ELEMENT addName %macro.phraseSeq;>
<!ATTLIST addName xmlns CDATA "http://www.tei-c.org/ns/1.0">
<!ATTLIST addName
%tei_att.global.attributes;
%tei_att.personal.attributes;
%tei_att.typed.attributes; >
<!--doc:(address line) contains one line of a postal address. [3.6.2. Addresses 2.2.4. Publication, Distribution, Licensing, etc. 3.12.2.4. Imprint, Size of a Document, and Reprint Information] -->
<!ELEMENT addrLine %macro.phraseSeq;>
<!ATTLIST addrLine xmlns CDATA "http://www.tei-c.org/ns/1.0">
Expand Down Expand Up @@ -1167,7 +1184,7 @@ motivation NMTOKENS #IMPLIED >
%tei_att.typed.attributes;
%tei_att.datable.attributes;
ident %teidata.name; #REQUIRED
version %teidata.versionNumber; #REQUIRED >
version CDATA #REQUIRED >
<!--doc:(author) in a bibliographic reference, contains the name(s) of an author, personal or corporate, of a work; for example in the same form as that provided by a recognized bibliographic name authority. [3.12.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement] -->
<!ELEMENT author %macro.phraseSeq;>
<!ATTLIST author xmlns CDATA "http://www.tei-c.org/ns/1.0">
Expand Down Expand Up @@ -1204,7 +1221,7 @@ status (free|unknown|restricted) #IMPLIED >
%tei_att.global.attributes;
%tei_att.citing.attributes; >
<!--doc:(structured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements] -->
<!ELEMENT biblStruct (((analytic)*,(monogr,(series)*)+,(%model.noteLike;|%model.ptrLike;|idno)*))>
<!ELEMENT biblStruct (((analytic)*,(monogr,(series)*)+,(%model.noteLike;|%model.ptrLike;|relatedItem|citedRange|idno)*))>
<!ATTLIST biblStruct xmlns CDATA "http://www.tei-c.org/ns/1.0">
<!ATTLIST biblStruct
%tei_att.global.attributes;
Expand Down Expand Up @@ -1751,6 +1768,16 @@ key %teidata.xmlName; #IMPLIED >
%tei_att.global.attributes;
%tei_att.typed.attributes;
%tei_att.declaring.attributes; >
<!--doc:(state) contains a description of some status or quality attributed to a person, place, or organization often at some specific time or for a specific date range. [13.3.1. Basic Principles 13.3.2.1. Personal Characteristics] -->
<!ELEMENT state (((precision)*,((state)+|((%model.headLike;)*,(%model.pLike;)+,(%model.noteLike;|%model.biblLike;)*)|(%model.labelLike;|%model.noteLike;|%model.biblLike;)*)))>
<!ATTLIST state xmlns CDATA "http://www.tei-c.org/ns/1.0">
<!ATTLIST state
%tei_att.global.attributes;
%tei_att.datable.attributes;
%tei_att.editLike.attributes;
%tei_att.typed.attributes;
%tei_att.naming.attributes;
%tei_att.dimensions.attributes; >
<!--doc:contains a full street address including any name or number identifying a building as well as the name of the street or route on which it is located. [3.6.2. Addresses] -->
<!ELEMENT street %macro.phraseSeq;>
<!ATTLIST street xmlns CDATA "http://www.tei-c.org/ns/1.0">
Expand Down
Loading

0 comments on commit f1265a1

Please sign in to comment.