From: <lou...@us...> - 2015-08-10 13:07:20
|
Revision: 13326 http://sourceforge.net/p/tei/code/13326 Author: louburnard Date: 2015-08-10 13:07:17 +0000 (Mon, 10 Aug 2015) Log Message: ----------- remove implausible choice elements from content models Modified Paths: -------------- trunk/P5/Source/Specs/classes.xml trunk/P5/Source/Specs/data.numeric.xml trunk/P5/Source/Specs/fvLib.xml trunk/P5/Source/Specs/langUsage.xml Modified: trunk/P5/Source/Specs/classes.xml =================================================================== --- trunk/P5/Source/Specs/classes.xml 2015-08-09 20:56:56 UTC (rev 13325) +++ trunk/P5/Source/Specs/classes.xml 2015-08-10 13:07:17 UTC (rev 13326) @@ -6,7 +6,8 @@ $Date$ $Id$ --> -<?xml-model href="http://tei.it.ox.ac.uk/jenkins/job/TEIP5/lastSuccessfulBuild/artifact/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?> +<?xml-model href="http://tei.it.ox.ac.uk/jenkins/job/TEIP5/lastSuccessfulBuild/artifact/release/xml/tei/odd/p5.nvdl" type="application/xml" + schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?> <elementSpec xmlns="http://www.tei-c.org/ns/1.0" module="tagdocs" ident="classes"> <gloss versionDate="2007-06-12" xml:lang="fr">classes</gloss> <desc versionDate="2005-01-14" xml:lang="en">specifies all the classes of which the documented element or @@ -22,11 +23,9 @@ <memberOf key="att.global"/> </classes> <content> - <choice xmlns="http://relaxng.org/ns/structure/1.0"> - <zeroOrMore> - <ref name="memberOf"/> + <zeroOrMore xmlns:rng="http://relaxng.org/ns/structure/1.0"> + <rng:ref name="memberOf"/> </zeroOrMore> - </choice> </content> <attList> <attDef ident="mode" usage="opt"> Modified: trunk/P5/Source/Specs/data.numeric.xml =================================================================== --- trunk/P5/Source/Specs/data.numeric.xml 2015-08-09 20:56:56 UTC (rev 13325) +++ trunk/P5/Source/Specs/data.numeric.xml 2015-08-10 13:07:17 UTC (rev 13326) @@ -6,7 +6,6 @@ $Date$ $Id$ --> -<?xml-model href="http://tei.it.ox.ac.uk/jenkins/job/TEIP5/lastSuccessfulBuild/artifact/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?> <macroSpec xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" module="tei" type="dt" ident="data.numeric"> <desc versionDate="2007-10-18" xml:lang="en">defines the range of attribute values used for numeric values.</desc> <desc versionDate="2007-12-20" xml:lang="ko">수치에 사용되는 속성 값의 범위를 정의한다.</desc> Modified: trunk/P5/Source/Specs/fvLib.xml =================================================================== --- trunk/P5/Source/Specs/fvLib.xml 2015-08-09 20:56:56 UTC (rev 13325) +++ trunk/P5/Source/Specs/fvLib.xml 2015-08-10 13:07:17 UTC (rev 13326) @@ -29,9 +29,9 @@ </classes> <content> <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0"> - <choice> + <ref name="model.featureVal"/> - </choice> + </zeroOrMore> </content> <exemplum xml:lang="en"> Modified: trunk/P5/Source/Specs/langUsage.xml =================================================================== --- trunk/P5/Source/Specs/langUsage.xml 2015-08-09 20:56:56 UTC (rev 13325) +++ trunk/P5/Source/Specs/langUsage.xml 2015-08-10 13:07:17 UTC (rev 13326) @@ -34,12 +34,9 @@ </classes> <content> <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0"> - <choice> - <!-- <rng:ref name="p"/>--> - <ref name="language"/> - </choice> + <ref name="language"/> </oneOrMore> - </content> + </content> <exemplum xml:lang="en"> <egXML xmlns="http://www.tei-c.org/ns/Examples"> <langUsage> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |