Skip to content
Permalink
Browse files

Merge branch 'release-3.4.0'

  • Loading branch information...
raffazizzi committed Jul 23, 2018
2 parents f4d8439 + a0deb72 commit 1fa0b547491ff626b6cd0c75712542dc1869528d
Showing with 2,363 additions and 1,670 deletions.
  1. +138 −0 Documents/pureODD/howtoChain-fr.xml
  2. +2 −2 P5/Exemplars/Makefile
  3. +30 −31 P5/Exemplars/make_template.xsl
  4. +22 −20 P5/Exemplars/tei_bare.odd
  5. +38 −0 P5/Exemplars/tei_customization.template
  6. +33 −7 P5/Exemplars/tei_jtei.odd
  7. +2 −38 P5/Exemplars/tei_odds.odd
  8. +2 −2 P5/Makefile
  9. +1 −1 P5/Query/datatypes.xql
  10. +3 −0 P5/ReleaseNotes/ChangeLog
  11. +111 −0 P5/ReleaseNotes/readme-3.4.0.xml
  12. +1 −1 P5/Source/{Specs → Defunct}/macro.anyXML.xml
  13. +1 −1 P5/Source/{Specs → Defunct}/macro.schemaPattern.xml
  14. +35 −12 P5/Source/Guidelines/en/AB-About.xml
  15. +186 −27 P5/Source/Guidelines/en/AI-AnalyticMechanisms.xml
  16. +11 −2 P5/Source/Guidelines/en/BIB-Bibliography.xml
  17. +24 −19 P5/Source/Guidelines/en/CC-LanguageCorpora.xml
  18. +12 −7 P5/Source/Guidelines/en/CE-CertaintyResponsibility.xml
  19. +3 −3 P5/Source/Guidelines/en/CH-LanguagesCharacterSets.xml
  20. +105 −85 P5/Source/Guidelines/en/CO-CoreElements.xml
  21. +17 −18 P5/Source/Guidelines/en/DI-PrintDictionaries.xml
  22. +18 −16 P5/Source/Guidelines/en/DR-PerformanceTexts.xml
  23. +22 −17 P5/Source/Guidelines/en/DS-DefaultTextStructure.xml
  24. +12 −9 P5/Source/Guidelines/en/FM1-IntroductoryNote.xml
  25. +34 −239 P5/Source/Guidelines/en/FS-FeatureStructures.xml
  26. +15 −13 P5/Source/Guidelines/en/FT-TablesFormulaeGraphics.xml
  27. +20 −16 P5/Source/Guidelines/en/GD-GraphsNetworksTrees.xml
  28. +64 −20 P5/Source/Guidelines/en/HD-Header.xml
  29. BIN P5/Source/Guidelines/en/Images/da_vinci_camera_obscura.jpg
  30. BIN P5/Source/Guidelines/en/Images/da_vinci_camera_obscura.zip
  31. BIN P5/Source/Guidelines/en/Images/facs-fig3.jpg
  32. +30 −26 P5/Source/Guidelines/en/MS-ManuscriptDescription.xml
  33. +18 −15 P5/Source/Guidelines/en/ND-NamesDates.xml
  34. +68 −43 P5/Source/Guidelines/en/PH-PrimarySources.xml
  35. +18 −24 P5/Source/Guidelines/en/SA-LinkingSegmentationAlignment.xml
  36. +11 −14 P5/Source/Guidelines/en/ST-Infrastructure.xml
  37. +21 −12 P5/Source/Guidelines/en/TC-CriticalApparatus.xml
  38. +46 −47 P5/Source/Guidelines/en/TD-DocumentationElements.xml
  39. +23 −21 P5/Source/Guidelines/en/TS-TranscriptionsofSpeech.xml
  40. +34 −34 P5/Source/Guidelines/en/USE.xml
  41. +141 −199 P5/Source/Guidelines/en/VE-Verse.xml
  42. +98 −80 P5/Source/Guidelines/en/WD-NonStandardCharacters.xml
  43. +7 −6 P5/Source/Specs/TEI.xml
  44. +1 −1 P5/Source/Specs/ab.xml
  45. +6 −6 P5/Source/Specs/abbr.xml
  46. +1 −1 P5/Source/Specs/abstract.xml
  47. +3 −3 P5/Source/Specs/accMat.xml
  48. +3 −3 P5/Source/Specs/acquisition.xml
  49. +5 −5 P5/Source/Specs/activity.xml
  50. +2 −2 P5/Source/Specs/actor.xml
  51. +4 −4 P5/Source/Specs/addName.xml
  52. +1 −1 P5/Source/Specs/addSpan.xml
  53. +3 −3 P5/Source/Specs/addrLine.xml
  54. +7 −7 P5/Source/Specs/address.xml
  55. +5 −5 P5/Source/Specs/affiliation.xml
  56. +3 −3 P5/Source/Specs/age.xml
  57. +1 −3 P5/Source/Specs/alt.xml
  58. +2 −2 P5/Source/Specs/altIdent.xml
  59. +1 −1 P5/Source/Specs/am.xml
  60. +1 −3 P5/Source/Specs/anchor.xml
  61. +2 −3 P5/Source/Specs/anyElement.xml
  62. +55 −0 P5/Source/Specs/att.ascribed.directed.xml
  63. +2 −2 P5/Source/Specs/att.datable.iso.xml
  64. +2 −2 P5/Source/Specs/att.lexicographic.xml
  65. +17 −9 P5/Source/Specs/att.linguistic.xml
  66. +3 −3 P5/Source/Specs/att.patternReplacement.xml
  67. +1 −1 P5/Source/Specs/att.spanning.xml
  68. +8 −4 P5/Source/Specs/att.written.xml
  69. +1 −3 P5/Source/Specs/attRef.xml
  70. +1 −0 P5/Source/Specs/authority.xml
  71. +1 −3 P5/Source/Specs/binary.xml
  72. +3 −4 P5/Source/Specs/cRefPattern.xml
  73. +1 −3 P5/Source/Specs/caesura.xml
  74. +1 −3 P5/Source/Specs/catRef.xml
  75. +1 −3 P5/Source/Specs/cb.xml
  76. +1 −1 P5/Source/Specs/classRef.xml
  77. +1 −1 P5/Source/Specs/constraint.xml
  78. +2 −2 P5/Source/Specs/constraintSpec.xml
  79. +76 −39 P5/Source/Specs/content.xml
  80. +1 −3 P5/Source/Specs/damageSpan.xml
  81. +2 −2 P5/Source/Specs/dataFacet.xml
  82. +1 −1 P5/Source/Specs/dataRef.xml
  83. +1 −3 P5/Source/Specs/default.xml
  84. +1 −3 P5/Source/Specs/delSpan.xml
  85. +1 −0 P5/Source/Specs/distributor.xml
  86. +2 −3 P5/Source/Specs/div1.xml
  87. +1 −1 P5/Source/Specs/elementRef.xml
  88. +1 −1 P5/Source/Specs/empty.xml
  89. +1 −0 P5/Source/Specs/entry.xml
  90. +1 −3 P5/Source/Specs/equiv.xml
  91. +1 −0 P5/Source/Specs/figure.xml
  92. +4 −4 P5/Source/Specs/fsdDecl.xml
  93. +1 −3 P5/Source/Specs/fsdLink.xml
  94. +1 −1 P5/Source/Specs/gap.xml
  95. +1 −3 P5/Source/Specs/gb.xml
  96. +2 −2 P5/Source/Specs/gi.xml
  97. +1 −1 P5/Source/Specs/handDesc.xml
  98. +1 −3 P5/Source/Specs/handShift.xml
  99. +1 −0 P5/Source/Specs/hom.xml
  100. +1 −3 P5/Source/Specs/iff.xml
  101. +1 −1 P5/Source/Specs/kinesic.xml
  102. +1 −3 P5/Source/Specs/lacunaEnd.xml
  103. +1 −3 P5/Source/Specs/lacunaStart.xml
  104. +23 −4 P5/Source/Specs/layout.xml
  105. +1 −3 P5/Source/Specs/lb.xml
  106. +1 −0 P5/Source/Specs/lbl.xml
  107. +1 −3 P5/Source/Specs/link.xml
  108. +1 −1 P5/Source/Specs/macro.limitedContent.xml
  109. +1 −1 P5/Source/Specs/macro.paraContent.xml
  110. +1 −1 P5/Source/Specs/macro.phraseSeq.limited.xml
  111. +1 −1 P5/Source/Specs/macro.phraseSeq.xml
  112. +1 −1 P5/Source/Specs/macro.specialPara.xml
  113. +2 −1 P5/Source/Specs/macro.xtext.xml
  114. +2 −2 P5/Source/Specs/macroRef.xml
  115. +19 −26 P5/Source/Specs/macroSpec.xml
  116. +2 −2 P5/Source/Specs/metSym.xml
  117. +1 −3 P5/Source/Specs/milestone.xml
  118. +1 −1 P5/Source/Specs/model.editorialDeclPart.xml
  119. +1 −1 P5/Source/Specs/model.encodingDescPart.xml
  120. +1 −1 P5/Source/Specs/model.physDescPart.xml
  121. +1 −1 P5/Source/Specs/model.profileDescPart.xml
  122. +1 −1 P5/Source/Specs/model.sourceDescPart.xml
  123. +2 −4 P5/Source/Specs/move.xml
  124. +3 −3 P5/Source/Specs/namespace.xml
  125. +1 −3 P5/Source/Specs/numeric.xml
  126. +1 −1 P5/Source/Specs/param.xml
  127. +83 −0 P5/Source/Specs/path.xml
  128. +2 −4 P5/Source/Specs/pause.xml
  129. +1 −3 P5/Source/Specs/pb.xml
  130. +15 −0 P5/Source/Specs/pc.xml
  131. +1 −3 P5/Source/Specs/ptr.xml
  132. +1 −0 P5/Source/Specs/publisher.xml
  133. +1 −1 P5/Source/Specs/q.xml
  134. +1 −1 P5/Source/Specs/recording.xml
  135. +3 −3 P5/Source/Specs/recordingStmt.xml
  136. +1 −1 P5/Source/Specs/redo.xml
  137. +1 −3 P5/Source/Specs/refState.xml
  138. +10 −12 P5/Source/Specs/relation.xml
  139. +1 −2 P5/Source/Specs/rendition.xml
  140. +1 −1 P5/Source/Specs/said.xml
  141. +1 −2 P5/Source/Specs/seal.xml
  142. +1 −3 P5/Source/Specs/sealDesc.xml
  143. +1 −1 P5/Source/Specs/shift.xml
  144. +2 −2 P5/Source/Specs/sic.xml
  145. +1 −1 P5/Source/Specs/sp.xml
  146. +1 −1 P5/Source/Specs/spGrp.xml
  147. +1 −3 P5/Source/Specs/specDesc.xml
  148. +1 −3 P5/Source/Specs/specGrpRef.xml
  149. +1 −1 P5/Source/Specs/stage.xml
  150. +2 −1 P5/Source/Specs/state.xml
  151. +2 −1 P5/Source/Specs/surface.xml
  152. +1 −3 P5/Source/Specs/symbol.xml
  153. +4 −4 P5/Source/Specs/tagUsage.xml
  154. +2 −3 P5/Source/Specs/tagsDecl.xml
  155. +8 −1 P5/Source/Specs/teiCorpus.xml
  156. +0 −19 P5/Source/Specs/teidata.percentage.xml
  157. +39 −4 P5/Source/Specs/teidata.point.xml
  158. +1 −1 P5/Source/Specs/textNode.xml
  159. +1 −3 P5/Source/Specs/then.xml
  160. +2 −2 P5/Source/Specs/titleStmt.xml
  161. +1 −1 P5/Source/Specs/u.xml
  162. +1 −1 P5/Source/Specs/undo.xml
  163. +54 −0 P5/Source/Specs/unit.xml
  164. +1 −3 P5/Source/Specs/variantEncoding.xml
  165. +1 −1 P5/Source/Specs/vocal.xml
  166. +68 −18 P5/Source/Specs/w.xml
  167. +1 −3 P5/Source/Specs/when.xml
  168. +1 −3 P5/Source/Specs/witEnd.xml
  169. +1 −3 P5/Source/Specs/witStart.xml
  170. +1 −1 P5/Source/Specs/writing.xml
  171. +22 −1 P5/Source/Specs/zone.xml
  172. +3 −23 P5/Test/detest.odd
  173. +0 −8 P5/Test/expected-results/detest.log
  174. +0 −16 P5/Utilities-1/identlist.xsl
  175. +121 −23 P5/Utilities/{TEI_to_odd4odds.xslt → TEI-to-tei_customization.xslt}
  176. +1 −1 P5/Utilities/expand.xsl
  177. +6 −6 P5/Utilities/guidelines.xsl.model
  178. +1 −1 P5/VERSION
  179. +1 −1 P5/catalog.p5
  180. +60 −13 P5/expected-results/ValidatorLog.xml
  181. +0 −15 P5/p5odds-examples.odd
  182. +18 −57 P5/p5odds.odd
  183. +2 −0 write_changelog

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -103,12 +103,12 @@ tei_customization.rng: tei_customization.odd
@echo Validate XSD using Jing ...
${JING} $*.xsd $*.tei

