Skip to content

Commit

Permalink
moving biblStruct to its own specGrp, fixing the wega_all schema
Browse files Browse the repository at this point in the history
  • Loading branch information
peterstadler committed Nov 20, 2019
1 parent 664d609 commit cae0504
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 135 deletions.
64 changes: 0 additions & 64 deletions compiled-ODD/guidelines-de-wega_all.compiled.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11650,70 +11650,6 @@ epistemology, methodology and history of
<ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
</listRef>
</elementSpec><elementSpec rend="change" module="core" ident="biblStruct"><gloss versionDate="2005-04-15" xml:lang="en">structured bibliographic citation</gloss><gloss versionDate="2007-12-20" xml:lang="ko">구조화된 서지 인용</gloss><gloss versionDate="2007-05-02" xml:lang="zh-TW">結構次要書目</gloss><gloss versionDate="2009-01-06" xml:lang="fr">référence bibliographique structurée</gloss><gloss versionDate="2007-05-04" xml:lang="es">cita bibliográfica estructurada.</gloss><gloss versionDate="2007-01-21" xml:lang="it">citazione bibliografica strutturata</gloss><desc versionDate="2008-01-13" xml:lang="en">contains a structured bibliographic citation, in which only bibliographic sub-elements
appear and in a specified order.</desc><desc versionDate="2007-12-20" xml:lang="ko">서지의 하위 요소만이 나타나는, 명시적 순서로 구성되는 구조화된 서지 인용을 포함한다.</desc><desc versionDate="2007-05-02" xml:lang="zh-TW">包含僅出現子節點的結構書目資料,並以特定順序呈現。</desc><desc versionDate="2008-04-05" xml:lang="ja">構造を持った書誌情報を示す.下位要素として,書誌情報を示す要素が,決 められた順番で出現する.</desc><desc versionDate="2009-01-06" xml:lang="fr">contient une référence bibliographique dans laquelle
seuls des sous-éléments bibliographiques apparaissent et cela, selon un ordre déterminé.</desc><desc versionDate="2007-05-04" xml:lang="es">contiene una cita bibliográfica estructurada, en la cual
sólo aparecen los subelementos bibliográficos y en un orden especificado.</desc><desc versionDate="2007-01-21" xml:lang="it">contiene una citazione bibliografica strutturata che può
contenere solo altri elemento nell'ordine specificato.</desc><classes><memberOf key="model.biblLike"/></classes><content><sequence minOccurs="1" maxOccurs="1"><elementRef key="analytic" minOccurs="0" maxOccurs="unbounded"/><sequence minOccurs="1" maxOccurs="unbounded"><elementRef key="monogr"/><elementRef key="series" minOccurs="0" maxOccurs="unbounded"/></sequence><alternate minOccurs="0" maxOccurs="unbounded"><classRef key="model.noteLike"/><classRef key="model.ptrLike"/><elementRef key="relatedItem"/><elementRef key="citedRange"/></alternate></sequence></content><attList><attDef ident="type" usage="opt">
<desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" versionDate="2013-11-11" xml:lang="en">characterizes the element in some sense, using any convenient classification scheme or typology.</desc>
<desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" versionDate="2013-11-11" xml:lang="de">charakterisiert das Element in einem gewissen Sinne, wobei irgendeine zweckmäßige Systematik oder Typologie angwendet wird.</desc>
<datatype xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron">
<dataRef key="wega.biblio.types"/>
</datatype>
</attDef><attRef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" class="att.global" name="xml:id"/><attRef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:s="http://www.ascc.net/xml/schematron" class="att.global" name="n"/></attList><exemplum xml:lang="en">
<egXML xmlns="http://www.tei-c.org/ns/Examples">
<biblStruct>
<monogr>
<author>Blain, Virginia</author>
<author>Clements, Patricia</author>
<author>Grundy, Isobel</author>
<title>The Feminist Companion to Literature in English: women writers from the middle ages
to the present</title>
<edition>first edition</edition>
<imprint>
<publisher>Yale University Press</publisher>
<pubPlace>New Haven and London</pubPlace>
<date>1990</date>
</imprint>
</monogr>
</biblStruct>
</egXML>
</exemplum><exemplum versionDate="2008-04-06" xml:lang="fr">
<egXML xmlns="http://www.tei-c.org/ns/Examples">
<biblStruct>
<monogr>
<author>Anouilh, Jean</author>
<title>Antigone</title>
<edition>première édition</edition>
<imprint>
<publisher>in Nouvelles pièces noires, La Table ronde</publisher>
<pubPlace>Paris</pubPlace>
<date>1955</date>
</imprint>
</monogr>
</biblStruct>
</egXML>
</exemplum><exemplum xml:lang="zh-TW">
<egXML xmlns="http://www.tei-c.org/ns/Examples">
<biblStruct>
<monogr>
<author>王大明</author>
<author>文天行</author>
<author>廖全京</author>
<title>抗戰文藝報刊編目彙編</title>
<edition>初版</edition>
<imprint>
<publisher>四川省社會科學院</publisher>
<pubPlace>成都</pubPlace>
<date>1984</date>
</imprint>
</monogr>
</biblStruct>
</egXML>
</exemplum><listRef>
<ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBITY">3.11.1. Methods of Encoding Bibliographic References and Lists of References</ref>
<ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</ref>
<ref target="http://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
</listRef><gloss versionDate="2005-04-15" xml:lang="en">structured bibliographic citation</gloss><gloss versionDate="2007-12-20" xml:lang="ko">구조화된 서지 인용</gloss><gloss versionDate="2007-05-02" xml:lang="zh-TW">結構次要書目</gloss><gloss versionDate="2009-01-06" xml:lang="fr">référence bibliographique structurée</gloss><gloss versionDate="2007-05-04" xml:lang="es">cita bibliográfica estructurada.</gloss><gloss versionDate="2007-01-21" xml:lang="it">citazione bibliografica strutturata</gloss><desc versionDate="2008-01-13" xml:lang="en">contains a structured bibliographic citation, in which only bibliographic sub-elements
appear and in a specified order.</desc><desc versionDate="2007-12-20" xml:lang="ko">서지의 하위 요소만이 나타나는, 명시적 순서로 구성되는 구조화된 서지 인용을 포함한다.</desc><desc versionDate="2007-05-02" xml:lang="zh-TW">包含僅出現子節點的結構書目資料,並以特定順序呈現。</desc><desc versionDate="2008-04-05" xml:lang="ja">構造を持った書誌情報を示す.下位要素として,書誌情報を示す要素が,決 められた順番で出現する.</desc><desc versionDate="2009-01-06" xml:lang="fr">contient une référence bibliographique dans laquelle
seuls des sous-éléments bibliographiques apparaissent et cela, selon un ordre déterminé.</desc><desc versionDate="2007-05-04" xml:lang="es">contiene una cita bibliográfica estructurada, en la cual
sólo aparecen los subelementos bibliográficos y en un orden especificado.</desc><desc versionDate="2007-01-21" xml:lang="it">contiene una citazione bibliografica strutturata che può
Expand Down
38 changes: 3 additions & 35 deletions schema/de/wega_all.rng
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns="http://relaxng.org/ns/structure/1.0"
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
ns="http://www.tei-c.org/ns/1.0"><!--
Schema generated from ODD source 2019-10-28T13:03:08Z. .
Schema generated from ODD source 2019-11-20T15:08:59Z. .
TEI Edition: Version 3.6.0. Last updated on
16th July 2019, revision daa3cc0b9
TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.6.0/
Expand Down Expand Up @@ -4665,27 +4665,7 @@ Elements]</a:documentation>
</define>
<define name="biblStruct">
<element name="biblStruct">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(structured bibliographic citationstructured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order.contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.11.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements3.11.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]</a:documentation>
<group>
<zeroOrMore>
<ref name="analytic"/>
</zeroOrMore>
<oneOrMore>
<group>
<ref name="monogr"/>
<zeroOrMore>
<ref name="series"/>
</zeroOrMore>
</group>
</oneOrMore>
<zeroOrMore>
<choice>
<ref name="model.noteLike"/>
<ref name="model.ptrLike"/>
<ref name="relatedItem"/>
</choice>
</zeroOrMore>
</group>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(structured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.11.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]</a:documentation>
<choice>
<ref name="ref"/>
<group>
Expand All @@ -4711,20 +4691,8 @@ Elements]</a:documentation>
</group>
</choice>
<ref name="att.global.attributes"/>
<ref name="att.typed.attribute.subtype"/>
<ref name="att.typed.attributes"/>
<ref name="att.docStatus.attributes"/>
<optional>
<attribute name="type">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">charakterisiert das Element in einem gewissen Sinne, wobei irgendeine zweckmäßige Systematik oder Typologie angwendet wird.</a:documentation>
</attribute>
</optional>
<optional>
<attribute name="type">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">charakterisiert das Element in einem gewissen Sinne, wobei irgendeine zweckmäßige Systematik oder Typologie angwendet wird.</a:documentation>
</attribute>
</optional>
<ref name="att.global.attribute.xmlid"/>
<ref name="att.global.attribute.n"/>
<empty/>
</element>
</define>
Expand Down
38 changes: 3 additions & 35 deletions schema/en/wega_all.rng
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns="http://relaxng.org/ns/structure/1.0"
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
ns="http://www.tei-c.org/ns/1.0"><!--
Schema generated from ODD source 2019-10-28T13:03:57Z. .
Schema generated from ODD source 2019-11-20T15:11:12Z. .
TEI Edition: Version 3.6.0. Last updated on
16th July 2019, revision daa3cc0b9
TEI Edition Location: http://www.tei-c.org/Vault/P5/Version 3.6.0/
Expand Down Expand Up @@ -4665,27 +4665,7 @@ Elements]</a:documentation>
</define>
<define name="biblStruct">
<element name="biblStruct">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(structured bibliographic citationstructured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order.contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.11.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements3.11.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]</a:documentation>
<group>
<zeroOrMore>
<ref name="analytic"/>
</zeroOrMore>
<oneOrMore>
<group>
<ref name="monogr"/>
<zeroOrMore>
<ref name="series"/>
</zeroOrMore>
</group>
</oneOrMore>
<zeroOrMore>
<choice>
<ref name="model.noteLike"/>
<ref name="model.ptrLike"/>
<ref name="relatedItem"/>
</choice>
</zeroOrMore>
</group>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(structured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.11.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]</a:documentation>
<choice>
<ref name="ref"/>
<group>
Expand All @@ -4711,20 +4691,8 @@ Elements]</a:documentation>
</group>
</choice>
<ref name="att.global.attributes"/>
<ref name="att.typed.attribute.subtype"/>
<ref name="att.typed.attributes"/>
<ref name="att.docStatus.attributes"/>
<optional>
<attribute name="type">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">characterizes the element in some sense, using any convenient classification scheme or typology.</a:documentation>
</attribute>
</optional>
<optional>
<attribute name="type">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">characterizes the element in some sense, using any convenient classification scheme or typology.</a:documentation>
</attribute>
</optional>
<ref name="att.global.attribute.xmlid"/>
<ref name="att.global.attribute.n"/>
<empty/>
</element>
</define>
Expand Down
4 changes: 3 additions & 1 deletion src/Specs/common-specs.odd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,9 @@
<attRef class="att.global" name="xml:id"/>
</attList>
</elementSpec>

