Merging release branch into master branch

TEIC · Jan 29, 2019 · cf83e6a · cf83e6a
2 parents 0ec2dba + afa1942
commit cf83e6a
Show file tree

Hide file tree

Showing 191 changed files with 9,948 additions and 99,110 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,21 @@
+sudo: required
+
+language: java
+
+services:
+  - docker
+
+# before we can run the docker image for the tests, we need to 
+# * pull the docker image
+# * get the current VERSION file of the stylesheets from the artifacts server
+# * get the latest stylesheets zip file from the artifacts server
+# * install the stylesheets within our working dir in a dedicated sub dir
+before_install:
+  - docker pull teic/jenkins:dev
+  - curl https://jenkins.tei-c.org/view/TEI%20dev/job/Stylesheets-dev/lastSuccessfulBuild/artifact/dist/doc/tei-xsl/VERSION -o XSLVERSION
+  - curl https://jenkins.tei-c.org/view/TEI%20dev/job/Stylesheets-dev/lastStableBuild/artifact/tei-xsl-`head -1 XSLVERSION`.zip -o stylesheets.zip
+  - mkdir stylesheets
+  - unzip stylesheets.zip -d stylesheets
+
+script:
+  - docker run --rm -w /var/tei/P5 -it -v `pwd`:/var/tei -v $TRAVIS_BUILD_DIR/stylesheets/xml/tei/stylesheet:/usr/share/xml/tei/stylesheet -u $UID --entrypoint "make" teic/jenkins:dev clean validate test
diff --git a/Documents/oddmanual/examples/minimal.rnc b/Documents/oddmanual/examples/minimal.rnc
@@ -1,8 +1,8 @@
 namespace ns1 = "http://www.tei-c.org/ns/1.0"
 namespace rng = "http://relaxng.org/ns/structure/1.0"
 
-include "http://www.tei-c.org/schema/relaxng/header.rnc" inherit = ns1
-include "http://www.tei-c.org/schema/relaxng/core.rnc" inherit = ns1
-include "http://www.tei-c.org/schema/relaxng/tei.rnc" inherit = ns1
-include "http://www.tei-c.org/schema/relaxng/textstructure.rnc" inherit = ns1
+include "http://www.tei-c.org/release/xml/tei/schema/relaxng/header.rnc" inherit = ns1
+include "http://www.tei-c.org/release/xml/tei/schema/relaxng/core.rnc" inherit = ns1
+include "http://www.tei-c.org/release/xml/tei/schema/relaxng/tei.rnc" inherit = ns1
+include "http://www.tei-c.org/release/xml/tei/schema/relaxng/textstructure.rnc" inherit = ns1
 start = TEI
diff --git a/Documents/oddmanual/examples/minimal.rng b/Documents/oddmanual/examples/minimal.rng
@@ -2,10 +2,10 @@
 <rng:grammar xmlns:rng="http://relaxng.org/ns/structure/1.0" 
 	     datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" 
 	     ns="http://www.tei-c.org/ns/1.0">
-  <rng:include href="http://www.tei-c.org/schema/relaxng/header.rng"/>
-  <rng:include href="http://www.tei-c.org/schema/relaxng/core.rng"/>
-  <rng:include href="http://www.tei-c.org/schema/relaxng/tei.rng"/>
-  <rng:include href="http://www.tei-c.org/schema/relaxng/textstructure.rng"/>
+  <rng:include href="http://www.tei-c.org/release/xml/tei/schema/relaxng/header.rng"/>
+  <rng:include href="http://www.tei-c.org/release/xml/tei/schema/relaxng/core.rng"/>
+  <rng:include href="http://www.tei-c.org/release/xml/tei/schema/relaxng/tei.rng"/>
+  <rng:include href="http://www.tei-c.org/release/xml/tei/schema/relaxng/textstructure.rng"/>
   <rng:start>
     <rng:ref name="TEI"/>
   </rng:start>

diff --git a/Documents/oddmanual/examples/minimal2.rnc b/Documents/oddmanual/examples/minimal2.rnc
@@ -1,9 +1,9 @@
 namespace ns1 = "http://www.tei-c.org/ns/1.0"
 namespace rng = "http://relaxng.org/ns/structure/1.0"
 
-include "http://www.tei-c.org/schema/relaxng/header.rnc" inherit = ns1
+include "http://www.tei-c.org/release/xml/tei/schema/relaxng/header.rnc" inherit = ns1
 [ define [ name = "mentioned" notAllowed [ ] ] ]
