From b7d1f6906cfe613ad2434658d4055e357587aa9f Mon Sep 17 00:00:00 2001 From: Benny Malengier Date: Tue, 28 May 2013 09:26:32 +0000 Subject: [PATCH] Rationalize fields: * consistent use of first/last * no numbered entries, use (SHORT) where needed * consistent use of single or plural (AUTHOR, PAGES) svn: r22439 --- data/evidencestyle/evidence_style.csv | 254 ++--- gramps/gen/lib/srcattrtype.py | 1317 +++++++++++-------------- 2 files changed, 728 insertions(+), 843 deletions(-) diff --git a/data/evidencestyle/evidence_style.csv b/data/evidencestyle/evidence_style.csv index 7ad4091ea..9cf91c373 100644 --- a/data/evidencestyle/evidence_style.csv +++ b/data/evidencestyle/evidence_style.csv @@ -121,21 +121,21 @@ ,,,,,,,,"[SUBJECT FIRST]",".",,, ,,,,,,,,"[CREATION DATE]",".",,, ,,,,,,,,"[COLLECTION]",".",,, -,,,,,,,,"[REPOSITORY1]",",",,, +,,,,,,,,"[REPOSITORY]",",",,, ,,,,,,,,"[REPOSITORY LOCATION]",".",,, 7,"Archives & Artifacts","Archived Material","Portrait",,"F","ESM99",,"[SUBJECT FIRST]",,,, ,,,,,,,,"[SUBJECT LAST]",",",,, ,,,,,,,,"[CREATION DATE]",";",,, ,,,,,,,,"[COLLECTION]",",",,, -,,,,,,,,"[REPOSITORY2]",",",,, +,,,,,,,,"[REPOSITORY]",",",,, ,,,,,,,,"[REPOSITORY LOCATION]",".",,, ,,,,,,,,"[ARCHIVAL DESCRIPTION]",".",,, 7,"Archives & Artifacts","Archived Material","Portrait",,"S","ESM99",,"[SUBJECT FIRST]",,,, ,,,,,,,,"[SUBJECT LAST]",",",,, ,,,,,,,,"[CREATION DATE]",",",,, ,,,,,,,,"[COLLECTION]",".",,, -8,"Archives & Artifacts","Archived Material","Research Report",,"L","ESM100",,"[AUTHOR & PROFESSIONAL CREDENTIALS LAST]",",",,, -,,,,,,,,"[AUTHOR & PROFESSIONAL CREDENTIALS FIRST]",".",,, +8,"Archives & Artifacts","Archived Material","Research Report",,"L","ESM100",,"[AUTHOR & PROFESSIONAL CREDENTIALS (LAST)]",",",,, +,,,,,,,,"[AUTHOR & PROFESSIONAL CREDENTIALS (FIRST)]",".",,, ,,,,,,,,"[REPORT TITLE OR SUBJECT]",".","Quoted",, ,,,,,,,,"[ITEM TYPE]","to",,, ,,,,,,,,"[RECIPIENT]",".",,, @@ -143,8 +143,8 @@ ,,,,,,,,"[COLLECTION]",",",,, ,,,,,,,,"[REPOSITORY]",",",,, ,,,,,,,,"[REPOSITORY LOCATION]",".",,, -8,"Archives & Artifacts","Archived Material","Research Report",,"F","ESM100",,"[AUTHOR & PROFESSIONAL CREDENTIALS FIRST]",,,, -,,,,,,,,"[AUTHOR & PROFESSIONAL CREDENTIALS LAST]",",",,, +8,"Archives & Artifacts","Archived Material","Research Report",,"F","ESM100",,"[AUTHOR & PROFESSIONAL CREDENTIALS (FIRST)]",,,, +,,,,,,,,"[AUTHOR & PROFESSIONAL CREDENTIALS (LAST)]",",",,, ,,,,,,,,"[REPORT TITLE OR SUBJECT]",",","Quoted",, ,,,,,,,,"[PAGE(S)]",";",,, ,,,,,,,,"[ITEM TYPE]","to",,, @@ -156,14 +156,14 @@ 8,"Archives & Artifacts","Archived Material","Research Report",,"S","ESM100",,"[AUTHOR (SHORT)]",",",,, ,,,,,,,,"[REPORT TITLE OR SUBJECT]",",","Quoted",, ,,,,,,,,"[PAGE(S)]",".",,, -9,"Archives & Artifacts","Archived Material","Unpublished narrative",,"L","ESM101",,"[AUTHOR LAST]",",",,, -,,,,,,,,"[AUTHOR FIRST]",".",,, +9,"Archives & Artifacts","Archived Material","Unpublished narrative",,"L","ESM101",,"[AUTHOR (LAST)]",",",,, +,,,,,,,,"[AUTHOR (FIRST)]",".",,, ,,,,,,,,"[MANUSCRIPT TITLE]",".","Quoted",, ,,,,,,,,"[MANUSCRIPT NO.]",".",,, ,,,,,,,,"[REPOSITORY]",",",,, ,,,,,,,,"[REPOSITORY LOCATION]",".",,, -9,"Archives & Artifacts","Archived Material","Unpublished narrative",,"F","ESM101",,"[AUTHOR FIRST]",,,, -,,,,,,,,"[AUTHOR LAST]",",",,, +9,"Archives & Artifacts","Archived Material","Unpublished narrative",,"F","ESM101",,"[AUTHOR (FIRST)]",,,, +,,,,,,,,"[AUTHOR (LAST)]",",",,, ,,,,,,,,"[MANUSCRIPT TITLE]",",","Quoted",, ,,,,,,,,"[PAGE(S)]",";",,, ,,,,,,,,"[MANUSCRIPT NO.]",",",,, @@ -188,8 +188,8 @@ ,,,,,,,,"[REPOSITORY LOCATION]",".",,, 10,"Archives & Artifacts","Archived Material","Vertical file",,"S","ESM102",,"[AUTHOR]",",",,, ,,,,,,,,"[ITEM TITLE]",".","Quoted",, -11,"Archives & Artifacts","Preservation Film","FHL-GSU film",,"L","ESM103",,"[COMPILERS LAST]",",",,, -,,,,,,,,"[COMPILERS FIRST]",",",,, +11,"Archives & Artifacts","Preservation Film","FHL-GSU film",,"L","ESM103",,"[COMPILER (LAST)]",",",,, +,,,,,,,,"[COMPILER (FIRST)]",",",,, ,,,,,,,,"[MANUSCRIPT SERIES TITLE]",".","Quoted",, ,,,,,,,,"[NO. OF VOLS.]",,,, ,,,,,,,,"[ITEM TYPE OR FORMAT]",".",,, @@ -200,8 +200,8 @@ ,,,,,,,,"[NO. OF ROLLS]",".",,, ,,,,,,,,"[FILM REPOSITORY]",",",,, ,,,,,,,,"[FILM LOCATION]",".",,, -11,"Archives & Artifacts","Preservation Film","FHL-GSU film",,"F","ESM103",,"[COMPILERS FIRST]",,,, -,,,,,,,,"[COMPILERS LAST]",",",,, +11,"Archives & Artifacts","Preservation Film","FHL-GSU film",,"F","ESM103",,"[COMPILER (FIRST)]",,,, +,,,,,,,,"[COMPILER (LAST)]",",",,, ,,,,,,,,"[MANUSCRIPT SERIES TITLE]",",","Quoted",, ,,,,,,,,"[NO. OF VOLS.]",,,, ,,,,,,,"(","[ITEM TYPE OR FORMAT]",",",,, @@ -212,7 +212,7 @@ ,,,,,,,,"[SECTION]",":",,, ,,,,,,,,"[ITEM OF INTEREST]",";",,, ,,,,,,,,"[FILM ID]",".",,, -11,"Archives & Artifacts","Preservation Film","FHL-GSU film",,"S","ESM103",,"[COMPILERS (SHORT)]",",",,, +11,"Archives & Artifacts","Preservation Film","FHL-GSU film",,"S","ESM103",,"[COMPILER (SHORT)]",",",,, ,,,,,,,,"[MANUSCRIPT SERIES TITLE (SHORT)]",",","Quoted",, ,,,,,,,,"[VOLUME USED]",",",,, ,,,,,,,,"[SECTION (SHORT)]",":",,, @@ -232,8 +232,8 @@ ,,,,,,,,"[YEAR(S)]",",",,, ,,,,,,,,"[FILE]",",",,, ,,,,,,,,"[COLLECTION]",".",,, -13,"Archives & Artifacts","Private Holdings","Artifact",,"L","ESM105",,"[COMPILER LAST]",",",,, -,,,,,,,,"[COMPILER FIRST]",".",,, +13,"Archives & Artifacts","Private Holdings","Artifact",,"L","ESM105",,"[COMPILER (LAST)]",",",,, +,,,,,,,,"[COMPILER (FIRST)]",".",,, ,,,,,,,,"[ARTIFACT ID (SHORT)]",".",,, ,,,,,,,,"[CREATION DATE]",".",,, ,,,,,,,,"[CURRENT OR LAST KNOWN OWNER]",",",,, @@ -249,9 +249,9 @@ ,,,,,,,,"[YEAR OWNED]",".",,, ,,,,,,,,"[DESCRIPTIVE DETAIL]",".",,, 13,"Archives & Artifacts","Private Holdings","Artifact",,"S","ESM105",,"[ITEM ID (SHORT)]",",",,, -,,,,,,,,"[ARTIFACT ID2]",".",,, -14,"Archives & Artifacts","Private Holdings","Diary or journal, etc.",,"L","ESM106",,"[AUTHOR LAST]",",",,, -,,,,,,,,"[AUTHOR FIRST]",".",,, +,,,,,,,,"[ARTIFACT ID]",".",,, +14,"Archives & Artifacts","Private Holdings","Diary or journal, etc.",,"L","ESM106",,"[AUTHOR (LAST)]",",",,, +,,,,,,,,"[AUTHOR (FIRST)]",".",,, ,,,,,,,,"[MANUSCRIPT TITLE]",".","Quoted",, ,,,,,,,,"[RECORD TYPE]",".",,, ,,,,,,,,"[PLACE CREATED]",",",,, @@ -260,8 +260,8 @@ ,,,,,,,,"[ADDRESS FOR PRIVATE USE]",",",,"Privacy", ,,,,,,,,"[OWNER'S LOCATION]",".",,, ,,,,,,,,"[YEAR OWNED]",".",,, -14,"Archives & Artifacts","Private Holdings","Diary or journal, etc.",,"F","ESM106",,"[AUTHOR FIRST]",,,, -,,,,,,,,"[AUTHOR LAST]",",",,, +14,"Archives & Artifacts","Private Holdings","Diary or journal, etc.",,"F","ESM106",,"[AUTHOR (FIRST)]",,,, +,,,,,,,,"[AUTHOR (LAST)]",",",,, ,,,,,,,,"[MANUSCRIPT TITLE]",",","Quoted",, ,,,,,,,,"[PAGE(S)]",";",,, ,,,,,,,,"[RECORD TYPE]",",",,, @@ -302,15 +302,15 @@ 15,"Archives & Artifacts","Private Holdings","Family Bible Records",,"S","ESM107",,"[BIBLE ID (OWNER FIRST)]",,,, ,,,,,,,,"[BIBLE ID (OWNER LAST)]",",",,, ,,,,,,,,"[PAGE OR SECTION]",".","Quoted",, -16,"Archives & Artifacts","Private Holdings","Family Chart or Group Sheet",,"L","ESM108",,"[COMPILER LAST]",",",,, -,,,,,,,,"[COMPILER FIRST]",".",,, +16,"Archives & Artifacts","Private Holdings","Family Chart or Group Sheet",,"L","ESM108",,"[COMPILER (LAST)]",",",,, +,,,,,,,,"[COMPILER (FIRST)]",".",,, ,,,,,,,,"[COLLECTION]",".",,, ,,,,,,,,"[OWNER OR SUPPLIER]",",",,, ,,,,,,,,"[ADDRESS FOR PRIVATE USE]",",",,"Privacy", ,,,,,,,,"[OWNER OR SUPPLIER'S LOCATION]",".",,, ,,,,,,,,"[YEAR SUPPLIED]",".",,, -16,"Archives & Artifacts","Private Holdings","Family Chart or Group Sheet",,"F","ESM108",,"[COMPILER FIRST]",,,, -,,,,,,,,"[COMPILER LAST]",",",,, +16,"Archives & Artifacts","Private Holdings","Family Chart or Group Sheet",,"F","ESM108",,"[COMPILER (FIRST)]",,,, +,,,,,,,,"[COMPILER (LAST)]",",",,, ,,,,,,,,"[ITEM (GENERIC ID)]",",",,, ,,,,,,,,"[COLLECTION]",";",,, ,,,,,,,,"[SUPPLIER]",",",,, @@ -321,8 +321,8 @@ 16,"Archives & Artifacts","Private Holdings","Family Chart or Group Sheet",,"S","ESM108",,"[COMPILER (SHORT)]",",",,, ,,,,,,,,"[ITEM (GENERIC ID)]",",",,, ,,,,,,,,"[REFERRAL TO PRIOR EVALUATION]",".",,, -17,"Archives & Artifacts","Private Holdings","Historic letter",,"L","ESM109",,"[WRITER LAST]",",",,, -,,,,,,,,"[WRITER FIRST]",,,, +17,"Archives & Artifacts","Private Holdings","Historic letter",,"L","ESM109",,"[WRITER (LAST)]",",",,, +,,,,,,,,"[WRITER (FIRST)]",,,, ,,,,,,,"(","[WRITER'S LOCATION]",")",,, ,,,,,,,"to","[RECIPIENT]",".",,, ,,,,,,,,"[ITEM TYPE]",".",,, @@ -331,8 +331,8 @@ ,,,,,,,,"[ADDRESS FOR PRIVATE USE]",",",,"Privacy", ,,,,,,,,"[OWNER'S LOCATION]",".",,, ,,,,,,,,"[YEAR OWNED]",".",,, -17,"Archives & Artifacts","Private Holdings","Historic letter",,"F","ESM109",,"[WRITER FIRST]",,,, -,,,,,,,,"[WRITER LAST]",,,, +17,"Archives & Artifacts","Private Holdings","Historic letter",,"F","ESM109",,"[WRITER (FIRST)]",,,, +,,,,,,,,"[WRITER (LAST)]",,,, ,,,,,,,"(","[WRITER'S LOCATION]",")",,, ,,,,,,,"to","[RECIPIENT]",",",,, ,,,,,,,,"[ITEM TYPE]",",",,, @@ -342,12 +342,12 @@ ,,,,,,,,"[OWNER'S LOCATION]",",",,, ,,,,,,,,"[YEAR OWNED]",".",,, ,,,,,,,,"[DESCRIPTIVE DETAIL OR OTHER RELEVANT DISCUSSION]",".",,, -17,"Archives & Artifacts","Private Holdings","Historic letter",,"S","ESM109",,"[WRITER FIRST]",,,, -,,,,,,,,"[WRITER LAST]","to",,, +17,"Archives & Artifacts","Private Holdings","Historic letter",,"S","ESM109",,"[WRITER (FIRST)]",,,, +,,,,,,,,"[WRITER (LAST)]","to",,, ,,,,,,,,"[RECIPIENT (SHORT)]",",",,, ,,,,,,,,"[RECORD DATE(S)]",".",,, -18,"Archives & Artifacts","Private Holdings","Interview tape & transcript",,"L","ESM110",,"[PERSON INTERVIEWED LAST]",",",,, -,,,,,,,,"[PERSON INTERVIEWED FIRST]",".",,, +18,"Archives & Artifacts","Private Holdings","Interview tape & transcript",,"L","ESM110",,"[PERSON INTERVIEWED (LAST)]",",",,, +,,,,,,,,"[PERSON INTERVIEWED (FIRST)]",".",,, ,,,,,,,,"[LOCATION]",".",,, ,,,,,,,,"[ITEM TYPE]","by",,, ,,,,,,,,"[NAME OF INTERVIEWER]",",",,, @@ -357,8 +357,8 @@ ,,,,,,,,"[ADDRESS FOR PRIVATE USE]",",",,"Privacy", ,,,,,,,,"[OWNER'S LOCATION]",".",,, ,,,,,,,,"[YEAR OWNED]",".",,, -18,"Archives & Artifacts","Private Holdings","Interview tape & transcript",,"F","ESM110",,"[PERSON INTERVIEWED FIRST]",,,, -,,,,,,,,"[PERSON INTERVIEWED LAST]",,,, +18,"Archives & Artifacts","Private Holdings","Interview tape & transcript",,"F","ESM110",,"[PERSON INTERVIEWED (FIRST)]",,,, +,,,,,,,,"[PERSON INTERVIEWED (LAST)]",,,, ,,,,,,,"(","[INTERVIEWEE ADDRESS FOR PRIVATE USE]",",",,"Privacy", ,,,,,,,,"[LOCATION]","),",,, ,,,,,,,,"[ITEM TYPE]","by",,, @@ -403,7 +403,7 @@ ,,,,,,,,"[ITEM TYPE]",",",,, ,,,,,,,,"[RECORD DATE(S)]",",",,, ,,,,,,,,"[SUBJECT OR NATURE OF DATA PROVIDED]",";",,, -,,,,,,,,"[FOLDER]",";",,, +,,,,,,,,"[FOLDER LABEL]",";",,, ,,,,,,,,"[SERIES OR RESEARCH PROJECT]",",",,, ,,,,,,,,"[COLLECTION]",";",,, ,,,,,,,,"[RESEARCHER]",",",,, @@ -433,7 +433,8 @@ ,,,,,,,"to","[RECIPIENT (SHORT)]",",",,, ,,,,,,,,"[ITEM TYPE]",",",,, ,,,,,,,,"[RECORD DATE(S)]",".",,, -22,"Archives & Artifacts","Private Holdings","Research Report",,"L","ESM114",,"[AUTHOR & PROFESSIONAL CREDENTIALS LAST, FIRST]",".",,, +22,"Archives & Artifacts","Private Holdings","Research Report",,"L","ESM114",,"[AUTHOR & PROFESSIONAL CREDENTIALS (LAST)]",",",,, +,,,,,,,,"[AUTHOR & PROFESSIONAL CREDENTIALS (FIRST)]",".",,, ,,,,,,,,"[REPORT TITLE (QUOTED EXACTLY)]",".","Quoted",, ,,,,,,,,"[ITEM TYPE]","to",,, ,,,,,,,,"[RECIPIENT]",,,, @@ -442,7 +443,8 @@ ,,,,,,,,"[REPORT DATE]",".",,, ,,,,,,,,"[ITEM FORMAT]",,,, ,,,,,,,,"[OWNER & CONTACT INFORMATION]",".",,, -22,"Archives & Artifacts","Private Holdings","Research Report",,"F","ESM114",,"[AUTHOR & PROFESSIONAL CREDENTIALS FIRST LAST]",",",,, +22,"Archives & Artifacts","Private Holdings","Research Report",,"F","ESM114",,"[AUTHOR & PROFESSIONAL CREDENTIALS (FIRST)]",,,, +,,,,,,,,"[AUTHOR & PROFESSIONAL CREDENTIALS (LAST)]",",",,, ,,,,,,,,"[REPORT TITLE (QUOTED EXACTLY)]",",","Quoted",, ,,,,,,,,"[PAGE(S)]",";",,, ,,,,,,,,"[ITEM TYPE]","to",,, @@ -562,7 +564,7 @@ ,,,,,,,,"[WEBSITE TITLE]",,"Italics",, ,,,,,,,"(","[URL (DIGITAL LOCATION)]",":",,, ,,,,,,,,"[DATE]","),",,, -,,,,,,,,"[DIGITAL PATH (WHEN NECESSARY)]",",",,,"Optional" +,,,,,,,,"[DIGITAL PATH]",",",,,"Optional" ,,,,,,,,"[ITEM OF INTEREST]",".",,, 28,"Business & institutional Records","Corporate Records","Online database",,"S","ESM165",,"[DATABASE TITLE]",",","Quoted",, ,,,,,,,,"[WEBSITE TITLE]",",","Italics",, @@ -583,24 +585,24 @@ 29,"Business & institutional Records","Corporate Records","Online image",,"S","ESM166",,"[COLLECTION]",",","Quoted",, ,,,,,,,,"[WEBSITE TITLE]",",","Italics",, ,,,,,,,,"[ITEM OF INTEREST (SHORT)]",".",,, -30,"Business & institutional Records","Lineage-society Records","Application file",,"L","ESM167",,"[ORGANIZATION1]",".",,, +30,"Business & institutional Records","Lineage-society Records","Application file",,"L","ESM167",,"[ORGANIZATION]",".",,, ,,,,,,,,"[COLLECTION]",,,, ,,,,,,,,"[REPOSITORY]",",",,, ,,,,,,,,"[REPOSITORY LOCATION]",".",,, 30,"Business & institutional Records","Lineage-society Records","Application file",,"F","ESM167",,"[FILE]",",",,, ,,,,,,,,"[MEMBERSHIP NUMBER]",",",,, -,,,,,,,,"[ORGANIZATION2]",",",,, +,,,,,,,,"[ORGANIZATION]",",",,, ,,,,,,,,"[REPOSITORY]",",",,, ,,,,,,,,"[REPOSITORY LOCATION]",".",,, 30,"Business & institutional Records","Lineage-society Records","Application file",,"S","ESM167",,"[FILE]",",",,, ,,,,,,,,"[MEMBERSHIP NUMBER]",",",,, ,,,,,,,,"[ORGANIZATION (SHORT)]",".",,, -31,"Business & institutional Records","Lineage-society Records","Online database",,"L","ESM168",,"[ORGANIZATION1]",".",,, +31,"Business & institutional Records","Lineage-society Records","Online database",,"L","ESM168",,"[ORGANIZATION]",".",,, ,,,,,,,,"[WEBSITE TITLE]",".","Italics",, ,,,,,,,,"[ITEM TYPE OR FORMAT]",".",,, ,,,,,,,,"[URL (DIGITAL LOCATION)]",":",,, ,,,,,,,,"[YEAR(S)]",".",,, -31,"Business & institutional Records","Lineage-society Records","Online database",,"F","ESM168",,"[ORGANIZATION2]",",",,, +31,"Business & institutional Records","Lineage-society Records","Online database",,"F","ESM168",,"[ORGANIZATION]",",",,, ,,,,,,,,"[WEBSITE TITLE]",",","Italics",, ,,,,,,,,"[ITEM TYPE OR FORMAT]",,,, ,,,,,,,"(","[URL (DIGITAL LOCATION)]",":",,, @@ -771,18 +773,18 @@ ,,,,,,,,"[RECORD DATE(S)]",".",,, 41,"Cemetery Records","Cemetery Office Records","Online images",,"L","ESM211",,"[CREATOR]",".",,, ,,,,,,,,"[WEBSITE TITLE]",".","Italics",, -,,,,,,,,"[ITEM TYPE & FORMAT L]",".",,, +,,,,,,,,"[ITEM TYPE & FORMAT]",".",,, ,,,,,,,,"[URL (DIGITAL LOCATION)]",":",,, ,,,,,,,,"[YEAR(S)]",".",,, 41,"Cemetery Records","Cemetery Office Records","Online images",,"F","ESM211",,"[CREATOR]",",",,, ,,,,,,,,"[WEBSITE TITLE]",",","Italics",, -,,,,,,,,"[ITEM TYPE & FORMAT F]",,,, +,,,,,,,,"[ITEM TYPE & FORMAT]",,,, ,,,,,,,"(","[URL (DIGITAL LOCATION)]",":",,, ,,,,,,,,"[DATE]","),",,, ,,,,,,,,"[ITEM OF INTEREST]",";",,, ,,,,,,,,"[CREDIT LINE (SOURCE OF THIS SOURCE)]",".",,, 41,"Cemetery Records","Cemetery Office Records","Online images",,"S","ESM211",,"[WEBSITE TITLE]",",","Italics",, -,,,,,,,,"[ITEM TYPE & FORMAT S]",",",,, +,,,,,,,,"[ITEM TYPE & FORMAT (SHORT)]",",",,, ,,,,,,,,"[ITEM OF INTEREST (SHORT)]",".",,, 42,"Cemetery Records","Cemetery Office Records","Preservation film, FHL-GSU",,"L","ESM212",,"[CEMETERY (AUTHOR)]",,,, ,,,,,,,"(","[LOCATION]",").",,, @@ -860,10 +862,10 @@ ,,,,,,,,"[CREATION DATE (SHORT)]",",",,, ,,,,,,,,"[REPOSITORY]",",",,, ,,,,,,,,"[REPOSITORY LOCATION]","),",,, -,,,,,,,,"[FOLDER]",";",,, +,,,,,,,,"[FOLDER LABEL]",";",,, ,,,,,,,,"[ITEM OF INTEREST]",".",,, 47,"Cemetery Records","Derivatives","Cemetery abstracts","vertical file","S","ESM217",,"[FILE LABEL (SHORT)]",",","Quoted",, -,,,,,,,,"[FOLDER (SHORT)]",",",,, +,,,,,,,,"[FOLDER LABEL (SHORT)]",",",,, ,,,,,,,,"[ITEM OF INTEREST (SHORT)]",".",,, 48,"Cemetery Records","Derivatives","Cemetery abstracts","card file","L","ESM218",,"[FILE LABEL]",".","Quoted",, ,,,,,,,,"[ITEM TYPE OR FORMAT]",".",,, @@ -899,7 +901,7 @@ 50,"Census Records","Original manuscripts (U.S.)","Local copy","federal census","L","ESM237",,"[JURISDICTION (STATE. COUNTY)]",".",,, ,,,,,,,,"[CENSUS ID (GENERIC)]",",",,, ,,,,,,,,"[SCHEDULE & COPY]",".",,, -,,,,,,,,"[REPOSITORY1]",",",,, +,,,,,,,,"[REPOSITORY]",",",,, ,,,,,,,,"[REPOSITORY LOCATION]",".",,, 50,"Census Records","Original manuscripts (U.S.)","Local copy","federal census","F","ESM237",,"[CENSUS ID (GENERIC)]",",",,, ,,,,,,,,"[JURISDICTION (COUNTY, STATE)]",",",,, @@ -909,7 +911,7 @@ ,,,,,,,,"[PAGE(S)]",",",,, ,,,,,,,,"[HOUSEHOLD ID]",",",,, ,,,,,,,,"[PERSON OF INTEREST]",";",,, -,,,,,,,,"[REPOSITORY2]",",",,, +,,,,,,,,"[REPOSITORY]",",",,, ,,,,,,,,"[REPOSITORY LOCATION]",".",,, 50,"Census Records","Original manuscripts (U.S.)","Local copy","federal census","S","ESM237",,"[CENSUS ID (GENERIC)]",",",,, ,,,,,,,,"[JURISDICTION (COUNTY, STATE) (SHORT)]",",",,, @@ -937,30 +939,30 @@ ,,,,,,,,"[NARA SERIES & SUBGROUP (SHORT)]",",",,, ,,,,,,,,"[RECORD GROUP (SHORT)]",",",,, ,,,,,,,,"[REPOSITORY (SHORT)]",".",,, -52,"Census Records","Digital Images","CD/DVD",,"L","ESM239",,"[JURISDICTION1]",".",,, +52,"Census Records","Digital Images","CD/DVD",,"L","ESM239",,"[JURISDICTION]",".",,, ,,,,,,,,"[CENSUS ID (GENERIC)]",",",,, ,,,,,,,,"[SCHEDULE]",".",,, -,,,,,,,,"[PUBLICATION TITLE1]",".","Italics",, +,,,,,,,,"[PUBLICATION TITLE]",".","Italics",, ,,,,,,,,"[FORMAT]",".",,, ,,,,,,,,"[PUBLICATION PLACE]",":",,, ,,,,,,,,"[PUBLISHER]",",",,, ,,,,,,,,"[YEAR(S)]",".",,, 52,"Census Records","Digital Images","CD/DVD",,"F","ESM239",,"[CENSUS ID (GENERIC)]",",",,, -,,,,,,,,"[JURISDICTION2]",",",,, +,,,,,,,,"[JURISDICTION]",",",,, ,,,,,,,,"[SCHEDULE]",",",,, ,,,,,,,,"[GEOGRAPHIC DIVISION]",",",,, ,,,,,,,,"[ENUMERATION DISTRICT (FROM 1880 FORWARD)]",",",,, ,,,,,,,,"[PAGE ID]",",",,, ,,,,,,,,"[HOUSEHOLD]",",",,, ,,,,,,,,"[PERSON OF INTEREST]",";",,, -,,,,,,,,"[PUBLICATION TITLE2]",",","Italics",, +,,,,,,,,"[PUBLICATION TITLE]",",","Italics",, ,,,,,,,,"[FORMAT]",,,, ,,,,,,,"(","[PUBLICATION PLACE]",":",,, ,,,,,,,,"[PUBLISHER]",",",,, ,,,,,,,,"[DATE]",");",,, ,,,,,,,,"[CREDIT LINE (SOURCE OF THIS SOURCE)]",".",,, 52,"Census Records","Digital Images","CD/DVD",,"S","ESM239",,"[CENSUS ID (GENERIC)]",",",,, -,,,,,,,,"[JURISDICTION3]",",",,, +,,,,,,,,"[JURISDICTION]",",",,, ,,,,,,,,"[SCHEDULE (SHORT)]",",",,, ,,,,,,,,"[ENUMERATION DISTRICT (SHORT)]",",",,, ,,,,,,,,"[PAGE ID]",",",,, @@ -1212,13 +1214,13 @@ ,,,,,,,,"[PERSON(S) OF INTEREST]",".",,, 64,"Census Records","Microfilm (U.S.)","Population schedules","State-level copies","L","ESM251",,"[JURISDICTION (STATE. COUNTY)]",".",,, ,,,,,,,,"[CENSUS ID (GENERIC)]",",",,, -,,,,,,,,"[SCHEDULE & COPY1]",".",,, +,,,,,,,,"[SCHEDULE & COPY]",".",,, ,,,,,,,,"[FILM ID]",".",,, ,,,,,,,,"[OWNER/REPOSITORY]",",",,, ,,,,,,,,"[LOCATION]",".",,, 64,"Census Records","Microfilm (U.S.)","Population schedules","State-level copies","F","ESM251",,"[CENSUS ID (GENERIC)]",",",,, ,,,,,,,,"[JURISDICTION (COUNTY, STATE)]",",",,, -,,,,,,,,"[SCHEDULE & COPY2]",",",,, +,,,,,,,,"[SCHEDULE & COPY]",",",,, ,,,,,,,,"[CIVIL DIVISION(S)]",",",,, ,,,,,,,,"[PAGE ID]",",",,, ,,,,,,,,"[HOUSEHOLD ID]",",",,, @@ -1291,17 +1293,17 @@ ,,,,,,,,"[DATABASE TITLE]",",","Quoted",, ,,,,,,,,"[ITEM OF INTEREST (SHORT)]",".",,, 68,"Census Records","Derivatives","Soundex & Miracode, microfilm",,"L","ESM255",,"[STATE]",".",,, -,,,,,,,,"[CENSUS ID1]",".",,, +,,,,,,,,"[CENSUS ID]",".",,, ,,,,,,,,"[FILM ID]",".",,, ,,,,,,,,"[PUBLICATION PLACE]",":",,, ,,,,,,,,"[PUBLISHER]",",",,, ,,,,,,,,"[YEAR(S)]",".",,, -68,"Census Records","Derivatives","Soundex & Miracode, microfilm",,"F","ESM255",,"[CENSUS ID1]",",",,, +68,"Census Records","Derivatives","Soundex & Miracode, microfilm",,"F","ESM255",,"[CENSUS ID]",",",,, ,,,,,,,,"[STATE]",",",,, ,,,,,,,,"[CODE]",",",,, ,,,,,,,,"[PERSON(S) OF INTEREST]",";",,, ,,,,,,,,"[FILM ID]",".",,, -68,"Census Records","Derivatives","Soundex & Miracode, microfilm",,"S","ESM255",,"[CENSUS ID2]",",",,, +68,"Census Records","Derivatives","Soundex & Miracode, microfilm",,"S","ESM255",,"[CENSUS ID]",",",,, ,,,,,,,,"[STATE]",",",,, ,,,,,,,,"[CODE (SHORT)]",",",,, ,,,,,,,,"[PERSON(S) OF INTEREST (SHORT)]",".",,, @@ -1500,11 +1502,11 @@ ,,,,,,,,"[WEBSITE TITLE]",,"Italics",, ,,,,,,,"(","[URL (DIGITAL LOCATION)]",":",,, ,,,,,,,,"[DATE]","),",,, -,,,,,,,,"[ITEM OF INTEREST 1]",";",,, +,,,,,,,,"[ITEM OF INTEREST]",";",,, ,,,,,,,,"[CREDIT LINE (SOURCE OF THIS SOURCE)]",".",,, 79,"Church Records","Derivatives","Church-records database","online","S","ESM320",,"[COMPILER (SHORT)]",",",,, ,,,,,,,,"[DATABASE TITLE]",",","Quoted",, -,,,,,,,,"[ITEM OF INTEREST 2]",".",,, +,,,,,,,,"[ITEM OF INTEREST]",".",,, 80,"Local & State Records: Courts & Governance","Original Records","Local","Case files","L","ESM373",,"[JURISDICTION (STATE. COUNTY)]",".",,, ,,,,,,,,"[SERIES]",".",,, ,,,,,,,,"[REPOSITORY]",",",,, @@ -1544,7 +1546,7 @@ ,,,,,,,,"[REPOSITORY]",",",,, ,,,,,,,,"[REPOSITORY LOCATION]",".",,, 82,"Local & State Records: Courts & Governance","Original Records","Local","Record Books, archived off-site","F","ESM375",,"[JURISDICTION (COUNTY, STATE)]",",",,, -,,,,,,,,"[SERIES2]",,,, +,,,,,,,,"[SERIES]",,,, ,,,,,,,,"[SPECIFIC VOLUME(S)]",",",,, ,,,,,,,,"[PAGE OR COURT TERM (IF UNPAGINATED)]",",",,, ,,,,,,,,"[CASE LABEL AND/OR ITEM OF INTEREST]",";",,, @@ -1718,7 +1720,7 @@ ,,,,,,,"file:","[FILE]",",","Quoted",, ,,,,,,,,"[ITEM NO. OR ARRANGEMENT]",",",,, ,,,,,,,,"[ITEM OF INTEREST]",";",,, -,,,,,,,,"[DATE (IF NOT IN TITLE)]",",",,,"Optional" +,,,,,,,,"[DATE]",",",,,"Optional" ,,,,,,,,"[COLLECTION]",";",,, ,,,,,,,,"[REPOSITORY]",",",,, ,,,,,,,,"[REPOSITORY LOCATION]",".",,, @@ -1733,7 +1735,7 @@ ,,,,,,,,"[SPECIFIC VOLUME(S)]",",","Quoted",, ,,,,,,,,"[PAGE NO. OR ARRANGEMENT]",",",,, ,,,,,,,,"[CASE AND/OR ITEM]",";",,, -,,,,,,,,"[DATE (IF NOT IN TITLE)]",",",,,"Optional" +,,,,,,,,"[DATE]",",",,,"Optional" ,,,,,,,,"[REPOSITORY]",",",,, ,,,,,,,,"[REPOSITORY LOCATION]",".",,, 92,"Local & State Records: Licenses, Registrations, Rolls & Vital Records","Local Records","Registers","Named volume","S","ESM423",,"[JURISDICTION (SHORT)]",",",,, @@ -1749,7 +1751,7 @@ ,,,,,,,,"[SPECIFIC VOLUME(S)]",":",,, ,,,,,,,,"[PAGE(S)]",",",,, ,,,,,,,,"[ITEM OF INTEREST]",,,, -,,,,,,,,"[DATE (IF NOT IN TITLE)]",";",,,"Optional" +,,,,,,,,"[DATE]",";",,,"Optional" ,,,,,,,,"[REPOSITORY]",",",,, ,,,,,,,,"[REPOSITORY LOCATION]",".",,, 93,"Local & State Records: Licenses, Registrations, Rolls & Vital Records","Local Records","Registers","Numbered volume","S","ESM424",,"[JURISDICTION (SHORT)]",",",,, @@ -1842,7 +1844,7 @@ ,,,,,,,,"[REPOSITORY]",",",,, ,,,,,,,,"[REPOSITORY LOCATION]",".",,, 99,"Local & State Records: Licenses, Registrations, Rolls & Vital Records","State-level Records","Vital-records certificate",,"S","ESM430",,"[JURISDICTION (STATE)]",,,, -,,,,,,,,"[CERTIFICATE TYPE & NO. 2]",,,, +,,,,,,,,"[CERTIFICATE TYPE & NO.]",,,, ,,,,,,,"(","[CERTIFICATE DATE]","),",,, ,,,,,,,,"[ID OF PERSON(S)]",".",,, 100,"Local & State Records: Licenses, Registrations, Rolls & Vital Records","State-level Records","Vital-records register",,"L","ESM431",,"[JURISDICTION (STATE)]",".",,, @@ -1856,7 +1858,7 @@ ,,,,,,,,"[BOOK & PAGE]",",",,, ,,,,,,,,"[ENTRY]",",",,, ,,,,,,,,"[ID OF PERSON(S)]",";",,, -,,,,,,,,"[DATE (IF NOT IN TITLE)]",",",,,"Optional" +,,,,,,,,"[DATE]",",",,,"Optional" ,,,,,,,,"[REPOSITORY]",",",,, ,,,,,,,,"[REPOSITORY LOCATION]",".",,, 100,"Local & State Records: Licenses, Registrations, Rolls & Vital Records","State-level Records","Vital-records register",,"S","ESM431",,"[JURISDICTION (STATE)]",,,, @@ -1951,15 +1953,15 @@ ,,,,,,,,"[REPOSITORY LOCATION]",".",,, 106,"Local & State Records: Property & Probates","Original Records","State level","Land warrants: loose","F","ESM491",,"[ITEM OF INTEREST]",",",,, ,,,,,,,,"[RECORD DATE(S)]",";",,, -,,,,,,,,"[SERIES2]",",",,, +,,,,,,,,"[SERIES]",",",,, ,,,,,,,,"[RECORD GROUP]",";",,, ,,,,,,,,"[REPOSITORY]",",",,, ,,,,,,,,"[REPOSITORY LOCATION]",".",,, 106,"Local & State Records: Property & Probates","Original Records","State level","Land warrants: loose","S","ESM491",,"[ITEM OF INTEREST]",",",,, ,,,,,,,,"[RECORD DATE(S)]",",",,, -,,,,,,,,"[SERIES2]",",",,, +,,,,,,,,"[SERIES (SHORT)]",",",,, ,,,,,,,,"[JURISDICTION]",".",,, -107,"Local & State Records: Property & Probates","Image Copies","CD/DVD",,"L","ESM492",,"[JURISDICTION/AGENCY1]",".",,, +107,"Local & State Records: Property & Probates","Image Copies","CD/DVD",,"L","ESM492",,"[JURISDICTION/AGENCY]",".",,, ,,,,,,,,"[SERIES]",".",,, ,,,,,,,,"[RECORD GROUP]",".",,, ,,,,,,,,"[REPOSITORY]",",",,, @@ -1970,7 +1972,7 @@ ,,,,,,,,"[PUBLICATION PLACE]",":",,, ,,,,,,,,"[PUBLISHER]",",",,, ,,,,,,,,"[YEAR(S)]",".",,, -107,"Local & State Records: Property & Probates","Image Copies","CD/DVD",,"F","ESM492",,"[JURISDICTION/AGENCY2]",",",,, +107,"Local & State Records: Property & Probates","Image Copies","CD/DVD",,"F","ESM492",,"[JURISDICTION/AGENCY]",",",,, ,,,,,,,,"[SPECIFIC VOLUME(S)]",",","Quoted",, ,,,,,,,,"[PAGE(S)]",",",,, ,,,,,,,,"[ITEM OF INTEREST]",";",,, @@ -1980,7 +1982,7 @@ ,,,,,,,"(","[PUBLICATION PLACE]",":",,, ,,,,,,,,"[PUBLISHER]",",",,, ,,,,,,,,"[YEAR(S)]",").",,, -107,"Local & State Records: Property & Probates","Image Copies","CD/DVD",,"S","ESM492",,"[JURISDICTION/AGENCY2]",",",,, +107,"Local & State Records: Property & Probates","Image Copies","CD/DVD",,"S","ESM492",,"[JURISDICTION/AGENCY]",",",,, ,,,,,,,,"[SPECIFIC VOLUME(S)]",",","Quoted",, ,,,,,,,,"[PAGE(S)]",",",,, ,,,,,,,,"[ITEM OF INTEREST]",".",,, @@ -2079,14 +2081,14 @@ ,,,,,,,,"[FILE UNIT NO.]",",",,, ,,,,,,,,"[RECORD GROUP NO. (SHORT)]",",",,, ,,,,,,,,"[REPOSITORY (SHORT)]",".",,, -113,"National Government Records","Original Materials (U.S.)","Manuscripts","Library of Congress","L","ESM540",,"[SERIES1]",".",,, +113,"National Government Records","Original Materials (U.S.)","Manuscripts","Library of Congress","L","ESM540",,"[SERIES]",".",,, ,,,,,,,,"[COLLECTION]",".",,, ,,,,,,,,"[DIVISION]",",",,, ,,,,,,,,"[REPOSITORY]",",",,, ,,,,,,,,"[REPOSITORY LOCATION]",".",,, 113,"National Government Records","Original Materials (U.S.)","Manuscripts","Library of Congress","F","ESM540",,"[DOCUMENT ID]",",",,, ,,,,,,,,"[DOCUMENT DATE]",";",,, -,,,,,,,,"[SERIES2]",";",,, +,,,,,,,,"[SERIES]",";",,, ,,,,,,,,"[COLLECTION]",";",,, ,,,,,,,,"[DIVISION]",",",,, ,,,,,,,,"[REPOSITORY]",",",,, @@ -2095,29 +2097,29 @@ ,,,,,,,,"[DOCUMENT DATE]",",",,, ,,,,,,,,"[SERIES/COLLECTION]",",",,, ,,,,,,,,"[REPOSITORY]",".",,, -114,"National Government Records","Original Materials (U.S.)","Manuscripts","National Archives","L","ESM541",,"[SERIES1]",".",,, +114,"National Government Records","Original Materials (U.S.)","Manuscripts","National Archives","L","ESM541",,"[SERIES]",".",,, ,,,,,,,,"[SUBGROUP]",".",,, ,,,,,,,,"[RECORD GROUP TITLE]",",",,, ,,,,,,,,"[RECORD GROUP NO.]",".",,, -,,,,,,,,"[REPOSITORY1]",",",,, +,,,,,,,,"[REPOSITORY]",",",,, ,,,,,,,,"[REPOSITORY LOCATION]",".",,, 114,"National Government Records","Original Materials (U.S.)","Manuscripts","National Archives","F","ESM541",,"[DOCUMENT ID]",",",,, ,,,,,,,,"[DOCUMENT DATE]",";",,, ,,,,,,,,"[FILE UNIT]",",",,, ,,,,,,,,"[FILE UNIT NO.]",",",,, ,,,,,,,,"[SUBSERIES]",",",,, -,,,,,,,,"[SERIES2]",";",,, +,,,,,,,,"[SERIES]",";",,, ,,,,,,,,"[SUBGROUP]",";",,, ,,,,,,,,"[RECORD GROUP TITLE]",",",,, ,,,,,,,,"[RECORD GROUP NO.]",";",,, -,,,,,,,,"[REPOSITORY1]",",",,, +,,,,,,,,"[REPOSITORY]",",",,, ,,,,,,,,"[REPOSITORY LOCATION]",".",,, 114,"National Government Records","Original Materials (U.S.)","Manuscripts","National Archives","S","ESM541",,"[DOCUMENT ID]",",",,, -,,,,,,,,"[FILE UNIT ID]",",",,, -,,,,,,,,"[SERIES3]",",",,, +,,,,,,,,"[FILE UNIT NO.]",",",,, +,,,,,,,,"[SERIES (SHORT)]",",",,, ,,,,,,,,"[RECORD GROUP NO. (SHORT)]",",",,, -,,,,,,,,"[REPOSITORY2]",".",,, -115,"National Government Records","Original Materials (U.S.)","Manuscripts","National Archives-Regional","L","ESM542",,"[SUBGROUP1]",".",,, +,,,,,,,,"[REPOSITORY (SHORT)]",".",,, +115,"National Government Records","Original Materials (U.S.)","Manuscripts","National Archives-Regional","L","ESM542",,"[SUBGROUP]",".",,, ,,,,,,,,"[SERIES]",".",,, ,,,,,,,,"[RECORD GROUP TITLE]",".",,, ,,,,,,,,"[RECORD GROUP NO.]",".",,, @@ -2128,7 +2130,7 @@ ,,,,,,,,"[FILE UNIT]",",",,, ,,,,,,,,"[FILE UNIT NO.]",";",,, ,,,,,,,,"[SERIES]",",",,, -,,,,,,,,"[SUBGROUP2]",";",,, +,,,,,,,,"[SUBGROUP]",";",,, ,,,,,,,,"[RECORD GROUP TITLE]",",",,, ,,,,,,,,"[RECORD GROUP NO.]",";",,, ,,,,,,,,"[REPOSITORY]",",",,, @@ -2348,7 +2350,7 @@ ,,,,,,,,"[YEAR(S)]",".",,, 127,"National Government Records","Image Copies","Online:","Library of Congress","F","ESM554",,"[CREATOR/OWNER OF DATABASE & WEBSITE]",",",,, ,,,,,,,,"[TITLE OF DATABASE]",",","Quoted",, -,,,,,,,,"[ITEM TYPE OR FORMAT2]",",",,, +,,,,,,,,"[ITEM TYPE OR FORMAT]",",",,, ,,,,,,,,"[WEBSITE TITLE]",,"Italics",, ,,,,,,,"(","[URL (DIGITAL LOCATION)]",":",,, ,,,,,,,,"[DATE]","),",,, @@ -2365,7 +2367,7 @@ ,,,,,,,,"[URL (DIGITAL LOCATION)]",":",,, ,,,,,,,,"[YEAR(S)]",".",,, 128,"National Government Records","Image Copies","Online:","National Archives (U.S.)","F","ESM555",,"[DATABASE TITLE]",",","Quoted",, -,,,,,,,,"[ITEM TYPE OR FORMAT2]",",",,, +,,,,,,,,"[ITEM TYPE OR FORMAT]",",",,, ,,,,,,,,"[WEBSITE TITLE]",,"Italics",, ,,,,,,,"(","[URL (DIGITAL LOCATION)]",":",,, ,,,,,,,,"[DATE]","),",,, @@ -2382,7 +2384,7 @@ ,,,,,,,,"[URL (DIGITAL LOCATION)]",":",,, ,,,,,,,,"[YEAR(S)]",".",,, 129,"National Government Records","Image Copies","Online:","Patent & Trademark Office (U.S.)","F","ESM556",,"[DATABASE TITLE]",",","Quoted",, -,,,,,,,,"[ITEM TYPE OR FORMAT 2]",",",,, +,,,,,,,,"[ITEM TYPE OR FORMAT]",",",,, ,,,,,,,,"[WEBSITE TITLE (SAME AS CREATOR-OWNER)]",,"Italics",, ,,,,,,,"(","[URL (DIGITAL LOCATION)]",":",,, ,,,,,,,,"[DATE]","),",,, @@ -2660,7 +2662,7 @@ ,,,,,,,,"[AUTHOR (LAST)]",",",,, ,,,,,,,,"[TITLE]",,"Italics",, ,,,,,,,"(","[ORIGINAL PUBLICATION DATA (PLACE: PUBLISHER, YEAR)]","),",,, -,,,,,,,,"[PAGE(S)1]",";",,, +,,,,,,,,"[PAGE(S)]",";",,, ,,,,,,,,"[FILM PUBLICATION SERIES]",,"Italics",, ,,,,,,,"(","[PLACE OF FILM PUBLICATION]",":",,, ,,,,,,,,"[FILM PUBLISHER]",",",,, @@ -2668,7 +2670,7 @@ ,,,,,,,,"[ROLL & ITEM]",".",,, 144,"Publications: Books, CDs, Maps, Leaflets & Videos","Image Copies","Microfilm publication",,"S","ESM660",,"[AUTHOR (LAST)]",",",,, ,,,,,,,,"[TITLE]",",","Italics",, -,,,,,,,,"[PAGE(S)2]",".",,, +,,,,,,,,"[PAGE(S)]",".",,, 145,"Publications: Books, CDs, Maps, Leaflets & Videos","Image Copies","Online publication",,"L","ESM661",,"[AUTHOR (LAST)]",",",,, ,,,,,,,,"[AUTHOR (FIRST)]",".",,, ,,,,,,,,"[TITLE]",".","Italics",, @@ -2711,7 +2713,7 @@ ,,,,,,,,"[TOTAL VOLUMES]",".",,, ,,,,,,,,"[PLACE OF PUBLICATION]",":",,, ,,,,,,,,"[PUBLISHER]",",",,, -,,,,,,,,"[YEAR(S)1]",".",,, +,,,,,,,,"[YEAR(S)]",".",,, 147,"Publications: Legal Works & Government Documents","Legal Reference Works","Case Reporters","Series named for editor","F","ESM728",,"[EDITOR (FIRST)]",,,, ,,,,,,,,"[EDITOR (LAST)]",",",,, ,,,,,,,,"[TITLE]",",","Italics",, @@ -2721,7 +2723,7 @@ ,,,,,,,,"[PUBLICATION YEAR]","),",,, ,,,,,,,,"[VOLUME/PAGE]",",",,, ,,,,,,,,"[CASE]",,"Italics",, -,,,,,,,"(","[YEAR(S)2]",");",,, +,,,,,,,"(","[YEAR(S)]",");",,, ,,,,,,,"hereinafter cited as","[CASE LABEL (LEGAL STYLE)]",".",,, 147,"Publications: Legal Works & Government Documents","Legal Reference Works","Case Reporters","Series named for editor","S","ESM728",,"[CASE LABEL (LEGAL STYLE)]",".",,, 148,"Publications: Legal Works & Government Documents","Legal Reference Works","Case Reporters","Standardized series","L","ESM729",,"[TITLE]",".","Italics",, @@ -2736,7 +2738,7 @@ ,,,,,,,"(","[PLACE OF PUBLICATION]",":",,, ,,,,,,,,"[PUBLISHER]",",",,, ,,,,,,,,"[PUBLICATION YEAR]","),",,, -,,,,,,,,"[PAGES]",",",,, +,,,,,,,,"[PAGE(S)]",",",,, ,,,,,,,,"[CASE]",";","Italics",, ,,,,,,,"hereinafter cited as","[CASE LABEL (LEGAL STYLE)]",".",,, 148,"Publications: Legal Works & Government Documents","Legal Reference Works","Case Reporters","Standardized series","S","ESM729",,"[CASE LABEL (LEGAL STYLE)]",".",,, @@ -2789,7 +2791,7 @@ ,,,,,,,,"[PLACE OF PUBLICATION]",":",,, ,,,,,,,,"[PUBLISHER]",",",,, ,,,,,,,,"[YEAR(S)]",".",,, -152,"Publications: Legal Works & Government Documents","Legal Reference Works","Statutes:","federal","F","ESM733",,"[AUTHOR2]",",",,, +152,"Publications: Legal Works & Government Documents","Legal Reference Works","Statutes:","federal","F","ESM733",,"[AUTHOR]",",",,, ,,,,,,,,"[TITLE OF SERIES]",",","Italics",, ,,,,,,,,"[SPECIFIC VOLUME(S) (SHORT)]",,,, ,,,,,,,"(","[PLACE OF PUBLICATION]",":",,, @@ -2798,7 +2800,7 @@ ,,,,,,,,"[PAGE(S)]",",",,, ,,,,,,,,"[TITLE OF ACT]",".","Quoted",, 152,"Publications: Legal Works & Government Documents","Legal Reference Works","Statutes:","federal","S","ESM733",,"[TITLE OF SERIES]",,"Italics",, -,,,,,,,,"[SPECIFIC VOLUME(S) (SHORT2)]",":",,, +,,,,,,,,"[SPECIFIC VOLUME(S) (SHORT)]",":",,, ,,,,,,,,"[PAGE(S)]",,,, ,,,,,,,"(","[YEAR(S)]","),",,, ,,,,,,,,"[TITLE OF ACT]",".","Quoted",, @@ -2833,7 +2835,7 @@ ,,,,,,,,"[PUBLISHER]",",",,, ,,,,,,,,"[YEAR(S)]","),",,, ,,,,,,,,"[PAGE(S)]",".",,, -154,"Publications: Legal Works & Government Documents","Printed Government Documents","Congressional Records","Citing volume from title page","S","ESM735",,"[AUTHOR (SHORT2)]",",",,, +154,"Publications: Legal Works & Government Documents","Printed Government Documents","Congressional Records","Citing volume from title page","S","ESM735",,"[AUTHOR (SHORT)]",",",,, ,,,,,,,,"[TITLE (SHORT)]",",","Italics",, ,,,,,,,,"[PAGE(S)]",".",,, 155,"Publications: Legal Works & Government Documents","Printed Government Documents","Congressional Records","Traditional academic style","L","ESM736",,"[AUTHOR]",".",,, @@ -2850,7 +2852,7 @@ ,,,,,,,,"[PUBLISHER]",",",,, ,,,,,,,,"[YEAR(S)]","),",,, ,,,,,,,,"[PAGE(S)]",".",,, -155,"Publications: Legal Works & Government Documents","Printed Government Documents","Congressional Records","Traditional academic style","S","ESM736",,"[AUTHOR (SHORT)2]",",",,, +155,"Publications: Legal Works & Government Documents","Printed Government Documents","Congressional Records","Traditional academic style","S","ESM736",,"[AUTHOR (SHORT)]",",",,, ,,,,,,,,"[CONGRESS & SESSION]",",",,, ,,,,,,,,"[YEAR(S)]",",",,, ,,,,,,,,"[DOCUMENT ID]",".",,, @@ -2860,22 +2862,22 @@ ,,,,,,,,"[WEBSITE CREATOR/OWNER]",".",,, ,,,,,,,,"[WEBSITE TITLE]",".","Italics",, ,,,,,,,,"[URL (DIGITAL LOCATION)]",":",,, -,,,,,,,,"[YEAR(S)1]",".",,, +,,,,,,,,"[YEAR(S)]",".",,, 156,"Publications: Legal Works & Government Documents","Printed Government Documents","Online images",,"F","ESM737",,"[AUTHOR (SHORT)]",",",,, ,,,,,,,,"[SERIES TITLE]",",","Italics",, ,,,,,,,,"[CONGRESS & SESSION]",,,, -,,,,,,,"(","[YEAR(S)2]","),",,, -,,,,,,,,"[PAGES]",",",,, +,,,,,,,"(","[YEAR(S)]","),",,, +,,,,,,,,"[PAGE(S)]",",",,, ,,,,,,,,"[ITEM]",";","Quoted",, ,,,,,,,,"[FORMAT]",",",,, ,,,,,,,,"[WEBSITE CREATOR/OWNER]",",",,, ,,,,,,,,"[WEBSITE TITLE]",,"Italics",, ,,,,,,,"(","[URL (DIGITAL LOCATION)]",":",,, ,,,,,,,,"[DATE]",").",,, -156,"Publications: Legal Works & Government Documents","Printed Government Documents","Online images",,"S","ESM737",,"[AUTHOR (SHORT2)]",",",,, +156,"Publications: Legal Works & Government Documents","Printed Government Documents","Online images",,"S","ESM737",,"[AUTHOR (SHORT)]",",",,, ,,,,,,,,"[SERIES TITLE]",",","Italics",, ,,,,,,,,"[CONGRESS & SESSION]",",",,, -,,,,,,,,"[PAGES]",".",,, +,,,,,,,,"[PAGE(S)]",".",,, 157,"Publications: Legal Works & Government Documents","Printed Government Documents","National Archives (U.S.) guides","Descriptive pamphlet, online","L","ESM738",,"[AUTHOR]",".",,, ,,,,,,,,"[TITLE OF PAMPHLET]",".","Italics",, ,,,,,,,,"[SERIES ID]",".",,, @@ -2891,7 +2893,7 @@ ,,,,,,,"(","[URL (DIGITAL LOCATION)]",":",,, ,,,,,,,,"[DATE]","),",,, ,,,,,,,,"[PAGE(S)]",".",,, -157,"Publications: Legal Works & Government Documents","Printed Government Documents","National Archives (U.S.) guides","Descriptive pamphlet, online","S","ESM738",,"[AUTHOR (SHORT2)]",",",,, +157,"Publications: Legal Works & Government Documents","Printed Government Documents","National Archives (U.S.) guides","Descriptive pamphlet, online","S","ESM738",,"[AUTHOR (SHORT)]",",",,, ,,,,,,,,"[TITLE OF PAMPHLET]",",","Italics",, ,,,,,,,,"[SERIES ID (SHORT)]",",",,, ,,,,,,,,"[PAGE(S)]",".",,, @@ -2921,7 +2923,7 @@ ,,,,,,,,"[ARTICLE SUBTITLE]",".“",,, ,,,,,,,,"[JOURNAL TITLE]",,"Italics",, ,,,,,,,,"[VOLUME ISSUE DATE]",":",,, -,,,,,,,,"[PAGES1]",".",,, +,,,,,,,,"[PAGE(S)]",".",,, 159,"Publications: Periodicals, Broadcasts & Web Miscellanea","Periodicals","Journal articles","Print editions","F","ESM779",,"[AUTHOR (FIRST)]",,,, ,,,,,,,,"[AUTHOR (LAST)]",",",,, ,,,,,,,"“","[ARTICLE TITLE]",":",,, @@ -2929,10 +2931,10 @@ ,,,,,,,,"[JOURNAL TITLE]",,"Italics",, ,,,,,,,,"[VOLUME]",,,, ,,,,,,,"(","[ISSUE DATE]","):",,, -,,,,,,,,"[PAGES2]",".",,, +,,,,,,,,"[PAGE(S)]",".",,, 159,"Publications: Periodicals, Broadcasts & Web Miscellanea","Periodicals","Journal articles","Print editions","S","ESM779",,"[AUTHOR (LAST)]",".",,, ,,,,,,,,"[TITLE (SHORT)]",",","Quoted",, -,,,,,,,,"[PAGES3]",".",,, +,,,,,,,,"[PAGE(S)]",".",,, 160,"Publications: Periodicals, Broadcasts & Web Miscellanea","Periodicals","Journal articles","Online archives of print journals","L","ESM780",,"[AUTHOR (LAST)]",",",,, ,,,,,,,,"[AUTHOR (FIRST)]",,,, ,,,,,,,"“","[ARTICLE TITLE]",":",,, @@ -2979,25 +2981,25 @@ ,,,,,,,,"[TYPE OR FORMAT]",,,, ,,,,,,,"(","[URL (DIGITAL LOCATION)]",":",,, ,,,,,,,,"[DATE]","),",,, -,,,,,,,,"[SPECIFIC CONTENT1]",".",,, +,,,,,,,,"[SPECIFIC CONTENT]",".",,, 161,"Publications: Periodicals, Broadcasts & Web Miscellanea","Periodicals","Journal articles","Online journals","S","ESM781",,"[AUTHOR (LAST)]",",",,, ,,,,,,,,"[TITLE (SHORT)]",",","Quoted",, -,,,,,,,,"[SPECIFIC CONTENT2]",".",,, -162,"Publications: Periodicals, Broadcasts & Web Miscellanea","Periodicals","Magazine articles","Print editions","L","ESM782",,"[AUTHORS (LAST)]",",",,, -,,,,,,,,"[AUTHORS (FIRST)]",".",,, +,,,,,,,,"[SPECIFIC CONTENT]",".",,, +162,"Publications: Periodicals, Broadcasts & Web Miscellanea","Periodicals","Magazine articles","Print editions","L","ESM782",,"[AUTHOR (LAST)]",",",,, +,,,,,,,,"[AUTHOR (FIRST)]",".",,, ,,,,,,,,"[ARTICLE TITLE]",".","Quoted",, ,,,,,,,,"[MAGAZINE]",,"Italics",, ,,,,,,,,"[ISSUE DATE]",",",,, -,,,,,,,,"[PAGE(S)1]",".",,, -162,"Publications: Periodicals, Broadcasts & Web Miscellanea","Periodicals","Magazine articles","Print editions","F","ESM782",,"[AUTHORS (FIRST)]",,,, -,,,,,,,,"[AUTHORS (LAST)]",",",,, +,,,,,,,,"[PAGE(S)]",".",,, +162,"Publications: Periodicals, Broadcasts & Web Miscellanea","Periodicals","Magazine articles","Print editions","F","ESM782",,"[AUTHOR (FIRST)]",,,, +,,,,,,,,"[AUTHOR (LAST)]",",",,, ,,,,,,,,"[ARTICLE TITLE]",",","Quoted",, ,,,,,,,,"[MAGAZINE]",,"Italics",, ,,,,,,,,"[ISSUE DATE]",",",,, -,,,,,,,,"[PAGE(S)1]",".",,, -162,"Publications: Periodicals, Broadcasts & Web Miscellanea","Periodicals","Magazine articles","Print editions","S","ESM782",,"[AUTHORS (LAST)]",",",,, +,,,,,,,,"[PAGE(S)]",".",,, +162,"Publications: Periodicals, Broadcasts & Web Miscellanea","Periodicals","Magazine articles","Print editions","S","ESM782",,"[AUTHOR (LAST)]",",",,, ,,,,,,,,"[ARTICLE TITLE]",",","Quoted",, -,,,,,,,,"[PAGE(S)2]",".",,, +,,,,,,,,"[PAGE(S)]",".",,, 163,"Publications: Periodicals, Broadcasts & Web Miscellanea","Periodicals","Magazine articles","Online reprints, random items","L","ESM783",,"[AUTHOR (LAST)]",",",,, ,,,,,,,,"[AUTHOR (FIRST)]",".",,, ,,,,,,,,"[ARTICLE TITLE]",".","Quoted",, @@ -3014,11 +3016,11 @@ ,,,,,,,,"[WEBSITE]",,"Italics",, ,,,,,,,"(","[URL (DIGITAL LOCATION)]",":",,, ,,,,,,,,"[ACCESS DATE]","),",,, -,,,,,,,,"[SPECIFIC CONTENT1]",";",,, +,,,,,,,,"[SPECIFIC CONTENT]",";",,, ,,,,,,,,"[CREDIT LINE (SOURCE OF THIS SOURCE)]",".",,, 163,"Publications: Periodicals, Broadcasts & Web Miscellanea","Periodicals","Magazine articles","Online reprints, random items","S","ESM783",,"[AUTHOR (LAST)]",",",,, ,,,,,,,,"[ARTICLE TITLE]",",","Quoted",, -,,,,,,,,"[SPECIFIC CONTENT2]",".",,, +,,,,,,,,"[SPECIFIC CONTENT (SHORT)]",".",,, 164,"Publications: Periodicals, Broadcasts & Web Miscellanea","Periodicals","Newsletter articles","Print editions","L","ESM784",,"[AUTHOR (LAST)]",",",,, ,,,,,,,,"[AUTHOR (FIRST)]",".",,, ,,,,,,,,"[ARTICLE TITLE]",".","Quoted",, @@ -3037,14 +3039,14 @@ ,,,,,,,,"[ARTICLE TITLE (SHORT)]",",","Quoted",, ,,,,,,,,"[PAGE(S)]",".",,, 165,"Publications: Periodicals, Broadcasts & Web Miscellanea","Periodicals","Newspaper articles","Print editions","L","ESM785",,"[LOCATION]",".",,, -,,,,,,,,"[NEWSPAPER1]",",","Italics",, +,,,,,,,,"[NEWSPAPER]",",","Italics",, ,,,,,,,,"[ISSUES EXAMINED]",".",,, 165,"Publications: Periodicals, Broadcasts & Web Miscellanea","Periodicals","Newspaper articles","Print editions","F","ESM785",,"[ARTICLE TITLE]",",","Quoted",, -,,,,,,,,"[NEWSPAPER2]",",","Italics",, +,,,,,,,,"[NEWSPAPER]",",","Italics",, ,,,,,,,,"[ISSUE DATE]",",",,, ,,,,,,,,"[PAGE & COLUMN]",".",,, 165,"Publications: Periodicals, Broadcasts & Web Miscellanea","Periodicals","Newspaper articles","Print editions","S","ESM785",,"[ARTICLE TITLE]",",","Quoted",, -,,,,,,,,"[PAGE & COLUMN2]",".",,, +,,,,,,,,"[PAGE & COLUMN]",".",,, 166,"Publications: Periodicals, Broadcasts & Web Miscellanea","Periodicals","Newspaper articles","Online archives ","L","ESM786",,"[AUTHOR (LAST)]",",",,, ,,,,,,,,"[AUTHOR (FIRST)]",".",,, ,,,,,,,,"[ARTICLE TITLE]",".","Quoted",, @@ -3128,8 +3130,8 @@ 169,"Publications: Periodicals, Broadcasts & Web Miscellanea","Broadcasts & Web Miscellanea","Podcasts",,"S","ESM789",,"[PRESENTER (LAST)]",",",,, ,,,,,,,,"[SUBJECT/TITLE]",",","Quoted",, ,,,,,,,,"[SPECIFIC CONTENT (SHORT)]",".",,, -170,"Publications: Periodicals, Broadcasts & Web Miscellanea","Broadcasts & Web Miscellanea","Radio & television clips",,"L","ESM790",,"[PRESENTERS (LAST)]",",",,, -,,,,,,,,"[PRESENTERS (FIRST)]",".",,, +170,"Publications: Periodicals, Broadcasts & Web Miscellanea","Broadcasts & Web Miscellanea","Radio & television clips",,"L","ESM790",,"[PRESENTER (LAST)]",",",,, +,,,,,,,,"[PRESENTER (FIRST)]",".",,, ,,,,,,,,"[CLIP ID]",".","Quoted",, ,,,,,,,,"[TITLE OF SHOW]",":","Italics",, ,,,,,,,,"[SEGMENT]",",","Italics",, @@ -3139,8 +3141,8 @@ ,,,,,,,,"[WEBSITE]",".","Italics",, ,,,,,,,,"[URL (DIGITAL LOCATION)]",":",,, ,,,,,,,,"[ACCESS YEAR]",".",,, -170,"Publications: Periodicals, Broadcasts & Web Miscellanea","Broadcasts & Web Miscellanea","Radio & television clips",,"F","ESM790",,"[PRESENTERS (FIRST)]",,,, -,,,,,,,,"[PRESENTERS (LAST)]",",",,, +170,"Publications: Periodicals, Broadcasts & Web Miscellanea","Broadcasts & Web Miscellanea","Radio & television clips",,"F","ESM790",,"[PRESENTER (FIRST)]",,,, +,,,,,,,,"[PRESENTER (LAST)]",",",,, ,,,,,,,,"[CLIP ID]",",","Quoted",, ,,,,,,,,"[TITLE OF SHOW]",":","Italics",, ,,,,,,,,"[SEGMENT]",",","Italics",, @@ -3150,5 +3152,5 @@ ,,,,,,,,"[WEBSITE]",,"Italics",, ,,,,,,,"(","[URL (DIGITAL LOCATION)]",":",,, ,,,,,,,,"[DATE]",").",,, -170,"Publications: Periodicals, Broadcasts & Web Miscellanea","Broadcasts & Web Miscellanea","Radio & television clips",,"S","ESM790",,"[PRESENTERS (LAST)]",",",,, +170,"Publications: Periodicals, Broadcasts & Web Miscellanea","Broadcasts & Web Miscellanea","Radio & television clips",,"S","ESM790",,"[PRESENTER (LAST)]",",",,, ,,,,,,,,"[CLIP ID]",".","Quoted",, diff --git a/gramps/gen/lib/srcattrtype.py b/gramps/gen/lib/srcattrtype.py index 0ca604cef..c1ea75868 100644 --- a/gramps/gen/lib/srcattrtype.py +++ b/gramps/gen/lib/srcattrtype.py @@ -72,585 +72,525 @@ class SrcAttributeType(GrampsType): (GEN_BY , _("Generated by"), "Generated by"), # Generated sources on import # possible fields for evidence styles need to be added next ] - #following fields are generated with evidencefieldgenerator.py #the index starts at 100! - ABSTRACTOR_6FIRST9 = 567 - ABSTRACTOR_6LAST9 = 566 - ACCESS_DATA_DISTANCE_DIRECTION_GPS_READING_ETC = 336 - ACCESS_DATE = 422 - ACCESS_YEAR = 313 - ACT_NO = 617 - ADDRESS_FOR_PRIVATE_USE = 195 - AGENCY = 525 - AGENCY_OFFICE_OR_REPOSITORY = 526 - AGENCY_OR_CREATOR = 385 - AGENCY_OR_REPOSITORY = 523 - AGENCY_OR_REPOSITORY_6SHORT9 = 524 - ANALYTICAL_COMMENTS_BY_RESEARCHER = 327 - ARCHIVAL_DESCRIPTION = 158 - ARCHIVAL_ID = 448 - ARCHIVAL_ID_OR_ARRANGEMENT = 450 - ARTICLE_SUBTITLE = 630 - ARTICLE_TITLE = 497 - ARTICLE_TITLE_6SHORT9 = 647 - ARTIFACT_ID = 199 - ARTIFACT_ID2 = 201 - ARTIFACT_ID_6SHORT9 = 193 + ABSTRACTOR_6FIRST9 = 529 + ABSTRACTOR_6LAST9 = 528 + ACCESS_DATA_DISTANCE_DIRECTION_GPS_READING_ETC = 324 + ACCESS_DATE = 401 + ACCESS_YEAR = 302 + ACT_NO = 574 + ADDRESS_FOR_PRIVATE_USE = 191 + AGENCY = 491 + AGENCY_OFFICE_OR_REPOSITORY = 492 + AGENCY_OR_CREATOR = 369 + AGENCY_OR_REPOSITORY = 489 + AGENCY_OR_REPOSITORY_6SHORT9 = 490 + ANALYTICAL_COMMENTS_BY_RESEARCHER = 316 + ARCHIVAL_DESCRIPTION = 156 + ARCHIVAL_ID = 422 + ARCHIVAL_ID_OR_ARRANGEMENT = 424 + ARTICLE_SUBTITLE = 583 + ARTICLE_TITLE = 468 + ARTICLE_TITLE_6SHORT9 = 594 + ARTIFACT_ID = 195 + ARTIFACT_ID_6SHORT9 = 189 ARTIFACT_TITLE = 102 - AUTHOR = 167 - AUTHOR2 = 619 - AUTHORS_6FIRST9 = 642 - AUTHORS_6LAST9 = 641 - AUTHOR_6COMPILER9_6FIRST9 = 594 - AUTHOR_6COMPILER9_6LAST9 = 593 - AUTHOR_6FIRST9 = 555 + AUTHOR = 165 + AUTHOR_6COMPILER9_6FIRST9 = 554 + AUTHOR_6COMPILER9_6LAST9 = 553 + AUTHOR_6FIRST9 = 162 AUTHOR_6GRANTOR9 = 134 - AUTHOR_6LAST9 = 554 - AUTHOR_6SHORT29 = 623 + AUTHOR_6LAST9 = 161 AUTHOR_6SHORT9 = 140 - AUTHOR_6SHORT92 = 626 - AUTHOR_6TRANSLATOR9_6FIRST9 = 578 - AUTHOR_6TRANSLATOR9_6LAST9 = 577 - AUTHOR_AND_PROFESSIONAL_CREDENTIALS_FIRST = 160 - AUTHOR_AND_PROFESSIONAL_CREDENTIALS_FIRST_LAST = 257 - AUTHOR_AND_PROFESSIONAL_CREDENTIALS_LAST = 159 - AUTHOR_AND_PROFESSIONAL_CREDENTIALS_LAST_FIRST = 252 - AUTHOR_FIRST = 164 - AUTHOR_LAST = 163 - BIBLE_ID_6OWNER_FIRST9 = 205 - BIBLE_ID_6OWNER_LAST9 = 204 + AUTHOR_6TRANSLATOR9_6FIRST9 = 540 + AUTHOR_6TRANSLATOR9_6LAST9 = 539 + AUTHOR_AND_PROFESSIONAL_CREDENTIALS_6FIRST9 = 158 + AUTHOR_AND_PROFESSIONAL_CREDENTIALS_6LAST9 = 157 + BIBLE_ID_6OWNER_FIRST9 = 200 + BIBLE_ID_6OWNER_LAST9 = 199 BIBLE_ID_6SHORT9 = 152 BIBLE_ID_ORIGINAL_OWNER_6FIRST9 = 145 BIBLE_ID_ORIGINAL_OWNER_6LAST9 = 144 BIBLE_TITLE = 147 - BLOG_NAME = 656 - BOOK_AND_PAGE = 481 - BOOK_EDITOR = 562 - BOOK_EDITOR_6SHORT9 = 560 - BOOK_TITLE = 559 - BROADCAST_DATE = 668 - CASE = 600 - CASE_AND_OR_OR_ITEM = 472 - CASE_AND_OR_OR_ITEM_6SHORT9 = 445 - CASE_FILE_NO = 465 - CASE_ID_OR_ITEM_OF_INTEREST = 454 - CASE_LABEL = 438 - CASE_LABEL_6LEGAL_STYLE9 = 602 - CASE_LABEL_6SHORT9 = 439 - CASE_LABEL_AND_OR_OR_ITEM_OF_INTEREST = 441 - CASE_LABEL_OR_ITEM_6SHORT9 = 453 - CEMETERY = 335 - CEMETERY_6AUTHOR9 = 326 - CENSUS_ID = 380 - CENSUS_ID1 = 406 - CENSUS_ID2 = 408 - CENSUS_ID_6GENERIC9 = 346 - CENSUS_ID_6GENERIC9_6SHORT9 = 398 - CENSUS_ID_6GENERIC_YEAR_AND_TRIBE9 = 384 - CERTIFICATE_DATE = 474 - CERTIFICATE_ID_6SHORT9 = 433 - CERTIFICATE_ID_6WHO_WHEN_WHAT_EVENT9 = 431 - CERTIFICATE_TYPE_AND_NO = 473 - CERTIFICATE_TYPE_AND_NO_2 = 480 - CHAPTER_PAGES = 561 - CHAPTER_TITLE = 558 - CHAPTER_TITLE_6SHORT9 = 563 - CHURCH_6AUTHOR9 = 410 - CHURCH_6SHORT9 = 415 - CHURCH_LOCATION = 411 - CITATION_6LEGAL_STYLE9_6SHORT9 = 616 - CIVIL_DIVISION6S9 = 351 - CIVIL_DIVISION6S9_6SHORT9 = 356 - CLASS = 321 - CLIP_ID = 672 - CODE = 407 - CODE_6SHORT9 = 409 + BLOG_NAME = 600 + BOOK_AND_PAGE = 453 + BOOK_EDITOR = 524 + BOOK_EDITOR_6SHORT9 = 522 + BOOK_TITLE = 521 + BROADCAST_DATE = 611 + CASE = 559 + CASE_AND_OR_OR_ITEM = 445 + CASE_AND_OR_OR_ITEM_6SHORT9 = 419 + CASE_FILE_NO = 439 + CASE_ID_OR_ITEM_OF_INTEREST = 428 + CASE_LABEL = 413 + CASE_LABEL_6LEGAL_STYLE9 = 560 + CASE_LABEL_6SHORT9 = 414 + CASE_LABEL_AND_OR_OR_ITEM_OF_INTEREST = 416 + CASE_LABEL_OR_ITEM_6SHORT9 = 427 + CEMETERY = 323 + CEMETERY_6AUTHOR9 = 315 + CENSUS_ID = 365 + CENSUS_ID_6GENERIC9 = 334 + CENSUS_ID_6GENERIC9_6SHORT9 = 379 + CENSUS_ID_6GENERIC_YEAR_AND_TRIBE9 = 368 + CERTIFICATE_DATE = 447 + CERTIFICATE_ID_6SHORT9 = 412 + CERTIFICATE_ID_6WHO_WHEN_WHAT_EVENT9 = 410 + CERTIFICATE_TYPE_AND_NO = 446 + CHAPTER_PAGES = 523 + CHAPTER_TITLE = 520 + CHAPTER_TITLE_6SHORT9 = 525 + CHURCH_6AUTHOR9 = 389 + CHURCH_6SHORT9 = 394 + CHURCH_LOCATION = 390 + CITATION_6LEGAL_STYLE9_6SHORT9 = 573 + CIVIL_DIVISION6S9 = 339 + CIVIL_DIVISION6S9_6SHORT9 = 344 + CLASS = 310 + CLIP_ID = 613 + CODE = 387 + CODE_6SHORT9 = 388 COLLECTION = 105 - COLLECTION_6GENERIC_LABEL9 = 429 + COLLECTION_6GENERIC_LABEL9 = 408 COLLECTION_6SHORT9 = 127 - COLLECTION_OWNER = 430 - COMPILER = 260 - COMPILERS_6SHORT9 = 185 - COMPILERS_FIRST = 172 - COMPILERS_LAST = 171 - COMPILER_6FIRST9 = 435 - COMPILER_6LAST9 = 434 - COMPILER_6SHORT9 = 215 - COMPILER_FIRST = 192 - COMPILER_LAST = 191 - CONGRESS = 624 - CONGRESS_AND_SESSION = 621 - CONGRESS_AND_SESSION_6SHORT9 = 622 - CONTACT_ADDRESS = 236 - CONTACT_PRIVATE_ADDRESS = 235 - COPY_ID = 350 - CORPORATE_AFFILIATION = 307 - CORPORATE_AUTHOR = 300 - CORPORATE_AUTHOR_6RESEARCHERS_NOT_IDENTIFIED9 = 311 - CORPORATE_COLLECTION = 272 - CORPORATE_LOCATION = 301 - CORPORATE_WRITER = 275 - COUNTRY = 533 - COURT_TERM = 466 - COURT_TERM_6SHORT9 = 467 - COURT_TERM_OR_SUBTITLE = 603 + COLLECTION_OWNER = 409 + COMPILER = 251 + COMPILER_6FIRST9 = 170 + COMPILER_6LAST9 = 169 + COMPILER_6SHORT9 = 183 + CONGRESS = 578 + CONGRESS_AND_SESSION = 576 + CONGRESS_AND_SESSION_6SHORT9 = 577 + CONTACT_ADDRESS = 230 + CONTACT_PRIVATE_ADDRESS = 229 + COPY_ID = 338 + CORPORATE_AFFILIATION = 296 + CORPORATE_AUTHOR = 289 + CORPORATE_AUTHOR_6RESEARCHERS_NOT_IDENTIFIED9 = 300 + CORPORATE_COLLECTION = 263 + CORPORATE_LOCATION = 290 + CORPORATE_WRITER = 266 + COUNTRY = 499 + COURT_TERM = 440 + COURT_TERM_6SHORT9 = 441 + COURT_TERM_OR_SUBTITLE = 561 CREATION_DATE = 104 - CREATION_DATE_6SHORT9 = 341 - CREATOR = 329 + CREATION_DATE_6SHORT9 = 329 + CREATOR = 318 CREATOR_6FIRST9 = 101 CREATOR_6LAST9 = 100 - CREATOR_6SHORT9 = 344 - CREATOR_OF_BLOG = 655 - CREATOR_OF_DATABASE = 535 - CREATOR_OF_DATABASE_6FIRST9 = 496 - CREATOR_OF_DATABASE_6LAST9 = 495 - CREATOR_OR_OWNER_OF_DATABASE_AND_WEBSITE = 548 - CREATOR_OWNER_OF_DATABASE_AND_WEBSITE = 537 - CREATOR_OWNER_OF_DATABASE_AND_WEBSITE_6SHORT9 = 536 + CREATOR_6SHORT9 = 332 + CREATOR_OF_BLOG = 599 + CREATOR_OF_DATABASE = 501 + CREATOR_OF_DATABASE_6FIRST9 = 467 + CREATOR_OF_DATABASE_6LAST9 = 466 + CREATOR_OR_OWNER_OF_DATABASE_AND_WEBSITE = 514 + CREATOR_OWNER_OF_DATABASE_AND_WEBSITE = 503 + CREATOR_OWNER_OF_DATABASE_AND_WEBSITE_6SHORT9 = 502 CREDIT_LINE_6SOURCE_OF_THE_SOURCE9 = 118 - CREDIT_LINE_6SOURCE_OF_THIS_SOURCE9 = 287 - CURRENT_OR_LAST_KNOWN_OWNER = 194 - DATABASE_6PUBLICATION9_TITLE = 400 - DATABASE_TITLE = 285 - DATABASE_TITLE_6SHORT9 = 609 - DATA_COLLECTION_INFO = 337 + CREDIT_LINE_6SOURCE_OF_THIS_SOURCE9 = 278 + CURRENT_OR_LAST_KNOWN_OWNER = 190 + DATABASE_6PUBLICATION9_TITLE = 381 + DATABASE_TITLE = 276 + DATABASE_TITLE_6SHORT9 = 566 + DATA_COLLECTION_INFO = 325 DATE = 115 - DATE_6IF_NOT_IN_TITLE9 = 471 DATE_6SHORT9 = 126 - DATE_OWNED = 278 - DATE_PUBLISHED_UPDATED_OR_ACCESSED = 606 + DATE_OWNED = 269 + DATE_PUBLISHED_UPDATED_OR_ACCESSED = 563 DATE_RANGE = 146 - DATE_READ_OR_PHOTOGRAPHED = 338 - DATE_SPAN_READ = 661 - DESCRIPTION_AND_EVALUATION_BY_RESEARCHER = 214 + DATE_READ_OR_PHOTOGRAPHED = 326 + DATE_SPAN_READ = 604 + DESCRIPTION_AND_EVALUATION_BY_RESEARCHER = 209 DESCRIPTIVE_DETAIL = 109 - DESCRIPTIVE_DETAIL_OR_OTHER_RELEVANT_DISCUSSION = 220 - DIGITAL_FILE_TYPE = 552 - DIGITAL_ID_NO = 538 - DIGITAL_PATH_6WHEN_NECESSARY9 = 286 - DIVISION = 506 - DOCUMENT = 478 - DOCUMENT_6SHORT9 = 479 - DOCUMENT_DATE = 508 - DOCUMENT_ID = 507 - DOCUMENT_ID_6SHORT9 = 509 + DESCRIPTIVE_DETAIL_OR_OTHER_RELEVANT_DISCUSSION = 214 + DIGITAL_FILE_TYPE = 517 + DIGITAL_ID_NO = 504 + DIGITAL_PATH = 277 + DIVISION = 476 + DOCUMENT = 451 + DOCUMENT_6SHORT9 = 452 + DOCUMENT_DATE = 478 + DOCUMENT_ID = 477 + DOCUMENT_ID_6SHORT9 = 479 DOCUMENT_TITLE = 116 DOCUMENT_TITLE_6SHORT9 = 119 - DVD_TITLE = 582 - EDITION = 611 - EDITION_DATA = 572 - EDITION_DATA_6SHORT9 = 573 - EDITION_YEAR = 612 - EDITOR_6FIRST9 = 565 - EDITOR_6LAST9 = 564 - ENTRY = 482 - ENUMERATION_DISTRICT_6FROM_1880_FORWARD9 = 373 - ENUMERATION_DISTRICT_6SHORT9 = 379 - ENUMERATION_DISTRICT_AND_SHEET_NO = 393 - ENUMERATION_DISTRICT_AND_SHEET_NO_6SHORT9 = 394 + DVD_TITLE = 544 + EDITION = 568 + EDITION_DATA = 534 + EDITION_DATA_6SHORT9 = 535 + EDITION_YEAR = 569 + EDITOR_6FIRST9 = 527 + EDITOR_6LAST9 = 526 + ENTRY = 454 + ENUMERATION_DISTRICT_6FROM_1880_FORWARD9 = 360 + ENUMERATION_DISTRICT_6SHORT9 = 364 + ENUMERATION_DISTRICT_AND_SHEET_NO = 376 + ENUMERATION_DISTRICT_AND_SHEET_NO_6SHORT9 = 377 EVALUATION_OR_DESCRIPTIVE_DETAILS = 124 - FILE = 189 - FILE_DATE = 484 - FILE_ID_6FIRST9 = 519 - FILE_ID_6LAST9 = 518 - FILE_LABEL = 340 - FILE_LABEL_6SHORT9 = 342 - FILE_LOCATION = 271 + FILE = 187 + FILE_DATE = 456 + FILE_ID_6FIRST9 = 485 + FILE_ID_6LAST9 = 484 + FILE_LABEL = 328 + FILE_LABEL_6SHORT9 = 330 + FILE_LOCATION = 262 FILE_NAME = 138 FILE_NO = 137 - FILE_NO_AND_NAME = 483 - FILE_TITLE = 298 - FILE_TITLE_6SHORT9 = 299 - FILE_UNIT = 501 - FILE_UNIT_6SHORT9 = 503 - FILE_UNIT_ID = 510 - FILE_UNIT_NO = 502 - FILE_YEAR = 520 - FILM_ID = 184 - FILM_ID_6NO_TITLE9_PUBN_NO_AND_SPECIFIC_ROLL = 541 - FILM_ID_6PUBLICATION_NO9 = 545 - FILM_ID_6SHORT9 = 177 - FILM_ID_AND_ROLL_NO = 190 - FILM_LOCATION = 180 - FILM_PUBLICATION_SERIES = 587 - FILM_PUBLISHER = 590 - FILM_REPOSITORY = 179 - FILM_REPOSITORY_LOCATION = 423 - FILM_RESPOSITORY = 460 - FILM_TITLE = 391 - FOLDER = 240 - FOLDER_6SHORT9 = 343 - FOLDER_LABEL = 170 - FORMAT = 370 - FORMAT_OR_EDITION = 574 - FORMAT_OR_EDITION_6SHORT9 = 575 - FRAME_NOS = 457 - FULL_CREDIT_LINE_6SOURCE_OF_THE_SOURCE9 = 288 - GENERIC_ID_6SHORT9 = 232 - GENERIC_LABEL_6SHORT9 = 267 - GEOGRAPHIC_DIVISION = 372 - GRANTOR_6AUTHOR9 = 230 - GRANTOR_6SHORT9 = 231 - HOUSEHOLD = 375 - HOUSEHOLD_ID = 352 - HOUSEHOLD_ID_6SHORT9 = 357 - ID_OF_PERSON6S9 = 475 - ID_OF_PERSON6S9_6SHORT9 = 477 - INCLUSIVE_DATES = 206 - INSTITUTION = 322 - INSTITUTIONAL_AUTHOR = 317 - INTERVIEWEE_ADDRESS_FOR_PRIVATE_USE = 226 - INTERVIEWER = 227 - ISSUES_EXAMINED = 649 - ISSUE_DATE = 634 - ITEM = 274 - ITEM_6FROM_THE_SERIES_OF_THE_SAME_NAME9 = 529 - ITEM_6FROM_THE_SERIES_OF_THE_SAME_NAME9_6SHORT9 = 530 - ITEM_6GENERIC_ID9 = 212 - ITEM_6SHORT9 = 188 - ITEM_DATE = 169 - ITEM_FORMAT = 225 - ITEM_ID_6GENERIC9 = 198 - ITEM_ID_6SHORT9 = 200 + FILE_NO_AND_NAME = 455 + FILE_TITLE = 287 + FILE_TITLE_6SHORT9 = 288 + FILE_UNIT = 472 + FILE_UNIT_6SHORT9 = 474 + FILE_UNIT_NO = 473 + FILE_YEAR = 486 + FILM_ID = 182 + FILM_ID_6NO_TITLE9_PUBN_NO_AND_SPECIFIC_ROLL = 507 + FILM_ID_6PUBLICATION_NO9 = 511 + FILM_ID_6SHORT9 = 175 + FILM_ID_AND_ROLL_NO = 188 + FILM_LOCATION = 178 + FILM_PUBLICATION_SERIES = 549 + FILM_PUBLISHER = 552 + FILM_REPOSITORY = 177 + FILM_REPOSITORY_LOCATION = 402 + FILM_RESPOSITORY = 434 + FILM_TITLE = 374 + FOLDER_LABEL = 168 + FOLDER_LABEL_6SHORT9 = 331 + FORMAT = 358 + FORMAT_OR_EDITION = 536 + FORMAT_OR_EDITION_6SHORT9 = 537 + FRAME_NOS = 431 + FULL_CREDIT_LINE_6SOURCE_OF_THE_SOURCE9 = 279 + GENERIC_ID_6SHORT9 = 226 + GENERIC_LABEL_6SHORT9 = 258 + GEOGRAPHIC_DIVISION = 359 + GRANTOR_6AUTHOR9 = 224 + GRANTOR_6SHORT9 = 225 + HOUSEHOLD = 362 + HOUSEHOLD_ID = 340 + HOUSEHOLD_ID_6SHORT9 = 345 + ID_OF_PERSON6S9 = 448 + ID_OF_PERSON6S9_6SHORT9 = 450 + INCLUSIVE_DATES = 201 + INSTITUTION = 311 + INSTITUTIONAL_AUTHOR = 306 + INTERVIEWEE_ADDRESS_FOR_PRIVATE_USE = 220 + INTERVIEWER = 221 + ISSUES_EXAMINED = 596 + ISSUE_DATE = 586 + ITEM = 265 + ITEM_6FROM_THE_SERIES_OF_THE_SAME_NAME9 = 495 + ITEM_6FROM_THE_SERIES_OF_THE_SAME_NAME9_6SHORT9 = 496 + ITEM_6GENERIC_ID9 = 207 + ITEM_6SHORT9 = 186 + ITEM_DATE = 167 + ITEM_FORMAT = 219 + ITEM_ID_6GENERIC9 = 194 + ITEM_ID_6SHORT9 = 196 ITEM_NO = 108 - ITEM_NO_OR_ARRANGEMENT = 470 - ITEM_OF_INTEREST = 183 - ITEM_OF_INTEREST_1 = 436 - ITEM_OF_INTEREST_2 = 437 - ITEM_OF_INTEREST_6COUNTY_STATE_DATE_AND_PO9 = 547 - ITEM_OF_INTEREST_6PARTIES_AND_TYPE_OF_DOCUMENT9 = 486 - ITEM_OF_INTEREST_6SHORT9 = 289 - ITEM_OF_INTEREST_AND_DATE_FOR_UNPAGINATED_ENTRY = 421 - ITEM_OF_INTEREST_AND_YEAR = 419 - ITEM_OF_INTEREST_WITH_ABBREVIATED_DETAIL = 403 - ITEM_OF_INTEREST_WITH_IDENTIFYING_DETAIL = 402 + ITEM_NO_OR_ARRANGEMENT = 444 + ITEM_OF_INTEREST = 181 + ITEM_OF_INTEREST_6COUNTY_STATE_DATE_AND_PO9 = 513 + ITEM_OF_INTEREST_6PARTIES_AND_TYPE_OF_DOCUMENT9 = 458 + ITEM_OF_INTEREST_6SHORT9 = 280 + ITEM_OF_INTEREST_AND_DATE_FOR_UNPAGINATED_ENTRY = 400 + ITEM_OF_INTEREST_AND_YEAR = 398 + ITEM_OF_INTEREST_WITH_ABBREVIATED_DETAIL = 384 + ITEM_OF_INTEREST_WITH_IDENTIFYING_DETAIL = 383 ITEM_OR_PIECE = 122 ITEM_OR_PIECE_NUMBER = 123 - ITEM_TITLE = 168 + ITEM_TITLE = 166 ITEM_TYPE = 103 - ITEM_TYPE_6IF_NECESSARY9 = 499 - ITEM_TYPE_AND_FORMAT_F = 331 - ITEM_TYPE_AND_FORMAT_L = 330 - ITEM_TYPE_AND_FORMAT_S = 332 + ITEM_TYPE_6IF_NECESSARY9 = 470 + ITEM_TYPE_AND_FORMAT = 319 + ITEM_TYPE_AND_FORMAT_6SHORT9 = 320 ITEM_TYPE_OR_FORMAT = 110 - ITEM_TYPE_OR_FORMAT2 = 550 - ITEM_TYPE_OR_FORMAT_2 = 553 - ITEM_TYPE_OR_FORMAT_6SHORT9 = 539 - JOURNAL_TITLE = 631 - JURISDICTION = 382 - JURISDICTION1 = 368 - JURISDICTION2 = 371 - JURISDICTION3 = 377 - JURISDICTION_6AUTHOR9_6STATE_CITY9 = 494 - JURISDICTION_6CITY_STATE9 = 464 - JURISDICTION_6COUNTRY_LOCAL9 = 459 - JURISDICTION_6COUNTY9 = 458 - JURISDICTION_6COUNTY_STATE9 = 348 - JURISDICTION_6COUNTY_STATE9_6SHORT9 = 354 - JURISDICTION_6LOCAL_COUNTRY9 = 461 - JURISDICTION_6LONG9 = 383 - JURISDICTION_6SHORT9 = 364 - JURISDICTION_6STATE9 = 446 - JURISDICTION_6STATE_CITY9 = 463 - JURISDICTION_6STATE_COUNTY9 = 345 - JURISDICTION_OR_AGENCY1 = 492 - JURISDICTION_OR_AGENCY2 = 493 - JURISDICTION_OR_AGENCY_6STATE_AGENCY9 = 488 - JURISDICTION_OR_REPY_LOCATION = 456 - LIBRARY_DIVISION = 515 - LOCATION = 223 - LOCATION_6SHORT9 = 328 - LOCATION_OF_INSTITUTION = 323 - MAGAZINE = 643 - MAIN_TITLE = 556 + ITEM_TYPE_OR_FORMAT_6SHORT9 = 505 + JOURNAL_TITLE = 584 + JURISDICTION = 356 + JURISDICTION_6AUTHOR9_6STATE_CITY9 = 465 + JURISDICTION_6CITY_STATE9 = 438 + JURISDICTION_6COUNTRY_LOCAL9 = 433 + JURISDICTION_6COUNTY9 = 432 + JURISDICTION_6COUNTY_STATE9 = 336 + JURISDICTION_6COUNTY_STATE9_6SHORT9 = 342 + JURISDICTION_6LOCAL_COUNTRY9 = 435 + JURISDICTION_6LONG9 = 367 + JURISDICTION_6SHORT9 = 352 + JURISDICTION_6STATE9 = 420 + JURISDICTION_6STATE_CITY9 = 437 + JURISDICTION_6STATE_COUNTY9 = 333 + JURISDICTION_OR_AGENCY = 464 + JURISDICTION_OR_AGENCY_6STATE_AGENCY9 = 460 + JURISDICTION_OR_REPY_LOCATION = 430 + LIBRARY_DIVISION = 481 + LOCATION = 217 + LOCATION_6SHORT9 = 317 + LOCATION_OF_INSTITUTION = 312 + MAGAZINE = 589 + MAIN_TITLE = 518 MANUSCRIPT_NO = 151 - MANUSCRIPT_SERIES_TITLE = 173 - MANUSCRIPT_SERIES_TITLE_6SHORT9 = 186 - MANUSCRIPT_TITLE = 165 - MANUSCRIPT_TITLE_6SHORT9 = 166 - MEMBERSHIP_NUMBER = 291 - MESSAGE_TITLE = 662 - MICROFILM_ID = 334 - MICROFILM_ID_6ABBREVIATED9_PUBN_NO_AND_TOTAL_ROLLS = 540 - MICROFILM_ID_OR_ROLL_NO6S9 = 280 - MICROFILM_ID_OR_ROLL_NO6S9_6SHORT9 = 282 - NAME = 527 - NAME_OF_ACT = 613 - NAME_OF_CODE = 610 - NAME_OF_COLLECTION = 269 - NAME_OF_FORUM = 659 - NAME_OF_INTERVIEWER = 224 - NARA_FILE_UNIT_6JURISDICTION_SMALLEST_TO_LARGEST9 = 360 - NARA_RECORD_GROUP_6NAME_AND_NO9 = 363 - NARA_RECORD_GROUP_NO = 522 - NARA_RECORD_GROUP_TITLE = 521 - NARA_SERIES_AND_SUBGROUP_6SHORT9 = 365 - NARA_SERIES_AND_VOLUME = 361 - NARA_SUBGROUP = 362 - NETWORK_OR_PRODUCER = 675 - NEWSLETTER = 646 - NEWSPAPER = 653 - NEWSPAPER1 = 648 - NEWSPAPER2 = 650 - NEW_FORMAT = 571 - NO_OF_ROLLS = 178 - NO_OF_VOLS = 174 - ORGANIZATION = 295 - ORGANIZATION1 = 290 - ORGANIZATION2 = 292 - ORGANIZATION_6CREATOR9 = 297 - ORGANIZATION_6SHORT9 = 293 - ORGANIZATION_6SHORT_TITLE9 = 294 - ORIGINAL_PUBLICATION_DATA_6PLACE_PUBLISHER_YEAR9 = 584 - ORIGINAL_PUBLICATION_DATA_6PLACE_PUBLISHER_YEAR9_6SHORT9 = 586 - ORIGINAL_PUBLICATION_DATE = 644 - ORIGINAL_PUBLICATION_YEAR = 570 - OWNERS_ADDRESS = 262 - OWNERS_ADDRESS_FOR_PRIVATE_USE = 228 - OWNERS_LOCATION = 196 - OWNERS_PRIVATE_ADDRESS = 261 - OWNERS_PRIVATE_LOCATION = 277 - OWNER_AND_CONTACT_INFORMATION = 256 - OWNER_LOCATION = 176 - OWNER_OR_REPOSITORY = 396 - OWNER_OR_SUPPLIER = 209 - OWNER_OR_SUPPLIERS_LOCATION = 210 - OWNER_REPOSITORY = 175 + MANUSCRIPT_SERIES_TITLE = 171 + MANUSCRIPT_SERIES_TITLE_6SHORT9 = 184 + MANUSCRIPT_TITLE = 163 + MANUSCRIPT_TITLE_6SHORT9 = 164 + MEMBERSHIP_NUMBER = 282 + MESSAGE_TITLE = 605 + MICROFILM_ID = 322 + MICROFILM_ID_6ABBREVIATED9_PUBN_NO_AND_TOTAL_ROLLS = 506 + MICROFILM_ID_OR_ROLL_NO6S9 = 271 + MICROFILM_ID_OR_ROLL_NO6S9_6SHORT9 = 273 + NAME = 493 + NAME_OF_ACT = 570 + NAME_OF_CODE = 567 + NAME_OF_COLLECTION = 260 + NAME_OF_FORUM = 602 + NAME_OF_INTERVIEWER = 218 + NARA_FILE_UNIT_6JURISDICTION_SMALLEST_TO_LARGEST9 = 348 + NARA_RECORD_GROUP_6NAME_AND_NO9 = 351 + NARA_RECORD_GROUP_NO = 488 + NARA_RECORD_GROUP_TITLE = 487 + NARA_SERIES_AND_SUBGROUP_6SHORT9 = 353 + NARA_SERIES_AND_VOLUME = 349 + NARA_SUBGROUP = 350 + NETWORK_OR_PRODUCER = 616 + NEWSLETTER = 593 + NEWSPAPER = 595 + NEW_FORMAT = 533 + NO_OF_ROLLS = 176 + NO_OF_VOLS = 172 + ORGANIZATION = 281 + ORGANIZATION_6CREATOR9 = 286 + ORGANIZATION_6SHORT9 = 283 + ORGANIZATION_6SHORT_TITLE9 = 284 + ORIGINAL_PUBLICATION_DATA_6PLACE_PUBLISHER_YEAR9 = 546 + ORIGINAL_PUBLICATION_DATA_6PLACE_PUBLISHER_YEAR9_6SHORT9 = 548 + ORIGINAL_PUBLICATION_DATE = 590 + ORIGINAL_PUBLICATION_YEAR = 532 + OWNERS_ADDRESS = 253 + OWNERS_ADDRESS_FOR_PRIVATE_USE = 222 + OWNERS_LOCATION = 192 + OWNERS_PRIVATE_ADDRESS = 252 + OWNERS_PRIVATE_LOCATION = 268 + OWNER_AND_CONTACT_INFORMATION = 248 + OWNER_LOCATION = 174 + OWNER_OR_REPOSITORY = 378 + OWNER_OR_SUPPLIER = 204 + OWNER_OR_SUPPLIERS_LOCATION = 205 + OWNER_REPOSITORY = 173 PAGE6S9 = 117 - PAGE6S91 = 591 - PAGE6S92 = 592 PAGE6S9_6SHORT9 = 132 - PAGE6S9_OR_TERM = 452 - PAGES = 605 - PAGES1 = 633 - PAGES2 = 635 - PAGES3 = 636 - PAGE_6SHORT9 = 490 - PAGE_AND_COLUMN = 651 - PAGE_AND_COLUMN2 = 652 - PAGE_AND_ITEM = 413 - PAGE_ARRANGEMENT_OR_ARCHIVAL_ID = 462 - PAGE_ID = 374 - PAGE_NO_OR_ARRANGEMENT = 428 - PAGE_OR_COURT_TERM_6IF_UNPAGINATED9 = 444 - PAGE_OR_SECTION = 208 - PAGE_OR_SPECIFIC_PART = 314 - PART = 607 - PART_OR_CHAPTER_OR_SECTION = 615 - PERSON6S9_OF_INTEREST = 381 - PERSON6S9_OF_INTEREST_6SHORT9 = 399 - PERSON_INTERVIEWED_6SHORT9 = 229 - PERSON_INTERVIEWED_FIRST = 222 - PERSON_INTERVIEWED_LAST = 221 - PERSON_OF_INTEREST = 353 - PHOTOGRAPH_NO = 517 - PHOTOGRAPH_TITLE = 516 - PLACE_CREATED = 203 - PLACE_OF_FILM_PUBLICATION = 589 - PLACE_OF_PUBLICATION = 207 - PODCAST_HOST = 666 - PODCAST_TITLE = 667 - POSITION_ON_FILM = 585 - POSTING_DATE = 657 - PRESENTERS_6FIRST9 = 671 - PRESENTERS_6LAST9 = 670 - PRESENTER_6FIRST9 = 580 - PRESENTER_6LAST9 = 579 - PRESENTER_OR_GUEST_6FIRST9 = 664 - PRESENTER_OR_GUEST_6LAST9 = 663 - PRIVATE_RESEARCHER_ADDRESS = 243 - PROFESSIONAL_CREDENTIALS = 306 - PROVENANCE_AND_EVALUATION_OF_TRADITION = 266 - PUBLICATION_FORMAT = 451 - PUBLICATION_NO = 543 + PAGE6S9_OR_TERM = 426 + PAGE_6SHORT9 = 462 + PAGE_AND_COLUMN = 597 + PAGE_AND_ITEM = 392 + PAGE_ARRANGEMENT_OR_ARCHIVAL_ID = 436 + PAGE_ID = 361 + PAGE_NO_OR_ARRANGEMENT = 407 + PAGE_OR_COURT_TERM_6IF_UNPAGINATED9 = 418 + PAGE_OR_SECTION = 203 + PAGE_OR_SPECIFIC_PART = 303 + PART = 564 + PART_OR_CHAPTER_OR_SECTION = 572 + PERSON6S9_OF_INTEREST = 366 + PERSON6S9_OF_INTEREST_6SHORT9 = 380 + PERSON_INTERVIEWED_6FIRST9 = 216 + PERSON_INTERVIEWED_6LAST9 = 215 + PERSON_INTERVIEWED_6SHORT9 = 223 + PERSON_OF_INTEREST = 341 + PHOTOGRAPH_NO = 483 + PHOTOGRAPH_TITLE = 482 + PLACE_CREATED = 198 + PLACE_OF_FILM_PUBLICATION = 551 + PLACE_OF_PUBLICATION = 202 + PODCAST_HOST = 609 + PODCAST_TITLE = 610 + POSITION_ON_FILM = 547 + POSTING_DATE = 601 + PRESENTER_6FIRST9 = 542 + PRESENTER_6LAST9 = 541 + PRESENTER_OR_GUEST_6FIRST9 = 607 + PRESENTER_OR_GUEST_6LAST9 = 606 + PRIVATE_RESEARCHER_ADDRESS = 236 + PROFESSIONAL_CREDENTIALS = 295 + PROVENANCE_AND_EVALUATION_OF_TRADITION = 257 + PUBLICATION_FORMAT = 425 + PUBLICATION_NO = 509 PUBLICATION_PLACE = 148 - PUBLICATION_TITLE = 386 - PUBLICATION_TITLE1 = 369 - PUBLICATION_TITLE2 = 376 - PUBLICATION_YEAR = 598 - PUBLISHED = 392 + PUBLICATION_TITLE = 357 + PUBLICATION_YEAR = 557 + PUBLISHED = 375 PUBLISHER = 149 RECIPIENT = 135 - RECIPIENTS_ADDRESS = 255 - RECIPIENTS_LOCATION = 259 - RECIPIENTS_PRIVATE_ADDRESS = 254 - RECIPIENTS_PRIVATE_LOCATION = 258 + RECIPIENTS_ADDRESS = 247 + RECIPIENTS_LOCATION = 250 + RECIPIENTS_PRIVATE_ADDRESS = 246 + RECIPIENTS_PRIVATE_LOCATION = 249 RECIPIENT_6SHORT9 = 141 - RECORD_BOOK = 333 - RECORD_BOOK_6SERIES_AND_VOLUME_NO9 = 418 - RECORD_BOOK_ID_6GENERIC_LABEL9 = 420 - RECORD_BOOK_ID_6SERIES_AND_VOLUME9 = 424 - RECORD_BOOK_ID_6SHORT9 = 425 - RECORD_BOOK_TITLE = 412 - RECORD_BOOK_TITLE_6QUOTED_EXACTLY9 = 270 - RECORD_BOOK_TITLE_6SHORT9 = 416 + RECORD_BOOK = 321 + RECORD_BOOK_6SERIES_AND_VOLUME_NO9 = 397 + RECORD_BOOK_ID_6GENERIC_LABEL9 = 399 + RECORD_BOOK_ID_6SERIES_AND_VOLUME9 = 403 + RECORD_BOOK_ID_6SHORT9 = 404 + RECORD_BOOK_TITLE = 391 + RECORD_BOOK_TITLE_6QUOTED_EXACTLY9 = 261 + RECORD_BOOK_TITLE_6SHORT9 = 395 RECORD_DATE6S9 = 121 - RECORD_DATE6S9_6SHORT9 = 233 - RECORD_FORMAT = 401 - RECORD_GROUP = 491 - RECORD_GROUP_6NAME_AND_NO9 = 359 - RECORD_GROUP_6SHORT9 = 366 - RECORD_GROUP_AND_OR_OR_SUBGROUP = 273 - RECORD_GROUP_NO = 449 - RECORD_GROUP_NO_6SHORT9 = 504 - RECORD_GROUP_NO_6SHORT9_REPOSITORY_6SHORT9 = 542 - RECORD_GROUP_TITLE = 500 - RECORD_HOLDER = 324 - RECORD_HOLDER_PRIVATE_ADDRESS = 325 + RECORD_DATE6S9_6SHORT9 = 227 + RECORD_FORMAT = 382 + RECORD_GROUP = 463 + RECORD_GROUP_6NAME_AND_NO9 = 347 + RECORD_GROUP_6SHORT9 = 354 + RECORD_GROUP_AND_OR_OR_SUBGROUP = 264 + RECORD_GROUP_NO = 423 + RECORD_GROUP_NO_6SHORT9 = 475 + RECORD_GROUP_NO_6SHORT9_REPOSITORY_6SHORT9 = 508 + RECORD_GROUP_TITLE = 471 + RECORD_HOLDER = 313 + RECORD_HOLDER_PRIVATE_ADDRESS = 314 RECORD_ID_6GENERIC9 = 136 RECORD_ID_6SHORT9 = 142 - RECORD_OR_VOLUME_TITLE = 318 - RECORD_OWNER = 276 - RECORD_REPOSITORY = 455 - RECORD_SERIES = 417 + RECORD_OR_VOLUME_TITLE = 307 + RECORD_OWNER = 267 + RECORD_REPOSITORY = 429 + RECORD_SERIES = 396 RECORD_TITLE = 120 - RECORD_TITLE_6QUOTED_EXACTLY9 = 296 + RECORD_TITLE_6QUOTED_EXACTLY9 = 285 RECORD_TITLE_6SHORT9 = 125 - RECORD_TYPE = 202 - REFERENCE_TO_PRIOR_DISCUSSION = 268 - REFERRAL_TO_PRIOR_EVALUATION = 216 - REPORT_DATE = 162 - REPORT_DATE_6SHORT9 = 312 - REPORT_TITLE = 302 - REPORT_TITLE_6QUOTED_EXACTLY9 = 253 - REPORT_TITLE_6SHORT9 = 315 - REPORT_TITLE_OR_SUBJECT = 161 + RECORD_TYPE = 197 + REFERENCE_TO_PRIOR_DISCUSSION = 259 + REFERRAL_TO_PRIOR_EVALUATION = 210 + REPORT_DATE = 160 + REPORT_DATE_6SHORT9 = 301 + REPORT_TITLE = 291 + REPORT_TITLE_6QUOTED_EXACTLY9 = 245 + REPORT_TITLE_6SHORT9 = 304 + REPORT_TITLE_OR_SUBJECT = 159 REPOSITORY = 106 - REPOSITORY1 = 156 - REPOSITORY2 = 157 - REPOSITORY_6SHORT9 = 367 + REPOSITORY_6SHORT9 = 355 REPOSITORY_LOCATION = 107 - RESEARCHER = 242 - RESEARCHERS_ADDRESS = 251 - RESEARCHERS_ID = 234 - RESEARCHERS_ID_6SHORT9 = 249 - RESEARCHERS_PRIVATE_CONTACT_INFORMATION = 250 - RESEARCHER_6AUTHOR9_6FIRST9 = 305 - RESEARCHER_6AUTHOR9_6LAST9 = 304 - RESEARCHER_LOCATION = 244 - RESEARCH_SERIES = 248 - ROLL_AND_ITEM = 588 - ROLL_NO = 387 - ROLL_USED = 427 - SCHEDULE = 349 - SCHEDULE_6GENERIC9 = 390 - SCHEDULE_6GENERIC_ID9 = 389 - SCHEDULE_6SHORT9 = 378 - SCHEDULE_AND_COPY = 347 - SCHEDULE_AND_COPY1 = 395 - SCHEDULE_AND_COPY2 = 397 - SCHEDULE_AND_COPY_6SHORT9 = 355 - SCHEDULE_TITLE_6CITED_EXACTLY9 = 388 - SECTION = 182 - SECTION_6SHORT9 = 187 - SECTION_AND_PAGE = 476 - SECTION_LOT_OR_ROW = 339 - SEGMENT = 674 + RESEARCHER = 235 + RESEARCHERS_ADDRESS = 244 + RESEARCHERS_ID = 228 + RESEARCHERS_ID_6SHORT9 = 242 + RESEARCHERS_PRIVATE_CONTACT_INFORMATION = 243 + RESEARCHER_6AUTHOR9_6FIRST9 = 294 + RESEARCHER_6AUTHOR9_6LAST9 = 293 + RESEARCHER_LOCATION = 237 + RESEARCH_SERIES = 241 + ROLL_AND_ITEM = 550 + ROLL_NO = 370 + ROLL_USED = 406 + SCHEDULE = 337 + SCHEDULE_6GENERIC9 = 373 + SCHEDULE_6GENERIC_ID9 = 372 + SCHEDULE_6SHORT9 = 363 + SCHEDULE_AND_COPY = 335 + SCHEDULE_AND_COPY_6SHORT9 = 343 + SCHEDULE_TITLE_6CITED_EXACTLY9 = 371 + SECTION = 180 + SECTION_6SHORT9 = 185 + SECTION_AND_PAGE = 449 + SECTION_LOT_OR_ROW = 327 + SEGMENT = 615 SERIES = 133 - SERIES1 = 505 - SERIES2 = 442 - SERIES3 = 511 SERIES_6LONG9 = 139 SERIES_6SHORT9 = 143 - SERIES_ID = 628 - SERIES_ID_6SHORT9 = 629 + SERIES_ID = 581 + SERIES_ID_6SHORT9 = 582 SERIES_NAME = 129 SERIES_NO = 128 - SERIES_OR_COLLECTION = 469 - SERIES_OR_RECORD_GROUP = 489 - SERIES_OR_RESEARCH_PROJECT = 241 - SERIES_TITLE = 426 - SESSION = 625 - SITE_OWNER_OR_CREATOR = 498 - SOCIAL_SECURITY_NO = 528 - SOURCES_RELATIONSHIP_TO_SUBJECT_ETC = 265 - SOURCE_OF_INFORMATION = 264 - SPECIFIC_BOOK = 447 - SPECIFIC_CONTENT = 637 - SPECIFIC_CONTENT1 = 639 - SPECIFIC_CONTENT2 = 640 - SPECIFIC_CONTENT_6SHORT9 = 658 + SERIES_OR_COLLECTION = 443 + SERIES_OR_RECORD_GROUP = 461 + SERIES_OR_RESEARCH_PROJECT = 234 + SERIES_TITLE = 405 + SESSION = 579 + SITE_OWNER_OR_CREATOR = 469 + SOCIAL_SECURITY_NO = 494 + SOURCES_RELATIONSHIP_TO_SUBJECT_ETC = 256 + SOURCE_OF_INFORMATION = 255 + SPECIFIC_BOOK = 421 + SPECIFIC_CONTENT = 587 + SPECIFIC_CONTENT_6SHORT9 = 592 SPECIFIC_DATA = 153 - SPECIFIC_ITEM_OF_INTEREST = 281 - SPECIFIC_ITEM_OF_INTEREST_6SHORT9 = 283 - SPECIFIC_LOCATION = 576 - SPECIFIC_PART = 316 - SPECIFIC_ROLL = 546 - SPECIFIC_VOLUME = 440 - SPECIFIC_VOLUME6S9 = 443 - SPECIFIC_VOLUME6S9_6SHORT29 = 620 - SPECIFIC_VOLUME6S9_6SHORT9 = 604 - STATE = 405 - STUDENT_6FIRST9 = 320 - STUDENT_6LAST9 = 319 - SUBGROUP = 358 - SUBGROUP1 = 512 - SUBGROUP2 = 513 - SUBGROUP_6SHORT9 = 514 - SUBJECT = 263 + SPECIFIC_ITEM_OF_INTEREST = 272 + SPECIFIC_ITEM_OF_INTEREST_6SHORT9 = 274 + SPECIFIC_LOCATION = 538 + SPECIFIC_PART = 305 + SPECIFIC_ROLL = 512 + SPECIFIC_VOLUME = 415 + SPECIFIC_VOLUME6S9 = 417 + SPECIFIC_VOLUME6S9_6SHORT9 = 562 + STATE = 386 + STUDENT_6FIRST9 = 309 + STUDENT_6LAST9 = 308 + SUBGROUP = 346 + SUBGROUP_6SHORT9 = 480 + SUBJECT = 254 SUBJECT_FIRST = 155 SUBJECT_LAST = 154 - SUBJECT_LINE = 247 - SUBJECT_OR_NATURE_OF_DATA_PROVIDED = 239 - SUBJECT_OR_TITLE = 665 - SUBSERIES = 279 - SUBSERIES_6SHORT9 = 284 - SUBTITLE = 557 - SUPPLIER = 213 - TITLE = 531 - TITLE_6SHORT9 = 532 - TITLE_NO = 614 - TITLE_OF_ACT = 608 - TITLE_OF_DATABASE = 549 - TITLE_OF_DATABASE_6SHORT9 = 551 - TITLE_OF_PAMPHLET = 627 - TITLE_OF_SERIES = 618 - TITLE_OF_SHOW = 673 - TITLE_OF_WEBSITE = 581 - TOTAL_ROLLS = 544 - TOTAL_VOLUMES = 595 - TOTAL_VOLUMES_6SHORT9 = 597 - TRANSLATION_OF_TITLE = 583 - TYPE_OF_FORUM = 660 - TYPE_OR_FORMAT = 638 + SUBJECT_LINE = 240 + SUBJECT_OR_NATURE_OF_DATA_PROVIDED = 233 + SUBJECT_OR_TITLE = 608 + SUBSERIES = 270 + SUBSERIES_6SHORT9 = 275 + SUBTITLE = 519 + SUPPLIER = 208 + TITLE = 497 + TITLE_6SHORT9 = 498 + TITLE_NO = 571 + TITLE_OF_ACT = 565 + TITLE_OF_DATABASE = 515 + TITLE_OF_DATABASE_6SHORT9 = 516 + TITLE_OF_PAMPHLET = 580 + TITLE_OF_SERIES = 575 + TITLE_OF_SHOW = 614 + TITLE_OF_WEBSITE = 543 + TOTAL_ROLLS = 510 + TOTAL_VOLUMES = 555 + TOTAL_VOLUMES_6SHORT9 = 556 + TRANSLATION_OF_TITLE = 545 + TYPE_OF_FORUM = 603 + TYPE_OR_FORMAT = 588 URL_6DIGITAL_LOCATION9 = 113 - URL_6DIGITAL_LOCATION9_6SHORT9 = 654 + URL_6DIGITAL_LOCATION9_6SHORT9 = 598 VOLUME = 130 VOLUME_6SHORT9 = 131 - VOLUME_AND_PAGE6S9 = 485 - VOLUME_AND_PAGE_NO_OR_ARRANGEMENT = 487 - VOLUME_DATA = 568 - VOLUME_DATA_6SHORT9 = 569 - VOLUME_ISSUE_DATE = 632 - VOLUME_NO = 414 - VOLUME_OR_PAGE = 599 - VOLUME_USED = 181 - WEBSITE = 645 - WEBSITE_6WHERE_ARCHIVED9 = 669 + VOLUME_AND_PAGE6S9 = 457 + VOLUME_AND_PAGE_NO_OR_ARRANGEMENT = 459 + VOLUME_DATA = 530 + VOLUME_DATA_6SHORT9 = 531 + VOLUME_ISSUE_DATE = 585 + VOLUME_NO = 393 + VOLUME_OR_PAGE = 558 + VOLUME_USED = 179 + WEBSITE = 591 + WEBSITE_6WHERE_ARCHIVED9 = 612 WEBSITE_CREATOR_OR_OWNER = 111 - WEBSITE_CREATOR_OR_OWNER_6SHORT9 = 404 + WEBSITE_CREATOR_OR_OWNER_6SHORT9 = 385 WEBSITE_TITLE = 112 - WEBSITE_TITLE_6SAME_AS_CREATOR9 = 468 - WEBSITE_TITLE_6SAME_AS_CREATOR_OWNER9 = 534 - WHEN_HELD = 310 - WHEN_ISSUED = 432 - WHERE_AND_WHEN_HELD = 303 - WHERE_HELD = 308 - WHERE_HELD_PRIVATE_ADDRESS = 309 - WRITER = 237 - WRITERS_AFFILIATION_6IF_RELEVANT9 = 238 - WRITERS_CONTACT_INFORMATION = 246 - WRITERS_LOCATION = 219 - WRITER_6SHORT9 = 245 - WRITER_FIRST = 218 - WRITER_LAST = 217 + WEBSITE_TITLE_6SAME_AS_CREATOR9 = 442 + WEBSITE_TITLE_6SAME_AS_CREATOR_OWNER9 = 500 + WHEN_HELD = 299 + WHEN_ISSUED = 411 + WHERE_AND_WHEN_HELD = 292 + WHERE_HELD = 297 + WHERE_HELD_PRIVATE_ADDRESS = 298 + WRITER = 231 + WRITERS_AFFILIATION_6IF_RELEVANT9 = 232 + WRITERS_CONTACT_INFORMATION = 239 + WRITERS_LOCATION = 213 + WRITER_6FIRST9 = 212 + WRITER_6LAST9 = 211 + WRITER_6SHORT9 = 238 YEAR6S9 = 114 - YEAR6S91 = 596 - YEAR6S92 = 601 - YEAR_OWNED = 197 + YEAR_OWNED = 193 YEAR_PUBLISHED = 150 - YEAR_SUPPLIED = 211 + YEAR_SUPPLIED = 206 _DATAMAP += [ @@ -674,29 +614,19 @@ class SrcAttributeType(GrampsType): (ARTICLE_TITLE, _("Article title"), "Article title"), (ARTICLE_TITLE_6SHORT9, _("Article title (short)"), "Article title (short)"), (ARTIFACT_ID, _("Artifact id"), "Artifact id"), - (ARTIFACT_ID2, _("Artifact id2"), "Artifact id2"), (ARTIFACT_ID_6SHORT9, _("Artifact id (short)"), "Artifact id (short)"), (ARTIFACT_TITLE, _("Artifact title"), "Artifact title"), (AUTHOR, _("Author"), "Author"), - (AUTHOR2, _("Author2"), "Author2"), - (AUTHORS_6FIRST9, _("Authors (first)"), "Authors (first)"), - (AUTHORS_6LAST9, _("Authors (last)"), "Authors (last)"), (AUTHOR_6COMPILER9_6FIRST9, _("Author (compiler) (first)"), "Author (compiler) (first)"), (AUTHOR_6COMPILER9_6LAST9, _("Author (compiler) (last)"), "Author (compiler) (last)"), (AUTHOR_6FIRST9, _("Author (first)"), "Author (first)"), (AUTHOR_6GRANTOR9, _("Author (grantor)"), "Author (grantor)"), (AUTHOR_6LAST9, _("Author (last)"), "Author (last)"), - (AUTHOR_6SHORT29, _("Author (short2)"), "Author (short2)"), (AUTHOR_6SHORT9, _("Author (short)"), "Author (short)"), - (AUTHOR_6SHORT92, _("Author (short)2"), "Author (short)2"), (AUTHOR_6TRANSLATOR9_6FIRST9, _("Author (translator) (first)"), "Author (translator) (first)"), (AUTHOR_6TRANSLATOR9_6LAST9, _("Author (translator) (last)"), "Author (translator) (last)"), - (AUTHOR_AND_PROFESSIONAL_CREDENTIALS_FIRST, _("Author & professional credentials first"), "Author & professional credentials first"), - (AUTHOR_AND_PROFESSIONAL_CREDENTIALS_FIRST_LAST, _("Author & professional credentials first last"), "Author & professional credentials first last"), - (AUTHOR_AND_PROFESSIONAL_CREDENTIALS_LAST, _("Author & professional credentials last"), "Author & professional credentials last"), - (AUTHOR_AND_PROFESSIONAL_CREDENTIALS_LAST_FIRST, _("Author & professional credentials last, first"), "Author & professional credentials last, first"), - (AUTHOR_FIRST, _("Author first"), "Author first"), - (AUTHOR_LAST, _("Author last"), "Author last"), + (AUTHOR_AND_PROFESSIONAL_CREDENTIALS_6FIRST9, _("Author & professional credentials (first)"), "Author & professional credentials (first)"), + (AUTHOR_AND_PROFESSIONAL_CREDENTIALS_6LAST9, _("Author & professional credentials (last)"), "Author & professional credentials (last)"), (BIBLE_ID_6OWNER_FIRST9, _("Bible id (owner first)"), "Bible id (owner first)"), (BIBLE_ID_6OWNER_LAST9, _("Bible id (owner last)"), "Bible id (owner last)"), (BIBLE_ID_6SHORT9, _("Bible id (short)"), "Bible id (short)"), @@ -722,8 +652,6 @@ class SrcAttributeType(GrampsType): (CEMETERY, _("Cemetery"), "Cemetery"), (CEMETERY_6AUTHOR9, _("Cemetery (author)"), "Cemetery (author)"), (CENSUS_ID, _("Census id"), "Census id"), - (CENSUS_ID1, _("Census id1"), "Census id1"), - (CENSUS_ID2, _("Census id2"), "Census id2"), (CENSUS_ID_6GENERIC9, _("Census id (generic)"), "Census id (generic)"), (CENSUS_ID_6GENERIC9_6SHORT9, _("Census id (generic) (short)"), "Census id (generic) (short)"), (CENSUS_ID_6GENERIC_YEAR_AND_TRIBE9, _("Census id (generic: year & tribe)"), "Census id (generic: year & tribe)"), @@ -731,7 +659,6 @@ class SrcAttributeType(GrampsType): (CERTIFICATE_ID_6SHORT9, _("Certificate id (short)"), "Certificate id (short)"), (CERTIFICATE_ID_6WHO_WHEN_WHAT_EVENT9, _("Certificate id (who, when, what event)"), "Certificate id (who, when, what event)"), (CERTIFICATE_TYPE_AND_NO, _("Certificate type & no."), "Certificate type & no."), - (CERTIFICATE_TYPE_AND_NO_2, _("Certificate type & no. 2"), "Certificate type & no. 2"), (CHAPTER_PAGES, _("Chapter pages"), "Chapter pages"), (CHAPTER_TITLE, _("Chapter title"), "Chapter title"), (CHAPTER_TITLE_6SHORT9, _("Chapter title (short)"), "Chapter title (short)"), @@ -750,14 +677,9 @@ class SrcAttributeType(GrampsType): (COLLECTION_6SHORT9, _("Collection (short)"), "Collection (short)"), (COLLECTION_OWNER, _("Collection owner"), "Collection owner"), (COMPILER, _("Compiler"), "Compiler"), - (COMPILERS_6SHORT9, _("Compilers (short)"), "Compilers (short)"), - (COMPILERS_FIRST, _("Compilers first"), "Compilers first"), - (COMPILERS_LAST, _("Compilers last"), "Compilers last"), (COMPILER_6FIRST9, _("Compiler (first)"), "Compiler (first)"), (COMPILER_6LAST9, _("Compiler (last)"), "Compiler (last)"), (COMPILER_6SHORT9, _("Compiler (short)"), "Compiler (short)"), - (COMPILER_FIRST, _("Compiler first"), "Compiler first"), - (COMPILER_LAST, _("Compiler last"), "Compiler last"), (CONGRESS, _("Congress"), "Congress"), (CONGRESS_AND_SESSION, _("Congress & session"), "Congress & session"), (CONGRESS_AND_SESSION_6SHORT9, _("Congress & session (short)"), "Congress & session (short)"), @@ -795,7 +717,6 @@ class SrcAttributeType(GrampsType): (DATABASE_TITLE_6SHORT9, _("Database title (short)"), "Database title (short)"), (DATA_COLLECTION_INFO, _("Data collection info"), "Data collection info"), (DATE, _("Date"), "Date"), - (DATE_6IF_NOT_IN_TITLE9, _("Date (if not in title)"), "Date (if not in title)"), (DATE_6SHORT9, _("Date (short)"), "Date (short)"), (DATE_OWNED, _("Date owned"), "Date owned"), (DATE_PUBLISHED_UPDATED_OR_ACCESSED, _("Date published, updated or accessed"), "Date published, updated or accessed"), @@ -807,7 +728,7 @@ class SrcAttributeType(GrampsType): (DESCRIPTIVE_DETAIL_OR_OTHER_RELEVANT_DISCUSSION, _("Descriptive detail or other relevant discussion"), "Descriptive detail or other relevant discussion"), (DIGITAL_FILE_TYPE, _("Digital file type"), "Digital file type"), (DIGITAL_ID_NO, _("Digital id no."), "Digital id no."), - (DIGITAL_PATH_6WHEN_NECESSARY9, _("Digital path (when necessary)"), "Digital path (when necessary)"), + (DIGITAL_PATH, _("Digital path"), "Digital path"), (DIVISION, _("Division"), "Division"), (DOCUMENT, _("Document"), "Document"), (DOCUMENT_6SHORT9, _("Document (short)"), "Document (short)"), @@ -843,7 +764,6 @@ class SrcAttributeType(GrampsType): (FILE_TITLE_6SHORT9, _("File title (short)"), "File title (short)"), (FILE_UNIT, _("File unit"), "File unit"), (FILE_UNIT_6SHORT9, _("File unit (short)"), "File unit (short)"), - (FILE_UNIT_ID, _("File unit id"), "File unit id"), (FILE_UNIT_NO, _("File unit no."), "File unit no."), (FILE_YEAR, _("File year"), "File year"), (FILM_ID, _("Film id"), "Film id"), @@ -858,9 +778,8 @@ class SrcAttributeType(GrampsType): (FILM_REPOSITORY_LOCATION, _("Film repository location"), "Film repository location"), (FILM_RESPOSITORY, _("Film respository"), "Film respository"), (FILM_TITLE, _("Film title"), "Film title"), - (FOLDER, _("Folder"), "Folder"), - (FOLDER_6SHORT9, _("Folder (short)"), "Folder (short)"), (FOLDER_LABEL, _("Folder label"), "Folder label"), + (FOLDER_LABEL_6SHORT9, _("Folder label (short)"), "Folder label (short)"), (FORMAT, _("Format"), "Format"), (FORMAT_OR_EDITION, _("Format/edition"), "Format/edition"), (FORMAT_OR_EDITION_6SHORT9, _("Format/edition (short)"), "Format/edition (short)"), @@ -895,8 +814,6 @@ class SrcAttributeType(GrampsType): (ITEM_NO, _("Item no."), "Item no."), (ITEM_NO_OR_ARRANGEMENT, _("Item no. or arrangement"), "Item no. or arrangement"), (ITEM_OF_INTEREST, _("Item of interest"), "Item of interest"), - (ITEM_OF_INTEREST_1, _("Item of interest 1"), "Item of interest 1"), - (ITEM_OF_INTEREST_2, _("Item of interest 2"), "Item of interest 2"), (ITEM_OF_INTEREST_6COUNTY_STATE_DATE_AND_PO9, _("Item of interest (county, state, date & po.)"), "Item of interest (county, state, date & po.)"), (ITEM_OF_INTEREST_6PARTIES_AND_TYPE_OF_DOCUMENT9, _("Item of interest (parties & type of document)"), "Item of interest (parties & type of document)"), (ITEM_OF_INTEREST_6SHORT9, _("Item of interest (short)"), "Item of interest (short)"), @@ -909,18 +826,12 @@ class SrcAttributeType(GrampsType): (ITEM_TITLE, _("Item title"), "Item title"), (ITEM_TYPE, _("Item type"), "Item type"), (ITEM_TYPE_6IF_NECESSARY9, _("Item type (if necessary)"), "Item type (if necessary)"), - (ITEM_TYPE_AND_FORMAT_F, _("Item type & format f"), "Item type & format f"), - (ITEM_TYPE_AND_FORMAT_L, _("Item type & format l"), "Item type & format l"), - (ITEM_TYPE_AND_FORMAT_S, _("Item type & format s"), "Item type & format s"), + (ITEM_TYPE_AND_FORMAT, _("Item type & format"), "Item type & format"), + (ITEM_TYPE_AND_FORMAT_6SHORT9, _("Item type & format (short)"), "Item type & format (short)"), (ITEM_TYPE_OR_FORMAT, _("Item type or format"), "Item type or format"), - (ITEM_TYPE_OR_FORMAT2, _("Item type or format2"), "Item type or format2"), - (ITEM_TYPE_OR_FORMAT_2, _("Item type or format 2"), "Item type or format 2"), (ITEM_TYPE_OR_FORMAT_6SHORT9, _("Item type or format (short)"), "Item type or format (short)"), (JOURNAL_TITLE, _("Journal title"), "Journal title"), (JURISDICTION, _("Jurisdiction"), "Jurisdiction"), - (JURISDICTION1, _("Jurisdiction1"), "Jurisdiction1"), - (JURISDICTION2, _("Jurisdiction2"), "Jurisdiction2"), - (JURISDICTION3, _("Jurisdiction3"), "Jurisdiction3"), (JURISDICTION_6AUTHOR9_6STATE_CITY9, _("Jurisdiction (author) (state. city)"), "Jurisdiction (author) (state. city)"), (JURISDICTION_6CITY_STATE9, _("Jurisdiction (city, state)"), "Jurisdiction (city, state)"), (JURISDICTION_6COUNTRY_LOCAL9, _("Jurisdiction (country. local)"), "Jurisdiction (country. local)"), @@ -933,8 +844,7 @@ class SrcAttributeType(GrampsType): (JURISDICTION_6STATE9, _("Jurisdiction (state)"), "Jurisdiction (state)"), (JURISDICTION_6STATE_CITY9, _("Jurisdiction (state. city)"), "Jurisdiction (state. city)"), (JURISDICTION_6STATE_COUNTY9, _("Jurisdiction (state. county)"), "Jurisdiction (state. county)"), - (JURISDICTION_OR_AGENCY1, _("Jurisdiction/agency1"), "Jurisdiction/agency1"), - (JURISDICTION_OR_AGENCY2, _("Jurisdiction/agency2"), "Jurisdiction/agency2"), + (JURISDICTION_OR_AGENCY, _("Jurisdiction/agency"), "Jurisdiction/agency"), (JURISDICTION_OR_AGENCY_6STATE_AGENCY9, _("Jurisdiction/agency (state. agency)"), "Jurisdiction/agency (state. agency)"), (JURISDICTION_OR_REPY_LOCATION, _("Jurisdiction/rep'y location"), "Jurisdiction/rep'y location"), (LIBRARY_DIVISION, _("Library division"), "Library division"), @@ -970,14 +880,10 @@ class SrcAttributeType(GrampsType): (NETWORK_OR_PRODUCER, _("Network or producer"), "Network or producer"), (NEWSLETTER, _("Newsletter"), "Newsletter"), (NEWSPAPER, _("Newspaper"), "Newspaper"), - (NEWSPAPER1, _("Newspaper1"), "Newspaper1"), - (NEWSPAPER2, _("Newspaper2"), "Newspaper2"), (NEW_FORMAT, _("New format"), "New format"), (NO_OF_ROLLS, _("No. of rolls"), "No. of rolls"), (NO_OF_VOLS, _("No. of vols."), "No. of vols."), (ORGANIZATION, _("Organization"), "Organization"), - (ORGANIZATION1, _("Organization1"), "Organization1"), - (ORGANIZATION2, _("Organization2"), "Organization2"), (ORGANIZATION_6CREATOR9, _("Organization (creator)"), "Organization (creator)"), (ORGANIZATION_6SHORT9, _("Organization (short)"), "Organization (short)"), (ORGANIZATION_6SHORT_TITLE9, _("Organization (short title)"), "Organization (short title)"), @@ -997,17 +903,10 @@ class SrcAttributeType(GrampsType): (OWNER_OR_SUPPLIERS_LOCATION, _("Owner or supplier's location"), "Owner or supplier's location"), (OWNER_REPOSITORY, _("Owner repository"), "Owner repository"), (PAGE6S9, _("Page(s)"), "Page(s)"), - (PAGE6S91, _("Page(s)1"), "Page(s)1"), - (PAGE6S92, _("Page(s)2"), "Page(s)2"), (PAGE6S9_6SHORT9, _("Page(s) (short)"), "Page(s) (short)"), (PAGE6S9_OR_TERM, _("Page(s) or term"), "Page(s) or term"), - (PAGES, _("Pages"), "Pages"), - (PAGES1, _("Pages1"), "Pages1"), - (PAGES2, _("Pages2"), "Pages2"), - (PAGES3, _("Pages3"), "Pages3"), (PAGE_6SHORT9, _("Page (short)"), "Page (short)"), (PAGE_AND_COLUMN, _("Page & column"), "Page & column"), - (PAGE_AND_COLUMN2, _("Page & column2"), "Page & column2"), (PAGE_AND_ITEM, _("Page & item"), "Page & item"), (PAGE_ARRANGEMENT_OR_ARCHIVAL_ID, _("Page, arrangement or archival id"), "Page, arrangement or archival id"), (PAGE_ID, _("Page id"), "Page id"), @@ -1019,9 +918,9 @@ class SrcAttributeType(GrampsType): (PART_OR_CHAPTER_OR_SECTION, _("Part/chapter/section"), "Part/chapter/section"), (PERSON6S9_OF_INTEREST, _("Person(s) of interest"), "Person(s) of interest"), (PERSON6S9_OF_INTEREST_6SHORT9, _("Person(s) of interest (short)"), "Person(s) of interest (short)"), + (PERSON_INTERVIEWED_6FIRST9, _("Person interviewed (first)"), "Person interviewed (first)"), + (PERSON_INTERVIEWED_6LAST9, _("Person interviewed (last)"), "Person interviewed (last)"), (PERSON_INTERVIEWED_6SHORT9, _("Person interviewed (short)"), "Person interviewed (short)"), - (PERSON_INTERVIEWED_FIRST, _("Person interviewed first"), "Person interviewed first"), - (PERSON_INTERVIEWED_LAST, _("Person interviewed last"), "Person interviewed last"), (PERSON_OF_INTEREST, _("Person of interest"), "Person of interest"), (PHOTOGRAPH_NO, _("Photograph no."), "Photograph no."), (PHOTOGRAPH_TITLE, _("Photograph title"), "Photograph title"), @@ -1032,8 +931,6 @@ class SrcAttributeType(GrampsType): (PODCAST_TITLE, _("Podcast title"), "Podcast title"), (POSITION_ON_FILM, _("Position on film"), "Position on film"), (POSTING_DATE, _("Posting date"), "Posting date"), - (PRESENTERS_6FIRST9, _("Presenters (first)"), "Presenters (first)"), - (PRESENTERS_6LAST9, _("Presenters (last)"), "Presenters (last)"), (PRESENTER_6FIRST9, _("Presenter (first)"), "Presenter (first)"), (PRESENTER_6LAST9, _("Presenter (last)"), "Presenter (last)"), (PRESENTER_OR_GUEST_6FIRST9, _("Presenter or guest (first)"), "Presenter or guest (first)"), @@ -1045,8 +942,6 @@ class SrcAttributeType(GrampsType): (PUBLICATION_NO, _("Publication no."), "Publication no."), (PUBLICATION_PLACE, _("Publication place"), "Publication place"), (PUBLICATION_TITLE, _("Publication title"), "Publication title"), - (PUBLICATION_TITLE1, _("Publication title1"), "Publication title1"), - (PUBLICATION_TITLE2, _("Publication title2"), "Publication title2"), (PUBLICATION_YEAR, _("Publication year"), "Publication year"), (PUBLISHED, _("Published"), "Published"), (PUBLISHER, _("Publisher"), "Publisher"), @@ -1096,8 +991,6 @@ class SrcAttributeType(GrampsType): (REPORT_TITLE_6SHORT9, _("Report title (short)"), "Report title (short)"), (REPORT_TITLE_OR_SUBJECT, _("Report title or subject"), "Report title or subject"), (REPOSITORY, _("Repository"), "Repository"), - (REPOSITORY1, _("Repository1"), "Repository1"), - (REPOSITORY2, _("Repository2"), "Repository2"), (REPOSITORY_6SHORT9, _("Repository (short)"), "Repository (short)"), (REPOSITORY_LOCATION, _("Repository location"), "Repository location"), (RESEARCHER, _("Researcher"), "Researcher"), @@ -1117,8 +1010,6 @@ class SrcAttributeType(GrampsType): (SCHEDULE_6GENERIC_ID9, _("Schedule (generic id)"), "Schedule (generic id)"), (SCHEDULE_6SHORT9, _("Schedule (short)"), "Schedule (short)"), (SCHEDULE_AND_COPY, _("Schedule & copy"), "Schedule & copy"), - (SCHEDULE_AND_COPY1, _("Schedule & copy1"), "Schedule & copy1"), - (SCHEDULE_AND_COPY2, _("Schedule & copy2"), "Schedule & copy2"), (SCHEDULE_AND_COPY_6SHORT9, _("Schedule & copy (short)"), "Schedule & copy (short)"), (SCHEDULE_TITLE_6CITED_EXACTLY9, _("Schedule title (cited exactly)"), "Schedule title (cited exactly)"), (SECTION, _("Section"), "Section"), @@ -1127,9 +1018,6 @@ class SrcAttributeType(GrampsType): (SECTION_LOT_OR_ROW, _("Section lot or row"), "Section lot or row"), (SEGMENT, _("Segment"), "Segment"), (SERIES, _("Series"), "Series"), - (SERIES1, _("Series1"), "Series1"), - (SERIES2, _("Series2"), "Series2"), - (SERIES3, _("Series3"), "Series3"), (SERIES_6LONG9, _("Series (long)"), "Series (long)"), (SERIES_6SHORT9, _("Series (short)"), "Series (short)"), (SERIES_ID, _("Series id"), "Series id"), @@ -1147,8 +1035,6 @@ class SrcAttributeType(GrampsType): (SOURCE_OF_INFORMATION, _("Source of information"), "Source of information"), (SPECIFIC_BOOK, _("Specific book"), "Specific book"), (SPECIFIC_CONTENT, _("Specific content"), "Specific content"), - (SPECIFIC_CONTENT1, _("Specific content1"), "Specific content1"), - (SPECIFIC_CONTENT2, _("Specific content2"), "Specific content2"), (SPECIFIC_CONTENT_6SHORT9, _("Specific content (short)"), "Specific content (short)"), (SPECIFIC_DATA, _("Specific data"), "Specific data"), (SPECIFIC_ITEM_OF_INTEREST, _("Specific item of interest"), "Specific item of interest"), @@ -1158,14 +1044,11 @@ class SrcAttributeType(GrampsType): (SPECIFIC_ROLL, _("Specific roll"), "Specific roll"), (SPECIFIC_VOLUME, _("Specific volume"), "Specific volume"), (SPECIFIC_VOLUME6S9, _("Specific volume(s)"), "Specific volume(s)"), - (SPECIFIC_VOLUME6S9_6SHORT29, _("Specific volume(s) (short2)"), "Specific volume(s) (short2)"), (SPECIFIC_VOLUME6S9_6SHORT9, _("Specific volume(s) (short)"), "Specific volume(s) (short)"), (STATE, _("State"), "State"), (STUDENT_6FIRST9, _("Student (first)"), "Student (first)"), (STUDENT_6LAST9, _("Student (last)"), "Student (last)"), (SUBGROUP, _("Subgroup"), "Subgroup"), - (SUBGROUP1, _("Subgroup1"), "Subgroup1"), - (SUBGROUP2, _("Subgroup2"), "Subgroup2"), (SUBGROUP_6SHORT9, _("Subgroup (short)"), "Subgroup (short)"), (SUBJECT, _("Subject"), "Subject"), (SUBJECT_FIRST, _("Subject first"), "Subject first"), @@ -1221,12 +1104,10 @@ class SrcAttributeType(GrampsType): (WRITERS_AFFILIATION_6IF_RELEVANT9, _("Writer's affiliation (if relevant)"), "Writer's affiliation (if relevant)"), (WRITERS_CONTACT_INFORMATION, _("Writer's contact information"), "Writer's contact information"), (WRITERS_LOCATION, _("Writer's location"), "Writer's location"), + (WRITER_6FIRST9, _("Writer (first)"), "Writer (first)"), + (WRITER_6LAST9, _("Writer (last)"), "Writer (last)"), (WRITER_6SHORT9, _("Writer (short)"), "Writer (short)"), - (WRITER_FIRST, _("Writer first"), "Writer first"), - (WRITER_LAST, _("Writer last"), "Writer last"), (YEAR6S9, _("Year(s)"), "Year(s)"), - (YEAR6S91, _("Year(s)1"), "Year(s)1"), - (YEAR6S92, _("Year(s)2"), "Year(s)2"), (YEAR_OWNED, _("Year owned"), "Year owned"), (YEAR_PUBLISHED, _("Year published"), "Year published"), (YEAR_SUPPLIED, _("Year supplied"), "Year supplied"), @@ -1586,8 +1467,8 @@ class SrcAttributeType(GrampsType): EVIDENCETEMPLATES = { 'ESM100': { 'F': [ - ('', AUTHOR_AND_PROFESSIONAL_CREDENTIALS_FIRST, '', '', False, False), - ('', AUTHOR_AND_PROFESSIONAL_CREDENTIALS_LAST, ',', '', False, False), + ('', AUTHOR_AND_PROFESSIONAL_CREDENTIALS_6FIRST9, '', '', False, False), + ('', AUTHOR_AND_PROFESSIONAL_CREDENTIALS_6LAST9, ',', '', False, False), ('', REPORT_TITLE_OR_SUBJECT, ',', 'Quoted', False, False), ('', PAGE6S9, ';', '', False, False), ('', ITEM_TYPE, 'to', '', False, False), @@ -1598,8 +1479,8 @@ class SrcAttributeType(GrampsType): ('', REPOSITORY_LOCATION, '.', '', False, False), ], 'L': [ - ('', AUTHOR_AND_PROFESSIONAL_CREDENTIALS_LAST, ',', '', False, False), - ('', AUTHOR_AND_PROFESSIONAL_CREDENTIALS_FIRST, '.', '', False, False), + ('', AUTHOR_AND_PROFESSIONAL_CREDENTIALS_6LAST9, ',', '', False, False), + ('', AUTHOR_AND_PROFESSIONAL_CREDENTIALS_6FIRST9, '.', '', False, False), ('', REPORT_TITLE_OR_SUBJECT, '.', 'Quoted', False, False), ('', ITEM_TYPE, 'to', '', False, False), ('', RECIPIENT, '.', '', False, False), @@ -1616,8 +1497,8 @@ class SrcAttributeType(GrampsType): }, 'ESM101': { 'F': [ - ('', AUTHOR_FIRST, '', '', False, False), - ('', AUTHOR_LAST, ',', '', False, False), + ('', AUTHOR_6FIRST9, '', '', False, False), + ('', AUTHOR_6LAST9, ',', '', False, False), ('', MANUSCRIPT_TITLE, ',', 'Quoted', False, False), ('', PAGE6S9, ';', '', False, False), ('', MANUSCRIPT_NO, ',', '', False, False), @@ -1625,8 +1506,8 @@ class SrcAttributeType(GrampsType): ('', REPOSITORY_LOCATION, '.', '', False, False), ], 'L': [ - ('', AUTHOR_LAST, ',', '', False, False), - ('', AUTHOR_FIRST, '.', '', False, False), + ('', AUTHOR_6LAST9, ',', '', False, False), + ('', AUTHOR_6FIRST9, '.', '', False, False), ('', MANUSCRIPT_TITLE, '.', 'Quoted', False, False), ('', MANUSCRIPT_NO, '.', '', False, False), ('', REPOSITORY, ',', '', False, False), @@ -1664,8 +1545,8 @@ class SrcAttributeType(GrampsType): }, 'ESM103': { 'F': [ - ('', COMPILERS_FIRST, '', '', False, False), - ('', COMPILERS_LAST, ',', '', False, False), + ('', COMPILER_6FIRST9, '', '', False, False), + ('', COMPILER_6LAST9, ',', '', False, False), ('', MANUSCRIPT_SERIES_TITLE, ',', 'Quoted', False, False), ('', NO_OF_VOLS, '', '', False, False), ('(', ITEM_TYPE_OR_FORMAT, ',', '', False, False), @@ -1678,8 +1559,8 @@ class SrcAttributeType(GrampsType): ('', FILM_ID, '.', '', False, False), ], 'L': [ - ('', COMPILERS_LAST, ',', '', False, False), - ('', COMPILERS_FIRST, ',', '', False, False), + ('', COMPILER_6LAST9, ',', '', False, False), + ('', COMPILER_6FIRST9, ',', '', False, False), ('', MANUSCRIPT_SERIES_TITLE, '.', 'Quoted', False, False), ('', NO_OF_VOLS, '', '', False, False), ('', ITEM_TYPE_OR_FORMAT, '.', '', False, False), @@ -1692,7 +1573,7 @@ class SrcAttributeType(GrampsType): ('', FILM_LOCATION, '.', '', False, False), ], 'S': [ - ('', COMPILERS_6SHORT9, ',', '', False, False), + ('', COMPILER_6SHORT9, ',', '', False, False), ('', MANUSCRIPT_SERIES_TITLE_6SHORT9, ',', 'Quoted', False, False), ('', VOLUME_USED, ',', '', False, False), ('', SECTION_6SHORT9, ':', '', False, False), @@ -1734,8 +1615,8 @@ class SrcAttributeType(GrampsType): ('', DESCRIPTIVE_DETAIL, '.', '', False, False), ], 'L': [ - ('', COMPILER_LAST, ',', '', False, False), - ('', COMPILER_FIRST, '.', '', False, False), + ('', COMPILER_6LAST9, ',', '', False, False), + ('', COMPILER_6FIRST9, '.', '', False, False), ('', ARTIFACT_ID_6SHORT9, '.', '', False, False), ('', CREATION_DATE, '.', '', False, False), ('', CURRENT_OR_LAST_KNOWN_OWNER, ',', '', False, False), @@ -1745,13 +1626,13 @@ class SrcAttributeType(GrampsType): ], 'S': [ ('', ITEM_ID_6SHORT9, ',', '', False, False), - ('', ARTIFACT_ID2, '.', '', False, False), + ('', ARTIFACT_ID, '.', '', False, False), ], }, 'ESM106': { 'F': [ - ('', AUTHOR_FIRST, '', '', False, False), - ('', AUTHOR_LAST, ',', '', False, False), + ('', AUTHOR_6FIRST9, '', '', False, False), + ('', AUTHOR_6LAST9, ',', '', False, False), ('', MANUSCRIPT_TITLE, ',', 'Quoted', False, False), ('', PAGE6S9, ';', '', False, False), ('', RECORD_TYPE, ',', '', False, False), @@ -1764,8 +1645,8 @@ class SrcAttributeType(GrampsType): ('', DESCRIPTIVE_DETAIL, '.', '', False, False), ], 'L': [ - ('', AUTHOR_LAST, ',', '', False, False), - ('', AUTHOR_FIRST, '.', '', False, False), + ('', AUTHOR_6LAST9, ',', '', False, False), + ('', AUTHOR_6FIRST9, '.', '', False, False), ('', MANUSCRIPT_TITLE, '.', 'Quoted', False, False), ('', RECORD_TYPE, '.', '', False, False), ('', PLACE_CREATED, ',', '', False, False), @@ -1818,8 +1699,8 @@ class SrcAttributeType(GrampsType): }, 'ESM108': { 'F': [ - ('', COMPILER_FIRST, '', '', False, False), - ('', COMPILER_LAST, ',', '', False, False), + ('', COMPILER_6FIRST9, '', '', False, False), + ('', COMPILER_6LAST9, ',', '', False, False), ('', ITEM_6GENERIC_ID9, ',', '', False, False), ('', COLLECTION, ';', '', False, False), ('', SUPPLIER, ',', '', False, False), @@ -1829,8 +1710,8 @@ class SrcAttributeType(GrampsType): ('', DESCRIPTION_AND_EVALUATION_BY_RESEARCHER, '.', '', False, False), ], 'L': [ - ('', COMPILER_LAST, ',', '', False, False), - ('', COMPILER_FIRST, '.', '', False, False), + ('', COMPILER_6LAST9, ',', '', False, False), + ('', COMPILER_6FIRST9, '.', '', False, False), ('', COLLECTION, '.', '', False, False), ('', OWNER_OR_SUPPLIER, ',', '', False, False), ('', ADDRESS_FOR_PRIVATE_USE, ',', '', True, False), @@ -1845,8 +1726,8 @@ class SrcAttributeType(GrampsType): }, 'ESM109': { 'F': [ - ('', WRITER_FIRST, '', '', False, False), - ('', WRITER_LAST, '', '', False, False), + ('', WRITER_6FIRST9, '', '', False, False), + ('', WRITER_6LAST9, '', '', False, False), ('(', WRITERS_LOCATION, ')', '', False, False), ('to', RECIPIENT, ',', '', False, False), ('', ITEM_TYPE, ',', '', False, False), @@ -1858,8 +1739,8 @@ class SrcAttributeType(GrampsType): ('', DESCRIPTIVE_DETAIL_OR_OTHER_RELEVANT_DISCUSSION, '.', '', False, False), ], 'L': [ - ('', WRITER_LAST, ',', '', False, False), - ('', WRITER_FIRST, '', '', False, False), + ('', WRITER_6LAST9, ',', '', False, False), + ('', WRITER_6FIRST9, '', '', False, False), ('(', WRITERS_LOCATION, ')', '', False, False), ('to', RECIPIENT, '.', '', False, False), ('', ITEM_TYPE, '.', '', False, False), @@ -1870,16 +1751,16 @@ class SrcAttributeType(GrampsType): ('', YEAR_OWNED, '.', '', False, False), ], 'S': [ - ('', WRITER_FIRST, '', '', False, False), - ('', WRITER_LAST, 'to', '', False, False), + ('', WRITER_6FIRST9, '', '', False, False), + ('', WRITER_6LAST9, 'to', '', False, False), ('', RECIPIENT_6SHORT9, ',', '', False, False), ('', RECORD_DATE6S9, '.', '', False, False), ], }, 'ESM110': { 'F': [ - ('', PERSON_INTERVIEWED_FIRST, '', '', False, False), - ('', PERSON_INTERVIEWED_LAST, '', '', False, False), + ('', PERSON_INTERVIEWED_6FIRST9, '', '', False, False), + ('', PERSON_INTERVIEWED_6LAST9, '', '', False, False), ('(', INTERVIEWEE_ADDRESS_FOR_PRIVATE_USE, ',', '', True, False), ('', LOCATION, '),', '', False, False), ('', ITEM_TYPE, 'by', '', False, False), @@ -1892,8 +1773,8 @@ class SrcAttributeType(GrampsType): ('', YEAR_OWNED, '.', '', False, False), ], 'L': [ - ('', PERSON_INTERVIEWED_LAST, ',', '', False, False), - ('', PERSON_INTERVIEWED_FIRST, '.', '', False, False), + ('', PERSON_INTERVIEWED_6LAST9, ',', '', False, False), + ('', PERSON_INTERVIEWED_6FIRST9, '.', '', False, False), ('', LOCATION, '.', '', False, False), ('', ITEM_TYPE, 'by', '', False, False), ('', NAME_OF_INTERVIEWER, ',', '', False, False), @@ -1947,7 +1828,7 @@ class SrcAttributeType(GrampsType): ('', ITEM_TYPE, ',', '', False, False), ('', RECORD_DATE6S9, ',', '', False, False), ('', SUBJECT_OR_NATURE_OF_DATA_PROVIDED, ';', '', False, False), - ('', FOLDER, ';', '', False, False), + ('', FOLDER_LABEL, ';', '', False, False), ('', SERIES_OR_RESEARCH_PROJECT, ',', '', False, False), ('', COLLECTION, ';', '', False, False), ('', RESEARCHER, ',', '', False, False), @@ -1997,7 +1878,8 @@ class SrcAttributeType(GrampsType): }, 'ESM114': { 'F': [ - ('', AUTHOR_AND_PROFESSIONAL_CREDENTIALS_FIRST_LAST, ',', '', False, False), + ('', AUTHOR_AND_PROFESSIONAL_CREDENTIALS_6FIRST9, '', '', False, False), + ('', AUTHOR_AND_PROFESSIONAL_CREDENTIALS_6LAST9, ',', '', False, False), ('', REPORT_TITLE_6QUOTED_EXACTLY9, ',', 'Quoted', False, False), ('', PAGE6S9, ';', '', False, False), ('', ITEM_TYPE, 'to', '', False, False), @@ -2009,7 +1891,8 @@ class SrcAttributeType(GrampsType): ('', OWNER_AND_CONTACT_INFORMATION, '.', '', False, False), ], 'L': [ - ('', AUTHOR_AND_PROFESSIONAL_CREDENTIALS_LAST_FIRST, '.', '', False, False), + ('', AUTHOR_AND_PROFESSIONAL_CREDENTIALS_6LAST9, ',', '', False, False), + ('', AUTHOR_AND_PROFESSIONAL_CREDENTIALS_6FIRST9, '.', '', False, False), ('', REPORT_TITLE_6QUOTED_EXACTLY9, '.', 'Quoted', False, False), ('', ITEM_TYPE, 'to', '', False, False), ('', RECIPIENT, '', '', False, False), @@ -2168,7 +2051,7 @@ class SrcAttributeType(GrampsType): ('', WEBSITE_TITLE, '', 'Italics', False, False), ('(', URL_6DIGITAL_LOCATION9, ':', '', False, False), ('', DATE, '),', '', False, False), - ('', DIGITAL_PATH_6WHEN_NECESSARY9, ',', '', False, True), + ('', DIGITAL_PATH, ',', '', False, True), ('', ITEM_OF_INTEREST, '.', '', False, False), ], 'L': [ @@ -2213,12 +2096,12 @@ class SrcAttributeType(GrampsType): 'F': [ ('', FILE, ',', '', False, False), ('', MEMBERSHIP_NUMBER, ',', '', False, False), - ('', ORGANIZATION2, ',', '', False, False), + ('', ORGANIZATION, ',', '', False, False), ('', REPOSITORY, ',', '', False, False), ('', REPOSITORY_LOCATION, '.', '', False, False), ], 'L': [ - ('', ORGANIZATION1, '.', '', False, False), + ('', ORGANIZATION, '.', '', False, False), ('', COLLECTION, '', '', False, False), ('', REPOSITORY, ',', '', False, False), ('', REPOSITORY_LOCATION, '.', '', False, False), @@ -2231,7 +2114,7 @@ class SrcAttributeType(GrampsType): }, 'ESM168': { 'F': [ - ('', ORGANIZATION2, ',', '', False, False), + ('', ORGANIZATION, ',', '', False, False), ('', WEBSITE_TITLE, ',', 'Italics', False, False), ('', ITEM_TYPE_OR_FORMAT, '', '', False, False), ('(', URL_6DIGITAL_LOCATION9, ':', '', False, False), @@ -2239,7 +2122,7 @@ class SrcAttributeType(GrampsType): ('', ITEM_OF_INTEREST, '.', '', False, False), ], 'L': [ - ('', ORGANIZATION1, '.', '', False, False), + ('', ORGANIZATION, '.', '', False, False), ('', WEBSITE_TITLE, '.', 'Italics', False, False), ('', ITEM_TYPE_OR_FORMAT, '.', '', False, False), ('', URL_6DIGITAL_LOCATION9, ':', '', False, False), @@ -2487,7 +2370,7 @@ class SrcAttributeType(GrampsType): 'F': [ ('', CREATOR, ',', '', False, False), ('', WEBSITE_TITLE, ',', 'Italics', False, False), - ('', ITEM_TYPE_AND_FORMAT_F, '', '', False, False), + ('', ITEM_TYPE_AND_FORMAT, '', '', False, False), ('(', URL_6DIGITAL_LOCATION9, ':', '', False, False), ('', DATE, '),', '', False, False), ('', ITEM_OF_INTEREST, ';', '', False, False), @@ -2496,13 +2379,13 @@ class SrcAttributeType(GrampsType): 'L': [ ('', CREATOR, '.', '', False, False), ('', WEBSITE_TITLE, '.', 'Italics', False, False), - ('', ITEM_TYPE_AND_FORMAT_L, '.', '', False, False), + ('', ITEM_TYPE_AND_FORMAT, '.', '', False, False), ('', URL_6DIGITAL_LOCATION9, ':', '', False, False), ('', YEAR6S9, '.', '', False, False), ], 'S': [ ('', WEBSITE_TITLE, ',', 'Italics', False, False), - ('', ITEM_TYPE_AND_FORMAT_S, ',', '', False, False), + ('', ITEM_TYPE_AND_FORMAT_6SHORT9, ',', '', False, False), ('', ITEM_OF_INTEREST_6SHORT9, '.', '', False, False), ], }, @@ -2619,7 +2502,7 @@ class SrcAttributeType(GrampsType): ('', CREATION_DATE_6SHORT9, ',', '', False, False), ('', REPOSITORY, ',', '', False, False), ('', REPOSITORY_LOCATION, '),', '', False, False), - ('', FOLDER, ';', '', False, False), + ('', FOLDER_LABEL, ';', '', False, False), ('', ITEM_OF_INTEREST, '.', '', False, False), ], 'L': [ @@ -2631,7 +2514,7 @@ class SrcAttributeType(GrampsType): ], 'S': [ ('', FILE_LABEL_6SHORT9, ',', 'Quoted', False, False), - ('', FOLDER_6SHORT9, ',', '', False, False), + ('', FOLDER_LABEL_6SHORT9, ',', '', False, False), ('', ITEM_OF_INTEREST_6SHORT9, '.', '', False, False), ], }, @@ -2692,14 +2575,14 @@ class SrcAttributeType(GrampsType): ('', PAGE6S9, ',', '', False, False), ('', HOUSEHOLD_ID, ',', '', False, False), ('', PERSON_OF_INTEREST, ';', '', False, False), - ('', REPOSITORY2, ',', '', False, False), + ('', REPOSITORY, ',', '', False, False), ('', REPOSITORY_LOCATION, '.', '', False, False), ], 'L': [ ('', JURISDICTION_6STATE_COUNTY9, '.', '', False, False), ('', CENSUS_ID_6GENERIC9, ',', '', False, False), ('', SCHEDULE_AND_COPY, '.', '', False, False), - ('', REPOSITORY1, ',', '', False, False), + ('', REPOSITORY, ',', '', False, False), ('', REPOSITORY_LOCATION, '.', '', False, False), ], 'S': [ @@ -2742,14 +2625,14 @@ class SrcAttributeType(GrampsType): 'ESM239': { 'F': [ ('', CENSUS_ID_6GENERIC9, ',', '', False, False), - ('', JURISDICTION2, ',', '', False, False), + ('', JURISDICTION, ',', '', False, False), ('', SCHEDULE, ',', '', False, False), ('', GEOGRAPHIC_DIVISION, ',', '', False, False), ('', ENUMERATION_DISTRICT_6FROM_1880_FORWARD9, ',', '', False, False), ('', PAGE_ID, ',', '', False, False), ('', HOUSEHOLD, ',', '', False, False), ('', PERSON_OF_INTEREST, ';', '', False, False), - ('', PUBLICATION_TITLE2, ',', 'Italics', False, False), + ('', PUBLICATION_TITLE, ',', 'Italics', False, False), ('', FORMAT, '', '', False, False), ('(', PUBLICATION_PLACE, ':', '', False, False), ('', PUBLISHER, ',', '', False, False), @@ -2757,10 +2640,10 @@ class SrcAttributeType(GrampsType): ('', CREDIT_LINE_6SOURCE_OF_THIS_SOURCE9, '.', '', False, False), ], 'L': [ - ('', JURISDICTION1, '.', '', False, False), + ('', JURISDICTION, '.', '', False, False), ('', CENSUS_ID_6GENERIC9, ',', '', False, False), ('', SCHEDULE, '.', '', False, False), - ('', PUBLICATION_TITLE1, '.', 'Italics', False, False), + ('', PUBLICATION_TITLE, '.', 'Italics', False, False), ('', FORMAT, '.', '', False, False), ('', PUBLICATION_PLACE, ':', '', False, False), ('', PUBLISHER, ',', '', False, False), @@ -2768,7 +2651,7 @@ class SrcAttributeType(GrampsType): ], 'S': [ ('', CENSUS_ID_6GENERIC9, ',', '', False, False), - ('', JURISDICTION3, ',', '', False, False), + ('', JURISDICTION, ',', '', False, False), ('', SCHEDULE_6SHORT9, ',', '', False, False), ('', ENUMERATION_DISTRICT_6SHORT9, ',', '', False, False), ('', PAGE_ID, ',', '', False, False), @@ -3112,7 +2995,7 @@ class SrcAttributeType(GrampsType): 'F': [ ('', CENSUS_ID_6GENERIC9, ',', '', False, False), ('', JURISDICTION_6COUNTY_STATE9, ',', '', False, False), - ('', SCHEDULE_AND_COPY2, ',', '', False, False), + ('', SCHEDULE_AND_COPY, ',', '', False, False), ('', CIVIL_DIVISION6S9, ',', '', False, False), ('', PAGE_ID, ',', '', False, False), ('', HOUSEHOLD_ID, ',', '', False, False), @@ -3124,7 +3007,7 @@ class SrcAttributeType(GrampsType): 'L': [ ('', JURISDICTION_6STATE_COUNTY9, '.', '', False, False), ('', CENSUS_ID_6GENERIC9, ',', '', False, False), - ('', SCHEDULE_AND_COPY1, '.', '', False, False), + ('', SCHEDULE_AND_COPY, '.', '', False, False), ('', FILM_ID, '.', '', False, False), ('', OWNER_OR_REPOSITORY, ',', '', False, False), ('', LOCATION, '.', '', False, False), @@ -3222,7 +3105,7 @@ class SrcAttributeType(GrampsType): }, 'ESM255': { 'F': [ - ('', CENSUS_ID1, ',', '', False, False), + ('', CENSUS_ID, ',', '', False, False), ('', STATE, ',', '', False, False), ('', CODE, ',', '', False, False), ('', PERSON6S9_OF_INTEREST, ';', '', False, False), @@ -3230,14 +3113,14 @@ class SrcAttributeType(GrampsType): ], 'L': [ ('', STATE, '.', '', False, False), - ('', CENSUS_ID1, '.', '', False, False), + ('', CENSUS_ID, '.', '', False, False), ('', FILM_ID, '.', '', False, False), ('', PUBLICATION_PLACE, ':', '', False, False), ('', PUBLISHER, ',', '', False, False), ('', YEAR6S9, '.', '', False, False), ], 'S': [ - ('', CENSUS_ID2, ',', '', False, False), + ('', CENSUS_ID, ',', '', False, False), ('', STATE, ',', '', False, False), ('', CODE_6SHORT9, ',', '', False, False), ('', PERSON6S9_OF_INTEREST_6SHORT9, '.', '', False, False), @@ -3513,7 +3396,7 @@ class SrcAttributeType(GrampsType): ('', WEBSITE_TITLE, '', 'Italics', False, False), ('(', URL_6DIGITAL_LOCATION9, ':', '', False, False), ('', DATE, '),', '', False, False), - ('', ITEM_OF_INTEREST_1, ';', '', False, False), + ('', ITEM_OF_INTEREST, ';', '', False, False), ('', CREDIT_LINE_6SOURCE_OF_THIS_SOURCE9, '.', '', False, False), ], 'L': [ @@ -3528,7 +3411,7 @@ class SrcAttributeType(GrampsType): 'S': [ ('', COMPILER_6SHORT9, ',', '', False, False), ('', DATABASE_TITLE, ',', 'Quoted', False, False), - ('', ITEM_OF_INTEREST_2, '.', '', False, False), + ('', ITEM_OF_INTEREST, '.', '', False, False), ], }, 'ESM373': { @@ -3584,7 +3467,7 @@ class SrcAttributeType(GrampsType): 'ESM375': { 'F': [ ('', JURISDICTION_6COUNTY_STATE9, ',', '', False, False), - ('', SERIES2, '', '', False, False), + ('', SERIES, '', '', False, False), ('', SPECIFIC_VOLUME6S9, ',', '', False, False), ('', PAGE_OR_COURT_TERM_6IF_UNPAGINATED9, ',', '', False, False), ('', CASE_LABEL_AND_OR_OR_ITEM_OF_INTEREST, ';', '', False, False), @@ -3829,7 +3712,7 @@ class SrcAttributeType(GrampsType): ('file:', FILE, ',', 'Quoted', False, False), ('', ITEM_NO_OR_ARRANGEMENT, ',', '', False, False), ('', ITEM_OF_INTEREST, ';', '', False, False), - ('', DATE_6IF_NOT_IN_TITLE9, ',', '', False, True), + ('', DATE, ',', '', False, True), ('', COLLECTION, ';', '', False, False), ('', REPOSITORY, ',', '', False, False), ('', REPOSITORY_LOCATION, '.', '', False, False), @@ -3853,7 +3736,7 @@ class SrcAttributeType(GrampsType): ('', SPECIFIC_VOLUME6S9, ',', 'Quoted', False, False), ('', PAGE_NO_OR_ARRANGEMENT, ',', '', False, False), ('', CASE_AND_OR_OR_ITEM, ';', '', False, False), - ('', DATE_6IF_NOT_IN_TITLE9, ',', '', False, True), + ('', DATE, ',', '', False, True), ('', REPOSITORY, ',', '', False, False), ('', REPOSITORY_LOCATION, '.', '', False, False), ], @@ -3877,7 +3760,7 @@ class SrcAttributeType(GrampsType): ('', SPECIFIC_VOLUME6S9, ':', '', False, False), ('', PAGE6S9, ',', '', False, False), ('', ITEM_OF_INTEREST, '', '', False, False), - ('', DATE_6IF_NOT_IN_TITLE9, ';', '', False, True), + ('', DATE, ';', '', False, True), ('', REPOSITORY, ',', '', False, False), ('', REPOSITORY_LOCATION, '.', '', False, False), ], @@ -4026,7 +3909,7 @@ class SrcAttributeType(GrampsType): ], 'S': [ ('', JURISDICTION_6STATE9, '', '', False, False), - ('', CERTIFICATE_TYPE_AND_NO_2, '', '', False, False), + ('', CERTIFICATE_TYPE_AND_NO, '', '', False, False), ('(', CERTIFICATE_DATE, '),', '', False, False), ('', ID_OF_PERSON6S9, '.', '', False, False), ], @@ -4039,7 +3922,7 @@ class SrcAttributeType(GrampsType): ('', BOOK_AND_PAGE, ',', '', False, False), ('', ENTRY, ',', '', False, False), ('', ID_OF_PERSON6S9, ';', '', False, False), - ('', DATE_6IF_NOT_IN_TITLE9, ',', '', False, True), + ('', DATE, ',', '', False, True), ('', REPOSITORY, ',', '', False, False), ('', REPOSITORY_LOCATION, '.', '', False, False), ], @@ -4182,7 +4065,7 @@ class SrcAttributeType(GrampsType): 'F': [ ('', ITEM_OF_INTEREST, ',', '', False, False), ('', RECORD_DATE6S9, ';', '', False, False), - ('', SERIES2, ',', '', False, False), + ('', SERIES, ',', '', False, False), ('', RECORD_GROUP, ';', '', False, False), ('', REPOSITORY, ',', '', False, False), ('', REPOSITORY_LOCATION, '.', '', False, False), @@ -4197,13 +4080,13 @@ class SrcAttributeType(GrampsType): 'S': [ ('', ITEM_OF_INTEREST, ',', '', False, False), ('', RECORD_DATE6S9, ',', '', False, False), - ('', SERIES2, ',', '', False, False), + ('', SERIES_6SHORT9, ',', '', False, False), ('', JURISDICTION, '.', '', False, False), ], }, 'ESM492': { 'F': [ - ('', JURISDICTION_OR_AGENCY2, ',', '', False, False), + ('', JURISDICTION_OR_AGENCY, ',', '', False, False), ('', SPECIFIC_VOLUME6S9, ',', 'Quoted', False, False), ('', PAGE6S9, ',', '', False, False), ('', ITEM_OF_INTEREST, ';', '', False, False), @@ -4215,7 +4098,7 @@ class SrcAttributeType(GrampsType): ('', YEAR6S9, ').', '', False, False), ], 'L': [ - ('', JURISDICTION_OR_AGENCY1, '.', '', False, False), + ('', JURISDICTION_OR_AGENCY, '.', '', False, False), ('', SERIES, '.', '', False, False), ('', RECORD_GROUP, '.', '', False, False), ('', REPOSITORY, ',', '', False, False), @@ -4228,7 +4111,7 @@ class SrcAttributeType(GrampsType): ('', YEAR6S9, '.', '', False, False), ], 'S': [ - ('', JURISDICTION_OR_AGENCY2, ',', '', False, False), + ('', JURISDICTION_OR_AGENCY, ',', '', False, False), ('', SPECIFIC_VOLUME6S9, ',', 'Quoted', False, False), ('', PAGE6S9, ',', '', False, False), ('', ITEM_OF_INTEREST, '.', '', False, False), @@ -4373,14 +4256,14 @@ class SrcAttributeType(GrampsType): 'F': [ ('', DOCUMENT_ID, ',', '', False, False), ('', DOCUMENT_DATE, ';', '', False, False), - ('', SERIES2, ';', '', False, False), + ('', SERIES, ';', '', False, False), ('', COLLECTION, ';', '', False, False), ('', DIVISION, ',', '', False, False), ('', REPOSITORY, ',', '', False, False), ('', REPOSITORY_LOCATION, '.', '', False, False), ], 'L': [ - ('', SERIES1, '.', '', False, False), + ('', SERIES, '.', '', False, False), ('', COLLECTION, '.', '', False, False), ('', DIVISION, ',', '', False, False), ('', REPOSITORY, ',', '', False, False), @@ -4400,27 +4283,27 @@ class SrcAttributeType(GrampsType): ('', FILE_UNIT, ',', '', False, False), ('', FILE_UNIT_NO, ',', '', False, False), ('', SUBSERIES, ',', '', False, False), - ('', SERIES2, ';', '', False, False), + ('', SERIES, ';', '', False, False), ('', SUBGROUP, ';', '', False, False), ('', RECORD_GROUP_TITLE, ',', '', False, False), ('', RECORD_GROUP_NO, ';', '', False, False), - ('', REPOSITORY1, ',', '', False, False), + ('', REPOSITORY, ',', '', False, False), ('', REPOSITORY_LOCATION, '.', '', False, False), ], 'L': [ - ('', SERIES1, '.', '', False, False), + ('', SERIES, '.', '', False, False), ('', SUBGROUP, '.', '', False, False), ('', RECORD_GROUP_TITLE, ',', '', False, False), ('', RECORD_GROUP_NO, '.', '', False, False), - ('', REPOSITORY1, ',', '', False, False), + ('', REPOSITORY, ',', '', False, False), ('', REPOSITORY_LOCATION, '.', '', False, False), ], 'S': [ ('', DOCUMENT_ID, ',', '', False, False), - ('', FILE_UNIT_ID, ',', '', False, False), - ('', SERIES3, ',', '', False, False), + ('', FILE_UNIT_NO, ',', '', False, False), + ('', SERIES_6SHORT9, ',', '', False, False), ('', RECORD_GROUP_NO_6SHORT9, ',', '', False, False), - ('', REPOSITORY2, '.', '', False, False), + ('', REPOSITORY_6SHORT9, '.', '', False, False), ], }, 'ESM542': { @@ -4430,14 +4313,14 @@ class SrcAttributeType(GrampsType): ('', FILE_UNIT, ',', '', False, False), ('', FILE_UNIT_NO, ';', '', False, False), ('', SERIES, ',', '', False, False), - ('', SUBGROUP2, ';', '', False, False), + ('', SUBGROUP, ';', '', False, False), ('', RECORD_GROUP_TITLE, ',', '', False, False), ('', RECORD_GROUP_NO, ';', '', False, False), ('', REPOSITORY, ',', '', False, False), ('', REPOSITORY_LOCATION, '.', '', False, False), ], 'L': [ - ('', SUBGROUP1, '.', '', False, False), + ('', SUBGROUP, '.', '', False, False), ('', SERIES, '.', '', False, False), ('', RECORD_GROUP_TITLE, '.', '', False, False), ('', RECORD_GROUP_NO, '.', '', False, False), @@ -4746,7 +4629,7 @@ class SrcAttributeType(GrampsType): 'F': [ ('', CREATOR_OR_OWNER_OF_DATABASE_AND_WEBSITE, ',', '', False, False), ('', TITLE_OF_DATABASE, ',', 'Quoted', False, False), - ('', ITEM_TYPE_OR_FORMAT2, ',', '', False, False), + ('', ITEM_TYPE_OR_FORMAT, ',', '', False, False), ('', WEBSITE_TITLE, '', 'Italics', False, False), ('(', URL_6DIGITAL_LOCATION9, ':', '', False, False), ('', DATE, '),', '', False, False), @@ -4772,7 +4655,7 @@ class SrcAttributeType(GrampsType): 'ESM555': { 'F': [ ('', DATABASE_TITLE, ',', 'Quoted', False, False), - ('', ITEM_TYPE_OR_FORMAT2, ',', '', False, False), + ('', ITEM_TYPE_OR_FORMAT, ',', '', False, False), ('', WEBSITE_TITLE, '', 'Italics', False, False), ('(', URL_6DIGITAL_LOCATION9, ':', '', False, False), ('', DATE, '),', '', False, False), @@ -4797,7 +4680,7 @@ class SrcAttributeType(GrampsType): 'ESM556': { 'F': [ ('', DATABASE_TITLE, ',', 'Quoted', False, False), - ('', ITEM_TYPE_OR_FORMAT_2, ',', '', False, False), + ('', ITEM_TYPE_OR_FORMAT, ',', '', False, False), ('', WEBSITE_TITLE_6SAME_AS_CREATOR_OWNER9, '', 'Italics', False, False), ('(', URL_6DIGITAL_LOCATION9, ':', '', False, False), ('', DATE, '),', '', False, False), @@ -5191,7 +5074,7 @@ class SrcAttributeType(GrampsType): ('', AUTHOR_6LAST9, ',', '', False, False), ('', TITLE, '', 'Italics', False, False), ('(', ORIGINAL_PUBLICATION_DATA_6PLACE_PUBLISHER_YEAR9, '),', '', False, False), - ('', PAGE6S91, ';', '', False, False), + ('', PAGE6S9, ';', '', False, False), ('', FILM_PUBLICATION_SERIES, '', 'Italics', False, False), ('(', PLACE_OF_FILM_PUBLICATION, ':', '', False, False), ('', FILM_PUBLISHER, ',', '', False, False), @@ -5212,7 +5095,7 @@ class SrcAttributeType(GrampsType): 'S': [ ('', AUTHOR_6LAST9, ',', '', False, False), ('', TITLE, ',', 'Italics', False, False), - ('', PAGE6S92, '.', '', False, False), + ('', PAGE6S9, '.', '', False, False), ], }, 'ESM661': { @@ -5278,7 +5161,7 @@ class SrcAttributeType(GrampsType): ('', PUBLICATION_YEAR, '),', '', False, False), ('', VOLUME_OR_PAGE, ',', '', False, False), ('', CASE, '', 'Italics', False, False), - ('(', YEAR6S92, ');', '', False, False), + ('(', YEAR6S9, ');', '', False, False), ('hereinafter cited as', CASE_LABEL_6LEGAL_STYLE9, '.', '', False, False), ], 'L': [ @@ -5288,7 +5171,7 @@ class SrcAttributeType(GrampsType): ('', TOTAL_VOLUMES, '.', '', False, False), ('', PLACE_OF_PUBLICATION, ':', '', False, False), ('', PUBLISHER, ',', '', False, False), - ('', YEAR6S91, '.', '', False, False), + ('', YEAR6S9, '.', '', False, False), ], 'S': [ ('', CASE_LABEL_6LEGAL_STYLE9, '.', '', False, False), @@ -5302,7 +5185,7 @@ class SrcAttributeType(GrampsType): ('(', PLACE_OF_PUBLICATION, ':', '', False, False), ('', PUBLISHER, ',', '', False, False), ('', PUBLICATION_YEAR, '),', '', False, False), - ('', PAGES, ',', '', False, False), + ('', PAGE6S9, ',', '', False, False), ('', CASE, ';', 'Italics', False, False), ('hereinafter cited as', CASE_LABEL_6LEGAL_STYLE9, '.', '', False, False), ], @@ -5387,7 +5270,7 @@ class SrcAttributeType(GrampsType): }, 'ESM733': { 'F': [ - ('', AUTHOR2, ',', '', False, False), + ('', AUTHOR, ',', '', False, False), ('', TITLE_OF_SERIES, ',', 'Italics', False, False), ('', SPECIFIC_VOLUME6S9_6SHORT9, '', '', False, False), ('(', PLACE_OF_PUBLICATION, ':', '', False, False), @@ -5406,7 +5289,7 @@ class SrcAttributeType(GrampsType): ], 'S': [ ('', TITLE_OF_SERIES, '', 'Italics', False, False), - ('', SPECIFIC_VOLUME6S9_6SHORT29, ':', '', False, False), + ('', SPECIFIC_VOLUME6S9_6SHORT9, ':', '', False, False), ('', PAGE6S9, '', '', False, False), ('(', YEAR6S9, '),', '', False, False), ('', TITLE_OF_ACT, '.', 'Quoted', False, False), @@ -5457,7 +5340,7 @@ class SrcAttributeType(GrampsType): ('', YEAR6S9, '.', '', False, False), ], 'S': [ - ('', AUTHOR_6SHORT29, ',', '', False, False), + ('', AUTHOR_6SHORT9, ',', '', False, False), ('', TITLE_6SHORT9, ',', 'Italics', False, False), ('', PAGE6S9, '.', '', False, False), ], @@ -5482,7 +5365,7 @@ class SrcAttributeType(GrampsType): ('', YEAR6S9, '.', '', False, False), ], 'S': [ - ('', AUTHOR_6SHORT92, ',', '', False, False), + ('', AUTHOR_6SHORT9, ',', '', False, False), ('', CONGRESS_AND_SESSION, ',', '', False, False), ('', YEAR6S9, ',', '', False, False), ('', DOCUMENT_ID, '.', '', False, False), @@ -5493,8 +5376,8 @@ class SrcAttributeType(GrampsType): ('', AUTHOR_6SHORT9, ',', '', False, False), ('', SERIES_TITLE, ',', 'Italics', False, False), ('', CONGRESS_AND_SESSION, '', '', False, False), - ('(', YEAR6S92, '),', '', False, False), - ('', PAGES, ',', '', False, False), + ('(', YEAR6S9, '),', '', False, False), + ('', PAGE6S9, ',', '', False, False), ('', ITEM, ';', 'Quoted', False, False), ('', FORMAT, ',', '', False, False), ('', WEBSITE_CREATOR_OR_OWNER, ',', '', False, False), @@ -5509,13 +5392,13 @@ class SrcAttributeType(GrampsType): ('', WEBSITE_CREATOR_OR_OWNER, '.', '', False, False), ('', WEBSITE_TITLE, '.', 'Italics', False, False), ('', URL_6DIGITAL_LOCATION9, ':', '', False, False), - ('', YEAR6S91, '.', '', False, False), + ('', YEAR6S9, '.', '', False, False), ], 'S': [ - ('', AUTHOR_6SHORT29, ',', '', False, False), + ('', AUTHOR_6SHORT9, ',', '', False, False), ('', SERIES_TITLE, ',', 'Italics', False, False), ('', CONGRESS_AND_SESSION, ',', '', False, False), - ('', PAGES, '.', '', False, False), + ('', PAGE6S9, '.', '', False, False), ], }, 'ESM738': { @@ -5539,7 +5422,7 @@ class SrcAttributeType(GrampsType): ('', YEAR6S9, '.', '', False, False), ], 'S': [ - ('', AUTHOR_6SHORT29, ',', '', False, False), + ('', AUTHOR_6SHORT9, ',', '', False, False), ('', TITLE_OF_PAMPHLET, ',', 'Italics', False, False), ('', SERIES_ID_6SHORT9, ',', '', False, False), ('', PAGE6S9, '.', '', False, False), @@ -5582,7 +5465,7 @@ class SrcAttributeType(GrampsType): ('', JOURNAL_TITLE, '', 'Italics', False, False), ('', VOLUME, '', '', False, False), ('(', ISSUE_DATE, '):', '', False, False), - ('', PAGES2, '.', '', False, False), + ('', PAGE6S9, '.', '', False, False), ], 'L': [ ('', AUTHOR_6LAST9, ',', '', False, False), @@ -5591,12 +5474,12 @@ class SrcAttributeType(GrampsType): ('', ARTICLE_SUBTITLE, '.“', '', False, False), ('', JOURNAL_TITLE, '', 'Italics', False, False), ('', VOLUME_ISSUE_DATE, ':', '', False, False), - ('', PAGES1, '.', '', False, False), + ('', PAGE6S9, '.', '', False, False), ], 'S': [ ('', AUTHOR_6LAST9, '.', '', False, False), ('', TITLE_6SHORT9, ',', 'Quoted', False, False), - ('', PAGES3, '.', '', False, False), + ('', PAGE6S9, '.', '', False, False), ], }, 'ESM780': { @@ -5645,7 +5528,7 @@ class SrcAttributeType(GrampsType): ('', TYPE_OR_FORMAT, '', '', False, False), ('(', URL_6DIGITAL_LOCATION9, ':', '', False, False), ('', DATE, '),', '', False, False), - ('', SPECIFIC_CONTENT1, '.', '', False, False), + ('', SPECIFIC_CONTENT, '.', '', False, False), ], 'L': [ ('', AUTHOR_6LAST9, ',', '', False, False), @@ -5662,30 +5545,30 @@ class SrcAttributeType(GrampsType): 'S': [ ('', AUTHOR_6LAST9, ',', '', False, False), ('', TITLE_6SHORT9, ',', 'Quoted', False, False), - ('', SPECIFIC_CONTENT2, '.', '', False, False), + ('', SPECIFIC_CONTENT, '.', '', False, False), ], }, 'ESM782': { 'F': [ - ('', AUTHORS_6FIRST9, '', '', False, False), - ('', AUTHORS_6LAST9, ',', '', False, False), + ('', AUTHOR_6FIRST9, '', '', False, False), + ('', AUTHOR_6LAST9, ',', '', False, False), ('', ARTICLE_TITLE, ',', 'Quoted', False, False), ('', MAGAZINE, '', 'Italics', False, False), ('', ISSUE_DATE, ',', '', False, False), - ('', PAGE6S91, '.', '', False, False), + ('', PAGE6S9, '.', '', False, False), ], 'L': [ - ('', AUTHORS_6LAST9, ',', '', False, False), - ('', AUTHORS_6FIRST9, '.', '', False, False), + ('', AUTHOR_6LAST9, ',', '', False, False), + ('', AUTHOR_6FIRST9, '.', '', False, False), ('', ARTICLE_TITLE, '.', 'Quoted', False, False), ('', MAGAZINE, '', 'Italics', False, False), ('', ISSUE_DATE, ',', '', False, False), - ('', PAGE6S91, '.', '', False, False), + ('', PAGE6S9, '.', '', False, False), ], 'S': [ - ('', AUTHORS_6LAST9, ',', '', False, False), + ('', AUTHOR_6LAST9, ',', '', False, False), ('', ARTICLE_TITLE, ',', 'Quoted', False, False), - ('', PAGE6S92, '.', '', False, False), + ('', PAGE6S9, '.', '', False, False), ], }, 'ESM783': { @@ -5697,7 +5580,7 @@ class SrcAttributeType(GrampsType): ('', WEBSITE, '', 'Italics', False, False), ('(', URL_6DIGITAL_LOCATION9, ':', '', False, False), ('', ACCESS_DATE, '),', '', False, False), - ('', SPECIFIC_CONTENT1, ';', '', False, False), + ('', SPECIFIC_CONTENT, ';', '', False, False), ('', CREDIT_LINE_6SOURCE_OF_THIS_SOURCE9, '.', '', False, False), ], 'L': [ @@ -5714,7 +5597,7 @@ class SrcAttributeType(GrampsType): 'S': [ ('', AUTHOR_6LAST9, ',', '', False, False), ('', ARTICLE_TITLE, ',', 'Quoted', False, False), - ('', SPECIFIC_CONTENT2, '.', '', False, False), + ('', SPECIFIC_CONTENT_6SHORT9, '.', '', False, False), ], }, 'ESM784': { @@ -5745,18 +5628,18 @@ class SrcAttributeType(GrampsType): 'ESM785': { 'F': [ ('', ARTICLE_TITLE, ',', 'Quoted', False, False), - ('', NEWSPAPER2, ',', 'Italics', False, False), + ('', NEWSPAPER, ',', 'Italics', False, False), ('', ISSUE_DATE, ',', '', False, False), ('', PAGE_AND_COLUMN, '.', '', False, False), ], 'L': [ ('', LOCATION, '.', '', False, False), - ('', NEWSPAPER1, ',', 'Italics', False, False), + ('', NEWSPAPER, ',', 'Italics', False, False), ('', ISSUES_EXAMINED, '.', '', False, False), ], 'S': [ ('', ARTICLE_TITLE, ',', 'Quoted', False, False), - ('', PAGE_AND_COLUMN2, '.', '', False, False), + ('', PAGE_AND_COLUMN, '.', '', False, False), ], }, 'ESM786': { @@ -5876,8 +5759,8 @@ class SrcAttributeType(GrampsType): }, 'ESM790': { 'F': [ - ('', PRESENTERS_6FIRST9, '', '', False, False), - ('', PRESENTERS_6LAST9, ',', '', False, False), + ('', PRESENTER_6FIRST9, '', '', False, False), + ('', PRESENTER_6LAST9, ',', '', False, False), ('', CLIP_ID, ',', 'Quoted', False, False), ('', TITLE_OF_SHOW, ':', 'Italics', False, False), ('', SEGMENT, ',', 'Italics', False, False), @@ -5889,8 +5772,8 @@ class SrcAttributeType(GrampsType): ('', DATE, ').', '', False, False), ], 'L': [ - ('', PRESENTERS_6LAST9, ',', '', False, False), - ('', PRESENTERS_6FIRST9, '.', '', False, False), + ('', PRESENTER_6LAST9, ',', '', False, False), + ('', PRESENTER_6FIRST9, '.', '', False, False), ('', CLIP_ID, '.', 'Quoted', False, False), ('', TITLE_OF_SHOW, ':', 'Italics', False, False), ('', SEGMENT, ',', 'Italics', False, False), @@ -5902,7 +5785,7 @@ class SrcAttributeType(GrampsType): ('', ACCESS_YEAR, '.', '', False, False), ], 'S': [ - ('', PRESENTERS_6LAST9, ',', '', False, False), + ('', PRESENTER_6LAST9, ',', '', False, False), ('', CLIP_ID, '.', 'Quoted', False, False), ], }, @@ -6078,7 +5961,7 @@ class SrcAttributeType(GrampsType): ('', SUBJECT_LAST, ',', '', False, False), ('', CREATION_DATE, ';', '', False, False), ('', COLLECTION, ',', '', False, False), - ('', REPOSITORY2, ',', '', False, False), + ('', REPOSITORY, ',', '', False, False), ('', REPOSITORY_LOCATION, '.', '', False, False), ('', ARCHIVAL_DESCRIPTION, '.', '', False, False), ], @@ -6087,7 +5970,7 @@ class SrcAttributeType(GrampsType): ('', SUBJECT_FIRST, '.', '', False, False), ('', CREATION_DATE, '.', '', False, False), ('', COLLECTION, '.', '', False, False), - ('', REPOSITORY1, ',', '', False, False), + ('', REPOSITORY, ',', '', False, False), ('', REPOSITORY_LOCATION, '.', '', False, False), ], 'S': [