1 files changed, 114 insertions, 163 deletions
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
index d75557fb57f..cd9eadb3233 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
@@ -1,7 +1,7 @@
 % archaeologie --%
 % biblatex for archaeologists, 
 % historians and philologists
-% Copyright (c) 2016 Lukas C. Bossert | Johannes Friedl
+% 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
@@ -10,25 +10,23 @@
 % 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{2016-10-06}
-\def\arch@version{2.2b}
+\def\arch@date{2017-02-27}
+\def\arch@version{2.3}
 \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@dbxid{\arch@date\space v\arch@version\space biblatex-archaeologie  data (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]
 \RequireBibliographyStyle{standard}
 \AtBeginDocument{%
-  \RequirePackage[normalem]{ulem}
-  %\RequirePackage{csquotes}
   \urlstyle{sf}%
   \typeout{* * * archaeologie * * * 
   biblatex for archaeologists,
   historians and philologists}
 }
-
+\RequirePackage[normalem]{ulem}
+%\RequirePackage{csquotes}
 \def\archaeologieversion{\arch@version}
 \def\archaeologiedate{\arch@date}
 \ExecuteBibliographyOptions{%
@@ -45,6 +43,7 @@
   minnames=1,%
   maxitems=1,%
   maxbibnames=999,%
+  useprefix=true,%
 }
 %-----------------------
 \newbool{bbx:edby}
@@ -171,6 +170,9 @@
   \iftoggle{bbx:jstor}{}{\xout{jstor}\seperator}%
   \iftoggle{bbx:urn}{}{\xout{urn}\seperator}%
   \iftoggle{bbx:doi}{}{\xout{doi}\seperator}%
+    \iflanguage{ngerman}%
+      {weitere Informationen unter \url{http://biblatex-archaeologie.de}}
+      {further information see \url{http://biblatex-archaeologie.de}}
 }
 %-----------------------
 \DeclareFieldFormat*{title}{#1}
@@ -186,6 +188,7 @@
 \DeclareFieldFormat{edition}{#1}
 \DeclareFieldFormat{volumes}{#1}
 \DeclareFieldFormat{volume}{#1}
+\DeclareFieldFormat[article]{date}{\iffieldundef{number}{#1}{#1\setunit{\yearnumdelim}\printfield{number}}}
 \DeclareFieldFormat[inreference]{number}{\mkbibbrackets{#1}}
 \DeclareFieldFormat{parens}{\mkbibparens{#1}}
 \DeclareFieldFormat{brackets}{\mkbibbrackets{#1}}
@@ -219,15 +222,16 @@
 \DeclareFieldAlias{jstor}{eprint:jstor}
 \DeclareFieldAlias{urn}{eprint:urn}
 %-----------------------
-\DeclareRedundantLanguages{ngerman}{german,ngerman,austrian,naustrian}
+\DeclareRedundantLanguages{german}{german,ngerman,austrian,naustrian}
 \DeclareRedundantLanguages{english,american}{english,american,british,%
  canadian,australian,newzealand,USenglish,UKenglish}
-\DeclareLanguageMapping{ngerman}{archaeologie-ngerman}
+\DeclareLanguageMapping{german}{archaeologie-german}
 \DeclareLanguageMapping{english}{archaeologie-english}
 \DeclareLanguageMapping{french}{archaeologie-french}
 \DeclareLanguageMapping{italian}{archaeologie-italian}
 \DeclareLanguageMapping{spanish}{archaeologie-spanish}
 %-----------------------
+\renewcommand*{\sqspace}{\addnbthinspace}
 \renewcommand*{\subtitlepunct}{\addperiod\addspace}
 \renewcommand*{\intitlepunct}{\addcolon\addspace}
 \renewcommand*{\newunitpunct}{\addcomma\addspace}
@@ -252,7 +256,8 @@
 \renewcommand{\multinamedelim}{\addnbspace\textendash\addspace}
 \renewcommand{\finalnamedelim}{\multinamedelim}
 \renewcommand*\relateddelim{\addnbspace\textendash\addspace}
-\newcommand*{\volnumdelim}{\addslash}
+\newcommand*{\volnumdelim}{\addcomma}
+\newcommand*{\yearnumdelim}{\addslash}
 \newcommand*{\jourvoldelim}{\addnbspace}
 %-----------------------
 \DeclareBibliographyAlias{collection}{book}
@@ -331,10 +336,10 @@
 }
 %-----------------------
 \AtEveryBibitem{%
-  \iffieldequalstr{relatedtype}{translationof}
+  \iffieldequalstr{relatedtype}{translationof}%
   {\savename{translator}{\savedrelatedtranslator}%
-  \clearname{translator}}
-  {}
+  \clearname{translator}}%
+  {}%
   \ifboolexpr{bool {bbx:translation}%
   or bool {cbx:ancient}%
   or bool {cbx:frgancient}}%
@@ -377,73 +382,59 @@
 %% 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[byeditor]{ineditor}%
- \clearname{ineditor}%
- \newunit%
- }%
- \usebibmacro{byintranslator+others}%
-}
+  \ifnameundef{ineditor}
+  {}
+  {\usebibmacro{byeditor+othersstrg}%
+    \setunit{\addspace}%
+    \printnames[byeditor]{ineditor}%
+    \clearname{ineditor}%
+    \newunit}%
+  \usebibmacro{byintranslator+others}}
 %-----------------------
 \newbibmacro*{byintranslator+others}{%
- \ifnameundef{intranslator}%
- {}%
- {\usebibmacro{bytranslator+othersstrg}%
- \setunit{\addspace}%
- \printnames[bytranslator]{intranslator}%
- \clearname{intranslator}%
- \newunit%
- }%
- \usebibmacro{withinothers}%
-}
+  \ifnameundef{intranslator}
+  {}
+  {\usebibmacro{bytranslator+othersstrg}%
+    \setunit{\addspace}%
+    \printnames[bytranslator]{intranslator}%
+    \clearname{intranslator}%
+    \newunit}%
+   \usebibmacro{withinothers}}
 %-----------------------
 \newbibmacro*{withincommentator}{%
- \ifnameundef{incommentator}%
- {}%
- {\bibstring{withcommentator}%
- \setunit{\addspace}%
- \printnames[withcommentator]{incommentator}%
- }%
-}
+  \ifnameundef{incommentator}
+  {}
+  {\bibstring{withcommentator}%
+   \setunit{\addspace}%
+   \printnames[withcommentator]{incommentator}}}
 %-----------------------
 \newbibmacro*{withinannotator}{%
- \ifnameundef{inannotator}%
- {}%
- {\bibstring{withannotator}%
- \setunit{\addspace}%
- \printnames[withannotator]{inannotator}%
- }%
- }
+  \ifnameundef{inannotator}
+  {}
+  {\bibstring{withannotator}%
+    \setunit{\addspace}%
+    \printnames[withannotator]{inannotator}}}
 %-----------------------
 \newbibmacro*{withinintroduction}{%
- \ifnameundef{inintroduction}
- {}%
- {\bibstring{withintroduction}%
- \setunit{\addspace}%
- \printnames[withintroduction]{inintroduction}%
- }%
-}
+  \ifnameundef{inintroduction}
+  {}
+  {\bibstring{withintroduction}%
+    \setunit{\addspace}%
+    \printnames[withintroduction]{inintroduction}}}
 %-----------------------
 \newbibmacro*{withinforeword}{%
- \ifnameundef{inforeword}%
- {}%
- {\bibstring{withforeword}%
- \setunit{\addspace}%
- \printnames[withforeword]{inforeword}%
- }%
-}
+  \ifnameundef{inforeword}
+  {}
+  {\bibstring{withforeword}%
+    \setunit{\addspace}%
+    \printnames[withforeword]{inforeword}}}
 %-----------------------
 \newbibmacro*{withinafterword}{%
- \ifnameundef{inafterword}
- {}
- {\bibstring{withafterword}%
- \setunit{\addspace}%
- \printnames[withafterword]{inafterword}%
- }%
-}
+  \ifnameundef{inafterword}
+  {}
+  {\bibstring{withafterword}%
+    \setunit{\addspace}%
+    \printnames[withafterword]{inafterword}}}
 %-----------------------
 \newbibmacro*{withinothers}{%
  \usebibmacro{withincommentator}%
@@ -523,7 +514,7 @@
  \clearlist{pageref}%
  \setunit{\addcomma\newline\nobreak}%
  }%
- {}%
+ {\newunit}%
 }
  %----------------------- 
 \renewbibmacro*{eprint}{%
@@ -534,35 +525,30 @@
 }
 %----------------------- 
 \newbibmacro*{zenon}{%
- \iffieldundef{zenon}%
- {}%
- {\usebibmacro{bbx:parunit}%
- \printfield{zenon}%
- } 
-}
+  \iffieldundef{zenon}
+  {}%
+  {\usebibmacro{bbx:parunit}%
+   \printfield{zenon}}}
 %----------------------- 
 \newbibmacro*{jstor}{%
- \iffieldundef{jstor}%
- {}%
- {\usebibmacro{bbx:parunit}%
- \printfield{jstor}%
- }
-}
+  \iffieldundef{jstor}
+  {}
+  {\usebibmacro{bbx:parunit}%
+    \printfield{jstor}}}
 %----------------------- 
 \newbibmacro*{urn}{%
- \iffieldundef{urn}
- {} 
- {\usebibmacro{bbx:parunit}%
- \printfield{urn}%
- }
-}
+  \iffieldundef{urn}
+  {} 
+  {\usebibmacro{bbx:parunit}%
+    \printfield{urn}}}
 %-----------------------
 \renewbibmacro*{url+urldate}{%
- \usebibmacro{bbx:parunit}%
- \iffieldundef{url}{}{\printfield{url}%
- \setunit*{\addspace}%
- \printtext{\printurldate}%
-}}
+  \usebibmacro{bbx:parunit}%
+  \iffieldundef{url}
+    {}
+    {\printfield{url}%
+  \setunit*{\addspace}%
+  \printtext{\printurldate}}}
 %----------------------- 
 \renewbibmacro*{doi+eprint+url}{%
  \usebibmacro{bbx:parunit}%
@@ -575,24 +561,15 @@
 }
 %-----------------------
 \renewbibmacro*{editor}{%
- \ifboolexpr{%
- test \ifuseeditor %
- and %
- not test {\ifnameundef{editor}}%
- }%
+  \ifboolexpr{%
+    test \ifuseeditor %
+    and %
+    not test {\ifnameundef{editor}}}%
  {\printnames{editor}%
- \setunit{\addspace}%
- \printtext[parens]{\bibstring{editor}}%
- \clearname{editor}%
- }%
- {}%
-}
-%----------------------- 
-\newbibmacro{savestuff}{%
- \savename{editor}{\bbx@lasteditor}%
- \savefield{namehash}{\bbx@lasthash}%
- \savefield{booktitle}{\bbx@lastbooktitle}%
-}
+   \setunit{\addspace}%
+   \printtext[parens]{\bibstring{editor}}%
+   \clearname{editor}}%
+  {}}
 %----------------------- 
 \DeclareLabeldate{%
   \field{date}
@@ -619,9 +596,7 @@
  \printfield{number}%
  \ifbool{bbx:yearseries}%
  {\newunit}%
- {\setunit{\addspace}}%
- }%
-}
+ {\setunit{\addspace}}}}
 %-----------------------
 \renewbibmacro*{journal}{%
  \ifboolexpr{test {\iffieldundef{shortjournal}}%
@@ -632,19 +607,19 @@
  \printfield[titlecase]{journalsubtitle}%
  }%
  }%