tei_customization.odd: ../Utilities/TEI_to_odd4odds.xslt ../p5subset.xml
tei_customization.odd: ../Utilities/TEI-to-tei_customization.xslt ../p5subset.xml
# Note that the "../p5subset.xml" in above line is the same as the definition
# of ${SOURCE}, but you can't use a variable as prerequisite (at least, it
# didn't work for me. :-) Syd, 2017-11-05
@echo generating tei_customization.odd from p5subset
$(SAXON) -s:${SOURCE} -xsl:../Utilities/TEI_to_odd4odds.xslt -o:tei_customization.odd
$(SAXON) -s:${SOURCE} -xsl:../Utilities/TEI-to-tei_customization.xslt -o:tei_customization.odd

dist: schemas docschemas
rm -rf tei[0-9]*.xml ../release/tei-p5-exemplars
@@ -1,61 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet xmlns="http://www.tei-c.org/ns/1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xpath-default-namespace="http://www.tei-c.org/ns/1.0"
version="2.0">
<xsl:stylesheet xmlns="http://www.tei-c.org/ns/1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xpath-default-namespace="http://www.tei-c.org/ns/1.0" version="2.0">
<xsl:param name="file"/>
<xsl:template name="main">
<xsl:for-each select="doc(concat($file,'.template'))">
<xsl:for-each select="doc(concat($file, '.template'))">
<xsl:variable name="Name">
<xsl:choose>
<xsl:when test="*/processing-instruction()[name()='name']">
<xsl:value-of select="*/processing-instruction()[name()='name']"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="/*/@n"/>
</xsl:otherwise>
</xsl:choose>
<xsl:choose>
<xsl:when test="*/processing-instruction()[name() = 'name']">
<xsl:value-of select="*/processing-instruction()[name() = 'name']"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="/*/@n"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:message>Create template <xsl:value-of select="$Name"/> from <xsl:value-of select="$file"/></xsl:message>
<xsl:if test="normalize-space($Name) = ''">
<xsl:message>ERROR: The template <xsl:value-of select="$file"/>.template has no name; it
needs the @n attribute on its root element before it can be turned into a working
template.</xsl:message>
</xsl:if>
<xsl:message>Create template <xsl:value-of select="$Name"/> from <xsl:value-of select="$file"
/></xsl:message>
<xsl:result-document href="{$Name}.xml" indent="yes">
<xsl:processing-instruction name="xml-model">
<xsl:processing-instruction name="xml-model">
<xsl:text>href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/</xsl:text>
<xsl:value-of select="$file"/>
<xsl:text>.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"</xsl:text>
</xsl:processing-instruction>
<xsl:text>&#10;</xsl:text>
<xsl:processing-instruction name="xml-model">
<xsl:text>&#10;</xsl:text>
<xsl:processing-instruction name="xml-model">
<xsl:text>href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/</xsl:text>
<xsl:value-of select="$file"/>
<xsl:text>.rng" type="application/xml"
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:result-document>
<xsl:text>&#10;</xsl:text>
<xsl:apply-templates select="* | text() | comment | processing-instruction()"/>
</xsl:result-document>