</specGrp>

<specGrp xml:id="wega-biblStruct">
<!--
hiding biblStruct here so the bibl schema (which has a fairly
different definition of biblStruct) won't inherit
Expand Down
1 change: 1 addition & 0 deletions src/Specs/schemaSpec-documents.odd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<specGrpRef target="../Specs/common-specs.odd.xml#wega-gaiji"/>
<specGrpRef target="../Specs/common-specs.odd.xml#wega-tei-macros"/>
<specGrpRef target="../Specs/common-specs.odd.xml#wega-datatypes"/>
<specGrpRef target="../Specs/common-specs.odd.xml#wega-biblStruct"/>

<elementSpec ident="TEI" mode="change" module="textstructure">
<gloss versionDate="2013-11-11" xml:lang="en">TEI document</gloss>
Expand Down
1 change: 1 addition & 0 deletions src/Specs/schemaSpec-letters.odd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<specGrpRef target="../Specs/common-specs.odd.xml#wega-gaiji"/>
<specGrpRef target="../Specs/common-specs.odd.xml#wega-tei-macros"/>
<specGrpRef target="../Specs/common-specs.odd.xml#wega-datatypes"/>
<specGrpRef target="../Specs/common-specs.odd.xml#wega-biblStruct"/>


<elementSpec ident="TEI" mode="change" module="textstructure">
Expand Down
1 change: 1 addition & 0 deletions src/Specs/schemaSpec-thematicCommentaries.odd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<specGrpRef target="../Specs/common-specs.odd.xml#wega-linking"/>
<specGrpRef target="../Specs/common-specs.odd.xml#wega-tei-macros"/>
<specGrpRef target="../Specs/common-specs.odd.xml#wega-datatypes"/>
<specGrpRef target="../Specs/common-specs.odd.xml#wega-biblStruct"/>

