archaeologie (25sep18)

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

1 files changed, 32 insertions, 61 deletions

diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
index 2798d7d09ec..a483ecf3372 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
@@ -1,25 +1,29 @@
-% 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.
-\ProvidesFile{archaeologie.cbx}[\arch@cbxid]
-%-----------------------
+%%
+%% This is file `archaeologie.cbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% archaeologie.dtx  (with options: `cbx')
+%% ----------------------------------------------------------------
+%% 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.cbx}
+    [\archVersion\space\archDate Base settings for citation style of biblatex-archaeologie]
+
 \newbool{cbx:yearinparens}
 \newbool{cbx:seenote}
 \newbool{cbx:uniqueme}
 \newbool{cbx:yearinparensoption}
-%-----------------------
-%\renewcommand*{\multicitedelim}{\addsemicolon\addspace}
 \newcommand*{\labelyeardelim}{\addspace}
-%\renewcommand{\textcitedelim}{\addcomma\space}
 \renewcommand*{\iffinalcitedelim}{\iflastcitekey}
 \renewcommand{\postnotedelim}{%
   \ifboolexpr{%
@@ -81,7 +85,6 @@
   \global\cslet{cbx@bseen@names@\the\c@refsection}\@empty
   \global\cslet{cbx@fseen@names@\the\c@refsection}\@empty}
 
-%-----------------------
 \DeclareBibliographyOption{yearinparens}[true]{%
   \ifstrequal{#1}{true}%
     {\DeclareFieldFormat{citeyear}{\mkbibparens{##1}}%
@@ -99,10 +102,10 @@
         Use one of the values 'initials', 'full', 'family', 'firstfulltheninitials' or 'firstfullthenfamily'.}{}}%
   \def\citeauthorformatVALUE{#1}}
 \DeclareEntryOption{uniqueme}[true]{\csuse{bool#1}{cbx:uniqueme}}
-%-----------------------
 \DeclareFieldFormat{citeyear}{#1}
 \DeclareFieldFormat{prenote}{#1\isdot}
-\DeclareFieldFormat{postnote}{#1}
+\DeclareFieldFormat{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat{multipostnote}{\mknormrange{#1}}
 \DeclareFieldFormat{shorttitle}{#1}
 \DeclareFieldFormat{pages}{#1}
 
@@ -184,7 +187,6 @@
   \fi
   \usebibmacro{name:andothers}}
 
-
 \def\cbx@arch@citeauthorformat@family{%
   \DeclareNameAlias{citeauthor}{name:family}}
 
@@ -223,7 +225,6 @@
        \cbx@nametracker{\thefield{hash}}}%
     \usebibmacro{name:andothers}}
 
-
 \DeclareNameFormat{citeauthor:firstinitialsthenfamily}{%
   \cbx@ifnameseen{\thefield{hash}}
     {}
@@ -268,7 +269,7 @@
          {\namepartsuffix}%
      \or
        \ifuseprefix
-         {\usebibmacro{name:given-family}   
+         {\usebibmacro{name:given-family}
            {\namepartfamily}
            {\namepartgiveni}
            {\namepartprefix}
@@ -289,10 +290,10 @@
        {\namepartfamily}
        {\namepartgiven}
        {\namepartprefix}
-       {\namepartsuffix}
+       {\namepartsuffix}%
      \cbx@nametracker{\thefield{hash}}}%
   \usebibmacro{name:andothers}}
-  
+
 \def\cbx@arch@citeauthorformat@firstfulltheninitials{%
    \DeclareNameAlias{citeauthor}{citeauthor:firstfulltheninitials}}
 
@@ -302,15 +303,12 @@
 \def\cbx@arch@citeauthorformat@firstinitialsthenfamily{%
    \DeclareNameAlias{citeauthor}{citeauthor:firstinitialsthenfamily}}
 
-
 \def\cbx@arch@citeauthorformat@firstfull{%
   \PackageWarningNoLine{biblatex-archaeologie}{%
-    Value 'firstfull' for 'citeauthorformat' is deprecated,\MessageBreak 
+    Value 'firstfull' for 'citeauthorformat' is deprecated,\MessageBreak
     use 'firstfulltheninitials' instead.}%
   \cbx@arch@citeauthorformat@firstfulltheninitials}
 
-
-%-----------------------
 \ExecuteBibliographyOptions{%
   citetracker=true,
   idemtracker=true,
@@ -324,7 +322,6 @@
   uniquename=minfull,
   autocite=footnote,
 }
-%-----------------------
 \newbibmacro*{uniqueshorthand}{%
   \printtext[brackets]{%
     \ifnameundef{translator}
@@ -334,7 +331,6 @@
             {\usebibmacro{series}}}%
          {\printnames[name:family]{intranslator}}}%
       {\printnames[name:family]{translator}}}}
-%-----------------------
 \renewbibmacro*{citeindex}{%
   \ifciteindex%
     {\ifboolexpr{%
@@ -345,7 +341,6 @@
        {\indexnames{labelname}}}%
     {}%
 }
-%-----------------------
 \renewbibmacro*{postnote}{%
   \ifboolexpr{
     bool{bbx:inreferencesasfullcite}
@@ -361,13 +356,11 @@
           {\setunit{\addspace}%
            \usebibmacro{cite:frgname}}%
           {}}}}
-%-----------------------
 \newbibmacro*{cite:frgname}{%
   \ifnameundef{shorteditor}%
     {\printnames[name:family]{editor}}%
     {\printnames{shorteditor}}%
 }
-%-----------------------
 \newbibmacro*{seenote}{%
   \ifnameundef{labelname}%
     {\usebibmacro{cite:label}}%
@@ -379,24 +372,20 @@
   \addspace%
   \ref{footref:\thefield{entrykey}}}%
   \renewcommand{\postnotedelim}{\addspace}}
-%-----------------------
 \newbibmacro*{cite:title}{\printfield{labeltitle}}
-%-----------------------
 \newbibmacro*{cite:origtitle}{%
   \iffieldundef{origtitle}
     {\usebibmacro{cite:title}}
     {\printfield{origtitle}}}
-%-----------------------
 \newbibmacro*{cite:year}{%
   \iffieldundef{labelyear}
     {}
     {\printtext[citeyear]{\usebibmacro{cite:labeldate+extradate}}}}
-%-----------------------
 \newbibmacro*{cite:lexikon}{%
   \printfield{booktitle}%
   \setunit{\addspace}%
   \printfield{volume}%
-  \setunit{\addspace}%
+  \usebibmacro{edition}%
   \printfield[parens]{year}%
   \setunit{\addspace}%
   \iffieldundef{postnote}%
@@ -404,7 +393,6 @@
     {\printfield{postnote}}%
   \usebibmacro{inreference:title+author}%
 }
-%-----------------------
 \newbibmacro{cite:seenote}{%
   \ifboolexpr{bool{cbx:ancient}%
     or bool{cbx:frgancient}%
@@ -418,7 +406,6 @@
              {\DeclareNameAlias{sortname}{default}}%
              {\thefield{entrytype}}%
            \iffootnote{\label{footref:\thefield{entrykey}}}}}}}
-%-----------------------
 \newbibmacro{cite}{%
   \ifboolexpr{
     bool{bbx:inreferencesasfullcite}
@@ -437,14 +424,12 @@
                 \setunit{\nameyeardelim}}%
              \usebibmacro{cite:year}}%
             {\usebibmacro{cite:shorthand}}}}}}
-%-----------------------
 \newbibmacro*{citeyear}{%
   \iffieldundef{shorthand}%
     {\iffieldundef{labelyear}%
        {\usebibmacro{cite:label}}%
        {\usebibmacro{cite:labeldate+extradate}}}%
     {\usebibmacro{cite}}}
-%-----------------------
 \newbibmacro*{textcite}{%
   \ifnameundef{labelname}%
     {\iffieldundef{shorthand}%
@@ -462,7 +447,6 @@
        \global\booltrue{cbx:yearinparens}%
        \nameyeardelim\bibopenparen}%
      \usebibmacro{citeyear}}}
-%-----------------------
 \newbibmacro*{cite:shorthand}{%
   \ifbool{cbx:seenote}%
     {\printtext{\printfield{shorthand}}}%
@@ -472,17 +456,14 @@
          {\setunit*{\addspace}%
           \usebibmacro*{uniqueshorthand}}%
          {}}}}
-%-----------------------
 \newbibmacro*{cite:label}{%
   \iffieldundef{label}%
     {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}%
     {\printtext[bibhyperref]{\printfield{label}}}}
-%-----------------------
 \newbibmacro*{cite:labeldate+extradate}{%
   \iffieldundef{labelyear}
     {}
     {\printtext[bibhyperref]{\printlabeldateextra}}}
-%-----------------------
 \newbibmacro*{textcite:postnote}{%
   \iffieldundef{postnote}%
     {\ifbool{cbx:yearinparens}%
@@ -497,7 +478,6 @@
         \usebibmacro{cite:frgname}%
         \bibcloseparen}%
      \bibcloseparen}}