<xsl:result-document href="{$Name}.properties">
smallIcon=../icons/TEI_16.gif
bigIcon=../icons/TEI_48.png
</xsl:result-document>
<xsl:result-document href="{$Name}.properties"> smallIcon=../icons/TEI_16.gif
bigIcon=../icons/TEI_48.png </xsl:result-document>
</xsl:for-each>
</xsl:template>
<xsl:template match="/*/processing-instruction()[name()='name']"/>

<xsl:template match="/*/processing-instruction()[name() = 'name']"/>

<xsl:template match="/*/@n"/>

<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>

</xsl:stylesheet>



@@ -97,37 +97,39 @@ within it is the <gi>fileDesc</gi>, which contains only the following elements:
</div>
<div>
<head>Class modifications</head>
<p>Finally three of the TEI attribute
classes are simplified. The attributes xml:space, rend, and xml:base
are removed from the att.global class, so that this now makes
available to all elements only the following attributes:
<att>xml:id</att>, <att>n</att>, and
<att>xml:lang</att>.
</p>
<p>Three un-needed attributes are removed from the att.divLike class so that
the <gi>div</gi> element inherits from it only
the following attributes: <att>xml:id</att>,
<att>n</att>,
<att>xml:lang</att>.
The attribute class <ident>att.declaring</ident> is deleted
completely, so that none of its members inherit the <att>decls</att>
attribute defined in the unmodified TEI.</p>
<p>Seven of the TEI attribute
classes are simplified. The attributes <code>xml:space</code>, and <code>xml:base</code>
are removed from the <code>att.global class</code>, so that this now makes
available to all member elements only the following attributes:
<att>xml:id</att>, <att>n</att>, and <att>xml:lang</att>.</p>
<p>From <code>att.global.rendition</code> the attributes
<code>rend</code>, and <code>style</code> are removed, leaving
<code>rendition</code> as the sole attribute within this class.</p>
<p>Finally, the classes <code>att.fragmentable</code>, <code>att.divLike</code>,
<code>att.declaring</code>, <code>att.global.source</code>, and <code>att.global.responsibility</code>
are removed completely, so that none of its
members inherit the <code>part</code>, <code>org</code>, <code>sample</code>, <code>decls</code>,
<code>source</code>, <code>cert</code>, nor <code>resp</code>
attributes defined in the unmodified TEI.</p>
<specGrp xml:id="classmods">
<classSpec ident="att.global" mode="change" module="tei" type="atts">
<attList>
<attDef ident="xml:space" mode="delete"/>
<attDef ident="rend" mode="delete"/>
<attDef ident="xml:base" mode="delete"/>
</attList>
</classSpec>
<classSpec ident="att.fragmentable" mode="delete" module="tei" type="atts"/>
<classSpec ident="att.divLike" mode="change" module="tei" type="atts">
<classSpec ident="att.global.rendition" mode="change" module="tei" type="atts">
<attList>
<attDef ident="org" mode="delete"/>
<attDef ident="sample" mode="delete"/>
<attDef ident="rend" mode="delete"/>
<attDef ident="style" mode="delete"/>
</attList>
</classSpec>
<classSpec ident="att.fragmentable" mode="delete" module="tei" type="atts"/>
<classSpec ident="att.divLike" mode="delete" module="tei" type="atts"/>
<classSpec ident="att.declaring" mode="delete" module="tei" type="atts"/>
<classSpec ident="att.written" mode="delete" module="tei" type="atts"/>
<classSpec ident="att.global.source" mode="delete" module="tei" type="atts"/>
<classSpec ident="att.global.responsibility" mode="delete" module="tei" type="atts"/>
</specGrp>
</div>
<div>
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<TEI n="TEI for writing TEI Customizations" xmlns="http://www.tei-c.org/ns/1.0" xml:lang="en">
<teiHeader>
<fileDesc>
<titleStmt>
<title><!-- name of markup language being defined goes here --></title>
<author><!-- primary author --></author>
<editor><!-- editor or secondary author --></editor>
</titleStmt>
<publicationStmt>
<!-- put <publisher>, <distributor>, or <authority> here -->
<!-- put <availability> and other optional details about-->
<!-- the publisher, distributor, or release authority here -->
</publicationStmt>
<sourceDesc><p>born digital</p></sourceDesc>
</fileDesc>
</teiHeader>
<text>
<body>
<head><!-- name of markup language being defined can be repeated here --></head>
<p><!-- prose description of, and explanation of, markup language goes here;
you can use any TEI constructs you like, including multiple paragarphs,
tables, nested divisions, etc. Furthermore, <specGrp> elements may
be used to include snippets of schema definitions, and <specList>
can be used to include to insert a list of descriptions of elements
and attributes. --></p>
<schemaSpec ident=""> <!-- @ident is required -->
<desc><!-- put a one-sentence description of this TEI customization here --></desc>
<moduleRef key="tei"/>
<moduleRef key="core"/>
<moduleRef key="header"/>
<moduleRef key="textstructure"/>
<!-- ODD-specific elements like <elementSpec> and <classSpec>;
or references to <specGrp>s defined above using <specGrpRef>. -->
</schemaSpec>
</body>
</text>
</TEI>
@@ -569,7 +569,7 @@
</div>
<div xml:id="figures">
<head>Figures and Graphics</head>
<p>Illustrative figures are encoded using the<gi>figure</gi> element, along with a mandatory
<p>Illustrative figures are encoded using the <gi>figure</gi> element, along with a mandatory
<tag>head type="legend"</tag> element providing the caption for the figure, as in this
example:</p>

