Skip to content

Commit

Permalink
Merge main into next-minor (#435)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
5 people authored Feb 15, 2024
1 parent ea8a124 commit 86b6e62
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 11 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

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

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
NOTICE:

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

"FAMILYSEARCH GEDCOM™" and "FAMILYSEARCH®" are trademarks of Intellectual
Reserve, Inc. and may not be used except as allowed by the Apache 2.0 license
Expand Down
1 change: 1 addition & 0 deletions build/hyperlink.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,6 @@ def abnf(m):
# to.write(line)
else:
to.write(linkable(line, num))
to.write('\n\n') # ensure full break between each .md file

# 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
33 changes: 27 additions & 6 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
# Version 7.0.14

- Recommend that `NO XYZ` only be used where `XYZ` is permitted (its meaning is undefined elsewhere).

- 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).

- 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.

- 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.

- 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.

- Clarify that the "applies to" and "status" columns of `g7:enumset-ord-STAT` are recommendations, not restrictions.

- Clarify that AGE values may be larger than any calendar supports. This was always permitted; that fact is now called out more clearly.

- 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.

- Various typo corrections.


# Version 7.0.13

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

- Changes anticipating a coming extension registry:

- 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.
- 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.

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

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

- 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.
- 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.

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

Expand Down Expand Up @@ -220,7 +241,7 @@

# Version 7.0.0

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

This version is the first version to use [semantic versioning](https://semver.org/).
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.
Expand Down Expand Up @@ -302,7 +323,7 @@ Earlier versions of GEDCOM predated language tags, media types, and Unicode beca

## New Extensibility

- 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.
- 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.

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

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

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

- 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
- 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

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

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

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

- `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
- `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

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.

Expand Down
6 changes: 3 additions & 3 deletions specification/gedcom-0-introduction.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
title: The FamilySearch GEDCOM Specification
subtitle: 7.0.13
subtitle: 7.0.14
email: [email protected]
copyright: |
:::{style="page-break-after: always;page-break-before: always;"}
Copyright 1984–2023 Intellectual Reserve, Inc. All rights reserved. A service provided by The Church of Jesus Christ of Latter-day Saints.
Copyright 1984–2024 Intellectual Reserve, Inc. All rights reserved. A service provided by The Church of Jesus Christ of Latter-day Saints.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -20,7 +20,7 @@ copyright: |
> NOTICE:
>
> This work comprises, is based on, or is derived from the FAMILYSEARCH GEDCOM™ Specification, © 1984-2023 Intellectual Reserve, Inc. All rights reserved.
> This work comprises, is based on, or is derived from the FAMILYSEARCH GEDCOM™ Specification, © 1984-2024 Intellectual Reserve, Inc. All rights reserved.
>
> "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.
:::
Expand Down

0 comments on commit 86b6e62

Please sign in to comment.