- {\printfield{shortjournal}}%
-}
+ {\printfield{shortjournal}}}
 %-----------------------
 \newbibmacro{journal+number+year}{%
  \usebibmacro{journal}%
  \setunit{\jourvoldelim}%
  \printfield{volume}%
+ \iffieldundef{number}
+ {}
  {\setunit{\volnumdelim}%
  \printfield{number}%
  }% 
  \newunit%
-\usebibmacro{pubstate+year}%
-}
+\usebibmacro{pubstate+year}}
 %-----------------------
 \newbibmacro{pubstate+year}{%
  \iffieldundef{pubstate}%
@@ -658,18 +633,15 @@
 \newbibmacro{translation}{%
  \printfield{origtitle}%
  \setunit{\addcomma\space}%
- \usebibmacro{byeditor+others}%
-}
+ \usebibmacro{byeditor+others}}
 %----------------------- 
 \newbibmacro{intranslation}{%
  \printfield{origtitle}%
  \setunit{\addcomma\space}%
- \usebibmacro{byineditor+others}%
-} 
+ \usebibmacro{byineditor+others}} 
 %----------------------- 
 \newbibmacro*{related:reviewof}[1]{%
- \usebibmacro*{related:default}{#1}%
-}
+  \usebibmacro*{related:default}{#1}}
 %-----------------------
 \newbibmacro*{related:translationof}[1]{%
  \entrydata*{#1}{%
@@ -681,10 +653,7 @@
  {\newunit
  \bibstring{bytranslator}%keine Sprache ausgegeben? 
  \setunit{\addspace}%
- \printnames{savedtranslator}%
- }%
- }%
-}
+ \printnames{savedtranslator}}}}
 %----------------------- 
 \newbibmacro*{inreference:title+author}{%
 \iffieldundef{title}%
@@ -696,8 +665,7 @@
  \setunit*{\addspace}%
  \printfield{number}}%
  \setunit{\addspace}%
