Commit 2935f7e1 authored by Charles Bourdot's avatar Charles Bourdot
Browse files

Merge branch 'odd_note_place' into 'master' 

note@place : ajout contrainte sur la valeur

See merge request fnso/i-fair-ir/schema-tei!32
parents 831b3790 50d1ef09

odd/out/commons-publishing.rng

+16 −46
Changes for odd/out/commons-publishing.rng: 16 added lines, 46 removed lines.
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
         xmlns="http://relaxng.org/ns/structure/1.0"

         datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"

         ns="http://www.tei-c.org/ns/1.0"><!--

Schema generated from ODD source 2023-03-30T06:06:03Z. .

Schema generated from ODD source 2023-03-31T07:04:38Z. .

TEI Edition: Version 4.5.0. Last updated on

        25th October 2022, revision 3e98e619e

TEI Edition Location: https://www.tei-c.org/Vault/P5/Version 4.5.0/
@@ -301,50 +301,6 @@ TEI Edition Location: https://www.tei-c.org/Vault/P5/Version 4.5.0/ 
         </attribute>

      </optional>

   </define>

   <define name="att.placement.attributes">

      <ref name="att.placement.attribute.place"/>

   </define>

   <define name="att.placement.attribute.place">

      <optional>

         <attribute name="place">

            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies where this item is placed.

Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf; 6] above; 7] right; 8] below; 9] left; 10] end; 11] inline; 12] inspace</a:documentation>

            <list>

               <oneOrMore>

                  <choice>

                     <value>top</value>

                     <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">at the top of the page</a:documentation>

                     <value>bottom</value>

                     <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">at the foot of the page</a:documentation>

                     <value>margin</value>

                     <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">in the margin (left, right, or both)</a:documentation>

                     <value>opposite</value>

                     <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">on the opposite, i.e. facing, page</a:documentation>

                     <value>overleaf</value>

                     <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">on the other side of the leaf</a:documentation>

                     <value>above</value>

                     <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">above the line</a:documentation>

                     <value>right</value>

                     <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">to the right, e.g. to the right of a vertical line of text, or to the right of a figure</a:documentation>

                     <value>below</value>

                     <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">below the line</a:documentation>

                     <value>left</value>

                     <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">to the left, e.g. to the left of a vertical line of text, or to the left of a figure</a:documentation>

                     <value>end</value>

                     <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">at the end of e.g. chapter or volume.</a:documentation>

                     <value>inline</value>

                     <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">within the body of the text.</a:documentation>

                     <value>inspace</value>

                     <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">in a predefined space, for example left by an earlier scribe.</a:documentation>

                     <data type="token">

                        <param name="pattern">[^\p{C}\p{Z}]+</param>

                     </data>

                  </choice>

               </oneOrMore>

            </list>

         </attribute>

      </optional>

   </define>

   <define name="att.typed.attribute.type">

      <optional>

         <attribute name="type">
@@ -2263,7 +2219,21 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i 
         <ref name="att.global.attribute.xmlspace"/>

         <ref name="att.global.rendition.attribute.rend"/>

         <ref name="att.global.rendition.attribute.rendition"/>

         <ref name="att.placement.attributes"/>

         <optional>

            <attribute name="place">

               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies where this item is placed.</a:documentation>

               <list>

                  <oneOrMore>

                     <choice>

                        <value>foot</value>

                        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>

                        <value>end</value>

                        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>

                     </choice>

                  </oneOrMore>

               </list>

            </attribute>

         </optional>

         <optional>

            <attribute name="type">

               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">characterizes the element in some sense, using any convenient classification scheme or typology.</a:documentation>

odd/src/commons-publishing.odd

+6 −0
Changes for odd/src/commons-publishing.odd: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -654,6 +654,12 @@ 
                <valItem ident="trl"/>

              </valList>

            </attDef>

            <attDef ident="place" mode="change">

              <valList  mode="replace" type="closed">

                <valItem ident="foot"/>

                <valItem ident="end"/>

              </valList>

            </attDef>

          </attList>

        </elementSpec>

odd/src/commons-publishing_compiled.odd

+5 −0
Changes for odd/src/commons-publishing_compiled.odd: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -4987,6 +4987,11 @@ entre les Romains.</label> 
                <valItem ident="pbl"/>

                <valItem ident="trl"/>

              </valList>

            </attDef><attDef ident="place" mode="change">

              <valList mode="replace" type="closed">

                <valItem ident="foot"/>

                <valItem ident="end"/>

              </valList>

            </attDef></attList><exemplum xml:lang="en">

    <p>In the following example, the translator has supplied a footnote

      containing an explanation of the term translated as "painterly":</p>