Merge main into next-minor (#421)

* Update gedstruct to make cross reference identifiers optional Fixes #408 Signed-off-by: Dave Thaler <[email protected]> * Revert "Update gedstruct to make cross reference identifiers optional" * Deprecate using stdTag in non-standard ways As discussed in issue #97 Signed-off-by: Dave Thaler <[email protected]> * Update specification/gedcom-1-hierarchical-container-format.md * Update gedcom-3-structures-3-meaning.md (#423) Copy a line from next-minor per #416 * Fix typos (#431) Fix spelling of "contains" in a README file. Fix formatting in GEDCOM spec caused by lack of a blank line before bulleted list. Change bullets in source from "*" to "-" just for consistency with rest of source. Signed-off-by: Dave Thaler <[email protected]> Co-authored-by: Dave Thaler <[email protected]> * Add note about oddly formed age payloads (#432) * Add note about oddly formed age payloads Signed-off-by: Dave Thaler <[email protected]> * Update specification/gedcom-2-data-types.md Co-authored-by: Luther Tychonievich <[email protected]> --------- Signed-off-by: Dave Thaler <[email protected]> Co-authored-by: Dave Thaler <[email protected]> Co-authored-by: Luther Tychonievich <[email protected]> * Update extracted files (#427) Co-authored-by: Dave Thaler <[email protected]> --------- Signed-off-by: Dave Thaler <[email protected]> Co-authored-by: Dave Thaler <[email protected]> Co-authored-by: Dave Thaler <[email protected]> Co-authored-by: Luther Tychonievich <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Dave Thaler <[email protected]>
FamilySearch · Feb 8, 2024 · ea8a124 · ea8a124
1 parent 5a8180e
commit ea8a124
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/extracted-files/README.md b/extracted-files/README.md
@@ -12,7 +12,7 @@ All files in this directory and its sub-directories, except for this README file
 - Various TSV files provide simple look-ups; all of this information is also available in the YAML files
     - `cardinalities.tsv` contains (superstructure type, substructure type, cardinality of substructure) triples.
     - `enumrations.tsv` contains (enumeration set, enumeration value) pairs.
-    - `enumerationsets.tsv` contaisn (structure type, enmeration set) pairs.
+    - `enumerationsets.tsv` contains (structure type, enmeration set) pairs.
     - `payloads.tsv` contains (structure type, payload type) pairs.
     - `substructures.tsv` contains (superstructure type, substructure tag, substructure type) triples.
 

diff --git a/extracted-files/tags/type-Age b/extracted-files/tags/type-Age
@@ -49,6 +49,16 @@ specification:
     be unaware of these traditions or may fail to convert them to the round-down
     convention, errors in age of up to a year are common.
 
+    <div class="note">
+
+    Because age payloads are intended to allow recording the age as it was recorded
+    in records that could contain errors, odd ages such as `8w 30d`, `1y 400d`,
+    `1y 30m`, etc. are permitted. Some applications might convert these to more
+    standard forms; if so, it is recommended that they use a `PHRASE` substructure
+    to hold the original form.
+
+    </div>
+
     Age payloads may also be omitted entirely if no suitable form is known but a
     substructure (such as a `PHRASE`) is desired.
 

diff --git a/specification/gedcom-1-hierarchical-container-format.md b/specification/gedcom-1-hierarchical-container-format.md
@@ -319,7 +319,7 @@ Extensions cannot change existing meanings, cardinalities, or calendars.
 A **tagged extension structure** is a structure whose tag matches production `extTag`. Tagged extension structures may appear as records or substructures of any other structure. Their meaning is defined by their tag, as is discussed more fully in the section [Extension Tags].
 
 Any substructure of a tagged extension structure that uses a tag matching `stdTag` is an **extension-defined substructure**.
-Substructures of an extension-defined substructure that uses a tag matching `stdTag` are also extension-defined substructures.
+Substructures of an extension-defined substructure that uses a tag matching `stdTag` are also extension-defined substructures, but this specification deprecates using a `stdTag` with a definition that does not match any standard type with that tag.
 The meaning and use of each extension-defined substructure is defined by the tagged extension structure it occurs within, not by its tag alone nor by this specification.
 
 :::example
@@ -337,7 +337,8 @@ In the following
 ```
 
 - Both uses of `_LOC` are tagged extension structures, as is `_POP`.
-- `_LOC`.`NAME` and `_LOC`.`NAME`.`DATE` are both extension-defined substructures. Their meaning is defined by the specification defining `_LOC`.
+- `_LOC`.`NAME` and `_LOC`.`NAME`.`DATE` are both extension-defined substructures. Their meaning is defined by the specification defining `_LOC`, but since no standard definition of `NAME` permits `DATE` as a substructure, such use is
+deprecated.
 - `_POP`.`DATE` is an extension-defined substructure. Its meaning is defined by the specification defining `_POP`.
 - Even though both `DATE`s appear to have `g7:type-DATE` payloads, we can't know that is the intended data type without consulting the defining specifications of `_LOC` and `_POP`, respectively. The first might be a `g7:type-DATE#period` and the second a `g7:type-DATE#exact`, for example.
 :::

diff --git a/specification/gedcom-2-data-types.md b/specification/gedcom-2-data-types.md
@@ -225,6 +225,12 @@ Because numbers are rounded down, `>` effectively includes its endpoint; that is
 
 Different cultures count ages differently. Some increment years on the anniversary of birth and others at particular seasons. Some round to the nearest year, others round years down, others round years up. Because users may be unaware of these traditions or may fail to convert them to the round-down convention, errors in age of up to a year are common.
 
+:::note
+Because age payloads are intended to allow recording the age as it was recorded in records that could contain errors,
+odd ages such as `8w 30d`, `1y 400d`, `1y 30m`, etc. are permitted.  Some applications might convert these to more
+standard forms; if so, it is recommended that they use a `PHRASE` substructure to hold the original form.
+:::
+
 Age payloads may also be omitted entirely if no suitable form is known but a substructure (such as a `PHRASE`) is desired.
 
 :::note
@@ -304,13 +310,14 @@ registered values and extension values.
 MediaType = type "/" subtype parameters
 ```
 where:
-* `type` and `subtype` are defined in [RFC 2045](https://www.rfc-editor.org/info/rfc2045)
+
+- `type` and `subtype` are defined in [RFC 2045](https://www.rfc-editor.org/info/rfc2045)
   section 5.1, and registered values (i.e., those not beginning with "x-") are further
   constrained by the definitions in
   [RFC 6838](https://www.rfc-editor.org/info/rfc6838), section 4.2.
   A [registry of media types](https://www.iana.org/assignments/media-types/media-types.xhtml)
   is maintained publicly by the IANA.
-* `parameters` is defined in [RFC 9110](https://www.rfc-editor.org/info/rfc9110),
+- `parameters` is defined in [RFC 9110](https://www.rfc-editor.org/info/rfc9110),
   section 5.6.6.  Note that the `parameters` definition in GEDCOM matches that used by HTTP
   headers which permit whitespace around the ";" delimiter, whereas email headers in
   RFC 2045 do not.