Skip to content
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

Add eventName and update event #2483

Merged
merged 57 commits into from
Nov 7, 2023
Merged

Add eventName and update event #2483

Show file tree
Hide file tree
Changes from 49 commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
acc29ba
update tei:event description
skurzinz May 2, 2023
adfbf43
update tei:event model and provide example
skurzinz May 2, 2023
24c3606
provide tagdoc for tei:eventName
skurzinz May 2, 2023
b58f593
allow listPerson and listEvent as children of listEvent
skurzinz May 2, 2023
c247fb8
add eventName into chapter 13 ND
skurzinz May 2, 2023
fbd490b
fix cardinalities for (list)?event child elements
skurzinz May 2, 2023
876e1eb
new div2 on events
skurzinz May 2, 2023
eb6c737
move nested event example to new event section
skurzinz May 4, 2023
679744a
correct a typo
skurzinz May 4, 2023
21204de
check cardinalities with @ChristianeFritze
skurzinz May 4, 2023
9e2a984
add @type to event example in specs
skurzinz May 4, 2023
b6bd949
improve example of indirect event reference
skurzinz May 4, 2023
45e95ab
improve description of `event` in ND
skurzinz May 4, 2023
62b1b9a
include eventName spec in ND as suggested by @sydb
skurzinz May 4, 2023
8680301
remove listPerson|Place from listEvent again
skurzinz May 4, 2023
14376d5
address first of @sydb’s comment in #2427 (dup xi:include)
skurzinz May 6, 2023
7d8a834
swap out eventName example
skurzinz May 7, 2023
24f6e72
`eventName` made member of att.personal
skurzinz May 7, 2023
8ddc809
update versionDate of `event`; add german desc
skurzinz May 7, 2023
ea40022
add `objectLike` elements to possible children of `event`
skurzinz May 7, 2023
6c68379
Removed ambiguities from content models
sydb May 10, 2023
4d39c1c
Merge pull request #1 from TEIC/dev
skurzinz May 10, 2023
3e69268
add a TEI2019 Graz example for typed `eventName`
skurzinz May 10, 2023
c8e723c
Fix invalidities:
sydb May 12, 2023
d52818c
fix remaining problem (yank Platter addName)
skurzinz May 12, 2023
f2fbf36
formatting
skurzinz May 15, 2023
d0fa3c2
remove comments with references to the #2382 issuex
skurzinz May 16, 2023
e2c432f
add clarifying comment on legislation understood as event
skurzinz May 16, 2023
1f1aaa4
alternative `<listPlace>` and/or `@where` for locating events
skurzinz May 16, 2023
395ad63
add de_AT nested listEvent example to #2427
skurzinz May 16, 2023
3074eb2
Merge pull request #2 from TEIC/dev
skurzinz May 16, 2023
22a5afb
Merge pull request #3 from TEIC/dev
skurzinz Jun 1, 2023
e80feac
Re-arrange 'gloss' and 'desc' elements so they are valid against the …
sydb Jun 10, 2023
78e1296
Update TEI 2019 example
sydb Jun 10, 2023
219ddf8
Use local organizers as list of people associated with TEI Graz event
sydb Jun 10, 2023
fe27af6
Re-generated spec lists.
sydb Jun 10, 2023
63fec57
Merge branch 'TEIC:dev' into dev
skurzinz Aug 23, 2023
a2bbab9
Merge branch 'TEIC:dev' into dev
skurzinz Aug 28, 2023
85a904f
correction of spanish description
HelenaSabel Sep 4, 2023
cc26488
Update P5/Source/Specs/event.xml
raffazizzi Sep 4, 2023
022387e
changed typo in the street name
martinascholger Sep 4, 2023
585b35b
Merge branch 'issue_2382_eventName' into dev
joeytakeda Sep 4, 2023
63b0b92
Merge pull request #2427 from skurzinz/dev
joeytakeda Sep 4, 2023
25c81f9
Updating event's content model
joeytakeda Sep 4, 2023
a958917
Forgot to remove eventName from the main alternate
joeytakeda Sep 5, 2023
decb388
Reordering classes of event and eventName (per #2466)
joeytakeda Sep 5, 2023
1134a14
Updating (English) desc for event per #2466
joeytakeda Sep 5, 2023
b1ef17d
Merge branch 'dev' into issue_2382_eventName
joeytakeda Oct 6, 2023
1fcf6f7
Continued work on event and eventName (#2382, #2466)
joeytakeda Oct 6, 2023
e12c857
Small editorial tweaks for PR #2483
joeytakeda Oct 16, 2023
ecdc71a
Merge branch 'dev' into issue_2382_eventName
joeytakeda Oct 16, 2023
fe62239
auto-merge latest from dev, except event.xml, which had to be merged …
sydb Oct 23, 2023
47d93db
Oops; added missing namespace decl
sydb Oct 23, 2023
e699800
More updates to prose
joeytakeda Nov 3, 2023
bda7de7
Fixes to event
joeytakeda Nov 3, 2023
eec20e5
Merge branch 'dev' into issue_2382_eventName
joeytakeda Nov 3, 2023
91bb308
Re-work prose of eventName section
sydb Nov 3, 2023
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
2 changes: 1 addition & 1 deletion P5/Source/Guidelines/en/BIB-Bibliography.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,7 +1006,7 @@ $Id$
Parachute: The Highest Falls People Survived</title>, <title level="m">Statista</title>,
<date when="2020-11-18">November 18, 2020</date>. <ptr
target="https://www.statista.com/chart/19708/known-occasions-where-people-survived-falls/"
/>. </bibl>
/>. </bibl> <!-- See also https://en.wikipedia.org/wiki/Highest_falls_survived_without_a_parachute -->
<bibl xml:id="SOURCE-eg-01"><author>McCarty, Willard</author>. <title level="a"
>Introduction</title> in <title level="m">Collaborative Research in the Digital
Humanities</title>: A volume in honour of Harold Short on the occasion of his 65th
Expand Down
Loading