Release 4.1.0.

TEIC · Aug 19, 2020 · b414ba5 · b414ba5
2 parents ccd19b0 + d6dc280
commit b414ba5
Show file tree

Hide file tree

Showing 169 changed files with 7,417 additions and 15,415 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,6 @@ p5odds.mess*
 
 p5examples*
 stripspace*
+
+# Oxygen project files
+*.xpr
diff --git a/P5/Exemplars/isofs.odd b/P5/Exemplars/isofs.odd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TEI xml:lang="en"  xmlns="http://www.tei-c.org/ns/1.0"
- xmlns:rng="http://relaxng.org/ns/structure/1.0" n="isofs">
+ n="isofs">
    <teiHeader>
       <fileDesc>
          <titleStmt>

diff --git a/P5/Exemplars/tei_all.odd b/P5/Exemplars/tei_all.odd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TEI xml:lang="en"
      xmlns="http://www.tei-c.org/ns/1.0"
-     xmlns:rng="http://relaxng.org/ns/structure/1.0">
+    >
    <teiHeader>
       <fileDesc>
          <titleStmt>

diff --git a/P5/Exemplars/tei_allPlus.odd b/P5/Exemplars/tei_allPlus.odd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TEI xmlns:xi="http://www.w3.org/2001/XInclude"
      xmlns="http://www.tei-c.org/ns/1.0"
-     xmlns:rng="http://relaxng.org/ns/structure/1.0"
+
      xml:lang="en">
   <teiHeader>
     <fileDesc>

diff --git a/P5/Exemplars/tei_corpus.odd b/P5/Exemplars/tei_corpus.odd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TEI xmlns="http://www.tei-c.org/ns/1.0"
-     xmlns:rng="http://relaxng.org/ns/structure/1.0"
+
      xml:lang="en"  >
   <teiHeader>
     <fileDesc>

diff --git a/P5/Exemplars/tei_dictionaries.odd b/P5/Exemplars/tei_dictionaries.odd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TEI xml:lang="en" xmlns="http://www.tei-c.org/ns/1.0"
-  xmlns:rng="http://relaxng.org/ns/structure/1.0">
+ >
   <teiHeader>
     <fileDesc>
       <titleStmt>

diff --git a/P5/Exemplars/tei_docs.odd b/P5/Exemplars/tei_docs.odd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TEI xml:lang="en"
      xmlns="http://www.tei-c.org/ns/1.0"
-     xmlns:rng="http://relaxng.org/ns/structure/1.0">
+    >
    <teiHeader>
       <fileDesc>
          <titleStmt>

diff --git a/P5/Exemplars/tei_drama.odd b/P5/Exemplars/tei_drama.odd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TEI xml:lang="en" xmlns="http://www.tei-c.org/ns/1.0"
-  xmlns:rng="http://relaxng.org/ns/structure/1.0">
+ >
   <teiHeader>
     <fileDesc>
       <titleStmt>

diff --git a/P5/Exemplars/tei_enrich.odd b/P5/Exemplars/tei_enrich.odd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TEI xmlns="http://www.tei-c.org/ns/1.0"
      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-     xmlns:rng="http://relaxng.org/ns/structure/1.0"
+
      xmlns:xi="http://www.w3.org/2001/XInclude"
      xmlns:s="http://www.ascc.net/xml/schematron"
      xml:lang="en"

diff --git a/P5/Exemplars/tei_jtei.odd b/P5/Exemplars/tei_jtei.odd
@@ -332,7 +332,7 @@
                 <bibl xml:id="bowers12">
                   <author>Bowers, John</author>. <date>2012</date>. 
                   <title level="a">The Logic of Annotated Portfolios: Communicating the 
-                    Value of <soCalled>Research through Design.</soCalled></title> In 
+                    Value of <soCalled>Research through Design.</soCalled></title>  
                   <title level="j">Proceedings of the Designing Interactive Systems 
                     Conference</title>, <biblScope unit="page">68–77</biblScope>. 
                   <title level="s">DIS ’12</title>. <pubPlace>New York</pubPlace>:
@@ -2176,6 +2176,19 @@
                 </sch:rule>
               </constraint>
             </constraintSpec>
+            <constraintSpec ident="jtei.sch-title-journal-CMOS" scheme="schematron">
+              <constraint>
+                <sch:rule context="tei:bibl/tei:title[@level='j']"
+                  role="warning">
+                  <sch:report test="self::*[preceding-sibling::*[1]/self::tei:title[@level='a']]
+                    [not(preceding-sibling::node()[normalize-space()][1][matches(normalize-space(), '[.,!?]$')])]
+                    ">
+                    An analytic title and a journal title in a bibliographic entry should only be separated by a comma or a period (or the end punctuation of the analytic title). 
+                  </sch:report>
+                </sch:rule>
+              </constraint>
+            </constraintSpec>
+
             <attList>
               <attDef ident="type" mode="delete"/>
             </attList>
@@ -2351,7 +2364,7 @@
             <desc xml:lang="en" versionDate="2015-03-03"> The <gi>emph</gi> element is used for emphasized text, and will be rendered in
               italics. </desc>
           </elementSpec>
