From 3da7e588b82c0b5d436b48ea7e864579a120ed99 Mon Sep 17 00:00:00 2001 From: Luther Tychonievich Date: Tue, 1 Nov 2022 09:15:06 -0500 Subject: [PATCH] typo --- changelog.md | 2 +- extracted-files/cardinalities.tsv | 2 +- extracted-files/grammar.abnf | 3 ++- extracted-files/grammar.gedstruct | 2 +- extracted-files/tags/ADOP-FAMC | 2 +- extracted-files/tags/NOTE | 2 +- extracted-files/tags/NOTE-TRAN | 2 +- extracted-files/tags/type-Date | 8 ++++++-- extracted-files/tags/type-Enum | 14 ++++++++------ extracted-files/tags/type-Time | 3 ++- 10 files changed, 24 insertions(+), 16 deletions(-) diff --git a/changelog.md b/changelog.md index a0bea6ca..751b5a35 100644 --- a/changelog.md +++ b/changelog.md @@ -10,7 +10,7 @@ - Clarify that the same tag can be used for multiple URIs in the schema provided the meanings are non-overlapping. Recommend tags only be reused for closely related concepts, similar to how standard tags are. -- Recommend that `g7:type-DateExact` should use UTC time because it is used in places where exact machine-generated timestamps are expected. +- Recommend that `g7:type-Date#exact` should use UTC time because it is used in places where exact machine-generated timestamps are expected. - Split shared rows in date definition table and reorder rows to be more logically organized. diff --git a/extracted-files/cardinalities.tsv b/extracted-files/cardinalities.tsv index 59ada608..6ca5044f 100644 --- a/extracted-files/cardinalities.tsv +++ b/extracted-files/cardinalities.tsv @@ -1189,7 +1189,7 @@ https://gedcom.io/terms/v7/record-INDI https://gedcom.io/terms/v7/INDI-TITL {0:M https://gedcom.io/terms/v7/CROP https://gedcom.io/terms/v7/TOP {0:1} https://gedcom.io/terms/v7/INDI-NAME https://gedcom.io/terms/v7/NAME-TRAN {0:M} https://gedcom.io/terms/v7/PLAC https://gedcom.io/terms/v7/PLAC-TRAN {0:M} -https://gedcom.io/terms/v7/NOTE https://gedcom.io/terms/v7/NOTE-TRAN {0:1} +https://gedcom.io/terms/v7/NOTE https://gedcom.io/terms/v7/NOTE-TRAN {0:M} https://gedcom.io/terms/v7/record-SNOTE https://gedcom.io/terms/v7/NOTE-TRAN {0:M} https://gedcom.io/terms/v7/FILE https://gedcom.io/terms/v7/FILE-TRAN {0:M} https://gedcom.io/terms/v7/ADOP https://gedcom.io/terms/v7/TYPE {0:1} diff --git a/extracted-files/grammar.abnf b/extracted-files/grammar.abnf index 42d8be01..3ac39fb5 100644 --- a/extracted-files/grammar.abnf +++ b/extracted-files/grammar.abnf @@ -54,7 +54,8 @@ Integer = 1*digit ; ------------- Enumeration ------------- -Enum = Tag +stdEnum = stdTag / Integer +Enum = stdEnum / extTag ; ------------- Date ------------- diff --git a/extracted-files/grammar.gedstruct b/extracted-files/grammar.gedstruct index b224db15..ac00d558 100644 --- a/extracted-files/grammar.gedstruct +++ b/extracted-files/grammar.gedstruct @@ -561,7 +561,7 @@ NOTE_STRUCTURE := n NOTE {1:1} g7:NOTE +1 MIME {0:1} g7:MIME +1 LANG {0:1} g7:LANG - +1 TRAN {0:1} g7:NOTE-TRAN + +1 TRAN {0:M} g7:NOTE-TRAN +2 MIME {0:1} g7:MIME +2 LANG {0:1} g7:LANG +1 <> {0:M} diff --git a/extracted-files/tags/ADOP-FAMC b/extracted-files/tags/ADOP-FAMC index eb70a900..4f976647 100644 --- a/extracted-files/tags/ADOP-FAMC +++ b/extracted-files/tags/ADOP-FAMC @@ -11,7 +11,7 @@ standard tag: FAMC specification: - Family child - | - The individual or couple that adopted this this individual. + The individual or couple that adopted this individual. Adoption by an individual, rather than a couple, may be represented either by pointing to a FAM where that individual is a HUSB or WIFE and using a diff --git a/extracted-files/tags/NOTE b/extracted-files/tags/NOTE index 8fd81d62..8d0d94aa 100644 --- a/extracted-files/tags/NOTE +++ b/extracted-files/tags/NOTE @@ -24,7 +24,7 @@ payload: http://www.w3.org/2001/XMLSchema#string substructures: "https://gedcom.io/terms/v7/LANG": "{0:1}" "https://gedcom.io/terms/v7/MIME": "{0:1}" - "https://gedcom.io/terms/v7/NOTE-TRAN": "{0:1}" + "https://gedcom.io/terms/v7/NOTE-TRAN": "{0:M}" "https://gedcom.io/terms/v7/SOUR": "{0:M}" superstructures: diff --git a/extracted-files/tags/NOTE-TRAN b/extracted-files/tags/NOTE-TRAN index ba5c1d34..d6e2da74 100644 --- a/extracted-files/tags/NOTE-TRAN +++ b/extracted-files/tags/NOTE-TRAN @@ -60,6 +60,6 @@ substructures: "https://gedcom.io/terms/v7/MIME": "{0:1}" superstructures: - "https://gedcom.io/terms/v7/NOTE": "{0:1}" + "https://gedcom.io/terms/v7/NOTE": "{0:M}" "https://gedcom.io/terms/v7/record-SNOTE": "{0:M}" ... diff --git a/extracted-files/tags/type-Date b/extracted-files/tags/type-Date index f0a8fe33..209c877a 100644 --- a/extracted-files/tags/type-Date +++ b/extracted-files/tags/type-Date @@ -63,9 +63,13 @@ specification: TO x Lasted for multiple days, ending on x. - BET xAFT x Exact date unknown, but no earlier than x. + BET x Exact date unknown, but no earlier than x. - AND xBEF x Exact date unknown, but no later than x. + AND x Exact date unknown, but no later than x. + + BEF x Exact date unknown, but no later than x. + + AFT x Exact date unknown, but no earlier than x. ABT x Exact date unknown, but near x. diff --git a/extracted-files/tags/type-Enum b/extracted-files/tags/type-Enum index 937a4340..14b8833e 100644 --- a/extracted-files/tags/type-Enum +++ b/extracted-files/tags/type-Enum @@ -9,15 +9,17 @@ uri: https://gedcom.io/terms/v7/type-Enum specification: - | An enumeration is a selection from a set of options. They are represented - as a string matching the same production as a tag. + as a string matching the same production as a tag, with the additional + permission that standard enumerations may be integers. - Enum = Tag + stdEnum = stdTag / Integer + Enum = stdEnum / extTag Each structure type with an enumeration payload also defines specific - payload values it permits. These permitted payloads match production stdTag - and should each have a defined URI. Payload values that match production - extTag are always permitted in structures with an enumeration payload and - have their URI defined by the schema. + payload values it permits. These permitted payloads match production + stdEnum and should each have a defined URI. Payload values that match + production extTag are always permitted in structures with an enumeration + payload and have their URI defined by the schema. Each enumeration value has a distinct meaning as identified by its corresponding URI. diff --git a/extracted-files/tags/type-Time b/extracted-files/tags/type-Time index 812e8eb6..91909f18 100644 --- a/extracted-files/tags/type-Time +++ b/extracted-files/tags/type-Time @@ -12,7 +12,8 @@ specification: 11:00 PM). It may be represented either in event-local time or in Coordinated Universal Time (UTC). UTC is indicated by including a Z (U+005A) after the time value; event-local time is indicated by its - absence. + absence. When a time is used together with a DateExact, it is recommended + that UTC time be used rather than event-local time. Time = hour ":" minute [":" second ["." fraction]] [%s"Z"]