Merge pull request #2471 from TEIC/sydb_2347_null_teidata.namespace

null teidata.namespace
TEIC · Oct 12, 2023 · c27b080 · c27b080
2 parents 6279fb2 + 4ba3a7a
commit c27b080
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 28 deletions.
diff --git a/P5/Source/Specs/att.namespaceable.xml b/P5/Source/Specs/att.namespaceable.xml
@@ -26,7 +26,7 @@ $Id$
       <desc versionDate="2007-06-12" xml:lang="fr">précise l'espace de noms auquel appartient cet élément.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">especifica el espacio de nombre al que pertenece tal elemento.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">indica lo spazio del nome al quale appartiene tale elemento</desc>
-      <datatype><dataRef key="teidata.namespace"/></datatype>
+      <datatype minOccurs="0" maxOccurs="1"><dataRef key="teidata.namespace"/></datatype>
       <defaultVal>http://www.tei-c.org/ns/1.0</defaultVal>
       <remarks xml:lang="en" versionDate="2023-02-07">
         <p>When specified on an <gi>elementSpec</gi>, this attribute
@@ -36,7 +36,7 @@ $Id$
         is added, deleted, replaced, or changed by
         <gi>elementSpec</gi> children of the <gi>schemaSpec</gi>, or
         by <gi>elementSpec</gi>s referred to by <gi>specGrpRef</gi>
-        children of the <gi>schemSpec</gi>, <emph>unless</emph>
+        children of the <gi>schemaSpec</gi>, <emph>unless</emph>
         overridden by an <att>ns</att> attribute on the
         <gi>elementSpec</gi>.</p>
         <p>Note that the value of <att>ns</att> of <gi>attDef</gi> is

diff --git a/P5/Source/Specs/attDef.xml b/P5/Source/Specs/attDef.xml
@@ -24,6 +24,7 @@ $Id$
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.identified"/>
+    <memberOf key="att.namespaceable"/>
   </classes>
   <content>
     <sequence>      
@@ -124,25 +125,6 @@ $Id$
         </valItem>
       </valList>
     </attDef>
-    <attDef ident="ns" usage="opt">
-      <gloss versionDate="2005-09-20" xml:lang="en">namespace</gloss>
-      <gloss versionDate="2007-12-20" xml:lang="ko">이름 공간</gloss>
-      <gloss versionDate="2007-05-02" xml:lang="zh-TW">名稱空間</gloss>
-      <gloss versionDate="2007-06-12" xml:lang="fr">espace de noms</gloss>
-      <gloss versionDate="2007-05-04" xml:lang="es">espacio de nombre</gloss>
-      <gloss versionDate="2007-01-21" xml:lang="it">spazio del nome</gloss>
-      <desc versionDate="2005-09-20" xml:lang="en">specifies the namespace to which this attribute belongs</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="2007-06-12" xml:lang="fr">précise l'espace de noms auquel appartient cet
-      attribut.</desc>
-      <desc versionDate="2007-05-04" xml:lang="es">especifica el espacio del nombre al que pertenece el
-      atributo.</desc>
-      <desc versionDate="2007-01-21" xml:lang="it">indica lo spazio del nome al quale appartiene
-      l'attributo</desc>
-      <datatype><dataRef key="teidata.namespace"/></datatype>
-    </attDef>
   </attList>
   <exemplum xml:lang="en">
     <egXML xmlns="http://www.tei-c.org/ns/Examples">

diff --git a/P5/Source/Specs/namespace.xml b/P5/Source/Specs/namespace.xml
@@ -27,9 +27,7 @@ $Id$
     <memberOf key="att.global"/>
   </classes>
   <content>
-
-      <elementRef key="tagUsage" minOccurs="1" maxOccurs="unbounded"/>
-
+    <elementRef key="tagUsage" minOccurs="1" maxOccurs="unbounded"/>
   </content>
   <attList>
     <attDef ident="name" usage="req">
@@ -42,7 +40,7 @@ $Id$
         Namensraums an.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">el nombre formal completo del namespace concerniente.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">l'intero nome formale del namespace in questione.</desc>
-      <datatype><dataRef key="teidata.namespace"/></datatype>
+      <datatype minOccurs="0" maxOccurs="1"><dataRef key="teidata.namespace"/></datatype>
     </attDef>
   </attList>
   <exemplum xml:lang="en">
@@ -71,4 +69,4 @@ $Id$
   <listRef>
     <ptr target="#HD57"/>
   </listRef>
-</elementSpec>
+</elementSpec>
diff --git a/P5/Source/Specs/teidata.namespace.xml b/P5/Source/Specs/teidata.namespace.xml
@@ -27,7 +27,7 @@ See the file COPYING.txt for details
     indicare i nomi degli spazi in XML come stabilito dalle raccomandazioni tecniche del W3C per gli
     <ref target="https://www.w3.org/TR/1999/REC-xml-names-19990114/">spazi dei nomi in XML</ref>.</desc>
   <content>
-      <dataRef restriction="\S*" name="anyURI"/>
+      <dataRef restriction="\S+" name="anyURI"/>
    </content>
   <remarks versionDate="2008-02-08" xml:lang="en">
       <p>The range of syntactically valid values is defined by <ref target="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986 <title>Uniform Resource Identifier
@@ -46,4 +46,4 @@ See the file COPYING.txt for details
          </ref>.</p>
       <!-- this ref should be in the TEI bibliog -->
   </remarks>
-</dataSpec>
+</dataSpec>