-          <elementSpec ident="figure" mode="change" xmlns:rng="http://relaxng.org/ns/structure/1.0">
+          <elementSpec ident="figure" mode="change">
             <gloss xml:lang="en" versionDate="2015-03-03">figure</gloss>
             <desc xml:lang="en" versionDate="2015-03-03">groups elements representing or containing graphic information
               such as a graphic illustration, or a block of example code. Figure must contain
@@ -2577,7 +2590,7 @@
             <constraintSpec ident="jtei.sch-head-number" scheme="schematron">
               <constraint>
                 <sch:rule context="tei:head">
-                  <sch:report test="matches(., '^\s*((figure|table|example|section) )?\d', 'i')">
+                  <sch:report test="matches(., '^\s*(((figure|fig\.|table|example|ex\.|section) )\d|\d+\.\d?)', 'i')">
                     Headings are numbered and labeled automatically, please remove the hard-coded label from the text.
                   </sch:report>
                 </sch:rule>
@@ -3231,7 +3244,7 @@
                   <sqf:description>
                     <sqf:title>Remove quotation marks.</sqf:title>
                   </sqf:description>
-                  <sqf:stringReplace regex="{concat('^', $double.quotes, '|', $double.quotes, '$')}"></sqf:stringReplace>
+                  <sqf:replace match="text()" select="replace(., concat('^', $double.quotes, '|', $double.quotes, '$'), '')"/>
                 </sqf:fix>
               </sch:rule>
             </constraint>

diff --git a/P5/Exemplars/tei_lite.odd b/P5/Exemplars/tei_lite.odd
@@ -7,7 +7,7 @@ $Date$
 $Id$
 -->
 <TEI xmlns="http://www.tei-c.org/ns/1.0"
-     xmlns:rng="http://relaxng.org/ns/structure/1.0"
+
      xml:lang="en">
   <teiHeader>
     <fileDesc>

diff --git a/P5/Exemplars/tei_math.odd b/P5/Exemplars/tei_math.odd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TEI xml:lang="en" xmlns="http://www.tei-c.org/ns/1.0"
-  xmlns:rng="http://relaxng.org/ns/structure/1.0">
+ >
   <teiHeader>
     <fileDesc>
       <titleStmt>

diff --git a/P5/Exemplars/tei_minimal-new.odd b/P5/Exemplars/tei_minimal-new.odd
diff --git a/P5/Exemplars/tei_minimal.odd b/P5/Exemplars/tei_minimal.odd
@@ -1,69 +1,84 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<TEI xml:lang="en" xmlns="http://www.tei-c.org/ns/1.0"
-  xmlns:rng="http://relaxng.org/ns/structure/1.0">
+<TEI xmlns="http://www.tei-c.org/ns/1.0">
   <teiHeader>
     <fileDesc>
       <titleStmt>
-        <title>TEI with minimal setup</title>
-        <author>Sebastian Rahtz</author>
+        <title>TEI Minimal</title>
+        <author>James Cummings</author>
       </titleStmt>
       <publicationStmt>
-	<publisher>TEI Consortium</publisher>
+        <publisher>TEI Consortium</publisher>
         <availability status="free">
-     <licence target="http://creativecommons.org/licenses/by-sa/3.0/"> Distributed under a Creative
-      Commons Attribution-ShareAlike 3.0 Unported License </licence>
-     <licence target="http://www.opensource.org/licenses/BSD-2-Clause">
-      <p>Copyright 2013 TEI Consortium.</p>
-      <p>All rights reserved.</p>
-      <p>Redistribution and use in source and binary forms, with or without modification, are
-       permitted provided that the following conditions are met:</p>
-      <list>
-       <item>Redistributions of source code must retain the above copyright notice, this list of
-        conditions and the following disclaimer.</item>
-       <item>Redistributions in binary form must reproduce the above copyright notice, this list of
-        conditions and the following disclaimer in the documentation and/or other materials provided
-        with the distribution.</item>
-      </list>
-      <p>This software is provided by the copyright holders and contributors "as is" and any express
-       or implied warranties, including, but not limited to, the implied warranties of
-       merchantability and fitness for a particular purpose are disclaimed. In no event shall the
-       copyright holder or contributors be liable for any direct, indirect, incidental, special,
-       exemplary, or consequential damages (including, but not limited to, procurement of substitute
-       goods or services; loss of use, data, or profits; or business interruption) however caused
-       and on any theory of liability, whether in contract, strict liability, or tort (including
-       negligence or otherwise) arising in any way out of the use of this software, even if advised
-       of the possibility of such damage.</p>
-     </licence>
-     <p>TEI material can be licensed differently depending on the use you intend to make of it.
-      Hence it is made available under both the CC+BY and BSD-2 licences. The CC+BY licence is
-      generally appropriate for usages which treat TEI content as data or documentation. The BSD-2
-      licence is generally appropriate for usage of TEI content in a software environment. For
-      further information or clarification, please contact the <ref target="mailto:[email protected]"
-       >TEI Consortium</ref>. </p>
+          <licence target="http://creativecommons.org/licenses/by-sa/3.0/"> Distributed under a Creative Commons
+            Attribution-ShareAlike 3.0 Unported License </licence>
+          <licence target="http://www.opensource.org/licenses/BSD-2-Clause">
+            <p>Copyright 2013 TEI Consortium.</p>
+            <p>All rights reserved.</p>
+            <p>Redistribution and use in source and binary forms, with or without modification, are permitted provided that
+              the following conditions are met:</p>
+            <list>
+              <item>Redistributions of source code must retain the above copyright notice, this list of conditions and the
+                following disclaimer.</item>
+              <item>Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
+                the following disclaimer in the documentation and/or other materials provided with the
+                distribution.</item>
+            </list>
+            <p>This software is provided by the copyright holders and contributors "as is" and any express or implied
+              warranties, including, but not limited to, the implied warranties of merchantability and fitness for a
+              particular purpose are disclaimed. In no event shall the copyright holder or contributors be liable for any
+              direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to,
+              procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however
+              caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence
+              or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such
+              damage.</p>
+          </licence>
+          <p>TEI material can be licensed differently depending on the use you intend to make of it. Hence it is made
+            available under both the CC+BY and BSD-2 licences. The CC+BY licence is generally appropriate for usages which
+            treat TEI content as data or documentation. The BSD-2 licence is generally appropriate for usage of TEI content
+            in a software environment. For further information or clarification, please contact the <ref
+              target="mailto:[email protected]">TEI Consortium</ref>. </p>
         </availability>
       </publicationStmt>
       <sourceDesc>
