archaeologie (25sep16)

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

8 files changed, 53 insertions, 33 deletions

diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx
index b1eeb3af3a3..c06d839de12 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx
@@ -11,8 +11,8 @@
 % and version 1.3 or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
 \ProvidesFile{archaeologie-english.lbx}%
-  [2016/09/20 v2.1  archaeologie -- 
-  biblatex for archaeologists, 
+  [2016/09/25 v2.2  archaeologie -- 
+    biblatex for archaeologists, 
   historians and philologists, lbx-Datei]
 \InheritBibliographyExtras{english}
 
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx
index 6733c8fe694..4c93173355d 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx
@@ -13,8 +13,8 @@
 
 
 \ProvidesFile{archaeologie-french.lbx}%
-  [2016/09/20 v2.1  archaeologie -- 
-  biblatex for archaeologists, 
+  [2016/09/25 v2.2  archaeologie -- 
+    biblatex for archaeologists, 
   historians and philologists, lbx-Datei]
 \InheritBibliographyExtras{french}
 \DefineBibliographyExtras{french}{\restorecommand\mkbibnamefamily}
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx
index 8f896a44346..150789bcbac 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx
@@ -13,8 +13,8 @@
 
 
 \ProvidesFile{archaeologie-italian.lbx}%
-  [2016/09/20 v2.1  archaeologie -- 
-  biblatex for archaeologists, 
+  [2016/09/25 v2.2  archaeologie -- 
+    biblatex for archaeologists, 
   historians and philologists, lbx-Datei]
 \InheritBibliographyExtras{italian}
 
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx
index 88c18848c0a..a9c25bb9870 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx
@@ -13,8 +13,8 @@
 
 
 \ProvidesFile{archaeologie-ngerman.lbx}%
-  [2016/09/20 v2.1  archaeologie -- 
-  biblatex for archaeologists, 
+  [2016/09/25 v2.2  archaeologie -- 
+    biblatex for archaeologists, 
   historians and philologists, lbx-Datei]
 \InheritBibliographyExtras{ngerman}
 
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx
index f30ef40b617..211d088593a 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx
@@ -12,8 +12,8 @@
 % version 2005/12/01 or later.
 
 \ProvidesFile{archaeologie-spanish.lbx}%
-  [2016/09/20 v2.1  archaeologie -- 
-  biblatex for archaeologists, 
+  [2016/09/25 v2.2  archaeologie -- 
+    biblatex for archaeologists, 
   historians and philologists, lbx-Datei]
 \InheritBibliographyExtras{spanish}
 
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
index 8dde3436877..ee6c9ce56c6 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
@@ -11,7 +11,7 @@
 % and version 1.3 or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
 \ProvidesFile{archaeologie.bbx}%
-  [2016/09/20 v2.1  archaeologie -- 
+  [2016/09/25 v2.2  archaeologie -- 
   biblatex for archaeologists, 
   historians and philologists, bbx-file]
 \RequireBibliographyStyle{standard}
@@ -23,8 +23,8 @@
   biblatex for archaeologists,
   historians and philologists}
 }
-\def\archaeologieversion{2.1}
-\def\archaeologiedate{2016-09-20}
+\def\archaeologieversion{2.2}
+\def\archaeologiedate{2016-09-25}
 \ExecuteBibliographyOptions{%
   pagetracker=true,%
   citecounter=true,%
@@ -34,7 +34,7 @@
   bibencoding=utf8,%
   dateabbrev=false, %
   sorting=nyt,%
-labeldateparts=true,
+  labeldateparts=true,
   maxnames=2,% 
   minnames=1,%
   maxitems=1,%
@@ -95,7 +95,7 @@ labeldateparts=true,
   \settoggle{bbx:urn}{#1}}
 \ExecuteBibliographyOptions{%
   jstor,%
-  urn,
+  urn,%
   }
 %-----------------------
 \DeclareBibliographyOption{edby}[true]{\csuse{bool#1}{bbx:edby}}
@@ -120,6 +120,8 @@ labeldateparts=true,
     {}%
   }
 %-----------------------
+\ExecuteBibliographyOptions{initials=true}
+%-----------------------
 \DeclareEntryOption{ancient}[true]{\csuse{bool#1}{cbx:ancient}}
 \DeclareEntryOption{frgancient}[true]{%
   \ifstrequal{#1}{true}%
@@ -151,7 +153,7 @@ labeldateparts=true,
   \ifbool{bbx:counter}{counter\seperator}{}%
   \ifbool{bbx:edby}{edby\seperator}{}%
   \ifbool{bbx:inreferences}{inreferences\seperator}{}%
-  \ifbool{bbx:initials}{initials\seperator}{}%
+  \ifbool{bbx:initials}{}{\xout{initials}\seperator}%
   \ifbool{bbx:noabbrv}{noabbrv\seperator}{}%
   \ifbool{bbx:publisher}{publisher\seperator}{}%
   \ifbool{cbx:seenote}{seenote\seperator}{}%
@@ -263,7 +265,8 @@ labeldateparts=true,
     \field{sortkey}
   }
   \sort{
-      \field{shorthand}
+    \field{sortshorthand}
+    \field{shorthand}
     \field{sortname}
     \field{author}
     \field{editor}
@@ -342,24 +345,24 @@ labeldateparts=true,
   \map{%
  % Author field
  \step[fieldsource=author,%
- match={\regexp{\b(Chr|Ch|Th|Ph|[B-DF-HJ-NP-TV-XZ](l|r))(\S*,)}},%
- replace={\regexp{\{$1\}$3}}]% Protect last names (first last)
+ 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|[B-DF-HJ-NP-TV-XZ](l|r))}},%
+ 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|[B-DF-HJ-NP-TV-XZ](l|r))([^\}])}},%
- replace={\regexp{\{\\relax\{\}$1\}$3}}]% Insert \relax after abbreviating
+ 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|[B-DF-HJ-NP-TV-XZ](l|r))(\S*,)}},%
- replace={\regexp{\{$1\}$3}}]% Protect last names (first last)
+  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|[B-DF-HJ-NP-TV-XZ](l|r))}},%
+ 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|[B-DF-HJ-NP-TV-XZ](l|r))([^\}])}},%
- replace={\regexp{\{\\relax\{\}$1\}$3}}]% Insert \relax after abbreviating
+ match={\regexp{\b(Chr|Ch|Th|Ph|St)([^\}])}},%
+ replace={\regexp{\{\\relax\{\}$1\}$2}}]% Insert \relax after abbreviating
  }}}%
  }{}%
 }
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
index 51f6d64bb2f..af5226408e7 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
@@ -11,13 +11,14 @@
 % and version 1.3 or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
 \ProvidesFile{archaeologie.cbx}%
