Grab newest from dev

Author: sydb

P5/Source/Guidelines/en/AB-About.xml

@@ -821,7 +821,7 @@ Guidelines, to the possible problems which revision might pose for those
 who are already using this version of these Guidelines.  
 </p>
 <p>With TEI P5, a version numbering system is introduced following 
-  <ref target="http://unicode.org/versions/">the pattern specified by 
+  <ref target="https://unicode.org/versions/">the pattern specified by 
     the Unicode Consortium</ref>: the first digit identifies a major 
   version number, the second digit a minor version number, and the 
   third digit a sub-minor version number. The TEI undertakes that no 

P5/Source/Guidelines/en/BIB-Bibliography.xml

@@ -6154,7 +6154,7 @@ $Id$
               <surname>Hawke</surname>
             </editor>
             <title level="m">The 'tag' URI Scheme</title>
-            <ptr target="http://www.ietf.org/rfc/rfc4151.txt"/>
+            <ptr target="https://www.ietf.org/rfc/rfc4151.txt"/>
             <idno>RFC 4151</idno>
             <imprint>
               <date>2005</date>

P5/Source/Guidelines/en/CH-LanguagesCharacterSets.xml

@@ -97,7 +97,7 @@ sublanguage), a script, and a region for the language, each possibly
 followed by a variant subtag.</p>
 <p>The authoritative list of registered subtags is maintained by IANA
 and is available at <ptr
-target="http://www.iana.org/assignments/language-subtag-registry"/>.
+target="https://www.iana.org/assignments/language-subtag-registry"/>.
 For a good general overview of the construction of language tags, see
 <ptr
 target="https://www.w3.org/International/articles/language-tags/"/>,

P5/Source/Guidelines/en/SA-LinkingSegmentationAlignment.xml

@@ -467,7 +467,7 @@ XPointer schemes.</item>
 <p>All TEI attributes used to point at something else are declared as
 having the datatype <ident type="datatype">teidata.pointer</ident>, which
 is defined as a URI reference<note place="bottom">The URI (Universal
-Resource Indicator) is defined in <ref target="http://www.ietf.org/rfc/rfc3986.txt">RFC 3986</ref></note>; the
+Resource Indicator) is defined in <ref target="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</ref></note>; the
 cases so far discussed are all simple examples of a URI
 reference. Another familiar example is the mechanism used in XHTML to
 create represent hypertext links by means of the XHTML <att scheme="XHTML">href</att> attribute. A URI reference can reference the
@@ -687,7 +687,7 @@ chapter and elsewhere in these Guidelines. </p>
 
         Any number of <gi>prefixDef</gi> elements may be provided for the same prefix. A processor may decide to process one or all of them; if it processes only one, it should choose the first one with the correct <att>ident</att> value, so the primary or most important <gi>prefixDef</gi> for any given prefix should appear first in its parent <gi>listPrefixDef</gi>.</p>
 
-      <p>When creating private URI schemes, it is recommended that you avoid using any existing registered prefix. A list of registered prefixes is maintained by IANA at <ptr target="http://www.iana.org/assignments/uri-schemes.html"/>.</p>
+      <p>When creating private URI schemes, it is recommended that you avoid using any existing registered prefix. A list of registered prefixes is maintained by IANA at <ptr target="https://www.iana.org/assignments/uri-schemes.html"/>.</p>
 
       <p>Note that this mechanism can also be used to dereference other abbreviated pointing systems which are based on prefixes, such as Tag URIs.</p>
 
@@ -964,7 +964,7 @@ the whole of <ref target="#SATSXP-ex">line 3</ref> from the
 <code><![CDATA[<lb n="3"/>]]></code> to the point right before the 
 following <code><![CDATA[<lb n="4"/>]]></code>.</p>
 <p>Example: <code>#range(right(//lb[@n='3']),string-index(//lb[@n='3'],15))</code>
-  indicates the sequence <code><![CDATA[<unclear>s</unclear>emp<unclear>er</unclear> in mente]]></code>.</p>
+  indicates the sequence <code><![CDATA[<unclear>s</unclear>emp<unclear>er</unclear> in mente]]></code> (an element, a text node, another element, and a partial text node).</p>
 <p>Example: <code>#range(string-index(//lb[@n='3'],7),string-index(//lb[@n='3'],10),string-index(//lb[@n='3'],15),string-index(//lb[@n='3'],21))</code> indicates
 the non-contiguous sequence <q>in mentem</q>.</p>
 </div>
