Skip to content

Commit

Permalink
complete merge of dev into this branch
Browse files Browse the repository at this point in the history
  • Loading branch information
sydb committed Nov 11, 2024
2 parents f5d33fc + 740fb04 commit ea4cbd3
Show file tree
Hide file tree
Showing 22 changed files with 12,015 additions and 23,755 deletions.
1 change: 0 additions & 1 deletion Test/expected-results/oddbyexample.odd
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@
<moduleRef key="core" include="p title"/>
<elementSpec ident="title" mode="change">
<attList>
<attDef ident="calendar" mode="delete"/>
<attDef ident="level" mode="delete"/>
<attDef ident="type" mode="delete"/>
</attList>
Expand Down
233 changes: 23 additions & 210 deletions Test/expected-results/test.isosch

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions Test/expected-results/test.odd.html
Original file line number Diff line number Diff line change
Expand Up @@ -1103,7 +1103,7 @@ <h1>
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-citedRange.html">citedRange</a>
</span>: (
<span xml:lang="en" lang="en">cited range</span>)
<span xml:lang="en" lang="en">defines the range of cited content, often represented by pages or other units</span>[
<span xml:lang="en" lang="en">defines the range of cited content, often represented by pages or other units.</span>[
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOB">3.12.2.5. Scopes and Ranges in Bibliographic Citations</a>]</td>
</tr>
<tr>
Expand Down Expand Up @@ -2111,7 +2111,7 @@ <h1>
<span class="hi">
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-line.html">line</a>
</span>:
<span xml:lang="en" lang="en">contains the transcription of a topographic line in the source document</span>[
<span xml:lang="en" lang="en">contains the transcription of a topographic line in the source document.</span>[
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHZLAB">12.2.2. Embedded Transcription</a>]</td>
</tr>
<tr>
Expand Down Expand Up @@ -2381,7 +2381,7 @@ <h1>
<span class="hi">
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.availabilityPart.html">model.availabilityPart</a>
</span>:
<span xml:lang="en" lang="en">groups elements such as licences and paragraphs of text which may appear as part of an availability statement</span>[
<span xml:lang="en" lang="en">groups elements such as licences and paragraphs of text which may appear as part of an availability statement.</span>[
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD24">2.2.4. Publication, Distribution, Licensing, etc.</a>]</td>
</tr>
<tr>
Expand Down Expand Up @@ -2457,14 +2457,14 @@ <h1>
<span class="hi">
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.correspContextPart.html">model.correspContextPart</a>
</span>:
<span xml:lang="en" lang="en">groups elements which may appear as part of the correspContext element</span></td>
<span xml:lang="en" lang="en">groups elements which may appear as part of the correspContext element.</span></td>
</tr>
<tr>
<td id="TEI.model.correspDescPart">
<span class="hi">
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.correspDescPart.html">model.correspDescPart</a>
</span>:
<span xml:lang="en" lang="en">groups together metadata elements for describing correspondence</span></td>
<span xml:lang="en" lang="en">groups together metadata elements for describing correspondence.</span></td>
</tr>
<tr>
<td id="TEI.model.dateLike">
Expand All @@ -2487,7 +2487,7 @@ <h1>
<span class="hi">
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.describedResource.html">model.describedResource</a>
</span>:
<span xml:lang="en" lang="en">groups elements which contain the content of a digital resource and its metadata; these elements may serve as the outermost or ‘root’ element of a TEI-conformant document</span>[
<span xml:lang="en" lang="en">groups elements which contain the content of a digital resource and its metadata; these elements may serve as the outermost or ‘root’ element of a TEI-conformant document.</span>[
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STEC">1.3. The TEI Class System</a>]</td>
</tr>
<tr>
Expand Down Expand Up @@ -2655,7 +2655,7 @@ <h1>
<span class="hi">
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.entryPart.top.html">model.entryPart.top</a>
</span>:
<span xml:lang="en" lang="en">groups high level elements within a structured dictionary entry</span>[
<span xml:lang="en" lang="en">groups high level elements within a structured dictionary entry.</span>[
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIEN">10.2. The Structure of Dictionary Entries</a>]</td>
</tr>
<tr>
Expand Down Expand Up @@ -2946,7 +2946,7 @@ <h1>
<span class="hi">
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.paraPart.html">model.paraPart</a>
</span>:
<span xml:lang="en" lang="en">groups elements that may appear in paragraphs and similar elements</span>[
<span xml:lang="en" lang="en">groups elements that may appear in paragraphs and similar elements.</span>[
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COPA">3.1. Paragraphs</a>]</td>
</tr>
<tr>
Expand All @@ -2962,7 +2962,7 @@ <h1>
<span class="hi">
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.phrase.xml.html">model.phrase.xml</a>
</span>:
<span xml:lang="en" lang="en">groups phrase-level elements used to encode XML constructs such as element names, attribute names, and attribute values</span>[
<span xml:lang="en" lang="en">groups phrase-level elements used to encode XML constructs such as element names, attribute names, and attribute values.</span>[
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TD">23. Documentation Elements</a>]</td>
</tr>
<tr>
Expand Down Expand Up @@ -3164,7 +3164,7 @@ <h1>
<span class="hi">
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-notatedMusic.html">notatedMusic</a>
</span>:
<span xml:lang="en" lang="en">encodes the presence of music notation in a text</span>[
<span xml:lang="en" lang="en">encodes the presence of music notation in a text.</span>[
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTNM">15.3. Notated Music in Written Text</a>]</td>
</tr>
<tr>
Expand All @@ -3185,7 +3185,7 @@ <h1>
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-noteGrp.html">noteGrp</a>
</span>: (
<span xml:lang="en" lang="en">note group</span>)
<span xml:lang="en" lang="en">contains a group of notes</span>[
<span xml:lang="en" lang="en">contains a group of notes.</span>[
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONONOGR">3.9.1.1. Encoding Grouped Notes</a>]</td>
</tr>
<tr>
Expand Down Expand Up @@ -3679,7 +3679,7 @@ <h1>
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-schemaRef.html">schemaRef</a>
</span>: (
<span xml:lang="en" lang="en">schema reference</span>)
<span xml:lang="en" lang="en">describes or points to a related customization or schema file</span>[
<span xml:lang="en" lang="en">describes or points to a related customization or schema file.</span>[
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HDSCHSPEC">2.3.10. The Schema Specification</a>]</td>
</tr>
<tr>
Expand Down Expand Up @@ -3910,7 +3910,7 @@ <h1>
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-substJoin.html">substJoin</a>
</span>: (
<span xml:lang="en" lang="en">substitution join</span>)
<span xml:lang="en" lang="en">identifies a series of possibly fragmented additions, deletions, or other revisions on a manuscript that combine to make up a single intervention in the text</span>[
<span xml:lang="en" lang="en">identifies a series of possibly fragmented additions, deletions, or other revisions on a manuscript that combine to make up a single intervention in the text.</span>[
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHSU">12.3.1.5. Substitutions</a>]</td>
</tr>
<tr>
Expand Down Expand Up @@ -4044,7 +4044,7 @@ <h1>
<span class="hi">
<a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-teidata.duration.iso.html">teidata.duration.iso</a>
</span>:
<span xml:lang="en" lang="en">defines the range of attribute values available for representation of a duration in time using ISO 8601 standard formats</span></td>
<span xml:lang="en" lang="en">defines the range of attribute values available for representation of a duration in time using ISO 8601 standard formats.</span></td>
</tr>
<tr>
<td id="TEI.teidata.duration.w3c">
Expand Down
Loading

0 comments on commit ea4cbd3

Please sign in to comment.