Skip to content

Commit c27b080

Browse files
authored
Merge pull request #2471 from TEIC/sydb_2347_null_teidata.namespace
null teidata.namespace
2 parents 6279fb2 + 4ba3a7a commit c27b080

File tree

4 files changed

+8
-28
lines changed

4 files changed

+8
-28
lines changed

P5/Source/Specs/att.namespaceable.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ $Id$
2626
<desc versionDate="2007-06-12" xml:lang="fr">précise l'espace de noms auquel appartient cet élément.</desc>
2727
<desc versionDate="2007-05-04" xml:lang="es">especifica el espacio de nombre al que pertenece tal elemento.</desc>
2828
<desc versionDate="2007-01-21" xml:lang="it">indica lo spazio del nome al quale appartiene tale elemento</desc>
29-
<datatype><dataRef key="teidata.namespace"/></datatype>
29+
<datatype minOccurs="0" maxOccurs="1"><dataRef key="teidata.namespace"/></datatype>
3030
<defaultVal>http://www.tei-c.org/ns/1.0</defaultVal>
3131
<remarks xml:lang="en" versionDate="2023-02-07">
3232
<p>When specified on an <gi>elementSpec</gi>, this attribute
@@ -36,7 +36,7 @@ $Id$
3636
is added, deleted, replaced, or changed by
3737
<gi>elementSpec</gi> children of the <gi>schemaSpec</gi>, or
3838
by <gi>elementSpec</gi>s referred to by <gi>specGrpRef</gi>
39-
children of the <gi>schemSpec</gi>, <emph>unless</emph>
39+
children of the <gi>schemaSpec</gi>, <emph>unless</emph>
4040
overridden by an <att>ns</att> attribute on the
4141
<gi>elementSpec</gi>.</p>
4242
<p>Note that the value of <att>ns</att> of <gi>attDef</gi> is

P5/Source/Specs/attDef.xml

+1-19
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ $Id$
2424
<classes>
2525
<memberOf key="att.global"/>
2626
<memberOf key="att.identified"/>
27+
<memberOf key="att.namespaceable"/>
2728
</classes>
2829
<content>
2930
<sequence>
@@ -124,25 +125,6 @@ $Id$
124125
</valItem>
125126
</valList>
126127
</attDef>
127-
<attDef ident="ns" usage="opt">
128-
<gloss versionDate="2005-09-20" xml:lang="en">namespace</gloss>
129-
<gloss versionDate="2007-12-20" xml:lang="ko">이름 공간</gloss>
130-
<gloss versionDate="2007-05-02" xml:lang="zh-TW">名稱空間</gloss>
131-
<gloss versionDate="2007-06-12" xml:lang="fr">espace de noms</gloss>
132-
<gloss versionDate="2007-05-04" xml:lang="es">espacio de nombre</gloss>
133-
<gloss versionDate="2007-01-21" xml:lang="it">spazio del nome</gloss>
134-
<desc versionDate="2005-09-20" xml:lang="en">specifies the namespace to which this attribute belongs</desc>
135-
<desc versionDate="2007-12-20" xml:lang="ko">이 속성이 소속된 이름 공간을 명시한다.</desc>
136-
<desc versionDate="2007-05-02" xml:lang="zh-TW">指明該屬性所屬的名稱空間。</desc>
137-
<desc versionDate="2008-04-05" xml:lang="ja">当該属性が属する名前空間を示す。</desc>
138-
<desc versionDate="2007-06-12" xml:lang="fr">précise l'espace de noms auquel appartient cet
139-
attribut.</desc>
140-
<desc versionDate="2007-05-04" xml:lang="es">especifica el espacio del nombre al que pertenece el
141-
atributo.</desc>
142-
<desc versionDate="2007-01-21" xml:lang="it">indica lo spazio del nome al quale appartiene
143-
l'attributo</desc>
144-
<datatype><dataRef key="teidata.namespace"/></datatype>
145-
</attDef>
146128
</attList>
147129
<exemplum xml:lang="en">
148130
<egXML xmlns="http://www.tei-c.org/ns/Examples">

P5/Source/Specs/namespace.xml

+3-5
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ $Id$
2727
<memberOf key="att.global"/>
2828
</classes>
2929
<content>
30-
31-
<elementRef key="tagUsage" minOccurs="1" maxOccurs="unbounded"/>
32-
30+
<elementRef key="tagUsage" minOccurs="1" maxOccurs="unbounded"/>
3331
</content>
3432
<attList>
3533
<attDef ident="name" usage="req">
@@ -42,7 +40,7 @@ $Id$
4240
Namensraums an.</desc>
4341
<desc versionDate="2007-05-04" xml:lang="es">el nombre formal completo del namespace concerniente.</desc>
4442
<desc versionDate="2007-01-21" xml:lang="it">l'intero nome formale del namespace in questione.</desc>
45-
<datatype><dataRef key="teidata.namespace"/></datatype>
43+
<datatype minOccurs="0" maxOccurs="1"><dataRef key="teidata.namespace"/></datatype>
4644
</attDef>
4745
</attList>
4846
<exemplum xml:lang="en">
@@ -71,4 +69,4 @@ $Id$
7169
<listRef>
7270
<ptr target="#HD57"/>
7371
</listRef>
74-
</elementSpec>
72+
</elementSpec>

P5/Source/Specs/teidata.namespace.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ See the file COPYING.txt for details
2727
indicare i nomi degli spazi in XML come stabilito dalle raccomandazioni tecniche del W3C per gli
2828
<ref target="https://www.w3.org/TR/1999/REC-xml-names-19990114/">spazi dei nomi in XML</ref>.</desc>
2929
<content>
30-
<dataRef restriction="\S*" name="anyURI"/>
30+
<dataRef restriction="\S+" name="anyURI"/>
3131
</content>
3232
<remarks versionDate="2008-02-08" xml:lang="en">
3333
<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
4646
</ref>.</p>
4747
<!-- this ref should be in the TEI bibliog -->
4848
</remarks>
49-
</dataSpec>
49+
</dataSpec>

0 commit comments

Comments
 (0)