<elementSpec ident="TEI" mode="change" module="textstructure">
<gloss versionDate="2013-11-11" xml:lang="en">TEI document</gloss>
Expand Down
1 change: 1 addition & 0 deletions src/Specs/schemaSpec-var.odd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<specGrpRef target="../Specs/common-specs.odd.xml#wega-transcr"/>
<specGrpRef target="../Specs/common-specs.odd.xml#wega-tei-macros"/>
<specGrpRef target="../Specs/common-specs.odd.xml#wega-datatypes"/>
<specGrpRef target="../Specs/common-specs.odd.xml#wega-biblStruct"/>

<dataSpec ident="wega.varOrAddenda.pointer">
<desc xml:lang="de" versionDate="2017-08-29">fasst die potentiellen internen Verweise zu Varia und Addenda zusammen</desc>
Expand Down
1 change: 1 addition & 0 deletions src/Specs/schemaSpec-writings.odd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<specGrpRef target="../Specs/common-specs.odd.xml#wega-gaiji"/>
<specGrpRef target="../Specs/common-specs.odd.xml#wega-tei-macros"/>
<specGrpRef target="../Specs/common-specs.odd.xml#wega-datatypes"/>
<specGrpRef target="../Specs/common-specs.odd.xml#wega-biblStruct"/>

<elementSpec ident="TEI" mode="change" module="textstructure">
<gloss versionDate="2013-11-11" xml:lang="en">TEI document</gloss>
Expand Down

0 comments on commit cae0504

Please sign in to comment.