-
Notifications
You must be signed in to change notification settings - Fork 27
Merge main into v7.1 (excluding extracted-files) #712
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.
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
base: v7.1
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,10 +20,6 @@ def slugify(bit): | |
| si = bit.rfind('`g7:')+4 | ||
| ei = bit.find('`', si) | ||
| slug = bit[si:ei].replace('#','-') | ||
| elif '`g7.1:' in bit: | ||
| si = bit.rfind('`g7.1:')+6 | ||
| ei = bit.find('`', si) | ||
| slug = bit[si:ei].replace('#','-') | ||
|
Comment on lines
-23
to
-26
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These lines should not be deleted |
||
| elif '`' in bit: | ||
| bit = re.search('`[A-Z0-9_`.]+`', bit) | ||
| slug = bit.group(0).replace('`','').replace('.','-') | ||
|
|
@@ -91,7 +87,7 @@ def abnf(m): | |
| slug = table_tags[m.group(1)] | ||
| return linkify(m.group(0), slug) | ||
| return m.group(0) | ||
| uried = re.sub(r'(?<![\[.`])`g7(?:\.1)?:[-A-Z0-9a-z`._#]+`', repl, line) | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This change should not be deleted |
||
| uried = re.sub(r'(?<![\[.`])`g7:[-A-Z0-9a-z`._#]+`', repl, line) | ||
| if istable: return uried | ||
| tagged = re.sub(r'(?<![\[.`])`[A-Z0-9`._#]+`', repl, uried) | ||
| abnfed = re.sub(r'(?<![\[.`])`([A-Za-z0-9]+)`', abnf, tagged) | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -176,9 +176,9 @@ The tag `ADOP` is used in this document to represent two structure types. | |
| Which one is meant can be identified by the superstructure type as follows: | ||
|
|
||
| | Superstructure type | Structure type identified by tag `ADOP` | | ||
| |---------------------|-----------------------------------------| | ||
| | `g7.1:record-INDI` | `g7:ADOP` | | ||
| | `g7:ADOP-FAMC` | `g7:FAMC-ADOP` | | ||
|
Comment on lines
-180
to
-181
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These changes should not be deleted |
||
| |------------------|------------------| | ||
| | `g7:record-INDI` | `g7:ADOP` | | ||
| | `g7:ADOP-FAMC` | `g7:FAMC-ADOP` | | ||
|
|
||
| An [extension-defined substructure](#extensions) could also be used to place either of these structure types in extension superstructures. | ||
|
|
||
|
|
@@ -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, but this specification deprecates using a `stdTag` with a definition that does not match any standard type with that tag. | ||
| Substructures of an extension-defined substructure that uses a tag matching `stdTag` are also extension-defined substructures. | ||
| 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 | ||
|
|
@@ -343,7 +343,9 @@ deprecated. | |
| - 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. | ||
| ::: | ||
|
|
||
| If an extension-defined substructure has a tag that is also used by one or more standard structures, its meaning and payload type should match at least one of those standard structure types. | ||
| Extension-defined substructures should match the structure type, payload, and substructure collection of at least one | ||
| standard type with the same tag, though it can add more substructures to the substructure collection. | ||
| This specification deprecates using a `stdTag` with a definition that does not match any standard type with that tag. | ||
|
|
||
| :::example | ||
| An extension-defined substructure with tag "`DATE`" should provide a date or date period relevant to its superstructure, as do all `DATE`-tagged structures in this specification. Extensions should not use "`DATE`" to tag a structure describing anything else (even something that might reasonably be abbreviated "date", such as someone an individual dated). | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line should not be deleted