archaeologie (25sep18)

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

1 files changed, 64 insertions, 133 deletions

diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
index 9e86e96b98c..70055c3ca78 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
@@ -1,33 +1,30 @@
-% archaeologie --%
-% biblatex for archaeologists,
-% historians and philologists
-% 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
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% 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/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)}
-
-\ProvidesFile{archaeologie.bbx}[\arch@bbxid]
+%%
+%% This is file `archaeologie.bbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% archaeologie.dtx  (with options: `bbx')
+%% ----------------------------------------------------------------
+%% biblatex-archaeologie ---
+%% Author:  Lukas C. Bossert
+%% E-mail:  info@biblatex-archaeologie.de
+%% License: Released under the LaTeX Project Public License v1.3c or later
+%% See:     http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
+%% 
+\def\archDate{2018/09/25}
+\def\archVersion{2.4.0}
+\NeedsTeXFormat{LaTeX2e}[2005/12/01]
+\ProvidesFile{archaeologie.bbx}
+    [\archVersion\space\archDate Base settings for bibliography style of biblatex-archaeologie]
+  \typeout{  * * * archaeologie * * *^^J
+    biblatex for archaeologists,^^J
+    historians and philologists}
+\def\archaeologieversion{\archVersion}
+\def\archaeologiedate{\archDate}
 \RequireBibliographyStyle{standard}
-\AtBeginDocument{%
-  \urlstyle{sf}%
-  \typeout{* * * archaeologie * * *
-  biblatex for archaeologists,
-  historians and philologists}
-}
 \RequirePackage[normalem]{ulem}
-%\RequirePackage{csquotes} % optionclash
-\def\archaeologieversion{\arch@version}
-\def\archaeologiedate{\arch@date}
 \ExecuteBibliographyOptions{%
   pagetracker=true,%
   citecounter=true,%
@@ -46,7 +43,6 @@
   useprefix=true,%
   mincrossrefs=1,%
 }
-%-----------------------
 \newbool{bbx:edby}
 \newbool{bbx:width}
 \newbool{bbx:yearseries}
@@ -75,7 +71,6 @@
 \newtoggle{bbx:arachne}
 
 \setlength{\biblabelsep}{0em}
-%-----------------------
 \DeclareBibliographyOption{lstabbrv}[true]{%
   \csuse{bool#1}{bib:lstabbrv}%
   \addbibresource{archaeologie-lstabbrv.bib}}
@@ -108,7 +103,6 @@
   lstlocations,%
   lstpublishers,%
 }
-%-----------------------
 \DeclareBibliographyOption[string]{biblabel}{%
   \ifcsundef{archblx@biblabel@#1}
     {\PackageError{biblatex-archaeologie}
@@ -116,7 +110,7 @@
        {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}}}}    
