rename descriptions "specification"; fix errors in YAML extraction sc…

…ript
FamilySearch · Sep 7, 2022 · 2499fd9 · 2499fd9
1 parent 3e57c50
commit 2499fd9
Show file tree

Hide file tree

Showing 300 changed files with 324 additions and 311 deletions.
diff --git a/build/Makefile b/build/Makefile
@@ -1,6 +1,7 @@
 SPECDIR = ../specification/
 EXTDIR = ../extracted-files/
 MD_FILES = $(sort $(wildcard $(SPECDIR)gedcom*.md))
+TERMS_FILES = $(sort $(wildcard $(SPECDIR)/terms/*))
 HTML_FILE = $(SPECDIR)gedcom.html
 PDF_FILE = $(SPECDIR)gedcom.pdf
 GRAMMARS = $(EXTDIR)grammar.abnf $(EXTDIR)grammar.gedstruct
@@ -19,7 +20,7 @@ $(PDF_FILE): $(HTML_FILE)
 $(HTML_FILE): hyperlink-code.py GEDCOM-tmp.html
 	python3 hyperlink-code.py GEDCOM-tmp.html $(HTML_FILE)
 
-$(TAGDEFS): $(MD_FILES) uri-def.py
+$(TAGDEFS): $(MD_FILES) $(TERMS_FILES) uri-def.py
 	python3 uri-def.py $(MD_FILES) $(TAGDEFS)
 	touch $(TAGDEFS)
 

diff --git a/build/uri-def.py b/build/uri-def.py
@@ -346,11 +346,11 @@ def expand_prefix(txt, prefixes):
             print('\nuri:', uri, file=fh)
 
             if g7[tag][0] in ('structure', 'enumeration', 'calendar', 'month'):
-                ptag = re.sub(r'.*-', '', tag)
-                print('\nstandard tag: '+ptag, file=fh)
+                ptag = re.sub(r'.*-', '', re.sub(r'-[A-Z]?[a-z].*', '', tag))
+                print('\nstandard tag: '+(repr(ptag) if ptag in ('YES','NO','TRUE','FALSE', '0', '1', '2', '3') else ptag), file=fh)
 
             if len(g7[tag][1]) > 0:
-                print('\ndescriptions:', file=fh)
+                print('\nspecification:', file=fh)
                 for desc in g7[tag][1]:
                     print(yaml_str_helper('  - ', desc), file=fh)
             if g7[tag][0] == 'structure':

diff --git a/extracted-files/substructures.tsv b/extracted-files/substructures.tsv
@@ -355,10 +355,10 @@ https://gedcom.io/terms/v7/SLGS	DATE	https://gedcom.io/terms/v7/DATE
 https://gedcom.io/terms/v7/SOUR-DATA	DATE	https://gedcom.io/terms/v7/DATE
 https://gedcom.io/terms/v7/SSN	DATE	https://gedcom.io/terms/v7/DATE
 https://gedcom.io/terms/v7/WILL	DATE	https://gedcom.io/terms/v7/DATE
-https://gedcom.io/terms/v7/CHAN	exact	https://gedcom.io/terms/v7/DATE-exact
-https://gedcom.io/terms/v7/CREA	exact	https://gedcom.io/terms/v7/DATE-exact
-https://gedcom.io/terms/v7/HEAD-SOUR-DATA	exact	https://gedcom.io/terms/v7/DATE-exact
-https://gedcom.io/terms/v7/ord-STAT	exact	https://gedcom.io/terms/v7/DATE-exact
+https://gedcom.io/terms/v7/CHAN	DATE	https://gedcom.io/terms/v7/DATE-exact
+https://gedcom.io/terms/v7/CREA	DATE	https://gedcom.io/terms/v7/DATE-exact
+https://gedcom.io/terms/v7/HEAD-SOUR-DATA	DATE	https://gedcom.io/terms/v7/DATE-exact
+https://gedcom.io/terms/v7/ord-STAT	DATE	https://gedcom.io/terms/v7/DATE-exact
 HEAD pseudostructure	DATE	https://gedcom.io/terms/v7/HEAD-DATE
 https://gedcom.io/terms/v7/NO	DATE	https://gedcom.io/terms/v7/NO-DATE
 https://gedcom.io/terms/v7/DATA-EVEN	DATE	https://gedcom.io/terms/v7/DATA-EVEN-DATE

diff --git a/extracted-files/tags/ABBR b/extracted-files/tags/ABBR
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/ABBR
 
 standard tag: ABBR
 
-descriptions:
+specification:
   - Abbreviation
   - A short name of a title, description, or name used for sorting, filing, and
     retrieving records.

diff --git a/extracted-files/tags/ADDR b/extracted-files/tags/ADDR
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/ADDR
 
 standard tag: ADDR
 
-descriptions:
+specification:
   - Address
   - The location of, or most relevant to, the subject of the superstructure.
     See ADDRESS_STRUCTURE for more.

diff --git a/extracted-files/tags/ADOP b/extracted-files/tags/ADOP
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/ADOP
 
 standard tag: ADOP
 
-descriptions:
+specification:
   - Adoption
   - An Individual Event. See also INDIVIDUAL_EVENT_STRUCTURE.
   - adoption

diff --git a/extracted-files/tags/ADOP-FAMC b/extracted-files/tags/ADOP-FAMC
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/ADOP-FAMC
 
 standard tag: FAMC
 
-descriptions:
+specification:
   - Family child
   - |
     The individual or couple that adopted this this individual.

diff --git a/extracted-files/tags/ADR1 b/extracted-files/tags/ADR1
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/ADR1
 
 standard tag: ADR1
 
-descriptions:
+specification:
   - Address Line 1
   - The first line of the address, used for indexing. This structure’s payload
     should be a single line of text equal to the first line of the

diff --git a/extracted-files/tags/ADR2 b/extracted-files/tags/ADR2
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/ADR2
 
 standard tag: ADR2
 
-descriptions:
+specification:
   - Address Line 2
   - The second line of the address, used for indexing. This structure’s payload
     should be a single line of text equal to the second line of the

diff --git a/extracted-files/tags/ADR3 b/extracted-files/tags/ADR3
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/ADR3
 
 standard tag: ADR3
 
-descriptions:
+specification:
   - Address Line 3
   - The third line of the address, used for indexing. This structure’s payload
     should be a single line of text equal to the third line of the

diff --git a/extracted-files/tags/AFN b/extracted-files/tags/AFN
@@ -1,10 +1,12 @@
 %YAML 1.2
 ---
+lang: en
+
 type: uri
 
 uri: https://gedcom.io/terms/v7/AFN
 
-descriptions:
+specification:
   - Ancestral File Number
   - |
     This URI is defined to support conversion from GEDCOM 5.5.1 to FamilySearch

diff --git a/extracted-files/tags/AGE b/extracted-files/tags/AGE
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/AGE
 
 standard tag: AGE
 
-descriptions:
+specification:
   - Age at event
   - The age of the individual at the time an event occurred, or the age listed
     in the document.

diff --git a/extracted-files/tags/AGNC b/extracted-files/tags/AGNC
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/AGNC
 
 standard tag: AGNC
 
-descriptions:
+specification:
   - Responsible agency
   - The organization, institution, corporation, person, or other entity that
     has responsibility for the associated context. Examples are an employer of

diff --git a/extracted-files/tags/ALIA b/extracted-files/tags/ALIA
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/ALIA
 
 standard tag: ALIA
 
-descriptions:
+specification:
   - Alias
   - |
     A single individual may have facts distributed across multiple individual

diff --git a/extracted-files/tags/ANCI b/extracted-files/tags/ANCI
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/ANCI
 
 standard tag: ANCI
 
-descriptions:
+specification:
   - Ancestor interest
   - Indicates an interest in additional research for ancestors of this
     individual. (See also DESI).

diff --git a/extracted-files/tags/ANUL b/extracted-files/tags/ANUL
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/ANUL
 
 standard tag: ANUL
 
-descriptions:
+specification:
   - Annulment
   - A Family Event. See also FAMILY_EVENT_STRUCTURE.
   - annulment

diff --git a/extracted-files/tags/ASSO b/extracted-files/tags/ASSO
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/ASSO
 
 standard tag: ASSO
 
-descriptions:
+specification:
   - Associates
   - A pointer to an associated individual. See ASSOCIATION_STRUCTURE for more.
   - |

diff --git a/extracted-files/tags/AUTH b/extracted-files/tags/AUTH
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/AUTH
 
 standard tag: AUTH
 
-descriptions:
+specification:
   - Author
   - The person, agency, or entity who created the record. For a published work,
     this could be the author, compiler, transcriber, abstractor, or editor. For

diff --git a/extracted-files/tags/BAPL b/extracted-files/tags/BAPL
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/BAPL
 
 standard tag: BAPL
 
-descriptions:
+specification:
   - Baptism, Latter-Day Saint
   - A Latter-Day Saint Ordinance. See also LDS_INDIVIDUAL_ORDINANCE.
   - baptism

diff --git a/extracted-files/tags/BAPM b/extracted-files/tags/BAPM
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/BAPM
 
 standard tag: BAPM
 
-descriptions:
+specification:
   - Baptism
   - An Individual Event. See also INDIVIDUAL_EVENT_STRUCTURE.
   - baptism

diff --git a/extracted-files/tags/BARM b/extracted-files/tags/BARM
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/BARM
 
 standard tag: BARM
 
-descriptions:
+specification:
   - Bar Mitzvah
   - An Individual Event. See also INDIVIDUAL_EVENT_STRUCTURE.
   - Bar Mitzvah

diff --git a/extracted-files/tags/BASM b/extracted-files/tags/BASM
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/BASM
 
 standard tag: BASM
 
-descriptions:
+specification:
   - Bas Mitzvah
   - An Individual Event. See also INDIVIDUAL_EVENT_STRUCTURE.
   - Bas Mitzvah

diff --git a/extracted-files/tags/BIRT b/extracted-files/tags/BIRT
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/BIRT
 
 standard tag: BIRT
 
-descriptions:
+specification:
   - Birth
   - An Individual Event. See also INDIVIDUAL_EVENT_STRUCTURE.
   - birth

diff --git a/extracted-files/tags/BLES b/extracted-files/tags/BLES
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/BLES
 
 standard tag: BLES
 
-descriptions:
+specification:
   - Blessing
   - An Individual Event. See also INDIVIDUAL_EVENT_STRUCTURE.
   - blessing

diff --git a/extracted-files/tags/BURI b/extracted-files/tags/BURI
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/BURI
 
 standard tag: BURI
 
-descriptions:
+specification:
   - Burial
   - An Individual Event. See also INDIVIDUAL_EVENT_STRUCTURE.
   - burial

diff --git a/extracted-files/tags/CALN b/extracted-files/tags/CALN
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/CALN
 
 standard tag: CALN
 
-descriptions:
+specification:
   - Call number
   - An identification or reference description used to file and retrieve items
     from the holdings of a repository. Despite the word “number” in the name,

diff --git a/extracted-files/tags/CAST b/extracted-files/tags/CAST
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/CAST
 
 standard tag: CAST
 
-descriptions:
+specification:
   - Caste
   - An Individual Attribute. See also INDIVIDUAL_ATTRIBUTE_STRUCTURE.
   - caste

diff --git a/extracted-files/tags/CAUS b/extracted-files/tags/CAUS
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/CAUS
 
 standard tag: CAUS
 
-descriptions:
+specification:
   - Cause
   - The reasons which precipitated an event. It is often used subordinate to a
     death event to show cause of death, such as might be listed on a death

diff --git a/extracted-files/tags/CHAN b/extracted-files/tags/CHAN
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/CHAN
 
 standard tag: CHAN
 
-descriptions:
+specification:
   - Change
   - The most recent change to the superstructure. This is metadata about the
     structure itself, not data about its subject. See CHANGE_DATE for more.

diff --git a/extracted-files/tags/CHIL b/extracted-files/tags/CHIL
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/CHIL
 
 standard tag: CHIL
 
-descriptions:
+specification:
   - Child
   - The child in a family, whether biological, adopted, foster, sealed, or
     other relationship.

diff --git a/extracted-files/tags/CHR b/extracted-files/tags/CHR
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/CHR
 
 standard tag: CHR
 
-descriptions:
+specification:
   - Christening
   - An Individual Event. See also INDIVIDUAL_EVENT_STRUCTURE.
   - christening

diff --git a/extracted-files/tags/CHRA b/extracted-files/tags/CHRA
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/CHRA
 
 standard tag: CHRA
 
-descriptions:
+specification:
   - Christening, adult
   - An Individual Event. See also INDIVIDUAL_EVENT_STRUCTURE.
   - adult christening

diff --git a/extracted-files/tags/CITY b/extracted-files/tags/CITY
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/CITY
 
 standard tag: CITY
 
-descriptions:
+specification:
   - City
   - The name of the city used in the address. See ADDRESS_STRUCTURE for more.
 

diff --git a/extracted-files/tags/CONF b/extracted-files/tags/CONF
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/CONF
 
 standard tag: CONF
 
-descriptions:
+specification:
   - Confirmation
   - An Individual Event. See also INDIVIDUAL_EVENT_STRUCTURE.
   - confirmation

diff --git a/extracted-files/tags/CONL b/extracted-files/tags/CONL
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/CONL
 
 standard tag: CONL
 
-descriptions:
+specification:
   - Confirmation, Latter-Day Saint
   - A Latter-Day Saint Ordinance. See also LDS_INDIVIDUAL_ORDINANCE.
   - confirmation

diff --git a/extracted-files/tags/COPR b/extracted-files/tags/COPR
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/COPR
 
 standard tag: COPR
 
-descriptions:
+specification:
   - Copyright
   - A copyright statement, as appropriate for the copyright laws applicable to
     this data.

diff --git a/extracted-files/tags/CORP b/extracted-files/tags/CORP
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/CORP
 
 standard tag: CORP
 
-descriptions:
+specification:
   - Corporate name
   - The name of the business, corporation, or person that produced or
     commissioned the product.

diff --git a/extracted-files/tags/CREA b/extracted-files/tags/CREA
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/CREA
 
 standard tag: CREA
 
-descriptions:
+specification:
   - Creation
   - The initial creation of the superstructure. This is metadata about the
     structure itself, not data about its subject. See CREATION_DATE for more.

diff --git a/extracted-files/tags/CREM b/extracted-files/tags/CREM
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/CREM
 
 standard tag: CREM
 
-descriptions:
+specification:
   - Cremation
   - An Individual Event. See also INDIVIDUAL_EVENT_STRUCTURE.
   - cremation

diff --git a/extracted-files/tags/CROP b/extracted-files/tags/CROP
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/CROP
 
 standard tag: CROP
 
-descriptions:
+specification:
   - Crop
   - |
     A subregion of an image to display. It is only valid when the

diff --git a/extracted-files/tags/CTRY b/extracted-files/tags/CTRY
@@ -8,7 +8,7 @@ uri: https://gedcom.io/terms/v7/CTRY
 
 standard tag: CTRY
 
-descriptions:
+specification:
   - Country
   - The name of the country that pertains to the associated address. See
     ADDRESS_STRUCTURE for more.