-  [2016/09/20 v2.1  archaeologie -- 
+  [2016/09/25 v2.2  archaeologie -- 
   biblatex for archaeologists, 
   historians and philologists, cbx-Datei]
 %-----------------------
 \newbool{cbx:yearinparens}
 \newbool{cbx:seenote}
 \newbool{cbx:seen}
+\newbool{cbx:uniqueme}
 %-----------------------
 \newcommand*{\cbx@fseen@names}{}
 \newcommand*{\cbx@tseen@names}{}
@@ -59,6 +60,7 @@
   Use one of the values 'initials', 'full', 'family' or 'firstfull'.}{}}%
 \def\citeauthorformatVALUE{#1}%
 }
+\DeclareEntryOption{uniqueme}[true]{\csuse{bool#1}{cbx:uniqueme}}
 %-----------------------
 \DeclareFieldFormat{citeyear}{#1}
 \DeclareFieldFormat{prenote}{#1\isdot}
@@ -199,6 +201,17 @@
   uniquename=minfull,%
 }
 %-----------------------
+\newbibmacro*{uniqueshorthand}{%
+  \printtext[brackets]{%
+  \ifnameundef{translator}
+    	{\ifnameundef{intranslator}%
+         {\iffieldundef{series}%
+      	    {\printnames[name:family]{editor}}%
+     	    {\usebibmacro*{series}}%
+     	   }%
+         {\printnames[name:family]{intranslator}}}%
+    	  {\printnames[name:family]{translator}}}}
+%-----------------------
 \renewbibmacro*{citeindex}{%
   \ifciteindex%
     {\ifboolexpr{%
@@ -217,7 +230,7 @@
    {\setunit{\addspace}%
   \usebibmacro{cite:frgname}}%
  }%
- }
+}
 %-----------------------
 \newbibmacro*{cite:frgname}{%
   \ifnameundef{shorteditor}%
@@ -244,7 +257,6 @@
   \iffieldundef{labelyear}%
   {}%
   {\printtext[citeyear]{\usebibmacro{cite:labelyear+extrayear}}}%
- %  {{\printtext[citeyear]{\printfield{labelyear}\printfield{extrayear}}}} 
 }
 %-----------------------
 \newbibmacro*{cite:lexikon}{%
@@ -333,7 +345,12 @@
 \newbibmacro*{cite:shorthand}{%
   \ifbool{cbx:seenote}%
   {\printtext{\printfield{shorthand}}}%
-  {\printtext[bibhyperref]{\printfield{shorthand}}}}
+  {\printtext[bibhyperref]{\printfield{shorthand}%
+  \ifbool{cbx:uniqueme}
+  {\setunit*{\addspace}%
+    \usebibmacro*{uniqueshorthand}}%
+    {}%
+}}}
 %-----------------------
 \newbibmacro*{cite:label}{%
   \iffieldundef{label}%
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx
index a8db0dfcfe7..e7e37399f0a 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx
@@ -11,8 +11,8 @@
 % and version 1.3 or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
 \ProvidesFile{archaeologie.dbx}%
-  [2016/09/20 v2.1  archaeologie -- 
-  biblatex for archaeologists, 
+  [2016/09/25 v2.2  archaeologie -- 
+    biblatex for archaeologists, 
   historians and philologists, dbx-Datei]
                 
  % new translator etc.  fields for "inner" work, that is translator of title (not booktitle) in @in...