+    {\csdef{archblx@biblabel}{\csuse{archblx@biblabel@#1}}}}
 \let\archblx@biblabel@plain\@firstofone
 \def\archblx@biblabel@bold{\mkbibbold}
 \def\archblx@biblabel@brackets{\mkbibbrackets}
@@ -124,7 +118,7 @@
 
 \DeclareBibliographyOption{edby}[true]{\csuse{bool#1}{bbx:edby}}
 \DeclareBibliographyOption{initials}[false]{\PackageWarningNoLine{biblatex-archaeologie}{%
-    The option 'initials' has been deleted in version 2.3.7,\MessageBreak 
+    The option 'initials' has been deleted in version 2.3.7,\MessageBreak
   due to incompatibility reasons with 'biber'.}}
 \DeclareBibliographyOption{width}[]{%
   \csuse{booltrue}{bbx:width}%
@@ -136,9 +130,9 @@
 \DeclareNameAlias{author}{given-family}}
 \DeclareBibliographyOption{inreferences}[true]{%
   \PackageWarningNoLine{biblatex-archaeologie}{%
-    The option 'inreferences' for is deprecated,\MessageBreak 
+    The option 'inreferences' for is deprecated,\MessageBreak
     use 'inreferencesasfullcite' instead.}%
-   \booltrue{bbx:inreferencesasfullcite}}  
+   \booltrue{bbx:inreferencesasfullcite}}
 \DeclareBibliographyOption{inreferencesasfullcite}[true]{\csuse{bool#1}{bbx:inreferencesasfullcite}
   \ExecuteBibliographyOptions[inreference]{skipbib=true}%
   \ExecuteBibliographyOptions[inreference]{skiplab=true}}
@@ -151,12 +145,9 @@
   \ifstrequal{#1}{true}%
     {\AtEveryCite{\renewcommand*{\mkbibnamefamily}[1]{\textsc{##1}}}}%
     {}}
-%-----------------------
 \ExecuteBibliographyOptions{%
-  initials=true,
   autolang=hyphen,%
 }
-%-----------------------
 \DeclareEntryOption{ancient}[true]{\csuse{bool#1}{cbx:ancient}}
 \DeclareEntryOption{frgancient}[true]{%
   \ifstrequal{#1}{true}%
@@ -164,7 +155,6 @@
     {}%
   \csuse{bool#1}{cbx:frgancient}}
 \DeclareEntryOption{corpus}[true]{\csuse{bool#1}{cbx:corpus}}
-%----------
 \newcommand{\archaeologieoptions}[1][]{%
   \ifstrempty{#1}{%
     \iflanguage{ngerman}%
@@ -175,10 +165,10 @@
      {}
      {{\PackageError{biblatex-archaeologie}%
        {command 'archaeologieoptions[#1]' invalid.\MessageBreak%
-          Use   'archaeologieoptions[plain]' 
+          Use   'archaeologieoptions[plain]'
           or omit the brackets.}{}
   }}}%
-  \def\seperator{ | }%
+  \def\seperator{\space|\space}%
   \ifbool{bib:bibancient}{bibancient\seperator}{}%
   \ifbool{bib:bibcorpora}{bibcorpora\seperator}{}%
   \ifbool{bib:lstabbrv}{}{\xout{lstabbrv}\seperator}{}%
@@ -191,7 +181,6 @@
   \ifbool{bbx:counter}{counter\seperator}{}%
   \ifbool{bbx:edby}{edby\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}{}%
@@ -210,7 +199,6 @@
       {Weitere Informationen unter \url{http://biblatex-archaeologie.de}}
       {For further information see \url{http://biblatex-archaeologie.de}}
 }
-%-----------------------
 \DeclareFieldFormat*{title}{#1\isdot}
 \DeclareFieldFormat{subtitle}{#1}
 \DeclareFieldFormat{booktitle}{#1}
@@ -224,7 +212,15 @@
 \DeclareFieldFormat{edition}{#1}
 \DeclareFieldFormat{volumes}{#1}
 \DeclareFieldFormat{volume}{#1}
-\DeclareFieldFormat[book,collection,proceedings,inproceedings,inbook,incollection]{volume}{\RN{#1}}
+\DeclareFieldFormat[%
+  book,%
+  collection,%
+  proceedings,%
+  inproceedings,%
+  inbook,%
+  incollection]
+  {volume}
+  {\ifinteger{#1}{\RN{#1}}{#1}}
 \DeclareFieldFormat{part}{#1}
 \DeclareFieldFormat[article]{date}{\iffieldundef{number}{#1}{\iffieldundef{volume}{#1\yearnumdelim\printfield{number}}{#1}}}
 \DeclareFieldFormat[inreference]{number}{\mkbibbrackets{#1}}
@@ -262,12 +258,10 @@
   \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,%
  canadian,australian,newzealand,USenglish,UKenglish}
@@ -276,8 +270,6 @@
 \DeclareLanguageMapping{french}{french-archaeologie}
 \DeclareLanguageMapping{italian}{italian-archaeologie}
 \DeclareLanguageMapping{spanish}{spanish-archaeologie}
-%\DeclareLanguageMappingSuffix{-archaeologie}
-%-----------------------
 \NewBibliographyString{origtitle}
 \NewBibliographyString{firstprint}
 \NewBibliographyString{reviewof}
@@ -294,7 +286,6 @@
 \NewBibliographyString{subvoce}
 \NewBibliographyString{owntranslation}
 \NewBibliographyString{magthesis}
-%-----------------------
 \renewcommand*{\sqspace}{\addnbthinspace}
 \renewcommand*{\subtitlepunct}{\addperiod\addspace}
 \renewcommand*{\intitlepunct}{\addcolon\addspace}
@@ -328,7 +319,7 @@
 
 \newrobustcmd*{\bibdatesubseqesep}{\slash}
 \newrobustcmd*{\bibdaterangesepx}[1]{%
-  \ifboolexpr{test {\iffieldint{#1year}} and test {\iffieldint{#1endyear}}} 
+  \ifboolexpr{test {\iffieldint{#1year}} and test {\iffieldint{#1endyear}}}
     {\ifnumequal{\thefield{#1endyear}-\thefield{#1year}}{1}
        {\bibdatesubseqesep}
        {\bibdaterangesep}}
@@ -538,7 +529,6 @@
                \enddateuncertainprint
                \dateeraprint{#1endyear}}}}}%
   \endgroup}
-%-----------------------
 \DeclareBibliographyAlias{collection}{book}
 \DeclareBibliographyAlias{reference}{book}
 \DeclareBibliographyAlias{institution}{school}
@@ -546,7 +536,6 @@
 \DeclareBibliographyAlias{incollection}{inbook}
 \DeclareBibliographyAlias{manual}{book}
 \DeclareBibliographyAlias{mathesis}{thesis}
-%-----------------------
 
 \DeclareSortingTemplate{nyt}{
   \sort{
@@ -578,10 +567,8 @@
     \literal{0}
   }
 }
-%-----------------------
 \DeclareSortingTemplate{shortseries}{\sort{\field{shortseries}}}
 \DeclareSortingTemplate{shortjournal}{\sort{\field{shortjournal}}}
-%-----------------------
 \defbibcheck{shortseries}{%
   \iffieldundef{shortseries}%
     {\skipentry}%
@@ -602,7 +589,6 @@
        {\skipentry}%
        {\savefieldcs{journaltitle}{\strfield{journaltitle}}}}%
 }
-%-----------------------
 \DeclareNameAlias{name:initials}{default}
 \DeclareNameAlias{author}{name:initials}
 \DeclareNameAlias{editor}{author}
@@ -612,13 +598,11 @@
 \DeclareNameAlias{bycommentator}{author}
 \DeclareNameAlias{bookauthor}{author}
 
-%-----------------------
 \DeclareListFormat{location}{%
   #1\ifthenelse{\value{listcount}<\value{liststop}}%
   {\locationdelim}%
   {}%
 }
-%-----------------------
 \AtEveryBibitem{%
   \iffieldequalstr{relatedtype}{translationof}%
     {\savename{translator}{\savedrelatedtranslator}%
@@ -630,10 +614,8 @@
     {}%
     {\clearname{translator}%
      \clearfield{origtitle}}}
-%-----------------------
 %% 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}
     {}
@@ -643,7 +625,6 @@
      \clearname{ineditor}%
      \newunit}%
   \usebibmacro{byintranslator+others}}
-%-----------------------
 \newbibmacro*{byintranslator+others}{%
   \ifnameundef{intranslator}
     {}
@@ -653,42 +634,36 @@
      \clearname{intranslator}%
      \newunit}%
   \usebibmacro{withinothers}}
-%-----------------------
 \newbibmacro*{withincommentator}{%
   \ifnameundef{incommentator}
     {}
     {\bibstring{withcommentator}%
      \setunit{\addspace}%
      \printnames[author]{incommentator}}}
-%-----------------------
 \newbibmacro*{withinannotator}{%
   \ifnameundef{inannotator}
     {}
     {\bibstring{withannotator}%
      \setunit{\addspace}%
      \printnames[author]{inannotator}}}
-%-----------------------
 \newbibmacro*{withinintroduction}{%
   \ifnameundef{inintroduction}
     {}
     {\bibstring{withintroduction}%
      \setunit{\addspace}%
      \printnames[author]{inintroduction}}}
-%-----------------------
 \newbibmacro*{withinforeword}{%
   \ifnameundef{inforeword}
     {}
     {\bibstring{withforeword}%
      \setunit{\addspace}%
      \printnames[author]{inforeword}}}
-%-----------------------
 \newbibmacro*{withinafterword}{%
   \ifnameundef{inafterword}
     {}
     {\bibstring{withafterword}%
      \setunit{\addspace}%
      \printnames[author]{inafterword}}}
-%-----------------------
 \newbibmacro*{withinothers}{%
   \usebibmacro{withincommentator}%
   \clearname{incommentator}%
@@ -704,7 +679,6 @@
   \newunit
   \usebibmacro{withinafterword}%
   \clearname{inafterword}}
-%-----------------------
 \newbibmacro{labelwidthbib}{%
   \begingroup
     \DeclareFieldFormat{bibhyperref}{##1}%
@@ -714,14 +688,12 @@
     \printtext[bibcitelabel]{\usebibmacro{cite}}%
   \endgroup
 }
-%-----------------------
 \newbibmacro{kicklabel}{%
   \sbox\arch@labelbox{\usebibmacro{labelwidthbib}}%
   \global\togglefalse{blx@insert}%
   \ifdim1.1\wd\arch@labelbox>%
     \labwidthsameline\leavevmode\newline
   \fi}
-%-----------------------
 \newbibmacro{labelwidthfield}[1]{%
   \begingroup
     \DeclareFieldFormat{bibhyperref}{##1}%
@@ -730,14 +702,12 @@
     \defcounter{maxnames}{\blx@maxcitenames}%
     \printfield{#1}%
   \endgroup}
-%-----------------------
 \newbibmacro{kicklabelfield}[1]{%
   \sbox\arch@labelbox{\usebibmacro{labelwidthfield}{#1}}%
   \global\togglefalse{blx@insert}%
   \ifdim.9\wd\arch@labelbox>%
     \labwidthsameline\leavevmode\newline
   \fi}
-%-----------------------
 \renewbibmacro*{pageref}{%
   \iflistundef{pageref}
     {}
@@ -747,7 +717,6 @@
          {\bibstring{backrefpages}\ppspace}
          {\bibstring{backrefpage}\ppspace}%
        \printlist[pageref][-\value{listtotal}]{pageref}}}}
-%-----------------------
 \newbibmacro*{bbx:parunit}{%
   \ifbibliography{%
     \setunit{\bibpagerefpunct}\newblock
@@ -763,31 +732,26 @@
     {\printfield{eprint}}%
     {\printfield[eprint:\strfield{eprinttype}]{eprint}}%
 }
-%-----------------------
 \newbibmacro*{zenon}{%
   \iffieldundef{zenon}
     {}%
     {\usebibmacro{bbx:parunit}%
      \printfield{zenon}}}
-%-----------------------
 \newbibmacro*{jstor}{%
   \iffieldundef{jstor}
     {}
     {\usebibmacro{bbx:parunit}%
      \printfield{jstor}}}
-%-----------------------
 \newbibmacro*{arachne}{%
   \iffieldundef{arachne}
     {}
     {\usebibmacro{bbx:parunit}%
-     \printfield{arachne}}}     
-%-----------------------
+     \printfield{arachne}}}
 \newbibmacro*{urn}{%
   \iffieldundef{urn}
     {}
     {\usebibmacro{bbx:parunit}%
      \printfield{urn}}}
-%-----------------------
 \renewbibmacro*{url+urldate}{%
   \usebibmacro{bbx:parunit}%
   \iffieldundef{url}
@@ -795,7 +759,6 @@
     {\printfield{url}%
   \setunit*{\addspace}%
   \printtext{\printurldate}}}
-%-----------------------
 \renewbibmacro*{doi+eprint+url}{%
   \usebibmacro{bbx:parunit}%
   \iftoggle{bbx:doi}{\printfield{doi}}{}%
@@ -806,7 +769,6 @@
   \iftoggle{bbx:zenon}{\usebibmacro{zenon}}{}%
   \iftoggle{bbx:url}{\usebibmacro{url+urldate}}{}%
 }
-%-----------------------
 \renewbibmacro*{editor}{%
   \ifboolexpr{%
     test \ifuseeditor %
@@ -817,11 +779,9 @@
      \printtext[editortype]{\bibstring{editor}}%
      \clearname{editor}}%
     {}}
-%-----------------------
 \newbibmacro*{bookauthor}{%
   \printnames{bookauthor}%
   \newunit}
-%-----------------------
 \DeclareLabeldate{%
   \field{date}
   \field{year}
@@ -831,14 +791,12 @@
   \field{eventdate}
   \literal{nodate}
 }
-%-----------------------
 \newbibmacro*{series}{%
  \ifboolexpr{test {\iffieldundef{shortseries}} %
       or bool {bbx:noabbrv}}%
    {\printtext[seriestitle]{\printfield[titlecase]{series}}}%
    {\printfield{shortseries}}%
 }
-%-----------------------
 \renewbibmacro*{series+number}{%
   \iffieldundef{series}%
     {}%
@@ -848,7 +806,6 @@
   \ifbool{bbx:yearseries}%
     {\newunit}%
     {\setunit{\addspace}}}}
-%-----------------------
 \renewbibmacro*{journal}{%
   \ifboolexpr{test {\iffieldundef{shortjournal}}%
       or bool {bbx:noabbrv}}%
@@ -857,7 +814,6 @@
        \setunit{\subtitlepunct}%
        \printfield[titlecase]{journalsubtitle}}}%
     {\printfield{shortjournal}}}
-%-----------------------
 \newbibmacro{journal+number+year}{%
   \usebibmacro{journal}%
   \setunit{\jourvoldelim}%
@@ -870,7 +826,6 @@
         \printfield{number}}%
      \newunit}%
   \usebibmacro{pubstate+year}}
-%-----------------------
 \newbibmacro{pubstate+year}{%
   \iffieldundef{pubstate}%
     {\usebibmacro{date}}%
@@ -879,20 +834,16 @@
 \newbibmacro*{pages}{%
   \printfield{pages}%
   \isdot}
-%-----------------------
 \newbibmacro{translation}{%
   \printfield{origtitle}%
   \setunit{\addcomma\space}%
   \usebibmacro{byeditor+others}}
-%-----------------------
 \newbibmacro{intranslation}{%
   \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}%
@@ -904,7 +855,6 @@
        \bibstring{bytranslator}%keine Sprache ausgegeben?
        \setunit{\addspace}%
        \printnames{savedtranslator}}}}
-%-----------------------
 \newbibmacro*{inreference:title+author}{%
   \iffieldundef{title}%
     {}%
@@ -918,7 +868,6 @@
   \ifnameundef{author}%
     {}
     {\printtext[parens]{\printnames[name:initials]{labelname}}}}
-%-----------------------
 \newbibmacro*{maintitle+title+volumes}{%
   \iffieldsequal{maintitle}{title}%
     {\clearfield{maintitle}%
@@ -936,30 +885,28 @@
        {\usebibmacro{translation}}%
        {\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}%
-\ifbool{bbx:eventdatelanguage}
-  {\begingroup
-  \begin{fullexpotherlanguage}{\thefield{eventdatelanguage}}%
+  \ifboolexpr{
+    bool{bbx:eventdatelanguage}
+    and
+    not test{\iffieldundef{eventdatelanguage}}
+  }
+  {\begin{fullexpotherlanguage}{\thefield{eventdatelanguage}}%
   \printeventdate
-  \end{fullexpotherlanguage}%
-  \endgroup}
+  \end{fullexpotherlanguage}}
   {\printeventdate}
-  \newunit
+  \newunit%
 }
-%-----------------------
 \renewbibmacro*{title}{%
   \ifboolexpr{%
       test {\iffieldundef{title}}%
@@ -973,9 +920,8 @@
   \iffieldundef{titleaddon}
     {\newunit}
     {\setunit*{\subtitlepunct}%
-     \printfield{titleaddon}}
+     \printfield{titleaddon}}%
 }
-%-----------------------
 \renewbibmacro*{booktitle}{%
   \ifboolexpr{%
       test {\iffieldundef{booktitle}}%
@@ -989,7 +935,6 @@
        \setunit{\subtitlepunct}}%
   \printfield{booktitleaddon}%
 }
-%-----------------------
 \renewbibmacro*{maintitle}{%
   \ifboolexpr{%
       test {\iffieldundef{maintitle}}%
@@ -1003,7 +948,6 @@
        \setunit{\subtitlepunct}}%
   \printfield{maintitleaddon}%
 }
-%-----------------------
 \newbibmacro*{edition}{%
   \iffieldint{edition}%
     {\setunit*{\addspace}%
@@ -1011,7 +955,6 @@
     {\newunit
      \printfield{edition}%
      \setunit{\addspace}}}
-%-----------------------
 \newbibmacro*{location+edition+year}{%
   \ifboolexpr{%
       test {\iflistundef{location}}%
@@ -1023,9 +966,9 @@
           \printlist{location}%
           \setunit*{\addcolon\addspace}%
           \printlist{publisher}%
-          \iffieldint{edition}%
-            {\setunit{\addspace}}%
-            {\newunit}%
+          % \iffieldint{edition}%
+          %   {\setunit{\addspace}}%
+          %   {\newunit}%
           \usebibmacro{edition}%
           \usebibmacro{pubstate+year}%
           \setunit*{\addspace}%
@@ -1061,22 +1004,20 @@
           \printlist{location}%
           \setunit*{\addspace}%
           \usebibmacro{pubstate+year}}}}}
-%-----------------------
 \renewbibmacro*{institution+location+date}{%
   \printlist{location}%
   \setunit*{\addspace}%
   \printlist{institution}%
   \setunit*{\addspace}%
   \usebibmacro{pubstate+year}}
-%-----------------------
 \newbibmacro{signatur}{%
   \printfield{note}}
-%-----------------------
 \newbibmacro*{volume}{%
   \iffieldundef{volume}%
     {\iffieldundef{volumes}%
        {}%
-       {\printfield{volumes}%
+       {\setunit{\addspace}%
+        \printfield{volumes}%
         \setunit*{\addspace}%
         \bibstring{volumes}%
         \setunit{\addspace}}}%
@@ -1088,7 +1029,6 @@
        {\setunit{\addspace}%
         \printfield{part}}}%
   \newunit}
-%-----------------------
 \renewbibmacro*{maintitle+booktitle}{%
   \iffieldundef{maintitle}%
     {}%
@@ -1099,7 +1039,6 @@
   \usebibmacro{volume}%
   \newunit
 }
-%-----------------------
 \newbibmacro*{booktitle+volume+editor}{%
   \ifnameundef{editor}%
     {\usebibmacro{bookauthor}%
@@ -1116,7 +1055,6 @@
         \usebibmacro{maintitle+booktitle}%
         \newunit}}%
 }
-%-----------------------
 \newbibmacro*{reftitle}{%
   \iffieldundef{title}%
     {}%
@@ -1129,30 +1067,25 @@
          {}%
          {\printfield[brackets]{number}}}}%
 }
-%-----------------------
 \DeclareBibliographyDriver{shortjournal}{%
   \printtext[journaltitle]{%
     \printfield[titlecase]{journaltitle}%
     \setunit{\subtitlepunct}%
     \printfield[titlecase]{journalsubtitle}}%
   \blx@initunit}
-%-----------------------
 \DeclareBibliographyDriver{shortseries}{%
   \printtext[seriestitle]{%
     \printfield[titlecase]{series}}%
   \blx@initunit}
-%-----------------------
 \DeclareDataInheritance{reference}{inreference}{%
   \inherit{shorthand}{booktitle}%
   \noinherit{volumes}%
 }
-%-----------------------
 \DeclareBibliographyDriver{shorthand}{%
   \iffieldundef{title}%
     {\printfield{booktitle}}%
     {\printfield{title}}%
 }
-%-----------------------
 \DeclareBibliographyDriver{article}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
@@ -1177,7 +1110,6 @@
     {}%
   \usebibmacro{finentry}%
 }
-%-----------------------
 \DeclareBibliographyDriver{book}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
@@ -1208,7 +1140,6 @@
     {}%
   \usebibmacro{finentry}%
 }
-%-----------------------
 \DeclareBibliographyDriver{thesis}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
@@ -1230,7 +1161,6 @@
     {}%
   \usebibmacro{finentry}%
 }
-%-----------------------
 \DeclareBibliographyDriver{proceedings}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
@@ -1260,7 +1190,6 @@
     {}%
   \usebibmacro{finentry}%
 }
-%-----------------------
 \DeclareBibliographyDriver{inproceedings}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
@@ -1296,7 +1225,6 @@
     {}%
   \usebibmacro{finentry}%
 }
-%-----------------------
 \DeclareBibliographyDriver{talk}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
@@ -1323,7 +1251,6 @@
     {}%
  \usebibmacro{finentry}%
 }
-%-----------------------
 \DeclareBibliographyDriver{inbook}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
@@ -1360,7 +1287,6 @@
     {}%
   \usebibmacro{finentry}%
 }
-%-----------------------
 \DeclareBibliographyDriver{inreference}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
@@ -1379,7 +1305,6 @@
   \newunit\newblock
   \usebibmacro{finentry}%
 }
-%-----------------------
 \DeclareBibliographyDriver{review}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
@@ -1401,7 +1326,6 @@
   \newunit\newblock
   \usebibmacro{finentry}%
 }
-%-----------------------
 \defbibenvironment{bibliography}%
   {\list%
     {\usebibmacro{labelwidthbib}}%
@@ -1431,4 +1355,11 @@
 }
 \docsvlist{shortjournal,shortseries}
 
-\endinput
\ No newline at end of file
+\providecommand*{\ifdateyearsequal}[2]{%
+  \ifboolexpr{ test {\iffieldsequal{#1year}{#2year}}
+               and test {\iffieldsequal{#1dateera}{#2dateera}}}}
+
+%% 
+%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de
+%%
+%% End of file `archaeologie.bbx'.