-        <p>Written from scratch.</p>
+        <p>Created from scratch by James Cummings, but looking at previous tei_minimal and tei_bare exemplars by SPQR and
+          LR.</p>
       </sourceDesc>
     </fileDesc>
   </teiHeader>
   <text>
     <body>
       <head>A Minimal TEI Customization</head>
-      <p>This is as minimal a TEI customization as is possible. That is, this
-        ODD file is just about as simple as can be. It does not create a minimal
-        TEI schema, of course. Adding various <gi>elementSpec</gi>,
-          <gi>classSpec</gi>, and <gi>macroSpec</gi> elements to this
-        customization file could make the resulting schema more minimal, but
-        would make this customization more complicated. E.g., the customization
-          <name>tei_bare</name> produces a much more minimal schema than the one
-        created here.</p>
+
+      <p>This TEI ODD defines a TEI customization that is as minimal as possible and the schema generated from it will validate
+        a document that is minimally valid against the TEI scheme. It includes only the ten required elements:
+        <list rend="numbered">
+          <item><gi>teiHeader</gi> from the header module to store required metadata</item>
+          <item><gi>fileDesc</gi> from the header module to record information about this file</item>
+          <item><gi>titleStmt</gi> from the header module to record information about the title</item>
+          <item><gi>publicationStmt</gi> from the header module to detail how it is published</item>
+          <item><gi>sourceDesc</gi> from the header module to record where it is from</item>
+          <item><gi>p</gi> from the core module for use in the header and the body</item>
+          <item><gi>title</gi> from the core module for use in the titleStmt</item>
+          <item><gi>TEI</gi> from the textstructure module because what is a TEI file without that?</item>
+          <item><gi>text</gi> from the textstructure module to hold some text</item>
+          <item><gi>body</gi> from the textstructure module as a place to put that text</item>
+        </list>
+      </p>
       <schemaSpec ident="tei_minimal" start="TEI">
-        <moduleRef key="header"/>
-        <moduleRef key="core"/>
+
+        <!-- required minimal header elements -->
+        <moduleRef key="header" include="teiHeader fileDesc titleStmt publicationStmt sourceDesc"/>
+
+        <!-- required core elements (p and title for use in titleStmt) -->
+        <moduleRef key="core" include="p title"/>
+
+        <!-- required textstructure elements (TEI, text, and body) -->
+        <moduleRef key="textstructure" include="TEI text body"/>
+
+        <!-- required module tei instantiates lots of classes used for further expansion of this odd -->
         <moduleRef key="tei"/>
-        <moduleRef key="textstructure"/>
-        <elementSpec ident="teiCorpus" mode="delete" module="core"/>
+
+
       </schemaSpec>
     </body>
   </text>

diff --git a/P5/Exemplars/tei_ms.odd b/P5/Exemplars/tei_ms.odd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TEI xml:lang="en" n="testms"
-     xmlns:rng="http://relaxng.org/ns/structure/1.0"
+
      xmlns="http://www.tei-c.org/ns/1.0" >
   <teiHeader>
     <fileDesc>

diff --git a/P5/Exemplars/tei_odds.odd b/P5/Exemplars/tei_odds.odd
@@ -3,7 +3,7 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns="http://www.tei-c.org/ns/1.0" 
   xmlns:teix="http://www.tei-c.org/ns/Examples" 
-  xmlns:rng="http://relaxng.org/ns/structure/1.0">
+ >
   <teiHeader>
     <fileDesc>
       <titleStmt>