Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GEDCOM: Update tag to record #3386

Merged
merged 3 commits into from Mar 13, 2022
Merged

GEDCOM: Update tag to record #3386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ccb0d3a
Update `tag` to `record` (GEDCOM 5.5.5 spec terminology update)
hoonweiting Mar 13, 2022
b6557e4
Update tests
hoonweiting Mar 13, 2022
7364e4b
Remove `string` alias
hoonweiting Mar 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/prism-gedcom.js
View file
Open in desktop
Expand Up @@ -10,11 +10,11 @@ Prism.languages.gedcom = {
}
}
},
'tag': {
'record': {
// Preceded by level and optional pointer
pattern: /(^[\t ]*\d+ +(?:@\w[\w!"$%&'()*+,\-./:;<=>?[\\\]^`{|}~\x80-\xfe #]*@ +)?)\w+/m,
lookbehind: true,
alias: 'string'
alias: 'tag'
},
'level': {
pattern: /(^[\t ]*)\d+/m,
Expand Down
2 changes: 1 addition & 1 deletion components/prism-gedcom.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions tests/languages/gedcom/level_feature.test
View file
Open in desktop
Expand Up @@ -6,15 +6,15 @@

[
["level", "0"],
["tag", "HEAD"],
["record", "HEAD"],
["level", "1"],
["tag", "CHAR"],
["record", "CHAR"],
["line-value", ["ASCII"]],
["level", "99"],
["tag", "FOO"],
["record", "FOO"],
["line-value", ["bar"]]
]

----------------------------------------------------

Checks for levels.
Checks for levels.
12 changes: 6 additions & 6 deletions tests/languages/gedcom/line-value_feature.test
View file
Open in desktop
Expand Up @@ -8,22 +8,22 @@

[
["level", "1"],
["tag", "CHIL"],
["record", "CHIL"],
["line-value", [["pointer", "@CHILD1@"]]],
["level", "2"],
["tag", "PLAC"],
["record", "PLAC"],
["line-value", ["ÁĆÉǴÍ,ḰĹḾŃÓ,ṔŔŚÚẂ,ÝŹáćé,ǵíḱĺḿ,ńóṕŕś,úẃýź"]],
["level", "1"],
["tag", "NAME"],
["record", "NAME"],
["line-value", ["code: 0313/COMMA ABOVE/"]],
["level", "2"],
["tag", "DATE"],
["record", "DATE"],
["line-value", ["@#DGREGORIAN@ 31 DEC 1997"]],
["level", "2"],
["tag", "CONT"],
["record", "CONT"],
["line-value", ["Copyright gedcom@@gedcom.org"]]
]

----------------------------------------------------

Checks for line values.
Checks for line values.
6 changes: 3 additions & 3 deletions tests/languages/gedcom/pointer_feature.test
View file
Open in desktop
Expand Up @@ -12,12 +12,12 @@
["pointer", "@_$!\"$%&'()*+,-./:;<=>?[\\]^`{|}~ #foobar@"],
["level", "0"],
["pointer", "@SUBMITTER@"],
["tag", "SUBM"],
["record", "SUBM"],
["level", "1"],
["tag", "FAMS"],
["record", "FAMS"],
["line-value", [["pointer", "@FAMILY@"]]]
]

----------------------------------------------------

Checks for pointers.
Checks for pointers.
50 changes: 25 additions & 25 deletions tests/languages/gedcom/tag_feature.test → tests/languages/gedcom/record_feature.test
View file
Open in desktop
@@ -1,25 +1,25 @@
0 HEAD
1 foo_bar
2 _
3 @pointer@ _Sometag42
4 247
----------------------------------------------------
[
["level", "0"],
["tag", "HEAD"],
["level", "1"],
["tag", "foo_bar"],
["level", "2"],
["tag", "_"],
["level", "3"],
["pointer", "@pointer@"],
["tag", "_Sometag42"],
["level", "4"],
["tag", "247"]
]
----------------------------------------------------
Checks for tags.
0 HEAD
1 foo_bar
2 _
3 @pointer@ _Sometag42
4 247

----------------------------------------------------

[
["level", "0"],
["record", "HEAD"],
["level", "1"],
["record", "foo_bar"],
["level", "2"],
["record", "_"],
["level", "3"],
["pointer", "@pointer@"],
["record", "_Sometag42"],
["level", "4"],
["record", "247"]
]

----------------------------------------------------

Checks for records.