Skip to content

Commit 86b6e62

Browse files
github-actions[bot]dthaler2dthalertychonievich
authored
Merge main into next-minor (#435)
* 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]> * V7 0 14 (#434) * Prepare for 7.0.14 release * Make rendering more robust by not requiring blank lines at the end of individual .md files * Update changelog.md Co-authored-by: Dave Thaler <[email protected]> * Update copyright statements to 2024 --------- Co-authored-by: Dave Thaler <[email protected]> * typos in changelog (#436) --------- 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]>
1 parent ea8a124 commit 86b6e62

File tree

5 files changed

+33
-11
lines changed

5 files changed

+33
-11
lines changed

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 1984-2023 Intellectual Reserve, Inc. All rights reserved. A service provided by The Church of Jesus Christ of Latter-day Saints.
189+
Copyright 1984-2024 Intellectual Reserve, Inc. All rights reserved. A service provided by The Church of Jesus Christ of Latter-day Saints.
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

NOTICE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
NOTICE:
22

33
This work comprises, is based on, or is derived from the FAMILYSEARCH GEDCOM™
4-
Specification, © 1984-2023 Intellectual Reserve, Inc. All rights reserved.
4+
Specification, © 1984-2024 Intellectual Reserve, Inc. All rights reserved.
55

66
"FAMILYSEARCH GEDCOM™" and "FAMILYSEARCH®" are trademarks of Intellectual
77
Reserve, Inc. and may not be used except as allowed by the Apache 2.0 license

build/hyperlink.py

+1
Original file line numberDiff line numberDiff line change
@@ -111,5 +111,6 @@ def abnf(m):
111111
# to.write(line)
112112
else:
113113
to.write(linkable(line, num))
114+
to.write('\n\n') # ensure full break between each .md file
114115

115116
# Step 3 is adding links inside gedstruct code blocks. This cannot be done in markdown, so it is handled by a separate processor for the HTML

changelog.md

+27-6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
# Version 7.0.14
2+
3+
- Recommend that `NO XYZ` only be used where `XYZ` is permitted (its meaning is undefined elsewhere).
4+
5+
- Recommend that a given `INDI` have at most one `FAMC` pointing to a given `FAM` (having more than one has unclear meaning); and likewise that a given `FAM` have at most one `CHIL` pointing to a given `INDI` (having more than one indicates nonsensical birth order).
6+
7+
- Refactor presentation of local files to better match related RFCs and only make implementable constraints, and to use its own `<FilePath>` datatype instead of `<Special>`. This does not change `FILE` payloads, only how they are specified to better support automated tooling.
8+
9+
- Refactor the enumeration tags `CENS`, `EVEN`, `FACT`, `NCHI`, and `RESI` to have different URIs, removing a previous parsing ambiguity. This changes neither the set of tags permitted in any enumeration set nor those tags' meaning, only how they are specified to better support automated tooling.
10+
11+
- Deprecate extension-defined substructures using `stdTag` in a way incompatible with any standard definition of that tag. The now-deprecated use was common in 5.5.1 and is permitted in 7.0, but can prevent extension structures from being adopted as-is as new standard structures in future versions of the specification.
12+
13+
- Clarify that the "applies to" and "status" columns of `g7:enumset-ord-STAT` are recommendations, not restrictions.
14+
15+
- Clarify that AGE values may be larger than any calendar supports. This was always permitted; that fact is now called out more clearly.
16+
17+
- Clarify that records cannot be relocated standard structures. This was always incompatible with the definition of relocated standard structures; that fact is now called out more clearly.
18+
19+
- Various typo corrections.
20+
21+
122
# Version 7.0.13
223

324
- Deprecated `ADR1`, `ADR2`, and `ADR3` which convey no information not already in `ADDR`.
@@ -73,7 +94,7 @@
7394

7495
- Changes anticipating a coming extension registry:
7596

76-
- Add URIs for sets of enumeration values. This has changes some fragment identifiers in the HTML version of the spec and could cause hotlinks to the specific sections discussing enumeration sets to change.
97+
- Add URIs for sets of enumeration values. This changed some fragment identifiers in the HTML version of the spec and could cause hotlinks to the specific sections discussing enumeration sets to change.
7798

7899
- Many updates to the YAML format served at <https://gedcom.io/terms/v7/record-INDI> and at the other URIs in the specification.
79100

@@ -139,7 +160,7 @@
139160
- `mul` can be used if there is no single primary language, but is unlikely to provide practical functionality beyond `und`.
140161
- `zxx` can be used for ASCII art and other non-language text, and can improve accessibility for screen readers.
141162

142-
- Clarify that empty *payloads* are encoded as missing `LineVal`s and empty `LineVal`s are not been permitted; this has been true since 7.0.0 but was easily overlooked in the previous text.
163+
- Clarify that empty *payloads* are encoded as missing `LineVal`s and empty `LineVal`s are not permitted; this has been true since 7.0.0 but was easily overlooked in the previous text.
143164

144165
- Note cases where the same couple might be the partners in multiple `FAM` records.
145166

@@ -220,7 +241,7 @@
220241

221242
# Version 7.0.0
222243

223-
As a major release and the first update to the specification in 20 years, there a many changes in this version.
244+
As a major release and the first update to the specification in 20 years, there are many changes in this version.
224245

225246
This version is the first version to use [semantic versioning](https://semver.org/).
226247
7 was chosen as the new major version number because 1 through 6 were each used previously, some for released standards and others for abandoned drafts.
@@ -302,7 +323,7 @@ Earlier versions of GEDCOM predated language tags, media types, and Unicode beca
302323

303324
## New Extensibility
304325

305-
- Every standard tag now has a single "default" meaning, even if it also has additional meanings in other contexts. Tags conforming to this default meaning can now be used by extensions as substructures of structures with extention tags.
326+
- Every standard tag now has a single "default" meaning, even if it also has additional meanings in other contexts. Tags conforming to this default meaning can now be used by extensions as substructures of structures with extension tags.
306327

307328
- Extension tags remain in a backwards-compatible way, but should additionally be paired with a URI to avoid name collisions and provide documentation.
308329

@@ -326,7 +347,7 @@ Earlier versions of GEDCOM predated language tags, media types, and Unicode beca
326347

327348
- Age phrases are now only phrases, not long-hand terms for specific age ranges
328349

329-
- Previously registered values (APPROVED_SYSTEM_ID, RECEIVING_SYSTEM_NAME, etc) are kept as-is if present; new ones are URIs instead of having a separate registration process
350+
- Previously registered values (APPROVED_SYSTEM_ID, RECEIVING_SYSTEM_NAME, etc.) are kept as-is if present; new ones are URIs instead of having a separate registration process
330351

331352
- `RESI` may have a payload, just as all other attributes may
332353

@@ -344,7 +365,7 @@ Various ambiguities were identified in version 5.5.1: some due to poor wording,
344365

345366
- Dual-year dates were used with widely different semantics and have been replaced by more flexibility in date phrases.
346367

347-
- `SEX` is now unambiguously biological sex at birth; all other related concepts (gender identity, sexual preference, sex reassignment, etc) are time-varying attributes and to be stored in an individual attribute instead
368+
- `SEX` is now unambiguously biological sex at birth; all other related concepts (gender identity, sexual preference, sex reassignment, etc.) are time-varying attributes and to be stored in an individual attribute instead
348369

349370
Note that new tags were not introduced for gender-related attributes. It is not yet clear what the correct set of attribute types should be given the evolving and regionally-specific understanding of these concepts. The generic `FACT` is recommended for these concepts instead.
350371

specification/gedcom-0-introduction.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: The FamilySearch GEDCOM Specification
3-
subtitle: 7.0.13
3+
subtitle: 7.0.14
44
55
copyright: |
66
:::{style="page-break-after: always;page-break-before: always;"}
7-
Copyright 1984–2023 Intellectual Reserve, Inc. All rights reserved. A service provided by The Church of Jesus Christ of Latter-day Saints.
7+
Copyright 1984–2024 Intellectual Reserve, Inc. All rights reserved. A service provided by The Church of Jesus Christ of Latter-day Saints.
88
99
Licensed under the Apache License, Version 2.0 (the "License");
1010
you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ copyright: |
2020
2121
> NOTICE:
2222
>
23-
> This work comprises, is based on, or is derived from the FAMILYSEARCH GEDCOM™ Specification, © 1984-2023 Intellectual Reserve, Inc. All rights reserved.
23+
> This work comprises, is based on, or is derived from the FAMILYSEARCH GEDCOM™ Specification, © 1984-2024 Intellectual Reserve, Inc. All rights reserved.
2424
>
2525
> "FAMILYSEARCH GEDCOM™" and "FAMILYSEARCH®" are trademarks of Intellectual Reserve, Inc. and may not be used except as allowed by the Apache 2.0 license that governs this work or as expressly authorized in writing and in advance by Intellectual Reserve, Inc.
2626
:::

0 commit comments

Comments
 (0)