Deprecation of classSpec/@generate and classRef/@expand with alternative solutions.

P5/Source/Guidelines/en/CC-LanguageCorpora.xml

@@ -329,10 +329,19 @@ categorize texts, which is fully described in section <ptr target="#HD43"/>, and
 organized as a set of values and optional prose descriptions for the
 following eight <term>situational parameters</term>, each represented by
 one of the following eight elements:
-<specList><specDesc key="channel" atts="mode"/><specDesc key="constitution" atts="type"/><specDesc key="derivation" atts="type"/><specDesc key="domain" atts="type"/><specDesc key="factuality" atts="type"/><specDesc key="interaction" atts="type active passive"/><specDesc key="preparedness" atts="type"/><specDesc key="purpose" atts="type degree"/></specList></p>
-<p>These elements constitute a model class called <ident type="class">model.textDescPart</ident>; new parameters may be defined
+<specList>
+  <specDesc key="channel" atts="mode"/>
+  <specDesc key="constitution" atts="type"/>
+  <specDesc key="derivation" atts="type"/>
+  <specDesc key="domain" atts="type"/>
+  <specDesc key="factuality" atts="type"/>
+  <specDesc key="interaction" atts="type active passive"/>
+  <specDesc key="preparedness" atts="type"/>
+  <specDesc key="purpose" atts="type degree"/>
+</specList></p>
+<!-- p>These elements constitute a model class called <ident type="class">model.textDescPart</ident>; new parameters may be defined
 by defining new elements and adding them to that class, as further
-described in <ptr target="#MD"/>.</p>
+described in <ptr target="#MD"/>.</p -->
 
 <p>By default, a text description will contain each of the above
 elements, supplied in the order specified. Except for the
@@ -964,4 +973,4 @@ elements, or silently omitted, as appropriate.</item></list></p>
   described in <ptr target="#STIN"/>.</p>
 </div>
 
-</div>
+</div>

P5/Source/Guidelines/en/HD-Header.xml

@@ -260,7 +260,6 @@ interchange.</p>
   <specDesc key="model.profileDescPart"/>
   <specDesc key="model.teiHeaderPart"/>
   <specDesc key="model.sourceDescPart"/>
-  <specDesc key="model.textDescPart"/>
 </specList>
 </p>
 </div></div>
@@ -2946,4 +2945,4 @@ for subject headings nor require the use of subject headings.</item>
   The selection and combination of modules to form a TEI schema is
   described in <ptr target="#STIN"/>.</p>
 </div>
-</div>
+</div>

P5/Source/Guidelines/en/MS-ManuscriptDescription.xml

@@ -1453,9 +1453,8 @@ with usage of the more specialized elements, as such an approach complicates
 processing, and may lead to inconsistency within a single manuscript
 description. A single <gi>physDesc</gi> element will normally contain either a
 series of <ident type="class">model.pLike</ident> elements, or a sequence of
-specialized elements from the <ident type="class">model.physDescPart</ident>
-class. There are however circumstances in which this is not feasible, for
-example: <list>
+particular specialized elements. There are however circumstances in which
+this is not feasible, for example: <list>
 <item>the description already exists in a prose form where some of the
 specialized topics are treated together in paragraphs of prose, but others are
 treated distinctly;</item>
@@ -2567,4 +2566,4 @@ description, and other related information:
     <specGrpRef target="#mscoclass.def"/>
   </specGrp>
 </div>
-</div>
+</div>

P5/Source/Guidelines/en/ST-Infrastructure.xml

@@ -886,7 +886,6 @@ one, or vice versa, should be done with care. </p>
 
             <!-- set 1: those attr classes that are not members of another attr class -->
             <xi:include href="../../Specs/att.anchoring.xml"/>
-
             <xi:include href="../../Specs/att.ascribed.xml"/>
             <xi:include href="../../Specs/att.breaking.xml"/>
             <xi:include href="../../Specs/att.cReferencing.xml"/>
@@ -912,6 +911,7 @@ one, or vice versa, should be done with care. </p>
             <xi:include href="../../Specs/att.measurement.xml"/>
             <xi:include href="../../Specs/att.milestoneUnit.xml"/>
             <xi:include href="../../Specs/att.notated.xml"/>
+            <xi:include href="../../Specs/att.organizable.xml"/>
             <xi:include href="../../Specs/att.placement.xml"/>
             <xi:include href="../../Specs/att.pointing.xml"/>
             <xi:include href="../../Specs/att.ranging.xml"/>