- \printtext[parens]{\printnames[name:initials]{labelname}}%
-} 
+ \printtext[parens]{\printnames[name:initials]{labelname}}} 
 %----------------------- 
 \newbibmacro*{maintitle+title+volumes}{% 
   \iffieldsequal{maintitle}{title}%
@@ -710,31 +678,23 @@
  {\usebibmacro{maintitle}%
  \ifbool{cbx:ancient}%
  {\usebibmacro{title}%
- \iffieldundef{volume}%
- {\newunit\newblock}%
- {}%
- }%
+   \iffieldundef{volume}%
+   {\newunit\newblock}%
+   {}}%
  {\iffieldundef{volume}%
  {\iffieldundef{volumes}%
- {}%
- {\printfield{volumes}%
- \setunit*{\addspace}%
- \bibstring{volumes}%
- \setunit{\addspace}%
- }%
- }%
- {\setunit{\addspace}%
- \printfield{volume}%
- \setunit*{\adddot\addspace}%
- }%
- }%
- }%
- }%
- \iffieldundef{volumes}%
- {\usebibmacro{title}}%
- {}%
- \newunit%
-}
+   {}%
+   {\printfield{volumes}%
+     \setunit*{\addspace}%
+     \bibstring{volumes}%
+     \setunit{\addspace}}}%
+  {\setunit{\addspace}%
+    \printfield{volume}%
+    \setunit*{\adddot\addspace}}}}}%
+  \iffieldundef{volumes}%
+   {\usebibmacro{title}}%
+   {}%
+ \newunit}
 %-----------------------
 \renewbibmacro{event+venue+date}{%
  \setunit{\adddot\addspace}% 
@@ -1017,9 +977,8 @@
  \iftoggle{bbx:related}%
  {\usebibmacro{related:init}%
  \usebibmacro{related}%
- }
+ }%
  {}%
