update odd, insert gramGrp elementSpec

acdh-oeaw · Jul 11, 2024 · 0a97364 · 0a97364
1 parent 6965343
commit 0a97364
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 22 deletions.
diff --git a/802_tei_odd/out/shawi.rng b/802_tei_odd/out/shawi.rng
@@ -5,7 +5,7 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0"><!--
-Schema generated from ODD source 2024-07-10T10:53:51Z. .
+Schema generated from ODD source 2024-07-11T14:06:37Z. .
 TEI Edition: 
 TEI Edition Location: https://www.tei-c.org/Vault/P5//
   
@@ -4312,16 +4312,9 @@ Suggested values include: 1] mainEntry; 2] wordFamily; 3] homonymicEntry; 4] rel
    <define name="gramGrp">
       <element name="gramGrp" ns="http://www.tei-c.org/ns/1.0">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(grammatical information group) groups morpho-syntactic information about a lexical item, e.g. <code xmlns="http://www.w3.org/1999/xhtml">&lt;pos&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml">&lt;gen&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml">&lt;number&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml">&lt;case&gt;</code>, or <code xmlns="http://www.w3.org/1999/xhtml">&lt;iType&gt;</code> (inflectional class). [9.3.2. Grammatical Information]</a:documentation>
-         <zeroOrMore>
-            <choice>
-               <text/>
-               <ref name="model.gLike"/>
-               <ref name="model.lexicalPhrase"/>
-               <ref name="model.lexicalInter"/>
-               <ref name="model.gramPart"/>
-               <ref name="model.global"/>
-            </choice>
-         </zeroOrMore>
+         <oneOrMore>
+            <ref name="model.gramPart"/>
+         </oneOrMore>
          <ref name="att.global.attributes"/>
          <ref name="att.lexicographic.attributes"/>
          <ref name="att.typed.attributes"/>

diff --git a/802_tei_odd/out/shawi.xsd b/802_tei_odd/out/shawi.xsd
@@ -6,7 +6,7 @@
    <xs:import namespace="http://www.w3.org/XML/1998/namespace"
               schemaLocation="xml.tmp"/>
    <!--
-    Schema generated from ODD source 2024-07-10T10:53:55Z. .
+    Schema generated from ODD source 2024-07-11T14:06:42Z. .
     TEI Edition: 
     TEI Edition Location: https://www.tei-c.org/Vault/P5//
     
@@ -4282,14 +4282,8 @@ Suggested values include: 1] mainEntry; 2] wordFamily; 3] homonymicEntry; 4] rel
       </xs:complexType>
    </xs:element>
    <xs:element name="gramGrp">
-      <xs:complexType mixed="true">
-         <xs:choice minOccurs="0" maxOccurs="unbounded">
-            <xs:element ref="tei:model.gLike"/>
-            <xs:group ref="tei:model.lexicalPhrase"/>
-            <xs:group ref="tei:model.lexicalInter"/>
-            <xs:group ref="tei:model.gramPart"/>
-            <xs:group ref="tei:model.global"/>
-         </xs:choice>
+      <xs:complexType>
+         <xs:group maxOccurs="unbounded" ref="tei:model.gramPart"/>
          <xs:attributeGroup ref="tei:att.global.attributes"/>
          <xs:attributeGroup ref="tei:att.lexicographic.attributes"/>
          <xs:attributeGroup ref="tei:att.typed.attributes"/>

diff --git a/802_tei_odd/shawi.odd b/802_tei_odd/shawi.odd
@@ -56,7 +56,7 @@
          <div>
             <head>Part 2: Formal Specification</head>
 
-            <schemaSpec ident="shawi" source="file:/C:/Users/ksramo/Documents/generic-dict-schema/schema/tmp/acdh-ch-dicts.compiled.odd">
+            <schemaSpec ident="shawi" source="file:/C:/Users/mrauschsupola/generic-dict-schema/generic-dict-schema/schema/acdh-ch-dicts.compiled.odd">
 
                <!-- We copy all modules from ACDH-CH dicts  -->
                <moduleRef key="derived-module-TEILex0"/>
@@ -77,6 +77,12 @@
                <elementSpec ident="val" mode="delete"/>
                <classSpec type="atts" ident="att.measurement" mode="delete"/>
 
+               <elementSpec ident="gramGrp" mode="change" module="dictionaries">
+                  <content>
+                     <elementRef key="model.gramPart" minOccurs="1" maxOccurs="unbounded"/>
+                  </content>
+               </elementSpec>
+
                <elementSpec ident="gram" mode="change" module="dictionaries">
                   <constraintSpec ident="gram-parents" scheme="schematron">
                      <constraint>
@@ -87,7 +93,7 @@
                   </constraintSpec>
                   <attList>
                      <!-- TODO 2021-12-03 
-                     Vocabularies should be moved to specific implementations. 
+                     Vocabularies should be moved to specific implementations. element
                      Also this one? 
                      -->
                      <attDef ident="type" mode="replace" usage="req">