-%-----------------------
 \DeclareCiteCommand{\cite}%
   {\usebibmacro{prenote}}%
   {\usebibmacro{citeindex}%
@@ -511,7 +491,6 @@
    \usebibmacro{cite}}%
   {\multicitedelim}%
   {\usebibmacro{postnote}}
-%-----------------------
 \DeclareCiteCommand{\textcite}%
   {\boolfalse{cbx:yearinparens}%
    \renewcommand*{\multinamedelim}{\addcomma\space}%
@@ -533,14 +512,12 @@
   {\ifbool{cbx:seenote}
      {\usebibmacro{postnote}}%
      {\usebibmacro{textcite:postnote}}}
-%-----------------------
 \DeclareCiteCommand{\parencite}[\mkbibparens]%
   {\usebibmacro{prenote}}%
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}%
   {\multicitedelim}%
   {\usebibmacro{postnote}}
-%-----------------------
 \DeclareCiteCommand{\smartcite}[\iffootnote\textnormal\mkbibfootnote]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
@@ -552,7 +529,6 @@
     test{\ifentrytype{inreference}}}
      {}
      {\usebibmacro{postnote}}}%
-%-----------------------
   \DeclareCiteCommand{\fullcite}
   {\usebibmacro{prenote}}
   {\usedriver
@@ -560,7 +536,6 @@
      {\thefield{entrytype}}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
-%-----------------------
 \DeclareCiteCommand{\footfullcite}[\mkbibfootnote]
   {\usebibmacro{prenote}}
   {\usedriver
@@ -568,12 +543,10 @@
      {\thefield{entrytype}}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
-%-----------------------
 \DeclareMultiCiteCommand{\cites}{\cite}{\multicitedelim}
 \DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\multicitedelim}
 \DeclareMultiCiteCommand{\textcites}{\textcite}{}
 \DeclareMultiCiteCommand{\smartcites}[\iffootnote\textnormal\mkbibfootnote]{\smartcite}{\multicitedelim}
-%-----------------------
 \DeclareCiteCommand{\citeauthor}
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
@@ -592,7 +565,6 @@
    {\printnames[citeauthor]{labelname}}}%
   {\multicitedelim}%
   {\usebibmacro{postnote}}
-%-----------------------
 \DeclareCiteCommand{\citetranslator}
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
@@ -621,7 +593,6 @@
           {\printtext[bibhyperref]{\printnames[citeauthor]{translator}}}}}}
   {\multicitedelim}%
   {\usebibmacro{postnote}}
-%-----------------------
 \DeclareCiteCommand*{\citetranslator}
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
@@ -651,7 +622,6 @@
            {\usebibmacro{bytranslator+others}}}}}%
   {\multicitedelim}%
   {\usebibmacro{postnote}}
-%-----------------------
 \DeclareCiteCommand*{\citeauthor}
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
@@ -660,7 +630,6 @@
    \printnames[][1-1]{labelname}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
-%-----------------------
 \DeclareCiteCommand{\citetitle}
   {\boolfalse{citetracker}%
   \boolfalse{pagetracker}%
@@ -699,5 +668,7 @@
   {\multicitedelim}%
   {\usebibmacro{postnote}}%
 
-\endinput
-%% End of file `archaeologie.cbx'.
\ No newline at end of file
+%% 
+%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de
+%%
+%% End of file `archaeologie.cbx'.