archaeologie (30may17)

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

2 files changed, 58 insertions, 46 deletions

diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
index cd9eadb3233..99b79ef0b09 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
@@ -10,8 +10,8 @@
 % http://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
-\def\arch@date{2017-02-27}
-\def\arch@version{2.3}
+\def\arch@date{2017-05-29}
+\def\arch@version{2.31}
 \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)}
@@ -188,7 +188,7 @@
 \DeclareFieldFormat{edition}{#1}
 \DeclareFieldFormat{volumes}{#1}
 \DeclareFieldFormat{volume}{#1}
-\DeclareFieldFormat[article]{date}{\iffieldundef{number}{#1}{#1\setunit{\yearnumdelim}\printfield{number}}}
+\DeclareFieldFormat[article]{date}{\iffieldundef{number}{#1}{\iffieldundef{volume}{#1\yearnumdelim\printfield{number}}{#1}}}
 \DeclareFieldFormat[inreference]{number}{\mkbibbrackets{#1}}
 \DeclareFieldFormat{parens}{\mkbibparens{#1}}
 \DeclareFieldFormat{brackets}{\mkbibbrackets{#1}}
@@ -325,9 +325,13 @@
     }%
 }
 %----------------------- 
+\DeclareNameAlias{name:initials}{default}
 \DeclareNameAlias{author}{name:initials}
 \DeclareNameAlias{editor}{author}
+\DeclareNameAlias{byeditor}{author}
 \DeclareNameAlias{translator}{author}
+\DeclareNameAlias{bytranslator}{default}
+\DeclareNameAlias{bycommentator}{author}
 %-----------------------
 \DeclareListFormat{location}{%
   #1\ifthenelse{\value{listcount}<\value{liststop}}%
@@ -386,7 +390,7 @@
   {}
   {\usebibmacro{byeditor+othersstrg}%
     \setunit{\addspace}%
-    \printnames[byeditor]{ineditor}%
+    \printnames[author]{ineditor}%
     \clearname{ineditor}%
     \newunit}%
   \usebibmacro{byintranslator+others}}
@@ -396,7 +400,7 @@
   {}
   {\usebibmacro{bytranslator+othersstrg}%
     \setunit{\addspace}%
-    \printnames[bytranslator]{intranslator}%
+    \printnames[author]{intranslator}%
     \clearname{intranslator}%
     \newunit}%
    \usebibmacro{withinothers}}
@@ -406,35 +410,35 @@
   {}
   {\bibstring{withcommentator}%
    \setunit{\addspace}%
-   \printnames[withcommentator]{incommentator}}}
+   \printnames[author]{incommentator}}}
 %-----------------------
 \newbibmacro*{withinannotator}{%
   \ifnameundef{inannotator}
   {}
   {\bibstring{withannotator}%
     \setunit{\addspace}%
-    \printnames[withannotator]{inannotator}}}
+    \printnames[author]{inannotator}}}
 %-----------------------
 \newbibmacro*{withinintroduction}{%
   \ifnameundef{inintroduction}
   {}
   {\bibstring{withintroduction}%
     \setunit{\addspace}%
-    \printnames[withintroduction]{inintroduction}}}
+    \printnames[author]{inintroduction}}}
 %-----------------------
 \newbibmacro*{withinforeword}{%
   \ifnameundef{inforeword}
   {}
   {\bibstring{withforeword}%
     \setunit{\addspace}%
-    \printnames[withforeword]{inforeword}}}
+    \printnames[author]{inforeword}}}
 %-----------------------
 \newbibmacro*{withinafterword}{%
   \ifnameundef{inafterword}
   {}
   {\bibstring{withafterword}%
     \setunit{\addspace}%
-    \printnames[withafterword]{inafterword}}}
+    \printnames[author]{inafterword}}}
 %-----------------------
 \newbibmacro*{withinothers}{%
  \usebibmacro{withincommentator}%
@@ -612,13 +616,14 @@
 \newbibmacro{journal+number+year}{%
  \usebibmacro{journal}%
  \setunit{\jourvoldelim}%
- \printfield{volume}%
- \iffieldundef{number}
+ \iffieldundef{volume}%
  {}
+ {\printfield{volume}%
+ \iffieldundef{number}%
+ {}%
  {\setunit{\volnumdelim}%
- \printfield{number}%
- }% 
- \newunit%
+ \printfield{number}}%
+ \newunit}%
 \usebibmacro{pubstate+year}}
 %-----------------------
 \newbibmacro{pubstate+year}{%
@@ -655,17 +660,19 @@
  \setunit{\addspace}%
  \printnames{savedtranslator}}}}
 %----------------------- 
