Skip to content

WIP: integrate the CMC work, related to 1955 #2537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 43 commits into from
Jul 3, 2024
Merged

WIP: integrate the CMC work, related to 1955 #2537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
4487875
initial creation of branch for work on the CMC-SIG’s new chapter (#2535)
sydb Mar 15, 2024
9595070
Updated some old attrs in eample to current versions. But …
sydb Mar 15, 2024
d341f16
ooops; correct a typo in the previous fix
sydb Mar 15, 2024
6f12150
initial creation of branch for work on the CMC-SIG’s new chapter (#2535)
sydb Mar 15, 2024
504b0b6
Updated some old attrs in eample to current versions. But …
sydb Mar 15, 2024
693b784
ooops; correct a typo in the previous fix
sydb Mar 15, 2024
29e79ce
Finishing rebase of dev into cmc
sydb Apr 27, 2024
72f0cdb
Merge remote-tracking branch 'origin/dev' into cmc
GusRiva May 17, 2024
a28ca43
Added att.indentation and indentLevel
GusRiva May 17, 2024
9f52fe4
Add post element to att.fragmentable per 2024-04-27 discussion
sydb May 17, 2024
31f496f
Rewrite of prose around Circulation xmp
sydb May 17, 2024
58842bd
Rewrite of prose around “Posts with Graphics” xmps
sydb May 17, 2024
f0e7d1e
Fix ellipses
sydb May 17, 2024
759c2ad
Various minor tweaks based on reviews in #2537
sydb May 18, 2024
416cc9a
Add required elements to example
sydb Jun 21, 2024
175133f
minor tweaks raised in PR thread
HelenaSabel Jun 30, 2024
a633757
revisions to CMC intro section
ebeshero Jun 30, 2024
5bdda67
edits to regularize use of <gi>term</gi> and list parallelism
ebeshero Jul 1, 2024
3a7c963
amending 'sloppy' to 'informal' re CMC writing
ebeshero Jul 1, 2024
7135b25
amending quotes in attDef desc re #1955
ebeshero Jul 1, 2024
7ca18f4
more consistency edits to CMC re #1955
ebeshero Jul 1, 2024
9407cd7
em dash consistency in cmc chapter re #1955
ebeshero Jul 1, 2024
6e1edb0
regularizing isation spellings to ization in conformance with TEI sty…
ebeshero Jul 1, 2024
a6215d7
updating cmc (Merge branch 'dev' into cmc)
ebeshero Jul 1, 2024
91770cc
further cleanup to regularize ize and iza words
ebeshero Jul 1, 2024
7b3795f
commenting out overly prescriptive sentence re #1955
ebeshero Jul 1, 2024
53c8e4b
polishing edits re #1955
ebeshero Jul 1, 2024
2c48d4a
small edits to reduce ambiguity, repetitiveness re 'CMC document' re …
ebeshero Jul 1, 2024
f0e2924
Repair CMC_generatedBy_within_post so that
sydb Jul 2, 2024
567c4c0
adding post elements to exempla in att.cmc re release blocker for #1955
ebeshero Jul 2, 2024
dc77933
Fix build by updating
sydb Jul 2, 2024
2dc29b3
Minor tweak to example
sydb Jul 2, 2024
260b946
Correct historical source of smiley
sydb Jul 2, 2024
86e6a4b
new usenet example with bib update on post spec for #1955
ebeshero Jul 2, 2024
4d9be6d
repairing usenet example for #1955
ebeshero Jul 2, 2024
61894c2
apply some of the edits by @martinascholger
HelenaSabel Jul 3, 2024
e083f5a
minor tweaks suggested by @martinascholger
HelenaSabel Jul 3, 2024
c80e27a
revisions to post exempla for #1955
ebeshero Jul 3, 2024
6076fc1
small edits to intro of cmc chapter re #1955
ebeshero Jul 3, 2024
251bb50
Apply suggestions by @martinascholger
HelenaSabel Jul 3, 2024
325d14b
change how examples are referred
HelenaSabel Jul 3, 2024
5619513
minor tweak in list of classes
HelenaSabel Jul 3, 2024
9cc186b
correct spelling of nonverbal
HelenaSabel Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions P5/Exemplars/tei_all.odd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,20 @@
<moduleRef n="06" key="verse"/>
<moduleRef n="07" key="drama"/>
<moduleRef n="08" key="spoken"/>
<moduleRef n="17" key="analysis"/>
<moduleRef n="09" key="dictionaries"/>
<moduleRef n="10" key="msdescription"/>
<moduleRef n="11" key="transcr"/>
<moduleRef n="12" key="textcrit"/>
<moduleRef n="13" key="namesdates"/>
<moduleRef n="14" key="figures"/>
<moduleRef n="15" key="corpus"/>
<moduleRef n="16" key="linking"/>
<moduleRef n="18" key="iso-fs"/>
<moduleRef n="19" key="nets"/>
<moduleRef n="21" key="certainty"/>
<moduleRef n="22" key="tagdocs"/>
<moduleRef n="09" key="cmc"/>
<moduleRef n="18" key="analysis"/>
<moduleRef n="10" key="dictionaries"/>
<moduleRef n="11" key="msdescription"/>
<moduleRef n="12" key="transcr"/>
<moduleRef n="13" key="textcrit"/>
<moduleRef n="14" key="namesdates"/>
<moduleRef n="15" key="figures"/>
<moduleRef n="16" key="corpus"/>
<moduleRef n="17" key="linking"/>
<moduleRef n="19" key="iso-fs"/>
<moduleRef n="20" key="nets"/>
<moduleRef n="22" key="certainty"/>
<moduleRef n="23" key="tagdocs"/>
</schemaSpec>
</body>
</text>
Expand Down
27 changes: 14 additions & 13 deletions P5/Exemplars/tei_allPlus.odd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,20 @@
<moduleRef n="06" key="verse"/>
<moduleRef n="07" key="drama"/>
<moduleRef n="08" key="spoken"/>
<moduleRef n="09" key="dictionaries"/>
<moduleRef n="10" key="msdescription"/>
<moduleRef n="11" key="transcr"/>
<moduleRef n="12" key="textcrit"/>
<moduleRef n="13" key="namesdates"/>
<moduleRef n="14" key="figures"/>
<moduleRef n="15" key="corpus"/>
<moduleRef n="16" key="linking"/>
<moduleRef n="17" key="analysis"/>
<moduleRef n="18" key="iso-fs"/>
<moduleRef n="19" key="nets"/>
<moduleRef n="21" key="certainty"/>
<moduleRef n="22" key="tagdocs"/>
<moduleRef n="09" key="cmc"/>
<moduleRef n="10" key="dictionaries"/>
<moduleRef n="11" key="msdescription"/>
<moduleRef n="12" key="transcr"/>
<moduleRef n="13" key="textcrit"/>
<moduleRef n="14" key="namesdates"/>
<moduleRef n="15" key="figures"/>
<moduleRef n="16" key="corpus"/>
<moduleRef n="17" key="linking"/>
<moduleRef n="18" key="analysis"/>
<moduleRef n="19" key="iso-fs"/>
<moduleRef n="20" key="nets"/>
<moduleRef n="22" key="certainty"/>
<moduleRef n="23" key="tagdocs"/>
<xi:include href="tei_svg.odd"
xpointer="xmlns(t=http://www.tei-c.org/ns/1.0)xpointer(//t:moduleRef[@url])">
<xi:fallback> ERROR: cannot locate ODD changes for SVG </xi:fallback>
Expand Down
27 changes: 16 additions & 11 deletions P5/Exemplars/tei_basic.odd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<fileDesc>
<titleStmt>
<title>TEI Basic</title>
<author>Hugh Cayless</author>
<author xml:id="HC">Hugh Cayless</author>
<editor xml:id="SB">Syd Bauman</editor>
</titleStmt>
<publicationStmt>
<publisher>TEI Consortium</publisher>
Expand All @@ -23,6 +24,9 @@
<p>Derived from TEI All.</p>
</sourceDesc>
</fileDesc>
<revisionDesc>
<change who="#SB">Added CMC and re-numbered accordingly.</change>
</revisionDesc>
</teiHeader>
<text>
<body>
Expand All @@ -42,16 +46,17 @@
<moduleRef n="06" key="verse"/>
<moduleRef n="07" key="drama"/>
<moduleRef n="08" key="spoken"/>
<moduleRef n="17" key="analysis"/>
<moduleRef n="10" key="msdescription"/>
<moduleRef n="11" key="transcr"/>
<moduleRef n="12" key="textcrit"/>
<moduleRef n="13" key="namesdates"/>
<moduleRef n="14" key="figures"/>
<moduleRef n="15" key="corpus"/>
<moduleRef n="16" key="linking"/>
<moduleRef n="21" key="certainty"/>
<moduleRef n="09" key="cmc"/>
<moduleRef n="18" key="analysis"/>
<moduleRef n="11" key="msdescription"/>
<moduleRef n="12" key="transcr"/>
<moduleRef n="13" key="textcrit"/>
<moduleRef n="14" key="namesdates"/>
<moduleRef n="15" key="figures"/>
<moduleRef n="16" key="corpus"/>
<moduleRef n="17" key="linking"/>
<moduleRef n="22" key="certainty"/>
</schemaSpec>
</body>
</text>
</TEI>
</TEI>
Loading