summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/archaeologie
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/archaeologie')
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx510
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx18
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx4
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx245
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx12
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx21
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx24
-rw-r--r--Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx15
8 files changed, 431 insertions, 418 deletions
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
index 57c484fd9aa..9e86e96b98c 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
@@ -10,8 +10,8 @@
% http://www.latex-project.org/lppl.txt
% and version 1.3 or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-\def\arch@date{2018/02/20}
-\def\arch@version{2.3.6}
+\def\arch@date{2018/04/08}
+\def\arch@version{2.3.7}
\def\arch@bbxid{\arch@date\space v\arch@version\space biblatex-archaeologie bibliography style (LCB/JF)}
\def\arch@cbxid{\arch@date\space v\arch@version\space biblatex-archaeologie citation style (LCB/JF)}
\def\arch@lbxid{\arch@date\space v\arch@version\space biblatex-archaeologie localization (LCB/JF)}
@@ -51,12 +51,12 @@
\newbool{bbx:width}
\newbool{bbx:yearseries}
\newbool{bbx:bibfullname}
-\newbool{bbx:inreferences}
+\newbool{bbx:inreferencesasfullcite}
\newbool{bbx:noabbrv}
\newbool{bbx:translation}
\newbool{bbx:publisher}
-\newbool{bbx:initials}
\newbool{bbx:counter}
+\newbool{bbx:eventdatelanguage}
\newbool{cbx:ancient}
\newbool{cbx:frgancient}
\newbool{cbx:corpus}
@@ -72,6 +72,7 @@
\newtoggle{bbx:jstor}
\newtoggle{bbx:zenon}
\newtoggle{bbx:urn}
+\newtoggle{bbx:arachne}
\setlength{\biblabelsep}{0em}
%-----------------------
@@ -95,6 +96,8 @@
\addbibresource{archaeologie-lstpublishers.bib}}
\DeclareBibliographyOption[boolean]{jstor}[true]{%
\settoggle{bbx:jstor}{#1}}
+\DeclareBibliographyOption[boolean]{arachne}[true]{%
+ \settoggle{bbx:arachne}{#1}}
\DeclareBibliographyOption[boolean]{zenon}[true]{%
\settoggle{bbx:zenon}{#1}}
\DeclareBibliographyOption[boolean]{urn}[true]{%
@@ -106,8 +109,23 @@
lstpublishers,%
}
%-----------------------
+\DeclareBibliographyOption[string]{biblabel}{%
+ \ifcsundef{archblx@biblabel@#1}
+ {\PackageError{biblatex-archaeologie}
+ {Unknown value '#1' for option 'biblabel'.}
+ {Unknown value '#1' for option 'biblabel'.\MessageBreak
+ Possible values are 'plain', 'bold', 'brackets', 'parens'.}%
+ \csdef{archblx@biblabel}{\csuse{archblx@biblabel@plain}}}
+ {\csdef{archblx@biblabel}{\csuse{archblx@biblabel@#1}}}}
+\let\archblx@biblabel@plain\@firstofone
+\def\archblx@biblabel@bold{\mkbibbold}
+\def\archblx@biblabel@brackets{\mkbibbrackets}
+\def\archblx@biblabel@parens{\mkbibparens}
+
\DeclareBibliographyOption{edby}[true]{\csuse{bool#1}{bbx:edby}}
-\DeclareBibliographyOption{initials}[true]{\csuse{bool#1}{bbx:initials}}
+\DeclareBibliographyOption{initials}[false]{\PackageWarningNoLine{biblatex-archaeologie}{%
+ The option 'initials' has been deleted in version 2.3.7,\MessageBreak
+ due to incompatibility reasons with 'biber'.}}
\DeclareBibliographyOption{width}[]{%
\csuse{booltrue}{bbx:width}%
\setlength{\labwidthsameline}{#1}%
@@ -116,9 +134,15 @@
\DeclareBibliographyOption{counter}[true]{\csuse{bool#1}{bbx:counter}}
\DeclareBibliographyOption{bibfullname}[true]{\csuse{bool#1}{bbx:bibfullname}
\DeclareNameAlias{author}{given-family}}
-\DeclareBibliographyOption{inreferences}[true]{\csuse{bool#1}{bbx:inreferences}
+\DeclareBibliographyOption{inreferences}[true]{%
+ \PackageWarningNoLine{biblatex-archaeologie}{%
+ The option 'inreferences' for is deprecated,\MessageBreak
+ use 'inreferencesasfullcite' instead.}%
+ \booltrue{bbx:inreferencesasfullcite}}
+\DeclareBibliographyOption{inreferencesasfullcite}[true]{\csuse{bool#1}{bbx:inreferencesasfullcite}
\ExecuteBibliographyOptions[inreference]{skipbib=true}%
\ExecuteBibliographyOptions[inreference]{skiplab=true}}
+\DeclareBibliographyOption{eventdatelanguage}[true]{\csuse{bool#1}{bbx:eventdatelanguage}}
\DeclareBibliographyOption{noabbrv}[true]{\csuse{bool#1}{bbx:noabbrv}}
\DeclareBibliographyOption{translation}[true]{\csuse{bool#1}{bbx:translation}}
\DeclareBibliographyOption{publisher}[true]{\csuse{bool#1}{bbx:publisher}
@@ -130,7 +154,7 @@
%-----------------------
\ExecuteBibliographyOptions{%
initials=true,
- autolang=other,%
+ autolang=hyphen,%
}
%-----------------------
\DeclareEntryOption{ancient}[true]{\csuse{bool#1}{cbx:ancient}}
@@ -163,21 +187,22 @@
\ifbool{bbx:bibfullname}{bibfullname\seperator}{}%
\ifdefstring\citeauthorformatVALUE{initials}%
{}
- {citeauthorformat\,= \citeauthorformatVALUE\seperator}%
+ {citeauthorformat\,= \mbox{\citeauthorformatVALUE\seperator}}%
\ifbool{bbx:counter}{counter\seperator}{}%
\ifbool{bbx:edby}{edby\seperator}{}%
- \ifbool{bbx:inreferences}{inreferences\seperator}{}%
+ \ifbool{bbx:inreferencesasfullcite}{inreferencesasfullcite\seperator}{}%
\ifbool{bbx:initials}{}{\xout{initials}\seperator}%
\ifbool{bbx:noabbrv}{noabbrv\seperator}{}%
\ifbool{bbx:publisher}{publisher\seperator}{}%
\ifbool{cbx:seenote}{seenote\seperator}{}%
\ifbool{bbx:translation}{translation\seperator}{}%
\ifbool{bbx:width}%
- {width\,=\labwidthsamelineVALUE\seperator}{}%
+ {width\,=\,\labwidthsamelineVALUE\seperator}{}%
\ifbool{cbx:yearinparensoption}
{yearinparens\seperator}{}%
\ifbool{bbx:yearseries}{yearseries\seperator}{}%
\iftoggle{bbx:zenon}{zenon\seperator}{}%
+ \iftoggle{bbx:arachne}{arachne\seperator}{}%
\iftoggle{bbx:jstor}{jstor\seperator}{}%
\iftoggle{bbx:urn}{}{\xout{urn}\seperator}%
\iftoggle{bbx:doi}{}{\xout{doi}\seperator}%
@@ -212,6 +237,7 @@
\DeclareFieldFormat{note}{\mkbibparens{#1}\nopunct}
\DeclareFieldFormat{shorthandwidth}{#1}
\DeclareFieldFormat{origtitle}{#1}
+\DeclareFieldFormat{bibcitelabel}{\csuse{archblx@biblabel}{#1}}
\DeclareFieldFormat{eprint:urn}{%
\textsc{urn}%
\addcolon\space%
@@ -230,10 +256,17 @@
\ifhyperref%
{\href{http://www.jstor.org/stable/#1}{\nolinkurl{#1}}}%
{\nolinkurl{#1}}}
+\DeclareFieldFormat{eprint:arachne}{%
+ \textsc{iDAI.objects/arachne}%
+ \addcolon\space%
+ \ifhyperref%
+ {\href{https://arachne.dainst.org/entity/#1}{\nolinkurl{#1}}}%
+ {\nolinkurl{#1}}}
%-----------------------
\DeclareFieldAlias{zenon}{eprint:zenon}
\DeclareFieldAlias{jstor}{eprint:jstor}
\DeclareFieldAlias{urn}{eprint:urn}
+\DeclareFieldAlias{arachne}{eprint:arachne}
%-----------------------
\DeclareRedundantLanguages{german}{german,ngerman,austrian,naustrian}
\DeclareRedundantLanguages{english,american}{english,american,british,%
@@ -245,6 +278,23 @@
\DeclareLanguageMapping{spanish}{spanish-archaeologie}
%\DeclareLanguageMappingSuffix{-archaeologie}
%-----------------------
+\NewBibliographyString{origtitle}
+\NewBibliographyString{firstprint}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{reference}
+\NewBibliographyString{translationof}
+\NewBibliographyString{talk}
+\NewBibliographyString{inpreparation}
+\NewBibliographyString{submitted}
+\NewBibliographyString{forthcoming}
+\NewBibliographyString{inpress}
+\NewBibliographyString{prepublished}
+\NewBibliographyString{seenote}
+\NewBibliographyString{loccit}
+\NewBibliographyString{subvoce}
+\NewBibliographyString{owntranslation}
+\NewBibliographyString{magthesis}
+%-----------------------
\renewcommand*{\sqspace}{\addnbthinspace}
\renewcommand*{\subtitlepunct}{\addperiod\addspace}
\renewcommand*{\intitlepunct}{\addcolon\addspace}
@@ -285,197 +335,209 @@
{\bibdaterangesep}}
\renewrobustcmd*{\mkdaterangefull}[2]{%
- \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}}}}}}
-
-\renewrobustcmd*{\mkdaterangetrunc}[2]{%
- \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}}}}}}
-
-\renewrobustcmd*{\mkdaterangefullextra}[2]{%
- \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}%
+ \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}}}%
- \printfield{extradate}%
+ {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
\enddateuncertainprint
- \dateeraprint{#2endyear}}}}}}}
+ \dateeraprint{#2endyear}}}}}%
+ \endgroup}
-\renewrobustcmd*{\mkdaterangetruncextra}[2]{%
- \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}%
+\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}}}%
- \printfield{extradate}%
+ {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
\enddateuncertainprint
- \dateeraprint{#2endyear}}}}}}}
+ \dateeraprint{#2endyear}}}}}%
+ \endgroup}
-\renewrobustcmd*{\mkdaterangeymd}[1]{%
- \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}}}}}}
+\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*{\mkdaterangeymdextra}[1]{%
- \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}%
+\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}}}}}}
+ {\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}
%-----------------------
\DeclareBibliographyAlias{collection}{book}
\DeclareBibliographyAlias{reference}{book}
@@ -483,6 +545,7 @@
\DeclareBibliographyAlias{maintitle}{booktitle}
\DeclareBibliographyAlias{incollection}{inbook}
\DeclareBibliographyAlias{manual}{book}
+\DeclareBibliographyAlias{mathesis}{thesis}
%-----------------------
\DeclareSortingTemplate{nyt}{
@@ -568,37 +631,6 @@
{\clearname{translator}%
\clearfield{origtitle}}}
%-----------------------
-\AtBeginDocument{%
- \ifbool{bbx:initials}{%http://tex.stackexchange.com/a/295486/98739
- \DeclareStyleSourcemap{%
- \maps[datatype=bibtex]{%
- \map{%
- % Author field
- \step[fieldsource=author,%
- match={\regexp{\b(Chr|Ch|Th|Ph|St)(\S*,)}},%
- replace={\regexp{\{$1\}$2}}]% Protect last names (first last)
- \step[fieldsource=author,%
- match={\regexp{([^,]\s)\b(Chr|Ch|Th|Ph|St)}},%
- replace={\regexp{$1\{$2\}}}]% Protect last names (last, first)
- \step[fieldsource=author,%
- match={\regexp{\b(Chr|Ch|Th|Ph|St)([^\}])}},%
- replace={\regexp{\{\\relax\{\}$1\}$2}}]% Insert \relax after abbreviating
- % Editor field
- \step[fieldsource=editor,%
- match={\regexp{\b(Chr|Ch|Th|Ph|St)(\S*,)}},%
- replace={\regexp{\{$1\}$2}}]% Protect last names (first last)
- \step[fieldsource=editor,%
- match={\regexp{([^,]\s)\b(Chr|Ch|Th|Ph|St)}},%
- replace={\regexp{$1\{$2\}}}]% Protect last names (last, first)
- \step[fieldsource=editor,%
- match={\regexp{\b(Chr|Ch|Th|Ph|St)([^\}])}},%
- replace={\regexp{\{\\relax\{\}$1\}$2}}]% Insert \relax after abbreviating
- }
- }
- }%
- }
- {}}
-%-----------------------
%% provide macros to deal with intranslator, withincommentator, withinannotator, withinintroduction, withinforeword, withinafterword
%% that is fields referring to the title work and not the booktitle work in inbook etc. works
% these macros are essentially the same as the standard macros without the "in"
@@ -671,17 +703,16 @@
\clearname{inforeword}%
\newunit
\usebibmacro{withinafterword}%
- \clearname{inafterword}%
-}
+ \clearname{inafterword}}
%-----------------------
\newbibmacro{labelwidthbib}{%
- \begingroup%
+ \begingroup
\DeclareFieldFormat{bibhyperref}{##1}%
\csuse{blx@hook@cite}%
\csuse{blx@hook@citekey}%
\defcounter{maxnames}{\blx@maxcitenames}%
- \usebibmacro{cite}%
- \endgroup%
+ \printtext[bibcitelabel]{\usebibmacro{cite}}%
+ \endgroup
}
%-----------------------
\newbibmacro{kicklabel}{%
@@ -689,8 +720,7 @@
\global\togglefalse{blx@insert}%
\ifdim1.1\wd\arch@labelbox>%
\labwidthsameline\leavevmode\newline
- \fi%
-}
+ \fi}
%-----------------------
\newbibmacro{labelwidthfield}[1]{%
\begingroup
@@ -699,24 +729,14 @@
\csuse{blx@hook@citekey}%
\defcounter{maxnames}{\blx@maxcitenames}%
\printfield{#1}%
- \endgroup
-}
+ \endgroup}
%-----------------------
\newbibmacro{kicklabelfield}[1]{%
\sbox\arch@labelbox{\usebibmacro{labelwidthfield}{#1}}%
\global\togglefalse{blx@insert}%
\ifdim.9\wd\arch@labelbox>%
\labwidthsameline\leavevmode\newline
- \fi
-}
-%-----------------------
-% \renewbibmacro{in:}{%
-% \setunit{\isdot%
-% \iffieldundef{title}
-% {}
-% {\addcomma}%
-% \addspace}%
-% \printtext{\bibstring{in}\intitlepunct}}
+ \fi}
%-----------------------
\renewbibmacro*{pageref}{%
\iflistundef{pageref}
@@ -756,6 +776,12 @@
{\usebibmacro{bbx:parunit}%
\printfield{jstor}}}
%-----------------------
+\newbibmacro*{arachne}{%
+ \iffieldundef{arachne}
+ {}
+ {\usebibmacro{bbx:parunit}%
+ \printfield{arachne}}}
+%-----------------------
\newbibmacro*{urn}{%
\iffieldundef{urn}
{}
@@ -775,6 +801,7 @@
\iftoggle{bbx:doi}{\printfield{doi}}{}%
\iftoggle{bbx:eprint}{\usebibmacro{eprint}}{}%
\iftoggle{bbx:jstor}{\usebibmacro{jstor}}{}%
+ \iftoggle{bbx:arachne}{\usebibmacro{arachne}}{}%
\iftoggle{bbx:urn}{\usebibmacro{urn}}{}%
\iftoggle{bbx:zenon}{\usebibmacro{zenon}}{}%
\iftoggle{bbx:url}{\usebibmacro{url+urldate}}{}%
@@ -787,7 +814,7 @@
not test {\ifnameundef{editor}}}%
{\printnames{editor}%
\setunit{\addspace}%
- \printtext[parens]{\bibstring{editor}}%
+ \printtext[editortype]{\bibstring{editor}}%
\clearname{editor}}%
{}}
%-----------------------
@@ -910,13 +937,26 @@
{\usebibmacro{volume}}}%
\newunit}
%-----------------------
+%https://tex.stackexchange.com/a/15014/35864
+\newenvironment{fullexpotherlanguage}[1]{%
+ \begingroup
+ \edef\temp{\endgroup\noexpand\otherlanguage{#1}}%
+ \temp
+}{\endotherlanguage}
+%-----------------------
\renewbibmacro{event+venue+date}{%
\setunit{\adddot\addspace}%
\printfield{eventtitle}%
\setunit*{\addspace}%
\printfield{venue}%
\setunit*{\addspace}%
- \printeventdate%
+\ifbool{bbx:eventdatelanguage}
+ {\begingroup
+ \begin{fullexpotherlanguage}{\thefield{eventdatelanguage}}%
+ \printeventdate
+ \end{fullexpotherlanguage}%
+ \endgroup}
+ {\printeventdate}
\newunit
}
%-----------------------
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
index 437ba54f2b4..2798d7d09ec 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
@@ -308,6 +308,8 @@
Value 'firstfull' for 'citeauthorformat' is deprecated,\MessageBreak
use 'firstfulltheninitials' instead.}%
\cbx@arch@citeauthorformat@firstfulltheninitials}
+
+
%-----------------------
\ExecuteBibliographyOptions{%
citetracker=true,
@@ -346,7 +348,7 @@
%-----------------------
\renewbibmacro*{postnote}{%
\ifboolexpr{
- bool{bbx:inreferences}
+ bool{bbx:inreferencesasfullcite}
and
test{\ifentrytype{inreference}}
}
@@ -419,7 +421,7 @@
%-----------------------
\newbibmacro{cite}{%
\ifboolexpr{
- bool{bbx:inreferences}
+ bool{bbx:inreferencesasfullcite}
and
test{\ifentrytype{inreference}}
}
@@ -545,7 +547,7 @@
\usebibmacro{cite}}
{\multicitedelim}
{\ifboolexpr{
- bool{bbx:inreferences}
+ bool{bbx:inreferencesasfullcite}
and
test{\ifentrytype{inreference}}}
{}
@@ -582,7 +584,7 @@
\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
\ifboolexpr{
- bool{bbx:inreferences}
+ bool{bbx:inreferencesasfullcite}
and
test{\ifentrytype{inreference}}}
{\printtext}%
@@ -611,7 +613,7 @@
{\ifnameundef{translator}%
{\bibstring{owntranslation}}%
{\ifboolexpr{
- bool {bbx:inreferences}
+ bool {bbx:inreferencesasfullcite}
and
test {\ifentrytype{inreference}}
}%
@@ -631,7 +633,7 @@
\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
\ifboolexpr{
- bool{bbx:inreferences}
+ bool{bbx:inreferencesasfullcite}
and
test{\ifentrytype{inreference}}}
{\printtext}%
@@ -664,7 +666,7 @@
\boolfalse{pagetracker}%
\usebibmacro{prenote}}%
{\ifboolexpr{
- bool{bbx:inreferences}
+ bool{bbx:inreferencesasfullcite}
and
test{\ifentrytype{inreference}}}
{\printtext}%
@@ -688,7 +690,7 @@
\boolfalse{pagetracker}%
\usebibmacro{prenote}}%
{\ifboolexpr{%
- bool{bbx:inreferences}
+ bool{bbx:inreferencesasfullcite}
and
test{\ifentrytype{inreference}}}
{\printtext}%
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx
index 662bf36bacd..218fd48b753 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx
@@ -20,8 +20,12 @@
\DeclareDatamodelEntryfields[talk]{author,title,subtitle,titleaddon,date,labeldate,year,venue,institution,eventtitle,eventdate,url,urldate,note}
\DeclareDatamodelFields[type=field,datatype=verbatim]{zenon}
\DeclareDatamodelEntryfields{zenon}
+\DeclareDatamodelFields[type=field,datatype=verbatim]{arachne}
+\DeclareDatamodelEntryfields{arachne}
\DeclareDatamodelFields[type=field,datatype=verbatim]{urn}
\DeclareDatamodelEntryfields{urn}
\DeclareDatamodelFields[type=field,datatype=verbatim]{jstor}
\DeclareDatamodelEntryfields{jstor}
+\DeclareDatamodelFields[type=field,datatype=verbatim]{eventdatelanguage}
+\DeclareDatamodelEntryfields[proceedings,inproceedings]{eventdatelanguage}
\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx
index d9a97a8ed2c..eaba25e327a 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx
@@ -1,7 +1,7 @@
% archaeologie --%
% biblatex for archaeologists,
% historians and philologists
-% Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl
+% Copyright (c) 2016-2018 Lukas C. Bossert | Johannes Friedl
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -10,21 +10,14 @@
% http://www.latex-project.org/lppl.txt
% and version 1.3 or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-\ProvidesFile{archaeologie-english.lbx}%
+\ProvidesFile{english-archaeologie.lbx}%
[\arch@lbxid]
\InheritBibliographyExtras{english}
-\NewBibliographyString{origtitle}
-\NewBibliographyString{firstprint}
-\NewBibliographyString{reference}
-\NewBibliographyString{talk}
-\NewBibliographyString{editor}
-\NewBibliographyString{subvoce}
-\NewBibliographyString{owntranslation}
-
-
\DeclareBibliographyStrings{%
inherit = {english},
+ magthesis = {{}{}},% FIX ME!
+ mathesis = {{Masters-thesis}{MA thesis}},% FIX ME!
subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
reference = {{Article}{Art\adddot}},
origtitle = {{original title}{orig\adddot title}},
@@ -51,121 +44,133 @@
}
\protected\gdef\lbx@us@mkdaterangetrunc@long#1#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}}
+ \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{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
- \enddateuncertainprint
- \dateeraprint{#2}}}}}}
+ {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+ \enddateuncertainprint
+ \dateeraprint{#2}}}}}%
+ \endgroup}
\protected\gdef\lbx@us@mkdaterangetrunc@short#1#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}}}}}}
+ \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{%
- \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}}}}}}
+ \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{%
- \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}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}
- {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
- \printfield{extradate}%
- \enddateuncertainprint
- \dateeraprint{#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}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}
+ {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+ \printfield{extradate}%
+ \enddateuncertainprint
+ \dateeraprint{#2}}}}}%
+ \endgroup}
\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx
index f66b1a9096f..b1ba2e8211b 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/french-archaeologie.lbx
@@ -17,18 +17,10 @@
\InheritBibliographyExtras{french}
\DefineBibliographyExtras{french}{\restorecommand\mkbibnamefamily}
-\NewBibliographyString{origtitle}
-\NewBibliographyString{firstprint}
-\NewBibliographyString{reviewof}
-\NewBibliographyString{reference}
-\NewBibliographyString{translationof}
-\NewBibliographyString{talk}
-\NewBibliographyString{subvoce}
-\NewBibliographyString{owntranslation}
-
-
\DeclareBibliographyStrings{%
inherit = {french},
+ magthesis = {{}{}},% FIX ME!
+ mathesis = {{}{}},% FIX ME!
subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
translationof = {{traduction\addspace de}{trad\adddot\addspace de}},
reference = {{article}{art\adddot}},
diff --git a/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx
index da9d1243e2c..62581365863 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/german-archaeologie.lbx
@@ -1,7 +1,7 @@
% archaeologie --%
% biblatex for archaeologists,
% historians and philologists
-% Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl
+% Copyright (c) 2016-2018 Lukas C. Bossert | Johannes Friedl
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -10,25 +10,14 @@
% http://www.latex-project.org/lppl.txt
% and version 1.3 or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-\ProvidesFile{archaeologie-german.lbx}%
+\ProvidesFile{german-archaeolgie.lbx}%
[\arch@lbxid]
\InheritBibliographyExtras{ngerman}
-\NewBibliographyString{origtitle}
-\NewBibliographyString{firstprint}
-\NewBibliographyString{reviewof}
-\NewBibliographyString{reference}
-\NewBibliographyString{translationof}
-\NewBibliographyString{talk}
-
-\NewBibliographyString{seenote}
-\NewBibliographyString{loccit}
-\NewBibliographyString{subvoce}
-\NewBibliographyString{owntranslation}
-
-
\DeclareBibliographyStrings{%
inherit = {ngerman},
+ magthesis = {{Magisterarbeit}{Mag.-Arbeit}},%
+ mathesis = {{Masterarbeit}{MA-Arbeit}},%
subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
reference = {{Artikel}{Art\adddot}},
reviewof = {{Rezension\addspace zu}{Rez\adddot\addabthinspace zu}},
@@ -38,6 +27,6 @@
seenote = {{Anmerkung}{Anm\adddot}},
loccit = {{am\addabthinspace Ort}{a\adddot\addabthinspace O\adddot}},
translationof = {{\"Ubersetzung\addspace von}{\"Ubers\adddot\addspace von}},
- owntranslation = {{eigene\addspace\"Ubersetzung}{eig\adddot\addspace\"Ubers\adddot}},
+ owntranslation = {{eigene\addspace\"Ubersetzung}{eig\adddot\addspace\"Ubers\adddot}},
}
\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx
index aca0683694b..3e097c05c2b 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/italian-archaeologie.lbx
@@ -1,7 +1,7 @@
% archaeologie --%
% biblatex for archaeologists,
% historians and philologists
-% Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl
+% Copyright (c) 2016-2018 Lukas C. Bossert | Johannes Friedl
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -12,28 +12,14 @@
% version 2005/12/01 or later.
-\ProvidesFile{archaeologie-italian.lbx}%
+\ProvidesFile{italian-archaeologie.lbx}%
[\arch@lbxid]
\InheritBibliographyExtras{italian}
-\NewBibliographyString{origtitle}
-\NewBibliographyString{firstprint}
-\NewBibliographyString{reviewof}
-\NewBibliographyString{reference}
-\NewBibliographyString{translationof}
-\NewBibliographyString{talk}
-\NewBibliographyString{inpreparation}
-\NewBibliographyString{submitted}
-\NewBibliographyString{forthcoming}
-\NewBibliographyString{inpress}
-\NewBibliographyString{prepublished}
-\NewBibliographyString{subvoce}
-\NewBibliographyString{owntranslation}
-
-
-
\DeclareBibliographyStrings{%
inherit = {italian},
+ magthesis = {{}{}},% FIX ME!
+ mathesis = {{}{}},% FIX ME!
subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
translationof = {{traduzione\addspace di}{trad\adddot\addabthinspace di}},
reference = {{articolo}{art\adddot}},
@@ -46,6 +32,6 @@
inpress = {{in\addspace corso\addspace di\addspace stampa}{c\adddot\addabthinspace d\adddot\addabthinspace s\adddot}},
prepublished = {{}{}},% FIX ME!
forthcoming = {{prossimo}{prossimo}},
- owntranslation = {{??}{??}},% FIX ME!
+ owntranslation = {{??}{??}},% FIX ME!
}
\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx b/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx
index 89daf2c73c1..34b727b4b8b 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/spanish-archaeologie.lbx
@@ -1,7 +1,7 @@
% archaeologie --%
% biblatex for archaeologists,
% historians and philologists
-% Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl
+% Copyright (c) 2016-2018 Lukas C. Bossert | Johannes Friedl
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -11,25 +11,20 @@
% and version 1.3 or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-\ProvidesFile{archaeologie-spanish.lbx}%
+\ProvidesFile{spanish-archaeologie.lbx}%
[\arch@lbxid]
\InheritBibliographyExtras{spanish}
-\NewBibliographyString{origtitle}
-\NewBibliographyString{firstprint}
-\NewBibliographyString{reference}
-\NewBibliographyString{talk}
-\NewBibliographyString{subvoce}
-\NewBibliographyString{owntranslation}
-
\DeclareBibliographyStrings{%
inherit = {spanish},
+ magthesis = {{}{}},% FIX ME!
+ mathesis = {{}{}},% FIX ME!
subvoce = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
reference = {{Artículo}{Art\adddot}},
origtitle = {{Título\addspace original}{Título\addspace original}},
firstprint = {{Primera\addspace edición}{Primera\addspace edición}},
talk = {{Conferencia}{Conferencia}},
- owntranslation = {{??}{??}},% FIX ME!
+ owntranslation = {{??}{??}},% FIX ME!
}
\endinput \ No newline at end of file