Change tag capture group

Author: DavidMStraub

gedcom7/grammar.py

@@ -33,7 +33,7 @@
 daterange = f'(BET{d}{date}{d}AND{d}{date}|AFT{d}{date}|BEF{d}{date})'
 daterestrict = '(FROM|TO|BET|AND|BEF|AFT|ABT|CAL|EST|BCE)'
 datevalue = f'({date}|{dateperiod}|{daterange}|{dateapprox})?'
-tag = f'(?P<tag>{stdtag}|{exttag})'
+tag = f'({stdtag}|{exttag})'
 enum = f'{tag}'
 eol = '(\\\r(\\\n)?|\\\n)'
 fraction = '[0-9]+'
@@ -47,7 +47,7 @@
 noneol = '[\t -\\U0010ffff]'
 linestr = f'(?P<linestr>({nonat}|{atsign}{atsign})({noneol})*)'
 lineval = f'({pointer}|{linestr})'
-line = f'{level}{d}((?P<xref>{xref}){d})?{tag}({d}{lineval})?{eol}'
+line = f'{level}{d}((?P<xref>{xref}){d})?(?P<tag>{tag})({d}{lineval})?{eol}'
 nocommasp = '[\t-\\x1d!-+\\--\\U0010ffff]'
 nocomma = '[\t-+\\--\\U0010ffff]'
 listitem = f'({nocommasp}|{nocommasp}({nocomma})*{nocommasp})?'