diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
338 files changed, 4135 insertions, 1347 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-aefkw.lbx index 68933f29cc4..eb56433f9ef 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-aefkw.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-aefkw.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUKenglishaefkwLBX,PenglishaefkwLBX') %% \ProvidesFile{UKenglish-aefkw.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-aefkw} \InheritBibliographyStrings{english-aefkw} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-archa.lbx index 21616db636c..ed67d0bb25a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-archa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-archa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUKenglisharchaLBX,PenglisharchaLBX') %% \ProvidesFile{UKenglish-archa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archa} \InheritBibliographyStrings{english-archa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-archaeology.lbx index 8e94778cb45..f08a366363d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-archaeology.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-archaeology.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUKenglishLBX,PenglishLBX') %% \ProvidesFile{UKenglish-archaeology.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-dguf-alt.lbx index 55a6877a72d..0c6ff8c82aa 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-dguf-alt.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-dguf-alt.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUKenglishdgufaltLBX,PenglishLBX') %% \ProvidesFile{UKenglish-dguf-alt.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-dguf-apa.lbx index 86a311ab3ba..aaaa2b92145 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-dguf-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-dguf-apa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUKenglishdgufapaLBX,PenglishdgufapaLBX') %% \ProvidesFile{UKenglish-dguf-apa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-dguf-apa} \InheritBibliographyStrings{english-dguf-apa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-eaz.lbx index c21738fce82..b830fef83d3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-eaz.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-eaz.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUKenglisheazLBX,PenglisheazLBX') %% \ProvidesFile{UKenglish-eaz.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-eaz} \InheritBibliographyStrings{english-eaz} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-foe.lbx index 4169c6fc05a..6137656e591 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-foe.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-foe.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUKenglishfoeLBX,PenglishfoeLBX') %% \ProvidesFile{UKenglish-foe.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-foe} \InheritBibliographyStrings{english-foe} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-jb-kreis-neuss.lbx index 6202d248224..addf41c8610 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-jb-kreis-neuss.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-jb-kreis-neuss.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUKenglishjbkreisneussLBX,PenglishjbkreisneussLBX') %% \ProvidesFile{UKenglish-jb-kreis-neuss.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-jb-kreis-neuss} \InheritBibliographyStrings{english-jb-kreis-neuss} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-karl.lbx index b3b3b4a1747..30bf0cc3ba8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-karl.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-karl.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUKenglishkarlLBX,PenglishLBX') %% \ProvidesFile{UKenglish-karl.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-maja.lbx index ad965030784..6591a18b682 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-maja.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-maja.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUKenglishmajaLBX,PenglishLBX') %% \ProvidesFile{UKenglish-maja.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-mpk.lbx index 40c8377072f..f74bb64bc2b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-mpk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-mpk.lbx @@ -7,9 +7,26 @@ %% biblatex-archaeology.dtx (with options: `FUKenglishmpkLBX,PenglishmpkLBX') %% \ProvidesFile{UKenglish-mpk.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-mpk} -\InheritBibliographyStrings{english-mpk} +\InheritBibliographyExtras{english-archaeology} +\DeclareBibliographyStrings{% + inherit = {english-archaeology}, + unpublishedbathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublisheddiplomathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedmagisterthesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedmathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedphdthesis = {{unpublished PhD Dissertation} + {unpublished PhD Dissertation}}, + unpublishedpostdocthesis = {{unpublished Habilitationsschrift} + {unpublished Habilitationsschrift}}, + urlseen = {{last access}{last access}}, +} \endinput %% %% End of file `UKenglish-mpk.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-mpkoeaw.lbx new file mode 100644 index 00000000000..70f30d55225 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-mpkoeaw.lbx @@ -0,0 +1,16 @@ +%% +%% This is file `UKenglish-mpkoeaw.lbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `FUKenglishmpkoeawLBX,PenglishmpkoeawLBX') +%% +\ProvidesFile{UKenglish-mpkoeaw.lbx} +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes +\InheritBibliographyExtras{english-mpkoeaw} +\InheritBibliographyStrings{english-mpkoeaw} +\endinput +%% +%% End of file `UKenglish-mpkoeaw.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-offa.lbx index 71c9caba686..62b380d8501 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-offa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-offa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUKenglishoffaLBX,PenglishoffaLBX') %% \ProvidesFile{UKenglish-offa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-offa} \InheritBibliographyStrings{english-offa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-rgzm.lbx index d8d8b49b8de..0231c6b7fd3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-rgzm.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-rgzm.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUKenglishrgzmLBX,PenglishLBX') %% \ProvidesFile{UKenglish-rgzm.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-zaak.lbx index c63d6597492..e2ca71024ea 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-zaak.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-zaak.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUKenglishzaakLBX,PenglishzaakLBX') %% \ProvidesFile{UKenglish-zaak.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-zaak} \InheritBibliographyStrings{english-zaak} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-zaes.lbx index fbe6783ecea..aa78daf0952 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-zaes.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/UKenglish-zaes.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUKenglishzaesLBX,PenglishzaesLBX') %% \ProvidesFile{UKenglish-zaes.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-zaes} \InheritBibliographyStrings{english-zaes} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-aefkw.lbx index 9e5cf3bcb6e..ab1f5ca8844 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-aefkw.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-aefkw.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUSenglishaefkwLBX,PenglishaefkwLBX') %% \ProvidesFile{USenglish-aefkw.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-aefkw} \InheritBibliographyStrings{english-aefkw} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-archa.lbx index 2ad872c141b..5b49583ecab 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-archa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-archa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUSenglisharchaLBX,PenglisharchaLBX') %% \ProvidesFile{USenglish-archa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archa} \InheritBibliographyStrings{english-archa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-archaeology.lbx index 026b4792ca3..681b8fa7a5b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-archaeology.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-archaeology.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUSenglishLBX,PenglishLBX') %% \ProvidesFile{USenglish-archaeology.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-dguf-alt.lbx index 3dd074adabe..0c732ce1181 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-dguf-alt.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-dguf-alt.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUSenglishdgufaltLBX,PenglishLBX') %% \ProvidesFile{USenglish-dguf-alt.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-dguf-apa.lbx index 1f41a9c0831..a103c230301 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-dguf-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-dguf-apa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUSenglishdgufapaLBX,PenglishdgufapaLBX') %% \ProvidesFile{USenglish-dguf-apa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-dguf-apa} \InheritBibliographyStrings{english-dguf-apa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-eaz.lbx index 4ae001aae00..d6f43e0d9e0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-eaz.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-eaz.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUSenglisheazLBX,PenglisheazLBX') %% \ProvidesFile{USenglish-eaz.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-eaz} \InheritBibliographyStrings{english-eaz} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-foe.lbx index 1daeaf3b54c..ddde66b5253 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-foe.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-foe.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUSenglishfoeLBX,PenglishfoeLBX') %% \ProvidesFile{USenglish-foe.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-foe} \InheritBibliographyStrings{english-foe} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-jb-kreis-neuss.lbx index 42476b9f040..f52dc250921 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-jb-kreis-neuss.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-jb-kreis-neuss.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUSenglishjbkreisneussLBX,PenglishjbkreisneussLBX') %% \ProvidesFile{USenglish-jb-kreis-neuss.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-jb-kreis-neuss} \InheritBibliographyStrings{english-jb-kreis-neuss} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-karl.lbx index 31b3ba9a412..fb1ac68d530 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-karl.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-karl.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUSenglishkarlLBX,PenglishLBX') %% \ProvidesFile{USenglish-karl.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-maja.lbx index 12c06097a70..85b63893cfc 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-maja.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-maja.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUSenglishmajaLBX,PenglishLBX') %% \ProvidesFile{USenglish-maja.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-mpk.lbx index 064c26d230a..73612d91bf0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-mpk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-mpk.lbx @@ -7,9 +7,26 @@ %% biblatex-archaeology.dtx (with options: `FUSenglishmpkLBX,PenglishmpkLBX') %% \ProvidesFile{USenglish-mpk.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-mpk} -\InheritBibliographyStrings{english-mpk} +\InheritBibliographyExtras{english-archaeology} +\DeclareBibliographyStrings{% + inherit = {english-archaeology}, + unpublishedbathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublisheddiplomathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedmagisterthesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedmathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedphdthesis = {{unpublished PhD Dissertation} + {unpublished PhD Dissertation}}, + unpublishedpostdocthesis = {{unpublished Habilitationsschrift} + {unpublished Habilitationsschrift}}, + urlseen = {{last access}{last access}}, +} \endinput %% %% End of file `USenglish-mpk.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-mpkoeaw.lbx new file mode 100644 index 00000000000..cf87949f4e9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-mpkoeaw.lbx @@ -0,0 +1,16 @@ +%% +%% This is file `USenglish-mpkoeaw.lbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `FUSenglishmpkoeawLBX,PenglishmpkoeawLBX') +%% +\ProvidesFile{USenglish-mpkoeaw.lbx} +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes +\InheritBibliographyExtras{english-mpkoeaw} +\InheritBibliographyStrings{english-mpkoeaw} +\endinput +%% +%% End of file `USenglish-mpkoeaw.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-offa.lbx index ca3dcf19c44..7fa400c72cf 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-offa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-offa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUSenglishoffaLBX,PenglishoffaLBX') %% \ProvidesFile{USenglish-offa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-offa} \InheritBibliographyStrings{english-offa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-rgzm.lbx index 2ab1156ac3c..c7042743d72 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-rgzm.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-rgzm.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUSenglishrgzmLBX,PenglishLBX') %% \ProvidesFile{USenglish-rgzm.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-zaak.lbx index e82006b89a1..b6ba16fc0bc 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-zaak.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-zaak.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUSenglishzaakLBX,PenglishzaakLBX') %% \ProvidesFile{USenglish-zaak.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-zaak} \InheritBibliographyStrings{english-zaak} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-zaes.lbx index e2a6a197130..2bd5e7ddcde 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-zaes.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/USenglish-zaes.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FUSenglishzaesLBX,PenglishzaesLBX') %% \ProvidesFile{USenglish-zaes.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-zaes} \InheritBibliographyStrings{english-zaes} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.bbx index c8386c21cc9..0a93eabdb21 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `aefkwBBX,noarticlesubtitlepunct') %% \ProvidesFile{aefkw.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{verbose-ibid-archaeology} \def\archaeobibstyletitle{\blxarch@style@aefkw} \DeclareLanguageMappingSuffix{-aefkw} @@ -29,6 +29,7 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=false, notitlepunct=true, origfields=false, @@ -55,16 +56,16 @@ useunpublishedthesis=false, volumeafterseries=false, } -\renewcommand{\newunitpunct}{\addcomma\space} +\renewcommand*{\newunitpunct}{\addcomma\space} \DeclareNameAlias{sortname}{family-given} \DeclareNameAlias{bookauthor}{given-family} -\renewcommand{\booklabelnamepunct}{\addcomma\space} -\renewcommand{\labelnamepunct}{\addcomma\space} -\renewcommand{\mkbiblistnamefamily}[1]{\ifcitation{\textsc{#1}}{#1}} -\renewcommand{\mkbiblistnameprefix}[1]{\ifcitation{\textsc{#1}}{#1}} -\renewcommand{\multinamedelim}{\addslash} -\renewcommand{\finalnamedelim}{\addslash} -\renewcommand{\bibnamedash}{\printtext{\bibstring[\mkbiblistnamefamily]{idem\thefield{gender}}}} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\mkbiblistnamefamily}[1]{\ifcitation{\textsc{#1}}{#1}} +\renewcommand*{\mkbiblistnameprefix}[1]{\ifcitation{\textsc{#1}}{#1}} +\renewcommand*{\multinamedelim}{\addslash} +\renewcommand*{\finalnamedelim}{\addslash} +\renewcommand*{\bibnamedash}{\printtext{\bibstring[\mkbiblistnamefamily]{idem\thefield{gender}}}} \DeclareFieldFormat*{pages}{#1} \DeclareFieldFormat*{volume}{\addspace\ifinteger{#1}{\RN{#1}}{#1}} \DeclareFieldFormat[article,review,suppperiodical]{volume}{\addspace#1} @@ -74,12 +75,12 @@ {title}{#1} \DeclareFieldFormat*{booktitle}{\mkbibitalic{#1}} \DeclareFieldFormat*{maintitle}{\mkbibitalic{#1}} -\renewcommand{\titleseriesdelim}{\unspace\nopunct} -\renewcommand{\seriespunct}{\addspace} +\renewcommand*{\titleseriesdelim}{\unspace\nopunct} +\renewcommand*{\seriespunct}{\addspace} \DeclareFieldFormat*{seriesparens}{} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat*{journaltitle}{\mkbibitalic{#1}} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `aefkw.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.cbx index bf0d15be698..0ca25872119 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.cbx @@ -7,12 +7,13 @@ %% biblatex-archaeology.dtx (with options: `aefkwCBX,barecitations') %% \ProvidesFile{aefkw.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{verbose-ibid-archaeology} \def\archaeocitestyletitle{\blxarch@style@aefkw} -\DeclareFieldFormat*{postnote}{#1} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `aefkw.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.dbx index 992574bbe97..038f4efb707 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/aefkw.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `aefkwDBX,DBX') %% \ProvidesFile{aefkw.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `aefkw.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.bbx index 536e2ef86c5..432bd87b911 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `afwlBBX,noarticlesubtitlepunct') %% \ProvidesFile{afwl.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-archaeology} \def\archaeobibstyletitle{\blxarch@style@afwl} \ExecuteBibliographyOptions{ @@ -32,6 +32,7 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=true, notitlepunct=true, origfields=true, @@ -60,35 +61,35 @@ } \setlength{\bibhang}{0em} \setlength{\bibitemsep}{\baselineskip} -\renewcommand{\repeatlabelwrap}[1]{\mkbibbold{#1}} +\DeclareFieldFormat*{repeatlabel}{\mkbibbold{#1}} \DeclareNameAlias{bookauthor}{given-family} \DeclareNameAlias{sortname}{given-family} -\renewcommand{\multinamedelim}{\addslash} -\renewcommand{\finalnamedelim}{\addslash} -\renewcommand{\labelnamepunct}{\addcomma\space} -\renewcommand{\booklabelnamepunct}{\addcomma\space} +\renewcommand*{\multinamedelim}{\addslash} +\renewcommand*{\finalnamedelim}{\addslash} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1} -\renewcommand{\seriespunct}{\addspace} +\renewcommand*{\seriespunct}{\addspace} \DeclareFieldFormat*{seriesparens}{#1} -\renewcommand{\volumenumberdelim}{\addcomma\space} -\DeclareFieldFormat*{realdate}{\mkbibparens{#1}} -\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}} +\renewcommand*{\volumenumberdelim}{\addcomma\space} +\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}} +\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}} \DeclareFieldFormat*{pages}{#1} \DeclareFieldFormat*{volume}{\addspace#1} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}} \DeclareFieldFormat[thesis]{locationdateparens}{#1} \DeclareFieldFormat*{missingfield}{\mkbibbrackets{#1}} -\renewcommand{\bibpagespunct}{% +\renewcommand*{\bibpagespunct}{% \iffieldundef{journaltitle} {\addspace} {\addcomma\space}} -\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1} -\renewcommand{\multicitedelim}{\addsemicolon\space} +\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1} +\renewcommand*{\multicitedelim}{\addsemicolon\space} \DeclareFieldFormat*{url}{\url{#1}} \let\blxarch@buffer@url\url -\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `afwl.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.cbx index 68665cb217a..2fad1e132fe 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.cbx @@ -7,13 +7,14 @@ %% biblatex-archaeology.dtx (with options: `afwlCBX,barecitations') %% \ProvidesFile{afwl.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{authoryear-comp-archaeology} \def\archaeocitestyletitle{\blxarch@style@afwl} \ExecuteBibliographyOptions{autocite=footnote} -\DeclareFieldFormat*{postnote}{#1} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `afwl.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.dbx index 115704108aa..10cbe3e1fd8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/afwl.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `afwlDBX,DBX') %% \ProvidesFile{afwl.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `afwl.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-aefkw.lbx index 2756bb9f4f3..2624716ed5e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-aefkw.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-aefkw.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FamericanaefkwLBX,PenglishaefkwLBX') %% \ProvidesFile{american-aefkw.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-aefkw} \InheritBibliographyStrings{english-aefkw} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-archa.lbx index 6dc3423ee05..7fe2ba0a036 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-archa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-archa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FamericanarchaLBX,PenglisharchaLBX') %% \ProvidesFile{american-archa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archa} \InheritBibliographyStrings{english-archa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-archaeology.lbx index ffa9fa3cc7c..9144dd854bc 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-archaeology.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-archaeology.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FamericanLBX,PenglishLBX') %% \ProvidesFile{american-archaeology.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-dguf-alt.lbx index 466026b1507..2b4aade4d64 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-dguf-alt.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-dguf-alt.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FamericandgufaltLBX,PenglishLBX') %% \ProvidesFile{american-dguf-alt.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-dguf-apa.lbx index c1961343893..129754407ca 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-dguf-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-dguf-apa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FamericandgufapaLBX,PenglishdgufapaLBX') %% \ProvidesFile{american-dguf-apa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-dguf-apa} \InheritBibliographyStrings{english-dguf-apa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-eaz.lbx index 487dde43d77..0e30eac1091 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-eaz.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-eaz.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FamericaneazLBX,PenglisheazLBX') %% \ProvidesFile{american-eaz.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-eaz} \InheritBibliographyStrings{english-eaz} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-foe.lbx index 88769ba3150..e45315fc95b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-foe.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-foe.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FamericanfoeLBX,PenglishfoeLBX') %% \ProvidesFile{american-foe.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-foe} \InheritBibliographyStrings{english-foe} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-jb-kreis-neuss.lbx index acc3fb28d80..f60a576235d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-jb-kreis-neuss.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-jb-kreis-neuss.lbx @@ -6,7 +6,8 @@ %% %% biblatex-archaeology.dtx (with options: `FamericanjbkreisneusseLBX,PenglishjbkreisneussLBX') %% -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-jb-kreis-neuss} \InheritBibliographyStrings{english-jb-kreis-neuss} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-karl.lbx index f6f464c5ff5..83904a232b8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-karl.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-karl.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FamericankarlLBX,PenglishLBX') %% \ProvidesFile{american-karl.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-maja.lbx index 1c1ce83d25b..08005434f88 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-maja.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-maja.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FamericanmajaLBX,PenglishLBX') %% \ProvidesFile{american-maja.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-mpk.lbx index 959924ce07b..2c356f36c2a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-mpk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-mpk.lbx @@ -7,9 +7,26 @@ %% biblatex-archaeology.dtx (with options: `FamericanmpkLBX,PenglishmpkLBX') %% \ProvidesFile{american-mpk.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-mpk} -\InheritBibliographyStrings{english-mpk} +\InheritBibliographyExtras{english-archaeology} +\DeclareBibliographyStrings{% + inherit = {english-archaeology}, + unpublishedbathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublisheddiplomathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedmagisterthesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedmathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedphdthesis = {{unpublished PhD Dissertation} + {unpublished PhD Dissertation}}, + unpublishedpostdocthesis = {{unpublished Habilitationsschrift} + {unpublished Habilitationsschrift}}, + urlseen = {{last access}{last access}}, +} \endinput %% %% End of file `american-mpk.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-mpkoeaw.lbx new file mode 100644 index 00000000000..c5e00e50fcd --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-mpkoeaw.lbx @@ -0,0 +1,16 @@ +%% +%% This is file `american-mpkoeaw.lbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `FamericanmpkoeawLBX,PenglishmpkoeawLBX') +%% +\ProvidesFile{american-mpkoeaw.lbx} +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes +\InheritBibliographyExtras{english-mpkoeaw} +\InheritBibliographyStrings{english-mpkoeaw} +\endinput +%% +%% End of file `american-mpkoeaw.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-offa.lbx index 0b7e94796dc..a0c6f0eceb6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-offa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-offa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FamericanoffaLBX,PenglishoffaLBX') %% \ProvidesFile{american-offa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-offa} \InheritBibliographyStrings{english-offa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-rgzm.lbx index a0402755b0c..a9cf0bb1242 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-rgzm.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-rgzm.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FamericanrgzmLBX,PenglishLBX') %% \ProvidesFile{american-rgzm.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-zaak.lbx index e0d974db71d..7f4ee0536f1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-zaak.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-zaak.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FamericanzaakLBX,PenglishzaakLBX') %% \ProvidesFile{american-zaak.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-zaak} \InheritBibliographyStrings{english-zaak} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-zaes.lbx index b40af03d01a..9d2c4748e45 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/american-zaes.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/american-zaes.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FamericanzaesLBX,PenglishzaesLBX') %% \ProvidesFile{american-zaes.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-zaes} \InheritBibliographyStrings{english-zaes} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.bbx index eb17a49b3d7..8da087ab14e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `amitBBX,noarticlesubtitlepunct,nosmallcaps') %% \ProvidesFile{amit.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-archaeology} \def\archaeobibstyletitle{\blxarch@style@amit} \ExecuteBibliographyOptions{ @@ -32,6 +32,7 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=true, notitlepunct=true, origfields=true, @@ -60,33 +61,33 @@ } \DeclareNameAlias{bookauthor}{given-family} \DeclareNameAlias{sortname}{given-family} -\renewcommand{\multinamedelim}{\addslash} -\renewcommand{\finalnamedelim}{\addslash} -\renewcommand{\labelnamepunct}{\addcomma\space} -\renewcommand{\booklabelnamepunct}{\addcomma\space} -\renewcommand{\seriespunct}{\addspace} +\renewcommand*{\multinamedelim}{\addslash} +\renewcommand*{\finalnamedelim}{\addslash} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} +\renewcommand*{\seriespunct}{\addspace} \DeclareFieldFormat*{seriesparens}{#1} -\renewcommand{\volumenumberdelim}{\addcomma\space} +\renewcommand*{\volumenumberdelim}{\addcomma\space} \DeclareFieldFormat*{pages}{#1} \DeclareFieldFormat*{volume}{\addspace#1} \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}} \DeclareFieldFormat[thesis]{locationdateparens}{#1} \DeclareFieldFormat*{journaldateparens}{#1} -\renewcommand{\bibpagespunct}{% +\renewcommand*{\bibpagespunct}{% \iffieldundef{journaltitle} {\addspace} {\addcomma\space}} -\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1} -\renewcommand{\multicitedelim}{\addsemicolon\space} +\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1} +\renewcommand*{\multicitedelim}{\addsemicolon\space} \DeclareFieldFormat*{url}{\url{#1}} \let\blxarch@buffer@url\url -\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater} -\renewcommand{\nameshortformdelim}{\addspace in\space} -\renewcommand{\mkbibnamefamily}[1]{#1} -\renewcommand{\mkbibnameprefix}[1]{#1} -\renewcommand{\mkbibrepeatfamily}[1]{#1} -\renewcommand{\mkbibrepeatprefix}[1]{#1} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater} +\renewcommand*{\nameshortformdelim}{\addspace in\space} +\renewcommand*{\mkbibnamefamily}[1]{#1} +\renewcommand*{\mkbibnameprefix}[1]{#1} +\renewcommand*{\mkbibrepeatfamily}[1]{#1} +\renewcommand*{\mkbibrepeatprefix}[1]{#1} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `amit.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.cbx index 337f6c8b32a..bce865aee57 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.cbx @@ -7,14 +7,15 @@ %% biblatex-archaeology.dtx (with options: `amitCBX,barecitations') %% \ProvidesFile{amit.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{authoryear-archaeology} \def\archaeocitestyletitle{\blxarch@style@amit} \ExecuteBibliographyOptions{autocite=footnote} -\renewcommand{\multicitedelim}{\addsemicolon\space} -\DeclareFieldFormat*{postnote}{#1} +\renewcommand*{\multicitedelim}{\addsemicolon\space} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `amit.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.dbx index 2211109db59..0c30514542d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/amit.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `amitDBX,DBX') %% \ProvidesFile{amit.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `amit.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.bbx index dc21f78b5c2..4925225e047 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `archaBBX,noarticlesubtitlepunct') %% \ProvidesFile{archa.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-archaeology} \def\archaeobibstyletitle{\blxarch@style@archa} \DeclareLanguageMappingSuffix{-archa} @@ -34,6 +34,7 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=false, notitlepunct=false, origfields=true, @@ -63,36 +64,37 @@ \setlength{\bibhang}{0em} \DeclareNameAlias{bookauthor}{given-family} \DeclareNameAlias{sortname}{given-family} -\renewcommand{\mkbibbooknamegiven}[1]{\textsc{#1}} -\renewcommand{\mkbibbooknamefamily}[1]{\textsc{#1}} -\renewcommand{\mkbibbooknameprefix}[1]{\textsc{#1}} -\renewcommand{\mkbibbooknamesuffix}[1]{\textsc{#1}} -\renewcommand{\mkbibsourcenamegiven}[1]{\textsc{#1}} -\renewcommand{\mkbibsourcenamefamily}[1]{\textsc{#1}} -\renewcommand{\mkbibsourcenameprefix}[1]{\textsc{#1}} -\renewcommand{\mkbibsourcenamesuffix}[1]{\textsc{#1}} -\renewcommand{\mkbiblistnamegiven}[1]{\textsc{#1}} -\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}} -\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}} -\renewcommand{\mkbiblistnamesuffix}[1]{\textsc{#1}} -\renewcommand{\labelnamepunct}{\addcomma\space} -\renewcommand{\booklabelnamepunct}{\addcomma\space} -\renewcommand{\newunitpunct}{\addcomma\space} -\renewcommand{\subtitlepunct}{\addcolon\space} -\renewcommand{\titleseriesdelim}{\addperiod\space} -\renewcommand{\seriespunct}{\addspace} +\renewcommand*{\mkbibbooknamegiven}[1]{\textsc{#1}} +\renewcommand*{\mkbibbooknamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbibbooknameprefix}[1]{\textsc{#1}} +\renewcommand*{\mkbibbooknamesuffix}[1]{\textsc{#1}} +\renewcommand*{\mkbibsourcenamegiven}[1]{\textsc{#1}} +\renewcommand*{\mkbibsourcenamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbibsourcenameprefix}[1]{\textsc{#1}} +\renewcommand*{\mkbibsourcenamesuffix}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnamegiven}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnamesuffix}[1]{\textsc{#1}} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} +\renewcommand*{\newunitpunct}{\addcomma\space} +\renewcommand*{\subtitlepunct}{\addcolon\space} +\renewcommand*{\titleseriesdelim}{\addperiod\space} +\renewcommand*{\seriespunct}{\addspace} \DeclareFieldFormat*{seriesparens}{#1} -\renewcommand{\subnumberseriesdelim}{\newunitpunct} +\renewcommand*{\subnumberseriesdelim}{\newunitpunct} \DeclareFieldFormat*{locationdateparens}{#1} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat*{reprintparens}{\newunitpunct#1} -\DeclareFieldFormat*{realdateparen}{\addcomma\space#1} -\DeclareFieldFormat*{origrealdateparen}{\addcomma\space#1} +\DeclareFieldFormat*{realdateparens}{\addcomma\space#1} +\DeclareFieldFormat*{origrealdateparens}{\addcomma\space#1} \DeclareFieldFormat*{pages}{#1} \DeclareFieldFormat*{volume}{\addspace#1} \DeclareFieldFormat*{url}{#1} -\xpatchbibmacro{thesistype}{bibstring}{biblstring}{}{} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\xpatchbibmacro{thesistype}{bibstring}{biblstring} + {}{Patching bibmacro 'thesistype' failed (1)} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `archa.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.cbx index 26cdc92ccd5..c0fce4f7ea7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.cbx @@ -7,14 +7,15 @@ %% biblatex-archaeology.dtx (with options: `archaCBX,barecitations') %% \ProvidesFile{archa.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{authoryear-archaeology} \def\archaeocitestyletitle{\blxarch@style@archa} \renewcommand{\multicitedelim}{\addperiod\space\textendash\space} \ExecuteBibliographyOptions{autocite=footnote} -\DeclareFieldFormat*{postnote}{#1} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `archa.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.dbx index fa3267242e5..5c92b88250d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/archa.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `archaDBX,DBX') %% \ProvidesFile{archa.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `archa.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-aefkw.lbx index 86aebe56934..95436d411dd 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-aefkw.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-aefkw.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustralianaefkwLBX,PenglishaefkwLBX') %% \ProvidesFile{australian-aefkw.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-aefkw} \InheritBibliographyStrings{english-aefkw} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-archa.lbx index ea4d0184c42..484828b5015 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-archa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-archa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustralianarchaLBX,PenglisharchaLBX') %% \ProvidesFile{australian-archa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archa} \InheritBibliographyStrings{english-archa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-archaeology.lbx index 23a4e78311c..e3fb9df6f32 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-archaeology.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-archaeology.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustralianLBX,PenglishLBX') %% \ProvidesFile{australian-archaeology.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-dguf-alt.lbx index 8b79399df0a..09f444e5f10 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-dguf-alt.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-dguf-alt.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustraliandgufaltLBX,PenglishLBX') %% \ProvidesFile{australian-dguf-alt.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-dguf-apa.lbx index 155b802e6a0..b063524e84a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-dguf-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-dguf-apa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustraliandgufapaLBX,PenglishdgufapaLBX') %% \ProvidesFile{australian-dguf-apa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-dguf-apa} \InheritBibliographyStrings{english-dguf-apa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-eaz.lbx index 19369a50542..f6da9218179 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-eaz.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-eaz.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustralianeazLBX,PenglisheazLBX') %% \ProvidesFile{australian-eaz.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-eaz} \InheritBibliographyStrings{english-eaz} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-foe.lbx index e231460a9c1..6d27569db8b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-foe.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-foe.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustralianfoeLBX,PenglishfoeLBX') %% \ProvidesFile{australian-foe.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-foe} \InheritBibliographyStrings{english-foe} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-jb-kreis-neuss.lbx index 13bad2e2eb1..bc4dbdb63ff 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-jb-kreis-neuss.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-jb-kreis-neuss.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustralianjbkreisneussLBX,PenglishjbkreisneussLBX') %% \ProvidesFile{australian-jb-kreis-neuss.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-jb-kreis-neuss} \InheritBibliographyStrings{english-jb-kreis-neuss} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-karl.lbx index ce397513486..64490502527 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-karl.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-karl.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustraliankarlLBX,PenglishLBX') %% \ProvidesFile{australian-karl.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-maja.lbx index a80e36ce553..888b4add715 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-maja.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-maja.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustralianmajaLBX,PenglishLBX') %% \ProvidesFile{australian-maja.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-mpk.lbx index 95f57b66540..cc35d123b35 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-mpk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-mpk.lbx @@ -7,9 +7,26 @@ %% biblatex-archaeology.dtx (with options: `FaustralianmpkLBX,PenglishmpkLBX') %% \ProvidesFile{australian-mpk.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-mpk} -\InheritBibliographyStrings{english-mpk} +\InheritBibliographyExtras{english-archaeology} +\DeclareBibliographyStrings{% + inherit = {english-archaeology}, + unpublishedbathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublisheddiplomathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedmagisterthesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedmathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedphdthesis = {{unpublished PhD Dissertation} + {unpublished PhD Dissertation}}, + unpublishedpostdocthesis = {{unpublished Habilitationsschrift} + {unpublished Habilitationsschrift}}, + urlseen = {{last access}{last access}}, +} \endinput %% %% End of file `australian-mpk.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-mpkoeaw.lbx new file mode 100644 index 00000000000..79b88b5556a --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-mpkoeaw.lbx @@ -0,0 +1,16 @@ +%% +%% This is file `australian-mpkoeaw.lbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `FaustralianmpkoeawLBX,PenglishmpkoeawLBX') +%% +\ProvidesFile{australian-mpkoeaw.lbx} +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes +\InheritBibliographyExtras{english-mpkoeaw} +\InheritBibliographyStrings{english-mpkoeaw} +\endinput +%% +%% End of file `australian-mpkoeaw.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-offa.lbx index 24cc30b9fa7..832e517469f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-offa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-offa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustralianoffaLBX,PenglishoffaLBX') %% \ProvidesFile{australian-offa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-offa} \InheritBibliographyStrings{english-offa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-rgzm.lbx index 5fdbfa15492..0b3ca1b8aa5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-rgzm.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-rgzm.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustralianrgzmLBX,PenglishLBX') %% \ProvidesFile{australian-rgzm.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-zaak.lbx index e63c7ccbb02..5031c396f43 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-zaak.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-zaak.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustralianzaakLBX,PenglishzaakLBX') %% \ProvidesFile{australian-zaak.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-zaak} \InheritBibliographyStrings{english-zaak} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-zaes.lbx index 9409ba03f8b..274c9027a72 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-zaes.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/australian-zaes.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustralianzaesLBX,PenglishzaesLBX') %% \ProvidesFile{australian-zaes.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-zaes} \InheritBibliographyStrings{english-zaes} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-aefkw.lbx index 81c9c4f49f8..7e48d41d09e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-aefkw.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-aefkw.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustrianaefkwLBX,PgermanaefkwLBX') %% \ProvidesFile{austrian-aefkw.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-aefkw} \InheritBibliographyStrings{german-aefkw} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-archa.lbx index d140e99f08c..de0067e80f8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-archa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-archa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustrianarchaLBX,PgermanarchaLBX') %% \ProvidesFile{austrian-archa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archa} \InheritBibliographyStrings{german-archa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-archaeology.lbx index 22651f96277..5d36d09c81c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-archaeology.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-archaeology.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustrianLBX,PgermanLBX') %% \ProvidesFile{austrian-archaeology.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} \InheritBibliographyStrings{german-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-dguf-alt.lbx index 88350e7c8a1..951034ebe15 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-dguf-alt.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-dguf-alt.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustriandgufaltLBX,PgermandgufaltLBX') %% \ProvidesFile{austrian-dguf-alt.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-dguf-alt} \InheritBibliographyStrings{german-dguf-alt} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-dguf-apa.lbx index 6b9edc8eb94..fca4d9724c8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-dguf-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-dguf-apa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustriandgufapaLBX,PgermanLBX') %% \ProvidesFile{austrian-dguf-apa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} \InheritBibliographyStrings{german-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-eaz.lbx index 954b81c749a..f3cf7f63942 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-eaz.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-eaz.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustrianeazLBX,PgermaneazLBX') %% \ProvidesFile{austrian-eaz.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-eaz} \InheritBibliographyStrings{german-eaz} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-foe.lbx index 3a79edd25d4..575a36fe8dd 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-foe.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-foe.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustrianfoeLBX,PgermanfoeLBX') %% \ProvidesFile{austrian-foe.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-foe} \InheritBibliographyStrings{german-foe} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-jb-kreis-neuss.lbx index 0fcab7d9e4b..85f57d74c92 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-jb-kreis-neuss.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-jb-kreis-neuss.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustrianjbkreisneussLBX,PgermanjbkreisneussLBX') %% \ProvidesFile{austrian-jb-kreis-neuss.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-jb-kreis-neuss} \InheritBibliographyStrings{german-jb-kreis-neuss} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-karl.lbx index 3b63bb42f1e..10c00bafd79 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-karl.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-karl.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustriankarlLBX,PgermankarlLBX') %% \ProvidesFile{austrian-karl.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-karl} \InheritBibliographyStrings{german-karl} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-maja.lbx index 1d2502e22d2..6121d6ce1dc 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-maja.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-maja.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustrianmajaLBX,PgermanmajaLBX') %% \ProvidesFile{austrian-maja.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-maja} \InheritBibliographyStrings{german-maja} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-mpk.lbx index 44cb53dc71e..cc72ca15180 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-mpk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-mpk.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustrianmpkLBX,PgermanmpkLBX') %% \ProvidesFile{austrian-mpk.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-mpk} \InheritBibliographyStrings{german-mpk} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-mpkoeaw.lbx new file mode 100644 index 00000000000..eb31d20b92c --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-mpkoeaw.lbx @@ -0,0 +1,16 @@ +%% +%% This is file `austrian-mpkoeaw.lbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `FaustrianmpkoeawLBX,PgermanmpkoeawLBX') +%% +\ProvidesFile{austrian-mpkoeaw.lbx} +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes +\InheritBibliographyExtras{german-mpkoeaw} + +\endinput +%% +%% End of file `austrian-mpkoeaw.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-offa.lbx index 5eeb841ce00..088bbbf8608 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-offa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-offa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustrianoffaLBX,PgermanoffaLBX') %% \ProvidesFile{austrian-offa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-offa} \InheritBibliographyStrings{german-offa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-rgzm.lbx index 277e032aeba..5963f44351e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-rgzm.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-rgzm.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustrianrgzmLBX,PgermanrgzmLBX') %% \ProvidesFile{austrian-rgzm.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-rgzm} \InheritBibliographyStrings{german-rgzm} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-zaak.lbx index 86db0e11807..105e8c0a596 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-zaak.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-zaak.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustrianzaakLBX,PgermanzaakLBX') %% \ProvidesFile{austrian-zaak.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-zaak} \InheritBibliographyStrings{german-zaak} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-zaes.lbx index 18efd824523..d5b0f825fe5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-zaes.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/austrian-zaes.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FaustrianzaesLBX,PgermanzaesLBX') %% \ProvidesFile{austrian-zaes.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-zaes} \InheritBibliographyStrings{german-zaes} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.bbx index 5408f731391..b8b0c610ff5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `authoryearBBX,authoryearsharedBBX') %% \ProvidesFile{authoryear-archaeology.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \def\archaeobibstyletitle{\blxarch@style@ay} \RequireBibliographyStyle{authoryear} \def\blxarch@fork@authordate{} @@ -20,8 +20,10 @@ \def\blxarch@settabbedlabeldate#1{% \xpatchbibdriver{#1}{\setunit{\printdelim{nametitledelim}}\newblock} {\setunit{\printdelim{nametitledelim}}% - \iftabbedlabeldate{&}{\newblock}}{}{} - \xapptobibdriver{#1}{\end{tabbedlabeldate}}{}{} + \iftabbedlabeldate{&}{\newblock}} +{}{Patching driver '#1' failed (a)} + \xapptobibdriver{#1}{\end{tabbedlabeldate}} +{}{Patching driver '#1' failed (b)} } \blxarch@settabbedlabeldate{article} \blxarch@settabbedlabeldate{book} @@ -31,8 +33,39 @@ \blxarch@settabbedlabeldate{periodical} \blxarch@settabbedlabeldate{thesis} \blxarch@settabbedlabeldate{unpublished} -\xpatchbibdriver{inreference}{{finentry}}{{finentry}\end{tabbedlabeldate}}{}{} +\xpatchbibdriver{inreference}{{finentry}}{{finentry}\end{tabbedlabeldate}} + {}{Patching driver 'inreference' failed (1)} \DeclareNameAlias{sortname}{family-given/given-family} +\xpretobibmacro{begentry}{% + \csuse{blxarch@issuedate}% +}{}{Patching bibmacro 'begentry' failed (1)} +\xpretobibmacro{finentry}{% + \restorebibmacro{issue+date}% +}{}{Patching bibmacro 'finentry' failed (2)} +\xpatchbibmacro{author}{\printnames{author}}{% + \ifidemincitation + {\printtext{% + \bibstring{idem\thefield{gender}}}} + {\usebibmacro{sortnamelist}{author}}} +{}{Patching bibmacro 'author' failed (1)} +\xpatchbibmacro{author}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}} + {}{Patching bibmacro 'author' failed (2)} +\xpatchbibmacro{bbx:editor}{\printnames{editor}}{% + \ifidemincitation + {\printtext{% + \bibstring{idem\thefield{gender}}}} + {\usebibmacro{sortnamelist}{editor}}} +{}{Patching bibmacro 'bbx:editor' failed (1)} +\xpatchbibmacro{bbx:translator}{\printnames{translator}}{% + \ifidemincitation + {\printtext{% + \bibstring{idem\thefield{gender}}}} + {\usebibmacro{sortnamelist}{translator}}} +{}{Patching bibmacro 'bbx:translator' failed} +\xpatchbibmacro{bbx:editor}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}} + {}{Patching bibmacro 'bbx:editor' failed (2)} +\xpatchbibmacro{bbx:translator}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}} + {}{Patching bibmacro 'bbx:translator' failed} \endinput %% %% End of file `authoryear-archaeology.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.cbx index da66608e602..4bc09912fb9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.cbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `authoryearCBX,noshortform') %% \ProvidesFile{authoryear-archaeology.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \def\archaeocitestyletitle{\blxarch@style@ay} \RequireCitationStyle{authoryear} \let\shortformcite\autocite diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.dbx index db7cc5db8e4..f5c7280a98f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-archaeology.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `authoryearDBX,DBX') %% \ProvidesFile{authoryear-archaeology.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `authoryear-archaeology.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.bbx index 589f561cd30..6dbfbd2804f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `authoryearcompBBX,authoryearsharedBBX') %% \ProvidesFile{authoryear-comp-archaeology.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-comp} \def\archaeobibstyletitle{\blxarch@style@ayc} \def\blxarch@fork@authordate{} @@ -20,8 +20,10 @@ \def\blxarch@settabbedlabeldate#1{% \xpatchbibdriver{#1}{\setunit{\printdelim{nametitledelim}}\newblock} {\setunit{\printdelim{nametitledelim}}% - \iftabbedlabeldate{&}{\newblock}}{}{} - \xapptobibdriver{#1}{\end{tabbedlabeldate}}{}{} + \iftabbedlabeldate{&}{\newblock}} +{}{Patching driver '#1' failed (a)} + \xapptobibdriver{#1}{\end{tabbedlabeldate}} +{}{Patching driver '#1' failed (b)} } \blxarch@settabbedlabeldate{article} \blxarch@settabbedlabeldate{book} @@ -31,8 +33,39 @@ \blxarch@settabbedlabeldate{periodical} \blxarch@settabbedlabeldate{thesis} \blxarch@settabbedlabeldate{unpublished} -\xpatchbibdriver{inreference}{{finentry}}{{finentry}\end{tabbedlabeldate}}{}{} +\xpatchbibdriver{inreference}{{finentry}}{{finentry}\end{tabbedlabeldate}} + {}{Patching driver 'inreference' failed (1)} \DeclareNameAlias{sortname}{family-given/given-family} +\xpretobibmacro{begentry}{% + \csuse{blxarch@issuedate}% +}{}{Patching bibmacro 'begentry' failed (1)} +\xpretobibmacro{finentry}{% + \restorebibmacro{issue+date}% +}{}{Patching bibmacro 'finentry' failed (2)} +\xpatchbibmacro{author}{\printnames{author}}{% + \ifidemincitation + {\printtext{% + \bibstring{idem\thefield{gender}}}} + {\usebibmacro{sortnamelist}{author}}} +{}{Patching bibmacro 'author' failed (1)} +\xpatchbibmacro{author}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}} + {}{Patching bibmacro 'author' failed (2)} +\xpatchbibmacro{bbx:editor}{\printnames{editor}}{% + \ifidemincitation + {\printtext{% + \bibstring{idem\thefield{gender}}}} + {\usebibmacro{sortnamelist}{editor}}} +{}{Patching bibmacro 'bbx:editor' failed (1)} +\xpatchbibmacro{bbx:translator}{\printnames{translator}}{% + \ifidemincitation + {\printtext{% + \bibstring{idem\thefield{gender}}}} + {\usebibmacro{sortnamelist}{translator}}} +{}{Patching bibmacro 'bbx:translator' failed} +\xpatchbibmacro{bbx:editor}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}} + {}{Patching bibmacro 'bbx:editor' failed (2)} +\xpatchbibmacro{bbx:translator}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}} + {}{Patching bibmacro 'bbx:translator' failed} \endinput %% %% End of file `authoryear-comp-archaeology.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.cbx index 973a65f0a39..e805b3d40fe 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.cbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `authoryearcompCBX,noshortform') %% \ProvidesFile{authoryear-comp-archaeology.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \def\archaeocitestyletitle{\blxarch@style@ayc} \RequireCitationStyle{authoryear-comp} \let\shortformcite\autocite diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.dbx index bb03a0702b8..cc4afc33629 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-comp-archaeology.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `authoryearcompDBX,DBX') %% \ProvidesFile{authoryear-comp-archaeology.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `authoryear-comp-archaeology.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-ibid-archaeology.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-ibid-archaeology.bbx index 33406678898..6d2660bc0d8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-ibid-archaeology.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-ibid-archaeology.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `authoryearibidBBX,authoryearsharedBBX') %% \ProvidesFile{authoryear-ibid-archaeology.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-ibid} \def\archaeobibstyletitle{\blxarch@style@ayi} \def\blxarch@fork@authordate{} @@ -20,8 +20,10 @@ \def\blxarch@settabbedlabeldate#1{% \xpatchbibdriver{#1}{\setunit{\printdelim{nametitledelim}}\newblock} {\setunit{\printdelim{nametitledelim}}% - \iftabbedlabeldate{&}{\newblock}}{}{} - \xapptobibdriver{#1}{\end{tabbedlabeldate}}{}{} + \iftabbedlabeldate{&}{\newblock}} +{}{Patching driver '#1' failed (a)} + \xapptobibdriver{#1}{\end{tabbedlabeldate}} +{}{Patching driver '#1' failed (b)} } \blxarch@settabbedlabeldate{article} \blxarch@settabbedlabeldate{book} @@ -31,8 +33,39 @@ \blxarch@settabbedlabeldate{periodical} \blxarch@settabbedlabeldate{thesis} \blxarch@settabbedlabeldate{unpublished} -\xpatchbibdriver{inreference}{{finentry}}{{finentry}\end{tabbedlabeldate}}{}{} +\xpatchbibdriver{inreference}{{finentry}}{{finentry}\end{tabbedlabeldate}} + {}{Patching driver 'inreference' failed (1)} \DeclareNameAlias{sortname}{family-given/given-family} +\xpretobibmacro{begentry}{% + \csuse{blxarch@issuedate}% +}{}{Patching bibmacro 'begentry' failed (1)} +\xpretobibmacro{finentry}{% + \restorebibmacro{issue+date}% +}{}{Patching bibmacro 'finentry' failed (2)} +\xpatchbibmacro{author}{\printnames{author}}{% + \ifidemincitation + {\printtext{% + \bibstring{idem\thefield{gender}}}} + {\usebibmacro{sortnamelist}{author}}} +{}{Patching bibmacro 'author' failed (1)} +\xpatchbibmacro{author}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}} + {}{Patching bibmacro 'author' failed (2)} +\xpatchbibmacro{bbx:editor}{\printnames{editor}}{% + \ifidemincitation + {\printtext{% + \bibstring{idem\thefield{gender}}}} + {\usebibmacro{sortnamelist}{editor}}} +{}{Patching bibmacro 'bbx:editor' failed (1)} +\xpatchbibmacro{bbx:translator}{\printnames{translator}}{% + \ifidemincitation + {\printtext{% + \bibstring{idem\thefield{gender}}}} + {\usebibmacro{sortnamelist}{translator}}} +{}{Patching bibmacro 'bbx:translator' failed} +\xpatchbibmacro{bbx:editor}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}} + {}{Patching bibmacro 'bbx:editor' failed (2)} +\xpatchbibmacro{bbx:translator}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}} + {}{Patching bibmacro 'bbx:translator' failed} \endinput %% %% End of file `authoryear-ibid-archaeology.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-ibid-archaeology.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-ibid-archaeology.dbx index 60aceb7ea33..bef469b15a0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-ibid-archaeology.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-ibid-archaeology.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `authoryearibidDBX,DBX') %% \ProvidesFile{authoryear-ibid-archaeology.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `authoryear-ibid-archaeology.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.bbx index fe25c6f6480..701b92c46f4 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `authoryearicompBBX,authoryearsharedBBX') %% \ProvidesFile{authoryear-icomp-archaeology.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-icomp} \def\archaeobibstyletitle{\blxarch@style@ayic} \def\blxarch@fork@authordate{} @@ -20,8 +20,10 @@ \def\blxarch@settabbedlabeldate#1{% \xpatchbibdriver{#1}{\setunit{\printdelim{nametitledelim}}\newblock} {\setunit{\printdelim{nametitledelim}}% - \iftabbedlabeldate{&}{\newblock}}{}{} - \xapptobibdriver{#1}{\end{tabbedlabeldate}}{}{} + \iftabbedlabeldate{&}{\newblock}} +{}{Patching driver '#1' failed (a)} + \xapptobibdriver{#1}{\end{tabbedlabeldate}} +{}{Patching driver '#1' failed (b)} } \blxarch@settabbedlabeldate{article} \blxarch@settabbedlabeldate{book} @@ -31,8 +33,39 @@ \blxarch@settabbedlabeldate{periodical} \blxarch@settabbedlabeldate{thesis} \blxarch@settabbedlabeldate{unpublished} -\xpatchbibdriver{inreference}{{finentry}}{{finentry}\end{tabbedlabeldate}}{}{} +\xpatchbibdriver{inreference}{{finentry}}{{finentry}\end{tabbedlabeldate}} + {}{Patching driver 'inreference' failed (1)} \DeclareNameAlias{sortname}{family-given/given-family} +\xpretobibmacro{begentry}{% + \csuse{blxarch@issuedate}% +}{}{Patching bibmacro 'begentry' failed (1)} +\xpretobibmacro{finentry}{% + \restorebibmacro{issue+date}% +}{}{Patching bibmacro 'finentry' failed (2)} +\xpatchbibmacro{author}{\printnames{author}}{% + \ifidemincitation + {\printtext{% + \bibstring{idem\thefield{gender}}}} + {\usebibmacro{sortnamelist}{author}}} +{}{Patching bibmacro 'author' failed (1)} +\xpatchbibmacro{author}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}} + {}{Patching bibmacro 'author' failed (2)} +\xpatchbibmacro{bbx:editor}{\printnames{editor}}{% + \ifidemincitation + {\printtext{% + \bibstring{idem\thefield{gender}}}} + {\usebibmacro{sortnamelist}{editor}}} +{}{Patching bibmacro 'bbx:editor' failed (1)} +\xpatchbibmacro{bbx:translator}{\printnames{translator}}{% + \ifidemincitation + {\printtext{% + \bibstring{idem\thefield{gender}}}} + {\usebibmacro{sortnamelist}{translator}}} +{}{Patching bibmacro 'bbx:translator' failed} +\xpatchbibmacro{bbx:editor}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}} + {}{Patching bibmacro 'bbx:editor' failed (2)} +\xpatchbibmacro{bbx:translator}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}} + {}{Patching bibmacro 'bbx:translator' failed} \endinput %% %% End of file `authoryear-icomp-archaeology.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.cbx index ff4a3e96dd0..1ee7642ae07 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.cbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `authoryearicompCBX,noshortform') %% \ProvidesFile{authoryear-icomp-archaeology.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \def\archaeocitestyletitle{\blxarch@style@ayic} \RequireCitationStyle{authoryear-icomp} \let\shortformcite\autocite diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.dbx index 9cfc0448cc6..4a3febc5840 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/authoryear-icomp-archaeology.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `authoryearicompDBX,DBX') %% \ProvidesFile{authoryear-icomp-archaeology.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `authoryear-icomp-archaeology.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/biblatex-archaeology.sty b/Master/texmf-dist/tex/latex/biblatex-archaeology/biblatex-archaeology.sty index d16c94d8d8d..0b5cf70a461 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/biblatex-archaeology.sty +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/biblatex-archaeology.sty @@ -46,6 +46,14 @@ \edef\blxarch@shortform@value{true}} \def\blxarch@shortform@errstr#1{% Invalid value of #1} +\def\blxarch@opt@repeatlabel@dashed{% + \edef\blxarch@repeatlabel@value{dashed}} +\def\blxarch@opt@repeatlabel@false{% + \edef\blxarch@repeatlabel@value{false}} +\def\blxarch@opt@repeatlabel@true{% + \edef\blxarch@repeatlabel@value{true}} +\def\blxarch@repeatlabel@errstr#1{% + Invalid value of #1} \def\blxarch@opt@editionsuperscript@none{% \edef\blxarch@editionsuperscript@value{none}} \def\blxarch@opt@editionsuperscript@predate{% @@ -94,7 +102,7 @@ \def\blxarch@giveninitialletters#1{% \fullexpandarg% \StrLeft{#1}{1}[\blxarch@str]% - \renewcommand{\do}[1]{% + \renewcommand*{\do}[1]{% \IfBeginWith{#1}{##1} {\def\blxarch@str{##1}\listbreak} {}% @@ -139,22 +147,23 @@ {} {\ifthenelse{\blxarch@posbuffer<\blxarch@namefirstsepposition}{% \let\blxarch@namefirstsepposition\blxarch@posbuffer% - \renewcommand{\blxarch@namefirstsep}{#1}} + \renewcommand*{\blxarch@namefirstsep}{#1}} {}}% } \def\blxarch@namefirstsep{} \def\blxarch@namefirstdelim{\bibinitperiod\bibinitdelim} \ProvidesPackage{biblatex-archaeology} -[2017/11/16 v1.3 biblatex-archaeology (Ingram Braun) based on biblatex] +[2018/06/10 v2.0 biblatex-archaeology (Ingram Braun) based on biblatex] \RequirePackage{xpatch} \RequireBiber[3] -\@ifpackagelater{biblatex}{2017/11/05} +\@ifpackagelater{biblatex}{2018/03/04} {} {\blxarch@errmsg{too old\MessageBreak biblatex version - update required}} \DeclareLanguageMappingSuffix{-archaeology} \ExecuteBibliographyOptions{ abbreviate=true, % abbreviates bibstrings arxiv=pdf, % although I've never seen an arXiv link we point them to PDFs. + autopunct=true, % wether cite commands should scan ahead for punctuation autolang=hyphen, % language-dependent hyphenation rules backref=false, % wether to print back references in the bilbiography block=none, % no extra spacing between blocks @@ -210,7 +219,9 @@ realdate=ymd, } \DeclareDriverSourcemap[datatype=bibtex]{ - \map[overwrite]{ + \map[ + overwrite + ]{ \pertype{thesis} \step[ fieldsource=type, @@ -219,7 +230,44 @@ fieldvalue=phdthesis, ] } - \map[overwrite]{ + \map[ + overwrite=true, + foreach={titleaddon,booktitleaddon,maintitleaddon}, + ]{ +\pernottype{article} + \pernottype{review} + \pernottype{reference} + \pernottype{inreference} + \pernottype{mvreference} + \pernottype{thesis} + \step[ + fieldsource=\regexp{$MAPLOOP}, + match=\regexp{[Ee]xhibi[ct]|[Aa]usstellung|[Uu][dt]st[iä]ll[n]ing|[Tt]entoonstelling|[Ee][xs]posi[cçtz]}, + fieldset=eventtype, + fieldvalue=exhibition, + append=true, + notfield=eventtype, + ] + \step[ + fieldsource=\regexp{$MAPLOOP}, + match=\regexp{[KkCc]onf[eé]ren[cstz]|[Ss]ymposi|[KkCc]ol{1,2}[oó]qu|[KkCc]onvent|[Mm]eeting|}, + fieldset=eventtype, + fieldvalue=conference, + append=true, + notfield=eventtype, + ] + \step[ + fieldsource=\regexp{$MAPLOOP}, + match=\regexp{[Aa]u[ck]tion|Versteigerung|\b[Ee]nchère|[Vv]eiling|[Ss]ubasta|[Ll]eil(ões|ão)}, + fieldset=eventtype, + fieldvalue=auction, + append=true, + notfield=eventtype, + ] + } + \map[ + overwrite + ]{ \step[ fieldsource=eventtype, match=\regexp{[Aa]u[ck]tion}, @@ -231,7 +279,43 @@ origfieldval=true, ] } + \map[ + overwrite + ]{ + \step[ + fieldsource=date+an, + match=\regexp{\battributed\b}, % find all date+an field that match "attributed" (<field>+an are csv) + final=true, % do not add entries in further steps + ] + \step[ + fieldsource=date, + fieldtarget=realdate, + ] + } + \map[ + overwrite + ]{ + \step[ + fieldsource=year, + match=\regexp{\A\[.+\]\Z}, + fieldtarget=realdate, + ] + \step[ + fieldsource=date, + match=\regexp{\A\[.+\]\Z}, + fieldtarget=realdate, + ] + } \map[overwrite]{ + \step[ + fieldsource=realdate, + match=\regexp{\A\[(.+)\]\Z}, + replace={$1}, + ] + } + \map[ + overwrite + ]{ \pertype{article} \pertype{periodical} \pertype{suppperiodical} @@ -247,21 +331,28 @@ origfieldval=true, ] } - \map[overwrite]{ + \map[ + overwrite + ]{ \step[ fieldsource=edition, match=\regexp{(\d+)}, replace={$1}, ] } - \map[overwrite, foreach={location, multivenue}]{ + \map[ + overwrite, + foreach={location, multivenue} + ]{ \step[ fieldsource=\regexp{$MAPLOOP}, match={\blxarch@regex@location@match}, replace={\blxarch@regex@location@replace}, ] } - \map[overwrite]{ + \map[ + overwrite + ]{ \step[ fieldsource=venue, match={\blxarch@regex@location@match}, @@ -379,34 +470,35 @@ \DeclareBibliographyAlias{reference}{book} \DeclareBibliographyAlias{report}{book} \DeclareBibliographyAlias{patent}{book} -\renewcommand{\mkbibacro}[1]{\MakeLowercase{#1}} +\renewcommand*{\mkbibacro}[1]{\MakeLowercase{#1}} \renewbibmacro*{doi+eprint+url}{% \printfield{doi}% \newunit\newblock% \usebibmacro{eprint}% \newunit\newblock% \usebibmacro{url+urldate}} -\newcommand{\mkbibletterspacing}[1]{\ifcsdef{textls}{\textls{#1}}{#1}} -\renewcommand{\mkbibnamegiven}[1]{#1} -\renewcommand{\mkbibnamefamily}[1]{\textsc{#1}} -\renewcommand{\mkbibnameprefix}[1]{\textsc{#1}} -\renewcommand{\mkbibnamesuffix}[1]{#1} -\newcommand{\mkbibrepeatgiven}[1]{#1} -\newcommand{\mkbibrepeatfamily}[1]{\textsc{#1}} -\newcommand{\mkbibrepeatprefix}[1]{\textsc{#1}} -\newcommand{\mkbibrepeatsuffix}[1]{#1} -\newcommand{\mkbibbooknamegiven}[1]{#1} -\newcommand{\mkbibbooknamefamily}[1]{#1} -\newcommand{\mkbibbooknameprefix}[1]{#1} -\newcommand{\mkbibbooknamesuffix}[1]{#1} -\newcommand{\mkbibsourcenamegiven}[1]{#1} -\newcommand{\mkbibsourcenamefamily}[1]{#1} -\newcommand{\mkbibsourcenameprefix}[1]{#1} -\newcommand{\mkbibsourcenamesuffix}[1]{#1} -\newcommand{\mkbiblistnamegiven}[1]{#1} -\newcommand{\mkbiblistnamefamily}[1]{#1} -\newcommand{\mkbiblistnameprefix}[1]{#1} -\newcommand{\mkbiblistnamesuffix}[1]{#1} +\newcommand*{\mkbibletterspacing}[1]{\textls{#1}} +\providecommand*{\textls}[1]{\textsc{#1}} +\renewcommand*{\mkbibnamegiven}[1]{#1} +\renewcommand*{\mkbibnamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}} +\renewcommand*{\mkbibnamesuffix}[1]{#1} +\newcommand*{\mkbibrepeatgiven}[1]{#1} +\newcommand*{\mkbibrepeatfamily}[1]{\textsc{#1}} +\newcommand*{\mkbibrepeatprefix}[1]{\textsc{#1}} +\newcommand*{\mkbibrepeatsuffix}[1]{#1} +\newcommand*{\mkbibbooknamegiven}[1]{#1} +\newcommand*{\mkbibbooknamefamily}[1]{#1} +\newcommand*{\mkbibbooknameprefix}[1]{#1} +\newcommand*{\mkbibbooknamesuffix}[1]{#1} +\newcommand*{\mkbibsourcenamegiven}[1]{#1} +\newcommand*{\mkbibsourcenamefamily}[1]{#1} +\newcommand*{\mkbibsourcenameprefix}[1]{#1} +\newcommand*{\mkbibsourcenamesuffix}[1]{#1} +\newcommand*{\mkbiblistnamegiven}[1]{#1} +\newcommand*{\mkbiblistnamefamily}[1]{#1} +\newcommand*{\mkbiblistnameprefix}[1]{#1} +\newcommand*{\mkbiblistnamesuffix}[1]{#1} \newcommand{\ifshortform}[3]{% \ifdefstring{\blxarch@shortform@value}{#1} {#2} @@ -452,7 +544,7 @@ } \DeclareMultiCiteCommand{\shortformcites}[\mkbibfootnote] {\shortformcite}{\multicitedelim} -\newcommand{\nameshortformdelim}{\usebibmacro{in:}} +\newcommand*{\nameshortformdelim}{\usebibmacro{in:}} \DeclareBibliographyDriver{inreference}{% \ifshortform{true} {\usebibmacro{bibindex}% @@ -488,55 +580,73 @@ \usebibmacro{finentry}} {\usedriver{}{inbook}\usebibmacro{finentry}}% } -\newtoggle{archbool:repeatlabel} -\DeclareBibliographyOption{repeatlabel}[true]{% - \settoggle{archbool:repeatlabel}{#1}} +\newcommand{\ifrepeatlabel}[3]{% + \ifbibliography + {\ifdefstring{\blxarch@repeatlabel@value}{#1} + {#2} + {\ifcsdef{blxarch@opt@repeatlabel@#1} + {#3} + {\blxarch@errmsg{\blxarch@repeatlabel@errstr{\unexpanded{\ifrepeatlabel}}}}}}% + {\ifstrequal{false}{#1} + {#2} + {\ifcsdef{blxarch@opt@repeatlabel@#1} + {#3} + {\blxarch@errmsg{\blxarch@repeatlabel@errstr{\unexpanded{\ifrepeatlabel}}}}}}% +} +\DeclareBibliographyOption[string]{repeatlabel}[true]{% + \ifcsdef{blxarch@opt@repeatlabel@#1} + {\csuse{blxarch@opt@repeatlabel@#1}}% + {\blxarch@errmsg{\blxarch@repeatlabel@errstr{option 'repeatlabel'}}}} \ExecuteBibliographyOptions{repeatlabel} -\newcommand{\ifrepeatlabel}[2]{% - \ifboolexpr{ - togl {archbool:repeatlabel} - and - test {\ifbibliography} - } - {#1} - {#2}} -\newcommand{\repeatlabelwrap}[1]{#1} -\newcommand{\repeatlabeldelim}{\newline} +\newcommand*{\repeatlabeldash}{--\addspace} +\DeclareFieldFormat*{repeatlabel}{#1} +\newcommand*{\repeatlabeldelim}{\newline} \newbibmacro*{repeatlabel}{% - \repeatlabelwrap{% - \let\blxarch@buffer@repeatfamily\mkbibnamefamily - \let\blxarch@buffer@repeatprefix\mkbibnameprefix - \let\blxarch@buffer@repeatgiven\mkbibnamegiven - \let\blxarch@buffer@repeatsuffix\mkbibnamesuffix - \let\mkbibnamefamily\mkbibrepeatfamily - \let\mkbibnameprefix\mkbibrepeatprefix - \let\mkbibnamegiven\mkbibrepeatgiven - \let\mkbibnamesuffix\mkbibrepeatsuffix - \let\blxarch@buffer@repeatnames\c@minnames - \let\blxarch@buffer@maxnames\c@maxnames - \let\blxarch@buffer@minnames\c@minnames - \let\c@maxnames\blx@maxcitenames - \let\c@minnames\blx@mincitenames - \ifhyperref - {\let\bibhyperref\@empty} - {}% + \let\blxarch@buffer@repeatfamily\mkbibnamefamily% + \let\blxarch@buffer@repeatprefix\mkbibnameprefix% + \let\blxarch@buffer@repeatgiven\mkbibnamegiven% + \let\blxarch@buffer@repeatsuffix\mkbibnamesuffix% + \let\mkbibnamefamily\mkbibrepeatfamily% + \let\mkbibnameprefix\mkbibrepeatprefix% + \let\mkbibnamegiven\mkbibrepeatgiven% + \let\mkbibnamesuffix\mkbibrepeatsuffix% + \let\blxarch@buffer@repeatnames\c@minnames% + \let\blxarch@buffer@maxnames\c@maxnames% + \let\blxarch@buffer@minnames\c@minnames% + \let\c@maxnames\blx@maxcitenames% + \let\c@minnames\blx@mincitenames% + \ifhyperref + {\let\bibhyperref\@empty} + {}% + \printtext[repeatlabel]{% \iffieldundef{shorthand} - {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}} - {\usebibmacro{cite:label}% - \setunit{\printdelim{nonameyeardelim}}} - {\printnames{labelname}% - \setunit{\printdelim{nameyeardelim}}}% - \ifeditionsuperscript{prelabel}{\usebibmacro{editionsuperscript}}{}% - \usebibmacro{cite:labeldate+extradate}% - \ifeditionsuperscript{prelabel}{\usebibmacro{editionsuperscript}}{}}% + {\ifboolexpr{ + test {\ifrepeatlabel{dashed}} + and + test {\iffieldequalcs{namehash}{blxarch@field@namehash}}} + {\printtext{\repeatlabeldash}% + \ifeditionsuperscript{prelabel}{\usebibmacro{editionsuperscript}}{}% + \usebibmacro{cite:labeldate+extradate}% + \ifeditionsuperscript{postlabel}{\usebibmacro{editionsuperscript}}{}} + {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}} + {\usebibmacro{cite:label}% + \setunit{\printdelim{nonameyeardelim}}} + {\printnames{labelname}% + \setunit{\printdelim{nameyeardelim}}}% + \ifeditionsuperscript{prelabel}{\usebibmacro{editionsuperscript}}{}% + \usebibmacro{cite:labeldate+extradate}% + \ifeditionsuperscript{postlabel}{\usebibmacro{editionsuperscript}}{}}}% {\usebibmacro{cite:shorthand}}% - \ifhyperref{\let\bibhyperref\blxarch@buffer@hyperref}{}% - \let\c@maxnames\blxarch@buffer@maxnames - \let\c@minnames\blxarch@buffer@minnames - \let\mkbibnamefamily\blxarch@buffer@repeatfamily - \let\mkbibnameprefix\blxarch@buffer@repeatprefix - \let\mkbibnamegiven\blxarch@buffer@repeatgiven - \let\mkbibnamesuffix\blxarch@buffer@repeatsuffix}}% + }% + \ifhyperref{\let\bibhyperref\blxarch@buffer@hyperref}{}% + \let\c@maxnames\blxarch@buffer@maxnames% + \let\c@minnames\blxarch@buffer@minnames% + \let\mkbibnamefamily\blxarch@buffer@repeatfamily% + \let\mkbibnameprefix\blxarch@buffer@repeatprefix% + \let\mkbibnamegiven\blxarch@buffer@repeatgiven% + \let\mkbibnamesuffix\blxarch@buffer@repeatsuffix% + \savefield{namehash}{\blxarch@field@namehash}% +} \renewbibmacro*{begentry}{% \ifboolexpr{ togl {archbool:noseries} @@ -553,14 +663,14 @@ and not test {\iffieldundef{shortform}} } - {\savefield{shortform}{\blxarch@field@shortform}% + {\savefield*{shortform}{\blxarch@field@shortform}% \restorefield{booktitle}{\blxarch@field@shortform}% \clearfield{booksubtitle}% \clearfield{booktitleaddon}} {}% \iffieldundef{volume} {} - {\savefield{volume}{\blxarch@field@volume}% + {\savefield*{volume}{\blxarch@field@volume}% \restorefield{usera}{\blxarch@field@volume}}% \ifboolexpr{ test {\iffieldequalstr{entrysubtype}{digital}} @@ -598,7 +708,7 @@ \clearlist{origpublisher}}% \ifeditionsuperscript{none} {\clearfield{usere}} - {\savefield{edition}{\blxarch@field@edition}% + {\savefield*{edition}{\blxarch@field@edition}% \clearfield{edition}% \restorefield{usere}{\blxarch@field@edition}}% \ifboolexpr{ @@ -608,10 +718,10 @@ and not test {\ifselfcontained} } - {\savefield{maintitle}{\blxarch@field@maintitle}% - \savefield{mainsubtitle}{\blxarch@field@mainsubtitle}% - \savefield{maintitleaddon}{\blxarch@field@maintitleaddon}% - \savefield{maintitlenote}{\blxarch@field@maintitlenote}% + {\savefield*{maintitle}{\blxarch@field@maintitle}% + \savefield*{mainsubtitle}{\blxarch@field@mainsubtitle}% + \savefield*{maintitleaddon}{\blxarch@field@maintitleaddon}% + \savefield*{maintitlenote}{\blxarch@field@maintitlenote}% \restorefield{booktitle}{\blxarch@field@maintitle}% \restorefield{booksubtitle}{\blxarch@field@mainsubtitle}% \restorefield{booktitleaddon}{\blxarch@field@maintitleaddon}% @@ -627,7 +737,7 @@ and not test {\iffieldundef{shortjournal}} } - {\savefield{shortjournal}{\blxarch@field@shortjournal}% + {\savefield*{shortjournal}{\blxarch@field@shortjournal}% \restorefield{journaltitle}{\blxarch@field@shortjournal}% \clearfield{journalsubtitle}} {}% @@ -641,17 +751,17 @@ and not test {\iffieldundef{shortseries}} } - {\savefield{shortseries}{\blxarch@field@shortseries}% - \savefield{shortsubseries}{\blxarch@field@shortsubseries}% + {\savefield*{shortseries}{\blxarch@field@shortseries}% + \savefield*{shortsubseries}{\blxarch@field@shortsubseries}% \iffieldundef{shortsubseries} {} {\restorefield{series}{\blxarch@field@shortseries}% \restorefield{subseries}{\blxarch@field@shortsubseries}}% } {}% - \ifrepeatlabel - {\usebibmacro{repeatlabel}\repeatlabeldelim} - {}% + \ifrepeatlabel{false} + {} + {\usebibmacro{repeatlabel}\repeatlabeldelim}% \let\blxarch@buffer@list@namegiven\mkbibnamegiven% \let\blxarch@buffer@list@namefamily\mkbibnamefamily% \let\blxarch@buffer@list@nameprefix\mkbibnameprefix% @@ -678,10 +788,10 @@ \settoggle{archbool:usefestschriftaddon}{#1}} \ExecuteBibliographyOptions{usefestschriftaddon} \DeclareNameAlias{festschrift}{g-family} -\newcommand{\mkbibfestschriftnamegiven}[1]{#1} -\newcommand{\mkbibfestschriftnamefamily}[1]{#1} -\newcommand{\mkbibfestschriftnameprefix}[1]{#1} -\newcommand{\mkbibfestschriftnamesuffix}[1]{#1} +\newcommand*{\mkbibfestschriftnamegiven}[1]{#1} +\newcommand*{\mkbibfestschriftnamefamily}[1]{#1} +\newcommand*{\mkbibfestschriftnameprefix}[1]{#1} +\newcommand*{\mkbibfestschriftnamesuffix}[1]{#1} \newbibmacro*{festschrift}[1]{% \printtext[#1note]{% \let\blxarch@buffer@festschrift@namegiven\mkbibnamegiven% @@ -771,8 +881,8 @@ \setcounter{multivenueloop}{1}% }% } -\newcommand{\multivenuedelim}{\addcomma\space} -\newcommand{\eventtypepunct}{\addspace} +\newcommand*{\multivenuedelim}{\addcomma\space} +\newcommand*{\eventtypepunct}{\addspace} \DeclareListFormat*{notruncation}{#1} \newbibmacro*{titlenote}[1]{% \iftoggle{archbool:titlenote} @@ -813,37 +923,48 @@ \clearlist{multivenue}% \clearlist{multieventdate}% } -\renewcommand{\bibsetup}{% +\xpretocmd{\bibsetup}{% \def\blxarch@buffer@hyperref{\bibhyperref}% - \ifcsdef{blxarch@fork@authordate} - {\csuse{blxarch@issuedate}} - {} -} -\xpretobibmacro*{finentry}{% + \let\blxarch@field@namehash\undefined% +}{}{Patching macro '\bibsetup' failed} +\xpretobibmacro{finentry}{% \let\mkbibnamegiven\blxarch@buffer@list@namegiven% \let\mkbibnamefamily\blxarch@buffer@list@nameprefix% \let\mkbibnameprefix\blxarch@buffer@list@namefamily% \let\mkbibnamesuffix\blxarch@buffer@list@namesuffix% -} -\xpatchbibdriver{book}{\printfield {volume}}{}{}{} -\xpatchbibdriver{book}{\printfield {part}}{}{}{} -\xpatchbibdriver{inbook}{\printfield {volume}}{}{}{} -\xpatchbibdriver{inbook}{\printfield {part}}{}{}{} -\xpatchbibdriver{book}{\iffieldundef {maintitle} {} {}\newunit}{}{}{} -\xpatchbibdriver{inbook}{\iffieldundef {maintitle} {} {}\newunit}{}{}{} -\xpatchbibdriver{article}{\usebibmacro{byeditor+others}}{}{}{} -\newcommand{\titleseriesdelim}{\addperiod\space} -\xpatchbibdriver{inbook}{newunit \newblock \usebibmacro {in:}}{printunit{\inbookbookdelim}\newblock\usebibmacro{in:}}{}{} +}{}{Patching 'finentry' failed (1)} +\xpatchbibdriver{book}{\printfield {volume}}{} + {}{Patching driver 'book' failed (1)} +\xpatchbibdriver{book}{\printfield {part}}{} + {}{Patching driver 'book' failed (2)} +\xpatchbibdriver{inbook}{\printfield {volume}}{} + {}{blxarch@warning{patching driver 'inbook' failed (1)} +\xpatchbibdriver{inbook}{\printfield {part}}{} + {}{Patching driver 'inbook' failed (2)} +\xpatchbibdriver{book}{\iffieldundef {maintitle} {} {}\newunit}{} + {}{Patching driver 'book' failed (3)} +\xpatchbibdriver{inbook}{\iffieldundef {maintitle} {} {}\newunit}{} + {}{Patching driver 'inbook' failed (3)}} +\xpatchbibdriver{article}{\usebibmacro{byeditor+others}}{} + {}{Patching driver 'book' failed (4)} +\newcommand*{\titleseriesdelim}{\addperiod\space} +\newcommand*{\articletitlepunct}{\newunitpunct} +\xpatchbibdriver{inbook}{newunit \newblock \usebibmacro {in:}}{printunit{\inbookbookdelim}\newblock\usebibmacro{in:}} + {}{Patching driver 'inbook' failed (4)} \newcommand{\inbookbookdelim}{\newunitpunct} \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space\mkbibquote{#1\isdot}} \newtoggle{archbool:titlebrackets} \DeclareBibliographyOption{titlebrackets}[true]{% \settoggle{archbool:titlebrackets}{#1}} \ExecuteBibliographyOptions{titlebrackets} +\DeclareEntryOption{titlebrackets}[true]{% + \settoggle{archbool:titlebrackets}{#1}} \newtoggle{archbool:titlenote} \DeclareBibliographyOption{titlenote}[true]{% \settoggle{archbool:titlenote}{#1}} \ExecuteBibliographyOptions{titlenote} +\DeclareEntryOption{titlenote}[true]{% + \settoggle{archbool:titlenote}{#1}} \newtoggle{archbool:summarytitle} \DeclareBibliographyOption{summarytitle}[true]{% \settoggle{archbool:summarytitle}{#1}} @@ -865,7 +986,7 @@ {#1} {#2} } -\renewcommand{\subtitlepunct}{\addperiod\space} +\renewcommand*{\subtitlepunct}{\addperiod\space} \DeclareDataInheritance {mvbook,book,collection,mvcollection,proceedings,mvproceedings,reference,mvreference} {inbook,bookinbook,suppbook,incollection,suppcollection,inproceedings,inreference}{% @@ -880,6 +1001,7 @@ \inherit[override=true]{venue}{venue} \inherit[override=true]{multivenue}{multivenue} \inherit[override=true]{multieventdate}{multieventdate} + \inherit[override=true]{options}{options} \noinherit{summarytitle} } \renewbibmacro*{maintitle+title}{% @@ -958,7 +1080,9 @@ {\usebibmacro{titlenote}{title}} {\printfield[titlenote]{titleaddon}}}% {}% - \newunit}}% + \iffieldundef{journaltitle} + {\newunit} + {\printunit{\articletitlepunct}}}}% \iftoggle{archbool:titlebrackets} {} {\ifselfcontained @@ -1066,11 +1190,14 @@ \DeclareBibliographyOption{volumeafterseries}[false]{% \settoggle{archbool:volumeafterseries}{#1}} \ExecuteBibliographyOptions{volumeafterseries} -\newcommand{\articlesubtitlepunct}{\addcolon\space\midsentence} +\newcommand*{\articlesubtitlepunct}{\addcolon\space\midsentence} +\renewbibmacro*{bytranslator+others}{} \newtoggle{archbool:usesourceeditor} \DeclareBibliographyOption{usesourceeditor}[true]{% \settoggle{archbool:usesourceeditor}{#1}} \ExecuteBibliographyOptions{usesourceeditor} +\DeclareEntryOption{usesourceeditor}[true]{% + \settoggle{archbool:usesourceeditor}{#1}} \newcommand{\ifsourceeditor}[2]{% \ifboolexpr{ togl {archbool:usesourceeditor} @@ -1080,21 +1207,21 @@ {#1} {#2}% } -\newcommand{\multisourceeditordelim}{\addcomma\space} -\newcommand{\finalsourceeditordelim}{\addspace\bibstring{and}\space} +\newcommand*{\multisourceeditordelim}{\addcomma\space} +\newcommand*{\finalsourceeditordelim}{\addspace\bibstring{and}\space} \DeclareNameAlias{byeditor}{given-family} \xpretobibmacro{byeditor}{% \usebibmacro{byeditor:start} -}{}{} +}{}{Patching bibmacro 'byeditor' failed (1)} \xpretobibmacro{byeditor+others}{% \usebibmacro{byeditor:start} -}{}{} +}{}{Patching bibmacro 'byeditor:others' failed (1)} \xapptobibmacro{byeditor}{% \usebibmacro{byeditor:end} -}{}{} +}{}{Patching bibmacro 'byeditor:' failed (2)} \xapptobibmacro{byeditor+others}{% \usebibmacro{byeditor:end} -}{}{} +}{}{Patching bibmacro 'byeditor:others' failed (2)} \newbibmacro*{byeditor:start}{% \ifsourceeditor {\let\blxarch@buffer@multinamedelim\multinamedelim% @@ -1167,8 +1294,9 @@ \let\c@minnames\blxarch@buffer@minbooknames% } \DeclareDelimFormat{booknametitledelim}{\booklabelnamepunct} -\newcommand{\booklabelnamepunct}{\addcomma\space} +\newcommand*{\booklabelnamepunct}{\addcomma\space} \def\blxarch@issuedate{% + \savebibmacro{issue+date}% \renewbibmacro*{issue+date}{% \printtext[journaldateparens]{% \printfield{issue}% @@ -1180,9 +1308,9 @@ \DeclareBibliographyOption{shortjournal}[true]{% \settoggle{archbool:shortjournal}{#1}} \ExecuteBibliographyOptions{shortjournal} -\newcommand{\volumedatedelim}{\addcomma\space} -\newcommand{\journalvolumedelim}{\addspace} -\newcommand{\volumenumberdelim}{\addslash} +\newcommand*{\volumedatedelim}{\addcomma\space} +\newcommand*{\journalvolumedelim}{\addspace} +\newcommand*{\volumenumberdelim}{\addslash} \renewbibmacro*{volume+number+eid}{% \printfield{volume}% \setunit*{\volumenumberdelim}% @@ -1195,7 +1323,7 @@ {\newunit% \usebibmacro{location}{location}} {}% -} +}{}{Patching bibmacro 'note+pages' failed} \renewbibmacro*{journal+issuetitle}{% \printtext[journalvolumeblock]{% \usebibmacro{journal}% @@ -1258,8 +1386,8 @@ \clearfield{usere}% }% } -\newcommand{\mkbiblocationaddon}[1]{} -\renewcommand{\finallistdelim}{\multilistdelim} +\newcommand*{\mkbiblocationaddon}[1]{} +\renewcommand*{\finallistdelim}{\multilistdelim} \newcommand{\ifuselocation}[3]{% \ifdefstring{\blxarch@uselocation@value}{#1} {#2} @@ -1275,7 +1403,7 @@ \DeclareBibliographyOption{pagesfirst}[true]{% \settoggle{archbool:pagesfirst}{#1}} \ExecuteBibliographyOptions{pagesfirst} -\newcommand{\ifpagesfirst}[2]{% +\newcommand*{\ifpagesfirst}[2]{% \iftoggle{archbool:pagesfirst} {#1} {#2}}% @@ -1287,7 +1415,7 @@ \DeclareBibliographyOption{usepublisher}[true]{% \settoggle{archbool:usepublisher}{#1}} \ExecuteBibliographyOptions{usepublisher} -\newcommand{\locationpublisherdelim}{\addcolon\space} +\newcommand*{\locationpublisherdelim}{\addcolon\space} \newcommand{\iforigfields}[2]{% \iftoggle{archbool:origfields} {\iffieldundef{origyear} @@ -1332,7 +1460,7 @@ \setunit{\addspace}% \usebibmacro{bibliographydate}}% \newunit}% -\DeclareFieldFormat*{reprintbrackets}{\mkbibbrackets{#1}} +\DeclareFieldFormat*{reprintparens}{\mkbibbrackets{#1}} \newbibmacro*{origfields+reprint}{% \printtext[locationdateparens]{% \ifeditionsuperscript{preloc} @@ -1351,7 +1479,7 @@ \usebibmacro{origdate} \usebibmacro{editionsuperscript}% \setunit{\addspace}% - \printtext[reprintbrackets]{% + \printtext[reprintparens]{% \bibstring{reprint}\addspace% \printtext{\usebibmacro{location}{location}}% \setunit{\locationpublisherdelim}% @@ -1370,8 +1498,10 @@ {\ifcsdef{blxarch@opt@useinstitution@#1} {#3} {\blxarch@errmsg{\blxarch@useinstitution@errstr{\unexpanded{\ifuseinstitution}}}}}}% -\xpatchbibdriver{thesis}{\printfield {type}}{}{}{} -\xpatchbibdriver{thesis}{\printlist {language}}{}{}{} +\xpatchbibdriver{thesis}{\printfield {type}}{} + {}{Patching driver 'thesis' failed (1)} +\xpatchbibdriver{thesis}{\printlist {language}}{} + {}{Patching driver 'thesis' failed (2)} \newtoggle{archbool:useunpublishedthesis} \DeclareBibliographyOption{useunpublishedthesis}[true]{% \settoggle{archbool:useunpublishedthesis}{#1}} @@ -1459,8 +1589,8 @@ {\printtext[type]{\bibstring{unpublished\thefield{type}}}} {\printfield{type}} } -\newcommand{\institutionlocationdelim}{\addcomma\space} -\newcommand{\typeinstitutiondelim}{\addspace} +\newcommand*{\institutionlocationdelim}{\addcomma\space} +\newcommand*{\typeinstitutiondelim}{\addspace} \newcommand{\ifpositionlabeldate}[3]{% \ifdefstring{\blxarch@positionlabeldate@value}{#1} {#2} @@ -1488,26 +1618,60 @@ \ifbibextrayear {\printfield{extrayear}} {}}} -\DeclareFieldFormat*{extrayear}{\mknumalph{#1}}% +\DeclareFieldFormat*{extradate}{\mknumalph{#1}}% \newcommand{\ifbibextrayear}[2]{% \ifboolexpr{ - not test {\iffieldundef{extrayear}} + not test {\iffieldundef{extradate}} and test {\ifpositionlabeldate{location}} and - not test {\ifrepeatlabel} + test {\ifrepeatlabel{false}} and test {\ifbibliography} } {#1} {#2}} \DeclareFieldFormat*{newsparens}{\addcomma\space#1} -\newbibmacro*{extendeddate}[1]{% - \iffieldundef{#1year} - {} - {\printtext[#1dateparen]{\csuse{print#1date}}}% +\blxarch@newcounter{minrealdatediff}{3} +\blxarch@newcounter{currentrealdatediff}{0} +\DeclareBibliographyOption[integer]{minrealdatediff}[3]{% + \setcounter{minrealdatediff}{#1} + \addtocounter{minrealdatediff}{-1}} +\ExecuteBibliographyOptions{minrealdatediff} +\newbibmacro*{extendeddate}[2]{% + \clearfield{#1day}% + \clearfield{#1month}% + \clearfield{#1endday}% + \clearfield{#1endmonth}% + \iffieldint{#1year} + {\iffieldint{#2endyear} + {\ifnumcomp{\thefield{#1year}}{>}{\thefield{#2endyear}} + {\setcounter{currentrealdatediff}{\thefield{#1year}}% + \addtocounter{currentrealdatediff}{-\thefield{#2endyear}}} + {\setcounter{currentrealdatediff}{\thefield{#2endyear}}% + \addtocounter{currentrealdatediff}{-\thefield{#1year}}} + \ifnumcomp{\value{currentrealdatediff}}{>}{\value{minrealdatediff}} + {\printtext[#1dateparen]{\csuse{print#1date}}} + {}% + } + {\iffieldint{#2year} + {\ifnumcomp{\thefield{#1year}}{>}{\thefield{#2year}} + {\setcounter{currentrealdatediff}{\thefield{#1year}}% + \addtocounter{currentrealdatediff}{-\thefield{#2year}}} + {\setcounter{currentrealdatediff}{\thefield{#2year}}% + \addtocounter{currentrealdatediff}{-\thefield{#1year}}} + \ifnumcomp{\value{currentrealdatediff}}{>}{\value{minrealdatediff}} + {\printtext[#1dateparen]{\csuse{print#1date}}} + {}% + }% + {}% + }% + } + {\iffieldundef{#1year} + {} + {\printtext[#1dateparen]{\csuse{print#1date}}}}% } -\newcommand{\daterealdatedelim}{\addspace} +\newcommand*{\daterealdatedelim}{\addspace} \newbibmacro*{bibliographydate}{% \ifpositionlabeldate{label} {\ifnewspaper @@ -1526,14 +1690,14 @@ {\printtext[missingfield]{\midsentence\printfield{pubstate}}}}% {\printdate}% \ifbibextrayear - {\printfield{extrayear}} + {\printfield{extradate}} {}% }% \ifeditionsuperscript{postdate} {\usebibmacro{editionsuperscript}} {}% \setunit{\daterealdatedelim}% - \usebibmacro{extendeddate}{real}}}} + \usebibmacro{extendeddate}{real}{}}}} \newbibmacro*{origdate}{% \printtext{% \midsentence% @@ -1541,11 +1705,220 @@ {\printtext[missingfield]{\bibstring{nodate}}} {\printorigdate}% \setunit*{\daterealdatedelim} - \usebibmacro{extendeddate}{origreal}% + \usebibmacro{extendeddate}{origreal}{orig}% }} -\xpatchbibmacro{addendum+pubstate}{\printfield{pubstate}}{}{}{} -\DeclareFieldFormat*{realdateparen}{\mkbibbrackets{#1}} -\DeclareFieldFormat*{origrealdateparen}{\mkbibbrackets{#1}} +\xpatchbibmacro{addendum+pubstate}{\printfield{pubstate}}{} + {}{Patching bibmacro 'addendum+pubstate' failed} +\DeclareFieldFormat*{realdateparens}{\mkbibbrackets{#1}} +\DeclareFieldFormat*{origrealdateparens}{\mkbibbrackets{#1}} +\renewrobustcmd*{\bibdaterangesep}{\bibrangedash} +\newrobustcmd*{\bibdatesubseqesep}{\slash} + +\newrobustcmd*{\bibdaterangesepx}[1]{% + \ifboolexpr{test {\iffieldint{#1year}} and test {\iffieldint{#1endyear}}} + {\ifnumequal{\thefield{#1endyear}-\thefield{#1year}}{1} + {\bibdatesubseqesep} + {\bibdaterangesep}} + {\bibdaterangesep}} + \renewrobustcmd*{\mkdaterangefull}[2]{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + % Such a season component can only come from an ISO8601 season which replaces + % a normal month so if it exists, we know that a normal date print is ruled out + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + % Optionally print the time after the date + \blx@printtime{#2}{}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateuncertainprint + \dateeraprint{#2year}% + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% + % Optionally print the time after the date + \blx@printtime{#2}{end}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}% + \endgroup} +\renewrobustcmd*{\mkdaterangetrunc}[2]{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + % Such a season component can only come from an ISO8601 season which replaces + % a normal month so if it exists, we know that a normal date print is ruled out + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{}{}{#2day}} + {\csuse{mkbibdate#1}{}{#2month}{#2day}}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \iffieldsequal{#2dateera}{#2enddateera}{} + {\dateeraprint{#2year}}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}% + \iffieldsequal{#2dateera}{#2enddateera}{} + {\dateeraprint{#2year}}}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}% + \endgroup} +\renewrobustcmd*{\mkdaterangefullextra}[2]{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \printtext{% + % Such a season component can only come from an ISO8601 season which replaces + % a normal month so if it exists, we know that a normal date print is ruled out + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + % Optionally print the time after the date + \blx@printtime{#2}{}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateuncertainprint + \dateeraprint{#2year}% + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \printtext{\mbox{\bibdaterangesep}}} + {\printtext{% + \bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% + % Optionally print the time after the date + \blx@printtime{#2}{end}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}}% + \endgroup} +\renewrobustcmd*{\mkdaterangetruncextra}[2]{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \printtext{% + % Such a season component can only come from an ISO8601 season which replaces + % a normal month so if it exists, we know that a normal date print is ruled out + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{}{}{#2day}} + {\csuse{mkbibdate#1}{}{#2month}{#2day}}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \iffieldsequal{#2dateera}{#2enddateera}{} + {\dateeraprint{#2year}}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}% + \iffieldsequal{#2dateera}{#2enddateera}{} + {\dateeraprint{#2year}}}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \printtext{\mbox{\bibdaterangesep}}} + {\printtext{% + \bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2endyear}}}}}}% + \endgroup} +\renewrobustcmd*{\mkdaterangeymd}[1]{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year} + {} + {\datecircaprint + \printtext[#1date]{% + % Such a season component can only come from an ISO8601 season which replaces + % a normal month so if it exists, we know that a normal date print is ruled out + \iffieldundef{#1season} + {\blx@ymddate{#1}{}% + % Optionally print the time after the date + \blx@printtime{#1}{}} + {\csuse{mkbibseasondateshort}{#1year}{#1season}}% + \dateuncertainprint + \dateeraprint{#1year}% + \iffieldundef{#1endyear} + {} + {\iffieldequalstr{#1endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesepx{#1}% + \enddatecircaprint + \iffieldundef{#1season} + {\blx@ymddate{#1}{end}% + % Optionally print the time after the date + \blx@printtime{#1}{end}} + {\csuse{mkbibseasondateshort}{#1endyear}{#1endseason}}% + \enddateuncertainprint + \dateeraprint{#1endyear}}}}}% + \endgroup} +\renewrobustcmd*{\mkdaterangeymdextra}[1]{% + \begingroup + \blx@metadateinfo{#1}% + \iffieldundef{#1year} + {} + {\datecircaprint + \printtext[#1date]{% + % Such a season component can only come from an ISO8601 season which replaces + % a normal month so if it exists, we know that a normal date print is ruled out + \iffieldundef{#1season} + {\blx@ymddate[extradate]{#1}{}% + % Optionally print the time after the date + \blx@printtime{#1}{}} + {\csuse{mkbibseasondateshort}{#1year}{#1season}}% + \dateuncertainprint + \dateeraprint{#1year}% + \iffieldundef{#1endyear} + {} + {\iffieldequalstr{#1endyear}{} + {\mbox{\bibdaterangesep}} + {\printtext{% + \bibdaterangesepx{#1}% + \enddatecircaprint + \iffieldundef{#1season} + {\blx@ymddate{#1}{end}% + % Optionally print the time after the date + \blx@printtime{#1}{end}} + {\csuse{mkbibseasondateshort}{#1endyear}{#1endseason}}}% + \enddateuncertainprint + \dateeraprint{#1endyear}}}}}% + \endgroup} \DeclareBibliographyOption{giveninitligatures}[{Chr, Ch, Fr, IJ, Ll, Ph, Sch, St, Th}]{% \let\blxarch@giveninitligatures\@empty% \forcsvlist{\listadd\blxarch@giveninitligatures}{#1}% @@ -1709,16 +2082,34 @@ \DeclareBibliographyOption{preservelastauthor}[true]{% \settoggle{archbool:preservelastauthor}{#1}} \ExecuteBibliographyOptions{preservelastauthor} -\DeclareFieldFormat*{authortype}{\mkbibparens{#1}} +\newcommand*{\mkbibandothers}[1]{#1} +\renewbibmacro*{name:andothers}{% + \ifboolexpr{ + test {\ifnumequal{\value{listcount}}{\value{liststop}}} + and + test \ifmorenames + } + {\ifnumgreater{\value{liststop}}{1} + {\finalandcomma} + {}% + \printdelim{andothersdelim}\bibstring[\mkbibandothers]{andothers}}% + {}} +\newbibmacro*{name:andothersgenitive}{% + \ifboolexpr{ + test {\ifnumequal{\value{listcount}}{\value{liststop}}} + and + test \ifmorenames + } + {\ifnumgreater{\value{liststop}}{1} + {\finalandcomma} + {}% + \printdelim{andothersdelim}\bibstring[\mkbibandothers]{genitiveandothers}% + \let\blxarch@namepartfamily\@empty} + {}% +} +\DeclareFieldAlias{authortype}{editortype} \DeclareFieldFormat*{editortype}{\mkbibparens{#1}} -\renewbibmacro*{translator+othersstrg}{% - \ifboolexpr{ - test {\ifnumgreater{\value{translator}}{1}} - or - test {\ifandothers{translator}} - } - {\printtext[editortype]{\bibstring{translators}}} - {\printtext[editortype]{\bibstring{translator}}}} +\DeclareFieldAlias{translatortype}{editortype} \blxarch@newcounter{preservelastauthorloop}{1} \newbibmacro*{names:truncate}[1]{% \ifboolexpr{ @@ -1761,38 +2152,92 @@ {}% \ifpositionlabeldate{label} {\setunit{\daterealdatedelim}% - \usebibmacro{extendeddate}{real}} + \usebibmacro{extendeddate}{real}{}} {}}}} \DeclareListFormat*{labeldateparens}{#1} \DeclareDelimFormat{authortypedelim,editortypedelim,translatortypedelim}{\addspace} -\newcommand{\finalnameellipsis}{\addspace\dots\space} -\xpatchbibmacro{author}{\printnames{author}}{% - \ifidemincitation - {\printtext{% - \bibstring{idem\thefield{gender}}}} - {\usebibmacro{sortnamelist}{author}}}{}{} -\xpatchbibmacro{author}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}{}{} -\xpatchbibmacro{bbx:editor}{\printnames{editor}}{% - \ifidemincitation - {\printtext{% - \bibstring{idem\thefield{gender}}}} - {\usebibmacro{sortnamelist}{editor}}}{}{} -\xpatchbibmacro{bbx:translator}{\printnames{translator}}{% - \ifidemincitation - {\printtext{% - \bibstring{idem\thefield{gender}}}} - {\usebibmacro{sortnamelist}{translator}}}{}{} -\xpatchbibmacro{bbx:editor}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}{}{} -\xpatchbibmacro{bbx:translator}{\usebibmacro{date+extradate}}{\usebibmacro{labeldate+edition}}{}{} +\newcommand*{\finalnameellipsis}{\addspace\textellipsis\space} \renewbibmacro*{editor+others}{% \usebibmacro{editor}% } \renewbibmacro*{translator+others}{% \usebibmacro{translator}% } -\renewcommand{\multicitedelim}{\addspace\textendash\space} -\newcommand\strongcitedelim{\addperiod\space\textendash\space} -\renewcommand{\compcitedelim}{\addsemicolon\space} +\newrobustcmd*{\DefineGenitiveApostropheChars}[2]{% + \DefineBibliographyExtras{#1}{% + \let\blxarch@genitiveapostrophechars\@empty% + \forcsvlist{\listadd\blxarch@genitiveapostrophechars}{#2}% +}} +\newrobustcmd*{\DeclareGenitiveApostropheChars}[1]{% + \DeclareBibliographyExtras{% + \let\blxarch@genitiveapostrophechars\@empty% + \forcsvlist{\listadd\blxarch@genitiveapostrophechars}{#1}% +}} +\newtoggle{archbool:genitiveapostrophe} +\newbibmacro*{genitive}[1]{% + \ifdefvoid{#1} + {} + {\togglefalse{archbool:genitiveapostrophe}% + \fullexpandarg% + \StrRemoveBraces{#1}[\blxarch@nobraces]% + \renewcommand*{\do}[1]{% + \IfEndWith{\blxarch@nobraces}{##1} + {\toggletrue{archbool:genitiveapostrophe}\listbreak} + {}% + }% + \dolistloop{\blxarch@genitiveapostrophechars}% + \iftoggle{archbool:genitiveapostrophe} + {\bibstring{genitiveapostrophe}} + {\bibstring{genitives}}% + }% +} +\DeclareNameFormat{labelname:poss}{% Based on labelname from biblatex.def + \let\blxarch@namepartfamily\namepartfamily% + \ifcase\value{uniquename}% + \usebibmacro{name:family}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}% + \or + \ifuseprefix + {\usebibmacro{name:given-family}{\namepartfamily}{\blxarch@ligatureinitchars{\namepartgiven}}{\namepartprefix}{\namepartsuffixi}} + {\usebibmacro{name:given-family}{\namepartfamily}{\blxarch@ligatureinitchars{\namepartgiven}}{\namepartprefixi}{\namepartsuffixi}}% + \or + \usebibmacro{name:given-family}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}% + \fi + \usebibmacro{name:andothersgenitive}% + \ifnumequal{\value{listcount}}{\value{liststop}}{\usebibmacro{genitive}{\blxarch@namepartfamily}}{}} +\DeclareFieldFormat{shorthand:poss}{% + \ifnameundef{labelname}{#1\def\blxarch@genitivecheck{#1}\usebibmacro{genitive}{\blxarch@genitivecheck}}{}} +\DeclareFieldFormat{citetitle:poss}{#1\def\blxarch@genitivecheck{#1}\usebibmacro{genitive}{\blxarch@genitivecheck}} +\DeclareFieldFormat{label:poss}{#1\def\blxarch@genitivecheck{#1}\usebibmacro{genitive}{\blxarch@genitivecheck}} +\newrobustcmd*{\posscitealias}{% + \AtNextCite{% + \DeclareNameAlias{labelname}{labelname:poss}% + \DeclareFieldAlias{shorthand}{shorthand:poss}% + \DeclareFieldAlias{citetitle}{citetitle:poss}% + \DeclareFieldAlias{label}{label:poss}}} +\newrobustcmd*{\posscite}{% + \posscitealias% + \textcite} +\newrobustcmd*{\Posscite}{\bibsentence\posscite} +\newrobustcmd*{\posscites}{% + \posscitealias% + \textcites} +\newrobustcmd*{\Posscites}{\bibsentence\posscites} +\renewcommand*{\multicitedelim}{\addspace\textendash\space} +\newcommand*\strongcitedelim{\addperiod\space\textendash\space} +\renewcommand*{\compcitedelim}{\addsemicolon\space} +\newtoggle{archbool:citeshortin} +\DeclareBibliographyOption[boolean]{citeshortin}[true]{% + \settoggle{archbool:citeshortin}{#1}% + \ifboolexpr{ + togl {archbool:citeshortin} + and + not test {\ifcsdef{blxarch@fork@verbose}} + } +{\blxarch@errmsg{option 'citeshortin=true' only in verbose styles}} +{}% +} +\ExecuteBibliographyOptions{citeshortin=false} +\DeclareFieldFormat*{citetitle}{#1} \DeclareLabeldate{% \field{date} \field{pubstate} @@ -1804,7 +2249,7 @@ \field{editor} \field{translator} } -\renewcommand{\labelnamepunct}{\unspace\addcolon\space} +\renewcommand*{\labelnamepunct}{\unspace\addcolon\space} \newcommand{\ifseenote}[2]{#2} \newtoggle{archbool:uselabeltitle} \DeclareEntryOption{uselabeltitle}[false]{% @@ -1853,10 +2298,10 @@ \DeclareBibliographyOption{noseries}[false]{% \settoggle{archbool:noseries}{#1}} \ExecuteBibliographyOptions{noseries} -\newcommand{\seriespunct}{\addperiod\space} -\newcommand{\noseriespunct}{\seriespunct} -\newcommand{\seriesnumberdelim}{\addspace} -\newcommand{\subnumberseriesdelim}{\addspace=\space} +\newcommand*{\seriespunct}{\addperiod\space} +\newcommand*{\noseriespunct}{\seriespunct} +\newcommand*{\seriesnumberdelim}{\addspace} +\newcommand*{\subnumberseriesdelim}{\addspace=\space} \renewbibmacro*{series+number}{% \iffieldundef{series} {} @@ -1888,33 +2333,53 @@ }% }% \xpatchbibdriver{book}{usebibmacro {series+number}\newunit} - {usebibmacro{series+number}}{}{} + {usebibmacro{series+number}} +{}{Patching driver 'book' failed (5)} \xpatchbibdriver{inbook}{usebibmacro {series+number}\newunit} - {usebibmacro{series+number}}{}{} + {usebibmacro{series+number}} +{}{Patching driver 'inbook' failed (4)} \DeclareFieldFormat[book,inbook]{volume}{\addspace#1} -\renewcommand{\labelnamepunct}{\adddot\space} +\renewcommand*{\labelnamepunct}{\adddot\space} \urlstyle{same} \DeclareFieldFormat*{url}{\bibstring{urlfrom}\addcolon\space\url{#1}} -\renewcommand{\finalnamedelim}{\addcomma\addspace} +\renewcommand*{\finalnamedelim}{\addcomma\addspace} \DeclareListFormat*{language}{} -\DeclareFieldFormat*{citetitle}{#1} \newcommand{\printgiveninitligatureslist}{% - \renewcommand{\do}[1]{\space##1} + \renewcommand*{\do}[1]{\space##1} \dolistloop{\@blxarch@list@add@ligatures}} +\newrobustcmd*{\SuppressAdditiveLbxSuffixes}{% + \let\blx@lng@suff\@empty} \edef\blxarch@style@ay{authoryear-archaeology (generic)} \edef\blxarch@style@ayc{authoryear-comp-archaeology (generic)} \edef\blxarch@style@ayi{authoryear-ibid-archaeology (generic)} \edef\blxarch@style@ayic{authoryear-icomp-archaeology (generic)} +\edef\blxarch@style@numc{numeric-comp-archaeology (generic)} +\edef\blxarch@style@v{verbose-archaeology (generic)} \edef\blxarch@style@vi{verbose-ibid-archaeology (generic)} \edef\blxarch@style@vttwo{verbose-trad2note-archaeology (generic)} +\edef\blxarch@style@dguf@info{Deutsche Gesellschaft f\"ur Ur- und Fr\"uhgeschichte} +\edef\blxarch@style@dguf{\blxarch@style@dguf@info\space[obsolete \RN{2}]} +\edef\blxarch@style@dgufalt{\blxarch@style@dguf@info\space[obsolete \RN{1}]} +\edef\blxarch@style@dgufapa{\blxarch@style@dguf@info\space(APA)} +\edef\blxarch@style@mpk@info{Mitteilungen der Pr\"ahistorischen Kommission der \"Osterreichischen Akadademie der Wissenschaften} +\edef\blxarch@style@mpk{\blxarch@style@mpk@info\space[obsolete]} +\edef\blxarch@style@mpkoeaw{\blxarch@style@mpk@info\space[current]} +\edef\blxarch@style@rgk{R\"omisch-Germanische Kommission} +\edef\blxarch@style@rgkverbose{\blxarch@style@rgk\space(geisteswissenschaftlich)} +\edef\blxarch@style@rgkinline{\blxarch@style@rgk\space(naturwissenschaftlich)} +\edef\blxarch@style@rgknumeric{\blxarch@style@rgk\space(numerisch)} +\edef\blxarch@style@rgzm{R\"omisch-Germanisches Zentralmuseum Mainz} +\edef\blxarch@style@rgzminline{\blxarch@style@rgzm\space(naturwissenschaftlich)} +\edef\blxarch@style@rgzmnumeric{\blxarch@style@rgzm\space(numerisch)} +\edef\blxarch@style@rgzmverbose{\blxarch@style@rgzm\space(geisteswissenschaftlich)} +\edef\blxarch@style@muenster{Ur- und Fr\"uhgeschichtliche Arch\"aologie M\"unster} +\edef\blxarch@style@muensterverbose{\blxarch@style@muenster\space(geisteswissenschaftlich)} +\edef\blxarch@style@muensternumeric{\blxarch@style@muenster\space(numerisch)} +\edef\blxarch@style@muensterinline{\blxarch@style@muenster\space(naturwissenschaftlich)} \edef\blxarch@style@aefkw{\"Agyptologische Forschungsst\"atte f\"ur Kulturwissenschaft (\"AFKW)} \edef\blxarch@style@afwl{Ausgrabungen und Funde in Westfalen-Lippe} \edef\blxarch@style@amit{Arch\"aologische Berichte aus Iran und Turan (AMIT)} \edef\blxarch@style@archa{Archaeologia Austriaca (ArchA)} -\edef\blxarch@style@dai{Deutsches Arch\"aologisches Institut} -\edef\blxarch@style@dguf{Deutsche Gesellschaft f\"ur Ur- und Fr\"uhgeschichte} -\edef\blxarch@style@dgufalt{\blxarch@style@dguf\space[obsolete]} -\edef\blxarch@style@dgufapa{\blxarch@style@dguf\space(APA)} \edef\blxarch@style@eaz{Ethnographisch-Arch\"aologische Zeitschrift (EAZ)} \edef\blxarch@style@eazalt{\blxarch@style@eaz\space[obsolete]} \edef\blxarch@style@foe{Fundberichte aus \"Osterreich (F\"O)} @@ -1922,18 +2387,8 @@ \edef\blxarch@style@jbkrneuss{Jahrbuch f\"ur den Rhein-Kreis Neuss} \edef\blxarch@style@karl{Karl. Das kulturelle Schachmagazin} \edef\blxarch@style@maja{M\"unchner Arbeitskreis Junge Aegyptologie (MAJA)} -\edef\blxarch@style@mpk{Mitteilung der Pr\"ahistorischen Kommission} -\edef\blxarch@style@muenster{Ur- und Fr\"uhgeschichtliche Arch\"aologie M\"unster} -\edef\blxarch@style@muensterverbose{\blxarch@style@muenster\space(geisteswissenschaftlich)} -\edef\blxarch@style@muensterinline{\blxarch@style@muenster\space(naturwissenschaftlich)} \edef\blxarch@style@nnu{Nachrichten aus Niedersachsens Urgeschichte} \edef\blxarch@style@offa{Offa} -\edef\blxarch@style@rgk{R\"omisch-Germanische Kommission} -\edef\blxarch@style@rgkverbose{\blxarch@style@rgk\space(geisteswissenschaftlich)} -\edef\blxarch@style@rgkinline{\blxarch@style@rgk\space(naturwissenschaftlich)} -\edef\blxarch@style@rgzm{R\"omisch-Germanisches Zentralmuseum Mainz} -\edef\blxarch@style@rgzminline{\blxarch@style@rgzm\space(naturwissenschaftlich)} -\edef\blxarch@style@rgzmverbose{\blxarch@style@rgzm\space(geisteswissenschaftlich)} \edef\blxarch@style@sak{Studien zur Alt\"agyptischen Kultur} \edef\blxarch@style@volkskunde{Zeitschrift f\"ur Volkskunde} \edef\blxarch@style@zaak{Zeitschrift f\"ur Arch\"aologie au\ss ereurop\"aischer Kulturen (ZAAK)} diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-aefkw.lbx index f8118d51aaf..e3be2a469cb 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-aefkw.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-aefkw.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FbritishaefkwLBX,PenglishaefkwLBX') %% \ProvidesFile{british-aefkw.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-aefkw} \InheritBibliographyStrings{english-aefkw} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-archa.lbx index 00c28a439e5..3b859f61df0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-archa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-archa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FbritisharchaLBX,PenglisharchaLBX') %% \ProvidesFile{british-archa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archa} \InheritBibliographyStrings{english-archa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-archaeology.lbx index d80c53a0776..8dc13f827ae 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-archaeology.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-archaeology.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FbritishLBX,PenglishLBX') %% \ProvidesFile{british-archaeology.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-dguf-alt.lbx index 1584aee8883..a74dece4f59 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-dguf-alt.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-dguf-alt.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FbritishdgufaltLBX,PenglishLBX') %% \ProvidesFile{british-dguf-alt.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-dguf-apa.lbx index 7cb77741be5..5f220afd127 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-dguf-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-dguf-apa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FbritishdgufapaLBX,PenglishdgufapaLBX') %% \ProvidesFile{british-dguf-apa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-dguf-apa} \InheritBibliographyStrings{english-dguf-apa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-eaz.lbx index 6c6e2ef1ba0..6807b52d720 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-eaz.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-eaz.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FbritisheazLBX,PenglisheazLBX') %% \ProvidesFile{british-eaz.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-eaz} \InheritBibliographyStrings{english-eaz} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-foe.lbx index 4cf91b01341..35ce8946fec 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-foe.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-foe.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FbritishfoeLBX,PenglishfoeLBX') %% \ProvidesFile{british-foe.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-foe} \InheritBibliographyStrings{english-foe} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-jb-kreis-neuss.lbx index 15ffedb49a8..c4fc83fadd1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-jb-kreis-neuss.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-jb-kreis-neuss.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FbritishjbkreisneussLBX,PenglishjbkreisneussLBX') %% \ProvidesFile{british-jb-kreis-neuss.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-jb-kreis-neuss} \InheritBibliographyStrings{english-jb-kreis-neuss} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-karl.lbx index 3c612280127..640f83805bd 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-karl.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-karl.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FbritishkarlLBX,PenglishLBX') %% \ProvidesFile{british-karl.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-maja.lbx index 53d24a585f1..698b4cbe97f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-maja.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-maja.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FbritishmajaLBX,PenglishLBX') %% \ProvidesFile{british-maja.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-mpk.lbx index f465441b134..f4f4e5f11b6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-mpk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-mpk.lbx @@ -7,9 +7,26 @@ %% biblatex-archaeology.dtx (with options: `FbritishmpkLBX,PenglishmpkLBX') %% \ProvidesFile{british-mpk.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-mpk} -\InheritBibliographyStrings{english-mpk} +\InheritBibliographyExtras{english-archaeology} +\DeclareBibliographyStrings{% + inherit = {english-archaeology}, + unpublishedbathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublisheddiplomathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedmagisterthesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedmathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedphdthesis = {{unpublished PhD Dissertation} + {unpublished PhD Dissertation}}, + unpublishedpostdocthesis = {{unpublished Habilitationsschrift} + {unpublished Habilitationsschrift}}, + urlseen = {{last access}{last access}}, +} \endinput %% %% End of file `british-mpk.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-mpkoeaw.lbx new file mode 100644 index 00000000000..5724a0bd03d --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-mpkoeaw.lbx @@ -0,0 +1,16 @@ +%% +%% This is file `british-mpkoeaw.lbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `FbritishmpkoeawLBX,PenglishmpkoeawLBX') +%% +\ProvidesFile{british-mpkoeaw.lbx} +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes +\InheritBibliographyExtras{english-mpkoeaw} +\InheritBibliographyStrings{english-mpkoeaw} +\endinput +%% +%% End of file `british-mpkoeaw.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-offa.lbx index 8aecd9d6269..57a4051c835 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-offa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-offa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FbritishoffaLBX,PenglishoffaLBX') %% \ProvidesFile{british-offa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-offa} \InheritBibliographyStrings{english-offa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-rgzm.lbx index f3882ac8388..637392193b2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-rgzm.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-rgzm.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FbritishrgzmLBX,PenglishLBX') %% \ProvidesFile{british-rgzm.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-zaak.lbx index 04ac061a51a..4a40567760d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-zaak.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-zaak.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FbritishzaakLBX,PenglishzaakLBX') %% \ProvidesFile{british-zaak.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-zaak} \InheritBibliographyStrings{english-zaak} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-zaes.lbx index 4a6acbd21a5..56bab6e7349 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/british-zaes.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/british-zaes.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FbritishzaesLBX,PenglishzaesLBX') %% \ProvidesFile{british-zaes.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-zaes} \InheritBibliographyStrings{english-zaes} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-aefkw.lbx index b062c6d3a6f..8eaa4ba48fc 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-aefkw.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-aefkw.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FcanadianaefkwLBX,PenglishaefkwLBX') %% \ProvidesFile{canadian-aefkw.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-aefkw} \InheritBibliographyStrings{english-aefkw} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-archa.lbx index 872601b81cf..5070bb08874 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-archa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-archa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FcanadianarchaLBX,PenglisharchaLBX') %% \ProvidesFile{canadian-archa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archa} \InheritBibliographyStrings{english-archa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-archaeology.lbx index 46acc3eea76..e4b87fb2099 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-archaeology.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-archaeology.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FcanadianLBX,PenglishLBX') %% \ProvidesFile{canadian-archaeology.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-dguf-alt.lbx index cc1e4b0527f..7a0c5312f46 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-dguf-alt.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-dguf-alt.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FcanadiandgufaltLBX,PenglishLBX') %% \ProvidesFile{canadian-dguf-alt.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-dguf-apa.lbx index 6cef8d8b374..2a556ec666e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-dguf-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-dguf-apa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FcanadiandgufapaLBX,PenglishdgufapaLBX') %% \ProvidesFile{canadian-dguf-apa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-dguf-apa} \InheritBibliographyStrings{english-dguf-apa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-eaz.lbx index eed0eea5ca5..906b7cf6730 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-eaz.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-eaz.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FcanadianeazLBX,PenglisheazLBX') %% \ProvidesFile{canadian-eaz.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-eaz} \InheritBibliographyStrings{english-eaz} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-foe.lbx index 0d649d3bb4d..65dc702f533 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-foe.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-foe.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FcanadianfoeLBX,PenglishfoeLBX') %% \ProvidesFile{canadian-foe.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-foe} \InheritBibliographyStrings{english-foe} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-jb-kreis-neuss.lbx index 8eb4240bd90..822b8e60d23 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-jb-kreis-neuss.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-jb-kreis-neuss.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FcanadianjbkreisneussLBX,PenglishjbkreisneussLBX') %% \ProvidesFile{canadian-jb-kreis-neuss.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-jb-kreis-neuss} \InheritBibliographyStrings{english-jb-kreis-neuss} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-karl.lbx index ef37f5de4a5..8d76b1ffb2a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-karl.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-karl.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FcanadiankarlLBX,PenglishLBX') %% \ProvidesFile{canadian-karl.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-maja.lbx index 3e8678a3641..50b20e953ad 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-maja.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-maja.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FcanadianmajaLBX,PenglishLBX') %% \ProvidesFile{canadian-maja.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-mpk.lbx index 82b869cf916..3c675dca49b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-mpk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-mpk.lbx @@ -7,9 +7,26 @@ %% biblatex-archaeology.dtx (with options: `FcanadianmpkLBX,PenglishmpkLBX') %% \ProvidesFile{canadian-mpk.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-mpk} -\InheritBibliographyStrings{english-mpk} +\InheritBibliographyExtras{english-archaeology} +\DeclareBibliographyStrings{% + inherit = {english-archaeology}, + unpublishedbathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublisheddiplomathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedmagisterthesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedmathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedphdthesis = {{unpublished PhD Dissertation} + {unpublished PhD Dissertation}}, + unpublishedpostdocthesis = {{unpublished Habilitationsschrift} + {unpublished Habilitationsschrift}}, + urlseen = {{last access}{last access}}, +} \endinput %% %% End of file `canadian-mpk.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-mpkoeaw.lbx new file mode 100644 index 00000000000..e0ff9872b6d --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-mpkoeaw.lbx @@ -0,0 +1,16 @@ +%% +%% This is file `canadian-mpkoeaw.lbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `FcanadianmpkoeawLBX,PenglishmpkoeawLBX') +%% +\ProvidesFile{canadian-mpkoeaw.lbx} +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes +\InheritBibliographyExtras{english-mpkoeaw} +\InheritBibliographyStrings{english-mpkoeaw} +\endinput +%% +%% End of file `canadian-mpkoeaw.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-offa.lbx index ceeca3135ef..167a7d57562 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-offa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-offa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FcanadianoffaLBX,PenglishoffaLBX') %% \ProvidesFile{canadian-offa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-offa} \InheritBibliographyStrings{english-offa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-rgzm.lbx index d87970cf6fa..d7aeffa10ec 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-rgzm.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-rgzm.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FcanadianrgzmLBX,PenglishLBX') %% \ProvidesFile{canadian-rgzm.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-zaak.lbx index 36e736f305f..793cb85a200 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-zaak.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-zaak.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FcanadianzaakLBX,PenglishzaakLBX') %% \ProvidesFile{canadian-zaak.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-zaak} \InheritBibliographyStrings{english-zaak} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-zaes.lbx index 7ef4156e874..7bb44fb855e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-zaes.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/canadian-zaes.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FcanadianzaesLBX,PenglishzaesLBX') %% \ProvidesFile{canadian-zaes.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-zaes} \InheritBibliographyStrings{english-zaes} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.bbx index 4900203448b..ffdfda7f6b3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `dgufaltBBX,noarticlesubtitlepunct') %% \ProvidesFile{dguf-alt.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-archaeology} \def\archaeobibstyletitle{\blxarch@style@dgufalt} \DeclareLanguageMappingSuffix{-dguf-alt} @@ -32,6 +32,7 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=false, notitlepunct=false, origfields=true, @@ -60,31 +61,32 @@ } \setlength{\bibhang}{0em} \setlength{\bibitemsep}{\baselineskip} -\renewcommand{\labelnamepunct}{\addspace} -\renewcommand{\booklabelnamepunct}{\addspace} +\renewcommand*{\labelnamepunct}{\addspace} +\renewcommand*{\booklabelnamepunct}{\addspace} \DeclareFieldFormat*{seriesparens}{\mkbibitalic{#1}} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat*{url}{\url{#1}} \DeclareFieldFormat*{urldate}{\mkbibbrackets{#1}} -\renewcommand{\multilistdelim}{\addslash} -\renewcommand{\multinamedelim}{\addcomma\space} -\renewcommand{\finalnamedelim}{\addspace\&\space} -\renewcommand{\mkbibnamefamily}[1]{\MakeUppercase{#1}} -\renewcommand{\mkbibnameprefix}[1]{\MakeUppercase{#1}} -\renewcommand{\mkbibbooknamefamily}[1]{\MakeUppercase{#1}} -\renewcommand{\mkbibbooknameprefix}[1]{\MakeUppercase{#1}} -\renewcommand{\mkbiblistnamefamily}[1]{\MakeUppercase{#1}} -\renewcommand{\mkbiblistnameprefix}[1]{\MakeUppercase{#1}} +\renewcommand*{\multilistdelim}{\addslash} +\renewcommand*{\multinamedelim}{\addcomma\space} +\renewcommand*{\finalnamedelim}{\addspace\&\space} +\renewcommand*{\mkbibnamefamily}[1]{\MakeUppercase{#1}} +\renewcommand*{\mkbibnameprefix}[1]{\MakeUppercase{#1}} +\renewcommand*{\mkbibbooknamefamily}[1]{\MakeUppercase{#1}} +\renewcommand*{\mkbibbooknameprefix}[1]{\MakeUppercase{#1}} +\renewcommand*{\mkbiblistnamefamily}[1]{\MakeUppercase{#1}} +\renewcommand*{\mkbiblistnameprefix}[1]{\MakeUppercase{#1}} \xpretobibmacro{in:}{\itshape} + {}{Patching bibmacro 'in:' failed} \DeclareFieldFormat*{locationdateparens}{\textup{#1}} \DeclareFieldFormat[thesis]{locationdateparens}{#1} \DeclareFieldFormat*{seriesparens}{\mkbibitalic{#1}} \DeclareFieldFormat[thesis]{thesis}{\mkbibitalic{#1}} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat*{pages}{#1} -\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1} +\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1} \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `dguf-alt.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.cbx index a429b7358a5..fa356fea1e1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.cbx @@ -7,12 +7,13 @@ %% biblatex-archaeology.dtx (with options: `dgufaltCBX,barecitations') %% \ProvidesFile{dguf-alt.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{authoryear-archaeology} \def\archaeocitestyletitle{\blxarch@style@dgufalt} -\DeclareFieldFormat*{postnote}{#1} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `dguf-alt.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.dbx index 8b7734b3935..47d27641d30 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-alt.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `dgufaltDBX,DBX') %% \ProvidesFile{dguf-alt.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `dguf-alt.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.bbx index 0d937023e2e..863080621cf 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `dgufapaBBX,noarticlesubtitlepunct') %% \ProvidesFile{dguf-apa.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-archaeology} \def\archaeobibstyletitle{\blxarch@style@dgufapa} \DeclareLanguageMappingSuffix{-dguf-apa} @@ -43,6 +43,7 @@ journallocation=false, maxbooknames=7, minbooknames=7, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=false, notitlepunct=false, origfields=false, @@ -71,16 +72,16 @@ } \setlength{\bibhang}{0em} \setlength{\bibitemsep}{\baselineskip} -\renewcommand{\multicitedelim}{\addsemicolon\space} -\renewcommand{\nameyeardelim}{\addcomma\space} -\renewcommand{\multinamedelim}{\addcomma\space} -\renewcommand{\finalnamedelim}{\addspace\&\space} +\renewcommand*{\multicitedelim}{\addsemicolon\space} +\renewcommand*{\nameyeardelim}{\addcomma\space} +\renewcommand*{\multinamedelim}{\addcomma\space} +\renewcommand*{\finalnamedelim}{\addspace\&\space} \DeclareNameAlias{sortname}{family-given} \DeclareNameAlias{bookauthor}{given-family} -\renewcommand{\labelnamepunct}{\addperiod\space} -\renewcommand{\booklabelnamepunct}{\addcomma\space} -\renewcommand{\intitlepunct}{\printunit{\addspace}} -\renewcommand{\finentrypunct}{% +\renewcommand*{\labelnamepunct}{\addperiod\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} +\renewcommand*{\intitlepunct}{\printunit{\addspace}} +\renewcommand*{\finentrypunct}{% \iffieldundef{doi} {\ifboolexpr{ not test {\iffieldundef{eprint}} @@ -113,12 +114,12 @@ \iffieldundef{maintitle} {\iffieldundef{subseries} {} - {\savefield{subseries}{\blxarch@field@subseries}% + {\savefield*{subseries}{\blxarch@field@subseries}% \restorefield{subtitle}{\blxarch@field@subseries}% \clearfield{volume}% - \savefield{subnumber}{\blxarch@field@subnumber}% + \savefield*{subnumber}{\blxarch@field@subnumber}% \restorefield{volume}{\blxarch@field@subnumber}}} - {\savefield{maintitle}{\blxarch@field@maintitle}% + {\savefield*{maintitle}{\blxarch@field@maintitle}% \restorefield{subtitle}{\blxarch@field@maintitle}}% \usebibmacro{title}% \newunit} @@ -131,17 +132,17 @@ \iffieldundef{maintitle} {\iffieldundef{subseries} {} - {\savefield{subseries}{\blxarch@field@subseries}% + {\savefield*{subseries}{\blxarch@field@subseries}% \restorefield{booksubtitle}{\blxarch@field@subseries}% \clearfield{volume}% - \savefield{subnumber}{\blxarch@field@subnumber}% + \savefield*{subnumber}{\blxarch@field@subnumber}% \restorefield{volume}{\blxarch@field@subnumber}}} - {\savefield{maintitle}{\blxarch@field@maintitle}% + {\savefield*{maintitle}{\blxarch@field@maintitle}% \restorefield{booksubtitle}{\blxarch@field@maintitle}}% \usebibmacro{booktitle}% \newunit} -\renewcommand{\subtitlepunct}{\addcolon\space} -\renewcommand{\titleseriesdelim}{\addspace} +\renewcommand*{\subtitlepunct}{\addcolon\space} +\renewcommand*{\titleseriesdelim}{\addspace} \DeclareFieldFormat*{titlebrackets}{\textup{\mkbibparens{#1}}} \DeclareFieldFormat*{usere}{% \addspace% @@ -153,8 +154,8 @@ } \DeclareFieldFormat*{locationdateparens}{\addperiod\space#1} \DeclareFieldFormat[article,review,suppperiodical]{number}{\mkbibparens{#1}} -\renewcommand{\volumenumberdelim}{} -\renewcommand{\journalvolumedelim}{\addcomma\space} +\renewcommand*{\volumenumberdelim}{} +\renewcommand*{\journalvolumedelim}{\addcomma\space} \DeclareFieldFormat*{journalvolumeblock}{\mkbibitalic{#1}} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat*{volume}{% @@ -170,7 +171,7 @@ \DeclareFieldFormat*{pages}{% \mkbibparens{\mkpageprefix[bookpagination]{#1}}} \DeclareFieldFormat[article,review,suppperiodical]{pages}{#1} -\renewcommand{\bibpagespunct}{% +\renewcommand*{\bibpagespunct}{% \iffieldundef{journaltitle} {\addspace} {\addcomma\space}} @@ -180,9 +181,10 @@ \ifhyperref {\href{http://dx.doi.org/#1}{\nolinkurl{doi:#1}}} {\nolinkurl{doi:#1}}} -\renewcommand{\typeinstitutiondelim}{\addcomma\space} -\xpatchbibmacro{thesistype}{bibstring}{biblstring}{}{} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\typeinstitutiondelim}{\addcomma\space} +\xpatchbibmacro{thesistype}{bibstring}{biblstring} + {}{Patching driver 'thesistype' failed (2)} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `dguf-apa.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.cbx index 470024b16fa..311ab7e91b9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.cbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `dgufapaCBX,barecitations') %% \ProvidesFile{dguf-apa.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{authoryear-archaeology} \def\archaeocitestyletitle{\blxarch@style@dgufapa} \xpatchbibmacro{cite}{\printnames{labelname}}{% @@ -18,7 +18,7 @@ } {\printnames[][-\value{listtotal}]{labelname}} {\printnames{labelname}}% -}{}{} +}{}{Patching bibmacro 'cite' failed} \xpatchbibmacro{textcite}{\printnames{labelname}}{% \ifboolexpr{ not test {\ifciteseen} @@ -27,10 +27,11 @@ } {\printnames[][-\value{listtotal}]{labelname}} {\printnames{labelname}}% -}{}{} -\DeclareFieldFormat*{postnote}{#1} +}{}{Patching bibmacro 'textcite' failed} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `dguf-apa.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.dbx index ace100eb905..4c8dae3ad28 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf-apa.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `dgufapaDBX,DBX') %% \ProvidesFile{dguf-apa.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `dguf-apa.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.bbx index e6026e90122..9d37715462f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `dgufBBX,noarticlesubtitlepunct') %% \ProvidesFile{dguf.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-archaeology} \def\archaeobibstyletitle{\blxarch@style@dguf} \ExecuteBibliographyOptions{ @@ -31,6 +31,7 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=false, notitlepunct=true, origfields=true, @@ -59,17 +60,17 @@ } \setlength{\bibhang}{0em} \setlength{\bibitemsep}{\baselineskip} -\renewcommand{\multilistdelim}{\addspace-\space} -\renewcommand{\labelnamepunct}{\addcomma\space} -\renewcommand{\booklabelnamepunct}{\addcomma\space} -\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}} -\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}} -\xpatchbibmacro{name:andothers}{\bibstring{andothers}}{\bibstring[\mkbibnamefamily]{andothers}}{}{} +\renewcommand*{\multilistdelim}{\addspace-\space} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} +\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}} +\renewcommand*{\mkbibandothers}[1]{\mkbibnamefamily{\#1}} \DeclareNameAlias{bookauthor}{given-family} \DeclareNameAlias{sortname}{family-given} \DeclareFieldFormat*{url}{\url{#1}} \DeclareFieldFormat*{urldate}{\mkbibbrackets{#1}} -\renewcommand{\seriespunct}{\addspace} +\renewcommand*{\seriespunct}{\addspace} \DeclareFieldFormat*{seriesparens}{#1} \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1} \DeclareFieldFormat[thesis]{locationdateparens}{% @@ -83,14 +84,14 @@ {\mkbibparens{#1}} {#1}% } -\renewcommand{\institutionlocationdelim}{\addspace} +\renewcommand*{\institutionlocationdelim}{\addspace} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat*{pages}{#1} -\renewcommand{\bibpagespunct}{% +\renewcommand*{\bibpagespunct}{% \iffieldundef{journaltitle} {\addspace} {\unspace\addcomma\space}} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `dguf.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.cbx index a4c52258730..8e1556d3692 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.cbx @@ -7,12 +7,13 @@ %% biblatex-archaeology.dtx (with options: `dgufCBX,barecitations') %% \ProvidesFile{dguf.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{authoryear-archaeology} \def\archaeocitestyletitle{\blxarch@style@dguf} -\DeclareFieldFormat*{postnote}{#1} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `dguf.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.dbx index 2cdbb8be06a..76577a0addb 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/dguf.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `dgufDBX,DBX') %% \ProvidesFile{dguf.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `dguf.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.bbx index 6ab6abc2fa7..0deba384035 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `eazaltBBX,noarticlesubtitlepunct') %% \ProvidesFile{eaz-alt.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-comp-archaeology} \def\archaeobibstyletitle{\blxarch@style@eazalt} \ExecuteBibliographyOptions{ @@ -32,6 +32,7 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=false, notitlepunct=false, origfields=true, @@ -69,44 +70,46 @@ } \setlength{\bibhang}{2.5em} \DeclareNameAlias{bookauthor}{given-family} -\renewcommand{\mkbibbooknamegiven}[1]{\textsc{#1}} -\renewcommand{\mkbibbooknamefamily}[1]{\textsc{#1}} -\renewcommand{\mkbibbooknameprefix}[1]{\textsc{#1}} -\renewcommand{\mkbibbooknamesuffix}[1]{\textsc{#1}} -\renewcommand{\mkbibsourcenamegiven}[1]{\textsc{#1}} -\renewcommand{\mkbibsourcenamefamily}[1]{\textsc{#1}} -\renewcommand{\mkbibsourcenameprefix}[1]{\textsc{#1}} -\renewcommand{\mkbibsourcenamesuffix}[1]{\textsc{#1}} -\renewcommand{\mkbiblistnamegiven}[1]{\textsc{#1}} -\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}} -\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}} -\renewcommand{\mkbiblistnamesuffix}[1]{\textsc{#1}} +\renewcommand*{\mkbibbooknamegiven}[1]{\textsc{#1}} +\renewcommand*{\mkbibbooknamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbibbooknameprefix}[1]{\textsc{#1}} +\renewcommand*{\mkbibbooknamesuffix}[1]{\textsc{#1}} +\renewcommand*{\mkbibsourcenamegiven}[1]{\textsc{#1}} +\renewcommand*{\mkbibsourcenamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbibsourcenameprefix}[1]{\textsc{#1}} +\renewcommand*{\mkbibsourcenamesuffix}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnamegiven}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnamesuffix}[1]{\textsc{#1}} \def\blxarch@finalnamedelim@sortname{% \ifnumequal{\value{listtotal}}{2} {\addcomma} {}% \addspace\&\space} \def\blxarch@finalnamedelim@default{\addspace\&\space} -\xapptobibmacro{begentry}{\let\finalnamedelim\blxarch@finalnamedelim@sortname}{}{} -\xapptobibmacro{title}{\let\finalnamedelim\blxarch@finalnamedelim@default}{}{} -\renewcommand{\bibnamedash}{\parbox{\bibhang}{\hfill\textendash\hspace*{0.4em}}} -\renewcommand{\labelnamepunct}{\addcolon\space} -\renewcommand{\booklabelnamepunct}{\addcomma\space} +\xapptobibmacro{begentry}{\let\finalnamedelim\blxarch@finalnamedelim@sortname} + {}{Patching bibmacro 'begentry' failed (3)} +\xapptobibmacro{title}{\let\finalnamedelim\blxarch@finalnamedelim@default} + {}{Patching bibmacro 'title' failed} +\renewcommand*{\bibnamedash}{\parbox{\bibhang}{\hfill\textendash\hspace*{0.4em}}} +\renewcommand*{\labelnamepunct}{\addcolon\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} \DeclareFieldFormat*{parens}{#1} -\renewcommand{\multilistdelim}{\addspace\textendash\space} +\renewcommand*{\multilistdelim}{\addspace\textendash\space} \DeclareFieldFormat[inreference]{dictionary}{#1} \DeclareFieldFormat*{volume}{\addspace#1} \DeclareFieldFormat*{seriesparens}{\mkbibparens{#1\addperiod}} -\renewcommand{\seriespunct}{\addspace} -\renewcommand{\noseriespunct}{\addperiod\space} +\renewcommand*{\seriespunct}{\addspace} +\renewcommand*{\noseriespunct}{\addperiod\space} \DeclareFieldFormat*{locationdateparens}{#1} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat*{pages}{#1} \DeclareFieldFormat*{typeinstitution}{\mkbibparens{#1\addperiod}} -\renewcommand{\institutionlocationdelim}{\addspace} +\renewcommand*{\institutionlocationdelim}{\addspace} \DeclareFieldFormat*{url}{\url{#1}} \DeclareFieldFormat*{urldate}{} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `eaz-alt.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.cbx index 592298b0cd8..a1894da68b5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.cbx @@ -7,12 +7,13 @@ %% biblatex-archaeology.dtx (with options: `eazaltCBX,barecitations') %% \ProvidesFile{eaz-alt.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{authoryear-comp-archaeology} \def\archaeocitestyletitle{\blxarch@style@eazalt} -\DeclareFieldFormat*{postnote}{#1} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `eaz-alt.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.dbx index 3c9eb4c4405..7968d5f1a1c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz-alt.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `eazaltDBX,DBX') %% \ProvidesFile{eaz-alt.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `eaz-alt.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.bbx index ba62c1519aa..dc807a4c3ba 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `eazBBX,noarticlesubtitlepunct,nosmallcaps') %% \ProvidesFile{eaz.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-archaeology} \def\archaeobibstyletitle{\blxarch@style@eaz} \DeclareLanguageMappingSuffix{-eaz} @@ -33,6 +33,7 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=false, notitlepunct=false, origfields=true, @@ -61,29 +62,29 @@ } \setlength{\bibhang}{0em} \setlength{\bibitemsep}{\baselineskip} -\renewcommand{\labelnamepunct}{\addcomma\space} -\renewcommand{\booklabelnamepunct}{\addcomma\space} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} \DeclareNameAlias{sortname}{given-family} -\renewcommand{\bibnamedash}{\printtext{\bibstring{idem\thefield{gender}}}} -\renewcommand{\multinamedelim}{\addslash} -\renewcommand{\finalnamedelim}{\multinamedelim} -\renewcommand{\repeatlabeldelim}{\addcolon\space} +\renewcommand*{\bibnamedash}{\printtext{\bibstring{idem\thefield{gender}}}} +\renewcommand*{\multinamedelim}{\addslash} +\renewcommand*{\finalnamedelim}{\multinamedelim} +\renewcommand*{\repeatlabeldelim}{\addcolon\space} \DeclareFieldFormat*{url}{\url{#1}} \DeclareFieldFormat*{urldate}{\mkbibbrackets{#1}} \DeclareFieldFormat*{volume}{\addspace#1} \DeclareFieldFormat*{seriesparens}{#1} \DeclareFieldFormat*{locationdateparens}{#1} -\renewcommand{\institutionlocationdelim}{\addspace} +\renewcommand*{\institutionlocationdelim}{\addspace} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat*{pages}{#1} \DeclareFieldFormat*{booktitleaddon}{\mkbibbrackets{#1}} \DeclareFieldFormat*{titleaddon}{\mkbibbrackets{#1}} \DeclareFieldFormat*{maintitleaddon}{\mkbibbrackets{#1}} -\renewcommand{\mkbibnamefamily}[1]{#1} -\renewcommand{\mkbibnameprefix}[1]{#1} -\renewcommand{\mkbibrepeatfamily}[1]{#1} -\renewcommand{\mkbibrepeatprefix}[1]{#1} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\mkbibnamefamily}[1]{#1} +\renewcommand*{\mkbibnameprefix}[1]{#1} +\renewcommand*{\mkbibrepeatfamily}[1]{#1} +\renewcommand*{\mkbibrepeatprefix}[1]{#1} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `eaz.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.cbx index ed8df9a382a..c313d627c59 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.cbx @@ -7,13 +7,14 @@ %% biblatex-archaeology.dtx (with options: `eazCBX,barecitations') %% \ProvidesFile{eaz.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{authoryear-archaeology} \def\archaeocitestyletitle{\blxarch@style@eaz} -\renewcommand{\multicitedelim}{\addsemicolon\space} -\DeclareFieldFormat*{postnote}{#1} +\renewcommand*{\multicitedelim}{\addsemicolon\space} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `eaz.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.dbx index 9b4bb9926a2..2c8b45ce99e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/eaz.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `eazDBX,DBX') %% \ProvidesFile{eaz.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `eaz.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-aefkw.lbx index 6a074d3e40b..f185e2e2c01 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-aefkw.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-aefkw.lbx @@ -7,9 +7,9 @@ %% biblatex-archaeology.dtx (with options: `aefkwenglishLBX') %% \ProvidesFile{english-aefkw.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} -\InheritBibliographyStrings{german-archaeology} \DeclareBibliographyStrings{% inherit = {german-archaeology}, nodate = {{no date}{n.d\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-archa.lbx index e825558c353..bb3ac1ca14a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-archa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-archa.lbx @@ -7,9 +7,9 @@ %% biblatex-archaeology.dtx (with options: `archaenglishLBX') %% \ProvidesFile{english-archa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} -\InheritBibliographyStrings{english-archaeology} \DeclareBibliographyStrings{% inherit = {english-archaeology}, urlseen = {{last access}{last access}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-archaeology.lbx index 1b11fc5dc3c..779bb79bb74 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-archaeology.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-archaeology.lbx @@ -19,11 +19,14 @@ \NewBibliographyString{exhibition} \NewBibliographyString{exhibcat} \NewBibliographyString{festschrift} -\NewBibliographyString{postdocthesis} +\NewBibliographyString{genitiveandothers} +\NewBibliographyString{genitiveapostrophe} +\NewBibliographyString{genitives} \NewBibliographyString{magisterthesis} \NewBibliographyString{noplacenodate} \NewBibliographyString{noplace} \NewBibliographyString{plate} +\NewBibliographyString{postdocthesis} \NewBibliographyString{specialauction} \NewBibliographyString{specialauctions} \NewBibliographyString{subverbum} @@ -35,13 +38,16 @@ \NewBibliographyString{unpublishedmathesis} \NewBibliographyString{unpublishedmagisterthesis} \ProvidesFile{english-archaeology.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] \InheritBibliographyExtras{british} -\InheritBibliographyStrings{british} -\DeclareRedundantLanguages{english}{english,american,british,canadian,australian,newzealand,USenglish,UKenglish} +\DeclareRedundantLanguages{english} + {english,american,british,canadian,australian,newzealand,USenglish,UKenglish} \DeclareBibliographyStrings{% inherit = {english}, articledated = {{article dated}{article dated}}, + genitiveandothers = {{et\addabbrvspace al\adddot's}{et\addabbrvspace al\adddot's}}, + genitiveapostrophe = {{'}{'}}, + genitives = {{'s}{'s}}, auction = {{auction}{auktion}}, auctions = {{auktions}{auctions}}, bathesis = {{Bachelor thesis}{BA\addabbrvspace thesis}}, @@ -49,29 +55,161 @@ colloquium = {{symposium}{symposium\adddot}}, conference = {{symposium}{symposium\adddot}}, convention = {{symposium}{symposium\adddot}}, + diplomathesis = {{Master's thesis}{MA\addabbrvspace thesis}}, dvd = {{DVD}{DVD}}, exhibcat = {{exhibition catalogue}{exhibition catalogue}}, exhibition = {{exhibition catalogue}{exhibition catalogue}}, festschrift = {{Festschrift}{Festschr\adddot}}, - magisterthesis = {{Magisterarbeit}{MA.-Arb\adddot}}, + magisterthesis = {{Master's thesis}{MA\addabbrvspace thesis}}, nodate = {{no\space date}{n.\addabbrvspace d\adddot}}, postdocthesis = {{Habilitationsschrift}{Habil.-Schr\adddot}}, noplace = {{no\space place}{n.\space p\adddot}}, - noplacenodate = {{no\space place no\space date}{n.\addabbrvspace p\adddot n.\addabbrvspace d\adddot}}, + noplacenodate = {{no\space place no\space date}{n.\addabbrvspace p.\addabbrvspace n.\addabbrvspace d\adddot}}, plate = {{plate}{pl\adddot}}, postdocthesis = {{Habilitationsschrift}{Habil.-Schr\adddot}}, specialauction = {{special auction}{special auction}}, specialauctions = {{special auctions}{special auctions}}, subverbum = {{sub verbum}{\autocap{s}.~v\adddot}}, symposium = {{symposium}{symposium\adddot}}, - unpublishedbathesis = {{ungedruckte Bachelorbeit}{ungedr. BA.-Arb\adddot}}, - unpublisheddiplomathesis = {{ungedruckte Diplomarbeit}{ungedr. Dipl.-Arb\adddot}}, - unpublishedmagisterthesis = {{ungedruckte Magisterarbeit}{ungedr. MA.-Arb\adddot}}, - unpublishedmathesis = {{ungedruckte Masterarbeit}{ungedr. MA.-Arb\adddot}}, - unpublishedpostdocthesis = {{ungedruckte Habilitationsschrift}{ungedr. Habil.-Schr\adddot}}, - unpublishedphdthesis = {{ungedruckte Dissertation}{ungedr. Diss\adddot}}, + unpublishedbathesis = {{unpublished Bachelor thesis}{unpubl. BA\addabbrvspace thesis}}, + unpublisheddiplomathesis = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}}, + unpublishedmagisterthesis = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}}, + unpublishedmathesis = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}}, + unpublishedpostdocthesis = {{unpublished Habilitationsschrift}{unpubl. Habil.-Schr\adddot}}, + unpublishedphdthesis = {{unpublished PhD\addabbrvspace thesis}{unpubl. PhD\addabbrvspace thesis}},, urlfrom = {{Online}{Online}}, } +\protected\gdef\lbx@us@mkdaterangetrunc@long#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \dateeraprint{#2}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \enddateuncertainprint + \dateeraprint{#2}}}}}% + \endgroup} +\protected\gdef\lbx@us@mkdaterangetrunc@short#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day} + \dateeraprint{#2}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \enddateuncertainprint + \dateeraprint{#2}}}}}% + \endgroup} +\protected\gdef\lbx@us@mkdaterangetruncextra@long#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2}}}}}% + \endgroup} +\protected\gdef\lbx@us@mkdaterangetruncextra@short#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2}}}}}% + \endgroup} +\DeclareGenitiveApostropheChars{} \endinput %% %% End of file `english-archaeology.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-dguf-alt.lbx index 7875875aca4..37b37359167 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-dguf-alt.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-dguf-alt.lbx @@ -19,11 +19,14 @@ \NewBibliographyString{exhibition} \NewBibliographyString{exhibcat} \NewBibliographyString{festschrift} -\NewBibliographyString{postdocthesis} +\NewBibliographyString{genitiveandothers} +\NewBibliographyString{genitiveapostrophe} +\NewBibliographyString{genitives} \NewBibliographyString{magisterthesis} \NewBibliographyString{noplacenodate} \NewBibliographyString{noplace} \NewBibliographyString{plate} +\NewBibliographyString{postdocthesis} \NewBibliographyString{specialauction} \NewBibliographyString{specialauctions} \NewBibliographyString{subverbum} @@ -35,13 +38,16 @@ \NewBibliographyString{unpublishedmathesis} \NewBibliographyString{unpublishedmagisterthesis} \ProvidesFile{english-archaeology.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] \InheritBibliographyExtras{british} -\InheritBibliographyStrings{british} -\DeclareRedundantLanguages{english}{english,american,british,canadian,australian,newzealand,USenglish,UKenglish} +\DeclareRedundantLanguages{english} + {english,american,british,canadian,australian,newzealand,USenglish,UKenglish} \DeclareBibliographyStrings{% inherit = {english}, articledated = {{article dated}{article dated}}, + genitiveandothers = {{et\addabbrvspace al\adddot's}{et\addabbrvspace al\adddot's}}, + genitiveapostrophe = {{'}{'}}, + genitives = {{'s}{'s}}, auction = {{auction}{auktion}}, auctions = {{auktions}{auctions}}, bathesis = {{Bachelor thesis}{BA\addabbrvspace thesis}}, @@ -49,29 +55,161 @@ colloquium = {{symposium}{symposium\adddot}}, conference = {{symposium}{symposium\adddot}}, convention = {{symposium}{symposium\adddot}}, + diplomathesis = {{Master's thesis}{MA\addabbrvspace thesis}}, dvd = {{DVD}{DVD}}, exhibcat = {{exhibition catalogue}{exhibition catalogue}}, exhibition = {{exhibition catalogue}{exhibition catalogue}}, festschrift = {{Festschrift}{Festschr\adddot}}, - magisterthesis = {{Magisterarbeit}{MA.-Arb\adddot}}, + magisterthesis = {{Master's thesis}{MA\addabbrvspace thesis}}, nodate = {{no\space date}{n.\addabbrvspace d\adddot}}, postdocthesis = {{Habilitationsschrift}{Habil.-Schr\adddot}}, noplace = {{no\space place}{n.\space p\adddot}}, - noplacenodate = {{no\space place no\space date}{n.\addabbrvspace p\adddot n.\addabbrvspace d\adddot}}, + noplacenodate = {{no\space place no\space date}{n.\addabbrvspace p.\addabbrvspace n.\addabbrvspace d\adddot}}, plate = {{plate}{pl\adddot}}, postdocthesis = {{Habilitationsschrift}{Habil.-Schr\adddot}}, specialauction = {{special auction}{special auction}}, specialauctions = {{special auctions}{special auctions}}, subverbum = {{sub verbum}{\autocap{s}.~v\adddot}}, symposium = {{symposium}{symposium\adddot}}, - unpublishedbathesis = {{ungedruckte Bachelorbeit}{ungedr. BA.-Arb\adddot}}, - unpublisheddiplomathesis = {{ungedruckte Diplomarbeit}{ungedr. Dipl.-Arb\adddot}}, - unpublishedmagisterthesis = {{ungedruckte Magisterarbeit}{ungedr. MA.-Arb\adddot}}, - unpublishedmathesis = {{ungedruckte Masterarbeit}{ungedr. MA.-Arb\adddot}}, - unpublishedpostdocthesis = {{ungedruckte Habilitationsschrift}{ungedr. Habil.-Schr\adddot}}, - unpublishedphdthesis = {{ungedruckte Dissertation}{ungedr. Diss\adddot}}, + unpublishedbathesis = {{unpublished Bachelor thesis}{unpubl. BA\addabbrvspace thesis}}, + unpublisheddiplomathesis = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}}, + unpublishedmagisterthesis = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}}, + unpublishedmathesis = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}}, + unpublishedpostdocthesis = {{unpublished Habilitationsschrift}{unpubl. Habil.-Schr\adddot}}, + unpublishedphdthesis = {{unpublished PhD\addabbrvspace thesis}{unpubl. PhD\addabbrvspace thesis}},, urlfrom = {{Online}{Online}}, } +\protected\gdef\lbx@us@mkdaterangetrunc@long#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \dateeraprint{#2}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \enddateuncertainprint + \dateeraprint{#2}}}}}% + \endgroup} +\protected\gdef\lbx@us@mkdaterangetrunc@short#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day} + \dateeraprint{#2}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \enddateuncertainprint + \dateeraprint{#2}}}}}% + \endgroup} +\protected\gdef\lbx@us@mkdaterangetruncextra@long#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2}}}}}% + \endgroup} +\protected\gdef\lbx@us@mkdaterangetruncextra@short#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2}}}}}% + \endgroup} +\DeclareGenitiveApostropheChars{} \endinput %% %% End of file `english-dguf-alt.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-dguf-apa.lbx index 395f2c60fbf..088ef2f1d4b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-dguf-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-dguf-apa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `dgufapaenglishLBX') %% \ProvidesFile{english-dguf-apa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \DeclareBibliographyExtras{% diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-eaz.lbx index 6107e03166c..faed44c5a0a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-eaz.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-eaz.lbx @@ -7,9 +7,9 @@ %% biblatex-archaeology.dtx (with options: `eazenglishLBX') %% \ProvidesFile{english-eaz.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} -\InheritBibliographyStrings{english-archaeology} \DeclareBibliographyStrings{% inherit = {english-archaeology}, subverbum = {{keyword}{keyword}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-foe.lbx index bfd30ed639b..d0ea7e7bd18 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-foe.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-foe.lbx @@ -7,9 +7,8 @@ %% biblatex-archaeology.dtx (with options: `foeenglishLBX') %% \ProvidesFile{english-foe.lbx} -[2017/11/16 v1.3 biblatex-archaeology (Ingram Braun) based on biblatex] +[2018/06/10 v2.0 biblatex-archaeology (Ingram Braun) based on biblatex] \InheritBibliographyExtras{english-archaeology} -\InheritBibliographyStrings{english-archaeology} \DeclareBibliographyStrings{% inherit = {english-archaeology}, urlseen = {{accessed}{accessed}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-jb-kreis-neuss.lbx index 7690c584172..310b23dcaf0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-jb-kreis-neuss.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-jb-kreis-neuss.lbx @@ -7,9 +7,9 @@ %% biblatex-archaeology.dtx (with options: `jbkreisneussenglishLBX') %% \ProvidesFile{english-jb-kreis-neuss.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} -\InheritBibliographyStrings{english-archaeology} \DeclareBibliographyStrings{% inherit = {english-archaeology}, ibidem = {{ibidem}{ibidem}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-karl.lbx index 4a58ecf8de7..c5523de2f77 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-karl.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-karl.lbx @@ -19,11 +19,14 @@ \NewBibliographyString{exhibition} \NewBibliographyString{exhibcat} \NewBibliographyString{festschrift} -\NewBibliographyString{postdocthesis} +\NewBibliographyString{genitiveandothers} +\NewBibliographyString{genitiveapostrophe} +\NewBibliographyString{genitives} \NewBibliographyString{magisterthesis} \NewBibliographyString{noplacenodate} \NewBibliographyString{noplace} \NewBibliographyString{plate} +\NewBibliographyString{postdocthesis} \NewBibliographyString{specialauction} \NewBibliographyString{specialauctions} \NewBibliographyString{subverbum} @@ -35,13 +38,16 @@ \NewBibliographyString{unpublishedmathesis} \NewBibliographyString{unpublishedmagisterthesis} \ProvidesFile{english-archaeology.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] \InheritBibliographyExtras{british} -\InheritBibliographyStrings{british} -\DeclareRedundantLanguages{english}{english,american,british,canadian,australian,newzealand,USenglish,UKenglish} +\DeclareRedundantLanguages{english} + {english,american,british,canadian,australian,newzealand,USenglish,UKenglish} \DeclareBibliographyStrings{% inherit = {english}, articledated = {{article dated}{article dated}}, + genitiveandothers = {{et\addabbrvspace al\adddot's}{et\addabbrvspace al\adddot's}}, + genitiveapostrophe = {{'}{'}}, + genitives = {{'s}{'s}}, auction = {{auction}{auktion}}, auctions = {{auktions}{auctions}}, bathesis = {{Bachelor thesis}{BA\addabbrvspace thesis}}, @@ -49,29 +55,161 @@ colloquium = {{symposium}{symposium\adddot}}, conference = {{symposium}{symposium\adddot}}, convention = {{symposium}{symposium\adddot}}, + diplomathesis = {{Master's thesis}{MA\addabbrvspace thesis}}, dvd = {{DVD}{DVD}}, exhibcat = {{exhibition catalogue}{exhibition catalogue}}, exhibition = {{exhibition catalogue}{exhibition catalogue}}, festschrift = {{Festschrift}{Festschr\adddot}}, - magisterthesis = {{Magisterarbeit}{MA.-Arb\adddot}}, + magisterthesis = {{Master's thesis}{MA\addabbrvspace thesis}}, nodate = {{no\space date}{n.\addabbrvspace d\adddot}}, postdocthesis = {{Habilitationsschrift}{Habil.-Schr\adddot}}, noplace = {{no\space place}{n.\space p\adddot}}, - noplacenodate = {{no\space place no\space date}{n.\addabbrvspace p\adddot n.\addabbrvspace d\adddot}}, + noplacenodate = {{no\space place no\space date}{n.\addabbrvspace p.\addabbrvspace n.\addabbrvspace d\adddot}}, plate = {{plate}{pl\adddot}}, postdocthesis = {{Habilitationsschrift}{Habil.-Schr\adddot}}, specialauction = {{special auction}{special auction}}, specialauctions = {{special auctions}{special auctions}}, subverbum = {{sub verbum}{\autocap{s}.~v\adddot}}, symposium = {{symposium}{symposium\adddot}}, - unpublishedbathesis = {{ungedruckte Bachelorbeit}{ungedr. BA.-Arb\adddot}}, - unpublisheddiplomathesis = {{ungedruckte Diplomarbeit}{ungedr. Dipl.-Arb\adddot}}, - unpublishedmagisterthesis = {{ungedruckte Magisterarbeit}{ungedr. MA.-Arb\adddot}}, - unpublishedmathesis = {{ungedruckte Masterarbeit}{ungedr. MA.-Arb\adddot}}, - unpublishedpostdocthesis = {{ungedruckte Habilitationsschrift}{ungedr. Habil.-Schr\adddot}}, - unpublishedphdthesis = {{ungedruckte Dissertation}{ungedr. Diss\adddot}}, + unpublishedbathesis = {{unpublished Bachelor thesis}{unpubl. BA\addabbrvspace thesis}}, + unpublisheddiplomathesis = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}}, + unpublishedmagisterthesis = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}}, + unpublishedmathesis = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}}, + unpublishedpostdocthesis = {{unpublished Habilitationsschrift}{unpubl. Habil.-Schr\adddot}}, + unpublishedphdthesis = {{unpublished PhD\addabbrvspace thesis}{unpubl. PhD\addabbrvspace thesis}},, urlfrom = {{Online}{Online}}, } +\protected\gdef\lbx@us@mkdaterangetrunc@long#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \dateeraprint{#2}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \enddateuncertainprint + \dateeraprint{#2}}}}}% + \endgroup} +\protected\gdef\lbx@us@mkdaterangetrunc@short#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day} + \dateeraprint{#2}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \enddateuncertainprint + \dateeraprint{#2}}}}}% + \endgroup} +\protected\gdef\lbx@us@mkdaterangetruncextra@long#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2}}}}}% + \endgroup} +\protected\gdef\lbx@us@mkdaterangetruncextra@short#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2}}}}}% + \endgroup} +\DeclareGenitiveApostropheChars{} \endinput %% %% End of file `english-karl.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-maja.lbx index e153230ef84..d8b51b78806 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-maja.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-maja.lbx @@ -19,11 +19,14 @@ \NewBibliographyString{exhibition} \NewBibliographyString{exhibcat} \NewBibliographyString{festschrift} -\NewBibliographyString{postdocthesis} +\NewBibliographyString{genitiveandothers} +\NewBibliographyString{genitiveapostrophe} +\NewBibliographyString{genitives} \NewBibliographyString{magisterthesis} \NewBibliographyString{noplacenodate} \NewBibliographyString{noplace} \NewBibliographyString{plate} +\NewBibliographyString{postdocthesis} \NewBibliographyString{specialauction} \NewBibliographyString{specialauctions} \NewBibliographyString{subverbum} @@ -35,13 +38,16 @@ \NewBibliographyString{unpublishedmathesis} \NewBibliographyString{unpublishedmagisterthesis} \ProvidesFile{english-archaeology.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] \InheritBibliographyExtras{british} -\InheritBibliographyStrings{british} -\DeclareRedundantLanguages{english}{english,american,british,canadian,australian,newzealand,USenglish,UKenglish} +\DeclareRedundantLanguages{english} + {english,american,british,canadian,australian,newzealand,USenglish,UKenglish} \DeclareBibliographyStrings{% inherit = {english}, articledated = {{article dated}{article dated}}, + genitiveandothers = {{et\addabbrvspace al\adddot's}{et\addabbrvspace al\adddot's}}, + genitiveapostrophe = {{'}{'}}, + genitives = {{'s}{'s}}, auction = {{auction}{auktion}}, auctions = {{auktions}{auctions}}, bathesis = {{Bachelor thesis}{BA\addabbrvspace thesis}}, @@ -49,29 +55,161 @@ colloquium = {{symposium}{symposium\adddot}}, conference = {{symposium}{symposium\adddot}}, convention = {{symposium}{symposium\adddot}}, + diplomathesis = {{Master's thesis}{MA\addabbrvspace thesis}}, dvd = {{DVD}{DVD}}, exhibcat = {{exhibition catalogue}{exhibition catalogue}}, exhibition = {{exhibition catalogue}{exhibition catalogue}}, festschrift = {{Festschrift}{Festschr\adddot}}, - magisterthesis = {{Magisterarbeit}{MA.-Arb\adddot}}, + magisterthesis = {{Master's thesis}{MA\addabbrvspace thesis}}, nodate = {{no\space date}{n.\addabbrvspace d\adddot}}, postdocthesis = {{Habilitationsschrift}{Habil.-Schr\adddot}}, noplace = {{no\space place}{n.\space p\adddot}}, - noplacenodate = {{no\space place no\space date}{n.\addabbrvspace p\adddot n.\addabbrvspace d\adddot}}, + noplacenodate = {{no\space place no\space date}{n.\addabbrvspace p.\addabbrvspace n.\addabbrvspace d\adddot}}, plate = {{plate}{pl\adddot}}, postdocthesis = {{Habilitationsschrift}{Habil.-Schr\adddot}}, specialauction = {{special auction}{special auction}}, specialauctions = {{special auctions}{special auctions}}, subverbum = {{sub verbum}{\autocap{s}.~v\adddot}}, symposium = {{symposium}{symposium\adddot}}, - unpublishedbathesis = {{ungedruckte Bachelorbeit}{ungedr. BA.-Arb\adddot}}, - unpublisheddiplomathesis = {{ungedruckte Diplomarbeit}{ungedr. Dipl.-Arb\adddot}}, - unpublishedmagisterthesis = {{ungedruckte Magisterarbeit}{ungedr. MA.-Arb\adddot}}, - unpublishedmathesis = {{ungedruckte Masterarbeit}{ungedr. MA.-Arb\adddot}}, - unpublishedpostdocthesis = {{ungedruckte Habilitationsschrift}{ungedr. Habil.-Schr\adddot}}, - unpublishedphdthesis = {{ungedruckte Dissertation}{ungedr. Diss\adddot}}, + unpublishedbathesis = {{unpublished Bachelor thesis}{unpubl. BA\addabbrvspace thesis}}, + unpublisheddiplomathesis = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}}, + unpublishedmagisterthesis = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}}, + unpublishedmathesis = {{unpublished master's thesis}{unpubl. MA\addabbrvspace thesis}}, + unpublishedpostdocthesis = {{unpublished Habilitationsschrift}{unpubl. Habil.-Schr\adddot}}, + unpublishedphdthesis = {{unpublished PhD\addabbrvspace thesis}{unpubl. PhD\addabbrvspace thesis}},, urlfrom = {{Online}{Online}}, } +\protected\gdef\lbx@us@mkdaterangetrunc@long#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% + \dateeraprint{#2}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \enddateuncertainprint + \dateeraprint{#2}}}}}% + \endgroup} +\protected\gdef\lbx@us@mkdaterangetrunc@short#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day} + \dateeraprint{#2}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \enddateuncertainprint + \dateeraprint{#2}}}}}% + \endgroup} +\protected\gdef\lbx@us@mkdaterangetruncextra@long#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2}}}}}% + \endgroup} +\protected\gdef\lbx@us@mkdaterangetruncextra@short#1#2{% + \begingroup + \blx@metadateinfo{#2}% + \iffieldundef{#2year} + {} + {\datecircaprint + \printtext[#2date]{% + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}} + {\iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibseasondate#1}{}{#2season}} + {\csuse{mkbibseasondate#1}{#2year}{#2season}}% + \dateeraprint{#2}}% + \dateuncertainprint + \iffieldundef{#2endyear} + {\printfield{extradate}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extradate}% + \mbox{\bibdaterangesep}} + {\bibdaterangesepx{#2}% + \enddatecircaprint + \iffieldundef{#2season} + {\iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + \printfield{extradate}% + \enddateuncertainprint + \dateeraprint{#2}}}}}% + \endgroup} +\DeclareGenitiveApostropheChars{} \endinput %% %% End of file `english-maja.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-mpk.lbx index b8c4faeb45b..bbd8d6b8bdd 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-mpk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-mpk.lbx @@ -7,9 +7,9 @@ %% biblatex-archaeology.dtx (with options: `mpkenglishLBX') %% \ProvidesFile{english-mpk.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} -\InheritBibliographyStrings{english-archaeology} \DeclareBibliographyStrings{% inherit = {english-archaeology}, urlseen = {{last access}{last access}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-mpkoeaw.lbx new file mode 100644 index 00000000000..d864aa90f83 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-mpkoeaw.lbx @@ -0,0 +1,39 @@ +%% +%% This is file `english-mpkoeaw.lbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `mpkoeawenglishLBX') +%% +\ProvidesFile{english-mpkoeaw.lbx} +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes +\InheritBibliographyExtras{english-archaeology} +\InheritBibliographyExtras{english-archaeology} +\DeclareBibliographyStrings{% + inherit = {english-archaeology}, + exhibcat = {{Exhibition catalogue}{Exhibition catalogue}}, + exhibition = {{Exhibition catalogue}{Exhibition catalogue}}, + in = {{In}{In}}, + phdthesis = {{PhD Dissertation} + {PhD Dissertation}}, + postdocthesis = {{Habilitationsschrift} + {Habilitationsschrift}}, + unpublishedbathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublisheddiplomathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedmagisterthesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedmathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedphdthesis = {{unpublished PhD Dissertation} + {unpublished PhD Dissertation}}, + unpublishedpostdocthesis = {{unpublished Habilitationsschrift} + {unpublished Habilitationsschrift}}, + urlseen = {{last access}{last access}}, +} +\endinput +%% +%% End of file `english-mpkoeaw.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-offa.lbx index 3ab54c87ad9..41334c6994e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-offa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-offa.lbx @@ -7,9 +7,9 @@ %% biblatex-archaeology.dtx (with options: `offaenglishLBX') %% \ProvidesFile{english-offa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} -\InheritBibliographyStrings{english-archaeology} \DeclareBibliographyStrings{% inherit = {english-archaeology}, nodate = {{no date}{n.d\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-rgzm.lbx index 8fd6b0003e5..7ff5ddd3d9a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-rgzm.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-rgzm.lbx @@ -4,74 +4,13 @@ %% %% The original source files were: %% -%% biblatex-archaeology.dtx (with options: `newbibstrings,englishLBX') +%% biblatex-archaeology.dtx (with options: `FenglishrgzmLBX,PenglishLBX') %% -\NewBibliographyString{articledated} -\NewBibliographyString{auction} -\NewBibliographyString{auctions} -\NewBibliographyString{bathesis} -\NewBibliographyString{catalogue} -\NewBibliographyString{colloquium} -\NewBibliographyString{conference} -\NewBibliographyString{convention} -\NewBibliographyString{diplomathesis} -\NewBibliographyString{dvd} -\NewBibliographyString{exhibition} -\NewBibliographyString{exhibcat} -\NewBibliographyString{festschrift} -\NewBibliographyString{postdocthesis} -\NewBibliographyString{magisterthesis} -\NewBibliographyString{noplacenodate} -\NewBibliographyString{noplace} -\NewBibliographyString{plate} -\NewBibliographyString{specialauction} -\NewBibliographyString{specialauctions} -\NewBibliographyString{subverbum} -\NewBibliographyString{symposium} -\NewBibliographyString{unpublishedbathesis} -\NewBibliographyString{unpublishedpostdocthesis} -\NewBibliographyString{unpublisheddiplomathesis} -\NewBibliographyString{unpublishedphdthesis} -\NewBibliographyString{unpublishedmathesis} -\NewBibliographyString{unpublishedmagisterthesis} -\ProvidesFile{english-archaeology.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] -\InheritBibliographyExtras{british} -\InheritBibliographyStrings{british} -\DeclareRedundantLanguages{english}{english,american,british,canadian,australian,newzealand,USenglish,UKenglish} -\DeclareBibliographyStrings{% - inherit = {english}, - articledated = {{article dated}{article dated}}, - auction = {{auction}{auktion}}, - auctions = {{auktions}{auctions}}, - bathesis = {{Bachelor thesis}{BA\addabbrvspace thesis}}, - catalogue = {{catalogue}{catalogue}}, - colloquium = {{symposium}{symposium\adddot}}, - conference = {{symposium}{symposium\adddot}}, - convention = {{symposium}{symposium\adddot}}, - dvd = {{DVD}{DVD}}, - exhibcat = {{exhibition catalogue}{exhibition catalogue}}, - exhibition = {{exhibition catalogue}{exhibition catalogue}}, - festschrift = {{Festschrift}{Festschr\adddot}}, - magisterthesis = {{Magisterarbeit}{MA.-Arb\adddot}}, - nodate = {{no\space date}{n.\addabbrvspace d\adddot}}, - postdocthesis = {{Habilitationsschrift}{Habil.-Schr\adddot}}, - noplace = {{no\space place}{n.\space p\adddot}}, - noplacenodate = {{no\space place no\space date}{n.\addabbrvspace p\adddot n.\addabbrvspace d\adddot}}, - plate = {{plate}{pl\adddot}}, - postdocthesis = {{Habilitationsschrift}{Habil.-Schr\adddot}}, - specialauction = {{special auction}{special auction}}, - specialauctions = {{special auctions}{special auctions}}, - subverbum = {{sub verbum}{\autocap{s}.~v\adddot}}, - symposium = {{symposium}{symposium\adddot}}, - unpublishedbathesis = {{ungedruckte Bachelorbeit}{ungedr. BA.-Arb\adddot}}, - unpublisheddiplomathesis = {{ungedruckte Diplomarbeit}{ungedr. Dipl.-Arb\adddot}}, - unpublishedmagisterthesis = {{ungedruckte Magisterarbeit}{ungedr. MA.-Arb\adddot}}, - unpublishedmathesis = {{ungedruckte Masterarbeit}{ungedr. MA.-Arb\adddot}}, - unpublishedpostdocthesis = {{ungedruckte Habilitationsschrift}{ungedr. Habil.-Schr\adddot}}, - unpublishedphdthesis = {{ungedruckte Dissertation}{ungedr. Diss\adddot}}, - urlfrom = {{Online}{Online}}, -} +\ProvidesFile{english-rgzm.lbx} +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes +\InheritBibliographyExtras{english-archaeology} +\InheritBibliographyStrings{english-archaeology} \endinput %% %% End of file `english-rgzm.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-zaak.lbx index 4617415fdf8..4e96c25536a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-zaak.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-zaak.lbx @@ -7,9 +7,9 @@ %% biblatex-archaeology.dtx (with options: `zaakenglishLBX') %% \ProvidesFile{english-zaak.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} -\InheritBibliographyStrings{english-archaeology} \DeclareBibliographyStrings{% inherit = {english-archaeology}, urlfrom = {{In}{In}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-zaes.lbx index 01e125b412f..7a6f7636e99 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/english-zaes.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/english-zaes.lbx @@ -7,9 +7,9 @@ %% biblatex-archaeology.dtx (with options: `zaesenglishLBX') %% \ProvidesFile{english-zaes.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} -\InheritBibliographyStrings{english-archaeology} \DeclareBibliographyStrings{% inherit = {english-archaeology}, ibidem = {{l.\,c\adddot}{l.\,c\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.bbx index 74474397788..7057a7cc8ce 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `foeBBX,noarticlesubtitlepunct') %% \ProvidesFile{foe.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-archaeology} \def\archaeobibstyletitle{\blxarch@style@foe} \DeclareLanguageMappingSuffix{-foe} @@ -33,6 +33,7 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=4, nothesistitlepunct=false, notitlepunct=false, origfields=true, @@ -62,22 +63,22 @@ \setlength{\bibhang}{0em} \setlength{\bibitemsep}{\baselineskip} -\renewcommand{\repeatlabeldelim}{\mkbibbold{\addcolon\space}} -\renewcommand{\repeatlabelwrap}[1]{\mkbibbold{#1}} +\renewcommand*{\repeatlabeldelim}{\mkbibbold{\addcolon\space}} +\DeclareFieldFormat*{repeatlabel}{\mkbibbold{#1}} \DeclareNameAlias{bookauthor}{given-family} \DeclareNameAlias{sortname}{given-family} -\renewcommand{\mkbibbooknamegiven}[1]{\textsc{#1}} -\renewcommand{\mkbibbooknamefamily}[1]{\textsc{#1}} -\renewcommand{\mkbibbooknameprefix}[1]{\textsc{#1}} -\renewcommand{\mkbibbooknamesuffix}[1]{\textsc{#1}} -\renewcommand{\mkbibsourcenamegiven}[1]{\textsc{#1}} -\renewcommand{\mkbibsourcenamefamily}[1]{\textsc{#1}} -\renewcommand{\mkbibsourcenameprefix}[1]{\textsc{#1}} -\renewcommand{\mkbibsourcenamesuffix}[1]{\textsc{#1}} -\renewcommand{\mkbiblistnamegiven}[1]{\textsc{#1}} -\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}} -\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}} -\renewcommand{\mkbiblistnamesuffix}[1]{\textsc{#1}} +\renewcommand*{\mkbibbooknamegiven}[1]{\textsc{#1}} +\renewcommand*{\mkbibbooknamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbibbooknameprefix}[1]{\textsc{#1}} +\renewcommand*{\mkbibbooknamesuffix}[1]{\textsc{#1}} +\renewcommand*{\mkbibsourcenamegiven}[1]{\textsc{#1}} +\renewcommand*{\mkbibsourcenamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbibsourcenameprefix}[1]{\textsc{#1}} +\renewcommand*{\mkbibsourcenamesuffix}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnamegiven}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnamesuffix}[1]{\textsc{#1}} \DeclareFieldFormat*{title}{\mkbibitalic{#1}} \DeclareFieldFormat[book,collection,manual,proceedings,reference,report,thesis,unpublished]{title}{% \iffieldundef{series} @@ -91,23 +92,23 @@ \iffieldundef{series} {#1} {\mkbibitalic{#1}}} -\renewcommand{\labelnamepunct}{\addcomma\space} -\renewcommand{\booklabelnamepunct}{\addcomma\space} -\renewcommand{\newunitpunct}{\addcomma\space} -\renewcommand{\inbookbookdelim}{\addperiod\space} -\renewcommand{\finalnamedelim}{\addspace\biblstring{and}\space} -\renewcommand{\seriespunct}{\addcomma\addspace} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} +\renewcommand*{\newunitpunct}{\addcomma\space} +\renewcommand*{\inbookbookdelim}{\addperiod\space} +\renewcommand*{\finalnamedelim}{\addspace\biblstring{and}\space} +\renewcommand*{\seriespunct}{\addcomma\addspace} \DeclareFieldFormat*{seriesparens}{#1} -\renewcommand{\subnumberseriesdelim}{\newunitpunct} +\renewcommand*{\subnumberseriesdelim}{\newunitpunct} \DeclareFieldFormat*{locationdateparens}{#1} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat*{reprintparens}{\newunitpunct#1} -\DeclareFieldFormat*{realdateparen}{\mkbibparens{#1}} -\DeclareFieldFormat*{origrealdateparen}{\mkbibparens{#1}} +\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}} +\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}} \DeclareFieldFormat*{pages}{#1} \DeclareFieldFormat*{volume}{\addspace#1} \DeclareFieldFormat*{url}{\url{#1}} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `foe.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.cbx index c0fbb7ad66e..9b2bf01f063 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.cbx @@ -7,13 +7,14 @@ %% biblatex-archaeology.dtx (with options: `foeCBX,barecitations') %% \ProvidesFile{foe.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{authoryear-archaeology} \def\archaeocitestyletitle{\blxarch@style@foe} \ExecuteBibliographyOptions{autocite=footnote} -\DeclareFieldFormat*{postnote}{#1} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `foe.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.dbx index dae5773c548..eb0dd4fe889 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/foe.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `foeDBX,DBX') %% \ProvidesFile{foe.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `foe.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-aefkw.lbx index 3a76e73ff1b..91782009da1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-aefkw.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-aefkw.lbx @@ -7,63 +7,62 @@ %% biblatex-archaeology.dtx (with options: `aefkwgermanLBX') %% \ProvidesFile{zaas-german.lbx} -[2017/11/16 v1.3 biblatex-archaeology (Ingram Braun) based on biblatex] +[2018/06/10 v2.0 biblatex-archaeology (Ingram Braun) based on biblatex] \InheritBibliographyExtras{german-archaeology} -\InheritBibliographyStrings{german-archaeology} \DeclareBibliographyStrings{% - inherit = {german-archaeology}, - byeditor = {{herausgegeben von}{hg\adddotspace von}}, - byeditortr = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}% - {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}}, - byeditorco = {{herausgegeben und kommentiert von}% - {hg\adddotspace und komm\adddot\ von}}, - byeditoran = {{herausgegeben und erl\"autert von}% - {hg\adddotspace und erl\"aut\adddot\ von}}, - byeditorin = {{herausgegeben und mit einer Einleitung versehen von}% - {hg\adddotspace und mit einer Einl\adddot\ vers\adddot\ von}}, - byeditorfo = {{herausgegeben und mit einem Vorwort versehen von}% - {hg\adddotspace und mit einem Vorw\adddot\ vers\adddot\ von}}, - byeditoraf = {{herausgegeben und mit einem Nachwort versehen von}% - {hg\adddotspace und mit einem Nachw\adddot\ vers\adddot\ von}}, - byeditortrco = {{herausgegeben, \lbx@lfromlang \"ubersetzt und kommentiert von}% - {hg., \lbx@sfromlang \"ubers\adddot\ und komm\adddot\ von}}, - byeditortran = {{herausgegeben, \lbx@lfromlang \"ubersetzt und erl\"autert von}% - {hg., \lbx@sfromlang \"ubers\adddot\ und erl\"aut\adddot\ von}}, - byeditortrin = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einer Einleitung versehen von}% - {hg., \lbx@sfromlang \"ubers\adddot\ und Einl\adddot\ von}}, - byeditortrfo = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Vorwort versehen von}% - {hg., \lbx@sfromlang \"ubers\adddot\ und Vorw\adddot\ von}}, - byeditortraf = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Nachwort versehen von}% - {hg., \lbx@sfromlang \"ubers\adddot\ und Nachw\adddot\ von}}, - byeditorcoin = {{herausgegeben, kommentiert und mit einer Einleitung versehen von}% - {hg., komm\adddot\ und Einl\adddot\ von}}, - byeditorcofo = {{herausgegeben, kommentiert und mit einem Vorwort versehen von}% - {hg., komm\adddot\ und Vorw\adddot\ von}}, - byeditorcoaf = {{herausgegeben, kommentiert und mit einem Nachwort versehen von}% - {hg., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}}, - byeditoranin = {{herausgegeben, erl\"autert und mit einer Einleitung versehen von}% - {hg., erl\"aut\adddot\ und Einl\adddot\ von}}, - byeditoranfo = {{herausgegeben, erl\"autert und mit einem Vorwort versehen von}% - {hg., erl\"aut\adddot\ und Vorw\adddot\ von}}, - byeditoranaf = {{herausgegeben, erl\"autert und mit einem Nachwort versehen von}% - {hg., erl\"aut\adddot\ und Nachw\adddot\ von}}, - byeditortrcoin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}% - {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Einl\adddot\ von}}, - byeditortrcofo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}% - {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Vorw\adddot\ von}}, - byeditortrcoaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}% - {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Nachw\adddot\ von}}, - byeditortranin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}% - {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Einl\adddot\ von}}, - byeditortranfo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}% - {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Vorw\adddot\ von}}, - byeditortranaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}% - {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Nachw\adddot\ von}}, - byeditortr = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}% - {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}}, - editor = {{Herausgeber}{Hg\adddot}}, - editors = {{Herausgeber}{Hgg\adddot}}, - nodate = {{ohne Jahr}{o.J\adddot}}, + inherit = {german-archaeology}, + byeditor = {{herausgegeben von}{hg\adddotspace von}}, + byeditortr = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}% + {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}}, + byeditorco = {{herausgegeben und kommentiert von}% + {hg\adddotspace und komm\adddot\ von}}, + byeditoran = {{herausgegeben und erl\"autert von}% + {hg\adddotspace und erl\"aut\adddot\ von}}, + byeditorin = {{herausgegeben und mit einer Einleitung versehen von}% + {hg\adddotspace und mit einer Einl\adddot\ vers\adddot\ von}}, + byeditorfo = {{herausgegeben und mit einem Vorwort versehen von}% + {hg\adddotspace und mit einem Vorw\adddot\ vers\adddot\ von}}, + byeditoraf = {{herausgegeben und mit einem Nachwort versehen von}% + {hg\adddotspace und mit einem Nachw\adddot\ vers\adddot\ von}}, + byeditortrco = {{herausgegeben, \lbx@lfromlang \"ubersetzt und kommentiert von}% + {hg., \lbx@sfromlang \"ubers\adddot\ und komm\adddot\ von}}, + byeditortran = {{herausgegeben, \lbx@lfromlang \"ubersetzt und erl\"autert von}% + {hg., \lbx@sfromlang \"ubers\adddot\ und erl\"aut\adddot\ von}}, + byeditortrin = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einer Einleitung versehen von}% + {hg., \lbx@sfromlang \"ubers\adddot\ und Einl\adddot\ von}}, + byeditortrfo = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Vorwort versehen von}% + {hg., \lbx@sfromlang \"ubers\adddot\ und Vorw\adddot\ von}}, + byeditortraf = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Nachwort versehen von}% + {hg., \lbx@sfromlang \"ubers\adddot\ und Nachw\adddot\ von}}, + byeditorcoin = {{herausgegeben, kommentiert und mit einer Einleitung versehen von}% + {hg., komm\adddot\ und Einl\adddot\ von}}, + byeditorcofo = {{herausgegeben, kommentiert und mit einem Vorwort versehen von}% + {hg., komm\adddot\ und Vorw\adddot\ von}}, + byeditorcoaf = {{herausgegeben, kommentiert und mit einem Nachwort versehen von}% + {hg., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}}, + byeditoranin = {{herausgegeben, erl\"autert und mit einer Einleitung versehen von}% + {hg., erl\"aut\adddot\ und Einl\adddot\ von}}, + byeditoranfo = {{herausgegeben, erl\"autert und mit einem Vorwort versehen von}% + {hg., erl\"aut\adddot\ und Vorw\adddot\ von}}, + byeditoranaf = {{herausgegeben, erl\"autert und mit einem Nachwort versehen von}% + {hg., erl\"aut\adddot\ und Nachw\adddot\ von}}, + byeditortrcoin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}% + {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Einl\adddot\ von}}, + byeditortrcofo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}% + {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Vorw\adddot\ von}}, + byeditortrcoaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}% + {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Nachw\adddot\ von}}, + byeditortranin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}% + {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Einl\adddot\ von}}, + byeditortranfo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}% + {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Vorw\adddot\ von}}, + byeditortranaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}% + {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Nachw\adddot\ von}}, + byeditortr = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}% + {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}}, + editor = {{Herausgeber}{Hg\adddot}}, + editors = {{Herausgeber}{Hgg\adddot}}, + nodate = {{ohne Jahr}{o.J\adddot}}, } \endinput %% diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-archa.lbx index bed83391d84..2959ee22304 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-archa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-archa.lbx @@ -7,12 +7,12 @@ %% biblatex-archaeology.dtx (with options: `archagermanLBX') %% \ProvidesFile{german-archa.lbx} -[2017/11/16 v1.3 biblatex-archaeology (Ingram Braun) based on biblatex] +[2018/06/10 v2.0 biblatex-archaeology (Ingram Braun) based on biblatex] \InheritBibliographyExtras{german-archaeology} -\InheritBibliographyStrings{german-archaeology} \DeclareBibliographyStrings{% inherit = {german-archaeology}, andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + genitiveandothers = {{et\addabbrvspace al\adddot s}{et\addabbrvspace al\adddot s}}, urlseen = {{letzter Zugriff}{letzter Zugriff}}, } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-archaeology.lbx index 70b34c88686..5ace99992ee 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-archaeology.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-archaeology.lbx @@ -19,11 +19,14 @@ \NewBibliographyString{exhibition} \NewBibliographyString{exhibcat} \NewBibliographyString{festschrift} -\NewBibliographyString{postdocthesis} +\NewBibliographyString{genitiveandothers} +\NewBibliographyString{genitiveapostrophe} +\NewBibliographyString{genitives} \NewBibliographyString{magisterthesis} \NewBibliographyString{noplacenodate} \NewBibliographyString{noplace} \NewBibliographyString{plate} +\NewBibliographyString{postdocthesis} \NewBibliographyString{specialauction} \NewBibliographyString{specialauctions} \NewBibliographyString{subverbum} @@ -35,14 +38,16 @@ \NewBibliographyString{unpublishedmathesis} \NewBibliographyString{unpublishedmagisterthesis} \ProvidesFile{german-archaeology.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] \InheritBibliographyExtras{german} -\InheritBibliographyStrings{german} \DeclareRedundantLanguages{german} -{german,ngerman,austrian,naustrian,swissgerman,nswissgerman} + {german,ngerman,austrian,naustrian,swissgerman,nswissgerman} \DeclareBibliographyStrings{% inherit = {german}, articledated = {{Artikel vom}{Artikel vom}}, + genitiveandothers = {{u.\,a\adddot s}{u.\,a\adddot s}}, + genitiveapostrophe = {{'}{'}}, + genitives = {{s}{s}}, auction = {{Auktion}{Auktion}}, auctions = {{Auktionen}{Auktionen}}, catalogue = {{Katalog}{Kat\adddot}}, @@ -57,7 +62,7 @@ postdocthesis = {{Habilitationsschrift}{Habil.-Schr\adddot}}, magisterthesis = {{Magisterarbeit}{MA.-Arb\adddot}}, noplace = {{ohne\space Ort}{o.\,O\adddot}}, - noplacenodate = {{ohne Ort und Jahr}{o.\addabbrvspace O\adddot u.\addabbrvspace J\adddot}}, + noplacenodate = {{ohne Ort und Jahr}{o.\addabbrvspace O.\addabbrvspace u.\addabbrvspace J\adddot}}, plate = {{Tafel}{Taf.}}, specialauction = {{Sonderauktion}{Sonderauktion}}, specialauctions = {{Sonderauktionen}{Sonderauktionen}}, @@ -80,6 +85,7 @@ seenote = {{Anmerkung}{Anm.}}, urlfrom = {{Online}{Online}}, } +\DeclareGenitiveApostropheChars{ce,s,x,z,ß,\ss} \endinput %% %% End of file `german-archaeology.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-dguf-alt.lbx index b0ef0c466a8..8bf24b1e871 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-dguf-alt.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-dguf-alt.lbx @@ -7,12 +7,13 @@ %% biblatex-archaeology.dtx (with options: `dgufaltgermanLBX') %% \ProvidesFile{german-dguf-alt.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} -\InheritBibliographyStrings{german-archaeology} \DeclareBibliographyStrings{% inherit = {german-archaeology}, - andothers = {{et\space al\adddot}{et\space al\adddot}}, + andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + genitiveandothers = {{et\addabbrvspace al\adddot s}{et\addabbrvspace al\adddot s}}, bathesis = {{Bachelorarbeit}{Bachelorarbeit}}, diplomathesis = {{Diplomarbeit}{Diplomarbeit}}, magisterthesis = {{Magisterarbeit}{Magisterarbeit}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-dguf-apa.lbx index 67a69a70a27..007a858e440 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-dguf-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-dguf-apa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FngermanaefkwLBX,PgermanLBX') %% \ProvidesFile{ngerman-aefkw.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} \InheritBibliographyStrings{german-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-eaz.lbx index 1798db08979..6ad1a9989ed 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-eaz.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-eaz.lbx @@ -7,9 +7,9 @@ %% biblatex-archaeology.dtx (with options: `eazgermanLBX') %% \ProvidesFile{german-eaz.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} -\InheritBibliographyStrings{german-archaeology} \DeclareBibliographyStrings{% inherit = {german-archaeology}, subverbum = {{Stichwort}{Stichwort}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-foe.lbx index 5ca059e6384..f4ac4e0c33a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-foe.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-foe.lbx @@ -7,9 +7,9 @@ %% biblatex-archaeology.dtx (with options: `foegermanLBX') %% \ProvidesFile{german-foe.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} -\InheritBibliographyStrings{german-archaeology} \DeclareBibliographyStrings{% inherit = {german-archaeology}, urlseen = {{Zugriff}{Zugriff}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-jb-kreis-neuss.lbx index 711d7e54367..66fdcb3eb17 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-jb-kreis-neuss.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-jb-kreis-neuss.lbx @@ -7,9 +7,9 @@ %% biblatex-archaeology.dtx (with options: `jbkreisneussgermanLBX') %% \ProvidesFile{german-jb-kreis-neuss.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} -\InheritBibliographyStrings{german-archaeology} \DeclareBibliographyStrings{% inherit = {german-archaeology}, ibidem = {{ebenda}{ebenda}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-karl.lbx index 41d27205dbf..c2796a5a9e1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-karl.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-karl.lbx @@ -7,9 +7,9 @@ %% biblatex-archaeology.dtx (with options: `karlgermanLBX') %% \ProvidesFile{german-karl.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} -\InheritBibliographyStrings{german-archaeology} \DeclareBibliographyStrings{% inherit = {german-archaeology}, seenote = {{wie Fu\ss{}note}{wie Fn.}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-maja.lbx index 1d891310e9d..f439e8017d7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-maja.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-maja.lbx @@ -7,62 +7,62 @@ %% biblatex-archaeology.dtx (with options: `majagermanLBX') %% \ProvidesFile{german-maja.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} -\InheritBibliographyStrings{german-archaeology} \DeclareBibliographyStrings{% - inherit = {german-archaeology}, - byeditor = {{herausgegeben von}{hg\adddotspace von}}, - byeditortr = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}% + inherit = {german-archaeology}, + byeditor = {{herausgegeben von}{hg\adddotspace von}}, + byeditortr = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}% + {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}}, + byeditorco = {{herausgegeben und kommentiert von}% + {hg\adddotspace und komm\adddot\ von}}, + byeditoran = {{herausgegeben und erl\"autert von}% + {hg\adddotspace und erl\"aut\adddot\ von}}, + byeditorin = {{herausgegeben und mit einer Einleitung versehen von}% + {hg\adddotspace und mit einer Einl\adddot\ vers\adddot\ von}}, + byeditorfo = {{herausgegeben und mit einem Vorwort versehen von}% + {hg\adddotspace und mit einem Vorw\adddot\ vers\adddot\ von}}, + byeditoraf = {{herausgegeben und mit einem Nachwort versehen von}% + {hg\adddotspace und mit einem Nachw\adddot\ vers\adddot\ von}}, + byeditortrco = {{herausgegeben, \lbx@lfromlang \"ubersetzt und kommentiert von}% + {hg., \lbx@sfromlang \"ubers\adddot\ und komm\adddot\ von}}, + byeditortran = {{herausgegeben, \lbx@lfromlang \"ubersetzt und erl\"autert von}% + {hg., \lbx@sfromlang \"ubers\adddot\ und erl\"aut\adddot\ von}}, + byeditortrin = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einer Einleitung versehen von}% + {hg., \lbx@sfromlang \"ubers\adddot\ und Einl\adddot\ von}}, + byeditortrfo = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Vorwort versehen von}% + {hg., \lbx@sfromlang \"ubers\adddot\ und Vorw\adddot\ von}}, + byeditortraf = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Nachwort versehen von}% + {hg., \lbx@sfromlang \"ubers\adddot\ und Nachw\adddot\ von}}, + byeditorcoin = {{herausgegeben, kommentiert und mit einer Einleitung versehen von}% + {hg., komm\adddot\ und Einl\adddot\ von}}, + byeditorcofo = {{herausgegeben, kommentiert und mit einem Vorwort versehen von}% + {hg., komm\adddot\ und Vorw\adddot\ von}}, + byeditorcoaf = {{herausgegeben, kommentiert und mit einem Nachwort versehen von}% + {hg., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}}, + byeditoranin = {{herausgegeben, erl\"autert und mit einer Einleitung versehen von}% + {hg., erl\"aut\adddot\ und Einl\adddot\ von}}, + byeditoranfo = {{herausgegeben, erl\"autert und mit einem Vorwort versehen von}% + {hg., erl\"aut\adddot\ und Vorw\adddot\ von}}, + byeditoranaf = {{herausgegeben, erl\"autert und mit einem Nachwort versehen von}% + {hg., erl\"aut\adddot\ und Nachw\adddot\ von}}, + byeditortrcoin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}% + {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Einl\adddot\ von}}, + byeditortrcofo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}% + {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Vorw\adddot\ von}}, + byeditortrcoaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}% + {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Nachw\adddot\ von}}, + byeditortranin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}% + {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Einl\adddot\ von}}, + byeditortranfo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}% + {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Vorw\adddot\ von}}, + byeditortranaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}% + {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Nachw\adddot\ von}}, + byeditortr = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}% {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}}, - byeditorco = {{herausgegeben und kommentiert von}% - {hg\adddotspace und komm\adddot\ von}}, - byeditoran = {{herausgegeben und erl\"autert von}% - {hg\adddotspace und erl\"aut\adddot\ von}}, - byeditorin = {{herausgegeben und mit einer Einleitung versehen von}% - {hg\adddotspace und mit einer Einl\adddot\ vers\adddot\ von}}, - byeditorfo = {{herausgegeben und mit einem Vorwort versehen von}% - {hg\adddotspace und mit einem Vorw\adddot\ vers\adddot\ von}}, - byeditoraf = {{herausgegeben und mit einem Nachwort versehen von}% - {hg\adddotspace und mit einem Nachw\adddot\ vers\adddot\ von}}, - byeditortrco = {{herausgegeben, \lbx@lfromlang \"ubersetzt und kommentiert von}% - {hg., \lbx@sfromlang \"ubers\adddot\ und komm\adddot\ von}}, - byeditortran = {{herausgegeben, \lbx@lfromlang \"ubersetzt und erl\"autert von}% - {hg., \lbx@sfromlang \"ubers\adddot\ und erl\"aut\adddot\ von}}, - byeditortrin = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einer Einleitung versehen von}% - {hg., \lbx@sfromlang \"ubers\adddot\ und Einl\adddot\ von}}, - byeditortrfo = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Vorwort versehen von}% - {hg., \lbx@sfromlang \"ubers\adddot\ und Vorw\adddot\ von}}, - byeditortraf = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Nachwort versehen von}% - {hg., \lbx@sfromlang \"ubers\adddot\ und Nachw\adddot\ von}}, - byeditorcoin = {{herausgegeben, kommentiert und mit einer Einleitung versehen von}% - {hg., komm\adddot\ und Einl\adddot\ von}}, - byeditorcofo = {{herausgegeben, kommentiert und mit einem Vorwort versehen von}% - {hg., komm\adddot\ und Vorw\adddot\ von}}, - byeditorcoaf = {{herausgegeben, kommentiert und mit einem Nachwort versehen von}% - {hg., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}}, - byeditoranin = {{herausgegeben, erl\"autert und mit einer Einleitung versehen von}% - {hg., erl\"aut\adddot\ und Einl\adddot\ von}}, - byeditoranfo = {{herausgegeben, erl\"autert und mit einem Vorwort versehen von}% - {hg., erl\"aut\adddot\ und Vorw\adddot\ von}}, - byeditoranaf = {{herausgegeben, erl\"autert und mit einem Nachwort versehen von}% - {hg., erl\"aut\adddot\ und Nachw\adddot\ von}}, - byeditortrcoin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}% - {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Einl\adddot\ von}}, - byeditortrcofo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}% - {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Vorw\adddot\ von}}, - byeditortrcoaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}% - {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Nachw\adddot\ von}}, - byeditortranin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}% - {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Einl\adddot\ von}}, - byeditortranfo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}% - {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Vorw\adddot\ von}}, - byeditortranaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}% - {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Nachw\adddot\ von}}, - byeditortr = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}% - {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}}, - editor = {{Herausgeber}{Hg\adddot}}, - editors = {{Herausgeber}{Hgg\adddot}}, + editor = {{Herausgeber}{Hg\adddot}}, + editors = {{Herausgeber}{Hgg\adddot}}, } \endinput %% diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-mpk.lbx index 38c969929df..211df853aed 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-mpk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-mpk.lbx @@ -7,13 +7,16 @@ %% biblatex-archaeology.dtx (with options: `mpkgermanLBX') %% \ProvidesFile{german-mpk.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes +\InheritBibliographyExtras{german-archaeology} \InheritBibliographyExtras{german-archaeology} -\InheritBibliographyStrings{german-archaeology} \DeclareBibliographyStrings{% - inherit = {german-archaeology}, - andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, - urlseen = {{letzter Zugriff}{letzter Zugriff}}, + inherit = {german-archaeology}, + andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + genitiveandothers = {{et\addabbrvspace al\adddot s} + {et\addabbrvspace al\adddot s}}, + urlseen = {{letzter Zugriff}{letzter Zugriff}}, } \endinput %% diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-mpkoeaw.lbx new file mode 100644 index 00000000000..7a2c4fbd44e --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-mpkoeaw.lbx @@ -0,0 +1,45 @@ +%% +%% This is file `german-mpkoeaw.lbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `mpkoeawgermanLBX') +%% +\ProvidesFile{german-mpkoeaw.lbx} +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes +\InheritBibliographyExtras{german-archaeology} +\DeclareBibliographyStrings{% + inherit = {german-archaeology}, + andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + genitiveandothers = {{et\addabbrvspace al\adddot s} + {et\addabbrvspace al\adddot s}}, + exhibcat = {{Austellungskatalog}{Austellungskatalog}}, + exhibition = {{Austellungskatalog}{Austellungskatalog}}, + in = {{In}{In}}, + reprint = {{Nachdruck}{Nachdruck}}, + bathesis = {{Bachelorarbeit}{Bachelorarbeit}}, + diplomathesis = {{Diplomarbeit}{Diplomarbeit}}, + magisterthesis = {{Magisterarbeit}{Magisterarbeit}}, + mathesis = {{Masterarbeit}{Masterarbeit}}, + phdthesis = {{Dissertation}{Dissertation}}, + postdocthesis = {{Habilitationsschrift} + {Habilitationsschrift}}, + unpublishedbathesis = {{unver\"offentlichte Bachelorarbeit} + {unver\"offentlichte Bachelorarbeit}}, + unpublisheddiplomathesis = {{unver\"offentlichte Diplomarbeit} + {unver\"offentlichte Diplomarbeit}}, + unpublishedmagisterthesis = {{unver\"offentlichte Magisterarbeit} + {unver\"offentlichte Magisterarbeit}}, + unpublishedmathesis = {{unver\"offentlichte Masterarbeit} + {unver\"offentlichte Masterarbeit}}, + unpublishedphdthesis = {{unver\"offentlichte Dissertation} + {unver\"offentlichte Dissertation}}, + unpublishedpostdocthesis = {{unver\"offentlichte Habilitationsschrift} + {unver\"offentlichte Habilitationsschrift}}, + urlseen = {{letzter Zugriff}{letzter Zugriff}}, +} +\endinput +%% +%% End of file `german-mpkoeaw.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-offa.lbx index 3b014202d75..653c9a0eff2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-offa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-offa.lbx @@ -7,9 +7,9 @@ %% biblatex-archaeology.dtx (with options: `offagermanLBX') %% \ProvidesFile{german-offa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} -\InheritBibliographyStrings{german-archaeology} \DeclareBibliographyStrings{% inherit = {german-archaeology}, nodate = {{ohne Jahr}{o.J\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-rgzm.lbx index cd0f6b76399..56aa3a3b7b6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-rgzm.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-rgzm.lbx @@ -7,19 +7,19 @@ %% biblatex-archaeology.dtx (with options: `rgzmgermanLBX') %% \ProvidesFile{german-rgzm.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} -\InheritBibliographyStrings{german-archaeology} \DeclareBibliographyStrings{% - inherit = {german-archaeology}, - ibidem = {{ebenda}{ebenda}}, - reprint = {{Nachdruck}{Nachdruck}}, - bathesis = {{Bachelorarbeit}{Bachelorarbeit}}, - diplomathesis = {{Diplomarbeit}{Diplomarbeit}}, - magisterthesis = {{Magisterarbeit}{Magisterarbeit}}, - mathesis = {{Masterarbeit}{Masterarbeit}}, - phdthesis = {{Dissertation}{unpubl. Diss\adddot}}, - postdocthesis = {{Habilitationsschrift}{unpubl. Habilitationsschr\adddot}}, + inherit = {german-archaeology}, + ibidem = {{ebenda}{ebenda}}, + reprint = {{Nachdruck}{Nachdruck}}, + bathesis = {{Bachelorarbeit}{Bachelorarbeit}}, + diplomathesis = {{Diplomarbeit}{Diplomarbeit}}, + magisterthesis = {{Magisterarbeit}{Magisterarbeit}}, + mathesis = {{Masterarbeit}{Masterarbeit}}, + phdthesis = {{Dissertation}{unpubl. Diss\adddot}}, + postdocthesis = {{Habilitationsschrift}{unpubl. Habilitationsschr\adddot}}, } \endinput %% diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-zaak.lbx index 461b3730bdd..9dcf1ff85b9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-zaak.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-zaak.lbx @@ -7,9 +7,9 @@ %% biblatex-archaeology.dtx (with options: `zaakgermanLBX') %% \ProvidesFile{german-zaak.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} -\InheritBibliographyStrings{german-archaeology} \DeclareBibliographyStrings{% inherit = {german-archaeology}, page = {{Seite}{p\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-zaes.lbx index f98fb73a5da..d3aad02c223 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/german-zaes.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/german-zaes.lbx @@ -7,63 +7,63 @@ %% biblatex-archaeology.dtx (with options: `zaesgermanLBX') %% \ProvidesFile{german-zaes.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} -\InheritBibliographyStrings{german-archaeology} \DeclareBibliographyStrings{% - inherit = {german-archaeology}, - byeditor = {{herausgegeben von}{hg\adddotspace von}}, - byeditortr = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}% - {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}}, - byeditorco = {{herausgegeben und kommentiert von}% - {hg\adddotspace und komm\adddot\ von}}, - byeditoran = {{herausgegeben und erl\"autert von}% - {hg\adddotspace und erl\"aut\adddot\ von}}, - byeditorin = {{herausgegeben und mit einer Einleitung versehen von}% - {hg\adddotspace und mit einer Einl\adddot\ vers\adddot\ von}}, - byeditorfo = {{herausgegeben und mit einem Vorwort versehen von}% - {hg\adddotspace und mit einem Vorw\adddot\ vers\adddot\ von}}, - byeditoraf = {{herausgegeben und mit einem Nachwort versehen von}% - {hg\adddotspace und mit einem Nachw\adddot\ vers\adddot\ von}}, - byeditortrco = {{herausgegeben, \lbx@lfromlang \"ubersetzt und kommentiert von}% - {hg., \lbx@sfromlang \"ubers\adddot\ und komm\adddot\ von}}, - byeditortran = {{herausgegeben, \lbx@lfromlang \"ubersetzt und erl\"autert von}% - {hg., \lbx@sfromlang \"ubers\adddot\ und erl\"aut\adddot\ von}}, - byeditortrin = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einer Einleitung versehen von}% - {hg., \lbx@sfromlang \"ubers\adddot\ und Einl\adddot\ von}}, - byeditortrfo = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Vorwort versehen von}% - {hg., \lbx@sfromlang \"ubers\adddot\ und Vorw\adddot\ von}}, - byeditortraf = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Nachwort versehen von}% - {hg., \lbx@sfromlang \"ubers\adddot\ und Nachw\adddot\ von}}, - byeditorcoin = {{herausgegeben, kommentiert und mit einer Einleitung versehen von}% - {hg., komm\adddot\ und Einl\adddot\ von}}, - byeditorcofo = {{herausgegeben, kommentiert und mit einem Vorwort versehen von}% - {hg., komm\adddot\ und Vorw\adddot\ von}}, - byeditorcoaf = {{herausgegeben, kommentiert und mit einem Nachwort versehen von}% - {hg., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}}, - byeditoranin = {{herausgegeben, erl\"autert und mit einer Einleitung versehen von}% - {hg., erl\"aut\adddot\ und Einl\adddot\ von}}, - byeditoranfo = {{herausgegeben, erl\"autert und mit einem Vorwort versehen von}% - {hg., erl\"aut\adddot\ und Vorw\adddot\ von}}, - byeditoranaf = {{herausgegeben, erl\"autert und mit einem Nachwort versehen von}% - {hg., erl\"aut\adddot\ und Nachw\adddot\ von}}, - byeditortrcoin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}% - {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Einl\adddot\ von}}, - byeditortrcofo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}% - {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Vorw\adddot\ von}}, - byeditortrcoaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}% - {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Nachw\adddot\ von}}, - byeditortranin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}% - {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Einl\adddot\ von}}, - byeditortranfo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}% - {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Vorw\adddot\ von}}, - byeditortranaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}% - {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Nachw\adddot\ von}}, - byeditortr = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}% - {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}}, - editor = {{Herausgeber}{Hg\adddot}}, - editors = {{Herausgeber}{Hgg\adddot}}, - ibidem = {{\midsentence l.\,c\adddot}{l.\,c\adddot}}, + inherit = {german-archaeology}, + byeditor = {{herausgegeben von}{hg\adddotspace von}}, + byeditortr = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}% + {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}}, + byeditorco = {{herausgegeben und kommentiert von}% + {hg\adddotspace und komm\adddot\ von}}, + byeditoran = {{herausgegeben und erl\"autert von}% + {hg\adddotspace und erl\"aut\adddot\ von}}, + byeditorin = {{herausgegeben und mit einer Einleitung versehen von}% + {hg\adddotspace und mit einer Einl\adddot\ vers\adddot\ von}}, + byeditorfo = {{herausgegeben und mit einem Vorwort versehen von}% + {hg\adddotspace und mit einem Vorw\adddot\ vers\adddot\ von}}, + byeditoraf = {{herausgegeben und mit einem Nachwort versehen von}% + {hg\adddotspace und mit einem Nachw\adddot\ vers\adddot\ von}}, + byeditortrco = {{herausgegeben, \lbx@lfromlang \"ubersetzt und kommentiert von}% + {hg., \lbx@sfromlang \"ubers\adddot\ und komm\adddot\ von}}, + byeditortran = {{herausgegeben, \lbx@lfromlang \"ubersetzt und erl\"autert von}% + {hg., \lbx@sfromlang \"ubers\adddot\ und erl\"aut\adddot\ von}}, + byeditortrin = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einer Einleitung versehen von}% + {hg., \lbx@sfromlang \"ubers\adddot\ und Einl\adddot\ von}}, + byeditortrfo = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Vorwort versehen von}% + {hg., \lbx@sfromlang \"ubers\adddot\ und Vorw\adddot\ von}}, + byeditortraf = {{herausgegeben, \lbx@lfromlang \"ubersetzt und mit einem Nachwort versehen von}% + {hg., \lbx@sfromlang \"ubers\adddot\ und Nachw\adddot\ von}}, + byeditorcoin = {{herausgegeben, kommentiert und mit einer Einleitung versehen von}% + {hg., komm\adddot\ und Einl\adddot\ von}}, + byeditorcofo = {{herausgegeben, kommentiert und mit einem Vorwort versehen von}% + {hg., komm\adddot\ und Vorw\adddot\ von}}, + byeditorcoaf = {{herausgegeben, kommentiert und mit einem Nachwort versehen von}% + {hg., komm\adddot\ und mit einem Nachw\adddot\ vers\adddot\ von}}, + byeditoranin = {{herausgegeben, erl\"autert und mit einer Einleitung versehen von}% + {hg., erl\"aut\adddot\ und Einl\adddot\ von}}, + byeditoranfo = {{herausgegeben, erl\"autert und mit einem Vorwort versehen von}% + {hg., erl\"aut\adddot\ und Vorw\adddot\ von}}, + byeditoranaf = {{herausgegeben, erl\"autert und mit einem Nachwort versehen von}% + {hg., erl\"aut\adddot\ und Nachw\adddot\ von}}, + byeditortrcoin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einer Einleitung versehen von}% + {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Einl\adddot\ von}}, + byeditortrcofo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Vorwort versehen von}% + {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Vorw\adddot\ von}}, + byeditortrcoaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, kommentiert und mit einem Nachwort versehen von}% + {hg., \lbx@sfromlang \"ubers., komm\adddot\ und Nachw\adddot\ von}}, + byeditortranin = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einer Einleitung versehen von}% + {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Einl\adddot\ von}}, + byeditortranfo = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Vorwort versehen von}% + {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Vorw\adddot\ von}}, + byeditortranaf = {{herausgegeben, \lbx@lfromlang \"ubersetzt, erl\"autert und mit einem Nachwort versehen von}% + {hg., \lbx@sfromlang \"ubers., erl\"aut\adddot\ und Nachw\adddot\ von}}, + byeditortr = {{herausgegeben und \lbx@lfromlang \"ubersetzt von}% + {hg\adddotspace und \lbx@sfromlang \"ubers\adddot\ von}}, + editor = {{Herausgeber}{Hg\adddot}}, + editors = {{Herausgeber}{Hgg\adddot}}, + ibidem = {{\midsentence l.\,c\adddot}{l.\,c\adddot}}, } \endinput %% diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.bbx index 507ed6ca439..bf0c3dc520a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `jbhalleBBX,noarticlesubtitlepunct,nosmallcaps') %% \ProvidesFile{jb-halle.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-archaeology} \def\archaeobibstyletitle{\blxarch@style@jbhalle} \ExecuteBibliographyOptions{ @@ -32,6 +32,7 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=true, notitlepunct=false, origfields=true, @@ -61,17 +62,17 @@ \setlength{\bibhang}{1.2em} \DeclareNameAlias{bookauthor}{given-family} \DeclareNameAlias{sortname}{given-family} -\renewcommand{\repeatlabelwrap}[1]{\mkbibbold{#1}} -\renewcommand{\multinamedelim}{\addslash} -\renewcommand{\finalnamedelim}{\addslash} -\renewcommand{\labelnamepunct}{\addcomma\space} -\renewcommand{\booklabelnamepunct}{\addcomma\space} +\DeclareFieldFormat{repeatlabel}{\mkbibbold{#1}} +\renewcommand*{\multinamedelim}{\addslash} +\renewcommand*{\finalnamedelim}{\addslash} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1} -\renewcommand{\seriespunct}{\addspace} +\renewcommand*{\seriespunct}{\addspace} \DeclareFieldFormat*{seriesparens}{#1} -\renewcommand{\volumenumberdelim}{\addcomma\space} -\DeclareFieldFormat*{realdate}{\mkbibparens{#1}} -\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}} +\renewcommand*{\volumenumberdelim}{\addcomma\space} +\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}} +\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}} \DeclareFieldFormat*{pages}{#1} \DeclareFieldFormat*{volume}{\addspace#1} \DeclareFieldFormat*{journaldateparens}{#1} @@ -84,26 +85,26 @@ \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}} \DeclareFieldFormat[thesis]{locationdateparens}{#1} \DeclareFieldFormat*{missingfield}{\mkbibbrackets{#1}} -\renewcommand{\bibpagespunct}{% +\renewcommand*{\bibpagespunct}{% \iffieldundef{journaltitle} {\addspace} {\addcomma\space}} -\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1} +\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1} \DeclareFieldFormat*{usere}{% \ifinteger{#1} {\mkbibordinal{#1}\space\bibstring{edition},\space} {#1}% } -\renewcommand{\multicitedelim}{\addsemicolon\space} +\renewcommand*{\multicitedelim}{\addsemicolon\space} \DeclareFieldFormat*{url}{\url{#1}} \let\blxarch@buffer@url\url -\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater} -\renewcommand{\nameshortformdelim}{\addspace in\space} -\renewcommand{\mkbibnamefamily}[1]{#1} -\renewcommand{\mkbibnameprefix}[1]{#1} -\renewcommand{\mkbibrepeatfamily}[1]{#1} -\renewcommand{\mkbibrepeatprefix}[1]{#1} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater} +\renewcommand*{\nameshortformdelim}{\addspace in\space} +\renewcommand*{\mkbibnamefamily}[1]{#1} +\renewcommand*{\mkbibnameprefix}[1]{#1} +\renewcommand*{\mkbibrepeatfamily}[1]{#1} +\renewcommand*{\mkbibrepeatprefix}[1]{#1} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `jb-halle.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.cbx index c82112f5ed9..7396d9a54c5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.cbx @@ -7,12 +7,13 @@ %% biblatex-archaeology.dtx (with options: `jbhalleCBX,barecitations') %% \ProvidesFile{jb-halle.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{authoryear-archaeology} \def\archaeocitestyletitle{\blxarch@style@jbhalle} -\DeclareFieldFormat*{postnote}{#1} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `jb-halle.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.dbx index 8a847f4a476..907c0968e6d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-halle.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `jbhalleDBX,DBX') %% \ProvidesFile{jb-halle.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `jb-halle.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.bbx index 6cb13853674..282bd90c958 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `jbkreisneussBBX,noarticlesubtitlepunct,nosmallcaps') %% \ProvidesFile{jb-kreis-neuss.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{verbose-ibid-archaeology} \DeclareLanguageMappingSuffix{-jb-kreis-neuss} \def\archaeobibstyletitle{\blxarch@style@jbkrneuss} @@ -31,6 +31,7 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=false, notitlepunct=false, origfields=true, @@ -58,17 +59,17 @@ volumeafterseries=false, } \DeclareNameAlias{default}{family-given} -\renewcommand{\newunitpunct}{\addcomma\space} -\renewcommand{\booklabelnamepunct}{\addcolon\space} -\renewcommand{\labelnamepunct}{\addcolon\space} -\renewcommand{\volumedatedelim}{\addspace} -\renewcommand{\titleseriesdelim}{\addspace} -\renewcommand{\multinamedelim}{\addspace\addslash\space} -\renewcommand{\finalnamedelim}{\multinamedelim} +\renewcommand*{\newunitpunct}{\addcomma\space} +\renewcommand*{\booklabelnamepunct}{\addcolon\space} +\renewcommand*{\labelnamepunct}{\addcolon\space} +\renewcommand*{\volumedatedelim}{\addspace} +\renewcommand*{\titleseriesdelim}{\addspace} +\renewcommand*{\multinamedelim}{\addspace\addslash\space} +\renewcommand*{\finalnamedelim}{\multinamedelim} \DeclareFieldFormat*{title}{#1} \DeclareFieldFormat*{booktitle}{#1} \DeclareFieldFormat*{maintitle}{#1} -\DeclareFieldFormat*{reprintbrackets}{\mkbibparens{#1}} +\DeclareFieldFormat*{reprintparens}{\mkbibparens{#1}} \DeclareFieldFormat*{locationdateparens}{#1} \DeclareFieldFormat*{seriesparens}{\mkbibparens{= #1}} \DeclareFieldFormat*{volume}{\addcomma\addspace\bibstring{volume}\addspace#1} @@ -76,11 +77,11 @@ \DeclareFieldFormat*{number}{\bibstring{volume}\addspace#1} \DeclareFieldFormat*{subnumber}{\bibstring{volume}\addspace#1} \DeclareFieldFormat[article,periodical,review,suppperiodical]{number}{#1} -\renewcommand{\seriesnumberdelim}{\newunitpunct} +\renewcommand*{\seriesnumberdelim}{\newunitpunct} \renewcommand{\seriespunct}{\newunitpunct} -\renewcommand{\noseriespunct}{\newunitpunct} -\renewcommand{\multilistdelim}{\addspace\addslash\space} -\renewcommand{\sqspace}{} +\renewcommand*{\noseriespunct}{\newunitpunct} +\renewcommand*{\multilistdelim}{\addspace\addslash\space} +\renewcommand*{\sqspace}{} \DeclareFieldFormat*{pages}{% \ifpages{#1} {\ifnumequal{1}{\rangelen{pages}} @@ -91,11 +92,11 @@ }} {#1}% } -\renewcommand{\mkbibnamefamily}[1]{#1} -\renewcommand{\mkbibnameprefix}[1]{#1} -\renewcommand{\mkbibrepeatfamily}[1]{#1} -\renewcommand{\mkbibrepeatprefix}[1]{#1} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\mkbibnamefamily}[1]{#1} +\renewcommand*{\mkbibnameprefix}[1]{#1} +\renewcommand*{\mkbibrepeatfamily}[1]{#1} +\renewcommand*{\mkbibrepeatprefix}[1]{#1} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `jb-kreis-neuss.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.cbx index f9dd4a76964..96ecc72d587 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.cbx @@ -7,11 +7,11 @@ %% biblatex-archaeology.dtx (with options: `jbkreisneussCBX,noshortform') %% \ProvidesFile{jb-kreis-neuss.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{verbose-ibid-archaeology} \def\archaeocitestyletitle{\blxarch@style@jbkrneuss} \ExecuteBibliographyOptions{citepages=separate} -\renewcommand{\multicitedelim}{\addsemicolon\space} +\renewcommand*{\multicitedelim}{\addsemicolon\space} \let\shortformcite\autocite \let\shortformcites\autocites \let\sfcite\cite diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.dbx index a3a9abb9a78..f77aa27140f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/jb-kreis-neuss.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `jbkreisneussDBX,DBX') %% \ProvidesFile{jb-kreis-neuss.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `jb-kreis-neuss.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.bbx index 42d82d7bf97..adbf8a2fc0d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `karlBBX,noarticlesubtitlepunct,nosmallcaps') %% \ProvidesFile{karl.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{verbose-trad2note-archaeology} \def\archaeobibstyletitle{\blxarch@style@karl} \DeclareLanguageMappingSuffix{-karl} @@ -31,6 +31,7 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=\blxarch@maxnumber, noseries=true, nothesistitlepunct=false, notitlepunct=false, @@ -40,8 +41,8 @@ preservelastauthor=false, repeatlabel=false, shortform=false, - shortjournal=true, - shortseries=true, + shortjournal=false, + shortseries=false, subseries=true, summarytitle=false, tabbedlabeldate=false, @@ -60,28 +61,27 @@ } \DeclareNameAlias{bookauthor}{given-family} \DeclareNameAlias{sortname}{given-family} -\renewcommand{\finalnamedelim}{\addspace\biblstring{and}\space} -\renewcommand{\newunitpunct}{\addcomma\space} -\renewcommand{\labelnamepunct}{\addcolon\space} +\renewcommand*{\finalnamedelim}{\addspace\biblstring{and}\space} +\renewcommand*{\newunitpunct}{\addcomma\space} +\renewcommand*{\labelnamepunct}{\addcolon\space} \DeclareFieldFormat*{title}{\mkbibquote{#1}} -\DeclareFieldFormat[inreference]{title}{\biblstring{subverbum}\addspace\mkbibquote{#1}} \DeclareFieldFormat[book,booklet,collection,manual,misc,proceedings,report,thesis,unpublished] -{title}{\textit{#1}} -\DeclareFieldFormat*{booktitle}{\textit{#1}} -\DeclareFieldFormat*{maintitle}{\textit{#1}} +{title}{\emph{#1}} +\DeclareFieldFormat*{booktitle}{\emph{#1}} +\DeclareFieldFormat*{maintitle}{\emph{#1}} \DeclareFieldFormat*{volume}{\addspace\bibstring{volume}\space#1} \DeclareFieldFormat[article,review,suppperiodical]{title}{#1} -\DeclareFieldFormat*{journaltitle}{\textit{#1}} +\DeclareFieldFormat*{journaltitle}{\emph{#1}} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat*{locationdateparens}{#1} \DeclareFieldFormat*{seenote}{\mkbibparens{#1}} -\DeclareFieldFormat*{url}{\textit{\url{#1}}} +\DeclareFieldFormat*{url}{\emph{\url{#1}}} \DeclareFieldFormat*{urldate}{} -\renewcommand{\mkbibnamefamily}[1]{#1} -\renewcommand{\mkbibnameprefix}[1]{#1} -\renewcommand{\mkbibrepeatfamily}[1]{#1} -\renewcommand{\mkbibrepeatprefix}[1]{#1} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\mkbibnamefamily}[1]{#1} +\renewcommand*{\mkbibnameprefix}[1]{#1} +\renewcommand*{\mkbibrepeatfamily}[1]{#1} +\renewcommand*{\mkbibrepeatprefix}[1]{#1} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `karl.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.cbx index 058698c1ce1..bf98939a32f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.cbx @@ -7,10 +7,10 @@ %% biblatex-archaeology.dtx (with options: `karlCBX') %% \ProvidesFile{karl.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{verbose-trad2note-archaeology} \def\archaeocitestyletitle{\blxarch@style@karl} -\renewcommand{\multicitedelim}{\addsemicolon\space} +\renewcommand*{\multicitedelim}{\addsemicolon\space} \endinput %% %% End of file `karl.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.dbx index d7375a3ebec..743731dfb82 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/karl.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `karlDBX,DBX') %% \ProvidesFile{karl.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `karl.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.bbx index 5bb0d779f56..d167081dfe1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.bbx @@ -7,8 +7,8 @@ %% biblatex-archaeology.dtx (with options: `majaBBX,noarticlesubtitlepunct,nosmallcaps') %% \ProvidesFile{maja.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] -\RequireBibliographyStyle{verbose-ibid-archaeology} +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] +\RequireBibliographyStyle{verbose-archaeology} \def\archaeobibstyletitle{\blxarch@style@maja} \DeclareLanguageMappingSuffix{-maja} \ExecuteBibliographyOptions{ @@ -25,11 +25,12 @@ notetype=foot+end, editionsuperscript=predate, giveninitligatures={}, - idemincitation=true, + idemincitation=false, injournal=true, journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=false, notitlepunct=true, origfields=false, @@ -38,8 +39,8 @@ preservelastauthor=false, repeatlabel=false, shortform=title, - shortjournal=false, - shortseries=false, + shortjournal=true, + shortseries=true, subseries=false, summarytitle=false, tabbedlabeldate=false, @@ -56,33 +57,42 @@ useunpublishedthesis=true, volumeafterseries=false, } -\renewcommand{\newunitpunct}{\addcomma\space} +\renewcommand*{\newunitpunct}{\addcomma\space} \DeclareNameAlias{sortname}{family-given} -\renewcommand{\booklabelnamepunct}{\addcomma\space} -\renewcommand{\labelnamepunct}{\addcomma\space} -\renewcommand{\multinamedelim}{\addspace\slash\space} -\renewcommand{\finalnamedelim}{\addspace\slash\space} +\DeclareNameAlias{labelnames}{sortname} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\multinamedelim}{\addspace\slash\space} +\renewcommand*{\finalnamedelim}{\addspace\slash\space} \DeclareFieldFormat*{pages}{#1} \DeclareFieldFormat*{volume}{\addspace#1} -\renewcommand{\titleseriesdelim}{\newunitpunct} -\renewcommand{\seriespunct}{\newunitpunct} +\DeclareFieldFormat[inreference]{volume}{\addspace\RN{#1}} +\DeclareFieldFormat*{edition}{} +\DeclareFieldFormat*{usere}{} +\DeclareFieldFormat*{titleaddon}{} +\DeclareFieldFormat*{booktitleaddon}{} +\DeclareFieldFormat*{maintitleaddon}{} +\renewcommand*{\titleseriesdelim}{\newunitpunct} +\renewcommand*{\seriespunct}{\newunitpunct} +\DeclareListFormat[inreference]{location}{} \DeclareFieldFormat*{locationdateparens}{#1} \DeclareFieldFormat*{seriesparens}{#1} \DeclareFieldFormat*{newsparens}{#1} \DeclareFieldFormat[inreference]{date}{\iffieldundef{shortform}{#1}{\mkbibparens{#1}}} -\DeclareFieldFormat[inreference]{title}{#1} -\xpatchbibdriver{inreference}{location+date}{bibliographydate}{}{} -\xpatchbibdriver{inreference}{titlepunct}{nopunct}{}{} -\xpatchbibmacro{thesistype}{bibstring}{biblstring}{}{} -\renewcommand{\volumedatedelim}{\addspace} -\renewcommand{\multilistdelim}{\addspace\slash\space} +\DeclareFieldFormat[inreference]{dictionary}{#1} +\xpatchbibdriver{inreference}{location+date}{bibliographydate} + {}{Patching driver 'inreference' failed (2)} +\xpatchbibmacro{thesistype}{bibstring}{biblstring} + {}{Patching bibmacro 'thesistype' failed (3)} +\renewcommand*{\volumedatedelim}{\addspace} +\renewcommand*{\multilistdelim}{\addspace\slash\space} \DeclareFieldFormat*{url}{\mkbibparens{\url{#1}}} \DeclareFieldFormat*{urldate}{\addcomma\space#1} -\renewcommand{\mkbibnamefamily}[1]{#1} -\renewcommand{\mkbibnameprefix}[1]{#1} -\renewcommand{\mkbibrepeatfamily}[1]{#1} -\renewcommand{\mkbibrepeatprefix}[1]{#1} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\mkbibnamefamily}[1]{#1} +\renewcommand*{\mkbibnameprefix}[1]{#1} +\renewcommand*{\mkbibrepeatfamily}[1]{#1} +\renewcommand*{\mkbibrepeatprefix}[1]{#1} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `maja.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.cbx index 3eb402999d5..1f40f545c4d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.cbx @@ -7,16 +7,20 @@ %% biblatex-archaeology.dtx (with options: `majaCBX,barecitations,noshortform') %% \ProvidesFile{maja.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] -\RequireCitationStyle{verbose-ibid-archaeology} +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] +\RequireCitationStyle{verbose-archaeology} \def\archaeocitestyletitle{\blxarch@style@maja} +\ExecuteBibliographyOptions{ +citeshortin=true, +} \let\shortformcite\autocite \let\shortformcites\autocites \let\sfcite\cite \let\sfcites\cites -\DeclareFieldFormat*{postnote}{#1} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `maja.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.dbx index 5830bb3604b..a5f75e0402b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/maja.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `majaDBX,DBX') %% \ProvidesFile{maja.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `maja.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.bbx index fd4db02196a..612802c1ede 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `mpkBBX,noarticlesubtitlepunct') %% \ProvidesFile{mpk.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-icomp-archaeology} \def\archaeobibstyletitle{\blxarch@style@mpk} \DeclareLanguageMappingSuffix{-mpk} @@ -35,6 +35,7 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=false, notitlepunct=false, origfields=true, @@ -64,31 +65,32 @@ \setlength{\bibhang}{0em} \DeclareNameAlias{bookauthor}{given-family} \DeclareNameAlias{sortname}{given-family} -\renewcommand{\mkbibbooknamefamily}[1]{\textsc{#1}} -\renewcommand{\mkbibbooknameprefix}[1]{\textsc{#1}} -\renewcommand{\mkbibsourcenamefamily}[1]{\textsc{#1}} -\renewcommand{\mkbibsourcenameprefix}[1]{\textsc{#1}} -\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}} -\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}} -\renewcommand{\labelnamepunct}{\addcomma\space} -\renewcommand{\booklabelnamepunct}{\addcomma\space} -\renewcommand{\newunitpunct}{\addcomma\space} -\renewcommand{\titleseriesdelim}{\addperiod\space} -\renewcommand{\seriespunct}{\newunitpunct} +\renewcommand*{\mkbibbooknamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbibbooknameprefix}[1]{\textsc{#1}} +\renewcommand*{\mkbibsourcenamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbibsourcenameprefix}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} +\renewcommand*{\newunitpunct}{\addcomma\space} +\renewcommand*{\titleseriesdelim}{\addperiod\space} +\renewcommand*{\seriespunct}{\newunitpunct} \DeclareFieldFormat*{seriesparens}{#1} -\renewcommand{\subnumberseriesdelim}{\newunitpunct} +\renewcommand*{\subnumberseriesdelim}{\newunitpunct} \DeclareFieldFormat*{locationdateparens}{#1} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat*{reprintparens}{\newunitpunct#1} -\DeclareFieldFormat*{realdateparen}{\addcomma\space#1} -\DeclareFieldFormat*{origrealdateparen}{\addcomma\space#1} +\DeclareFieldFormat*{realdateparens}{\addcomma\space#1} +\DeclareFieldFormat*{origrealdateparens}{\addcomma\space#1} \DeclareFieldFormat*{pages}{#1} \DeclareFieldFormat*{volume}{\addspace#1} \DeclareFieldFormat*{url}{#1} \DeclareFieldFormat*{urldate}{\newunitpunct\biblstring{urlseen}\addcolon\space#1} -\xpatchbibmacro{thesistype}{bibstring}{biblstring}{}{} +\xpatchbibmacro{thesistype}{bibstring}{biblstring} + {}{Patching bibmacro 'thesistype' failed (4)} \let\blxarch@buffer@finentrypunct\finentrypunct -\renewcommand{\finentrypunct}{% +\renewcommand*{\finentrypunct}{% \ifboolexpr{ test {\ifentrytype{online}} or @@ -99,7 +101,7 @@ {} {\blxarch@buffer@finentrypunct} } -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `mpk.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.cbx index 8450edcebad..88349fba72d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.cbx @@ -7,17 +7,18 @@ %% biblatex-archaeology.dtx (with options: `mpkCBX,barecitations') %% \ProvidesFile{mpk.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{authoryear-icomp-archaeology} \def\archaeocitestyletitle{\blxarch@style@mpk} \ExecuteBibliographyOptions{autocite=footnote} -\renewcommand{\multicitedelim}{\addperiod\space\textendash\space} -\renewcommand{\compcitedelim}{% +\renewcommand*{\multicitedelim}{\addperiod\space\textendash\space} +\renewcommand*{\compcitedelim}{% \multicitedelim\bibsentence% \bibstring[\mkbibnamefamily]{idem\thefield{gender}}\addspace} -\DeclareFieldFormat*{postnote}{#1} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `mpk.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.dbx index d3d6da99917..bf5b1c6479a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpk.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `mpkDBX,DBX') %% \ProvidesFile{mpk.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `mpk.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/mpkoeaw.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpkoeaw.bbx new file mode 100644 index 00000000000..65e02c4ab95 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpkoeaw.bbx @@ -0,0 +1,131 @@ +%% +%% This is file `mpkoeaw.bbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `mpkoeawBBX,noarticlesubtitlepunct') +%% +\ProvidesFile{mpkoeaw.bbx} +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] +\RequireBibliographyStyle{authoryear-archaeology} +\def\archaeobibstyletitle{\blxarch@style@mpkoeaw} +\DeclareLanguageMappingSuffix{-mpkoeaw} +\ExecuteBibliographyOptions{ + dashed=false, + datezeros=true, + doi=true, + giveninits=true, + ibidtracker=false, + idemtracker=false, + loccittracker=false, + maxbibnames=500, + maxcitenames=3, + maxitems=3, + mergedate=true, + mincitenames=3, + minitems=3, + notetype=foot+end, + sortcites=true, + sorting=lnyvt, + editionsuperscript=predate, % ??, not in guidelines + giveninitligatures={}, + idemincitation=true, + injournal=false, + journallocation=false, + maxbooknames=500, + minbooknames=3, + minrealdatediff=1, + nothesistitlepunct=false, + notitlepunct=false, + origfields=true, + pagesfirst=false, + positionlabeldate=location, + preservelastauthor=false, + repeatlabel=true, + shortform=false, + shortjournal=false, + shortseries=false, + subseries=true, + summarytitle=false, + tabbedlabeldate=false, + titlebrackets=false, + titlenote=false, + useeventdate=true, + useeventnumber=false, + usefestschriftaddon=false, + useinstitution=omitlocation, + uselocation=true, + usemultivenue=false, + usepublisher=false, + useunpublishedthesis=true, + usesourceeditor=true, + volumeafterseries=false, +} +\DeclareStyleSourcemap{ + \maps[datatype=bibtex]{ + \map[ + overwrite=true, + ]{ + \step[ + fieldsource=eventtype, + match=\regexp{exhib}, + fieldset=options, + fieldvalue={titlenote=true,titlebrackets=true}, + append=true, + notfield=options, + ] + } + \map[ + overwrite=true, + ]{ + \step[ + fieldsource=options, + notmatch=\regexp{\btitlenote\b}, + final, + ] + \step[ + fieldsource=eventtype, + match=\regexp{exhib}, + fieldset=options, + fieldvalue={,titlenote=true,titlebrackets=true}, + append=true, + ] + } + } +} +\setlength{\bibhang}{0em} +\setlength{\bibitemsep}{\baselineskip} +\DeclareNameAlias{sortname}{given-family} +\renewcommand*{\mkbibbooknamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbibbooknameprefix}[1]{\textsc{#1}} +\renewcommand*{\mkbibsourcenamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbibsourcenameprefix}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\subtitlepunct}{\addcolon\space\midsentence} +\renewcommand*{\articletitlepunct}{\addcomma\space} +\DeclareFieldFormat*{titlenote}{\mkbibparens{#1}} +\DeclareFieldAlias{booktitlenote}{titlenote} +\DeclareFieldAlias{maintitlenote}{titlenote} +\DeclareFieldFormat*{dictionary}{#1} +\DeclareFieldFormat*{volume}{\addspace#1} +\renewrobustcmd*{\bibdatesubseqesep}{\bibdaterangesep} +\renewcommand*{\volumedatedelim}{\addslash} +\renewcommand*{\subnumberseriesdelim}{\addcomma\space} +\DeclareFieldFormat*{journaldateparens}{#1} +\DeclareFieldFormat*{locationdateparens}{#1} +\DeclareFieldFormat*{realdateparens}{#1} +\DeclareFieldFormat*{origrealdateparens}{#1} +\renewcommand*{\typeinstitutiondelim}{\addcomma\space} +\renewcommand*{\daterealdatedelim}{\addcomma\space} +\DeclareFieldFormat*{reprintparens}{\addcomma\space#1} +\renewcommand*{\multilistdelim}{\addspace\textendash\space} +\DeclareFieldFormat*{pages}{#1} +\urlstyle{same} +\DeclareFieldFormat*{url}{\url{#1}} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} +\endinput +%% +%% End of file `mpkoeaw.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/mpkoeaw.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpkoeaw.cbx new file mode 100644 index 00000000000..384d7945e9b --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpkoeaw.cbx @@ -0,0 +1,21 @@ +%% +%% This is file `mpkoeaw.cbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `mpkoeawCBX,barecitations') +%% +\ProvidesFile{mpk.cbx} +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] +\RequireCitationStyle{authoryear-archaeology} +\def\archaeocitestyletitle{\blxarch@style@mpkoeaw} +\ExecuteBibliographyOptions{autocite=footnote} +\renewcommand*{\multicitedelim}{\addperiod\space\textendash\space} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} +\DeclareFieldFormat*{volcitevolume}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} +\endinput +%% +%% End of file `mpkoeaw.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/mpkoeaw.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpkoeaw.dbx new file mode 100644 index 00000000000..5a08138a7ef --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/mpkoeaw.dbx @@ -0,0 +1,51 @@ +%% +%% This is file `mpkoeaw.dbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `mpkoeawDBX,DBX') +%% +\ProvidesFile{mpkoeaw.dbx} +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] +\DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} +\DeclareDatamodelFields[type=field,datatype=integer]{subnumber} +\DeclareDatamodelEntryfields +[book,bookinbook,inbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings, +proceedings,reference,inreference,mvreference,suppbook,suppcollection] +{shortsubseries,subnumber,subseries} +\DeclareDatamodelFields[type=field,datatype=literal]{titlenote} +\DeclareDatamodelFields[type=field,datatype=literal]{maintitlenote} +\DeclareDatamodelFields[type=field,datatype=literal]{booktitlenote} +\DeclareDatamodelFields[type=field,datatype=literal]{summarytitle} +\DeclareDatamodelFields[type=field,datatype=literal]{shortform} +\DeclareDatamodelFields[type=list,datatype=name]{festschrift} +\DeclareDatamodelFields[type=field,datatype=literal]{festschriftaddon} +\DeclareDatamodelFields[type=field,datatype=integer]{eventnumber} +\DeclareDatamodelFields[type=field,datatype=literal]{eventtype} +\DeclareDatamodelFields[type=list,datatype=literal]{multieventdate} +\DeclareDatamodelFields[type=list,datatype=literal]{multivenue} +\DeclareDatamodelEntryfields +[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings, +proceedings,reference,inreference,mvreference,suppbook,suppcollection] +{shortform,festschrift,festschriftaddon,eventnumber,eventtype +,eventdate,venue,multieventdate,multivenue} +\DeclareDatamodelEntryfields +[inbook,bookinbook,incollection,inproceedings,inreference,suppbook,suppcollection] +{booktitlenote} +\DeclareDatamodelEntryfields{summarytitle,titlenote} +\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate,fulleventdate,newsdate} +\DeclareDatamodelEntryfields{realdate,origrealdate} +\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate} +\DeclareDatamodelEntryfields +[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings, +proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fulleventdate} +\DeclareDatamodelEntryfields +[article,periodical,suppperiodical,review]{newsdate} +\DeclareDatamodelEntryfields +[article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} +\endinput +%% +%% End of file `mpkoeaw.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-aefkw.lbx index 27aeebaee35..b1e4dfeb6ab 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-aefkw.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-aefkw.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnaustrianaefkwLBX,PgermanaefkwLBX') %% \ProvidesFile{naustrian-aefkw.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-aefkw} \InheritBibliographyStrings{german-aefkw} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-archa.lbx index e909b9e4d93..43c8765e6d9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-archa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-archa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnaustrianarchaLBX,PgermanarchaLBX') %% \ProvidesFile{naustrian-archa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archa} \InheritBibliographyStrings{german-archa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-archaeology.lbx index 0042452ca69..c11815b1618 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-archaeology.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-archaeology.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnaustrianLBX,PgermanLBX') %% \ProvidesFile{naustrian-archaeology.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} \InheritBibliographyStrings{german-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-dguf-alt.lbx index b9586c4e6c5..79df086a463 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-dguf-alt.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-dguf-alt.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnaustriandgufaltLBX,PgermandgufaltLBX') %% \ProvidesFile{naustrian-dguf-alt.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-dguf-alt} \InheritBibliographyStrings{german-dguf-alt} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-dguf-apa.lbx index b01e1be09c6..56eb88bd380 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-dguf-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-dguf-apa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnaustriandgufapaLBX,PgermanLBX') %% \ProvidesFile{naustrian-dguf-apa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} \InheritBibliographyStrings{german-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-eaz.lbx index d0d6c249cca..a5a4ce8c30d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-eaz.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-eaz.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnaustrianeazLBX,PgermaneazLBX') %% \ProvidesFile{naustrian-eaz.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-eaz} \InheritBibliographyStrings{german-eaz} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-foe.lbx index e173e15421e..6b209eb5d77 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-foe.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-foe.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnaustrianfoeLBX,PgermanfoeLBX') %% \ProvidesFile{naustrian-foe.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-foe} \InheritBibliographyStrings{german-foe} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-jb-kreis-neuss.lbx index c363bf59f49..04e88209c8e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-jb-kreis-neuss.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-jb-kreis-neuss.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnaustrianjbkreisneussLBX,PgermanjbkreisneussLBX') %% \ProvidesFile{naustrian-jb-kreis-neuss.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-jb-kreis-neuss} \InheritBibliographyStrings{german-jb-kreis-neuss} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-karl.lbx index 519aed086a0..9d5c1c62b53 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-karl.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-karl.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnaustriankarlLBX,PgermankarlLBX') %% \ProvidesFile{naustrian-karl.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-karl} \InheritBibliographyStrings{german-karl} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-maja.lbx index 60bf5fbf490..d33f63b975b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-maja.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-maja.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnaustrianmajaLBX,PgermanmajaLBX') %% \ProvidesFile{naustrian-maja.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-maja} \InheritBibliographyStrings{german-maja} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-mpk.lbx index 643e18f3e42..9cc435c5398 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-mpk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-mpk.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnaustrianmpkLBX,PgermanmpkLBX') %% \ProvidesFile{naustrian-mpk.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-mpk} \InheritBibliographyStrings{german-mpk} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-mpkoeaw.lbx new file mode 100644 index 00000000000..dd3d8571dee --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-mpkoeaw.lbx @@ -0,0 +1,16 @@ +%% +%% This is file `naustrian-mpkoeaw.lbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `FnaustrianmpkoeawLBX,PgermanmpkoeawLBX') +%% +\ProvidesFile{naustrian-mpkoeaw.lbx} +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes +\InheritBibliographyExtras{german-mpkoeaw} + +\endinput +%% +%% End of file `naustrian-mpkoeaw.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-offa.lbx index f9cbfd8fed5..7dbce44d6d3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-offa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-offa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnaustrianoffaLBX,PgermanoffaLBX') %% \ProvidesFile{naustrian-offa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-offa} \InheritBibliographyStrings{german-offa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-rgzm.lbx index f497f2c4618..0bfcc763e3c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-rgzm.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-rgzm.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnaustrianrgzmLBX,PgermanrgzmLBX') %% \ProvidesFile{naustrian-rgzm.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-rgzm} \InheritBibliographyStrings{german-rgzm} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-zaak.lbx index b5b001ca129..9edaaf60469 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-zaak.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-zaak.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnaustrianzaakLBX,PgermanzaakLBX') %% \ProvidesFile{naustrian-zaak.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-zaak} \InheritBibliographyStrings{german-zaak} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-zaes.lbx index fdbedd6f5ef..2fa458a89a5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-zaes.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/naustrian-zaes.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnaustrianzaesLBX,PgermanzaesLBX') %% \ProvidesFile{naustrian-zaes.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-zaes} \InheritBibliographyStrings{german-zaes} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-aefkw.lbx index 8965d16d9b1..47e8abec388 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-aefkw.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-aefkw.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnewzealandaefkwLBX,PenglishaefkwLBX') %% \ProvidesFile{newzealand-aefkw.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-aefkw} \InheritBibliographyStrings{english-aefkw} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-archa.lbx index 55ca1451542..4c9a34976c8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-archa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-archa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnewzealandarchaLBX,PenglisharchaLBX') %% \ProvidesFile{newzealand-archa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archa} \InheritBibliographyStrings{english-archa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-archaeology.lbx index cc33d835653..d17087bc07f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-archaeology.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-archaeology.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnewzealandLBX,PenglishLBX') %% \ProvidesFile{newzealand-archaeology.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-dguf-alt.lbx index 4eedab9c82b..d157e81ac46 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-dguf-alt.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-dguf-alt.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnewzealanddgufaltLBX,PenglishLBX') %% \ProvidesFile{newzealand-dguf-alt.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-dguf-apa.lbx index 7ac97b85681..31b5b3881e7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-dguf-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-dguf-apa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnewzealanddgufapaLBX,PenglishdgufapaLBX') %% \ProvidesFile{newzealand-dguf-apa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-dguf-apa} \InheritBibliographyStrings{english-dguf-apa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-eaz.lbx index d7762509bfa..e754e32c3e5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-eaz.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-eaz.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnewzealandeazLBX,PenglisheazLBX') %% \ProvidesFile{newzealand-eaz.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-eaz} \InheritBibliographyStrings{english-eaz} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-foe.lbx index 3c0d47f5536..4dd5c7479db 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-foe.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-foe.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnewzealandfoeLBX,PenglishfoeLBX') %% \ProvidesFile{newzealand-foe.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-foe} \InheritBibliographyStrings{english-foe} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-jb-kreis-neuss.lbx index 5745f25f112..b24d1ffd5b9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-jb-kreis-neuss.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-jb-kreis-neuss.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnewzealandjbkreisneussLBX,PenglishjbkreisneussLBX') %% \ProvidesFile{newzealand-jb-kreis-neuss.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-jb-kreis-neuss} \InheritBibliographyStrings{english-jb-kreis-neuss} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-karl.lbx index dd262ae48ea..a8376430a52 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-karl.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-karl.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnewzealandkarlLBX,PenglishLBX') %% \ProvidesFile{newzealand-karl.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-maja.lbx index 10122ff933f..a14498fdc2b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-maja.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-maja.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnewzealandmajaLBX,PenglishLBX') %% \ProvidesFile{newzealand-maja.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-mpk.lbx index 769f5e7816f..260ffa20634 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-mpk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-mpk.lbx @@ -7,9 +7,26 @@ %% biblatex-archaeology.dtx (with options: `FnewzealandmpkLBX,PenglishmpkLBX') %% \ProvidesFile{newzealand-mpk.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-mpk} -\InheritBibliographyStrings{english-mpk} +\InheritBibliographyExtras{english-archaeology} +\DeclareBibliographyStrings{% + inherit = {english-archaeology}, + unpublishedbathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublisheddiplomathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedmagisterthesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedmathesis = {{unpublished thesis} + {unpublished thesis}}, + unpublishedphdthesis = {{unpublished PhD Dissertation} + {unpublished PhD Dissertation}}, + unpublishedpostdocthesis = {{unpublished Habilitationsschrift} + {unpublished Habilitationsschrift}}, + urlseen = {{last access}{last access}}, +} \endinput %% %% End of file `newzealand-mpk.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-mpkoeaw.lbx new file mode 100644 index 00000000000..70ce709ef5d --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-mpkoeaw.lbx @@ -0,0 +1,16 @@ +%% +%% This is file `newzealand-mpkoeaw.lbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `FnewzealandmpkoeawLBX,PenglishmpkoeawLBX') +%% +\ProvidesFile{newzealand-mpkoeaw.lbx} +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes +\InheritBibliographyExtras{english-mpkoeaw} +\InheritBibliographyStrings{english-mpkoeaw} +\endinput +%% +%% End of file `newzealand-mpkoeaw.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-offa.lbx index b474d436201..17efe1c9a0d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-offa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-offa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnewzealandoffaLBX,PenglishoffaLBX') %% \ProvidesFile{newzealand-offa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-offa} \InheritBibliographyStrings{english-offa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-rgzm.lbx index 7d37cf01b7d..179413065b7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-rgzm.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-rgzm.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnewzealandrgzmLBX,PenglishLBX') %% \ProvidesFile{newzealand-rgzm.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-archaeology} \InheritBibliographyStrings{english-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-zaak.lbx index 956547a6715..63977e35454 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-zaak.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-zaak.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnewzealandzaakLBX,PenglishzaakLBX') %% \ProvidesFile{newzealand-zaak.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-zaak} \InheritBibliographyStrings{english-zaak} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-zaes.lbx index 6097775d459..c8996e0122c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-zaes.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/newzealand-zaes.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnewzealandzaesLBX,PenglishzaesLBX') %% \ProvidesFile{newzealand-zaes.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{english-zaes} \InheritBibliographyStrings{english-zaes} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-aefkw.lbx index 1c83c260edf..e41f2240302 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-aefkw.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-aefkw.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FngermanaefkwLBX,PgermanaefkwLBX') %% \ProvidesFile{ngerman-aefkw.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-aefkw} \InheritBibliographyStrings{german-aefkw} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-archa.lbx index 14a1ed74a9e..c575154d94a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-archa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-archa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FngermanarchaLBX,PgermanarchaLBX') %% \ProvidesFile{ngerman-archa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archa} \InheritBibliographyStrings{german-archa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-archaeology.lbx index 5062e47541e..08a3a318fa6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-archaeology.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-archaeology.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FngermanLBX,PgermanLBX') %% \ProvidesFile{ngerman-archaeology.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} \InheritBibliographyStrings{german-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-dguf-alt.lbx index 38e9b04e1ce..7482033afb5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-dguf-alt.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-dguf-alt.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FngermandgufaltLBX,PgermandgufaltLBX') %% \ProvidesFile{ngerman-dguf-alt.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-dguf-alt} \InheritBibliographyStrings{german-dguf-alt} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-dguf-apa.lbx index 0ebd4dd68f3..7e751311c32 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-dguf-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-dguf-apa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FngermandgufapaLBX,PgermanLBX') %% \ProvidesFile{ngerman-dguf-apa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} \InheritBibliographyStrings{german-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-eaz.lbx index 33627086ebc..9306a771059 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-eaz.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-eaz.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FngermaneazLBX,PgermaneazLBX') %% \ProvidesFile{ngerman-eaz.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-eaz} \InheritBibliographyStrings{german-eaz} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-foe.lbx index f5cc4c28faa..f8b49d2a619 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-foe.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-foe.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FngermanfoeLBX,PgermanfoeLBX') %% \ProvidesFile{ngerman-foe.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-foe} \InheritBibliographyStrings{german-foe} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-jb-kreis-neuss.lbx index fedf2ebe266..a9491573109 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-jb-kreis-neuss.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-jb-kreis-neuss.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FngermanjbkreisneussLBX,PgermanjbkreisneussLBX') %% \ProvidesFile{ngerman-jb-kreis-neuss.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-jb-kreis-neuss} \InheritBibliographyStrings{german-jb-kreis-neuss} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-karl.lbx index 18157c1e59a..531758b6704 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-karl.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-karl.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FngermankarlLBX,PgermankarlLBX') %% \ProvidesFile{ngerman-karl.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-karl} \InheritBibliographyStrings{german-karl} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-maja.lbx index 8b219f5d885..6dc91a8b993 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-maja.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-maja.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FngermanmajaLBX,PgermanmajaLBX') %% \ProvidesFile{ngerman-maja.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-maja} \InheritBibliographyStrings{german-maja} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-mpk.lbx index b3888b76065..0868ef63368 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-mpk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-mpk.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FngermanmpkLBX,PgermanmpkLBX') %% \ProvidesFile{ngerman-mpk.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-mpk} \InheritBibliographyStrings{german-mpk} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-mpkoeaw.lbx new file mode 100644 index 00000000000..2011e22db85 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-mpkoeaw.lbx @@ -0,0 +1,16 @@ +%% +%% This is file `ngerman-mpkoeaw.lbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `FngermanmpkoeawLBX,PgermanmpkoeawLBX') +%% +\ProvidesFile{ngerman-mpkoeaw.lbx} +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes +\InheritBibliographyExtras{german-mpkoeaw} + +\endinput +%% +%% End of file `ngerman-mpkoeaw.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-offa.lbx index cd80a666fbb..c39bfabe99c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-offa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-offa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FngermanoffaLBX,PgermanoffaLBX') %% \ProvidesFile{ngerman-offa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-offa} \InheritBibliographyStrings{german-offa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-rgzm.lbx index 2e0860d6ff5..41fc10341a2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-rgzm.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-rgzm.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FngermanrgzmLBX,PgermanrgzmLBX') %% \ProvidesFile{ngerman-rgzm.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-rgzm} \InheritBibliographyStrings{german-rgzm} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-zaak.lbx index aa7f787b642..bd89f92e88d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-zaak.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-zaak.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FngermanzaakLBX,PgermanzaakLBX') %% \ProvidesFile{ngerman-zaak.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-zaak} \InheritBibliographyStrings{german-zaak} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-zaes.lbx index 8c7d830da77..ba374e4676e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-zaes.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ngerman-zaes.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FngermanzaesLBX,PgermanzaesLBX') %% \ProvidesFile{ngerman-zaes.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-zaes} \InheritBibliographyStrings{german-zaes} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.bbx index 5b79a64e1c0..140af8d5ae5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `nnuBBX,noarticlesubtitlepunct') %% \ProvidesFile{nnu.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-comp-archaeology} \def\archaeobibstyletitle{\blxarch@style@nnu} \ExecuteBibliographyOptions{ @@ -32,6 +32,7 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=true, notitlepunct=true, origfields=true, @@ -61,40 +62,40 @@ \setlength{\bibhang}{2em} \DeclareNameAlias{bookauthor}{given-family} \DeclareNameAlias{sortname}{given-family} -\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}} -\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}} -\renewcommand{\multinamedelim}{\addslash} -\renewcommand{\finalnamedelim}{\addslash} -\renewcommand{\labelnamepunct}{\addcomma\space} -\renewcommand{\booklabelnamepunct}{\addcomma\space} +\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}} +\renewcommand*{\multinamedelim}{\addslash} +\renewcommand*{\finalnamedelim}{\addslash} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1} -\renewcommand{\seriespunct}{\addspace} +\renewcommand*{\seriespunct}{\addspace} \DeclareFieldFormat*{seriesparens}{#1} -\renewcommand{\volumenumberdelim}{\addcomma\space} -\DeclareFieldFormat*{realdate}{\mkbibparens{#1}} -\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}} +\renewcommand*{\volumenumberdelim}{\addcomma\space} +\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}} +\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}} \DeclareFieldFormat*{pages}{#1} \DeclareFieldFormat*{volume}{\addspace#1} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}} \DeclareFieldFormat[thesis]{locationdateparens}{#1} \DeclareFieldFormat*{missingfield}{\mkbibbrackets{#1}} -\renewcommand{\bibpagespunct}{% +\renewcommand*{\bibpagespunct}{% \iffieldundef{journaltitle} {\addspace} {\addcomma\space}} -\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1} +\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1} \DeclareFieldFormat*{usere}{% \ifinteger{#1} {\mkbibordinal{#1}\space\bibstring{edition},\space} {#1}% } -\renewcommand{\multicitedelim}{\addsemicolon\space} +\renewcommand*{\multicitedelim}{\addsemicolon\space} \DeclareFieldFormat*{url}{\url{#1}} \let\blxarch@buffer@url\url -\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater} -\renewcommand{\nameshortformdelim}{\addspace in\space} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater} +\renewcommand*{\nameshortformdelim}{\addspace in\space} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `nnu.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.cbx index 511c22220d8..e18f1dad302 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.cbx @@ -7,12 +7,13 @@ %% biblatex-archaeology.dtx (with options: `nnuCBX,barecitations') %% \ProvidesFile{nnu.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{authoryear-comp-archaeology} \def\archaeocitestyletitle{\blxarch@style@nnu} -\DeclareFieldFormat*{postnote}{#1} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `nnu.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.dbx index a25460e2e30..0b20c9958c9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nnu.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `nnuDBX,DBX') %% \ProvidesFile{nnu.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `nnu.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-aefkw.lbx index 13cbc81d2a0..6f91aac402e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-aefkw.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-aefkw.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnswissgermanaefkwLBX,PgermanaefkwLBX') %% \ProvidesFile{nswissgerman-aefkw.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-aefkw} \InheritBibliographyStrings{german-aefkw} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-archa.lbx index 3189d756238..a7717f41933 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-archa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-archa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnswissgermanarchaLBX,PgermanarchaLBX') %% \ProvidesFile{nswissgerman-archa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archa} \InheritBibliographyStrings{german-archa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-archaeology.lbx index 09923ee3e8d..4e88bb0fe97 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-archaeology.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-archaeology.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnswissgermanLBX,PgermanLBX') %% \ProvidesFile{nswissgerman-archaeology.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} \InheritBibliographyStrings{german-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-dguf-alt.lbx index 692fe6dc574..0519ccfd993 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-dguf-alt.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-dguf-alt.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnswissgermandgufaltLBX,PgermandgufaltLBX') %% \ProvidesFile{nswissgerman-dguf-alt.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-dguf-alt} \InheritBibliographyStrings{german-dguf-alt} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-dguf-apa.lbx index 2124cf025df..fa548109aa0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-dguf-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-dguf-apa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnswissgermandgufapaLBX,PgermanLBX') %% \ProvidesFile{nswissgerman-dguf-apa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} \InheritBibliographyStrings{german-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-eaz.lbx index a8a69d35e9c..2d0e89a2152 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-eaz.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-eaz.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnswissgermaneazLBX,PgermaneazLBX') %% \ProvidesFile{nswissgerman-eaz.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-eaz} \InheritBibliographyStrings{german-eaz} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-foe.lbx index dcc3bd2240a..150fe53b668 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-foe.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-foe.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnswissgermanfoeLBX,PgermanfoeLBX') %% \ProvidesFile{nswissgerman-foe.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-foe} \InheritBibliographyStrings{german-foe} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-jb-kreis-neuss.lbx index 33003c38e26..24f40f0057e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-jb-kreis-neuss.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-jb-kreis-neuss.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnswissgermanjbkreisneussLBX,PgermanjbkreisneussLBX') %% \ProvidesFile{nswissgerman-jb-kreis-neuss.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-jb-kreis-neuss} \InheritBibliographyStrings{german-jb-kreis-neuss} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-karl.lbx index 7e90bcc41fe..fbb8afc5479 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-karl.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-karl.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnswissgermankarlLBX,PgermankarlLBX') %% \ProvidesFile{nswissgerman-karl.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-karl} \InheritBibliographyStrings{german-karl} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-maja.lbx index a32a5b36542..a7af80ba49e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-maja.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-maja.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnswissgermanmajaLBX,PgermanmajaLBX') %% \ProvidesFile{nswissgerman-maja.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-maja} \InheritBibliographyStrings{german-maja} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-mpk.lbx index 702e01d57d1..77cdc2886e6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-mpk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-mpk.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnswissgermanmpkLBX,PgermanmpkLBX') %% \ProvidesFile{nswissgerman-mpk.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-mpk} \InheritBibliographyStrings{german-mpk} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-mpkoeaw.lbx new file mode 100644 index 00000000000..0b550f6043c --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-mpkoeaw.lbx @@ -0,0 +1,16 @@ +%% +%% This is file `nswissgerman-mpkoeaw.lbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `FnswissgermanmpkoeawLBX,PgermanmpkoeawLBX') +%% +\ProvidesFile{nswissgerman-mpkoeaw.lbx} +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes +\InheritBibliographyExtras{german-mpkoeaw} + +\endinput +%% +%% End of file `nswissgerman-mpkoeaw.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-offa.lbx index a2dee5dd6b5..ea1355d5f44 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-offa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-offa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnswissgermanoffaLBX,PgermanoffaLBX') %% \ProvidesFile{nswissgerman-offa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-offa} \InheritBibliographyStrings{german-offa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-rgzm.lbx index ecc7592b8bc..990c7cbf8bf 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-rgzm.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-rgzm.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnswissgermanrgzmLBX,PgermanrgzmLBX') %% \ProvidesFile{nswissgerman-rgzm.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-rgzm} \InheritBibliographyStrings{german-rgzm} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-zaak.lbx index 0e11b1f5fba..115e30cbf99 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-zaak.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-zaak.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnswissgermanzaakLBX,PgermanzaakLBX') %% \ProvidesFile{nswissgerman-zaak.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-zaak} \InheritBibliographyStrings{german-zaak} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-zaes.lbx index f3359ea42d1..77e84d23905 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-zaes.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/nswissgerman-zaes.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FnswissgermanzaesLBX,PgermanzaesLBX') %% \ProvidesFile{nswissgerman-zaes.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-zaes} \InheritBibliographyStrings{german-zaes} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/numeric-comp-archaeology.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/numeric-comp-archaeology.bbx new file mode 100644 index 00000000000..cb462b2997a --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/numeric-comp-archaeology.bbx @@ -0,0 +1,24 @@ +%% +%% This is file `numeric-comp-archaeology.bbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `numericcompBBX,nonauthoryearsharedBBX') +%% +\ProvidesFile{numeric-comp-archaeology.bbx} +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] +\def\blxarch@fork@numeric{} +\def\archaeobibstyletitle{\blxarch@style@numc} +\RequireBibliographyStyle{numeric-comp} +\RequirePackage{biblatex-archaeology} +\ExecuteBibliographyOptions{ +repeatlabel=false +} +\renewbibmacro*{repeatlabel}{% + \blxarch@errmsg{Option 'repeatlabel' must be 'false' in verbose and numeric styles}} +\csuse{blxarch@issuedate}% +\renewcommand{\iftabbedlabeldate}[2]{#2} +\endinput +%% +%% End of file `numeric-comp-archaeology.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/numeric-comp-archaeology.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/numeric-comp-archaeology.cbx new file mode 100644 index 00000000000..f397dfbf069 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/numeric-comp-archaeology.cbx @@ -0,0 +1,21 @@ +%% +%% This is file `numeric-comp-archaeology.cbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `numericcompCBX,noshortform') +%% +\ProvidesFile{numeric-comp-archaeology.cbx} +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] +\def\archaeocitestyletitle{\blxarch@style@numc} +\RequireCitationStyle{numeric-comp} +\DeclareFieldFormat*{postnote}{} +\DeclareFieldFormat*{prenote}{} +\let\shortformcite\autocite +\let\shortformcites\autocites +\let\sfcite\cite +\let\sfcites\cites +\endinput +%% +%% End of file `numeric-comp-archaeology.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/numeric-comp-archaeology.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/numeric-comp-archaeology.dbx new file mode 100644 index 00000000000..94eab0e5bca --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/numeric-comp-archaeology.dbx @@ -0,0 +1,51 @@ +%% +%% This is file `numeric-comp-archaeology.dbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `numericcompDBX,DBX') +%% +\ProvidesFile{numeric-comp-archaeology.dbx} +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] +\DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} +\DeclareDatamodelFields[type=field,datatype=integer]{subnumber} +\DeclareDatamodelEntryfields +[book,bookinbook,inbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings, +proceedings,reference,inreference,mvreference,suppbook,suppcollection] +{shortsubseries,subnumber,subseries} +\DeclareDatamodelFields[type=field,datatype=literal]{titlenote} +\DeclareDatamodelFields[type=field,datatype=literal]{maintitlenote} +\DeclareDatamodelFields[type=field,datatype=literal]{booktitlenote} +\DeclareDatamodelFields[type=field,datatype=literal]{summarytitle} +\DeclareDatamodelFields[type=field,datatype=literal]{shortform} +\DeclareDatamodelFields[type=list,datatype=name]{festschrift} +\DeclareDatamodelFields[type=field,datatype=literal]{festschriftaddon} +\DeclareDatamodelFields[type=field,datatype=integer]{eventnumber} +\DeclareDatamodelFields[type=field,datatype=literal]{eventtype} +\DeclareDatamodelFields[type=list,datatype=literal]{multieventdate} +\DeclareDatamodelFields[type=list,datatype=literal]{multivenue} +\DeclareDatamodelEntryfields +[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings, +proceedings,reference,inreference,mvreference,suppbook,suppcollection] +{shortform,festschrift,festschriftaddon,eventnumber,eventtype +,eventdate,venue,multieventdate,multivenue} +\DeclareDatamodelEntryfields +[inbook,bookinbook,incollection,inproceedings,inreference,suppbook,suppcollection] +{booktitlenote} +\DeclareDatamodelEntryfields{summarytitle,titlenote} +\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate,fulleventdate,newsdate} +\DeclareDatamodelEntryfields{realdate,origrealdate} +\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate} +\DeclareDatamodelEntryfields +[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings, +proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fulleventdate} +\DeclareDatamodelEntryfields +[article,periodical,suppperiodical,review]{newsdate} +\DeclareDatamodelEntryfields +[article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} +\endinput +%% +%% End of file `numeric-comp-archaeology.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.bbx index 6fece610b5e..6673dd5e218 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `offaBBX,noarticlesubtitlepunct') %% \ProvidesFile{offa.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-comp-archaeology} \def\archaeobibstyletitle{\blxarch@style@offa} \DeclareLanguageMappingSuffix{-offa} @@ -33,6 +33,7 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=3, nothesistitlepunct=true, notitlepunct=true, origfields=true, @@ -61,25 +62,25 @@ } \DeclareNameAlias{bookauthor}{given-family} \DeclareNameAlias{sortname}{given-family} -\renewcommand{\mkbibrepeatfamily}[1]{#1} -\renewcommand{\mkbibrepeatprefix}[1]{#1} -\renewcommand{\multicitedelim}{\addsemicolon\space} -\renewcommand{\multinamedelim}{\addslash} -\renewcommand{\finalnamedelim}{\addslash} -\renewcommand{\multilistdelim}{\addslash} -\renewcommand{\repeatlabeldelim}{\addcolon\space} -\renewcommand{\booklabelnamepunct}{\addcomma\space} -\renewcommand{\labelnamepunct}{\addcomma\space} -\renewcommand{\seriespunct}{\addspace} +\renewcommand*{\mkbibrepeatfamily}[1]{#1} +\renewcommand*{\mkbibrepeatprefix}[1]{#1} +\renewcommand*{\multicitedelim}{\addsemicolon\space} +\renewcommand*{\multinamedelim}{\addslash} +\renewcommand*{\finalnamedelim}{\addslash} +\renewcommand*{\multilistdelim}{\addslash} +\renewcommand*{\repeatlabeldelim}{\addcolon\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\seriespunct}{\addspace} \DeclareFieldFormat*{seriesparens}{#1} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat*{pages}{#1} \DeclareFieldFormat*{volume}{\addspace#1} \DeclareFieldFormat*{thesis}{\mkbibparens{#1}} -\renewcommand{\institutionlocationdelim}{\addspace} +\renewcommand*{\institutionlocationdelim}{\addspace} \DeclareFieldFormat*{url}{\url{#1}} \DeclareFieldFormat*{urldate}{\mkbibparens{#1}} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `offa.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.cbx index a39b5edfd0b..175f02879aa 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.cbx @@ -7,12 +7,13 @@ %% biblatex-archaeology.dtx (with options: `offaCBX,barecitations') %% \ProvidesFile{offa.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{authoryear-comp-archaeology} \def\archaeocitestyletitle{\blxarch@style@offa} -\DeclareFieldFormat*{postnote}{#1} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `offa.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.dbx index 81aa375efcc..3d23e8df605 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/offa.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `offaDBX,DBX') %% \ProvidesFile{offa.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `offa.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.bbx index d951a4115ca..1d5b30b37d7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.bbx @@ -7,10 +7,11 @@ %% biblatex-archaeology.dtx (with options: `rgkinlineBBX,rgksharedBBX,noarticlesubtitlepunct') %% \ProvidesFile{rgk-inline.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-archaeology} \def\archaeobibstyletitle{\blxarch@style@rgkinline} \ExecuteBibliographyOptions{ + dashed=true, ibidtracker=false, idemtracker=false, loccittracker=false, @@ -22,11 +23,10 @@ sorting=lnyvt, } \setlength{\bibitemsep}{\baselineskip} -\renewcommand{\bibnamedash}{\printtext{\bibstring[\mkbiblistnamefamily]{idem\thefield{gender}}}} -\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}} -\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}} +\renewcommand*{\bibnamedash}{\printtext{\bibstring[\mkbiblistnamefamily]{idem\thefield{gender}}}} +\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}} \ExecuteBibliographyOptions{ - dashed=true, doi=false, eprint=false, giveninits=true, @@ -44,6 +44,7 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=true, notitlepunct=true, origfields=true, @@ -71,34 +72,34 @@ } \DeclareNameAlias{bookauthor}{given-family} \DeclareNameAlias{sortname}{given-family} -\renewcommand{\multinamedelim}{\addslash} -\renewcommand{\finalnamedelim}{\addslash} -\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}} -\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}} -\renewcommand{\labelnamepunct}{\addcomma\space} -\renewcommand{\booklabelnamepunct}{\addcomma\space} +\renewcommand*{\multinamedelim}{\addslash} +\renewcommand*{\finalnamedelim}{\addslash} +\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1} -\renewcommand{\seriespunct}{\addspace} +\renewcommand*{\seriespunct}{\addspace} \DeclareFieldFormat*{seriesparens}{#1} -\renewcommand{\volumenumberdelim}{\addcomma\space} -\DeclareFieldFormat*{realdate}{\mkbibparens{#1}} -\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}} +\renewcommand*{\volumenumberdelim}{\addcomma\space} +\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}} +\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}} \DeclareFieldFormat*{pages}{#1} \DeclareFieldFormat*{volume}{\addspace#1} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}} \DeclareFieldFormat[thesis]{locationdateparens}{#1} \DeclareFieldFormat*{missingfield}{\mkbibbrackets{#1}} -\renewcommand{\bibpagespunct}{% +\renewcommand*{\bibpagespunct}{% \iffieldundef{journaltitle} {\addspace} {\addcomma\space}} -\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1} -\renewcommand{\multicitedelim}{\addsemicolon\space} +\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1} +\renewcommand*{\multicitedelim}{\addsemicolon\space} \DeclareFieldFormat*{url}{\url{#1}} \let\blxarch@buffer@url\url -\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `rgk-inline.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.cbx index 94be20c1bef..6e1b59aed4f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.cbx @@ -7,12 +7,13 @@ %% biblatex-archaeology.dtx (with options: `rgkinlineCBX,barecitations') %% \ProvidesFile{rgk-inline.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{authoryear-archaeology} \def\archaeocitestyletitle{\blxarch@style@rgkinline} -\DeclareFieldFormat*{postnote}{#1} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `rgk-inline.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.dbx index 908b1fa6073..124471acaf7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-inline.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `rgkinlineDBX,DBX') %% \ProvidesFile{rgkinlineDBX} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `rgk-inline.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-numeric.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-numeric.bbx new file mode 100644 index 00000000000..6ca757c9ab4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-numeric.bbx @@ -0,0 +1,96 @@ +%% +%% This is file `rgk-numeric.bbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `rgknumericBBX,rgksharedBBX,noarticlesubtitlepunct') +%% +\ProvidesFile{rgk-verbose.bbx} +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] +\RequireBibliographyStyle{numeric-comp-archaeology} +\def\archaeobibstyletitle{\blxarch@style@rgknumeric} +\ExecuteBibliographyOptions{ + ibidtracker=false, + idemtracker=false, + loccittracker=false, + maxbibnames=500, + maxcitenames=500, +} +\ExecuteBibliographyOptions{ + doi=false, + eprint=false, + giveninits=true, + maxbibnames=500, + maxcitenames=2, + maxitems=2, + mincitenames=1, + minitems=1, + notetype=foot+end, + url=false, + editionsuperscript=posttitle, + giveninitligatures={Ch,Ph,St,Th}, + idemincitation=false, + injournal=false, + journallocation=false, + maxbooknames=500, + minbooknames=3, + minrealdatediff=\blxarch@maxnumber, + nothesistitlepunct=true, + notitlepunct=true, + origfields=true, + pagesfirst=false, + positionlabeldate=location, + preservelastauthor=false, + shortform=false, + shortjournal=true, + shortseries=true, + subseries=true, + summarytitle=false, + tabbedlabeldate=false, + titlebrackets=false, + titlenote=true, + useeventdate=false, + useeventnumber=true, + usefestschriftaddon=false, + useinstitution=false, + uselocation=true, + usemultivenue=false, + usesourceeditor=true, + usepublisher=false, + useunpublishedthesis=true, + volumeafterseries=false, +} +\DeclareNameAlias{bookauthor}{given-family} +\DeclareNameAlias{sortname}{given-family} +\renewcommand*{\multinamedelim}{\addslash} +\renewcommand*{\finalnamedelim}{\addslash} +\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} +\DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1} +\renewcommand*{\seriespunct}{\addspace} +\DeclareFieldFormat*{seriesparens}{#1} +\renewcommand*{\volumenumberdelim}{\addcomma\space} +\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}} +\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}} +\DeclareFieldFormat*{pages}{#1} +\DeclareFieldFormat*{volume}{\addspace#1} +\DeclareFieldFormat*{journaldateparens}{#1} +\DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}} +\DeclareFieldFormat[thesis]{locationdateparens}{#1} +\DeclareFieldFormat*{missingfield}{\mkbibbrackets{#1}} +\renewcommand*{\bibpagespunct}{% + \iffieldundef{journaltitle} + {\addspace} + {\addcomma\space}} +\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1} +\renewcommand*{\multicitedelim}{\addsemicolon\space} +\DeclareFieldFormat*{url}{\url{#1}} +\let\blxarch@buffer@url\url +\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} +\endinput +%% +%% End of file `rgk-numeric.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-numeric.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-numeric.cbx new file mode 100644 index 00000000000..472c5c32062 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-numeric.cbx @@ -0,0 +1,19 @@ +%% +%% This is file `rgk-numeric.cbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `rgknumericCBX,barecitations') +%% +\ProvidesFile{rgk-numeric.cbx} +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] +\RequireCitationStyle{numeric-comp-archaeology} +\def\archaeocitestyletitle{\blxarch@style@rgknumeric} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} +\DeclareFieldFormat*{volcitevolume}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} +\endinput +%% +%% End of file `rgk-numeric.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-numeric.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-numeric.dbx new file mode 100644 index 00000000000..301942506ce --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-numeric.dbx @@ -0,0 +1,51 @@ +%% +%% This is file `rgk-numeric.dbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `rgknumericDBX,DBX') +%% +\ProvidesFile{rgk-numeric.dbx} +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] +\DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} +\DeclareDatamodelFields[type=field,datatype=integer]{subnumber} +\DeclareDatamodelEntryfields +[book,bookinbook,inbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings, +proceedings,reference,inreference,mvreference,suppbook,suppcollection] +{shortsubseries,subnumber,subseries} +\DeclareDatamodelFields[type=field,datatype=literal]{titlenote} +\DeclareDatamodelFields[type=field,datatype=literal]{maintitlenote} +\DeclareDatamodelFields[type=field,datatype=literal]{booktitlenote} +\DeclareDatamodelFields[type=field,datatype=literal]{summarytitle} +\DeclareDatamodelFields[type=field,datatype=literal]{shortform} +\DeclareDatamodelFields[type=list,datatype=name]{festschrift} +\DeclareDatamodelFields[type=field,datatype=literal]{festschriftaddon} +\DeclareDatamodelFields[type=field,datatype=integer]{eventnumber} +\DeclareDatamodelFields[type=field,datatype=literal]{eventtype} +\DeclareDatamodelFields[type=list,datatype=literal]{multieventdate} +\DeclareDatamodelFields[type=list,datatype=literal]{multivenue} +\DeclareDatamodelEntryfields +[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings, +proceedings,reference,inreference,mvreference,suppbook,suppcollection] +{shortform,festschrift,festschriftaddon,eventnumber,eventtype +,eventdate,venue,multieventdate,multivenue} +\DeclareDatamodelEntryfields +[inbook,bookinbook,incollection,inproceedings,inreference,suppbook,suppcollection] +{booktitlenote} +\DeclareDatamodelEntryfields{summarytitle,titlenote} +\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate,fulleventdate,newsdate} +\DeclareDatamodelEntryfields{realdate,origrealdate} +\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate} +\DeclareDatamodelEntryfields +[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings, +proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fulleventdate} +\DeclareDatamodelEntryfields +[article,periodical,suppperiodical,review]{newsdate} +\DeclareDatamodelEntryfields +[article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} +\endinput +%% +%% End of file `rgk-numeric.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.bbx index f213ef13f1b..85498577541 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.bbx @@ -7,10 +7,11 @@ %% biblatex-archaeology.dtx (with options: `rgkverboseBBX,rgksharedBBX,noarticlesubtitlepunct') %% \ProvidesFile{rgk-verbose.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{verbose-trad2note-archaeology} \def\archaeobibstyletitle{\blxarch@style@rgkverbose} \ExecuteBibliographyOptions{ + dashed=true, ibidtracker=true, idemtracker=false, loccittracker=true, @@ -18,7 +19,6 @@ maxcitenames=500, } \ExecuteBibliographyOptions{ - dashed=true, doi=false, eprint=false, giveninits=true, @@ -36,6 +36,7 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=true, notitlepunct=true, origfields=true, @@ -63,34 +64,34 @@ } \DeclareNameAlias{bookauthor}{given-family} \DeclareNameAlias{sortname}{given-family} -\renewcommand{\multinamedelim}{\addslash} -\renewcommand{\finalnamedelim}{\addslash} -\renewcommand{\mkbiblistnamefamily}[1]{\textsc{#1}} -\renewcommand{\mkbiblistnameprefix}[1]{\textsc{#1}} -\renewcommand{\labelnamepunct}{\addcomma\space} -\renewcommand{\booklabelnamepunct}{\addcomma\space} +\renewcommand*{\multinamedelim}{\addslash} +\renewcommand*{\finalnamedelim}{\addslash} +\renewcommand*{\mkbiblistnamefamily}[1]{\textsc{#1}} +\renewcommand*{\mkbiblistnameprefix}[1]{\textsc{#1}} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1} -\renewcommand{\seriespunct}{\addspace} +\renewcommand*{\seriespunct}{\addspace} \DeclareFieldFormat*{seriesparens}{#1} -\renewcommand{\volumenumberdelim}{\addcomma\space} -\DeclareFieldFormat*{realdate}{\mkbibparens{#1}} -\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}} +\renewcommand*{\volumenumberdelim}{\addcomma\space} +\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}} +\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}} \DeclareFieldFormat*{pages}{#1} \DeclareFieldFormat*{volume}{\addspace#1} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}} \DeclareFieldFormat[thesis]{locationdateparens}{#1} \DeclareFieldFormat*{missingfield}{\mkbibbrackets{#1}} -\renewcommand{\bibpagespunct}{% +\renewcommand*{\bibpagespunct}{% \iffieldundef{journaltitle} {\addspace} {\addcomma\space}} -\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1} -\renewcommand{\multicitedelim}{\addsemicolon\space} +\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1} +\renewcommand*{\multicitedelim}{\addsemicolon\space} \DeclareFieldFormat*{url}{\url{#1}} \let\blxarch@buffer@url\url -\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `rgk-verbose.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.cbx index f8ee0e6f6e0..6d3184fd7a7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.cbx @@ -7,14 +7,14 @@ %% biblatex-archaeology.dtx (with options: `rgkverboseCBX,barecitations') %% \ProvidesFile{rgk-verbose.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{verbose-trad2note-archaeology} \def\archaeocitestyletitle{\blxarch@style@rgkverbose} \ExecuteBibliographyOptions{ citepages=omit, % permit|suppress|omit|separate } \DeclareFieldFormat*{seenote}{\mkbibparens{#1}} -\renewcommand{\postnotedelim}{% +\renewcommand*{\postnotedelim}{% \ifboolexpr{ test {\ifentrytype{article}} or @@ -31,9 +31,10 @@ {\addspace}} {\addspace}} % \end{macrocode} -\DeclareFieldFormat*{postnote}{#1} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `rgk-verbose.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.dbx index 3b5c699fca3..25bfc2cc57a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgk-verbose.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `rgkverboseDBX,DBX') %% \ProvidesFile{rgk-verbose.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `rgk-verbose.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.bbx index 6c86c294508..08a33477b7c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.bbx @@ -7,14 +7,15 @@ %% biblatex-archaeology.dtx (with options: `rgzminlineBBX,rgzmsharedBBX,noarticlesubtitlepunct,nosmallcaps') %% \ProvidesFile{rgzm-inline.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-comp-archaeology} \def\archaeobibstyletitle{\blxarch@style@rgzminline} \ExecuteBibliographyOptions{ + dashed=false, ibidtracker=false, idemtracker=false, loccittracker=false, - repeatlabel=true, + repeatlabel=dashed, mergedate=false, maxbibnames=500, maxcitenames=2, @@ -22,12 +23,12 @@ sorting=lnyvt, } \setlength{\bibitemsep}{\baselineskip} -\renewcommand{\mkbibrepeatfamily}[1]{#1} -\renewcommand{\mkbibrepeatprefix}[1]{#1} -\renewcommand{\repeatlabeldelim}{\addcolon\space} +\renewcommand*{\repeatlabeldash}{\hspace*{\bibhang}} +\renewcommand*{\mkbibrepeatfamily}[1]{#1} +\renewcommand*{\mkbibrepeatprefix}[1]{#1} +\renewcommand*{\repeatlabeldelim}{\addcolon\space} \DeclareLanguageMappingSuffix{-rgzm} \ExecuteBibliographyOptions{ - dashed=false, doi=false, eprint=false, giveninits=true, @@ -46,6 +47,7 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=1, nothesistitlepunct=true, notitlepunct=true, origfields=true, @@ -73,36 +75,36 @@ } \DeclareNameAlias{bookauthor}{given-family} \DeclareNameAlias{sortname}{given-family} -\renewcommand{\mkbibrepeatfamily}[1]{#1} -\renewcommand{\mkbibrepeatprefix}[1]{#1} -\renewcommand{\multinamedelim}{\addspace\addslash\space} -\renewcommand{\finalnamedelim}{\addspace\addslash\space} -\renewcommand{\labelnamepunct}{\addcomma\space} -\renewcommand{\booklabelnamepunct}{\addcomma\space} +\renewcommand*{\mkbibrepeatfamily}[1]{#1} +\renewcommand*{\mkbibrepeatprefix}[1]{#1} +\renewcommand*{\multinamedelim}{\addspace\addslash\space} +\renewcommand*{\finalnamedelim}{\addspace\addslash\space} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1} -\renewcommand{\seriespunct}{\addspace} +\renewcommand*{\seriespunct}{\addspace} \DeclareFieldFormat*{seriesparens}{#1} -\renewcommand{\volumenumberdelim}{\addcomma\space} -\DeclareFieldFormat*{realdate}{\mkbibparens{#1}} -\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}} +\renewcommand*{\volumenumberdelim}{\addcomma\space} +\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}} +\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}} \DeclareFieldFormat*{pages}{#1} \DeclareFieldFormat*{volume}{\addspace#1} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat[thesis]{thesis}{\mkbibbrackets{#1}} \DeclareFieldFormat[thesis]{locationdateparens}{#1} -\renewcommand{\bibpagespunct}{% +\renewcommand*{\bibpagespunct}{% \iffieldundef{journaltitle} {\addspace} {\addcomma\space}} -\DeclareFieldFormat*{reprintbrackets}{\addcomma\space#1} -\renewcommand{\multicitedelim}{\addsemicolon\space} +\DeclareFieldFormat*{reprintparens}{\addcomma\space#1} +\renewcommand*{\multicitedelim}{\addsemicolon\space} \DeclareFieldFormat*{url}{\url{#1}} \DeclareFieldFormat*{urldate}{\mkbibparens{#1}} -\renewcommand{\mkbibnamefamily}[1]{#1} -\renewcommand{\mkbibnameprefix}[1]{#1} -\renewcommand{\mkbibrepeatfamily}[1]{#1} -\renewcommand{\mkbibrepeatprefix}[1]{#1} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\mkbibnamefamily}[1]{#1} +\renewcommand*{\mkbibnameprefix}[1]{#1} +\renewcommand*{\mkbibrepeatfamily}[1]{#1} +\renewcommand*{\mkbibrepeatprefix}[1]{#1} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `rgzm-inline.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.cbx index 5c363698ee2..3501afffc65 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.cbx @@ -7,12 +7,13 @@ %% biblatex-archaeology.dtx (with options: `rgzminlineCBX,barecitations') %% \ProvidesFile{rgzm-inline.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{authoryear-comp-archaeology} \def\archaeocitestyletitle{\blxarch@style@rgzminline} -\DeclareFieldFormat*{postnote}{#1} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `rgzm-inline.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.dbx index 3cedcf6399e..62807a14e98 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-inline.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `rgzminlineDBX,DBX') %% \ProvidesFile{rgzm-inline.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `rgzm-inline.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-numeric.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-numeric.bbx new file mode 100644 index 00000000000..5ce82334c40 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-numeric.bbx @@ -0,0 +1,95 @@ +%% +%% This is file `rgzm-numeric.bbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `rgzmnumericBBX,rgzmsharedBBX,noarticlesubtitlepunct') +%% +\ProvidesFile{rgzm-inline.bbx} +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] +\RequireBibliographyStyle{numeric-comp-archaeology} +\def\archaeobibstyletitle{\blxarch@style@rgzmnumeric} +\ExecuteBibliographyOptions{ + ibidtracker=false, + idemtracker=false, + loccittracker=false, + maxbibnames=500, +} +\DeclareLanguageMappingSuffix{-rgzm} +\ExecuteBibliographyOptions{ + doi=false, + eprint=false, + giveninits=true, + maxbibnames=3, + maxcitenames=3, + maxitems=3, + minbibnames=3, + mincitenames=3 , + minitems=3, + notetype=foot+end, + url=false, + editionsuperscript=predate, + giveninitligatures={Ch,Ph,St,Th}, + idemincitation=false, + injournal=false, + journallocation=false, + maxbooknames=500, + minbooknames=3, + minrealdatediff=1, + nothesistitlepunct=true, + notitlepunct=true, + origfields=true, + pagesfirst=false, + positionlabeldate=location, + preservelastauthor=false, + shortform=false, + shortjournal=true, + shortseries=true, + subseries=true, + summarytitle=false, + tabbedlabeldate=false, + titlebrackets=true, + titlenote=true, + useeventdate=false, + useeventnumber=true, + usefestschriftaddon=false, + useinstitution=omitlocation, + uselocation=true, + usemultivenue=false, + usesourceeditor=true, + usepublisher=false, + useunpublishedthesis=true, + volumeafterseries=false, +} +\DeclareNameAlias{bookauthor}{given-family} +\DeclareNameAlias{sortname}{given-family} +\renewcommand*{\mkbibrepeatfamily}[1]{#1} +\renewcommand*{\mkbibrepeatprefix}[1]{#1} +\renewcommand*{\multinamedelim}{\addspace\addslash\space} +\renewcommand*{\finalnamedelim}{\addspace\addslash\space} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} +\DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1} +\renewcommand*{\seriespunct}{\addspace} +\DeclareFieldFormat*{seriesparens}{#1} +\renewcommand*{\volumenumberdelim}{\addcomma\space} +\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}} +\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}} +\DeclareFieldFormat*{pages}{#1} +\DeclareFieldFormat*{volume}{\addspace#1} +\DeclareFieldFormat*{journaldateparens}{#1} +\DeclareFieldFormat[thesis]{thesis}{\mkbibbrackets{#1}} +\DeclareFieldFormat[thesis]{locationdateparens}{#1} +\renewcommand*{\bibpagespunct}{% + \iffieldundef{journaltitle} + {\addspace} + {\addcomma\space}} +\DeclareFieldFormat*{reprintparens}{\addcomma\space#1} +\renewcommand*{\multicitedelim}{\addsemicolon\space} +\DeclareFieldFormat*{url}{\url{#1}} +\DeclareFieldFormat*{urldate}{\mkbibparens{#1}} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} +\endinput +%% +%% End of file `rgzm-numeric.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-numeric.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-numeric.cbx new file mode 100644 index 00000000000..eaed5bbdb4e --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-numeric.cbx @@ -0,0 +1,19 @@ +%% +%% This is file `rgzm-numeric.cbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `rgzmnumericCBX,barecitations') +%% +\ProvidesFile{rgzm-numeric.cbx} +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] +\RequireCitationStyle{numeric-comp-archaeology} +\def\archaeocitestyletitle{\blxarch@style@rgzmnumeric} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} +\DeclareFieldFormat*{volcitevolume}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} +\endinput +%% +%% End of file `rgzm-numeric.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-numeric.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-numeric.dbx new file mode 100644 index 00000000000..ae819eacb5c --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-numeric.dbx @@ -0,0 +1,51 @@ +%% +%% This is file `rgzm-numeric.dbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `rgzmnumericDBX,DBX') +%% +\ProvidesFile{rgzm-numeric.dbx} +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] +\DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} +\DeclareDatamodelFields[type=field,datatype=integer]{subnumber} +\DeclareDatamodelEntryfields +[book,bookinbook,inbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings, +proceedings,reference,inreference,mvreference,suppbook,suppcollection] +{shortsubseries,subnumber,subseries} +\DeclareDatamodelFields[type=field,datatype=literal]{titlenote} +\DeclareDatamodelFields[type=field,datatype=literal]{maintitlenote} +\DeclareDatamodelFields[type=field,datatype=literal]{booktitlenote} +\DeclareDatamodelFields[type=field,datatype=literal]{summarytitle} +\DeclareDatamodelFields[type=field,datatype=literal]{shortform} +\DeclareDatamodelFields[type=list,datatype=name]{festschrift} +\DeclareDatamodelFields[type=field,datatype=literal]{festschriftaddon} +\DeclareDatamodelFields[type=field,datatype=integer]{eventnumber} +\DeclareDatamodelFields[type=field,datatype=literal]{eventtype} +\DeclareDatamodelFields[type=list,datatype=literal]{multieventdate} +\DeclareDatamodelFields[type=list,datatype=literal]{multivenue} +\DeclareDatamodelEntryfields +[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings, +proceedings,reference,inreference,mvreference,suppbook,suppcollection] +{shortform,festschrift,festschriftaddon,eventnumber,eventtype +,eventdate,venue,multieventdate,multivenue} +\DeclareDatamodelEntryfields +[inbook,bookinbook,incollection,inproceedings,inreference,suppbook,suppcollection] +{booktitlenote} +\DeclareDatamodelEntryfields{summarytitle,titlenote} +\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate,fulleventdate,newsdate} +\DeclareDatamodelEntryfields{realdate,origrealdate} +\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate} +\DeclareDatamodelEntryfields +[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings, +proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fulleventdate} +\DeclareDatamodelEntryfields +[article,periodical,suppperiodical,review]{newsdate} +\DeclareDatamodelEntryfields +[article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} +\endinput +%% +%% End of file `rgzm-numeric.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.bbx index 780aa973d76..50eb68b8169 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.bbx @@ -7,10 +7,11 @@ %% biblatex-archaeology.dtx (with options: `rgzmverboseBBX,rgzmsharedBBX,noarticlesubtitlepunct,nosmallcaps') %% \ProvidesFile{rgzm-verbose.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{verbose-ibid-archaeology} \def\archaeobibstyletitle{\blxarch@style@rgzmverbose} \ExecuteBibliographyOptions{ + dashed=false, ibidtracker=true, idemtracker=false, loccittracker=false, @@ -19,7 +20,6 @@ } \DeclareLanguageMappingSuffix{-rgzm} \ExecuteBibliographyOptions{ - dashed=false, doi=false, eprint=false, giveninits=true, @@ -38,6 +38,7 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=1, nothesistitlepunct=true, notitlepunct=true, origfields=true, @@ -65,36 +66,36 @@ } \DeclareNameAlias{bookauthor}{given-family} \DeclareNameAlias{sortname}{given-family} -\renewcommand{\mkbibrepeatfamily}[1]{#1} -\renewcommand{\mkbibrepeatprefix}[1]{#1} -\renewcommand{\multinamedelim}{\addspace\addslash\space} -\renewcommand{\finalnamedelim}{\addspace\addslash\space} -\renewcommand{\labelnamepunct}{\addcomma\space} -\renewcommand{\booklabelnamepunct}{\addcomma\space} +\renewcommand*{\mkbibrepeatfamily}[1]{#1} +\renewcommand*{\mkbibrepeatprefix}[1]{#1} +\renewcommand*{\multinamedelim}{\addspace\addslash\space} +\renewcommand*{\finalnamedelim}{\addspace\addslash\space} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} \DeclareFieldFormat[inreference]{dictionary}{\midsentence\bibstring{subverbum}\space#1} -\renewcommand{\seriespunct}{\addspace} +\renewcommand*{\seriespunct}{\addspace} \DeclareFieldFormat*{seriesparens}{#1} -\renewcommand{\volumenumberdelim}{\addcomma\space} -\DeclareFieldFormat*{realdate}{\mkbibparens{#1}} -\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}} +\renewcommand*{\volumenumberdelim}{\addcomma\space} +\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}} +\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}} \DeclareFieldFormat*{pages}{#1} \DeclareFieldFormat*{volume}{\addspace#1} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat[thesis]{thesis}{\mkbibbrackets{#1}} \DeclareFieldFormat[thesis]{locationdateparens}{#1} -\renewcommand{\bibpagespunct}{% +\renewcommand*{\bibpagespunct}{% \iffieldundef{journaltitle} {\addspace} {\addcomma\space}} -\DeclareFieldFormat*{reprintbrackets}{\addcomma\space#1} -\renewcommand{\multicitedelim}{\addsemicolon\space} +\DeclareFieldFormat*{reprintparens}{\addcomma\space#1} +\renewcommand*{\multicitedelim}{\addsemicolon\space} \DeclareFieldFormat*{url}{\url{#1}} \DeclareFieldFormat*{urldate}{\mkbibparens{#1}} -\renewcommand{\mkbibnamefamily}[1]{#1} -\renewcommand{\mkbibnameprefix}[1]{#1} -\renewcommand{\mkbibrepeatfamily}[1]{#1} -\renewcommand{\mkbibrepeatprefix}[1]{#1} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\mkbibnamefamily}[1]{#1} +\renewcommand*{\mkbibnameprefix}[1]{#1} +\renewcommand*{\mkbibrepeatfamily}[1]{#1} +\renewcommand*{\mkbibrepeatprefix}[1]{#1} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `rgzm-verbose.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.cbx index 923be103761..264b3afab3d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.cbx @@ -7,15 +7,16 @@ %% biblatex-archaeology.dtx (with options: `rgzmverboseCBX,barecitations') %% \ProvidesFile{rgzm-verbose.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{verbose-ibid-archaeology} \def\archaeocitestyletitle{\blxarch@style@rgzmverbose} \ExecuteBibliographyOptions{ citepages=omit, % permit|suppress|omit|separate } -\DeclareFieldFormat*{postnote}{#1} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `rgzm-verbose.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.dbx index baaa1655471..404e77a48bb 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/rgzm-verbose.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `rgzmverboseDBX,DBX') %% \ProvidesFile{rgzm-verbose.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `rgzm-verbose.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-aefkw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-aefkw.lbx index f2c31d59bec..1d4d1ce18c4 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-aefkw.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-aefkw.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FswissgermanaefkwLBX,PgermanaefkwLBX') %% \ProvidesFile{swissgerman-aefkw.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-aefkw} \InheritBibliographyStrings{german-aefkw} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-archa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-archa.lbx index 10e746cb742..771bee523e4 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-archa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-archa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FswissgermanarchaLBX,PgermanarchaLBX') %% \ProvidesFile{swissgerman-archa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archa} \InheritBibliographyStrings{german-archa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-archaeology.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-archaeology.lbx index f0ec88f3d36..6c6f19d95fb 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-archaeology.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-archaeology.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FswissgermanLBX,PgermanLBX') %% \ProvidesFile{swissgerman-archaeology.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} \InheritBibliographyStrings{german-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-dguf-alt.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-dguf-alt.lbx index a99d6dab35a..75c27e575ae 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-dguf-alt.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-dguf-alt.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FswissgermandgufaltLBX,PgermandgufaltLBX') %% \ProvidesFile{swissgerman-dguf-alt.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-dguf-alt} \InheritBibliographyStrings{german-dguf-alt} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-dguf-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-dguf-apa.lbx index c3dfa8df855..35a34b5ea17 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-dguf-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-dguf-apa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FswissgermandgufapaLBX,PgermanLBX') %% \ProvidesFile{swissgerman-dguf-apa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-archaeology} \InheritBibliographyStrings{german-archaeology} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-eaz.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-eaz.lbx index 47ebde3b30a..73ba31c3172 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-eaz.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-eaz.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FswissgermaneazLBX,PgermaneazLBX') %% \ProvidesFile{swissgerman-eaz.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-eaz} \InheritBibliographyStrings{german-eaz} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-foe.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-foe.lbx index 4ab1c1df79a..511b380faa8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-foe.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-foe.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FswissgermanfoeLBX,PgermanfoeLBX') %% \ProvidesFile{swissgerman-foe.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-foe} \InheritBibliographyStrings{german-foe} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-jb-kreis-neuss.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-jb-kreis-neuss.lbx index 07cc43c9572..ab2fa312d2b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-jb-kreis-neuss.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-jb-kreis-neuss.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FswissgermanjbkreisneussLBX,PgermanjbkreisneussLBX') %% \ProvidesFile{swissgerman-jb-kreis-neuss.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-jb-kreis-neuss} \InheritBibliographyStrings{german-jb-kreis-neuss} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-karl.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-karl.lbx index fa4e874894c..3985867b18a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-karl.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-karl.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FswissgermankarlLBX,PgermankarlLBX') %% \ProvidesFile{swissgerman-karl.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-karl} \InheritBibliographyStrings{german-karl} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-maja.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-maja.lbx index ba63d985a60..5472b813942 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-maja.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-maja.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FswissgermanmajaLBX,PgermanmajaLBX') %% \ProvidesFile{swissgerman-maja.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-maja} \InheritBibliographyStrings{german-maja} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-mpk.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-mpk.lbx index c317138812f..bcf0415299a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-mpk.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-mpk.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FswissgermanmpkLBX,PgermanmpkLBX') %% \ProvidesFile{swissgerman-mpk.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-mpk} \InheritBibliographyStrings{german-mpk} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-mpkoeaw.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-mpkoeaw.lbx new file mode 100644 index 00000000000..035d75ee8ee --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-mpkoeaw.lbx @@ -0,0 +1,16 @@ +%% +%% This is file `swissgerman-mpkoeaw.lbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `FswissgermanmpkoeawLBX,PgermanmpkoeawLBX') +%% +\ProvidesFile{swissgerman-mpkoeaw.lbx} +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes +\InheritBibliographyExtras{german-mpkoeaw} + +\endinput +%% +%% End of file `swissgerman-mpkoeaw.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-offa.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-offa.lbx index cd533ed9609..c86d3941881 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-offa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-offa.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FswissgermanoffaLBX,PgermanoffaLBX') %% \ProvidesFile{swissgerman-offa.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-offa} \InheritBibliographyStrings{german-offa} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-rgzm.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-rgzm.lbx index 5710ffa80c4..a5a6434685c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-rgzm.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-rgzm.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FswissgermanrgzmLBX,PgermanrgzmLBX') %% \ProvidesFile{swissgerman-rgzm.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-rgzm} \InheritBibliographyStrings{german-rgzm} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-zaak.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-zaak.lbx index 92c98cefde8..fbc2ea31079 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-zaak.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-zaak.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FswissgermanzaakLBX,PgermanzaakLBX') %% \ProvidesFile{swissgerman-zaak.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-zaak} \InheritBibliographyStrings{german-zaak} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-zaes.lbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-zaes.lbx index 3b6fd386a05..075850755d0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-zaes.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/swissgerman-zaes.lbx @@ -7,7 +7,8 @@ %% biblatex-archaeology.dtx (with options: `FswissgermanzaesLBX,PgermanzaesLBX') %% \ProvidesFile{swissgerman-zaes.lbx} -[2017/11/16 v1.3 biblatex-archaeology localization (IB)] +[2018/06/10 v2.0 biblatex-archaeology localization (IB)] +\SuppressAdditiveLbxSuffixes \InheritBibliographyExtras{german-zaes} \InheritBibliographyStrings{german-zaes} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.bbx index 537ebd5a649..b89c4230a8c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.bbx @@ -7,10 +7,11 @@ %% biblatex-archaeology.dtx (with options: `ufgmuensterinlineBBX,ufgmuenstersharedBBX,noarticlesubtitlepunct') %% \ProvidesFile{ufg-muenster-inline.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-ibid-archaeology} \def\archaeobibstyletitle{\blxarch@style@muensterinline} \ExecuteBibliographyOptions{ + dashed=false, ibidtracker=false, idemtracker=true, loccittracker=false, @@ -24,7 +25,6 @@ \setlength{\bibhang}{0em} \setlength{\bibitemsep}{\baselineskip} \ExecuteBibliographyOptions{ - dashed=false, doi=false, eprint=false, giveninits=true, @@ -42,12 +42,14 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=true, notitlepunct=true, origfields=true, pagesfirst=false, positionlabeldate=location, preservelastauthor=false, + repeatlabel=false, shortform=title, shortjournal=true, shortseries=true, @@ -70,34 +72,34 @@ \DeclareNameAlias{bookauthor}{given-family} \DeclareNameAlias{sortname}{given-family} \DeclareNameAlias{festschrift}{gfull-family} -\renewcommand{\mkbibrepeatfamily}[1]{#1} -\renewcommand{\mkbibrepeatprefix}[1]{#1} -\renewcommand{\multinamedelim}{\addslash} -\renewcommand{\finalnamedelim}{\addslash} -\renewcommand{\labelnamepunct}{\addcomma\space} -\renewcommand{\booklabelnamepunct}{\addcomma\space} +\renewcommand*{\mkbibrepeatfamily}[1]{#1} +\renewcommand*{\mkbibrepeatprefix}[1]{#1} +\renewcommand*{\multinamedelim}{\addslash} +\renewcommand*{\finalnamedelim}{\addslash} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} \DeclareFieldFormat[inreference]{dictionary}{#1} -\renewcommand{\seriespunct}{\addspace} +\renewcommand*{\seriespunct}{\addspace} \DeclareFieldFormat*{seriesparens}{#1} -\renewcommand{\volumenumberdelim}{\addcomma\space} -\DeclareFieldFormat*{realdate}{\mkbibparens{#1}} -\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}} +\renewcommand*{\volumenumberdelim}{\addcomma\space} +\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}} +\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}} \DeclareFieldFormat*{volume}{\addspace#1} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}} \DeclareFieldFormat[thesis]{locationdateparens}{#1} \DeclareFieldFormat*{missingfield}{\mkbibbrackets{#1}} -\renewcommand{\bibpagespunct}{% +\renewcommand*{\bibpagespunct}{% \iffieldundef{journaltitle} {\addspace} {\addcomma\space}} -\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1} +\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1} \renewcommand{\multicitedelim}{\addsemicolon\space} \DeclareFieldFormat*{url}{\url{#1}} \let\blxarch@buffer@url\url -\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater} -\renewcommand{\typeinstitutiondelim}{\addcolon\space\midsentence} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater} +\renewcommand*{\typeinstitutiondelim}{\addcolon\space\midsentence} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `ufg-muenster-inline.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.cbx index 482a30bfcdd..1b64571d95e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.cbx @@ -7,12 +7,13 @@ %% biblatex-archaeology.dtx (with options: `ufgmuensterinlineCBX,barecitations') %% \ProvidesFile{ufg-muenster-inline.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{authoryear-ibid-archaeology} \def\archaeocitestyletitle{\blxarch@style@muensterinline} -\DeclareFieldFormat*{postnote}{#1} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `ufg-muenster-inline.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.dbx index 4502f9a84b5..82ab0cf310e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-inline.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `ufgmuensterinlineDBX,DBX') %% \ProvidesFile{ufg-muenster-inline.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `ufg-muenster-inline.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-numeric.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-numeric.bbx new file mode 100644 index 00000000000..da5d203dce1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-numeric.bbx @@ -0,0 +1,97 @@ +%% +%% This is file `ufg-muenster-numeric.bbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `ufgmuensternumericBBX,ufgmuenstersharedBBX,noarticlesubtitlepunct') +%% +\ProvidesFile{ufg-muenster-numeric.bbx} +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] +\RequireBibliographyStyle{numeric-comp-archaeology} +\def\archaeobibstyletitle{\blxarch@style@muensternumeric} +\ExecuteBibliographyOptions{ + ibidtracker=false, + idemtracker=false, + loccittracker=false, + maxbibnames=500, +} +\ExecuteBibliographyOptions{ + doi=false, + eprint=false, + giveninits=true, + maxbibnames=500, + maxcitenames=2, + maxitems=2, + mincitenames=1, + minitems=1, + notetype=foot+end, + url=false, + editionsuperscript=posttitle, + giveninitligatures={Ch,Ph,St,Th}, + idemincitation=false, + injournal=false, + journallocation=false, + maxbooknames=500, + minbooknames=3, + minrealdatediff=\blxarch@maxnumber, + nothesistitlepunct=true, + notitlepunct=true, + origfields=true, + pagesfirst=false, + positionlabeldate=location, + preservelastauthor=false, + repeatlabel=false, + shortform=title, + shortjournal=true, + shortseries=true, + subseries=true, + summarytitle=false, + tabbedlabeldate=false, + titlebrackets=false, + titlenote=true, + useeventdate=true, + useeventnumber=true, + usefestschriftaddon=true, + useinstitution=locationfirst, + uselocation=true, + usemultivenue=true, + usesourceeditor=true, + usepublisher=false, + useunpublishedthesis=true, + volumeafterseries=false, +} +\DeclareNameAlias{bookauthor}{given-family} +\DeclareNameAlias{sortname}{given-family} +\DeclareNameAlias{festschrift}{gfull-family} +\renewcommand*{\mkbibrepeatfamily}[1]{#1} +\renewcommand*{\mkbibrepeatprefix}[1]{#1} +\renewcommand*{\multinamedelim}{\addslash} +\renewcommand*{\finalnamedelim}{\addslash} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} +\DeclareFieldFormat[inreference]{dictionary}{#1} +\renewcommand*{\seriespunct}{\addspace} +\DeclareFieldFormat*{seriesparens}{#1} +\renewcommand*{\volumenumberdelim}{\addcomma\space} +\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}} +\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}} +\DeclareFieldFormat*{volume}{\addspace#1} +\DeclareFieldFormat*{journaldateparens}{#1} +\DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}} +\DeclareFieldFormat[thesis]{locationdateparens}{#1} +\DeclareFieldFormat*{missingfield}{\mkbibbrackets{#1}} +\renewcommand*{\bibpagespunct}{% + \iffieldundef{journaltitle} + {\addspace} + {\addcomma\space}} +\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1} +\renewcommand{\multicitedelim}{\addsemicolon\space} +\DeclareFieldFormat*{url}{\url{#1}} +\let\blxarch@buffer@url\url +\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater} +\renewcommand*{\typeinstitutiondelim}{\addcolon\space\midsentence} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} +\endinput +%% +%% End of file `ufg-muenster-numeric.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-numeric.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-numeric.cbx new file mode 100644 index 00000000000..b9460cfdca3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-numeric.cbx @@ -0,0 +1,19 @@ +%% +%% This is file `ufg-muenster-numeric.cbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `ufgmuensternumericCBX,barecitations') +%% +\ProvidesFile{ufg-muenster-inline.cbx} +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] +\RequireCitationStyle{numeric-comp-archaeology} +\def\archaeocitestyletitle{\blxarch@style@muensternumeric} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} +\DeclareFieldFormat*{volcitevolume}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} +\endinput +%% +%% End of file `ufg-muenster-numeric.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-numeric.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-numeric.dbx new file mode 100644 index 00000000000..de68b19697a --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-numeric.dbx @@ -0,0 +1,51 @@ +%% +%% This is file `ufg-muenster-numeric.dbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `ufgmuensternumericDBX,DBX') +%% +\ProvidesFile{ufg-muenster-numeric.dbx} +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] +\DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} +\DeclareDatamodelFields[type=field,datatype=integer]{subnumber} +\DeclareDatamodelEntryfields +[book,bookinbook,inbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings, +proceedings,reference,inreference,mvreference,suppbook,suppcollection] +{shortsubseries,subnumber,subseries} +\DeclareDatamodelFields[type=field,datatype=literal]{titlenote} +\DeclareDatamodelFields[type=field,datatype=literal]{maintitlenote} +\DeclareDatamodelFields[type=field,datatype=literal]{booktitlenote} +\DeclareDatamodelFields[type=field,datatype=literal]{summarytitle} +\DeclareDatamodelFields[type=field,datatype=literal]{shortform} +\DeclareDatamodelFields[type=list,datatype=name]{festschrift} +\DeclareDatamodelFields[type=field,datatype=literal]{festschriftaddon} +\DeclareDatamodelFields[type=field,datatype=integer]{eventnumber} +\DeclareDatamodelFields[type=field,datatype=literal]{eventtype} +\DeclareDatamodelFields[type=list,datatype=literal]{multieventdate} +\DeclareDatamodelFields[type=list,datatype=literal]{multivenue} +\DeclareDatamodelEntryfields +[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings, +proceedings,reference,inreference,mvreference,suppbook,suppcollection] +{shortform,festschrift,festschriftaddon,eventnumber,eventtype +,eventdate,venue,multieventdate,multivenue} +\DeclareDatamodelEntryfields +[inbook,bookinbook,incollection,inproceedings,inreference,suppbook,suppcollection] +{booktitlenote} +\DeclareDatamodelEntryfields{summarytitle,titlenote} +\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate,fulleventdate,newsdate} +\DeclareDatamodelEntryfields{realdate,origrealdate} +\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate} +\DeclareDatamodelEntryfields +[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings, +proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fulleventdate} +\DeclareDatamodelEntryfields +[article,periodical,suppperiodical,review]{newsdate} +\DeclareDatamodelEntryfields +[article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} +\endinput +%% +%% End of file `ufg-muenster-numeric.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.bbx index 1a9cd884e5f..2d912a51f36 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `ufgmuensterverboseBBX,ufgmuenstersharedBBX,noarticlesubtitlepunct') %% \ProvidesFile{ufg-muenster-verbose.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{verbose-trad2note-archaeology} \def\archaeobibstyletitle{\blxarch@style@muensterverbose} \ExecuteBibliographyOptions{ @@ -18,7 +18,6 @@ maxcitenames=500, } \ExecuteBibliographyOptions{ - dashed=false, doi=false, eprint=false, giveninits=true, @@ -36,12 +35,14 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=true, notitlepunct=true, origfields=true, pagesfirst=false, positionlabeldate=location, preservelastauthor=false, + repeatlabel=false, shortform=title, shortjournal=true, shortseries=true, @@ -64,34 +65,34 @@ \DeclareNameAlias{bookauthor}{given-family} \DeclareNameAlias{sortname}{given-family} \DeclareNameAlias{festschrift}{gfull-family} -\renewcommand{\mkbibrepeatfamily}[1]{#1} -\renewcommand{\mkbibrepeatprefix}[1]{#1} -\renewcommand{\multinamedelim}{\addslash} -\renewcommand{\finalnamedelim}{\addslash} -\renewcommand{\labelnamepunct}{\addcomma\space} -\renewcommand{\booklabelnamepunct}{\addcomma\space} +\renewcommand*{\mkbibrepeatfamily}[1]{#1} +\renewcommand*{\mkbibrepeatprefix}[1]{#1} +\renewcommand*{\multinamedelim}{\addslash} +\renewcommand*{\finalnamedelim}{\addslash} +\renewcommand*{\labelnamepunct}{\addcomma\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} \DeclareFieldFormat[inreference]{dictionary}{#1} -\renewcommand{\seriespunct}{\addspace} +\renewcommand*{\seriespunct}{\addspace} \DeclareFieldFormat*{seriesparens}{#1} -\renewcommand{\volumenumberdelim}{\addcomma\space} -\DeclareFieldFormat*{realdate}{\mkbibparens{#1}} -\DeclareFieldFormat*{origrealdate}{\mkbibparens{#1}} +\renewcommand*{\volumenumberdelim}{\addcomma\space} +\DeclareFieldFormat*{realdateparens}{\mkbibparens{#1}} +\DeclareFieldFormat*{origrealdateparens}{\mkbibparens{#1}} \DeclareFieldFormat*{volume}{\addspace#1} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat[thesis]{thesis}{\mkbibparens{#1}} \DeclareFieldFormat[thesis]{locationdateparens}{#1} \DeclareFieldFormat*{missingfield}{\mkbibbrackets{#1}} -\renewcommand{\bibpagespunct}{% +\renewcommand*{\bibpagespunct}{% \iffieldundef{journaltitle} {\addspace} {\addcomma\space}} -\DeclareFieldFormat*{reprintbrackets}{\addsemicolon\space#1} +\DeclareFieldFormat*{reprintparens}{\addsemicolon\space#1} \renewcommand{\multicitedelim}{\addsemicolon\space} \DeclareFieldFormat*{url}{\url{#1}} \let\blxarch@buffer@url\url -\renewcommand{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater} -\renewcommand{\typeinstitutiondelim}{\addcolon\space\midsentence} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\url}[1]{\textless\blxarch@buffer@url{#1}\textgreater} +\renewcommand*{\typeinstitutiondelim}{\addcolon\space\midsentence} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `ufg-muenster-verbose.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.cbx index 4bdc661670a..ddee4029010 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.cbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `ufgmuensterverboseCBX,barecitations,noshortform') %% \ProvidesFile{ufg-muenster-verbose.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{verbose-trad2note-archaeology} \def\archaeocitestyletitle{\blxarch@style@muensterverbose} \ExecuteBibliographyOptions{ @@ -17,9 +17,10 @@ \let\shortformcites\autocites \let\sfcite\cite \let\sfcites\cites -\DeclareFieldFormat*{postnote}{#1} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `ufg-muenster-verbose.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.dbx index fc88ebce6a9..6190c33d0ec 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/ufg-muenster-verbose.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `ufgmuensterverboseDBX,DBX') %% \ProvidesFile{ufg-muenster-verbose.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `ufg-muenster-verbose.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-archaeology.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-archaeology.bbx new file mode 100644 index 00000000000..db7b9460da2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-archaeology.bbx @@ -0,0 +1,24 @@ +%% +%% This is file `verbose-archaeology.bbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `verboseBBX,verbosesharedBBX,nonauthoryearsharedBBX') +%% +\ProvidesFile{verbose-archaeology.bbx} +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] +\RequireBibliographyStyle{verbose} +\def\archaeobibstyletitle{\blxarch@style@v} +\def\blxarch@fork@verbose{} +\RequirePackage{biblatex-archaeology} +\ExecuteBibliographyOptions{ +repeatlabel=false +} +\renewbibmacro*{repeatlabel}{% + \blxarch@errmsg{Option 'repeatlabel' must be 'false' in verbose and numeric styles}} +\csuse{blxarch@issuedate}% +\renewcommand{\iftabbedlabeldate}[2]{#2} +\endinput +%% +%% End of file `verbose-archaeology.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-archaeology.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-archaeology.cbx new file mode 100644 index 00000000000..67b4fbfcda2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-archaeology.cbx @@ -0,0 +1,51 @@ +%% +%% This is file `verbose-archaeology.cbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `verboseCBX,verbosesharedCBX') +%% +\ProvidesFile{verbose-archaeology.cbx} +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] +\def\archaeocitestyletitle{\blxarch@style@v} +\RequireCitationStyle{verbose} +\providebibmacro*{cite:short}{} +\renewbibmacro*{cite:short}{% + \printnames{labelname}% + \setunit*{\printdelim{nametitledelim}}% + \printtext[bibhyperlink]{% + \iftoggle{archbool:citeshortin} + {\ifboolexpr{ + not test {\iffieldundef{journaltitle}} +or +( not test {\ifshortform{false}} + and + not test {\iffieldundef{shortform}} +) + } + {\usebibmacro{cite:short:in}} + {\printfield[citetitle]{labeltitle}}% + } + {\printfield[citetitle]{labeltitle}}}% +} +\newbibmacro*{cite:short:in}{% +\savebibmacro{extendeddate}% +\renewbibmacro*{extendeddate}[2]{}% +\iffieldundef{journaltitle} +{\iffieldundef{shortform} +{\printfield[citetitle]{labeltitle}} +{\usebibmacro{in:}% + \printfield{shortform}% + \setunit{\addspace}% + \printfield[shortformvolume]{volume}% + \setunit{\addspace}% + \usebibmacro{bibliographydate}% +} +} +{\usebibmacro{journal+issuetitle}}% +\restorebibmacro{extendeddate}% +} +\endinput +%% +%% End of file `verbose-archaeology.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-archaeology.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-archaeology.dbx new file mode 100644 index 00000000000..6c2029a517b --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-archaeology.dbx @@ -0,0 +1,51 @@ +%% +%% This is file `verbose-archaeology.dbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% biblatex-archaeology.dtx (with options: `verboseDBX,DBX') +%% +\ProvidesFile{verbose-archaeology.dbx} +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] +\DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} +\DeclareDatamodelFields[type=field,datatype=integer]{subnumber} +\DeclareDatamodelEntryfields +[book,bookinbook,inbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings, +proceedings,reference,inreference,mvreference,suppbook,suppcollection] +{shortsubseries,subnumber,subseries} +\DeclareDatamodelFields[type=field,datatype=literal]{titlenote} +\DeclareDatamodelFields[type=field,datatype=literal]{maintitlenote} +\DeclareDatamodelFields[type=field,datatype=literal]{booktitlenote} +\DeclareDatamodelFields[type=field,datatype=literal]{summarytitle} +\DeclareDatamodelFields[type=field,datatype=literal]{shortform} +\DeclareDatamodelFields[type=list,datatype=name]{festschrift} +\DeclareDatamodelFields[type=field,datatype=literal]{festschriftaddon} +\DeclareDatamodelFields[type=field,datatype=integer]{eventnumber} +\DeclareDatamodelFields[type=field,datatype=literal]{eventtype} +\DeclareDatamodelFields[type=list,datatype=literal]{multieventdate} +\DeclareDatamodelFields[type=list,datatype=literal]{multivenue} +\DeclareDatamodelEntryfields +[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings, +proceedings,reference,inreference,mvreference,suppbook,suppcollection] +{shortform,festschrift,festschriftaddon,eventnumber,eventtype +,eventdate,venue,multieventdate,multivenue} +\DeclareDatamodelEntryfields +[inbook,bookinbook,incollection,inproceedings,inreference,suppbook,suppcollection] +{booktitlenote} +\DeclareDatamodelEntryfields{summarytitle,titlenote} +\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate,fulleventdate,newsdate} +\DeclareDatamodelEntryfields{realdate,origrealdate} +\DeclareDatamodelFields[type=field, datatype=date, skipout]{realdate,origrealdate} +\DeclareDatamodelEntryfields +[inbook,bookinbook,collection,incollection,inproceedings,mvbook,mvcollection,mvproceedings, +proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fulleventdate} +\DeclareDatamodelEntryfields +[article,periodical,suppperiodical,review]{newsdate} +\DeclareDatamodelEntryfields +[article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} +\endinput +%% +%% End of file `verbose-archaeology.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.bbx index e1ce7772630..d7c4fd7e831 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.bbx @@ -4,17 +4,19 @@ %% %% The original source files were: %% -%% biblatex-archaeology.dtx (with options: `verboseibidBBX,verbosesharedBBX') +%% biblatex-archaeology.dtx (with options: `verboseibidBBX,verbosesharedBBX,nonauthoryearsharedBBX') %% \ProvidesFile{verbose-ibid-archaeology.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{verbose-ibid} \def\archaeobibstyletitle{\blxarch@style@vi} \def\blxarch@fork@verbose{} \RequirePackage{biblatex-archaeology} -\ExecuteBibliographyOptions{repeatlabel=false} +\ExecuteBibliographyOptions{ +repeatlabel=false +} \renewbibmacro*{repeatlabel}{% - \blxarch@errmsg{Option 'repeatlabel' must be 'false' in verbose styles}} + \blxarch@errmsg{Option 'repeatlabel' must be 'false' in verbose and numeric styles}} \csuse{blxarch@issuedate}% \renewcommand{\iftabbedlabeldate}[2]{#2} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.cbx index 8aae540c2a1..8bc61a47c58 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.cbx @@ -4,12 +4,48 @@ %% %% The original source files were: %% -%% biblatex-archaeology.dtx (with options: `verboseibidCBX') +%% biblatex-archaeology.dtx (with options: `verboseibidCBX,verbosesharedCBX') %% \ProvidesFile{verbose-ibid-archaeology.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \def\archaeocitestyletitle{\blxarch@style@vi} \RequireCitationStyle{verbose-ibid} +\providebibmacro*{cite:short}{} +\renewbibmacro*{cite:short}{% + \printnames{labelname}% + \setunit*{\printdelim{nametitledelim}}% + \printtext[bibhyperlink]{% + \iftoggle{archbool:citeshortin} + {\ifboolexpr{ + not test {\iffieldundef{journaltitle}} +or +( not test {\ifshortform{false}} + and + not test {\iffieldundef{shortform}} +) + } + {\usebibmacro{cite:short:in}} + {\printfield[citetitle]{labeltitle}}% + } + {\printfield[citetitle]{labeltitle}}}% +} +\newbibmacro*{cite:short:in}{% +\savebibmacro{extendeddate}% +\renewbibmacro*{extendeddate}[2]{}% +\iffieldundef{journaltitle} +{\iffieldundef{shortform} +{\printfield[citetitle]{labeltitle}} +{\usebibmacro{in:}% + \printfield{shortform}% + \setunit{\addspace}% + \printfield[shortformvolume]{volume}% + \setunit{\addspace}% + \usebibmacro{bibliographydate}% +} +} +{\usebibmacro{journal+issuetitle}}% +\restorebibmacro{extendeddate}% +} \endinput %% %% End of file `verbose-ibid-archaeology.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.dbx index c79ae81ea92..73230db0bb4 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-ibid-archaeology.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `verboseibidDBX,DBX') %% \ProvidesFile{verbose-ibid-archaeology.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `verbose-ibid-archaeology.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.bbx index 0a882446c1e..ca5c282d319 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.bbx @@ -4,17 +4,19 @@ %% %% The original source files were: %% -%% biblatex-archaeology.dtx (with options: `verbosetrad2noteBBX,verbosesharedBBX') +%% biblatex-archaeology.dtx (with options: `verbosetrad2noteBBX,verbosesharedBBX,nonauthoryearsharedBBX') %% \ProvidesFile{verbose-trad2note-archaeology.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{verbose-trad2} \def\archaeobibstyletitle{\blxarch@style@vttwo} \def\blxarch@fork@verbose{} \RequirePackage{biblatex-archaeology} -\ExecuteBibliographyOptions{repeatlabel=false} +\ExecuteBibliographyOptions{ +repeatlabel=false +} \renewbibmacro*{repeatlabel}{% - \blxarch@errmsg{Option 'repeatlabel' must be 'false' in verbose styles}} + \blxarch@errmsg{Option 'repeatlabel' must be 'false' in verbose and numeric styles}} \csuse{blxarch@issuedate}% \renewcommand{\iftabbedlabeldate}[2]{#2} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.cbx index f7575e25cbe..b6131434506 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.cbx @@ -4,17 +4,12 @@ %% %% The original source files were: %% -%% biblatex-archaeology.dtx (with options: `verbosetrad2noteCBX') +%% biblatex-archaeology.dtx (with options: `verbosetrad2noteCBX,verbosesharedCBX') %% \ProvidesFile{verbose-trad2note-archaeology.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \def\archaeocitestyletitle{\blxarch@style@vttwo} \RequireCitationStyle{verbose-trad2} -\newbibmacro*{cite:short}{% - \printnames{labelname}% - \setunit*{\printdelim{labelnamepunct}}% - \printtext[bibhyperlink]{% - \printfield[citetitle]{labeltitle}}} \newbibmacro*{footcite}{% \usebibmacro{cite:citepages}% @@ -51,8 +46,8 @@ {\ifsamepage{\the\value{instcount}} {\csuse{cbx@f@\thefield{entrykey}}} {} - {\addcomma\space\bibstring{page}\addnbspace - \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}} + {\addcomma\space\bibstring{page}\addnbspace + \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}} {}}} \newbibmacro*{footcite:shorthand}{% @@ -127,6 +122,47 @@ } {#2}% } +\DeclareDataInheritance +{mvbook,book,collection,mvcollection,proceedings,mvproceedings,reference,mvreference} +{inbook,bookinbook,suppbook,incollection,suppcollection,inproceedings,inreference}{% + \noinherit{options} +} +\providebibmacro*{cite:short}{} +\renewbibmacro*{cite:short}{% + \printnames{labelname}% + \setunit*{\printdelim{nametitledelim}}% + \printtext[bibhyperlink]{% + \iftoggle{archbool:citeshortin} + {\ifboolexpr{ + not test {\iffieldundef{journaltitle}} +or +( not test {\ifshortform{false}} + and + not test {\iffieldundef{shortform}} +) + } + {\usebibmacro{cite:short:in}} + {\printfield[citetitle]{labeltitle}}% + } + {\printfield[citetitle]{labeltitle}}}% +} +\newbibmacro*{cite:short:in}{% +\savebibmacro{extendeddate}% +\renewbibmacro*{extendeddate}[2]{}% +\iffieldundef{journaltitle} +{\iffieldundef{shortform} +{\printfield[citetitle]{labeltitle}} +{\usebibmacro{in:}% + \printfield{shortform}% + \setunit{\addspace}% + \printfield[shortformvolume]{volume}% + \setunit{\addspace}% + \usebibmacro{bibliographydate}% +} +} +{\usebibmacro{journal+issuetitle}}% +\restorebibmacro{extendeddate}% +} \endinput %% %% End of file `verbose-trad2note-archaeology.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.dbx index 28e0fcfa3be..2294443c022 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/verbose-trad2note-archaeology.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `verbosetrad2noteDBX,DBX') %% \ProvidesFile{verbose-trad2note-archaeology.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `verbose-trad2note-archaeology.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.bbx index 9311b6cfa39..345b2034399 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `volkskundeBBX,noarticlesubtitlepunct,nosmallcaps') %% \ProvidesFile{volkskunde.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-archaeology} \def\archaeobibstyletitle{\blxarch@style@volkskunde} \DeclareStyleSourcemap{ @@ -40,6 +40,7 @@ journallocation=false, maxbooknames=3, minbooknames=1, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=false, notitlepunct=false, origfields=false, @@ -67,24 +68,24 @@ volumeafterseries=false, } \DeclareNameAlias{bookauthor}{family-given} -\renewcommand{\labelnamepunct}{\addcolon\space} +\renewcommand*{\labelnamepunct}{\addcolon\space} \DeclareFieldFormat*{labeldateparens}{\mkbibparens{#1}} \DeclareFieldFormat*{parens}{#1} -\renewcommand{\bibnamedash}{\printtext{\bibstring[\mkbiblistnamefamily]{idem\thefield{gender}}\space}} +\renewcommand*{\bibnamedash}{\printtext{\bibstring[\mkbiblistnamefamily]{idem\thefield{gender}}\space}} \DeclareFieldFormat*{seriesparens}{\mkbibparens{#1}} -\renewcommand{\titleseriesdelim}{\addspace} -\renewcommand{\institutionlocationdelim}{\addspace} +\renewcommand*{\titleseriesdelim}{\addspace} +\renewcommand*{\institutionlocationdelim}{\addspace} \DeclareFieldFormat*{locationdateparens}{#1} \DeclareFieldFormat*{journaldateparens}{#1} \renewcommand{\daterealdatedelim}{\nopunct} \DeclareFieldFormat*{number}{\addcomma\space#1} \DeclareFieldFormat*{subnumber}{\addcomma\space#1} \DeclareFieldFormat[article,review,suppperiodical]{number}{#1} -\renewcommand{\mkbibnamefamily}[1]{#1} -\renewcommand{\mkbibnameprefix}[1]{#1} -\renewcommand{\mkbibrepeatfamily}[1]{#1} -\renewcommand{\mkbibrepeatprefix}[1]{#1} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\renewcommand*{\mkbibnamefamily}[1]{#1} +\renewcommand*{\mkbibnameprefix}[1]{#1} +\renewcommand*{\mkbibrepeatfamily}[1]{#1} +\renewcommand*{\mkbibrepeatprefix}[1]{#1} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `volkskunde.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.cbx index 51efade1f07..1f047884437 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.cbx @@ -7,15 +7,16 @@ %% biblatex-archaeology.dtx (with options: `volkskundeCBX,barecitations') %% \ProvidesFile{volkskunde.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{authoryear-archaeology} \def\archaeocitestyletitle{\blxarch@style@volkskunde} -\renewcommand{\multicitedelim}{\addsemicolon\space} -\renewcommand{\postnotedelim}{\addcolon\space} -\renewcommand{\labelnamepunct}{\addcolon\space} -\DeclareFieldFormat*{postnote}{#1} +\renewcommand*{\multicitedelim}{\addsemicolon\space} +\renewcommand*{\postnotedelim}{\addcolon\space} +\renewcommand*{\labelnamepunct}{\addcolon\space} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `volkskunde.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.dbx index b07876928d9..e4e834f63b9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/volkskunde.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `volkskundeDBX,DBX') %% \ProvidesFile{volkskunde.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `volkskunde.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.bbx index c6a29fd3123..1d3c6db1ffa 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `zaakBBX,nosmallcaps') %% \ProvidesFile{zaak.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \DeclareStyleSourcemap{ \maps[datatype=bibtex]{ \map[overwrite=true]{ @@ -42,6 +42,7 @@ journallocation=true, maxbooknames=500, minbooknames=3, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=false, notitlepunct=false, origfields=false, @@ -71,27 +72,27 @@ \setlength{\bibhang}{0em} \setlength{\bibitemsep}{\baselineskip} \DeclareNameAlias{sortname}{family-given} -\renewcommand{\multinamedelim}{\addspace\addslash\space} -\renewcommand{\finalnamedelim}{\multinamedelim} -\renewcommand{\nameyeardelim}{% +\renewcommand*{\multinamedelim}{\addspace\addslash\space} +\renewcommand*{\finalnamedelim}{\multinamedelim} +\renewcommand*{\nameyeardelim}{% \iftabbedlabeldate {} {\addspace}} \DeclareFieldFormat[inreference]{dictionary}{#1} \DeclareFieldFormat*{seriesparens}{\mkbibparens{=#1}} -\renewcommand{\seriespunct}{\addspace} -\renewcommand{\titleseriesdelim}{\addspace} -\renewcommand{\labelnamepunct}{\addspace} -\renewcommand{\booklabelnamepunct}{\addcomma\space} +\renewcommand*{\seriespunct}{\addspace} +\renewcommand*{\titleseriesdelim}{\addspace} +\renewcommand*{\labelnamepunct}{\addspace} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} \DeclareFieldFormat*{journaldateparens}{#1} -\renewcommand{\volumenumberdelim}{\addspace} +\renewcommand*{\volumenumberdelim}{\addspace} \DeclareFieldFormat[article]{number}{\mkbibparens{#1}} \DeclareFieldFormat*{volume}{\addcomma\space\bibstring{volume}\space#1} \DeclareFieldFormat[article]{volume}{\addspace#1} \DeclareFieldFormat[article]{number}{\mkbibparens{#1}} \DeclareFieldFormat*{urldate}{\mkbibparens{#1}} -\renewcommand{\volumedatedelim}{} -\renewcommand{\bibpagespunct}{% +\renewcommand*{\volumedatedelim}{} +\renewcommand*{\bibpagespunct}{% \ifboolexpr{ not test {\iffieldundef{usera}} and @@ -101,14 +102,14 @@ {\addcomma\space\midsentence}} \DeclareFieldFormat*{parens}{#1} \DeclareFieldFormat*{locationdateparens}{#1} -\renewcommand{\daterealdatedelim}{% +\renewcommand*{\daterealdatedelim}{% \iftabbedlabeldate {\newline} {\addspace}} -\renewcommand{\mkbibnamefamily}[1]{#1} -\renewcommand{\mkbibnameprefix}[1]{#1} -\renewcommand{\mkbibrepeatfamily}[1]{#1} -\renewcommand{\mkbibrepeatprefix}[1]{#1} +\renewcommand*{\mkbibnamefamily}[1]{#1} +\renewcommand*{\mkbibnameprefix}[1]{#1} +\renewcommand*{\mkbibrepeatfamily}[1]{#1} +\renewcommand*{\mkbibrepeatprefix}[1]{#1} \endinput %% %% End of file `zaak.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.cbx index 2c3eb0fa853..6bb949f87a0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.cbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `zaakCBX') %% \ProvidesFile{zaak.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{authoryear-archaeology} \def\archaeocitestyletitle{\blxarch@style@zaak} \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.dbx index 75e73a5cb57..e7addb00ac4 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaak.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `zaakDBX,DBX') %% \ProvidesFile{zaak.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `zaak.dbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.bbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.bbx index 09b74843410..c610b50e458 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.bbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `zaesBBX,noarticlesubtitlepunct') %% \ProvidesFile{zaes.bbx} -[2017/11/16 v1.3 biblatex-archaeology bibliography style (IB)] +[2018/06/10 v2.0 biblatex-archaeology bibliography style (IB)] \RequireBibliographyStyle{authoryear-ibid-archaeology} \def\archaeobibstyletitle{\blxarch@style@zaes} \DeclareStyleSourcemap{ @@ -42,6 +42,7 @@ journallocation=false, maxbooknames=500, minbooknames=3, + minrealdatediff=\blxarch@maxnumber, nothesistitlepunct=false, notitlepunct=false, origfields=false, @@ -68,32 +69,33 @@ useunpublishedthesis=false, volumeafterseries=false, } -\renewcommand{\newunitpunct}{\addcomma\space} -\renewcommand{\booklabelnamepunct}{\addcomma\space} -\renewcommand{\labelnamepunct}{\addcomma\space} +\renewcommand*{\newunitpunct}{\addcomma\space} +\renewcommand*{\booklabelnamepunct}{\addcomma\space} +\renewcommand*{\labelnamepunct}{\addcomma\space} \DeclareNameAlias{sortname}{family-given} \DeclareNameAlias{bookauthor}{given-family} -\renewcommand{\mkbibnamefamily}[1]{\mkbibletterspacing{#1}} -\renewcommand{\mkbibnameprefix}[1]{\mkbibletterspacing{#1}} -\renewcommand{\mkbiblistnamefamily}[1]{\mkbibletterspacing{#1}} -\renewcommand{\mkbiblistnameprefix}[1]{\mkbibletterspacing{#1}} -\renewcommand{\mkbibbooknamefamily}[1]{\mkbibletterspacing{#1}} -\renewcommand{\mkbibbooknameprefix}[1]{\mkbibletterspacing{#1}} -\renewcommand{\mkbibsourcenamefamily}[1]{\mkbibletterspacing{#1}} -\renewcommand{\mkbibsourcenameprefix}[1]{\mkbibletterspacing{#1}} +\renewcommand*{\mkbibnamefamily}[1]{\mkbibletterspacing{#1}} +\renewcommand*{\mkbibnameprefix}[1]{\mkbibletterspacing{#1}} +\renewcommand*{\mkbiblistnamefamily}[1]{\mkbibletterspacing{#1}} +\renewcommand*{\mkbiblistnameprefix}[1]{\mkbibletterspacing{#1}} +\renewcommand*{\mkbibbooknamefamily}[1]{\mkbibletterspacing{#1}} +\renewcommand*{\mkbibbooknameprefix}[1]{\mkbibletterspacing{#1}} +\renewcommand*{\mkbibsourcenamefamily}[1]{\mkbibletterspacing{#1}} +\renewcommand*{\mkbibsourcenameprefix}[1]{\mkbibletterspacing{#1}} \DeclareFieldFormat*{pages}{#1} \DeclareFieldFormat*{volume}{\addspace#1} -\renewcommand{\titleseriesdelim}{\addcomma\space} -\renewcommand{\seriespunct}{\iffieldundef{pages}{\finentrypunct}{\bibpagespunct}} +\renewcommand*{\titleseriesdelim}{\addcomma\space} +\renewcommand*{\seriespunct}{\iffieldundef{pages}{\finentrypunct}{\bibpagespunct}} \DeclareFieldFormat*{locationdateparens}{#1} \DeclareFieldFormat[thesis]{thesis}{#1} \DeclareFieldFormat*{seriesparens}{#1} \DeclareFieldFormat*{journaldateparens}{#1} \DeclareFieldFormat*{parens}{\addcomma\space#1} -\xpatchbibdriver{inreference}{\usebibmacro{location+date}}{}{}{} -\renewcommand{\nameshortformdelim}{\addcomma\space} -\renewcommand{\noseriespunct}{\addcomma\addspace} -\renewcommand{\articlesubtitlepunct}{\subtitlepunct} +\xpatchbibdriver{inreference}{\usebibmacro{location+date}}{} + {}{Patching driver 'inreference' failed (4)} +\renewcommand*{\nameshortformdelim}{\addcomma\space} +\renewcommand*{\noseriespunct}{\addcomma\addspace} +\renewcommand*{\articlesubtitlepunct}{\subtitlepunct} \endinput %% %% End of file `zaes.bbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.cbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.cbx index 30a0c2f4767..4bf951c27de 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.cbx @@ -7,13 +7,14 @@ %% biblatex-archaeology.dtx (with options: `zaesCBX,barecitations') %% \ProvidesFile{zaes.cbx} -[2017/11/16 v1.3 biblatex-archaeology citation style (IB)] +[2018/06/10 v2.0 biblatex-archaeology citation style (IB)] \RequireCitationStyle{authoryear-ibid-archaeology} \def\archaeocitestyletitle{\blxarch@style@zaes} \ExecuteBibliographyOptions{autocite=footnote} -\DeclareFieldFormat*{postnote}{#1} +\DeclareFieldFormat*{postnote}{\mknormrange{#1}} +\DeclareFieldFormat*{multipostnote}{\mknormrange{#1}} \DeclareFieldFormat*{volcitevolume}{#1} -\DeclareFieldFormat*{volcitepages}{#1} +\DeclareFieldFormat*{volcitepages}{\mknormrange{#1}} \endinput %% %% End of file `zaes.cbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.dbx b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.dbx index 64aac730193..88ab28494a0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-archaeology/zaes.dbx @@ -7,7 +7,7 @@ %% biblatex-archaeology.dtx (with options: `zaesDBX,DBX') %% \ProvidesFile{zaes.dbx} -[2017/11/16 v1.3 biblatex-archaeology data model (IB)] +[2018/06/10 v2.0 biblatex-archaeology data model (IB)] \DeclareDatamodelFields[type=field,datatype=literal]{shortsubseries,subseries} \DeclareDatamodelFields[type=field,datatype=integer]{subnumber} \DeclareDatamodelEntryfields @@ -44,6 +44,8 @@ proceedings,reference,inreference,mvreference,suppbook,suppcollection]{fullevent [article,periodical,suppperiodical,review]{newsdate} \DeclareDatamodelEntryfields [article,periodical,review,suppperiodical]{location} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{date+an} +\DeclareDatamodelFields[type=field,datatype=literal,skipout]{origdate+an} \endinput %% %% End of file `zaes.dbx'. |