archaeologie (14feb18)

git-svn-id: svn://tug.org/texlive/trunk@46636 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 1306 insertions, 1016 deletions

diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
index fcc5c83961e..0513f9c5ccf 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
@@ -1,8 +1,8 @@
 % archaeologie --%
-% biblatex for archaeologists, 
+% biblatex for archaeologists,
 % historians and philologists
-% Copyright (c) 2017 Lukas C. Bossert | Johannes Friedl
-% 
+% Copyright (c) 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
 % of this license or (at your option) any later version.
@@ -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{2017/11/19}
-\def\arch@version{2.3.4}
+\def\arch@date{2018/02/13}
+\def\arch@version{2.3.5}
 \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)}
@@ -21,7 +21,7 @@
 \RequireBibliographyStyle{standard}
 \AtBeginDocument{%
   \urlstyle{sf}%
-  \typeout{* * * archaeologie * * * 
+  \typeout{* * * archaeologie * * *
   biblatex for archaeologists,
   historians and philologists}
 }
@@ -34,12 +34,11 @@
   citecounter=true,%
   sortlocale=auto,%
   language=auto,%
-  autolang=other,%
   bibencoding=utf8,%
   dateabbrev=false, %
   sorting=nyt,%
   labeldateparts=true,
-  maxnames=2,% 
+  maxnames=2,%
   minnames=1,%
   maxitems=1,%
   maxbibnames=999,%
@@ -49,12 +48,12 @@
 %-----------------------
 \newbool{bbx:edby}
 \newbool{bbx:width}
-\newbool{bbx:yearseries} 
+\newbool{bbx:yearseries}
 \newbool{bbx:bibfullname}
 \newbool{bbx:inreferences}
 \newbool{bbx:noabbrv}
 \newbool{bbx:translation}
-\newbool{bbx:publisher} 
+\newbool{bbx:publisher}
 \newbool{bbx:initials}
 \newbool{bbx:counter}
 \newbool{cbx:ancient}
@@ -102,12 +101,12 @@
 \ExecuteBibliographyOptions{%
   jstor,%
   urn,%
-  }
+}
 %-----------------------
 \DeclareBibliographyOption{edby}[true]{\csuse{bool#1}{bbx:edby}}
 \DeclareBibliographyOption{initials}[true]{\csuse{bool#1}{bbx:initials}}
 \DeclareBibliographyOption{width}[]{%
-  \csuse{booltrue}{bbx:width}% 
+  \csuse{booltrue}{bbx:width}%
   \setlength{\labwidthsameline}{#1}%
   \def\labwidthsamelineVALUE{#1}}
 \DeclareBibliographyOption{yearseries}[true]{\csuse{bool#1}{bbx:yearseries}}
@@ -124,10 +123,12 @@
 \DeclareBibliographyOption{scshape}[true]{%
   \ifstrequal{#1}{true}%
     {\AtEveryCite{\renewcommand*{\mkbibnamefamily}[1]{\textsc{##1}}}}%
-    {}%
-  }
+    {}}
 %-----------------------
-\ExecuteBibliographyOptions{initials=true}
+\ExecuteBibliographyOptions{%
+  initials=true,
+  autolang=other,%
+}
 %-----------------------
 \DeclareEntryOption{ancient}[true]{\csuse{bool#1}{cbx:ancient}}
 \DeclareEntryOption{frgancient}[true]{%
@@ -140,7 +141,7 @@
 \newcommand{\archaeologieoptions}[1][]{%
   \ifstrempty{#1}{%
     \iflanguage{ngerman}%
-      {Zusätzlich geladene oder \xout{deaktivierte} Optionen 
+      {Zusätzlich geladene oder \xout{deaktivierte} Optionen
       von \textsc{bib}\LaTeX-\textsf{archaeologie} (Version \archaeologieversion~| \archaeologiedate):}%
       {Additional options of \textsc{bib}\LaTeX-\textsf{archaeologie} (version \archaeologieversion~| \archaeologiedate) used or \xout{omitted}:}\addspace}%
    {\ifthenelse{\equal{#1}{plain}}{}{{\PackageError{biblatex-archaeologie}%
@@ -177,7 +178,7 @@
       {for further information see \url{http://biblatex-archaeologie.de}}
 }
 %-----------------------
-\DeclareFieldFormat*{title}{#1}
+\DeclareFieldFormat*{title}{#1\isdot}
 \DeclareFieldFormat{subtitle}{#1}
 \DeclareFieldFormat{booktitle}{#1}
 \DeclareFieldFormat{editortype}{\mkbibparens{#1}}
@@ -190,6 +191,7 @@
 \DeclareFieldFormat{edition}{#1}
 \DeclareFieldFormat{volumes}{#1}
 \DeclareFieldFormat{volume}{#1}
+\DeclareFieldFormat[book,collection,proceedings,inproceedings,inbook,incollection]{volume}{\RN{#1}}
 \DeclareFieldFormat{part}{#1}
 \DeclareFieldFormat[article]{date}{\iffieldundef{number}{#1}{\iffieldundef{volume}{#1\yearnumdelim\printfield{number}}{#1}}}
 \DeclareFieldFormat[inreference]{number}{\mkbibbrackets{#1}}
@@ -202,7 +204,6 @@
 \DeclareFieldFormat{note}{\mkbibparens{#1}\nopunct}
 \DeclareFieldFormat{shorthandwidth}{#1}
 \DeclareFieldFormat{origtitle}{#1}
-%\DeclareFieldFormat{origtitle}{\iffieldequalstr{origlanguage}{greek}{#1}{\mkbibemph{#1}}}
 \DeclareFieldFormat{eprint:urn}{%
   \textsc{urn}%
   \addcolon\space%
@@ -246,7 +247,7 @@
 \renewcommand{\finalnamedelim}{\multinamedelim}
 \renewcommand*\relateddelim{\addnbspace\textendash\addspace}%
 \newcommand*{\relateddelimmultivolume}{\addcomma\par\nobreak}
-\newcommand*{\volnumdelim}{\addcomma}
+\newcommand*{\volnumdelim}{\addcomma\space}
 \newcommand*{\yearnumdelim}{\addslash}
 \newcommand*{\jourvoldelim}{\addnbspace}
 \renewcommand{\finentrypunct}{%http://tex.stackexchange.com/a/14159/98739
@@ -256,7 +257,7 @@
       {wurde \ifnumequal{\value{citecounter}}
         {0}
         {{\color{red}{keinmal}}}
-        {\arabic{citecounter}-mal} 
+        {\arabic{citecounter}-mal}
         zitiert.}
       {cited \ifnumequal{\value{citecounter}}
         {0}
@@ -266,6 +267,207 @@
         {s}}.%
       }}%
       {}}
+
+\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]{%
+  \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}%
+               \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}}}}}}}
+
+\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}%
+               \enddatecircaprint
+               \iffieldundef{#2season}
+                 {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}
+                 {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}%
+               \printfield{extradate}%
+               \enddateuncertainprint
+               \dateeraprint{#2endyear}}}}}}}
+
+\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*{\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}%
+               \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}}}}}}
 %-----------------------
 \DeclareBibliographyAlias{collection}{book}
 \DeclareBibliographyAlias{reference}{book}
@@ -273,7 +475,7 @@
 \DeclareBibliographyAlias{maintitle}{booktitle}
 \DeclareBibliographyAlias{incollection}{inbook}
 \DeclareBibliographyAlias{manual}{book}
-%----------------------- 
+%-----------------------
 
 \DeclareSortingTemplate{nyt}{
   \sort{
@@ -309,17 +511,16 @@
 \DeclareSortingTemplate{shortseries}{\sort{\field{shortseries}}}
 \DeclareSortingTemplate{shortjournal}{\sort{\field{shortjournal}}}
 %-----------------------
-\defbibcheck{shortseries}{% 
+\defbibcheck{shortseries}{%
   \iffieldundef{shortseries}%
     {\skipentry}%
     {}%
- \iffieldundef{series}%
-  {\skipentry}%
-  {\ifcsdef{\strfield{series}}%
+  \iffieldundef{series}%
     {\skipentry}%
-    {\savefieldcs{series}{\strfield{series}}}%
-  }%
-} 
+    {\ifcsdef{\strfield{series}}%
+       {\skipentry}%
+       {\savefieldcs{series}{\strfield{series}}}}%
+}
 \defbibcheck{shortjournal}{%
   \iffieldundef{shortjournal}%
     {\skipentry}%
@@ -327,11 +528,10 @@
   \iffieldundef{journaltitle}%
     {\skipentry}%
     {\ifcsdef{\strfield{journaltitle}}%
-    {\skipentry}%
-    {\savefieldcs{journaltitle}{\strfield{journaltitle}}}%
-    }%
+       {\skipentry}%
+       {\savefieldcs{journaltitle}{\strfield{journaltitle}}}}%
 }
-%----------------------- 
+%-----------------------
 \DeclareNameAlias{name:initials}{default}
 \DeclareNameAlias{author}{name:initials}
 \DeclareNameAlias{editor}{author}
@@ -350,211 +550,209 @@
 %-----------------------
 \AtEveryBibitem{%
   \iffieldequalstr{relatedtype}{translationof}%
-  {\savename{translator}{\savedrelatedtranslator}%
-  \clearname{translator}}%
-  {}%
+    {\savename{translator}{\savedrelatedtranslator}%
+     \clearname{translator}}%
+    {}%
   \ifboolexpr{bool {bbx:translation}%
-  or bool {cbx:ancient}%
-  or bool {cbx:frgancient}}%
-  {}%
-  {\clearname{translator}%
-  \clearfield{origtitle}%
-  }%
-}
+      or bool {cbx:ancient}%
+      or bool {cbx:frgancient}}%
+    {}%
+    {\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
- }}}%
- }{}%
-}
+  \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"
 \newbibmacro*{byineditor+others}{%
   \ifnameundef{ineditor}
-  {}
-  {\usebibmacro{byeditor+othersstrg}%
-    \setunit{\addspace}%
-    \printnames[author]{ineditor}%
-    \clearname{ineditor}%
-    \newunit}%
+    {}
+    {\usebibmacro{byeditor+othersstrg}%
+     \setunit{\addspace}%
+     \printnames[author]{ineditor}%
+     \clearname{ineditor}%
+     \newunit}%
   \usebibmacro{byintranslator+others}}
 %-----------------------
 \newbibmacro*{byintranslator+others}{%
   \ifnameundef{intranslator}
-  {}
-  {\usebibmacro{bytranslator+othersstrg}%
-    \setunit{\addspace}%
-    \printnames[author]{intranslator}%
-    \clearname{intranslator}%
-    \newunit}%
-   \usebibmacro{withinothers}}
+    {}
+    {\usebibmacro{bytranslator+othersstrg}%
+     \setunit{\addspace}%
+     \printnames[author]{intranslator}%
+     \clearname{intranslator}%
+     \newunit}%
+  \usebibmacro{withinothers}}
 %-----------------------
 \newbibmacro*{withincommentator}{%
   \ifnameundef{incommentator}
-  {}
-  {\bibstring{withcommentator}%
-   \setunit{\addspace}%
-   \printnames[author]{incommentator}}}
+    {}
+    {\bibstring{withcommentator}%
+     \setunit{\addspace}%
+     \printnames[author]{incommentator}}}
 %-----------------------
 \newbibmacro*{withinannotator}{%
   \ifnameundef{inannotator}
-  {}
-  {\bibstring{withannotator}%
-    \setunit{\addspace}%
-    \printnames[author]{inannotator}}}
+    {}
+    {\bibstring{withannotator}%
+     \setunit{\addspace}%
+     \printnames[author]{inannotator}}}
 %-----------------------
 \newbibmacro*{withinintroduction}{%
   \ifnameundef{inintroduction}
-  {}
-  {\bibstring{withintroduction}%
-    \setunit{\addspace}%
-    \printnames[author]{inintroduction}}}
+    {}
+    {\bibstring{withintroduction}%
+     \setunit{\addspace}%
+     \printnames[author]{inintroduction}}}
 %-----------------------
 \newbibmacro*{withinforeword}{%
   \ifnameundef{inforeword}
-  {}
-  {\bibstring{withforeword}%
-    \setunit{\addspace}%
-    \printnames[author]{inforeword}}}
+    {}
+    {\bibstring{withforeword}%
+     \setunit{\addspace}%
+     \printnames[author]{inforeword}}}
 %-----------------------
 \newbibmacro*{withinafterword}{%
   \ifnameundef{inafterword}
-  {}
-  {\bibstring{withafterword}%
-    \setunit{\addspace}%
-    \printnames[author]{inafterword}}}
+    {}
+    {\bibstring{withafterword}%
+     \setunit{\addspace}%
+     \printnames[author]{inafterword}}}
 %-----------------------
 \newbibmacro*{withinothers}{%
- \usebibmacro{withincommentator}%
- \clearname{incommentator}%
- \newunit%
- \usebibmacro{withinannotator}%
- \clearname{inannotator}%
- \newunit%
- \usebibmacro{withinintroduction}%
- \clearname{inintroduction}%
- \newunit%
- \usebibmacro{withinforeword}%
- \clearname{inforeword}%
- \newunit%
- \usebibmacro{withinafterword}%
- \clearname{inafterword}%
+  \usebibmacro{withincommentator}%
+  \clearname{incommentator}%
+  \newunit
+  \usebibmacro{withinannotator}%
+  \clearname{inannotator}%
+  \newunit
+  \usebibmacro{withinintroduction}%
+  \clearname{inintroduction}%
+  \newunit
+  \usebibmacro{withinforeword}%
+  \clearname{inforeword}%
+  \newunit
+  \usebibmacro{withinafterword}%
+  \clearname{inafterword}%
 }
 %-----------------------
 \newbibmacro{labelwidthbib}{%
   \begingroup%
-  \DeclareFieldFormat{bibhyperref}{##1}%
-  \csuse{blx@hook@cite}%
-  \csuse{blx@hook@citekey}%
-  \defcounter{maxnames}{\blx@maxcitenames}%
-  \usebibmacro{cite}%
+    \DeclareFieldFormat{bibhyperref}{##1}%
+    \csuse{blx@hook@cite}%
+    \csuse{blx@hook@citekey}%
+    \defcounter{maxnames}{\blx@maxcitenames}%
+    \usebibmacro{cite}%
   \endgroup%
-} 
+}
 %-----------------------
-\newbibmacro{kicklabel}{% 
+\newbibmacro{kicklabel}{%
   \sbox\arch@labelbox{\usebibmacro{labelwidthbib}}%
   \global\togglefalse{blx@insert}%
   \ifdim1.1\wd\arch@labelbox>%
-  \labwidthsameline\leavevmode\newline\fi%
+    \labwidthsameline\leavevmode\newline
+  \fi%
 }
 %-----------------------
 \newbibmacro{labelwidthfield}[1]{%
   \begingroup
-  \DeclareFieldFormat{bibhyperref}{##1}%
-  \csuse{blx@hook@cite}%
-  \csuse{blx@hook@citekey}%
-  \defcounter{maxnames}{\blx@maxcitenames}%
-  \printfield{#1}%
+    \DeclareFieldFormat{bibhyperref}{##1}%
+    \csuse{blx@hook@cite}%
+    \csuse{blx@hook@citekey}%
+    \defcounter{maxnames}{\blx@maxcitenames}%
+    \printfield{#1}%
   \endgroup
-} 
+}
 %-----------------------
-\newbibmacro{kicklabelfield}[1]{% 
+\newbibmacro{kicklabelfield}[1]{%
   \sbox\arch@labelbox{\usebibmacro{labelwidthfield}{#1}}%
   \global\togglefalse{blx@insert}%
   \ifdim.9\wd\arch@labelbox>%
-  \labwidthsameline\leavevmode\newline\fi
+    \labwidthsameline\leavevmode\newline
+  \fi
 }
 %-----------------------
-\renewbibmacro{in:}{%
-  \ifthenelse{% 
-    \ifentrytype{article}%
-    \OR%
-    \ifentrytype{review}%
-  }%
-  {}%
-  {\setunit{\isdot\addcomma\addspace}%
-  \printtext{\bibstring{in}\intitlepunct}}}
-%----------------------- 
+% \renewbibmacro{in:}{%
+%  \setunit{\isdot%
+%    \iffieldundef{title}
+%      {}
+%      {\addcomma}%
+%      \addspace}%
+%      \printtext{\bibstring{in}\intitlepunct}}
+%-----------------------
 \renewbibmacro*{pageref}{%
   \iflistundef{pageref}
     {}
-    { \setunit{\addcomma\newline\nobreak}%
-    \printtext{%
+    {\setunit{\addcomma\newline\nobreak}%
+     \printtext{%
        \ifnumgreater{\value{pageref}}{1}
          {\bibstring{backrefpages}\ppspace}
          {\bibstring{backrefpage}\ppspace}%
        \printlist[pageref][-\value{listtotal}]{pageref}}}}
-%-----------------------     
+%-----------------------
 \newbibmacro*{bbx:parunit}{%
- \ifbibliography{%
- \setunit{\bibpagerefpunct}%
- \newblock
- \usebibmacro{pageref}%
- \clearlist{pageref}%
- \setunit{\addcomma\newline\nobreak}%
- }%
- {\newunit}%
+  \ifbibliography{%
+    \setunit{\bibpagerefpunct}\newblock
+    \usebibmacro{pageref}%
+    \clearlist{pageref}%
+    \setunit{\addcomma\newline\nobreak}}%
+  {\newunit}%
 }
- %----------------------- 
+ %-----------------------
 \renewbibmacro*{eprint}{%
- \usebibmacro{bbx:parunit}%
- \iffieldundef{eprinttype}%
- {\printfield{eprint}}%
- {\printfield[eprint:\strfield{eprinttype}]{eprint}}%
+  \usebibmacro{bbx:parunit}%
+  \iffieldundef{eprinttype}%
+    {\printfield{eprint}}%
+    {\printfield[eprint:\strfield{eprinttype}]{eprint}}%
 }
-%----------------------- 
+%-----------------------
 \newbibmacro*{zenon}{%
   \iffieldundef{zenon}
-  {}%
-  {\usebibmacro{bbx:parunit}%
-   \printfield{zenon}}}
-%----------------------- 
+    {}%
+    {\usebibmacro{bbx:parunit}%
+     \printfield{zenon}}}
+%-----------------------
 \newbibmacro*{jstor}{%
   \iffieldundef{jstor}
-  {}
-  {\usebibmacro{bbx:parunit}%
-    \printfield{jstor}}}
-%----------------------- 
+    {}
+    {\usebibmacro{bbx:parunit}%
+     \printfield{jstor}}}
+%-----------------------
 \newbibmacro*{urn}{%
   \iffieldundef{urn}
-  {} 
-  {\usebibmacro{bbx:parunit}%
-    \printfield{urn}}}
+    {}
+    {\usebibmacro{bbx:parunit}%
+     \printfield{urn}}}
 %-----------------------
 \renewbibmacro*{url+urldate}{%
   \usebibmacro{bbx:parunit}%
@@ -563,15 +761,15 @@
     {\printfield{url}%
   \setunit*{\addspace}%
   \printtext{\printurldate}}}
-%----------------------- 
+%-----------------------
 \renewbibmacro*{doi+eprint+url}{%
- \usebibmacro{bbx:parunit}%
- \iftoggle{bbx:doi}{\printfield{doi}}{}%
- \iftoggle{bbx:eprint}{\usebibmacro{eprint}}{}%
- \iftoggle{bbx:jstor}{\usebibmacro{jstor}}{}%
- \iftoggle{bbx:urn}{\usebibmacro{urn}}{}%
- \iftoggle{bbx:zenon}{\usebibmacro{zenon}}{}%
- \iftoggle{bbx:url}{\usebibmacro{url+urldate}}{}%
+  \usebibmacro{bbx:parunit}%
+  \iftoggle{bbx:doi}{\printfield{doi}}{}%
+  \iftoggle{bbx:eprint}{\usebibmacro{eprint}}{}%
+  \iftoggle{bbx:jstor}{\usebibmacro{jstor}}{}%
+  \iftoggle{bbx:urn}{\usebibmacro{urn}}{}%
+  \iftoggle{bbx:zenon}{\usebibmacro{zenon}}{}%
+  \iftoggle{bbx:url}{\usebibmacro{url+urldate}}{}%
 }
 %-----------------------
 \renewbibmacro*{editor}{%
@@ -579,341 +777,309 @@
     test \ifuseeditor %
     and %
     not test {\ifnameundef{editor}}}%
- {\printnames{editor}%
-   \setunit{\addspace}%
-   \printtext[parens]{\bibstring{editor}}%
-   \clearname{editor}}%
-  {}}
-%----------------------- 
+    {\printnames{editor}%
+     \setunit{\addspace}%
+     \printtext[parens]{\bibstring{editor}}%
+     \clearname{editor}}%
+    {}}
+%-----------------------
 \newbibmacro*{bookauthor}{%
   \printnames{bookauthor}%
   \newunit}
-%-----------------------   
+%-----------------------
 \DeclareLabeldate{%
-  \field{date}
   \field{year}
-  \field{eventdate}
+  \field{date}
   \field{origdate}
   \field{urldate}
   \field{pubstate}
+  \field{eventdate}
   \literal{nodate}
 }
-%----------------------- 
+%-----------------------
 \newbibmacro*{series}{%
  \ifboolexpr{test {\iffieldundef{shortseries}} %
- or bool {bbx:noabbrv}}%
- {\printtext[seriestitle]{\printfield[titlecase]{series}}}%
- {\printfield{shortseries}}%
+      or bool {bbx:noabbrv}}%
+   {\printtext[seriestitle]{\printfield[titlecase]{series}}}%
+   {\printfield{shortseries}}%
 }
 %-----------------------
 \renewbibmacro*{series+number}{%
- \iffieldundef{series}%
- {}%
- {\usebibmacro{series}%
- \setunit*{\addspace}%
- \printfield{number}%
- \ifbool{bbx:yearseries}%
- {\newunit}%
- {\setunit{\addspace}}}}
+  \iffieldundef{series}%
+    {}%
+    {\usebibmacro{series}%
+     \setunit*{\addspace}%
+     \printfield{number}%
+  \ifbool{bbx:yearseries}%
+    {\newunit}%
+    {\setunit{\addspace}}}}
 %-----------------------
 \renewbibmacro*{journal}{%
- \ifboolexpr{test {\iffieldundef{shortjournal}}%
- or bool {bbx:noabbrv}}%
- {\printtext[journaltitle]{%
- \printfield[titlecase]{journaltitle}%
- \setunit{\subtitlepunct}%
- \printfield[titlecase]{journalsubtitle}%
- }%
- }%
- {\printfield{shortjournal}}}
+  \ifboolexpr{test {\iffieldundef{shortjournal}}%
+      or bool {bbx:noabbrv}}%
+    {\printtext[journaltitle]{%
+       \printfield[titlecase]{journaltitle}%
+       \setunit{\subtitlepunct}%
+       \printfield[titlecase]{journalsubtitle}}}%
+    {\printfield{shortjournal}}}
 %-----------------------
 \newbibmacro{journal+number+year}{%
- \usebibmacro{journal}%
- \setunit{\jourvoldelim}%
- \iffieldundef{volume}%
- {}
- {\printfield{volume}%
- \iffieldundef{number}%
- {}%
- {\setunit{\volnumdelim}%
- \printfield{number}}%
- \newunit}%
-\usebibmacro{pubstate+year}}
+  \usebibmacro{journal}%
+  \setunit{\jourvoldelim}%
+  \iffieldundef{volume}%
+    {}
+    {\printfield{volume}%
+     \iffieldundef{number}%
+       {}%
+       {\setunit{\volnumdelim}%
+        \printfield{number}}%
+     \newunit}%
+  \usebibmacro{pubstate+year}}
 %-----------------------
 \newbibmacro{pubstate+year}{%
- \iffieldundef{pubstate}%
- {\usebibmacro{date}}%
- {\printfield{pubstate}}}
+  \iffieldundef{pubstate}%
+    {\usebibmacro{date}}%
+    {\printfield{pubstate}}}
  %-----------------------
 \newbibmacro*{pages}{%
- \printfield{pages}%
- \isdot}
+  \printfield{pages}%
+  \isdot}
 %-----------------------
 \newbibmacro{translation}{%
- \printfield{origtitle}%
- \setunit{\addcomma\space}%
- \usebibmacro{byeditor+others}}
-%----------------------- 
+  \printfield{origtitle}%
+  \setunit{\addcomma\space}%
+  \usebibmacro{byeditor+others}}
+%-----------------------
 \newbibmacro{intranslation}{%
- \printfield{origtitle}%
- \setunit{\addcomma\space}%
- \usebibmacro{byineditor+others}} 
-%----------------------- 
+  \printfield{origtitle}%
+  \setunit{\addcomma\space}%
+  \usebibmacro{byineditor+others}}
+%-----------------------
 \newbibmacro*{related:reviewof}[1]{%
   \usebibmacro*{related:default}{#1}}
 %-----------------------
 \newbibmacro*{related:translationof}[1]{%
- \entrydata*{#1}{%
- \restorename{savedtranslator}{\savedrelatedtranslator}%
- \printtext[emph]{\usebibmacro{title}}%
- \usebibmacro{location+edition+year}%
- \ifnameundef{savedtranslator}%
- {}%
- {\newunit
- \bibstring{bytranslator}%keine Sprache ausgegeben? 
- \setunit{\addspace}%
- \printnames{savedtranslator}}}}
-%----------------------- 
-\newbibmacro*{inreference:title+author}{%		
-  \iffieldundef{title}%		
-   {}%		
-   {\setunit{\addspace}%		
-   \bibstring{subvoce}%		
-   \setunit{\addspace}%		
-   \printfield{title}%		
-   \setunit*{\addspace}%		
-   \printfield{number}}%		
- \setunit{\addspace}%		
- \ifnameundef{author}%		
-  {}		
-  {\printtext[parens]{\printnames[name:initials]{labelname}}}}
-%----------------------- 
-\newbibmacro*{maintitle+title+volumes}{% 
-  \iffieldsequal{maintitle}{title}%
-  {\clearfield{maintitle}%
-  \clearfield{mainsubtitle}%
-  \clearfield{maintitleaddon}%
-  }%
- {\iffieldundef{maintitle}%
-  {}%
-  {\usebibmacro{maintitle}%
-   \usebibmacro{volume}%
-	 \clearfield{volume}%
-	 }%
+  \entrydata*{#1}{%
+    \restorename{savedtranslator}{\savedrelatedtranslator}%
+    \printtext[emph]{\usebibmacro{title}}%
+    \usebibmacro{location+edition+year}%
+    \ifnameundef{savedtranslator}%
+      {}%
+      {\newunit
+       \bibstring{bytranslator}%keine Sprache ausgegeben?
+       \setunit{\addspace}%
+       \printnames{savedtranslator}}}}
+%-----------------------
+\newbibmacro*{inreference:title+author}{%
   \iffieldundef{title}%
- {}%
- {\usebibmacro{title}}%
-  \ifbool{cbx:ancient}%
-    {\usebibmacro{translation}%
-		\usebibmacro{volume}% 
-    }%
     {}%
-  }%
+    {\setunit{\addspace}%
+     \bibstring{subvoce}%
+     \setunit{\addspace}%
+     \printfield{title}%
+     \setunit*{\addspace}%
+     \printfield{number}}%
+  \setunit{\addspace}%
+  \ifnameundef{author}%
+    {}
+    {\printtext[parens]{\printnames[name:initials]{labelname}}}}
+%-----------------------
+\newbibmacro*{maintitle+title+volumes}{%
+  \iffieldsequal{maintitle}{title}%
+    {\clearfield{maintitle}%
+     \clearfield{mainsubtitle}%
+     \clearfield{maintitleaddon}}%
+    {\iffieldundef{maintitle}%
+       {}%
+       {\usebibmacro{maintitle}%
+        \usebibmacro{volume}%
+        \clearfield{volume}}%
+     \iffieldundef{title}%
+       {}%
+       {\usebibmacro{title}}%
+     \ifbool{cbx:ancient}%
+       {\usebibmacro{translation}}%
+       {\usebibmacro{volume}}}%
  \newunit}
 %-----------------------
 \renewbibmacro{event+venue+date}{%
- \setunit{\adddot\addspace}% 
- \printfield{eventtitle}%
- \setunit*{\addspace}%
- \printfield{venue}%
- \setunit*{\addspace}%
- \printeventdate%
- \newunit%
+  \setunit{\adddot\addspace}%
+  \printfield{eventtitle}%
+  \setunit*{\addspace}%
+  \printfield{venue}%
+  \setunit*{\addspace}%
+  \printeventdate%
+  \newunit
 }
-%----------------------- 
+%-----------------------
 \renewbibmacro*{title}{%
- \ifboolexpr{%
- test {\iffieldundef{title}}%
- and%
- test {\iffieldundef{subtitle}}}%
- {}%
- {\printtext[title]{%
- \printfield[titlecase]{title}%
- \setunit{\subtitlepunct}%
- \printfield[titlecase]{subtitle}}%
- }%
- \iffieldundef{titleaddon}
-   {\newunit}
-   {\setunit*{\subtitlepunct}%
-	   \printfield{titleaddon}}%
+  \ifboolexpr{%
+      test {\iffieldundef{title}}%
+      and%
+      test {\iffieldundef{subtitle}}}%
+    {}%
+    {\printtext[title]{%
+       \printfield[titlecase]{title}%
+       \setunit{\subtitlepunct}%
+       \printfield[titlecase]{subtitle}}}%
+  \iffieldundef{titleaddon}
+    {\newunit}
+    {\setunit*{\subtitlepunct}%
+     \printfield{titleaddon}}
 }
-%----------------------- 
+%-----------------------
 \renewbibmacro*{booktitle}{%
- \ifboolexpr{%
- test {\iffieldundef{booktitle}}%
- and%
- test {\iffieldundef{booksubtitle}}}%
- {}%
- {\printtext[booktitle]{%
- \printfield[titlecase]{booktitle}%
- \setunit{\subtitlepunct}%
- \printfield[titlecase]{booksubtitle}}%
- \setunit{\subtitlepunct}%
- }%
- \printfield{booktitleaddon}%
+  \ifboolexpr{%
+      test {\iffieldundef{booktitle}}%
+      and%
+      test {\iffieldundef{booksubtitle}}}%
+    {}%
+    {\printtext[booktitle]{%
+       \printfield[titlecase]{booktitle}%
+       \setunit{\subtitlepunct}%
+       \printfield[titlecase]{booksubtitle}}%
+       \setunit{\subtitlepunct}}%
+  \printfield{booktitleaddon}%
 }
-%----------------------- 
+%-----------------------
 \renewbibmacro*{maintitle}{%
- \ifboolexpr{%
- test {\iffieldundef{maintitle}}%
- and%
- test {\iffieldundef{mainsubtitle}}}%
- {}%
- {\printtext[maintitle]{%
- \printfield[titlecase]{maintitle}%
- \setunit{\subtitlepunct}%
- \printfield[titlecase]{mainsubtitle}}%
- \setunit{\subtitlepunct}%
- }%
- \printfield{maintitleaddon}%
+  \ifboolexpr{%
+      test {\iffieldundef{maintitle}}%
+      and%
+      test {\iffieldundef{mainsubtitle}}}%
+    {}%
+    {\printtext[maintitle]{%
+       \printfield[titlecase]{maintitle}%
+       \setunit{\subtitlepunct}%
+       \printfield[titlecase]{mainsubtitle}}%
+       \setunit{\subtitlepunct}}%
+  \printfield{maintitleaddon}%
 }
 %-----------------------
 \newbibmacro*{edition}{%
- \iffieldint{edition}%
- {\setunit*{\addspace}%
-  \mkbibsuperscript{\printfield{edition}}\kern -1pt}%
- {\newunit%
-  \printfield{edition}%
-  \setunit{\addspace}}}
+  \iffieldint{edition}%
+    {\setunit*{\addspace}%
+     \mkbibsuperscript{\printfield{edition}}\kern -1pt}%
+    {\newunit
+     \printfield{edition}%
+     \setunit{\addspace}}}
 %-----------------------
 \newbibmacro*{location+edition+year}{%
   \ifboolexpr{%
-    test {\iflistundef{location}}%
-    and test {\iflistundef{publisher}}%
-    and test {\iffieldundef{year}}}%
-   {}%
-   {\ifbool{bbx:publisher}%
-     {\printtext[parens]{%
-       \printlist{location}%
-       \setunit*{\addcolon\addspace}%
-       \printlist{publisher}%
-       \iffieldint{edition}%
-         {\setunit{\addspace}}%
-         {\newunit}%
-     \usebibmacro{edition}% 
-     \usebibmacro{pubstate+year}%
-     \setunit*{\addspace}%
-     \ifboolexpr{%
-     test {\iflistundef{origlocation}}%
-     and test {\iflistundef{origpublisher}}%
-     and test {\iffieldundef{origyear}}}%
+      test {\iflistundef{location}}%
+      and test {\iflistundef{publisher}}%
+      and test {\iffieldundef{year}}}%
     {}%
-    {\printtext[parens]{%
-    \printlist{origlocation}%
-    \iflistundef{origpublisher}%
-      {}%
-      {\setunit*{\addcolon\addspace}%
-      \printlist{origpublisher}%
-      }%
-     \setunit{\addspace}%
-     \printfield{origyear}%
-      }% 
-     }%
-    }%
-   }%
-  {\usebibmacro{edition}%
-   \printtext[parens]{%
-   \ifboolexpr{%
-     test {\iflistundef{origlocation}}%
-     and test {\iffieldundef{origyear}}%
-     }%
-   {}%
-   {\iflistundef{origlocation}%
-   {\printlist{location}}%
-   {\printlist{origlocation}}% 
-   \setunit{\addspace}%
-   \printfield{origyear}%
-   \setunit*{\addsemicolon\addspace}%
-   \iffieldundef{origyear}%
-   {}%
-   {\bibstring{reprint}%
-    \setunit*{\addspace}%
-   }%
-  }%
+    {\ifbool{bbx:publisher}%
+       {\printtext[parens]{%
+          \printlist{location}%
+          \setunit*{\addcolon\addspace}%
+          \printlist{publisher}%
+          \iffieldint{edition}%
+            {\setunit{\addspace}}%
+            {\newunit}%
+          \usebibmacro{edition}%
+          \usebibmacro{pubstate+year}%
+          \setunit*{\addspace}%
+          \ifboolexpr{%
+              test {\iflistundef{origlocation}}%
+              and test {\iflistundef{origpublisher}}%
+              and test {\iffieldundef{origyear}}}%
+            {}%
+            {\printtext[parens]{%
+               \printlist{origlocation}%
+               \iflistundef{origpublisher}%
+                 {}%
+                 {\setunit*{\addcolon\addspace}%
+                  \printlist{origpublisher}}%
+               \setunit{\addspace}%
+               \printfield{origyear}}}}}%
+       {\usebibmacro{edition}%
+        \printtext[parens]{%
+          \ifboolexpr{%
+              test {\iflistundef{origlocation}}%
+              and test {\iffieldundef{origyear}}}%
+            {}%
+            {\iflistundef{origlocation}%
+               {\printlist{location}}%
+               {\printlist{origlocation}}%
+             \setunit*{\addspace}%
+             \printfield{origyear}%
+             \setunit*{\addsemicolon\addspace}%
+             \iffieldundef{origyear}%
+               {}%
+               {\bibstring{reprint}%
+                \setunit*{\addspace}}}%
+          \printlist{location}%
+          \setunit*{\addspace}%
+          \usebibmacro{pubstate+year}}}}}
+%-----------------------
+\renewbibmacro*{institution+location+date}{%
   \printlist{location}%
   \setunit*{\addspace}%
- \usebibmacro{pubstate+year}% 
-  }%
-  }%
- }%
-}
-%-----------------------   
-\renewbibmacro*{institution+location+date}{%
- \printlist{location}%
- \printlist{institution}%
- \setunit*{\addspace}%
-\usebibmacro{pubstate+year}%
-}
+  \printlist{institution}%
+  \setunit*{\addspace}%
+  \usebibmacro{pubstate+year}}
 %-----------------------
 \newbibmacro{signatur}{%
- \printfield{note}%
-} 
-%----------------------- 
+  \printfield{note}}
+%-----------------------
 \newbibmacro*{volume}{%
- \iffieldundef{volume}%
-   {\iffieldundef{volumes}%
-   {}%
-   {\printfield{volumes}%
-     \setunit*{\addspace}%
-     \bibstring{volumes}%
-     \setunit{\addspace}}}%
-  {\setunit{\addspace}%
-    \printfield{volume}%
-    \clearfield{volume}%
-    \iffieldundef{part}
-		  {}
-			{\setunit{\addspace}%
-		  \printfield{part}}%
-		}%
-		\newunit%
-}
-%----------------------- 
+  \iffieldundef{volume}%
+    {\iffieldundef{volumes}%
+       {}%
+       {\printfield{volumes}%
+        \setunit*{\addspace}%
+        \bibstring{volumes}%
+        \setunit{\addspace}}}%
+    {\setunit{\addspace}%
+     \printfield{volume}%
+     \clearfield{volume}%
+     \iffieldundef{part}
+       {}
+       {\setunit{\addspace}%
+        \printfield{part}}}%
+  \newunit}
+%-----------------------
 \renewbibmacro*{maintitle+booktitle}{%
- \iffieldundef{maintitle}%
- {}%
- {\usebibmacro{maintitle}%
- \usebibmacro{volume}%
- \setunit{\maintitlepunct}
- }%
- \usebibmacro{booktitle}%
- \usebibmacro{volume}%
- \newunit%
+  \iffieldundef{maintitle}%
+    {}%
+    {\usebibmacro{maintitle}%
+     \usebibmacro{volume}%
+     \setunit{\maintitlepunct}}%
+  \usebibmacro{booktitle}%
+  \usebibmacro{volume}%
+  \newunit
 }
-%----------------------- 
+%-----------------------
 \newbibmacro*{booktitle+volume+editor}{%
   \ifnameundef{editor}%
-  {\usebibmacro{bookauthor}%
-   \usebibmacro{maintitle+booktitle}%
-   \newunit%
- }%
- {\ifbool{bbx:edby}%
-   {\usebibmacro{maintitle+booktitle}%
- \newunit%
- \bibstring{byeditor}%
- \setunit{\addspace}%
- \printnames{editor}%
-  }%
- {\usebibmacro{editor}%
- \newunit\newblock%
- \usebibmacro{maintitle+booktitle}%
- \newunit%
- }%
- }%
+    {\usebibmacro{bookauthor}%
+     \usebibmacro{maintitle+booktitle}%
+     \newunit}%
+    {\ifbool{bbx:edby}%
+       {\usebibmacro{maintitle+booktitle}%
+        \newunit
+        \bibstring{byeditor}%
+        \setunit{\addspace}%
+        \printnames{editor}}%
+       {\usebibmacro{editor}%
+        \newunit\newblock
+        \usebibmacro{maintitle+booktitle}%
+        \newunit}}%
 }
 %-----------------------
 \newbibmacro*{reftitle}{%
- \iffieldundef{title}%
- {}%
- {\bibstring{reference}%
- \setunit{\addspace}%
- \printtext[emph]{%
- \usebibmacro{title}%
- \setunit{\addspace}%
- \iffieldundef{number}%
- {}%
- {\printfield[brackets]{number}}%
- }%
- }%
+  \iffieldundef{title}%
+    {}%
+    {\bibstring{reference}%
+     \setunit{\addspace}%
+     \printtext[emph]{%
+       \usebibmacro{title}%
+       \setunit{\addspace}%
+       \iffieldundef{number}%
+         {}%
+         {\printfield[brackets]{number}}}}%
 }
 %-----------------------
 \DeclareBibliographyDriver{shortjournal}{%
@@ -929,302 +1095,277 @@
   \blx@initunit}
 %-----------------------
 \DeclareDataInheritance{reference}{inreference}{%
- \inherit{shorthand}{booktitle}%
- \noinherit{volumes}%
+  \inherit{shorthand}{booktitle}%
+  \noinherit{volumes}%
 }
 %-----------------------
 \DeclareBibliographyDriver{shorthand}{%
- \iffieldundef{title}%
- {\printfield{booktitle}}%
- {\printfield{title}}%
-} 
-%----------------------- 
+  \iffieldundef{title}%
+    {\printfield{booktitle}}%
+    {\printfield{title}}%
+}
+%-----------------------
 \DeclareBibliographyDriver{article}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author}%
- \setunit*{\labelnamepunct}%
- \newblock%
- \usebibmacro{title}%
- \newunit\newblock%
- \usebibmacro{translation}%
- \usebibmacro{journal+number+year}%
- \newunit\newblock%
- \usebibmacro{pages}%
- \setunit{\addspace}%
- \usebibmacro{doi+eprint+url}%
- \newblock%
- \usebibmacro{signatur}%
- \newblock%
- \usebibmacro{pageref}%
- \newunit\newblock%
- \iftoggle{bbx:related}%
- {\usebibmacro{related:init}%
- \usebibmacro{related}%
- }%
- {}%
- \usebibmacro{finentry}%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit*{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \usebibmacro{translation}%
+  \usebibmacro{journal+number+year}%
+  \newunit\newblock
+  \usebibmacro{pages}%
+  \setunit{\addspace}%
+  \usebibmacro{doi+eprint+url}%
+  \newblock
+  \usebibmacro{signatur}%
+  \newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{bbx:related}%
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}%
+    {}%
+  \usebibmacro{finentry}%
 }
 %-----------------------
 \DeclareBibliographyDriver{book}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}%
- \newblock%
- \usebibmacro{maintitle+title+volumes}%
- \newunit\newblock% 
- \ifbool{bbx:yearseries}%
- {}%
- {\newunit\usebibmacro{series+number}}%
- \ifbool{cbx:ancient}%
-   {}%
-	 {\usebibmacro{translation}}%
- \setunit{\addspace}%
- \newblock%
- \usebibmacro{location+edition+year}%
- \setunit*{\addspace}%
- \newblock%
- \ifbool{bbx:yearseries}%
- {\usebibmacro{series+number}}%
- {}%
- \newunit\newblock%
- \usebibmacro{doi+eprint+url}%
- \setunit*{\addperiod\addspace}%
- \usebibmacro{signatur}%
- \newunit\newblock%
- \iftoggle{bbx:related}%
- {\usebibmacro{related:init}%
- \usebibmacro{related}%
- }%
- {}%
- \usebibmacro{finentry}%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit*{\labelnamepunct}\newblock
+  \usebibmacro{maintitle+title+volumes}%
+  \newunit\newblock
+  \ifbool{bbx:yearseries}%
+    {}%
+    {\newunit\usebibmacro{series+number}}%
+  \ifbool{cbx:ancient}%
+    {}%
+    {\usebibmacro{translation}}%
+  \setunit{\addspace}\newblock
+  \usebibmacro{location+edition+year}%
+  \setunit*{\addspace}\newblock
+  \ifbool{bbx:yearseries}%
+    {\usebibmacro{series+number}}%
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \setunit*{\addperiod\addspace}%
+  \usebibmacro{signatur}%
+  \newunit\newblock
+  \iftoggle{bbx:related}%
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}%
+    {}%
+  \usebibmacro{finentry}%
 }
 %-----------------------
-\DeclareBibliographyDriver{thesis}{% 
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}%
- \newblock%
- \usebibmacro{title}%
- \setunit{\addspace}
- \printtext[parens]{\printfield{type}%
- \setunit*{\addspace}%
- \usebibmacro{institution+location+date}}%
- \newunit\newblock%
- \usebibmacro{doi+eprint+url}%
- \setunit*{\addperiod\addspace}%
- \usebibmacro{signatur}%
- \newunit\newblock%
- \iftoggle{bbx:related}%
- {\usebibmacro{related:init}%
- \usebibmacro{related}%
- }%
- {}%
- \usebibmacro{finentry}%
+\DeclareBibliographyDriver{thesis}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit*{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \setunit{\addspace}
+  \printtext[parens]{\printfield{type}%
+  \setunit*{\addspace}%
+  \usebibmacro{institution+location+date}}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \setunit*{\addperiod\addspace}%
+  \usebibmacro{signatur}%
+  \newunit\newblock
+  \iftoggle{bbx:related}%
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}%
+    {}%
+  \usebibmacro{finentry}%
 }
 %-----------------------
-\DeclareBibliographyDriver{proceedings}{% 
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}%
- \newblock%
- \usebibmacro{maintitle+title+volumes}%
- \usebibmacro{event+venue+date}%
- \setunit*{\addspace}%
- \ifbool{bbx:yearseries}%
- {}%
- {\newunit%
- \usebibmacro{series+number}%
- }%
- \setunit{\addspace}%
- \newblock% 
- \usebibmacro{location+edition+year}%
- \setunit*{\addspace}%
- \newblock% 
- \ifbool{bbx:yearseries}%
- {\usebibmacro{series+number}}%
- {}%
- \newunit\newblock%
- \usebibmacro{doi+eprint+url}%
- \setunit{\addperiod\addspace}%
- \usebibmacro{signatur}%
- \newunit\newblock%
- \iftoggle{bbx:related}%
- {\usebibmacro{related:init}%
-   \usebibmacro{related}}%
- {}%
- \usebibmacro{finentry}%
+\DeclareBibliographyDriver{proceedings}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit*{\labelnamepunct}\newblock
+  \usebibmacro{maintitle+title+volumes}%
+  \usebibmacro{event+venue+date}%
+  \setunit*{\addspace}%
+  \ifbool{bbx:yearseries}%
+    {}%
+    {\newunit
+     \usebibmacro{series+number}}%
+  \setunit{\addspace}\newblock
+  \usebibmacro{location+edition+year}%
+  \setunit*{\addspace}\newblock
+  \ifbool{bbx:yearseries}%
+    {\usebibmacro{series+number}}%
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{signatur}%
+  \newunit\newblock
+  \iftoggle{bbx:related}%
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}%
+    {}%
+  \usebibmacro{finentry}%
 }
 %-----------------------
-\DeclareBibliographyDriver{inproceedings}{% 
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}%
- \newblock%
- \usebibmacro{title}%
- \newunit\newblock%
- \usebibmacro{intranslation}%
- \newunit\newblock%
- \usebibmacro{in:}%
- \usebibmacro{booktitle+volume+editor}%
- \usebibmacro{event+venue+date}%
- \setunit{\addspace}%
- \ifbool{bbx:yearseries}%
- {}%
- {\newunit%
- \usebibmacro{series+number}%
- }%
- \setunit{\addspace}%
- \newblock% 
- \usebibmacro{location+edition+year}%
- \setunit*{\addspace}%
- \newblock% 
- \ifbool{bbx:yearseries}%
- {\usebibmacro{series+number}}%
- {}% 
- \usebibmacro{pages}%
- \newunit\newblock%
- \usebibmacro{doi+eprint+url}%
- \setunit{\addperiod\addspace}%
- \usebibmacro{signatur}%
- \newunit\newblock%
- \iftoggle{bbx:related}%
- {\usebibmacro{related:init}%
- \usebibmacro{related}%
- }%
- {}%
- \usebibmacro{finentry}%
+\DeclareBibliographyDriver{inproceedings}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit*{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \usebibmacro{intranslation}%
+  \newunit\newblock
+  \usebibmacro{in:}%
+  \usebibmacro{booktitle+volume+editor}%
+  \usebibmacro{event+venue+date}%
+  \setunit{\addspace}%
+  \ifbool{bbx:yearseries}%
+    {}%
+    {\newunit
+     \usebibmacro{series+number}}%
+  \setunit{\addspace}\newblock
+  \usebibmacro{location+edition+year}%
+  \setunit*{\addspace}\newblock
+  \ifbool{bbx:yearseries}%
+    {\usebibmacro{series+number}}%
+    {}%
+  \usebibmacro{pages}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{signatur}%
+  \newunit\newblock
+  \iftoggle{bbx:related}%
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}%
+    {}%
+  \usebibmacro{finentry}%
 }
 %-----------------------
-\DeclareBibliographyDriver{talk}{% 
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}%
- \newblock%
- \usebibmacro{title}%
- \newunit\newblock%
- \bibstring{talk}%
- \setunit{\addspace}%
- \printdate%
- \newunit\newblock%
- \printlist{institution}%
- \newunit\newblock%
- \usebibmacro{event+venue+date}% 
- \setunit{\addspace}%
- \newunit\newblock%
- \usebibmacro{doi+eprint+url}%
- \setunit{\addperiod\addspace}%
- \usebibmacro{signatur}%
- \newunit\newblock%
- \iftoggle{bbx:related}%
- {\usebibmacro{related:init}%
- \usebibmacro{related}%
- }%
- {}%
+\DeclareBibliographyDriver{talk}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit*{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \bibstring{talk}%
+  \setunit{\addspace}%
+  \printdate%
+  \newunit\newblock
+  \printlist{institution}%
+  \newunit\newblock
+  \usebibmacro{event+venue+date}%
+  \setunit{\addspace}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{signatur}%
+  \newunit\newblock
+  \iftoggle{bbx:related}%
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}%
+    {}%
  \usebibmacro{finentry}%
 }
 %-----------------------
-\DeclareBibliographyDriver{inbook}{% 
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}%
- \newblock%
- \usebibmacro{title}%
- \newunit\newblock%
- \usebibmacro{intranslation}%
- \iffieldundef{title}%
- {\setunit{\addspace}}%
- {\newunit\newblock}%
- \usebibmacro{in:}%
- \usebibmacro{booktitle+volume+editor}%
- \setunit{\addspace}%
- \ifbool{bbx:yearseries}%
- {}%
- {\newunit%
- \usebibmacro{series+number}%
- }%
- \setunit{\addspace}%
- \newblock%
- \usebibmacro{location+edition+year}%
- \setunit*{\addspace}%
- \newblock% 
- \ifbool{bbx:yearseries}%
- {\usebibmacro{series+number}}%
- {}%
- \usebibmacro{pages}%
- \newunit\newblock%
- \usebibmacro{doi+eprint+url}%
- \setunit{\addperiod\addspace}%
- \usebibmacro{signatur}%
- \newunit\newblock%
- \iftoggle{bbx:related}%
- {\usebibmacro{related:init}%
- \usebibmacro{related}%
- }%
- {}%
- \usebibmacro{finentry}%
+\DeclareBibliographyDriver{inbook}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit*{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \usebibmacro{intranslation}%
+  \iffieldundef{title}%
+    {\setunit{\addspace}}%
+    {\newunit\newblock}%
+  \usebibmacro{in:}%
+  \usebibmacro{booktitle+volume+editor}%
+  \setunit{\addspace}%
+  \ifbool{bbx:yearseries}%
+    {}%
+    {\newunit
+     \usebibmacro{series+number}}%
+  \setunit{\addspace}\newblock
+  \usebibmacro{location+edition+year}%
+  \setunit*{\addspace}\newblock
+  \ifbool{bbx:yearseries}%
+    {\usebibmacro{series+number}}%
+    {}%
+  \usebibmacro{pages}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{signatur}%
+  \newunit\newblock
+  \iftoggle{bbx:related}%
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}%
+    {}%
+  \usebibmacro{finentry}%
 }
 %-----------------------
 \DeclareBibliographyDriver{inreference}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \printfield{booktitle}%
- \setunit{\addspace}%
- \printfield{volume}%
- \setunit{\addspace}%
- \printfield[parens]{year}%
- \setunit{\addspace}%
- \usebibmacro{pages}%
- \usebibmacro{inreference:title+author}%
- \newunit\newblock%
- \usebibmacro{doi+eprint+url}%
- \setunit{\addperiod\addspace}%
- \usebibmacro{signatur}%
- \newunit\newblock%
- \usebibmacro{finentry}%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \printfield{booktitle}%
+  \setunit{\addspace}%
+  \printfield{volume}%
+  \setunit{\addspace}%
+  \printfield[parens]{year}%
+  \setunit{\addspace}%
+  \usebibmacro{pages}%
+  \usebibmacro{inreference:title+author}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{signatur}%
+  \newunit\newblock
+  \usebibmacro{finentry}%
 }
 %-----------------------
 \DeclareBibliographyDriver{review}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}%