@@ -1149,9 +1149,7 @@ one, or vice versa, should be done with care. </p>
         <xi:include href="../../Specs/model.imprintPart.xml"/>
         <xi:include href="../../Specs/model.catDescPart.xml"/>
         <xi:include href="../../Specs/model.settingPart.xml"/>
-        <xi:include href="../../Specs/model.textDescPart.xml"/>
         <xi:include href="../../Specs/model.castItemPart.xml"/>
-        <xi:include href="../../Specs/model.physDescPart.xml"/>
         <xi:include href="../../Specs/model.addressLike.xml"/>
         <xi:include href="../../Specs/model.nameLike.xml"/>
         <xi:include href="../../Specs/model.persNamePart.xml"/>

P5/Source/Specs/accMat.xml

@@ -10,22 +10,16 @@
   <gloss versionDate="2007-01-21" xml:lang="it">materiale allegato</gloss>
   <gloss versionDate="2018-12-18" xml:lang="ja">添付資料</gloss>
   <gloss versionDate="2024-04-11" xml:lang="de">Begleitmaterial</gloss>
-  <desc versionDate="2019-01-17" xml:lang="en" xml:id="accmat.desc">contains details of any significant additional
-material which may be closely associated with the manuscript or object being
-described, such as non-contemporaneous documents or fragments bound in
-with it at some earlier historical period.</desc>
+  <desc versionDate="2019-01-17" xml:lang="en" xml:id="accmat.desc">contains details of any significant additional material which may be closely associated with the manuscript or object being described, such as non-contemporaneous documents or fragments bound in with it at some earlier historical period.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">기술하고 있는 원고와 밀접히 관련된 중요한 부가적 자료를 세밀하게 기술한다. 예를 들어, 어떤 이전 시기에 원고와 함께 제본된 비동시대의 문서  또는 문서 일부.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含可能與該手稿關係密切的重要附加資料之細節，例如非同時期的文件或是在早期與手稿裝訂一起的片段。</desc>
   <desc versionDate="2022-06-07" xml:lang="ja">当該手書き資料と密接に関連していると考えられる重要な追加資料、例えば、時代を異にする文書、歴史的に早い時期に手書き資料と合わされた断片などの詳細を示す。</desc>
-  <desc versionDate="2007-06-12" xml:lang="fr">donne des détails sur tout matériel d'accompagnement
-      étroitement associé au manuscrit, tel que documents non contemporains ou fragments reliés avec
-      le manuscrit à une époque antérieure.</desc>
+  <desc versionDate="2007-06-12" xml:lang="fr">donne des détails sur tout matériel d'accompagnement étroitement associé au manuscrit, tel que documents non contemporains ou fragments reliés avec le manuscrit à une époque antérieure.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">contiene eventuales detalles que conciernen a materiales añadidos estrechamente relacionados con el manuscrito examinado, p.ej. documentos no actuales o fragmentos cosidos junto al manuscrito en un período histórico precedente al actual.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene eventuali dettagli riguardanti maeriale aggiuntivo strettamente collegato al manoscritto in esame, per esempio documenti non attali o frammenti rilegati insieme al manoscritto in un periodo storico precedente a quello attuale</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.typed"/>
-    <memberOf key="model.physDescPart"/>
   </classes>
   <content>
     <macroRef key="macro.specialPara"/>

P5/Source/Specs/additions.xml

@@ -4,18 +4,15 @@
 <elementSpec xmlns="http://www.tei-c.org/ns/1.0" module="msdescription" xml:id="ADDITIONS" ident="additions">
   <gloss versionDate="2007-06-12" xml:lang="en">additions</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">ajouts</gloss>
-  <desc versionDate="2019-01-17" xml:lang="en" xml:id="additions.desc">contains a description of any significant additions found
-within a manuscript or other object, such as marginalia or other annotations.</desc>
+  <desc versionDate="2019-01-17" xml:lang="en" xml:id="additions.desc">contains a description of any significant additions found within a manuscript or other object, such as marginalia or other annotations.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">방주 또는 기타 주석과 같이 원고 내의 중요한 부가정보의 기술을 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含手稿中任何重要增添文字的描述，例如旁註或其他註釋。</desc>
   <desc versionDate="2022-06-07" xml:lang="ja">当該手書き資料中にある、重要な付加物を示す。例えば、欄外の書き込みや注釈など。</desc>