@@ -2959,6 +2959,8 @@
<sch:let name="apos.straight" value="''''"/>
<sch:let name="quotes" value="concat('[', $apos.straight, '&quot;]')"/>
<sch:let name="div.types.front" value="('abstract', 'acknowledgements', 'authorNotes', 'editorNotes', 'corrections', 'dedication')"/>
<sch:let name="tei.version.url" value="'http://www.tei-c.org/release/doc/tei-p5-doc/VERSION'"/>
<sch:let name="tei.version" value="if (unparsed-text-available($tei.version.url)) then normalize-space(unparsed-text($tei.version.url)) else ()"/>
</sch:pattern>
</constraint>
</constraintSpec>
@@ -3125,16 +3127,16 @@
</constraintSpec>
<constraintSpec ident="jtei.sch-rangeHyphen" scheme="schematron">
<constraint>
<sch:rule context="text()[not(ancestor::tei:eg|ancestor::eg:egXML|ancestor::tei:code|ancestor::tei:tag|ancestor::tei:idno|ancestor::tei:date)][not(. = parent::*/@*)]">
<sch:assert test="not(matches(., '\d-\d'))" sqf:fix="hyphen.replace">
<sch:rule context="text()[not(ancestor::tei:eg|ancestor::eg:egXML|ancestor::tei:code|ancestor::tei:tag|ancestor::tei:idno|ancestor::tei:date)]">
<sch:assert test="not(matches(., '(^|[\W-[-]])\d+-\d+([\W-[-]]|$)'))" sqf:fix="hyphen.replace">
Numeric ranges should not be indicated with a hyphen. Please use
the EN Dash (U+2013 or –) character instead.
</sch:assert>
<sqf:fix id="hyphen.replace">
<sqf:description>
<sqf:title>Replace hyphen with –.</sqf:title>
</sqf:description>
<sqf:stringReplace regex="(\d)-(\d)">$1–$2</sqf:stringReplace>
<sqf:stringReplace regex="((?:^|[\W-[-]])\d+)-(\d+(?:[\W-[-]]|$))">$1–$2</sqf:stringReplace>
</sqf:fix>
</sch:rule>
</constraint>
@@ -3236,14 +3238,38 @@
<constraintSpec ident="jtei.sch-teiVersion" scheme="schematron">
<constraint>
<sch:rule context="@target[matches(., '^https?://www\.tei-c\.org/release/doc/tei-p5-doc')]">
<sch:assert test="false()">
Please refer to the exact version of the TEI Guidelines, and link to the version that can be found in the Vault section. For an overview of all archived versions, see http://www.tei-c.org/Vault/P5/.
<sch:assert test="false()" sqf:fix="teiURL.fix">
Please refer to the exact version of the TEI Guidelines<sch:value-of select="if (normalize-space($tei.version)) then concat(' (currently at version ', $tei.version, ')') else ()"/>, and link to the version that can be found in the Vault section. For an overview of all archived versions, see http://www.tei-c.org/Vault/P5/.

