Merged release branch for TEI P5 4.0.0

.travis.yml

@@ -19,3 +19,6 @@ before_install:
 
 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
+
+notifications:
+  slack: tei-c:3IFCBSmTvNx3j1GUMDWS9Dom

P5/Exemplars/tei_its.template

@@ -1,4 +1,4 @@
-<TEI n="Minimal with Internationalization" xmlns="http://www.tei-c.org/ns/1.0" xmlns:its="http://www.w3.org/2005/11/its"
+<TEI n="TEI with W3C ITS for internationalization" xmlns="http://www.tei-c.org/ns/1.0" xmlns:its="http://www.w3.org/2005/11/its"
   xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xlink="http://www.w3.org/1999/xlink">
   <teiHeader>
     <fileDesc>

P5/Exemplars/tei_jtei.odd

@@ -2165,10 +2165,14 @@
             </constraintSpec>
             <constraintSpec ident="jtei.sch-bibl-endpunctuation" scheme="schematron">
               <constraint>
-                <sch:rule context="tei:back/tei:div[@type eq 'bibliography']//tei:bibl">
-                  <sch:assert role="warning" test="ends-with(normalize-space(), '.')">
-                    A bibliographic entry should end with a period.
-                  </sch:assert>
+                <sch:rule context="tei:back/tei:div[@type eq 'bibliography']//tei:bibl" role="warning">
+                  <sch:report test="descendant::node()[last()][
+                    not(matches(normalize-space(), '(^|[^.?!:;,])\.$')) or
+                    preceding-sibling::node()[1]/descendant-or-self::*[last()]
+                      [matches(normalize-space(), '[.?!:;,]$')]
+                    ]">
+                    A bibliographic entry should end with a single period.
+                  </sch:report>
                 </sch:rule>
               </constraint>
             </constraintSpec>
@@ -2540,10 +2544,14 @@
                     Otherwise, move it after the closing parenthesis.
                   </sch:report>
                 </sch:rule>                
-              <sch:rule context="tei:note">
-                  <sch:assert role="warning" test="matches(normalize-space(), '[.?!]$')">
-                    A footnote should end with closing punctuation.
-                  </sch:assert>
+              <sch:rule context="tei:note" role="warning">
+                <sch:report test="descendant::node()[last()][
+                  not(matches(normalize-space(), '(^|[^.?!:;,])[.?!]$')) or
+                  preceding-sibling::node()[1]/descendant-or-self::*[last()]
+                      [matches(normalize-space(), '[.?!:;,]$')]
+                  ]">
+                  A footnote should end a with a single closing punctuation character.
+                  </sch:report>
                 </sch:rule>
               </constraint>
             </constraintSpec>
@@ -3175,6 +3183,22 @@
               </sch:rule>
             </constraint>
           </constraintSpec>
+          <constraintSpec ident="jtei.sch-nonbreakingspace" scheme="schematron">
+            <constraint>
+              <sch:rule role="warning" context="text()[not(ancestor::tei:eg|ancestor::eg:egXML|ancestor::tei:code|ancestor::tei:tag)]">
+                <sch:report test="matches(., '&#160;')" sqf:fix="nonbreakingspace.remove">
+                  This text contains a non-breaking space character. Please consider changing this to a normal space character.
+                </sch:report>
+                <sqf:fix id="nonbreakingspace.remove">
+                  <sqf:description>
+                    <sqf:title>Normalize non-breaking space to normal space character.</sqf:title>
+                  </sqf:description>
+                  <!-- using XPath replace(), as sqf:stringReplace has problems matching literal character entities -->
+                  <sqf:replace match="." select="replace(., '&#160;', '&#32;')"/>
+                </sqf:fix>
+              </sch:rule>
+            </constraint>
+          </constraintSpec>
           <constraintSpec ident="jtei.sch-localLinkTarget" scheme="schematron">
             <constraint>
               <sch:rule context="@*[self::attribute(corresp)|self::attribute(target)|self::attribute(from)|self::attribute(to)|self::attribute(ref)|self::attribute(rendition)|self::attribute(resp)|self::attribute(source)][not(ancestor::eg:egXML)][some $i in tokenize(., '\s+') satisfies starts-with($i, '#')]">

P5/Exemplars/tei_math.template

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<TEI n="Minimal with Math" xmlns="http://www.tei-c.org/ns/1.0"
+<TEI n="TEI with MathML" xmlns="http://www.tei-c.org/ns/1.0"
      xmlns:math="http://www.w3.org/1998/Math/MathML">
   <teiHeader>
     <fileDesc>

P5/Exemplars/tei_svg.template

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<TEI n="Minimal with SVG" 
+<TEI n="TEI with SVG" 
     xmlns="http://www.tei-c.org/ns/1.0"
     xmlns:svg="http://www.w3.org/2000/svg">
   <teiHeader>

P5/Makefile

@@ -84,7 +84,7 @@ html-web.stamp:  check.stamp p5.xml  Utilities/guidelines.xsl.model
 		"s+http://www.tei-c.org/release/xml/tei/stylesheet+${XSL}+; \
 		 s+/usr/share/xml/tei/stylesheet+${XSL}+;" \
 		Utilities/guidelines.xsl.model > Utilities/guidelines.xsl
-	-if [ -n ${GOOGLEANALYTICS} ] ; then curl -sL http://www.tei-c.org/ | sed 's/content="text\/html"/content="text\/html; charset=utf-8"/' | xmllint --html --noent --dropdtd --xmlout - > Utilities/teic-index.xml 2>/dev/null;fi
+	-if [ -n ${GOOGLEANALYTICS} ] ; then curl -sL https://tei-c.org/ | sed 's/content="text\/html"/content="text\/html; charset=utf-8"/' | xmllint --html --noent --dropdtd --xmlout - > Utilities/teic-index.xml 2>/dev/null;fi
 	@# for each language, create a subdirectory and pre-populate it with CSS, source, and web navigation stuff
 	for i in $(ALLLANGUAGES) ;do \
 		mkdir -p Guidelines-web/$$i/html; \

P5/ReleaseNotes/readme-3.2.0.xml

@@ -14,7 +14,7 @@ See the file COPYING.txt for details
       </titleStmt>
       <editionStmt>
         <edition>
-          <date when="2016-12-15">Monday, 10 July 2017</date>
+          <date when="2017-07-10">Monday, 10 July 2017</date>
         </edition>
       </editionStmt>
       <publicationStmt>