@@ -1026,7 +1026,7 @@ modifications:
 </list>
 The optional INDEX parameter is an integer greater than 0 which specifies which 
 match should be chosen when there is more than one possibility. If omitted, the 
-first match in the text stream will be used.</p>
+first match in the text stream will be used to resolve the <code>match()</code>.</p>
 <p>Like <code>string-range()</code>, <code>match()</code> may capture elements 
 in the indicated sequence, even though they are ignored for purposes of evaluating 
 the match.</p>

P5/Source/Guidelines/en/TD-DocumentationElements.xml

@@ -995,17 +995,19 @@ to mark any technical term, thus:
         <p>The <soCalled>datatype</soCalled> (i.e. the kind of value) for an attribute may be specified using
           the elements <gi>datatype</gi> and <gi>dataRef</gi>. A datatype may be defined in any of the
           following three ways: <list>
-            <item>by reference to an existing TEI datatype definition; </item>
-            <item>by use of its name in the widely used schema datatype library maintained by the W3C as part
-              of the definition of its schema language; </item>
+            <item>by reference to an existing TEI datatype definition, itself defined by a <gi>dataSpec</gi>;</item>
+            <item>by use of its name in <ref target="#XSD2">XML Schema
+            Part 2: Datatypes Second Edition</ref>, the widely used
+            datatype library maintained by the W3C as part of
+            the definition of its schema language;</item>
             <item>by referencing its URI within some other datatype library.</item>
-          </list>The TEI defines a number of datatypes, each with an identifier beginning
+          </list> The TEI defines a number of datatypes, each with an identifier beginning
             <code>teidata.</code>, which are used in preference to the datatypes available natively from a
           target schema such as RELAX NG or W3C Schema since the facilities provided by different schema
           languages vary so widely. The TEI datatypes available are described in section <ptr target="#DTYPES"
           /> above. Note that each is, of necessity, mapped eventually to an externally defined datatype such
           as W3C Schema's <ident>text</ident> or <ident>name</ident>, possibly combined to give more
-          expressivity, or constrained to a particular defined usage. </p>
+          expressivity, or constrained to a particular defined usage.</p>
         <p>It is possible to reference a W3C schema datatype directly using <att>name</att>. In this case, 
           the child <gi>dataFacet</gi> can be used instead of <att>restriction</att> to set W3C schema compliant 
           restrictions on the datatype. A <gi>dataFacet</gi> is particularly useful for restrictions that can be difficult to impose and to read as a 
@@ -1015,17 +1017,32 @@ to mark any technical term, thus:
             <dataFacet name="minInclusive" value="-360.0"/>
             </dataRef></egXML>   
         Note that restrictions are either expressed with <att>restriction</att> or <gi>dataFacet</gi>, never both.</p>
-        <p>Attributes <att>minOccurs</att> and <att>maxOccurs</att> are available for the case where an
-          attribute may take more than one value of the type specified. For example, the <att>target</att>
-          attribute provided by the <ident type="class">att.pointing</ident> class has the following
-          declaration:
-          <egXML xmlns="http://www.tei-c.org/ns/Examples"><attDef ident="target">
-              <desc versionDate="2010-05-02" xml:lang="en">specifies the destination of the reference by
-                supplying one or more URI References</desc>
-              <datatype minOccurs="1" maxOccurs="unbounded">
-                <dataRef key="teidata.pointer"/>
-              </datatype>
-            </attDef></egXML>
+	<p>A datatype may be used to constrain the textual content of
+	an element, rather than the value of an attribute. But because
+	they are intended for use in defining ranges of attribute
+	values, datatypes may not contain elements or attributes.</p>
+        <p>The attributes <att>minOccurs</att> and
+        <att>maxOccurs</att> are available for the case where an
+        attribute may take more than one value of the type
+        specified. For example, the <att>columns</att> attribute of
+        the <gi>layout</gi> element can have one or two non-negative
+        integers as its value:
+          <egXML xmlns="http://www.tei-c.org/ns/Examples">
+	    <attDef ident="columns">
+	      <gloss xml:lang="en" versionDate="2007-06-12">columns</gloss>
+	      <desc versionDate="2005-01-14" xml:lang="en">specifies the number of columns per page</desc>
+	      <datatype minOccurs="1" maxOccurs="2">
+		<dataRef key="teidata.count"/>
+	      </datatype>
+	      <remarks xml:lang="en" versionDate="2017-07-09">
+		<p>If a single number is given, all pages referenced
+		have this number of columns. If two numbers are given,
+		the number of columns per page varies between the
+		values supplied. Where <att>columns</att> is omitted
+		the number is assumed to be <val>1</val>.</p>
+	      </remarks>
+	    </attDef>
+	  </egXML>
            indicating that the <att>target</att> attribute may take any number of values, each being of the
           same datatype, namely the TEI data specification <ident>teidata.pointer</ident>. As is usual in XML,
           multiple values for a single attribute are separated by one or more white space characters. Hence,