-include "http://www.tei-c.org/schema/relaxng/core.rnc" inherit = ns1
-include "http://www.tei-c.org/schema/relaxng/tei.rnc" inherit = ns1
-include "http://www.tei-c.org/schema/relaxng/textstructure.rnc" inherit = ns1
+include "http://www.tei-c.org/release/xml/tei/schema/relaxng/core.rnc" inherit = ns1
+include "http://www.tei-c.org/release/xml/tei/schema/relaxng/tei.rnc" inherit = ns1
+include "http://www.tei-c.org/release/xml/tei/schema/relaxng/textstructure.rnc" inherit = ns1
 start = TEI
diff --git a/Documents/oddmanual/examples/minimal2.rng b/Documents/oddmanual/examples/minimal2.rng
@@ -2,14 +2,14 @@
 <rng:grammar xmlns:rng="http://relaxng.org/ns/structure/1.0" 
 	     datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" 
 	     ns="http://www.tei-c.org/ns/1.0">
-  <rng:include href="http://www.tei-c.org/schema/relaxng/header.rng"/>
-  <rng:include href="http://www.tei-c.org/schema/relaxng/core.rng">
+  <rng:include href="http://www.tei-c.org/release/xml/tei/schema/relaxng/header.rng"/>
+  <rng:include href="http://www.tei-c.org/release/xml/tei/schema/relaxng/core.rng">
     <define name="mentioned">
       <notAllowed/>
     </define>
   </rng:include>
-  <rng:include href="http://www.tei-c.org/schema/relaxng/tei.rng"/>
-  <rng:include href="http://www.tei-c.org/schema/relaxng/textstructure.rng"/>
+  <rng:include href="http://www.tei-c.org/release/xml/tei/schema/relaxng/tei.rng"/>
+  <rng:include href="http://www.tei-c.org/release/xml/tei/schema/relaxng/textstructure.rng"/>
   <rng:start>
     <rng:ref name="TEI"/>
   </rng:start>

diff --git a/Documents/oddmanual/examples/odd1.5.xml b/Documents/oddmanual/examples/odd1.5.xml
@@ -10,7 +10,7 @@
       <memberOf key="model.pPart.data"/>
     </classes>
     <content>
-      <rng:text/>
+      <textNode/>
     </content>
   </elementSpec>
 </schemaSpec>
diff --git a/Documents/oddmanual/examples/odd3.html b/Documents/oddmanual/examples/odd3.html
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?>     You must indicate the level of the section   1st level section 2nd level section 3rd level section
diff --git a/Documents/oddmanual/examples/odd3.xml b/Documents/oddmanual/examples/odd3.xml
@@ -9,10 +9,10 @@
 	<gloss>You must indicate the level of the
 	section</gloss>
 	<datatype>
-	  <rng:ref
-	      xmlns:rng="http://relaxng.org/ns/structure/1.0"
+	  <dataRef key="teidata.enumerated"/>
+	    <!--  xmlns:rng="http://relaxng.org/ns/structure/1.0"
 	      name="datatype.Code"/>
-	</datatype>
+-->	</datatype>
 	<valList type="closed" mode="replace">
 	  <valItem ident="section">
 	    <gloss>1st level section</gloss>

diff --git a/Documents/oddmanual/examples/odd4.xml b/Documents/oddmanual/examples/odd4.xml
@@ -17,7 +17,7 @@
       <memberOf key="att.naming"/>
     </classes>
     <content>
-      <rng:ref name="macro.phraseSeq"/> 
+      <macroRef key="macro.phraseSeq"/> 
     </content>
   </elementSpec>
 </schemaSpec>
diff --git a/Documents/oddmanual/examples/odd6.xml b/Documents/oddmanual/examples/odd6.xml
@@ -7,6 +7,7 @@
     <memberOf key="model.common"/>
   </classes>
   <content>
+
     <rng:optional>
       <rng:element name="fallback"
 		   ns="http://www.w3.org/2001/XInclude">
@@ -26,7 +27,7 @@
   <attList>
     <attDef ident="href" usage="req">
       <datatype>
-	<rng:data type="anyURI"/>
+	<dataRef name="anyURI"/>
       </datatype>
     </attDef>
     <attDef ident="parse">
@@ -40,28 +41,28 @@
     </attDef>
     <attDef ident="xpointer">
       <datatype>
-	<rng:text/>
+	<dataRef key="teidata.text"/>
       </datatype>
     </attDef>
     <attDef ident="encoding">
       <datatype>
-	<rng:text/>
+        <dataRef key="teidata.text"/>
       </datatype>
     </attDef>
     <attDef ident="accept">
       <datatype>
-	<rng:text/>
+        <dataRef key="teidata.text"/>
       </datatype>
     </attDef>
     <attDef
 	ident="accept-charset">
       <datatype>
-	<rng:text/>
+        <dataRef key="teidata.text"/>
       </datatype>
     </attDef>
     <attDef ident="accept-language">
       <datatype>
-	<rng:text/>
+        <dataRef key="teidata.text"/>
       </datatype>
     </attDef>
   </attList>