- \usebibmacro{savestuff}%
  \usebibmacro{finentry}%
 }
 %-----------------------
@@ -1044,7 +1003,6 @@
  \usebibmacro{related}%
  }%
  {}%
- \usebibmacro{savestuff}%
  \usebibmacro{finentry}%
 }
 %-----------------------
@@ -1074,12 +1032,10 @@
  \usebibmacro{doi+eprint+url}%
  \setunit{\addperiod\addspace}%
  \usebibmacro{signatur}%
- \usebibmacro{savestuff}%
  \newunit\newblock%
  \iftoggle{bbx:related}%
  {\usebibmacro{related:init}%
- \usebibmacro{related}%
- }%
+   \usebibmacro{related}}%
  {}%
  \usebibmacro{finentry}%
 }
@@ -1122,7 +1078,6 @@
  \usebibmacro{related}%
  }%
  {}%
- \usebibmacro{savestuff}%
  \usebibmacro{finentry}%
 }
 %-----------------------
@@ -1152,7 +1107,6 @@
  \usebibmacro{related}%
  }%
  {}%
- \usebibmacro{savestuff}%
  \usebibmacro{finentry}%
 }
 %-----------------------
@@ -1195,7 +1149,6 @@
  \usebibmacro{related}%
  }%
  {}%
- \usebibmacro{savestuff}%
  \usebibmacro{finentry}%
 }
 %-----------------------
@@ -1215,7 +1168,6 @@
  \setunit{\addperiod\addspace}%
  \usebibmacro{signatur}%
  \newunit\newblock%
- \usebibmacro{savestuff}%
  \usebibmacro{finentry}%
 }
 %-----------------------
@@ -1239,7 +1191,6 @@
  \usebibmacro{doi+eprint+url}%
  \usebibmacro{signatur}%
  \newunit\newblock%
- \usebibmacro{savestuff}%
  \usebibmacro{finentry}%
 }
 %-----------------------