[TEI-notify] SF.net SVN: tei:[13324] branches/P5-Pure/Source/Specs

[<lou...@us...>]

Revision: 13324
          http://sourceforge.net/p/tei/code/13324
Author:   louburnard
Date:     2015-08-09 16:29:20 +0000 (Sun, 09 Aug 2015)
Log Message:
-----------
allow macroRef to repeat as crude fix to macro.paraContent model problem

Modified Paths:
--------------
    branches/P5-Pure/Source/Specs/macro.paraContent.xml
    branches/P5-Pure/Source/Specs/macroRef.xml

Modified: branches/P5-Pure/Source/Specs/macro.paraContent.xml
===================================================================
--- branches/P5-Pure/Source/Specs/macro.paraContent.xml	2015-08-08 20:43:54 UTC (rev 13323)
+++ branches/P5-Pure/Source/Specs/macro.paraContent.xml	2015-08-09 16:29:20 UTC (rev 13324)
@@ -23,7 +23,7 @@
   <desc versionDate="2007-05-04" xml:lang="es">define el contenido de párrafos y elementos similares.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">definisce il contenuto di paragrafi ed elementi simili</desc>
   <content>
-    <rng:zeroOrMore xmlns:rng="http://relaxng.org/ns/structure/1.0">
+<!--    <rng:zeroOrMore xmlns:rng="http://relaxng.org/ns/structure/1.0">
       <rng:choice>
         <rng:text/>
         <rng:ref name="model.gLike"/>
@@ -34,7 +34,17 @@
         <rng:ref name="l"/>
       </rng:choice>
     </rng:zeroOrMore>
-  </content>
+  -->
+<alternate minOccurs="0" maxOccurs="unbounded">
+ <textNode/>
+<classRef key="model.gLike"/>
+<classRef key="model.phrase"/>
+<classRef key="model.inter"/>
+<classRef key="model.global"/>
+ <elementRef key="lg"/>
+ <elementRef key="l"/>
+ </alternate>
+</content>
   <listRef>
     <ptr target="#STEC"/>
   </listRef>

Modified: branches/P5-Pure/Source/Specs/macroRef.xml
===================================================================
--- branches/P5-Pure/Source/Specs/macroRef.xml	2015-08-08 20:43:54 UTC (rev 13323)
+++ branches/P5-Pure/Source/Specs/macroRef.xml	2015-08-09 16:29:20 UTC (rev 13324)
@@ -16,6 +16,7 @@
       <memberOf key="model.oddRef"/>
       <memberOf key="model.contentPart"/>
       <memberOf key="att.readFrom"/>
+      <memberOf key="att.repeatable"/><!-- added to support current definition of macro.anyXML, but not sure it's needed LB -->
   </classes>
   <content>
       <rng:empty/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.