If you're referring to the English version, the correct URL will likely take the form of http://www.tei-c.org/Vault/P5/{$version-number}/doc/tei-p5-doc/en/html/.
</sch:assert>
<sqf:fix id="teiURL.fix" use-when="normalize-space($tei.version)">
<sqf:description>
<sqf:title>Change TEI URL to a versioned URL in the Vault (currently at version <sch:value-of select="$tei.version"/>).</sqf:title>
</sqf:description>
<sqf:replace node-type="attribute"
target="target"
select="replace(., '^https?://www\.tei-c\.org/release/', concat('https://www.tei-c.org/Vault/P5/', $tei.version, '/'))"/>
</sqf:fix>
</sch:rule>
</constraint>
</constraintSpec>
<constraintSpec ident="jtei.jtei-url" scheme="isoschematron">
<constraint>
<sch:rule context="@target[matches(., '^https?://(www\.)?jtei\.revues\.org/?')]">
<sch:let name="URL.fixed" value="replace(., '^https?://(www\.)?jtei\.revues\.org/?', 'https://journals.openedition.org/jtei/')"/>
<sch:assert test="false()" sqf:fix="jteiURL.fix">
Please refer to the correct jTEI URL: <sch:value-of select="$URL.fixed"/>.
</sch:assert>
<sqf:fix id="jteiURL.fix">
<sqf:description>
<sqf:title>Change jTEI URL to <sch:value-of select="$URL.fixed"/>.</sqf:title>
</sqf:description>
<sqf:replace node-type="attribute" target="target" select="$URL.fixed"/>
</sqf:fix>
</sch:rule>
</constraint>
</constraintSpec>
</constraintSpec>
</schemaSpec>
</div>
</back>
@@ -52,8 +52,8 @@
</teiHeader>
<text>
<body>
<p>This customization loads the modules and external
schemata necessary for writing TEI ODD documents.</p>
<p>This customization loads the modules and external schemata
necessary for writing TEI ODD documents.</p>
<schemaSpec ident="tei_odds" start="TEI schemaSpec elementSpec classSpec macroSpec div">
<moduleRef url="http://www.tei-c.org/release/xml/tei/Exemplars/relaxng.rng"/>
<moduleRef key="header"/>
@@ -66,42 +66,6 @@ schemata necessary for writing TEI ODD documents.</p>
<moduleRef key="linking"/>
<moduleRef key="figures"/>
<elementSpec ident="teiCorpus" mode="delete" module="core"/>
<macroSpec ident="macro.schemaPattern" mode="change" module="tagdocs">
<content>
<group xmlns="http://relaxng.org/ns/structure/1.0">
<choice>
<text/>
<oneOrMore>
<choice>
<ref name="pattern"/>
<ref name="define"/>
</choice>
</oneOrMore>
</choice>
<zeroOrMore>
<ref name="anySchematron"/>
</zeroOrMore>
</group>
</content>
</macroSpec>