diff --git a/Documents/oddmanual/examples/odd6a.xml b/Documents/oddmanual/examples/odd6a.xml
@@ -0,0 +1,80 @@
+ <elementSpec ident="xinclude" 
+	     mode="add"
+	     xmlns:rng="http://relaxng.org/ns/structure/1.0"
+	     ns="http://www.w3.org/2001/XInclude">
+  <altIdent>include</altIdent>
+  <classes>
+    <memberOf key="model.common"/>
+  </classes>
+  <content>
+    <elementRef key="fallback" minOccurs="0" maxOccurs="1"/>
+    </content>
+   <!-- 
+    </elementRef>
+    <rng:optional>
+      <rng:element name="fallback"
+		   ns="http://www.w3.org/2001/XInclude">
+        
+	<rng:zeroOrMore>
+	  <rng:element>
+	    <rng:anyName/>
+	    <rng:zeroOrMore>
+	      <rng:attribute>
+		<rng:anyName/>
+	      </rng:attribute>
+	    </rng:zeroOrMore>
+	  </rng:element>
+	</rng:zeroOrMore>
+      </rng:element>
+    </rng:optional>
+  </content>-->
+  <attList>
+    <attDef ident="href" usage="req">
+      <datatype>
+	<dataRef name="anyURI"/>
+      </datatype>
+    </attDef>
+    <attDef ident="parse">
+      <datatype>
+	<rng:choice>
+	  <rng:value>xml</rng:value>
+	  <rng:value>text</rng:value>
+	</rng:choice>
+      </datatype>
+      <defaultVal>xml</defaultVal>
+    </attDef>
+    <attDef ident="xpointer">
+      <datatype>
+	<dataRef key="teidata.text"/>
+      </datatype>
+    </attDef>
+    <attDef ident="encoding">
+      <datatype>
+        <dataRef key="teidata.text"/>
+      </datatype>
+    </attDef>
+    <attDef ident="accept">
+      <datatype>
+        <dataRef key="teidata.text"/>
+      </datatype>
+    </attDef>
+    <attDef
+	ident="accept-charset">
+      <datatype>
+        <dataRef key="teidata.text"/>
+      </datatype>
+    </attDef>
+    <attDef ident="accept-language">
+      <datatype>
+        <dataRef key="teidata.text"/>
+      </datatype>
+    </attDef>
+  </attList>
+</elementSpec>
+
+<elementSpec ident="fallback" ns="http://www.w3.org/2001/XInclude">
+ <content>
+   <anyElement except="http://www.w3.org/2001/XInclude"
+   minOccurs="1" maxOccurs="unlimited"/>
+   </content>
+</elementSpec>
diff --git a/P5/.gitignore b/P5/.gitignore
@@ -1 +1,6 @@
 local.mk
+repodate.xml
+
+Exemplars/isofs.xsl
+Exemplars/oNVDL/
+oNVDL/
diff --git a/P5/Exemplars/make_template.xsl b/P5/Exemplars/make_template.xsl
@@ -35,7 +35,7 @@
 	schematypens="http://purl.oclc.org/dsdl/schematron"</xsl:text>
       </xsl:processing-instruction>
         <xsl:text>&#10;</xsl:text>
-        <xsl:apply-templates select="* | text() | comment | processing-instruction()"/>
+        <xsl:apply-templates select="* | text() | comment() | processing-instruction()"/>
       </xsl:result-document>
 
       <xsl:result-document href="{$Name}.properties"> smallIcon=../icons/TEI_16.gif
@@ -49,11 +49,11 @@
 
   <xsl:template match="*">
     <xsl:copy>
-      <xsl:apply-templates select="@* | * | text() | comment | processing-instruction()"/>
+      <xsl:apply-templates select="@* | * | text() | comment() | processing-instruction()"/>
     </xsl:copy>
   </xsl:template>
 
-  <xsl:template match="@* | text() | comment | processing-instruction()">
+  <xsl:template match="@* | text() | comment() | processing-instruction()">
     <xsl:copy-of select="."/>
   </xsl:template>
 

diff --git a/P5/Exemplars/tei_enrich.odd b/P5/Exemplars/tei_enrich.odd
@@ -2984,13 +2984,9 @@ item</desc></valItem>
 </elementSpec>
 
 <elementSpec ident="layout" mode="change" module="msdescription">
-<attList>
-  <attDef ident="columns" mode="change" usage="req">
-      <datatype minOccurs="1" maxOccurs="2">
-        <rng:ref name="data.count"/>
-      </datatype>
-  </attDef>
-</attList>
+  <attList>
+    <attDef ident="columns" mode="change" usage="req"/>
+  </attList>
 </elementSpec>
 
 <elementSpec ident="msDesc" mode="change" module="msdescription">