-  <desc versionDate="2007-06-12" xml:lang="fr">contient la description des ajouts significatifs
-      trouvés dans un manuscrit, tels que gloses marginales ou autres annotations.</desc>
+  <desc versionDate="2007-06-12" xml:lang="fr">contient la description des ajouts significatifs trouvés dans un manuscrit, tels que gloses marginales ou autres annotations.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">contiene una descripción de cualquier adición significativa encontrada al interno de un manuscrito como notas al márgen u otras anotaciones.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene un descrizione di qualsiasi aggiunta significativa trovata all'interno di un manoscritto come note a margine o altre annotazioni</desc>
   <classes>
     <memberOf key="att.global"/>
-    <memberOf key="model.physDescPart"/>
   </classes>
   <content>
     <macroRef key="macro.specialPara"/>

P5/Source/Specs/altIdentifier.xml

@@ -12,10 +12,8 @@
   <desc versionDate="2019-01-17" xml:lang="en">contains an alternative or former structured identifier used for a manuscript or other object, such as a former catalogue number.</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">当該手書き資料を示す、代わりとなるIDまたは昔のIDを示す。例えば、昔の
-  カタログ番号など。</desc>
-  <desc versionDate="2007-06-12" xml:lang="fr">contient un autre ou un ancien identifiant pour un
-  manuscrit, par exemple un numéro anciennement utilisé dans un catalogue.</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">当該手書き資料を示す、代わりとなるIDまたは昔のIDを示す。例えば、昔の カタログ番号など。</desc>
+  <desc versionDate="2007-06-12" xml:lang="fr">contient un autre ou un ancien identifiant pour un manuscrit, par exemple un numéro anciennement utilisé dans un catalogue.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">contiene un identificador estructurado, alternativo o precedente, utilizado para un manuscrito, p.ej. un número antiguo de catalogación.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene un identificatore strutturato alternativo o precedente utilizzato per un manoscritto, per esempio un precedente numero di catalogazione</desc>
   <classes>
@@ -25,7 +23,15 @@
   </classes>
   <content>
     <sequence>
-      <classRef key="model.placeNamePart" expand="sequenceOptional"/>    
+      <!-- Note: this set of elements is the same as the membership of model.placeNamePart -->
+      <elementRef key="placeName" minOccurs="0" maxOccurs="1"/>
+      <elementRef key="bloc" minOccurs="0" maxOccurs="1"/>
+      <elementRef key="country" minOccurs="0" maxOccurs="1"/>
+      <elementRef key="region" minOccurs="0" maxOccurs="1"/>
+      <elementRef key="settlement" minOccurs="0" maxOccurs="1"/>
+      <elementRef key="district" minOccurs="0" maxOccurs="1"/>
+      <elementRef key="geogName" minOccurs="0" maxOccurs="1"/>
+      <!-- Note: end of model.placeNamePart set of elements -->
       <elementRef key="institution" minOccurs="0"/>
       <elementRef key="repository" minOccurs="0"/>
       <elementRef key="collection" minOccurs="0"/>

P5/Source/Specs/att.organizable.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- © TEI Consortium. Dual-licensed under CC-by and BSD2 licenses; see the file COPYING.txt for details. -->
+<?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
+<classSpec xmlns="http://www.tei-c.org/ns/1.0" module="tei" type="atts" xml:id="class-attr-organizable" ident="att.organizable">
+  <desc versionDate="2025-09-15" xml:lang="en">provides attributes for declaring the intended organization of the constructs being specified.</desc>
+  <attList>
+    <attDef ident="org">
+      <gloss versionDate="2007-07-04" xml:lang="en">organization</gloss>
+      <gloss versionDate="2007-12-20" xml:lang="ko">조직</gloss>
+      <gloss versionDate="2008-04-06" xml:lang="es">organización</gloss>
+      <gloss versionDate="2007-06-12" xml:lang="fr">conditions d'utilisation</gloss>
+      <gloss versionDate="2007-11-06" xml:lang="it">organizzazione</gloss>
+      <desc versionDate="2025-09-11" xml:lang="en">indicates whether one or all of the constructs being specified or referenced are available</desc>
+      <datatype><dataRef key="teidata.enumerated"/></datatype>
+      <defaultVal>group</defaultVal>
+      <valList type="closed">
+        <valItem ident="group">
+          <gloss versionDate="2025-09-11" xml:lang="en">grouped</gloss>
+          <desc versionDate="2025-09-11" xml:lang="en">any of the attributes defined in this list may be specified.</desc>
+        </valItem>
+        <valItem ident="choice">
+          <gloss versionDate="2025-09-11" xml:lang="en">alternated</gloss>
+          <desc versionDate="2025-09-11" xml:lang="en">only one of the attributes defined in this list may be specified.</desc>
+        </valItem>
+      </valList>
+    </attDef>
+  </attList>
+</classSpec>

P5/Source/Specs/attList.xml

@@ -13,52 +13,15 @@
   <desc versionDate="2007-01-21" xml:lang="it">contiene la documentazione relativa agli attributi associati all'elemento in questione sotto forma di una serie di elementi attDef</desc>
   <classes>
     <memberOf key="att.global"/>
-    </classes>
+    <memberOf key="att.organizable"/>
+  </classes>
   <content>
     <alternate minOccurs="1" maxOccurs="unbounded">
       <elementRef key="attRef"/>
       <elementRef key="attDef"/>
       <elementRef key="attList"/>
     </alternate>
   </content>
-  <attList>
-    <attDef ident="org">
-      <gloss versionDate="2007-07-04" xml:lang="en">organization</gloss>
-      <gloss versionDate="2007-12-20" xml:lang="ko">조직</gloss>
-      <gloss versionDate="2008-04-06" xml:lang="es">organización</gloss>
-      <gloss versionDate="2007-06-12" xml:lang="fr">conditions d'utilisation</gloss>
-      <gloss versionDate="2007-11-06" xml:lang="it">organizzazione</gloss>
-      <desc versionDate="2023-02-07" xml:lang="en">specifies whether only one (<val>choice</val>) or all (<val>group</val>) of the attributes in the list are available.</desc>
-      <desc versionDate="2007-12-20" xml:lang="ko">목록의 모든 속성이 이용가능하거나(org="group") 그 중 하나만 이용가능한지를 명시한다.</desc>
-      <desc versionDate="2007-05-02" xml:lang="zh-TW">標明是否列表中的全部屬性皆可使用 (org="group") 、或是僅可使用其中一個 (org="choice")。</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">リスト中の属性が全て使用できるか(org="group")、またはその1つだけ が使用できるか(org="choice")を示す。</desc>
-      <desc versionDate="2007-06-12" xml:lang="fr">précise si les attributs dans la liste sont tous disponibles (org="group") ou seulement l'un d'entre eux (org="choice").</desc>
-      <desc versionDate="2023-03-20" xml:lang="es">indica si solo uno (<val>choice</val>) o todos (<val>group</val>) los atributos de la lista están disponibles.</desc>
-      <desc versionDate="2023-03-21" xml:lang="it">indica se gli attributi contenuti nella lista sono tutti disponibili (<val>group</val>) o se ne è disponibile solo uno (<val>choice</val>)</desc>
-      <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <defaultVal>group</defaultVal>
-      <valList type="closed">
-        <valItem ident="group">
-          <desc versionDate="2007-06-27" xml:lang="en">grouped</desc>
-          <desc versionDate="2007-12-20" xml:lang="ko">그룹화된</desc>
-          <desc versionDate="2007-05-02" xml:lang="zh-TW">集合使用</desc>
-          <desc versionDate="2008-04-06" xml:lang="es">agrupado</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">全て。</desc>
-          <desc versionDate="2008-03-30" xml:lang="fr">tous les attributs de la liste sont disponibles.</desc>
-          <desc versionDate="2007-01-21" xml:lang="it">raggruppati</desc>
-        </valItem>
-        <valItem ident="choice">
-          <desc versionDate="2007-06-27" xml:lang="en">alternated</desc>
-          <desc versionDate="2007-12-20" xml:lang="ko">교체가능한</desc>
-          <desc versionDate="2007-05-02" xml:lang="zh-TW">擇一使用</desc>
-          <desc versionDate="2008-04-06" xml:lang="es">alternado</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">ひとつを選択。</desc>
-          <desc versionDate="2008-03-30" xml:lang="fr">un seul des attributs de la liste est disponible.</desc>
-          <desc versionDate="2007-01-21" xml:lang="it">alternati</desc>
-        </valItem>
-      </valList>
-    </attDef>
-  </attList>
   <exemplum xml:lang="en">
     <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="gi-attList-egXML-td">
       <attList>