-\newbibmacro*{inreference:title+author}{%
-\iffieldundef{title}%
- {}%
- {\setunit{\addspace}%
- \bibstring{subvoce}%
- \setunit{\addspace}%
- \printfield{title}%
- \setunit*{\addspace}%
- \printfield{number}}%
- \setunit{\addspace}%
- \printtext[parens]{\printnames[name:initials]{labelname}}} 
+\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}%
@@ -675,14 +682,12 @@
   }%
  {\iffieldundef{maintitle}%
  {}%
- {\usebibmacro{maintitle}%
- \ifbool{cbx:ancient}%
- {\usebibmacro{title}%
-   \iffieldundef{volume}%
-   {\newunit\newblock}%
-   {}}%
- {\iffieldundef{volume}%
- {\iffieldundef{volumes}%
+ {\usebibmacro{maintitle}}%
+ \iffieldundef{title}%
+ {}%
+ {\usebibmacro{title}}%
+ \iffieldundef{volume}%
+   {\iffieldundef{volumes}%
    {}%
    {\printfield{volumes}%
      \setunit*{\addspace}%
@@ -690,10 +695,11 @@
      \setunit{\addspace}}}%
   {\setunit{\addspace}%
     \printfield{volume}%
-    \setunit*{\adddot\addspace}}}}}%
-  \iffieldundef{volumes}%
-   {\usebibmacro{title}}%
-   {}%
+    \setunit*{\adddot\addspace}}%
+  \ifbool{cbx:ancient}%
+    {\usebibmacro{translation}}%
+ 	 {}%
+	}%
  \newunit}
 %-----------------------
 \renewbibmacro{event+venue+date}{%
@@ -704,7 +710,7 @@
  \setunit*{\addspace}%
  \printeventdate%
  \newunit%
- }
+}
 %----------------------- 
 \renewbibmacro*{title}{%
  \ifboolexpr{%
@@ -957,10 +963,12 @@
  \newblock%
  \usebibmacro{maintitle+title+volumes}%
  \newunit\newblock% 
- \usebibmacro{translation}%
  \ifbool{bbx:yearseries}%
  {}%
  {\newunit\usebibmacro{series+number}}%
+ \ifbool{cbx:ancient}%
+   {}%
+	 {\usebibmacro{translation}}%
  \setunit{\addspace}%
  \newblock%
  \usebibmacro{location+edition+year}%
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
index b6728f3d18c..253141e9368 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
@@ -271,7 +271,7 @@
   \iffieldundef{postnote}%
   {\printfield{pages}}%
   {\printfield{postnote}}%
-\usebibmacro{inreference:title+author}%
+  \usebibmacro{inreference:title+author}%
 }
 %-----------------------
 \newbibmacro{cite:seenote}{%
@@ -574,11 +574,15 @@
   {\printtext[bibhyperref]}{%
    \ifbool{cbx:ancient}{\printtext[emph]{\usebibmacro{cite:title}}}%
   {\printtext[emph]{\usebibmacro{cite:title}}% 
-  \setunit{\addspace}%
-  \printtext[parens]{\printfield{year}%
-  \iffieldundef{origyear}{}%
-  {\addspace\printfield[parens]{origyear}}}%
-   }}}%
+  \iffieldundef{year}
+	  {}
+		{\setunit{\addspace}%
+      \printtext[parens]{%
+			\printfield{year}%
+      \iffieldundef{origyear}
+			  {}%
+        {\addspace\printfield[parens]{origyear}}}%
+   }}}}%
   {\multicitedelim}%
   {\usebibmacro{postnote}}%