From d5f3373c312ffe7727f8ef9252e4148c5905cef4 Mon Sep 17 00:00:00 2001 From: plk Date: Mon, 30 Sep 2024 21:30:48 +0200 Subject: [PATCH] Looking at plk/biblatex#1383 --- data/schemata/bcf.rnc | 15 ++++++----- data/schemata/bcf.rng | 44 ++++++++++++++++++++------------ data/schemata/config.rnc | 20 +++++++-------- lib/Biber.pm | 37 ++++++++++++++++++++++----- lib/Biber/Constants.pm | 2 +- t/tdata/annotations.bcf | 5 ++-- t/tdata/basic-misc.bcf | 5 ++-- t/tdata/biblatexml.bcf | 5 ++-- t/tdata/bibtex-aliases.bcf | 5 ++-- t/tdata/bibtex-output.bcf | 5 ++-- t/tdata/crossrefs.bcf | 5 ++-- t/tdata/datalists.bcf | 5 ++-- t/tdata/dateformats.bcf | 5 ++-- t/tdata/dm-constraints.bcf | 5 ++-- t/tdata/encoding1.bcf | 5 ++-- t/tdata/encoding2.bcf | 5 ++-- t/tdata/encoding3.bcf | 5 ++-- t/tdata/encoding4.bcf | 5 ++-- t/tdata/encoding5.bcf | 5 ++-- t/tdata/encoding6.bcf | 5 ++-- t/tdata/extradate.bcf | 5 ++-- t/tdata/extratitle.bcf | 5 ++-- t/tdata/extratitleyear.bcf | 5 ++-- t/tdata/full-bbl.bcf | 5 ++-- t/tdata/full-bibtex.bcf | 5 ++-- t/tdata/full-dot.bcf | 5 ++-- t/tdata/general.bcf | 5 ++-- t/tdata/labelalpha.bcf | 5 ++-- t/tdata/labelalphaname.bcf | 5 ++-- t/tdata/maps.bcf | 5 ++-- t/tdata/names.bcf | 5 ++-- t/tdata/names_x.bcf | 5 ++-- t/tdata/options.bcf | 5 ++-- t/tdata/related.bcf | 5 ++-- t/tdata/remote-files.bcf | 5 ++-- t/tdata/sections-complex.bcf | 5 ++-- t/tdata/sections.bcf | 5 ++-- t/tdata/set-dynamic.bcf | 5 ++-- t/tdata/set-legacy.bcf | 5 ++-- t/tdata/set-static.bcf | 5 ++-- t/tdata/skips.bcf | 5 ++-- t/tdata/skipsg.bcf | 5 ++-- t/tdata/sort-case.bcf | 5 ++-- t/tdata/sort-complex.bcf | 5 ++-- t/tdata/sort-names.bcf | 5 ++-- t/tdata/sort-order.bcf | 5 ++-- t/tdata/sort-uc.bcf | 5 ++-- t/tdata/translit.bcf | 5 ++-- t/tdata/truncation.bcf | 5 ++-- t/tdata/uniqueness-nameparts.bcf | 5 ++-- t/tdata/uniqueness1.bcf | 5 ++-- t/tdata/uniqueness2.bcf | 5 ++-- t/tdata/uniqueness3.bcf | 5 ++-- t/tdata/uniqueness4.bcf | 5 ++-- t/tdata/uniqueness5.bcf | 5 ++-- t/tdata/uniqueness6.bcf | 5 ++-- t/tdata/uniqueness7.bcf | 5 ++-- t/tdata/xdata.bcf | 5 ++-- 58 files changed, 235 insertions(+), 148 deletions(-) diff --git a/data/schemata/bcf.rnc b/data/schemata/bcf.rnc index 8c943793f..02cd083da 100644 --- a/data/schemata/bcf.rnc +++ b/data/schemata/bcf.rnc @@ -54,7 +54,7 @@ start = singletitle, skipbib, skipbiblist, - skiplab, + skiplab, sortalphaothers?, sortlocale, sortingtemplatename, @@ -68,7 +68,7 @@ start = useprefix, usenames }, - + # Per-entrytype BibLaTeX options element bcf:options { attribute component { "biblatex" }, @@ -127,7 +127,7 @@ start = xsd:string }+ }*, - + # datafield sets element bcf:datafieldset { attribute name { text }, @@ -162,13 +162,13 @@ start = text }+ }+, - + # labelalpha template specification element bcf:labelalphatemplate { attribute type { xsd:string }?, # per-type? element bcf:labelelement { attribute order { xsd:integer }, - element bcf:labelpart { + element bcf:labelpart { attribute final { xsd:boolean }?, attribute pad_char { xsd:string {minLength="1"}}?, attribute pad_side { "left" | "right" }?, @@ -187,6 +187,7 @@ start = # Extradate specification element bcf:extradatespec { + attribute type { xsd:string }?, # per-type? # Scope of extradate tracking - an ordered set of fields to try element bcf:scope { # A field used to track extradate @@ -195,7 +196,7 @@ start = text }+ }+ - }, + }+, # Cross-reference inheritance specifications element bcf:inheritance { @@ -845,7 +846,7 @@ wrapline = attribute type { "singlevalued" }, element bcf:key { "wrapline" }, element bcf:value { xsd:integer } - } + } output_encoding = element bcf:option { attribute type { "singlevalued" }, diff --git a/data/schemata/bcf.rng b/data/schemata/bcf.rng index fbe72d016..1738cbe78 100644 --- a/data/schemata/bcf.rng +++ b/data/schemata/bcf.rng @@ -447,23 +447,33 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/schemata/config.rnc b/data/schemata/config.rnc index 1a6b7fef2..f6c6fa2fb 100644 --- a/data/schemata/config.rnc +++ b/data/schemata/config.rnc @@ -34,11 +34,11 @@ start = empty }+ }* & - + # Annotation marker element annotation_marker { text }? & # Can't specify the config file location in the config file ... - # element configfile { text }? & + # element configfile { text }? & element convert_control { "0" | "1" }? & element dot_include { text }? & # Data model specification (mainly for tool mode) @@ -380,7 +380,7 @@ map = } -labelalphanametemplate = +labelalphanametemplate = element labelalphanametemplate { attribute name { xsd:string }?, element namepart { @@ -393,13 +393,13 @@ labelalphanametemplate = text }+ } - -labelalphatemplate = + +labelalphatemplate = element labelalphatemplate { attribute type { xsd:string }?, # per-type? element labelelement { attribute order { xsd:integer }, - element labelpart { + element labelpart { attribute final { "0" | "1" }?, attribute pad_char { xsd:string {minLength="1"}}?, attribute pad_side { "left" | "right" }?, @@ -417,7 +417,7 @@ labelalphatemplate = } -uniquenametemplate = +uniquenametemplate = element uniquenametemplate { attribute name { xsd:string {minLength="1"} }, element namepart { @@ -429,7 +429,7 @@ uniquenametemplate = }+ } -namehashtemplate = +namehashtemplate = element namehashtemplate { attribute name { xsd:string {minLength="1"} }, element namepart { @@ -439,7 +439,7 @@ namehashtemplate = }+ } -sortingnamekeytemplate = +sortingnamekeytemplate = element sortingnamekeytemplate { attribute name { text }, attribute visibility { text }, @@ -455,7 +455,7 @@ sortingnamekeytemplate = }+ } -sortingtemplate = +sortingtemplate = element sortingtemplate { # sorting template name attribute name { xsd:string {minLength="1"}}, diff --git a/lib/Biber.pm b/lib/Biber.pm index 123a321ce..ac848ae68 100644 --- a/lib/Biber.pm +++ b/lib/Biber.pm @@ -480,6 +480,7 @@ sub parse_ctrlfile { qr/\Acondition\z/, qr/\Afilter(?:or)?\z/, qr/\Aoptionscope\z/, + qr/\Aextradatespec\z/ ], 'NsStrip' => 1, 'KeyAttr' => []); @@ -667,15 +668,37 @@ sub parse_ctrlfile { } # EXTRADATE specification - my $ed; - foreach my $scope ($bcfxml->{extradatespec}->{scope}->@*) { - my $fields; - foreach my $field (sort {$a->{order} <=> $b->{order}} $scope->{field}->@*) { - push $fields->@*, $field->{content}; + foreach my $eds ($bcfxml->{extradatespec}->@*) { + my $edtype = $eds->{type}; + my $ed; + foreach my $scope ($eds->{scope}->@*) { + my $fields; + foreach my $field (sort {$a->{order} <=> $b->{order}} $scope->{field}->@*) { + push $fields->@*, $field->{content}; + } + push $ed->@*, $fields; + } + + if ($edtype eq 'global') { + Biber::Config->setblxoption(undef, 'extradatespec', $ed); + } + else { + Biber::Config->setblxoption(undef, 'extradatespec', + $ed, + 'ENTRYTYPE', + $edtype); } - push $ed->@*, $fields; } - Biber::Config->setblxoption(undef, 'extradatespec', $ed); + + # my $ed; + # foreach my $scope ($bcfxml->{extradatespec}->{scope}->@*) { + # my $fields; + # foreach my $field (sort {$a->{order} <=> $b->{order}} $scope->{field}->@*) { + # push $fields->@*, $field->{content}; + # } + # push $ed->@*, $fields; + # } + # Biber::Config->setblxoption(undef, 'extradatespec', $ed); # INHERITANCE schemes for crossreferences (always global) Biber::Config->setblxoption(undef, 'inheritance', $bcfxml->{inheritance}); diff --git a/lib/Biber/Constants.pm b/lib/Biber/Constants.pm index ae06da3a7..dc0f5a967 100644 --- a/lib/Biber/Constants.pm +++ b/lib/Biber/Constants.pm @@ -46,7 +46,7 @@ our @EXPORT = qw{ # Version of biblatex control file which this release expects. Matched against version # passed in control file. Used when checking the .bcf -our $BCF_VERSION = '3.11'; +our $BCF_VERSION = '3.12'; # Format version of the .bbl. Used when writing the .bbl our $BBL_VERSION = '3.3'; diff --git a/t/tdata/annotations.bcf b/t/tdata/annotations.bcf index 9fbb9e347..c54c1425e 100644 --- a/t/tdata/annotations.bcf +++ b/t/tdata/annotations.bcf @@ -1,7 +1,7 @@ - + @@ -378,6 +378,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -590,7 +591,7 @@ - + labelyear year diff --git a/t/tdata/basic-misc.bcf b/t/tdata/basic-misc.bcf index 812af04cf..9d832237c 100644 --- a/t/tdata/basic-misc.bcf +++ b/t/tdata/basic-misc.bcf @@ -1,7 +1,7 @@ - + @@ -384,6 +384,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -606,7 +607,7 @@ - + labelyear year diff --git a/t/tdata/biblatexml.bcf b/t/tdata/biblatexml.bcf index f7ba37a99..7287e3a84 100644 --- a/t/tdata/biblatexml.bcf +++ b/t/tdata/biblatexml.bcf @@ -1,7 +1,7 @@ - + @@ -390,6 +390,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -623,7 +624,7 @@ - + labelyear year diff --git a/t/tdata/bibtex-aliases.bcf b/t/tdata/bibtex-aliases.bcf index e4f554e82..97fa1ef4b 100644 --- a/t/tdata/bibtex-aliases.bcf +++ b/t/tdata/bibtex-aliases.bcf @@ -1,7 +1,7 @@ - + @@ -373,6 +373,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -649,7 +650,7 @@ - + labelyear year diff --git a/t/tdata/bibtex-output.bcf b/t/tdata/bibtex-output.bcf index 05f8b960f..d2c38686e 100644 --- a/t/tdata/bibtex-output.bcf +++ b/t/tdata/bibtex-output.bcf @@ -1,7 +1,7 @@ - + @@ -377,6 +377,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -594,7 +595,7 @@ - + labelyear year diff --git a/t/tdata/crossrefs.bcf b/t/tdata/crossrefs.bcf index 3beb15397..b33e70f34 100644 --- a/t/tdata/crossrefs.bcf +++ b/t/tdata/crossrefs.bcf @@ -1,7 +1,7 @@ - + @@ -378,6 +378,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -590,7 +591,7 @@ - + labelyear year diff --git a/t/tdata/datalists.bcf b/t/tdata/datalists.bcf index 5ac2a7b18..78d152e75 100644 --- a/t/tdata/datalists.bcf +++ b/t/tdata/datalists.bcf @@ -1,7 +1,7 @@ - + @@ -378,6 +378,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -590,7 +591,7 @@ - + labelyear year diff --git a/t/tdata/dateformats.bcf b/t/tdata/dateformats.bcf index 16c3af2da..57d8352ef 100644 --- a/t/tdata/dateformats.bcf +++ b/t/tdata/dateformats.bcf @@ -1,7 +1,7 @@ - + @@ -390,6 +390,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -602,7 +603,7 @@ - + labelyear year diff --git a/t/tdata/dm-constraints.bcf b/t/tdata/dm-constraints.bcf index b6d266218..c835f25e4 100644 --- a/t/tdata/dm-constraints.bcf +++ b/t/tdata/dm-constraints.bcf @@ -1,7 +1,7 @@ - + @@ -374,6 +374,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -586,7 +587,7 @@ - + labelyear year diff --git a/t/tdata/encoding1.bcf b/t/tdata/encoding1.bcf index df2c72f68..4bdc720f6 100644 --- a/t/tdata/encoding1.bcf +++ b/t/tdata/encoding1.bcf @@ -1,7 +1,7 @@ - + @@ -379,6 +379,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -591,7 +592,7 @@ - + labelyear year diff --git a/t/tdata/encoding2.bcf b/t/tdata/encoding2.bcf index fb7b57154..2db9bfe4d 100644 --- a/t/tdata/encoding2.bcf +++ b/t/tdata/encoding2.bcf @@ -1,7 +1,7 @@ - + @@ -379,6 +379,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -591,7 +592,7 @@ - + labelyear year diff --git a/t/tdata/encoding3.bcf b/t/tdata/encoding3.bcf index c4027a509..70ecc93cb 100644 --- a/t/tdata/encoding3.bcf +++ b/t/tdata/encoding3.bcf @@ -1,7 +1,7 @@ - + @@ -379,6 +379,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -591,7 +592,7 @@ - + labelyear year diff --git a/t/tdata/encoding4.bcf b/t/tdata/encoding4.bcf index 3b2689d4c..c9fe7f4e5 100644 --- a/t/tdata/encoding4.bcf +++ b/t/tdata/encoding4.bcf @@ -1,7 +1,7 @@ - + @@ -379,6 +379,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -591,7 +592,7 @@ - + labelyear year diff --git a/t/tdata/encoding5.bcf b/t/tdata/encoding5.bcf index eecac47df..458dca087 100644 --- a/t/tdata/encoding5.bcf +++ b/t/tdata/encoding5.bcf @@ -1,7 +1,7 @@ - + @@ -379,6 +379,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -591,7 +592,7 @@ - + labelyear year diff --git a/t/tdata/encoding6.bcf b/t/tdata/encoding6.bcf index acc54c42d..762062c1d 100644 --- a/t/tdata/encoding6.bcf +++ b/t/tdata/encoding6.bcf @@ -1,7 +1,7 @@ - + @@ -379,6 +379,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -591,7 +592,7 @@ - + labelyear year diff --git a/t/tdata/extradate.bcf b/t/tdata/extradate.bcf index 4e3caf8ef..f015bf8fa 100644 --- a/t/tdata/extradate.bcf +++ b/t/tdata/extradate.bcf @@ -1,7 +1,7 @@ - + @@ -392,6 +392,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -604,7 +605,7 @@ - + labelyear year diff --git a/t/tdata/extratitle.bcf b/t/tdata/extratitle.bcf index b2c4fd226..19a246b34 100644 --- a/t/tdata/extratitle.bcf +++ b/t/tdata/extratitle.bcf @@ -1,7 +1,7 @@ - + @@ -390,6 +390,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -602,7 +603,7 @@ - + labelyear year diff --git a/t/tdata/extratitleyear.bcf b/t/tdata/extratitleyear.bcf index 476b80c70..e65a4c672 100644 --- a/t/tdata/extratitleyear.bcf +++ b/t/tdata/extratitleyear.bcf @@ -1,7 +1,7 @@ - + @@ -390,6 +390,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -602,7 +603,7 @@ - + labelyear year diff --git a/t/tdata/full-bbl.bcf b/t/tdata/full-bbl.bcf index 8b7a97d7f..196297e61 100644 --- a/t/tdata/full-bbl.bcf +++ b/t/tdata/full-bbl.bcf @@ -1,7 +1,7 @@ - + @@ -378,6 +378,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -590,7 +591,7 @@ - + labelyear year diff --git a/t/tdata/full-bibtex.bcf b/t/tdata/full-bibtex.bcf index 0144a5520..1ccac21f2 100644 --- a/t/tdata/full-bibtex.bcf +++ b/t/tdata/full-bibtex.bcf @@ -1,7 +1,7 @@ - + @@ -378,6 +378,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -590,7 +591,7 @@ - + labelyear year diff --git a/t/tdata/full-dot.bcf b/t/tdata/full-dot.bcf index f17929445..028333b75 100644 --- a/t/tdata/full-dot.bcf +++ b/t/tdata/full-dot.bcf @@ -1,7 +1,7 @@ - + @@ -378,6 +378,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -595,7 +596,7 @@ - + labelyear year diff --git a/t/tdata/general.bcf b/t/tdata/general.bcf index 33fe87750..0bd4c2a7d 100644 --- a/t/tdata/general.bcf +++ b/t/tdata/general.bcf @@ -1,7 +1,7 @@ - + @@ -383,6 +383,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -595,7 +596,7 @@ - + labelyear year diff --git a/t/tdata/labelalpha.bcf b/t/tdata/labelalpha.bcf index e08297736..5660726b5 100644 --- a/t/tdata/labelalpha.bcf +++ b/t/tdata/labelalpha.bcf @@ -1,7 +1,7 @@ - + @@ -398,6 +398,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -686,7 +687,7 @@ - + labelyear year diff --git a/t/tdata/labelalphaname.bcf b/t/tdata/labelalphaname.bcf index 77a2644d0..defcf4c45 100644 --- a/t/tdata/labelalphaname.bcf +++ b/t/tdata/labelalphaname.bcf @@ -1,7 +1,7 @@ - + @@ -398,6 +398,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -695,7 +696,7 @@ - + labelyear year diff --git a/t/tdata/maps.bcf b/t/tdata/maps.bcf index 9709bfa43..21d625baf 100644 --- a/t/tdata/maps.bcf +++ b/t/tdata/maps.bcf @@ -1,7 +1,7 @@ - + @@ -384,6 +384,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -586,7 +587,7 @@ - + labelyear year diff --git a/t/tdata/names.bcf b/t/tdata/names.bcf index 8c1455051..96f8a57f1 100644 --- a/t/tdata/names.bcf +++ b/t/tdata/names.bcf @@ -1,7 +1,7 @@ - + @@ -390,6 +390,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -602,7 +603,7 @@ - + labelyear year diff --git a/t/tdata/names_x.bcf b/t/tdata/names_x.bcf index 41555414b..bf647140a 100644 --- a/t/tdata/names_x.bcf +++ b/t/tdata/names_x.bcf @@ -1,7 +1,7 @@ - + @@ -390,6 +390,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -602,7 +603,7 @@ - + labelyear year diff --git a/t/tdata/options.bcf b/t/tdata/options.bcf index cc2eb1898..b7e6b6589 100644 --- a/t/tdata/options.bcf +++ b/t/tdata/options.bcf @@ -1,7 +1,7 @@ - + @@ -385,6 +385,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -598,7 +599,7 @@ - + labelyear year diff --git a/t/tdata/related.bcf b/t/tdata/related.bcf index bd9acce69..57c926fb5 100644 --- a/t/tdata/related.bcf +++ b/t/tdata/related.bcf @@ -1,7 +1,7 @@ - + @@ -378,6 +378,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -591,7 +592,7 @@ - + labelyear year diff --git a/t/tdata/remote-files.bcf b/t/tdata/remote-files.bcf index a5e45fa17..be1d8e247 100644 --- a/t/tdata/remote-files.bcf +++ b/t/tdata/remote-files.bcf @@ -1,7 +1,7 @@ - + @@ -386,6 +386,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -598,7 +599,7 @@ - + labelyear year diff --git a/t/tdata/sections-complex.bcf b/t/tdata/sections-complex.bcf index d0c453c81..925ce700c 100644 --- a/t/tdata/sections-complex.bcf +++ b/t/tdata/sections-complex.bcf @@ -1,7 +1,7 @@ - + @@ -390,6 +390,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -609,7 +610,7 @@ - + labelyear year diff --git a/t/tdata/sections.bcf b/t/tdata/sections.bcf index af786b3c5..108429efd 100644 --- a/t/tdata/sections.bcf +++ b/t/tdata/sections.bcf @@ -1,7 +1,7 @@ - + @@ -390,6 +390,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -602,7 +603,7 @@ - + labelyear year diff --git a/t/tdata/set-dynamic.bcf b/t/tdata/set-dynamic.bcf index af9d16443..0aada6d14 100644 --- a/t/tdata/set-dynamic.bcf +++ b/t/tdata/set-dynamic.bcf @@ -1,7 +1,7 @@ - + @@ -379,6 +379,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -591,7 +592,7 @@ - + labelyear year diff --git a/t/tdata/set-legacy.bcf b/t/tdata/set-legacy.bcf index 22d3fac77..278293958 100644 --- a/t/tdata/set-legacy.bcf +++ b/t/tdata/set-legacy.bcf @@ -1,7 +1,7 @@ - + @@ -379,6 +379,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -591,7 +592,7 @@ - + labelyear year diff --git a/t/tdata/set-static.bcf b/t/tdata/set-static.bcf index a769d0410..f57272919 100644 --- a/t/tdata/set-static.bcf +++ b/t/tdata/set-static.bcf @@ -1,7 +1,7 @@ - + @@ -379,6 +379,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -591,7 +592,7 @@ - + labelyear year diff --git a/t/tdata/skips.bcf b/t/tdata/skips.bcf index 6a2e630e8..4cdd2fc77 100644 --- a/t/tdata/skips.bcf +++ b/t/tdata/skips.bcf @@ -1,7 +1,7 @@ - + @@ -391,6 +391,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -603,7 +604,7 @@ - + labelyear year diff --git a/t/tdata/skipsg.bcf b/t/tdata/skipsg.bcf index 525933ad8..2aa00eb2c 100644 --- a/t/tdata/skipsg.bcf +++ b/t/tdata/skipsg.bcf @@ -1,7 +1,7 @@ - + @@ -391,6 +391,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -603,7 +604,7 @@ - + labelyear year diff --git a/t/tdata/sort-case.bcf b/t/tdata/sort-case.bcf index 014ad6258..c256ced1f 100644 --- a/t/tdata/sort-case.bcf +++ b/t/tdata/sort-case.bcf @@ -1,7 +1,7 @@ - + @@ -378,6 +378,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -590,7 +591,7 @@ - + labelyear year diff --git a/t/tdata/sort-complex.bcf b/t/tdata/sort-complex.bcf index 9c0b76154..11d4088e8 100644 --- a/t/tdata/sort-complex.bcf +++ b/t/tdata/sort-complex.bcf @@ -1,7 +1,7 @@ - + @@ -390,6 +390,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -602,7 +603,7 @@ - + labelyear year diff --git a/t/tdata/sort-names.bcf b/t/tdata/sort-names.bcf index 56cdff4a5..d8efc3a41 100644 --- a/t/tdata/sort-names.bcf +++ b/t/tdata/sort-names.bcf @@ -1,7 +1,7 @@ - + @@ -378,6 +378,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -590,7 +591,7 @@ - + labelyear year diff --git a/t/tdata/sort-order.bcf b/t/tdata/sort-order.bcf index 42845b526..6b6335b72 100644 --- a/t/tdata/sort-order.bcf +++ b/t/tdata/sort-order.bcf @@ -1,7 +1,7 @@ - + @@ -378,6 +378,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -590,7 +591,7 @@ - + labelyear year diff --git a/t/tdata/sort-uc.bcf b/t/tdata/sort-uc.bcf index 179b0c6cc..1c027c250 100644 --- a/t/tdata/sort-uc.bcf +++ b/t/tdata/sort-uc.bcf @@ -1,7 +1,7 @@ - + @@ -378,6 +378,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -590,7 +591,7 @@ - + labelyear year diff --git a/t/tdata/translit.bcf b/t/tdata/translit.bcf index acd06a394..4a220b944 100644 --- a/t/tdata/translit.bcf +++ b/t/tdata/translit.bcf @@ -1,7 +1,7 @@ - + @@ -445,6 +445,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -659,7 +660,7 @@ - + labelyear year diff --git a/t/tdata/truncation.bcf b/t/tdata/truncation.bcf index b992eae60..ba4889c2b 100644 --- a/t/tdata/truncation.bcf +++ b/t/tdata/truncation.bcf @@ -1,7 +1,7 @@ - + @@ -379,6 +379,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -591,7 +592,7 @@ - + labelyear year diff --git a/t/tdata/uniqueness-nameparts.bcf b/t/tdata/uniqueness-nameparts.bcf index cfea1c605..f693c7d57 100644 --- a/t/tdata/uniqueness-nameparts.bcf +++ b/t/tdata/uniqueness-nameparts.bcf @@ -1,7 +1,7 @@ - + @@ -379,6 +379,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -593,7 +594,7 @@ - + labelyear year diff --git a/t/tdata/uniqueness1.bcf b/t/tdata/uniqueness1.bcf index 1fd72e559..9eccac881 100644 --- a/t/tdata/uniqueness1.bcf +++ b/t/tdata/uniqueness1.bcf @@ -1,7 +1,7 @@ - + @@ -379,6 +379,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -591,7 +592,7 @@ - + labelyear year diff --git a/t/tdata/uniqueness2.bcf b/t/tdata/uniqueness2.bcf index 668dfe9ee..664603508 100644 --- a/t/tdata/uniqueness2.bcf +++ b/t/tdata/uniqueness2.bcf @@ -1,7 +1,7 @@ - + @@ -379,6 +379,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -591,7 +592,7 @@ - + labelyear year diff --git a/t/tdata/uniqueness3.bcf b/t/tdata/uniqueness3.bcf index 591f281ec..e02ac4537 100644 --- a/t/tdata/uniqueness3.bcf +++ b/t/tdata/uniqueness3.bcf @@ -1,7 +1,7 @@ - + @@ -379,6 +379,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -591,7 +592,7 @@ - + labelyear year diff --git a/t/tdata/uniqueness4.bcf b/t/tdata/uniqueness4.bcf index a1b7b5aeb..31f609c9c 100644 --- a/t/tdata/uniqueness4.bcf +++ b/t/tdata/uniqueness4.bcf @@ -1,7 +1,7 @@ - + @@ -379,6 +379,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -591,7 +592,7 @@ - + labelyear year diff --git a/t/tdata/uniqueness5.bcf b/t/tdata/uniqueness5.bcf index 45c195932..5d435d854 100644 --- a/t/tdata/uniqueness5.bcf +++ b/t/tdata/uniqueness5.bcf @@ -1,7 +1,7 @@ - + @@ -379,6 +379,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -591,7 +592,7 @@ - + labelyear year diff --git a/t/tdata/uniqueness6.bcf b/t/tdata/uniqueness6.bcf index 60dac61b0..5fc2f022d 100644 --- a/t/tdata/uniqueness6.bcf +++ b/t/tdata/uniqueness6.bcf @@ -1,7 +1,7 @@ - + @@ -379,6 +379,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -591,7 +592,7 @@ - + labelyear year diff --git a/t/tdata/uniqueness7.bcf b/t/tdata/uniqueness7.bcf index a7b7d5d7b..86282fa4e 100644 --- a/t/tdata/uniqueness7.bcf +++ b/t/tdata/uniqueness7.bcf @@ -1,7 +1,7 @@ - + @@ -379,6 +379,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -591,7 +592,7 @@ - + labelyear year diff --git a/t/tdata/xdata.bcf b/t/tdata/xdata.bcf index b2762a230..dc33fd50f 100644 --- a/t/tdata/xdata.bcf +++ b/t/tdata/xdata.bcf @@ -1,7 +1,7 @@ - + @@ -378,6 +378,7 @@ dateeraauto + extradatespec extradatecontext alphaothers sortalphaothers @@ -590,7 +591,7 @@ - + labelyear year