<macroSpec ident="anySchematron" mode="add">
<content>
<element xmlns="http://relaxng.org/ns/structure/1.0">
<nsName ns="http://www.ascc.net/xml/schematron"/>
<zeroOrMore>
<choice>
<attribute>
<anyName/>
</attribute>
<ref name="anySchematron"/>
<text/>
</choice>
</zeroOrMore>
</element>
</content>
</macroSpec>

</schemaSpec>
</body>
</text>
@@ -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 -s http://www.tei-c.org/index.xml | sed 's/content="text\/html"/content="text\/html; charset=utf-8"/' | xmllint --html --noent --dropdtd --xmlout - > Utilities/teic-index.xml;fi
-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
@# 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; \
@@ -102,7 +102,7 @@ html-web.stamp: check.stamp p5.xml Utilities/guidelines.xsl.model
@# use `ant` to run the lovely ANT file we just generated
${ANT} -lib Utilities/lib/jing.jar:Utilities/lib/${SAXONJAR} -f buildweb.xml -DgoogleAnalytics=${GOOGLEANALYTICS}
@# clean up after ourselves
# commented out for DEBUGing: rm -f buildweb.xml Utilities/teic-index.xml
rm -f buildweb.xml Utilities/teic-index.xml
@# let future `make`s know we been there, done that
touch html-web.stamp

@@ -2,7 +2,7 @@ declare namespace tei="http://www.tei-c.org/ns/1.0";
declare namespace rng="http://relaxng.org/ns/structure/1.0";
<dataList>
{
for $t in collection("/db/TEI")//tei:macroSpec[@type='dt']
for $t in collection("/db/TEI")//tei:dataSpec
order by $t/@ident
return
<dataType>
@@ -1,6 +1,9 @@






2016-03-29 Syd Bauman <s.bauman@neu.edu> 80ac8b7

Update veresion # for actual release of Guidelines 3.0.0
Oops, something went wrong.

0 comments on commit 1fa0b54

Please sign in to comment.
You can’t perform that action at this time.