P5/Source/Guidelines/en/WD-NonStandardCharacters.xml

@@ -51,7 +51,7 @@ In order to determine whether a character has been encoded,
 encoders should follow the following steps:
 <list rend="numbered">
   <item><p>Check the Unicode
-  web site at <ptr target="https://www.unicode.org"/>, in particular the page <ref target="http://unicode.org/standard/where/">"Where is my
+  web site at <ptr target="https://www.unicode.org"/>, in particular the page <ref target="https://unicode.org/standard/where/">"Where is my
   Character?"</ref>, and the associated character code charts.
   Alternatively, users can check the latest published version of
   <title>The Unicode Standard</title> (<ref target="#CH-BIBL-3">Unicode Consortium (2006)</ref>), though the web site is
@@ -64,7 +64,7 @@ project, refer to the guidelines contained below under <ref target="#D25-30">Ann
 encoded document may be rendered on a system which has different fonts
 from yours: if the specific form of a character is important to you,
 then you should document it. </p></item>
-  <item>Check the Proposed New Characters web page (<ptr target="http://unicode.org/alloc/Pipeline.html"/>) to see whether
+  <item>Check the Proposed New Characters web page (<ptr target="https://unicode.org/alloc/Pipeline.html"/>) to see whether
   the character is in line for approval.</item>
 
 <item>Ask on the Unicode email list (<ptr target="https://www.unicode.org/consortium/distlist.html"/>) to
@@ -101,7 +101,7 @@ represent a variant form of a known character, or does it represent a
 completely unencoded character?</q> If the character is determined to
 be missing from the Unicode Standard, it would be helpful to submit
 the new character for inclusion (see <ptr
-target="http://unicode.org/pending/proposals.html"/>). For assistance
+target="https://unicode.org/pending/proposals.html"/>). For assistance
 on writing or submitting a proposal, potential proposers can contact
 the UC Berkeley Script Encoding Initiative (<ptr
 target="http://linguistics.berkeley.edu/sei/"/>).</p>

P5/Source/Specs/att.global.xml

@@ -110,17 +110,17 @@ $Id$
         according to <ref target="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">BCP 47</ref>.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko"><ref target="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">BCP 47</ref>에 따라 생성된
         <soCalled>tag</soCalled>를 사용하는 요소 내용의 언어를 나타낸다.</desc>
-      <desc versionDate="2007-05-02" xml:lang="zh-TW">使用<ref target="http://www.ietf.org/rfc/rfc3066.txt">RFC3066</ref>的代碼，指出該元素內容的使用語言</desc>
+      <desc versionDate="2007-05-02" xml:lang="zh-TW">使用<ref target="https://www.ietf.org/rfc/rfc3066.txt">RFC3066</ref>的代碼，指出該元素內容的使用語言</desc>
       <desc xml:lang="ja" versionDate="2019-06-08"><ref target="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">BCP 47</ref>に従って生成された<soCalled>タグ</soCalled>を用いて要素の内容の言語を示す。</desc>
       <desc versionDate="2007-06-12" xml:lang="fr">indique la langue du contenu de l'élément en
-        utilisant les codes du <ref target="http://www.ietf.org/rfc/rfc3066.txt">RFC 3066</ref>
+        utilisant les codes du <ref target="https://www.ietf.org/rfc/rfc3066.txt">RFC 3066</ref>
          </desc>
       <desc versionDate="2007-05-04" xml:lang="es">indica la lengua del contenido del elemento
