archaeologie (6oct16)

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

8 files changed, 45 insertions, 51 deletions

diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx
index c06d839de12..e1ea38a4caa 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-english.lbx
@@ -11,9 +11,7 @@
 % 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/25 v2.2  archaeologie -- 
-    biblatex for archaeologists, 
-  historians and philologists, lbx-Datei]
+  [\arch@lbxid]
 \InheritBibliographyExtras{english}
 
 \NewBibliographyString{origtitle}
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx
index 4c93173355d..ef09873e9b6 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-french.lbx
@@ -13,9 +13,7 @@
 
 
 \ProvidesFile{archaeologie-french.lbx}%
-  [2016/09/25 v2.2  archaeologie -- 
-    biblatex for archaeologists, 
-  historians and philologists, lbx-Datei]
+  [\arch@lbxid]
 \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 150789bcbac..968a5a0294d 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-italian.lbx
@@ -13,9 +13,7 @@
 
 
 \ProvidesFile{archaeologie-italian.lbx}%
-  [2016/09/25 v2.2  archaeologie -- 
-    biblatex for archaeologists, 
-  historians and philologists, lbx-Datei]
+  [\arch@lbxid]
 \InheritBibliographyExtras{italian}
 
 \NewBibliographyString{origtitle}
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx
index a9c25bb9870..bd71988d1d9 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-ngerman.lbx
@@ -10,12 +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.
-
-
 \ProvidesFile{archaeologie-ngerman.lbx}%
-  [2016/09/25 v2.2  archaeologie -- 
-    biblatex for archaeologists, 
-  historians and philologists, lbx-Datei]
+  [\arch@lbxid]
 \InheritBibliographyExtras{ngerman}
 
 \NewBibliographyString{origtitle}
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx
index 211d088593a..a47772249c2 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie-spanish.lbx
@@ -12,9 +12,8 @@
 % version 2005/12/01 or later.
 
 \ProvidesFile{archaeologie-spanish.lbx}%
-  [2016/09/25 v2.2  archaeologie -- 
-    biblatex for archaeologists, 
-  historians and philologists, lbx-Datei]
+  [\arch@lbxid]
+  
 \InheritBibliographyExtras{spanish}
 
 \NewBibliographyString{origtitle}
@@ -27,8 +26,8 @@
   inherit          = {spanish},
   subvoce          = {{sub\addspace voce}{s\adddot\addnbthinspace v\adddot}},
   reference = {{Artículo}{Art\adddot}},
-  origtitle = {{Título original}{Título original}},
-  firstprint = {{Primera edición}{Primera edición}},
+  origtitle = {{Título\addspace original}{Título\addspace original}},
+  firstprint = {{Primera\addspace edición}{Primera\addspace edición}},
   talk = {{Conferencia}{Conferencia}},
 }
 \endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
index ee6c9ce56c6..d75557fb57f 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.bbx
@@ -10,10 +10,15 @@
 % 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@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@lbxid{\arch@date\space v\arch@version\space biblatex-archaeologie localization (LCB/JF)}
+
 \ProvidesFile{archaeologie.bbx}%
-  [2016/09/25 v2.2  archaeologie -- 
-  biblatex for archaeologists, 
-  historians and philologists, bbx-file]
+  [\arch@bbxid]
 \RequireBibliographyStyle{standard}
 \AtBeginDocument{%
   \RequirePackage[normalem]{ulem}
@@ -23,8 +28,9 @@
   biblatex for archaeologists,
   historians and philologists}
 }
-\def\archaeologieversion{2.2}
-\def\archaeologiedate{2016-09-25}
+
+\def\archaeologieversion{\arch@version}
+\def\archaeologiedate{\arch@date}
 \ExecuteBibliographyOptions{%
   pagetracker=true,%
   citecounter=true,%
@@ -497,10 +503,7 @@
     \ifentrytype{review}%
   }%
   {}%
-  {\printtext{%
-    \bibstring{in}%
-    \intitlepunct}%
-  }}
+  {\printtext{\bibstring{in}\intitlepunct}}}
 %----------------------- 
 \renewbibmacro*{pageref}{%
   \iflistundef{pageref}
@@ -557,16 +560,13 @@
 \renewbibmacro*{url+urldate}{%
  \usebibmacro{bbx:parunit}%
  \iffieldundef{url}{}{\printfield{url}%
- {\setunit*{\addspace}%
+ \setunit*{\addspace}%
  \printtext{\printurldate}%
- }}%
-}
+}}
 %----------------------- 
 \renewbibmacro*{doi+eprint+url}{%
  \usebibmacro{bbx:parunit}%
- \iftoggle{bbx:doi}%
- {\printfield{doi}}%
- {}%
+ \iftoggle{bbx:doi}{\printfield{doi}}{}%
  \iftoggle{bbx:eprint}{\usebibmacro{eprint}}{}%
  \iftoggle{bbx:jstor}{\usebibmacro{jstor}}{}%
  \iftoggle{bbx:urn}{\usebibmacro{urn}}{}%
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
index af5226408e7..22f01596b5c 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
@@ -11,9 +11,7 @@
 % and version 1.3 or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
 \ProvidesFile{archaeologie.cbx}%
-  [2016/09/25 v2.2  archaeologie -- 
-  biblatex for archaeologists, 
-  historians and philologists, cbx-Datei]
+  [\arch@cbxid]
 %-----------------------
 \newbool{cbx:yearinparens}
 \newbool{cbx:seenote}
@@ -300,18 +298,16 @@
   {\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}%
+  {\printtext[bibhyperref]{%
+    \iffieldundef{shorthand}%
+      {\ifnameundef{labelname}%
+       {\usebibmacro{cite:label}%
+       \setunit{\labelyeardelim}}%
+      {\printnames{labelname}%
+      \setunit{\nameyeardelim}}%
+     \usebibmacro{cite:year}}%
+    {\usebibmacro{cite:shorthand}}%
   }}}%
-  }%
-  }%
   \ifciteseen{\global\booltrue{cbx:seen}}%
   {\global\boolfalse{cbx:seen}}%
   \usebibmacro{savestuff}%
@@ -415,6 +411,17 @@
   and%
   test{\ifentrytype{inreference}}%
   }{}{\usebibmacro{postnote}}}%
+ %-----------------------
+  \DeclareCiteCommand{\footcite}[\mkbibfootnote]
+  {\usebibmacro{prenote}}%
+  {\usebibmacro{citeindex}%
+  \usebibmacro{cite}}%
+  {\multicitedelim}%
+  {\ifboolexpr{%
+  test{\ifbool{bbx:inreferences}}%
+  and%
+  test{\ifentrytype{inreference}}%
+  }{}{\usebibmacro{postnote}}}%
 %-----------------------
 \DeclareCiteCommand{\textcite}%
   {\boolfalse{cbx:yearinparens}%
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx
index e7e37399f0a..42c379c16d8 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.dbx
@@ -11,9 +11,7 @@
 % and version 1.3 or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
 \ProvidesFile{archaeologie.dbx}%
-  [2016/09/25 v2.2  archaeologie -- 
-    biblatex for archaeologists, 
-  historians and philologists, dbx-Datei]
+%  [\arch@dbxid]
                 
  % new translator etc.  fields for "inner" work, that is translator of title (not booktitle) in @in...
 \DeclareDatamodelFields[type=list,datatype=name]{ineditor, intranslator, inannotator, incommentator, inintroduction, inforeword, inafterword}