Skip to content

Commit

Permalink
Merge branch 'main' into head-sour-data
Browse files Browse the repository at this point in the history
  • Loading branch information
dthaler authored Oct 8, 2024
2 parents 3d74920 + f17281b commit f3e0165
Show file tree
Hide file tree
Showing 11 changed files with 64 additions and 16 deletions.
1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# For documentation on the format of this file, see
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
---

version: 2
updates:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/generate-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#
# For documentation on the syntax of this file, see
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
---
name: Build

on:

Check warning on line 11 in .github/workflows/generate-files.yml

View workflow job for this annotation

GitHub Actions / validate-yaml

11:1 [truthy] truthy value should be one of [false, true]
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/propagate-main-to-v7.1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#
# For documentation on the syntax of this file, see
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
---
name: Build

on:

Check warning on line 11 in .github/workflows/propagate-main-to-v7.1.yml

View workflow job for this annotation

GitHub Actions / validate-yaml

11:1 [truthy] truthy value should be one of [false, true]
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/validate-yaml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#
# For documentation on the syntax of this file, see
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
---
name: Validate-YAML

on:

Check warning on line 9 in .github/workflows/validate-yaml.yml

View workflow job for this annotation

GitHub Actions / validate-yaml

9:1 [truthy] truthy value should be one of [false, true]
Expand Down
1 change: 1 addition & 0 deletions .yamllint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Configuration file for yamllint. For documentation, see
# https://yamllint.readthedocs.io/en/stable/configuration.html
---

extends: default

Expand Down
21 changes: 20 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
# Version 7.0.15

- Clarified that `FORM`.`MEDI` describe the original medium, not the derived medium, when used with derived files.

- Clarified the meaning of the `WWW` structure, which previously only mentioned its payload datatype.

- Clarified `PLAC` to both define "jurisdiction" and document its meaning in the absence of a `PLAC`.`FORM`.

- Clarified what the term "principal date" means in different contexts in the definition of `g7:DATE`.

- Updated `NICK` to no longer suggest that some names are "improper" and to document the diversity of views in what a "nickname" is.

- Removed confusing reference to superstructures in the meaning of a documented extension tag.

- Added ABNF for more datatypes and updated DIGIT's capitalization for compatibility with more ABNF toolchains.

- Various typo corrections.


# Version 7.0.14

- Recommend that `NO XYZ` only be used where `XYZ` is permitted (its meaning is undefined elsewhere).
Expand All @@ -8,7 +27,7 @@

- 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.
- Deprecate the ability to use extension-defined substructures `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.

Expand Down
24 changes: 24 additions & 0 deletions exid-types.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,28 @@
"change-controller": "FindAGrave.com",
"reference": "https://support.findagrave.com/s/article/Cemetery-Search"
}
{
"label": "BillionGraves Grave ID",
"type": "https://www.billiongraves.com/grave/name/",
"description": "BillionGraves Grave ID",
"contact": "[email protected]",
"change-controller": "BillionGraves.com",
"reference": "https://billiongraves.com/search"
},
{
"label": "BillionGraves Cemetery ID",
"type": "https://www.billiongraves.com/cemetery/name/",
"description": "BillionGraves Cemetery ID",
"contact": "[email protected]",
"change-controller": "BillionGraves.com",
"reference": "https://billiongraves.com/search/cemetery"
}
{
"label": "WikiTree Person ID",
"type": "https://www.wikitree.com/wiki/",
"description": "WikiTree Person ID",
"contact": "[email protected]",
"change-controller": "wikitree.com",
"reference": "https://www.wikitree.com/wiki/Help:WikiTree_ID"
},
]
8 changes: 4 additions & 4 deletions extracted-files/tags/PLAC
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ specification:
The principal place in which the superstructure's subject occurred, represented
as a [List] of jurisdictional entities in a sequence from the lowest to the
highest jurisdiction, where "jurisdiction" includes units in a political,
ecclesiastical, and geographical hierarchies and may include units as large as
a nation or as specific as a building, farm, or cemetery. As with other lists,
the jurisdictions are separated by commas. Any jurisdiction's name that is
missing is still accounted for by an empty string in the list.
ecclesiastical, and geographical hierarchies and may include units of any size,
such as a continent, "at sea", or a specific building, farm, or cemetery. As
with other lists, the jurisdictions are separated by commas. Any jurisdiction's
name that is missing is still accounted for by an empty string in the list.

The type of each jurisdiction is given in the `PLAC`.`FORM` substructure, if
present, or in the `HEAD`.`PLAC`.`FORM` structure. If neither is present, the
Expand Down
18 changes: 9 additions & 9 deletions extracted-files/tags/cal-HEBREW
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@ specification:
(1 Tishrei 1) primarily overlapped with Gregorian 7 September 3761 BCE and
Julian 7 October 3761 BCE (starting at sunset on the 6th day of those months).

| Code | Name |
| :---- | :---------------------------------------------------------------------- |
| `TSH` | Tishrei (תִּשְׁרֵי) |
| `CSH` | Marcheshvan (מַרְחֶשְׁוָן) or Cheshvan (חֶשְׁוָן) |
| `KSL` | Kislev (כִּסְלֵו) |
| Code | Name |
| :---- | :-------------------------------------------------------------------- |
| `TSH` | Tishrei (תִּשְׁרֵי) |
| `CSH` | Marcheshvan (מַרְחֶשְׁוָן) or Cheshvan (חֶשְׁוָן) |
| `KSL` | Kislev (כִּסְלֵו) |
| `TVT` | Tevet (טֵבֵת) |
| `SHV` | Shevat (שְׁבָט) |
| `ADR` | Adar I, Adar Rishon, First Adar, or Adar Aleph (אדר א׳) |
| `SHV` | Shevat (שְׁבָט) |
| `ADR` | Adar I, Adar Rishon, First Adar, or Adar Aleph (אדר א׳) |
| `ADS` | Adar (אֲדָר); or Adar II, Adar Sheni, Second Adar, or Adar Bet (אדר ב׳) |
| `NSN` | Nisan (נִיסָן) |
| `IYR` | Iyar (אִייָר) |
| `SVN` | Sivan (סִיוָן) |
| `TMZ` | Tammuz (תַּמּוּז) |
| `AAV` | Av (אָב) |
| `TMZ` | Tammuz (תַּמּוּז) |
| `AAV` | Av (אָב) |
| `ELL` | Elul (אֱלוּל) |

To keep the lunar-based months synchronized with the solar-based years, some
Expand Down
2 changes: 1 addition & 1 deletion specification/gedcom-0-introduction.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: The FamilySearch GEDCOM Specification
subtitle: 7.0.14
subtitle: 7.0.15
email: [email protected]
copyright: |
:::{style="page-break-after: always;page-break-before: always;"}
Expand Down
2 changes: 1 addition & 1 deletion specification/gedcom-3-structures-3-meaning.md
Original file line number Diff line number Diff line change
Expand Up @@ -1122,7 +1122,7 @@ A name given to a foundling orphan might be
The principal place in which the superstructure's subject occurred,
represented as a [List] of jurisdictional entities in a sequence from the lowest to the highest jurisdiction,
where "jurisdiction" includes units in a political, ecclesiastical, and geographical hierarchies
and may include units as large as a nation or as specific as a building, farm, or cemetery.
and may include units of any size, such as a continent, "at sea", or a specific building, farm, or cemetery.
As with other lists, the jurisdictions are separated by commas.
Any jurisdiction's name that is missing is still accounted for by an empty string in the list.

Expand Down

0 comments on commit f3e0165

Please sign in to comment.