- \newblock%
- \iffieldundef{title}%
- {}%
- {\usebibmacro{title}}%
- \newunit\newblock%
- \usebibmacro{related:init}%
- \usebibmacro{related}% 
- \newunit\newblock%
- \usebibmacro{journal+number+year}%
- \newunit\newblock%
- \usebibmacro{pages}%
- \newunit\newblock%
- \usebibmacro{doi+eprint+url}%
- \usebibmacro{signatur}%
- \newunit\newblock%
- \usebibmacro{finentry}%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit*{\labelnamepunct}\newblock
+  \iffieldundef{title}%
+    {}%
+    {\usebibmacro{title}}%
+  \newunit\newblock
+  \usebibmacro{related:init}%
+  \usebibmacro{related}%
+  \newunit\newblock
+  \usebibmacro{journal+number+year}%
+  \newunit\newblock
+  \usebibmacro{pages}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \usebibmacro{signatur}%
+  \newunit\newblock
+  \usebibmacro{finentry}%
 }
 %-----------------------
 \defbibenvironment{bibliography}%
   {\list%
-   {\usebibmacro{labelwidthbib}}%
-   {\setlength{\labelwidth}{\labwidthsameline}%
+    {\usebibmacro{labelwidthbib}}%
+    {\setlength{\labelwidth}{\labwidthsameline}%
      \setlength{\leftmargin}{\labelwidth}%
      \setlength{\labelsep}{\biblabelsep}%
      \addtolength{\leftmargin}{\labelsep}%
      \setlength{\itemsep}{\bibitemsep}%
      \setlength{\parsep}{\bibparsep}%
      \renewcommand*{\makelabel}[1]{##1\hss}}}%
-   {\endlist}%
-   {\item\usebibmacro{kicklabel}}
+  {\endlist}%
+  {\item\usebibmacro{kicklabel}}
  %-----------------------
 \def\do#1{%
   \defbibenvironment{#1}
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
index 6bf89ec1b7a..83e9eea64e4 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
@@ -1,8 +1,8 @@
 % archaeologie --%
-%  biblatex for archaeologists, 
+%  biblatex for archaeologists,
 %  historians and philologists
 % Copyright (c) 2017 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
 % of this license or (at your option) any later version.
@@ -26,37 +26,90 @@
     bool {cbx:ancient}%
     or bool {cbx:frgancient}%
     or bool {cbx:corpus}%
-    }%
-  {\addspace}%
-  {\newunitpunct}}
-\newcommand*{\cbx@fseen@names}{}
-\newcommand*{\cbx@tseen@names}{}
-\newrobustcmd*{\cbx@nameseen}[1]{%
+  }%
+    {\addspace}%
+    {\newunitpunct}}
+
+\newrobustcmd*{\cbx@nametracker@global}[1]{%
+  \xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}
+    {}
+    {\listcsxadd{cbx@bseen@names@\the\c@refsection}{#1}}}
+
+\newrobustcmd*{\cbx@nametracker@context}[1]{%
   \iftoggle{blx@footnote}
-  {\listcsxadd{cbx@fseen@names}{#1}}
-  {\listcsxadd{cbx@tseen@names}{#1}}}
-\newrobustcmd*{\cbx@ifnameseen}[1]{%
+    {\xifinlistcs{#1}{cbx@fseen@names@\the\c@refsection}
+       {}
+       {\listcsxadd{cbx@fseen@names@\the\c@refsection}{#1}}}
+    {\xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}
+       {}
+       {\listcsxadd{cbx@bseen@names@\the\c@refsection}{#1}}}}
+
+\newrobustcmd*{\cbx@ifnameseen@global}[1]{%
+  \xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}}
+
+\newrobustcmd*{\cbx@ifnameseen@context}[1]{%
   \iftoggle{blx@footnote}%
-  {\xifinlistcs{#1}{cbx@fseen@names}}%
-  {\xifinlistcs{#1}{cbx@tseen@names}}}
+    {\xifinlistcs{#1}{cbx@fseen@names@\the\c@refsection}}%
+    {\xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}}}
+
+\DeclareBibliographyOption[boolean]{nametracker}[true]{%
+  \ifcsdef{blx@opt@nametracker@#1}
+    {\csuse{blx@opt@nametracker@#1}}
+    {\blx@err@invopt{nametracker=#1}{}}}
+
+\def\blx@opt@nametracker@true{%
+  \let\cbx@ifnameseen\cbx@ifnameseen@global
+  \let\cbx@nametracker\cbx@nametracker@global}
+
+\def\blx@opt@nametracker@false{%
+  \protected\long\def\cbx@ifnameseen##1##2##3{##3}%
+  \let\cbx@nametracker\relax}
+
+\def\blx@opt@nametracker@context{%
+  \let\cbx@ifnameseen\cbx@ifnameseen@context
+  \let\cbx@nametracker\cbx@nametracker@context}
+
+\appto\blx@secinit{
+  \ifcsundef{cbx@bseen@names@\the\c@refsection}
+    {\global\cslet{cbx@bseen@names@\the\c@refsection}\@empty}
+    {}%
+  \ifcsundef{cbx@fseen@names@\the\c@refsection}
+    {\global\cslet{cbx@fseen@names@\the\c@refsection}\@empty}
+    {}}
+
+\InitializeCitationStyle{%
+  \global\cslet{cbx@bseen@names@\the\c@refsection}\@empty
+  \global\cslet{cbx@fseen@names@\the\c@refsection}\@empty}
+
+%\renewrobustcmd*{\citereset}{%
+%  \csuse{blx@hook@cbxinit}%
+%  \@ifstar
+%    {}
+%    {\global\cslet{blx@bsee@\the\c@refsection}\@empty
+%     \global\cslet{blx@fsee@\the\c@refsection}\@empty
+%     \global\cslet{cbx@bseen@names@\the\c@refsection}\@empty
+%     \global\cslet{cbx@fseen@names@\the\c@refsection}\@empty
+%     \blx@ibidreset@force
+%     \blx@idemreset@force
+%     \blx@opcitreset@force
+%     \blx@loccitreset@force}}
+
 %-----------------------
 \DeclareBibliographyOption{yearinparens}[true]{%
   \ifstrequal{#1}{true}%
-  {\DeclareFieldFormat{citeyear}{\mkbibparens{##1}}%
-  \csuse{bool#1}{cbx:yearinparens}}%
-  {\DeclareFieldFormat{citeyear}{##1}}}%
+    {\DeclareFieldFormat{citeyear}{\mkbibparens{##1}}%
+     \csuse{bool#1}{cbx:yearinparens}}%
+    {\DeclareFieldFormat{citeyear}{##1}}}%
 \DeclareBibliographyOption{seenote}[true]{%
   \csuse{bool#1}{cbx:seenote}%
-  \ExecuteBibliographyOptions{maxnames=999}%
-  }%
+  \ExecuteBibliographyOptions{maxnames=999}}%
 \DeclareBibliographyOption[string]{citeauthorformat}{%
   \ifcsdef{cbx@arch@citeauthorformat@#1}%
-  {\csuse{cbx@arch@citeauthorformat@#1}}%
-  {\PackageError{biblatex-archaeologie}%
-  {Option 'citeauthorformat=#1' invalid.\MessageBreak
-  Use one of the values 'initials', 'full', 'family' or 'firstfull'.}{}}%
-\def\citeauthorformatVALUE{#1}%
-}
+    {\csuse{cbx@arch@citeauthorformat@#1}}%
+    {\PackageError{biblatex-archaeologie}%
+       {Option 'citeauthorformat=#1' invalid.\MessageBreak
+        Use one of the values 'initials', 'full', 'family' or 'firstfull'.}{}}%
+  \def\citeauthorformatVALUE{#1}}
 \DeclareEntryOption{uniqueme}[true]{\csuse{bool#1}{cbx:uniqueme}}
 %-----------------------
 \DeclareFieldFormat{citeyear}{#1}
@@ -67,83 +120,83 @@
 
 \DeclareNameFormat{labelname}{%
   \ifcase\value{uniquename}%
-  \usebibmacro{name:family}
-  {\namepartfamily}
-  {\namepartgiven}
-  {\namepartprefix}
-  {\namepartsuffix}%
+    \usebibmacro{name:family}
+      {\namepartfamily}
+      {\namepartgiven}
+      {\namepartprefix}
+      {\namepartsuffix}%
   \or
-  \ifuseprefix
-  {\usebibmacro{name:family-given}
-  {\namepartfamily}
-  {\namepartgiveni}
-  {\namepartprefix}
-  {\namepartsuffixi}}
-  {\usebibmacro{name:family-given}
-  {\namepartfamily}
-  {\namepartgiveni}
-  {\namepartprefixi}
-  {\namepartsuffixi}}%
+    \ifuseprefix
+      {\usebibmacro{name:family-given}
+         {\namepartfamily}
+         {\namepartgiveni}
+         {\namepartprefix}
+         {\namepartsuffixi}}
+      {\usebibmacro{name:family-given}
+         {\namepartfamily}
+         {\namepartgiveni}
+         {\namepartprefixi}
+         {\namepartsuffixi}}%
   \or
-   \usebibmacro{name:family-given}
-  {\namepartfamily}
-  {\namepartgiven}
-  {\namepartprefix}
-  {\namepartsuffix}%
+    \usebibmacro{name:family-given}
+      {\namepartfamily}
+      {\namepartgiven}
+      {\namepartprefix}
+      {\namepartsuffix}%
   \fi
   \usebibmacro{name:andothers}}
-  
+
  \DeclareNameFormat{name:family}{%
   \ifcase\value{uniquename}%
-  \usebibmacro{name:family}
-  {\namepartfamily}
-  {\namepartgiven}
-  {\namepartprefix}
-  {\namepartsuffix}%
+    \usebibmacro{name:family}
+      {\namepartfamily}
+      {\namepartgiven}
+      {\namepartprefix}
+      {\namepartsuffix}%
   \or
-  \ifuseprefix
-  {\usebibmacro{name:given-family}
-  {\namepartfamily}
-  {\namepartgiveni}
-  {\namepartprefix}
-  {\namepartsuffixi}}
-  {\usebibmacro{name:given-family}
-  {\namepartfamily}
-  {\namepartgiveni}
-  {\namepartprefixi}
-  {\namepartsuffixi}}%
+    \ifuseprefix
+      {\usebibmacro{name:given-family}
+         {\namepartfamily}
+         {\namepartgiveni}
+         {\namepartprefix}
+         {\namepartsuffixi}}
+      {\usebibmacro{name:given-family}
+         {\namepartfamily}
+         {\namepartgiveni}
+         {\namepartprefixi}
+         {\namepartsuffixi}}%
   \or
-   \usebibmacro{name:given-family}
-  {\namepartfamily}
-  {\namepartgiven}
-  {\namepartprefix}
-  {\namepartsuffix}%
+    \usebibmacro{name:given-family}
+      {\namepartfamily}
+      {\namepartgiven}
+      {\namepartprefix}
+      {\namepartsuffix}%
   \fi
   \usebibmacro{name:andothers}}
-  
+
  \DeclareNameFormat{name:initials}{%
   \ifnum\value{uniquename}=2%
-  \usebibmacro{name:given-family}
-  {\namepartfamily}
-  {\namepartgiven}
-  {\namepartprefix}
-  {\namepartsuffix}%
+    \usebibmacro{name:given-family}
+      {\namepartfamily}
+      {\namepartgiven}
+      {\namepartprefix}
+      {\namepartsuffix}%
   \else
-  \ifuseprefix
-  {\usebibmacro{name:given-family}
-  {\namepartfamily}
-  {\namepartgiveni}
-  {\namepartprefix}
-  {\namepartsuffixi}}
-  {\usebibmacro{name:given-family}
-  {\namepartfamily}
-  {\namepartgiveni}
-  {\namepartprefixi}
-  {\namepartsuffixi}}%
+    \ifuseprefix
+      {\usebibmacro{name:given-family}
+         {\namepartfamily}
+         {\namepartgiveni}
+         {\namepartprefix}
+         {\namepartsuffixi}}
+      {\usebibmacro{name:given-family}
+         {\namepartfamily}
+         {\namepartgiveni}
+         {\namepartprefixi}
+         {\namepartsuffixi}}%
   \fi
   \usebibmacro{name:andothers}}
-  
-   
+
+
 \def\cbx@arch@citeauthorformat@family{%
   \DeclareNameAlias{citeauthor}{name:family}}
 
@@ -179,66 +232,68 @@
          {\namepartgiven}
          {\namepartprefix}
          {\namepartsuffix}%
-       \cbx@nameseen{\thefield{hash}}}%
+       \cbx@nametracker{\thefield{hash}}}%
     \usebibmacro{name:andothers}}
 
 \def\cbx@arch@citeauthorformat@firstfull{%
    \DeclareNameAlias{citeauthor}{citeauthor:fancy}}
-%-----------------------  
+%-----------------------
 \ExecuteBibliographyOptions{%
-  citetracker=true,% 
-  idemtracker=true,% 
-  ibidtracker=true,%
-  opcittracker=true,%
-  loccittracker=true,%
-  alldates=comp,%
+  citetracker=true,
+  idemtracker=true,
+  ibidtracker=true,
+  opcittracker=true,
+  loccittracker=true,
+  nametracker=context,
+  alldates=comp,
   dateuncertain=true,
   datecirca=true,
-  citeauthorformat=initials,%
-  uniquename=minfull,%
+  citeauthorformat=initials,
+  uniquename=minfull,
   autocite=footnote,
 }
 %-----------------------
 \newbibmacro*{uniqueshorthand}{%
   \printtext[brackets]{%
-  \ifnameundef{translator}
-    	{\ifnameundef{intranslator}%
+    \ifnameundef{translator}
+      {\ifnameundef{intranslator}%
          {\iffieldundef{series}%
-      	    {\printnames[name:family]{editor}}%
-     	    {\usebibmacro{series}}%
-     	   }%
+            {\printnames[name:family]{editor}}%
+            {\usebibmacro{series}}}%
          {\printnames[name:family]{intranslator}}}%
-    	  {\printnames[name:family]{translator}}}}
+      {\printnames[name:family]{translator}}}}
 %-----------------------
 \renewbibmacro*{citeindex}{%
   \ifciteindex%
     {\ifboolexpr{%
       bool {cbx:ancient}%
-      or bool {cbx:frgancient}}%
-      {}%
-      {\indexnames{labelname}}}%
-  {}%
+      or bool {cbx:frgancient}
+     }%
+       {}%
+       {\indexnames{labelname}}}%
+    {}%
 }
 %-----------------------
 \renewbibmacro*{postnote}{%
   \ifboolexpr{
     bool{bbx:inreferences}
     and
-    test{\ifentrytype{inreference}}}
-  {}
-  {\iffieldundef{postnote}%
-    {}%
-    {\setunit{\postnotedelim}%
-      \printfield{postnote}%
-      \ifbool{cbx:frgancient}%
-        {\setunit{\addspace}%
-          \usebibmacro{cite:frgname}}%
-       {}}}}
+    test{\ifentrytype{inreference}}
+  }
+    {}
+    {\iffieldundef{postnote}%
+       {}%
+       {\setunit{\postnotedelim}%
+        \printfield{postnote}%
+        \ifbool{cbx:frgancient}%
+          {\setunit{\addspace}%
+           \usebibmacro{cite:frgname}}%
+          {}}}}
 %-----------------------
 \newbibmacro*{cite:frgname}{%
   \ifnameundef{shorteditor}%
-   {\printnames[name:family]{editor}}%
-   {\printnames{shorteditor}}%
+    {\printnames[name:family]{editor}}%
+    {\printnames{shorteditor}}%
 }
 %-----------------------
 \newbibmacro*{seenote}{%
@@ -251,16 +306,19 @@
   \printtext[parens]{\bibstring{seenote}%
   \addspace%
   \ref{footref:\thefield{entrykey}}}%
-  \renewcommand{\postnotedelim}{\addspace}%
-}%
+  \renewcommand{\postnotedelim}{\addspace}}
 %-----------------------
-\newbibmacro*{cite:title}{\printfield{labeltitle}}%  
+\newbibmacro*{cite:title}{\printfield{labeltitle}}
 %-----------------------
-\newbibmacro*{cite:year}{%  
-  \iffieldundef{labelyear}%
-  {}%
-  {\printtext[citeyear]{\usebibmacro{cite:labelyear+extradate}}}%
-}
+\newbibmacro*{cite:origtitle}{%
+  \iffieldundef{origtitle}
+    {\usebibmacro{cite:title}}
+    {\printfield{origtitle}}}
+%-----------------------
+\newbibmacro*{cite:year}{%
+  \iffieldundef{labelyear}
+    {}
+    {\printtext[citeyear]{\usebibmacro{cite:labeldate+extradate}}}}
 %-----------------------
 \newbibmacro*{cite:lexikon}{%
   \printfield{booktitle}%
@@ -270,186 +328,159 @@
   \printfield[parens]{year}%
   \setunit{\addspace}%
   \iffieldundef{postnote}%
-  {\printfield{pages}}%
-  {\printfield{postnote}}%
+    {\printfield{pages}}%
+    {\printfield{postnote}}%
   \usebibmacro{inreference:title+author}%
 }
 %-----------------------
 \newbibmacro{cite:seenote}{%
-\ifboolexpr{bool{cbx:ancient}%
-  or bool{cbx:frgancient}% 
-  or bool{cbx:corpus}}%
-  {\usebibmacro{cite:shorthand}}%
-  {\ifciteseen%
-    {\usebibmacro{seenote}}%
-    {\bibhypertarget{ref:\thefield{entrykey}}%
-    {\usedriver%
-      {\DeclareNameAlias{sortname}{default}}%
-      {\thefield{entrytype}}%
-        \iffootnote{\label{footref:\thefield{entrykey}}}}%      
-}}}
+  \ifboolexpr{bool{cbx:ancient}%
+    or bool{cbx:frgancient}%
+    or bool{cbx:corpus}
+  }%
+    {\usebibmacro{cite:shorthand}}%
+    {\ifciteseen%
+       {\usebibmacro{seenote}}%
+       {\bibhypertarget{ref:\thefield{entrykey}}%
+          {\usedriver%
+             {\DeclareNameAlias{sortname}{default}}%
+             {\thefield{entrytype}}%
+           \iffootnote{\label{footref:\thefield{entrykey}}}}}}}
 %-----------------------
 \newbibmacro{cite}{%
   \ifboolexpr{
     bool{bbx:inreferences}
     and
-    test{\ifentrytype{inreference}}}
-  {\usebibmacro{cite:lexikon}}%
-  {\ifbool{cbx:seenote}%
-    {\usebibmacro{cite:seenote}}%
-    {\printtext[bibhyperref]{%
-    \iffieldundef{shorthand}%
-      {\ifnameundef{labelname}%
-       {\usebibmacro{cite:label}%
-       \setunit{\labelyeardelim}}%
-      {\printnames{labelname}%
-      \setunit{\nameyeardelim}}%
-     \usebibmacro{cite:year}}%
-    {\usebibmacro{cite:shorthand}}%
-  }}}}
+    test{\ifentrytype{inreference}}
+  }
+    {\usebibmacro{cite:lexikon}}%
+    {\ifbool{cbx:seenote}%
+       {\usebibmacro{cite:seenote}}%
+       {\printtext[bibhyperref]{%
+          \iffieldundef{shorthand}%
+            {\ifnameundef{labelname}%
+               {\usebibmacro{cite:label}%
+                \setunit{\labelyeardelim}}%
+               {\printnames{labelname}%
+                \setunit{\nameyeardelim}}%
+             \usebibmacro{cite:year}}%
+            {\usebibmacro{cite:shorthand}}}}}}
 %-----------------------
 \newbibmacro*{citeyear}{%
   \iffieldundef{shorthand}%
-  {\iffieldundef{labelyear}%
-   {\usebibmacro{cite:label}}%
-   {\usebibmacro{cite:labelyear+extradate}}}%
-  {\usebibmacro{cite}}}
+    {\iffieldundef{labelyear}%
+       {\usebibmacro{cite:label}}%
+       {\usebibmacro{cite:labeldate+extradate}}}%
+    {\usebibmacro{cite}}}
 %-----------------------
 \newbibmacro*{textcite}{%
   \ifnameundef{labelname}%
-  {\iffieldundef{shorthand}%
-   {\usebibmacro{cite:label}%
-  \setunit{%
-  \global\booltrue{cbx:yearinparens}%
-  \nonameyeardelim\bibopenparen}%
-  \ifnumequal{\value{citecount}}{1}%
-  {\usebibmacro{prenote}}%
-  {}%
-  \usebibmacro{cite:labelyear+extradate}}%
-   {\usebibmacro{cite}}}%
-  {\printnames{labelname}%
-   \setunit{%
-   \global\booltrue{cbx:yearinparens}%
-   \nameyeardelim\bibopenparen}%
-   \usebibmacro{citeyear}}}
+    {\iffieldundef{shorthand}%
+       {\usebibmacro{cite:label}%
+        \setunit{%
+          \global\booltrue{cbx:yearinparens}%
+          \nonameyeardelim\bibopenparen}%
+        \ifnumequal{\value{citecount}}{1}%
+          {\usebibmacro{prenote}}%
+          {}%
+        \usebibmacro{cite:labeldate+extradate}}%
+       {\usebibmacro{cite}}}%
+    {\printnames{labelname}%
+     \setunit{%
+       \global\booltrue{cbx:yearinparens}%
+       \nameyeardelim\bibopenparen}%
+     \usebibmacro{citeyear}}}
 %-----------------------
 \newbibmacro*{cite:shorthand}{%
   \ifbool{cbx:seenote}%
-  {\printtext{\printfield{shorthand}}}%
-  {\printtext[bibhyperref]{\printfield{shorthand}%
-  \ifbool{cbx:uniqueme}
-  {\setunit*{\addspace}%
-    \usebibmacro*{uniqueshorthand}}%
-    {}%
-}}}
+    {\printtext{\printfield{shorthand}}}%
+    {\printtext[bibhyperref]{%
+       \printfield{shorthand}%
+       \ifbool{cbx:uniqueme}
+         {\setunit*{\addspace}%
+          \usebibmacro*{uniqueshorthand}}%
+         {}}}}
 %-----------------------
 \newbibmacro*{cite:label}{%
   \iffieldundef{label}%
-  {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}%
-  {\printtext[bibhyperref]{\printfield{label}}}}
+    {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}%
+    {\printtext[bibhyperref]{\printfield{label}}}}
 %-----------------------
-\newbibmacro*{cite:labelyear+extradate}{%
+\newbibmacro*{cite:labeldate+extradate}{%
   \iffieldundef{labelyear}
     {}
-    {\printtext[bibhyperref]{%
-     \ifdefstring\blx@dateformat@labeldate{edtf}
-       {}
-       {\datecircaprint}%
-     \dateeraprintpre{labelyear}%
-     \iffieldnums{labelyear}%
-       {\mkyearzeros{\thefield{labelyear}}}%
-       {\printfield{labelyear}}%
-     \printfield{extradate}%
-     \iffieldsequal{labeldateera}{labelenddateera}{}%
-       {\dateeraprint{labelyear}}%
-     \dateuncertainprint%
-     \ifdefstring\blx@dateformat@labeldate{edtf}%
-       {\datecircaprintedtf}%
-       {}%
-     \iffieldundef{labelendyear}%
-       {}
-       {\iffieldsequal{labelyear}{labelendyear}{}%
-        {\ifdefstring\blx@dateformat@labeldate{edtf}%
-          {\slash}% strict EDTF
-          {\bibdaterangesep%
-           \enddatecircaprint}%
-         \dateeraprintpre{labelendyear}%
-         \mkyearzeros{\thefield{labelendyear}}%
-         \enddateuncertainprint%
-         \ifdefstring\blx@dateformat@labeldate{edtf}%
-           {\enddatecircaprintedtf}%
-           {}%
-         \dateeraprint{labelendyear}}}}}}
+    {\printtext[bibhyperref]{\printlabeldateextra}}}
 %-----------------------
 \newbibmacro*{textcite:postnote}{%
   \iffieldundef{postnote}%
-  {\ifbool{cbx:yearinparens}%
-   {\bibcloseparen}%
-   {}}%
-  {\ifbool{cbx:yearinparens}%
-   {\setunit{\postnotedelim}}%
-   {\setunit{\extpostnotedelim\bibopenparen}}%
-   \printfield{postnote}%
-  \ifbool{cbx:frgancient}%
-   {\setunit{\addthinspace}%
-  \usebibmacro{cite:frgname}%
-  \bibcloseparen}%
-  \bibcloseparen}}
-%-----------------------
-\DeclareCiteCommand{\cite}%  
+    {\ifbool{cbx:yearinparens}%
+      {\bibcloseparen}%
+      {}}%
+    {\ifbool{cbx:yearinparens}%
+      {\setunit{\postnotedelim}}%
+      {\setunit{\extpostnotedelim\bibopenparen}}%
+     \printfield{postnote}%
+     \ifbool{cbx:frgancient}%
+       {\setunit{\addthinspace}%
+        \usebibmacro{cite:frgname}%
+        \bibcloseparen}%
+     \bibcloseparen}}
+%-----------------------
+\DeclareCiteCommand{\cite}%
   {\usebibmacro{prenote}}%
   {\usebibmacro{citeindex}%
-  \usebibmacro{cite}}%
+   \usebibmacro{cite}}%
   {\multicitedelim}%
   {\usebibmacro{postnote}}
  %-----------------------
-  \DeclareCiteCommand{\footcite}[\mkbibfootnote]
+\DeclareCiteCommand{\footcite}[\mkbibfootnote]
   {\usebibmacro{prenote}}%
   {\usebibmacro{citeindex}%
-  \usebibmacro{cite}}%
+   \usebibmacro{cite}}%
   {\multicitedelim}%
   {\usebibmacro{postnote}}
 %-----------------------
 \DeclareCiteCommand{\textcite}%
   {\boolfalse{cbx:yearinparens}%
-    \renewcommand*{\multinamedelim}{\addcomma\space}%
+   \renewcommand*{\multinamedelim}{\addcomma\space}%
    \renewcommand*{\finalnamedelim}{%
    \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
-   \addspace\bibstring{and}\space}%
-  }%
+   \addspace\bibstring{and}\space}}%
   {\usebibmacro{citeindex}%
    \iffirstcitekey%
-   {\setcounter{textcitetotal}{1}}%
-   {\stepcounter{textcitetotal}%
-  \textcitedelim%
-	\usebibmacro{prenote}}%
-   \ifbool{cbx:seenote}{\usebibmacro{cite:seenote}}%
-   {\usebibmacro{textcite}}}%
+     {\setcounter{textcitetotal}{1}}%
+     {\stepcounter{textcitetotal}%
+   \textcitedelim%
+   \usebibmacro{prenote}}%
+   \ifbool{cbx:seenote}
+     {\usebibmacro{cite:seenote}}%
+     {\usebibmacro{textcite}}}%
   {\ifbool{cbx:yearinparens}%
-   {\bibcloseparen\global\boolfalse{cbx:yearinparens}}%
-   {}}%
-  {\ifbool{cbx:seenote}{\usebibmacro{postnote}}%
-  {\usebibmacro{textcite:postnote}}}
-%----------------------- 
+     {\bibcloseparen\global\boolfalse{cbx:yearinparens}}%
+     {}}%
+  {\ifbool{cbx:seenote}
+     {\usebibmacro{postnote}}%
+     {\usebibmacro{textcite:postnote}}}
+%-----------------------
 \DeclareCiteCommand{\parencite}[\mkbibparens]%
   {\usebibmacro{prenote}}%
   {\usebibmacro{citeindex}%
-  \usebibmacro{cite}}%
+   \usebibmacro{cite}}%
   {\multicitedelim}%
   {\usebibmacro{postnote}}
-%-----------------------  
+%-----------------------
 \DeclareCiteCommand{\smartcite}[\iffootnote\textnormal\mkbibfootnote]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}
   {\multicitedelim}
- {\ifboolexpr{
+  {\ifboolexpr{
     bool{bbx:inreferences}
     and
     test{\ifentrytype{inreference}}}
-  {}
-	{\usebibmacro{postnote}}}%
-%-----------------------        
+     {}
+     {\usebibmacro{postnote}}}%
+%-----------------------
   \DeclareCiteCommand{\fullcite}
   {\usebibmacro{prenote}}
   {\usedriver
@@ -457,7 +488,7 @@
      {\thefield{entrytype}}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
-%-----------------------      
+%-----------------------
 \DeclareCiteCommand{\footfullcite}[\mkbibfootnote]
   {\usebibmacro{prenote}}
   {\usedriver
@@ -465,41 +496,41 @@
      {\thefield{entrytype}}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
-%-----------------------      
+%-----------------------
 \DeclareMultiCiteCommand{\cites}{\cite}{\multicitedelim}
 \DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\multicitedelim}
 \DeclareMultiCiteCommand{\textcites}{\textcite}{}
 \DeclareMultiCiteCommand{\smartcites}[\iffootnote\textnormal\mkbibfootnote]{\smartcite}{\multicitedelim}
-%----------------------- 
+%-----------------------
 \DeclareCiteCommand{\citeauthor}
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
    \renewcommand*{\multinamedelim}{\addcomma\space}%
    \renewcommand*{\finalnamedelim}{%
-   \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
-   \addspace\bibstring{and}\space}%
+     \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
+     \addspace\bibstring{and}\space}%
    \usebibmacro{prenote}}%
   {\usebibmacro{citeindex}%
    \ifboolexpr{
     bool{bbx:inreferences}
     and
     test{\ifentrytype{inreference}}}
-  {\printtext}%
-  {\printtext[bibhyperref]}%
-  {\printnames[citeauthor]{labelname}}}%
+     {\printtext}%
+     {\printtext[bibhyperref]}%
+   {\printnames[citeauthor]{labelname}}}%
   {\multicitedelim}%
-  {\usebibmacro{postnote}}	
-%----------------------- 	
+  {\usebibmacro{postnote}}
+%-----------------------
 \DeclareCiteCommand{\citetranslator}
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
    \renewcommand*{\multinamedelim}{\addcomma\space}%
    \renewcommand*{\finalnamedelim}{%
      \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
-      \addspace\bibstring{and}\space}%
+     \addspace\bibstring{and}\space}%
    \usebibmacro{prenote}}%
   {\usebibmacro{citeindex}%
-   \ifboolexpr{% 
+   \ifboolexpr{%
      test {\ifentrytype{incollection}}
      or
      test {\ifentrytype{inbook}}
@@ -517,8 +548,8 @@
           {\printnames[citeauthor]{translator}}
           {\printtext[bibhyperref]{\printnames[citeauthor]{translator}}}}}}
   {\multicitedelim}%
-  {\usebibmacro{postnote}}	
-%----------------------- 	
+  {\usebibmacro{postnote}}
+%-----------------------
 \DeclareCiteCommand*{\citetranslator}
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
@@ -535,20 +566,20 @@
      test{\ifentrytype{inreference}}}
     {\printtext}%
     {\printtext[bibhyperref]}%
-   {\ifthenelse{% 
-      \ifentrytype{incollection}%
-      \OR%
-      \ifentrytype{inbook}%
-    }%
-     {\ifnameundef{intranslator}%
-		   {\bibstring{owntranslation}}%
-		   {\usebibmacro{byintranslator+others}}}%
-     {\ifnameundef{translator}%
-		   {\bibstring{owntranslation}}%
-		   {\usebibmacro{bytranslator+others}}}}}%
+      {\ifthenelse{%
+         \ifentrytype{incollection}%
+         \OR%
+         \ifentrytype{inbook}%
+       }%
+         {\ifnameundef{intranslator}%
+            {\bibstring{owntranslation}}%
+            {\usebibmacro{byintranslator+others}}}%
+         {\ifnameundef{translator}%
+           {\bibstring{owntranslation}}%
+           {\usebibmacro{bytranslator+others}}}}}%
   {\multicitedelim}%
   {\usebibmacro{postnote}}
-%----------------------- 	
+%-----------------------
 \DeclareCiteCommand*{\citeauthor}
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
@@ -558,7 +589,7 @@
   {\multicitedelim}
   {\usebibmacro{postnote}}
 %-----------------------
-\DeclareCiteCommand{\citetitle} %
+\DeclareCiteCommand{\citetitle}
   {\boolfalse{citetracker}%
   \boolfalse{pagetracker}%
   \usebibmacro{prenote}}%
@@ -566,36 +597,35 @@
     bool{bbx:inreferences}
     and
     test{\ifentrytype{inreference}}}
-   {\printtext}%
-   {\printtext[bibhyperref]}{%
-   \ifbool{cbx:ancient}{\printtext[emph]{\usebibmacro{cite:title}}}%
-  {\printtext[emph]{\usebibmacro{cite:title}}% 
-  \iffieldundef{year}
-	  {}
-		{\setunit{\addspace}%
-      \printtext[parens]{%
-			\printfield{year}%
-      \iffieldundef{origyear}
-			  {}%
-        {\addspace\printfield[parens]{origyear}}}%
-   }}}}%
+     {\printtext}%
+     {\printtext[bibhyperref]}{%
+        \ifbool{cbx:ancient}
+          {\printtext[emph]{\usebibmacro{cite:origtitle}}}%
+          {\printtext[emph]{\usebibmacro{cite:title}}%
+           \iffieldundef{year}
+             {}
+             {\setunit{\addspace}%
+              \printtext[parens]{%
+                \printfield{year}%
+                \iffieldundef{origyear}
+                  {}%
+                  {\addspace\printfield[parens]{origyear}}}}}}}%
   {\multicitedelim}%
   {\usebibmacro{postnote}}%
 
-\DeclareCiteCommand{\citetitle*} %
+\DeclareCiteCommand*{\citetitle}
   {\boolfalse{citetracker}%
-  \boolfalse{pagetracker}%
-  \usebibmacro{prenote}}%
-  {\ifboolexpr{
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}%
+  {\ifboolexpr{%
     bool{bbx:inreferences}
     and
     test{\ifentrytype{inreference}}}
-   {\printtext}%
-   {\printtext[bibhyperref]}{%
-   \ifbool{cbx:ancient}{\printtext[emph]{\usebibmacro{cite:title}}}%
-  {\printtext[emph]{\usebibmacro{cite:title}}}}}%
+     {\printtext}%
+     {\printtext[bibhyperref]}
+          {\printtext[emph]{\usebibmacro{cite:title}}}}%
   {\multicitedelim}%
   {\usebibmacro{postnote}}%
-  
+
 \endinput
 %% End of file `archaeologie.cbx'.
\ 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 413971f3d06..d9a97a8ed2c 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/english-archaeologie.lbx
@@ -1,8 +1,8 @@
 % archaeologie --%
-%            biblatex for archaeologists, 
+%            biblatex for archaeologists,
 %				historians and philologists
 % Copyright (c) 2017 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
 % of this license or (at your option) any later version.
@@ -47,6 +47,125 @@
   fromrussian      = {{from\addspace Russian}{from\addspace Russian}},
   fromspanish      = {{from\addspace Spanish}{from\addspace Spanish}},
   fromswedish      = {{from\addspace Swedish}{from\addspace Swedish}},
-	owntranslation   = {{own\addspace trans\adddot}{own\addspace translation}},
+  owntranslation   = {{own\addspace trans\adddot}{own\addspace translation}},
 }
+
+\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}}
+                  {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+                {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+              {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+            \enddateuncertainprint
+            \dateeraprint{#2}}}}}}
+
+\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}}}}}}
+
+\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}}}}}}
+
+\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}}}}}}
+
 \endinput
\ No newline at end of file