-        utilizando los códigos extraídos de <ref target="http://www.ietf.org/rfc/rfc3066.txt">RFC
+        utilizando los códigos extraídos de <ref target="https://www.ietf.org/rfc/rfc3066.txt">RFC
           3066</ref>
          </desc>
       <desc versionDate="2007-01-21" xml:lang="it">indica la lingua del contenuto dell'elemento
-        utilizzando i codici tratti da <ref target="http://www.ietf.org/rfc/rfc3066.txt">RFC
+        utilizzando i codici tratti da <ref target="https://www.ietf.org/rfc/rfc3066.txt">RFC
         3066</ref>
          </desc>
       <datatype><dataRef key="teidata.language"/></datatype>
@@ -142,7 +142,7 @@ $Id$
           and that a single TEI document may contain texts in many languages.</p>
         <p>Only attributes with free text values (rare in these guidelines) will be in the scope of <att>xml:lang</att>.</p>
         <p>The authoritative list of registered language subtags is maintained by IANA and 
-          is available at <ptr target="http://www.iana.org/assignments/language-subtag-registry"/>. 
+          is available at <ptr target="https://www.iana.org/assignments/language-subtag-registry"/>. 
           For a good general overview of the construction of language tags, see 
           <ptr target="https://www.w3.org/International/articles/language-tags/"/>, and for 
           a practical step-by-step guide, see 
@@ -170,7 +170,7 @@ $Id$
         <p>Si no se especifica ningún valor para <att>xml:lang</att>, el valor de <att>xml:lang</att> para el elemento inmediatamente englobado, se hereda; por esta razón, un valor
           se debe especificar siempre en el elemento exterior (<gi>TEI</gi>).</p>
       </remarks>
-      <remarks xml:lang="ja" versionDate="2019-06-16"><p>xml:lang の値は、直接の親要素、そのまた親要素からというように、文書の上位階層から継承されてくる。できるだけ高い適切な階層に xml:lang を指定するのが一般には望ましいが、teiHeader には関連するリソース要素と異なるデフォルト値が必要となったり、一つのTEI文書が多くの言語のテキストを含みうることには注意されたい。登録された言語タグの正式なリストはIANAが管理しており、<ptr target="http://www.iana.org/assignments/language-subtag-registry"/> から確認できる。言語タグの構造についての良い概説は <ptr target="https://www.w3.org/International/articles/language-tags/"/> を、手順を追った実用的なガイドは <ptr target="https://www.w3.org/International/questions/qa-choosing-language-tags.en.php"/> を参照されたい。利用する値は、BCP 47 に準拠しなければならない。もし値が私用コード（<val>x-</val> から始まったり <val>-x-</val> を含む）ならば、その <att>ident</att> 属性と一致する値を持つ <gi>language</gi> 要素をTEIヘッダ内に追加して内容を説明すべきである。この説明は私用コード以外にも任意で追加できるが、<choice><abbr>IETF</abbr><expan>Internet Engineering Task Force</expan></choice> による定義と整合していなければならない。</p></remarks>
+      <remarks xml:lang="ja" versionDate="2019-06-16"><p>xml:lang の値は、直接の親要素、そのまた親要素からというように、文書の上位階層から継承されてくる。できるだけ高い適切な階層に xml:lang を指定するのが一般には望ましいが、teiHeader には関連するリソース要素と異なるデフォルト値が必要となったり、一つのTEI文書が多くの言語のテキストを含みうることには注意されたい。登録された言語タグの正式なリストはIANAが管理しており、<ptr target="https://www.iana.org/assignments/language-subtag-registry"/> から確認できる。言語タグの構造についての良い概説は <ptr target="https://www.w3.org/International/articles/language-tags/"/> を、手順を追った実用的なガイドは <ptr target="https://www.w3.org/International/questions/qa-choosing-language-tags.en.php"/> を参照されたい。利用する値は、BCP 47 に準拠しなければならない。もし値が私用コード（<val>x-</val> から始まったり <val>-x-</val> を含む）ならば、その <att>ident</att> 属性と一致する値を持つ <gi>language</gi> 要素をTEIヘッダ内に追加して内容を説明すべきである。この説明は私用コード以外にも任意で追加できるが、<choice><abbr>IETF</abbr><expan>Internet Engineering Task Force</expan></choice> による定義と整合していなければならない。</p></remarks>
     </attDef>