archaeologie (19nov17)

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

1 files changed, 28 insertions, 16 deletions

diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
index 1db43dfd623..6bf89ec1b7a 100644
--- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
+++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx
@@ -20,6 +20,7 @@
 %\renewcommand*{\multicitedelim}{\addsemicolon\addspace}
 \newcommand*{\labelyeardelim}{\addspace}
 %\renewcommand{\textcitedelim}{\addcomma\space}
+\renewcommand*{\iffinalcitedelim}{\iflastcitekey}
 \renewcommand{\postnotedelim}{%
   \ifboolexpr{%
     bool {cbx:ancient}%
@@ -258,7 +259,7 @@
 \newbibmacro*{cite:year}{%  
   \iffieldundef{labelyear}%
   {}%
-  {\printtext[citeyear]{\usebibmacro{cite:labelyear+extrayear}}}%
+  {\printtext[citeyear]{\usebibmacro{cite:labelyear+extradate}}}%
 }
 %-----------------------
 \newbibmacro*{cite:lexikon}{%
@@ -311,7 +312,7 @@
   \iffieldundef{shorthand}%
   {\iffieldundef{labelyear}%
    {\usebibmacro{cite:label}}%
-   {\usebibmacro{cite:labelyear+extrayear}}}%
+   {\usebibmacro{cite:labelyear+extradate}}}%
   {\usebibmacro{cite}}}
 %-----------------------
 \newbibmacro*{textcite}{%
@@ -324,7 +325,7 @@
   \ifnumequal{\value{citecount}}{1}%
   {\usebibmacro{prenote}}%
   {}%
-  \usebibmacro{cite:labelyear+extrayear}}%
+  \usebibmacro{cite:labelyear+extradate}}%
    {\usebibmacro{cite}}}%
   {\printnames{labelname}%
    \setunit{%
@@ -347,7 +348,7 @@
   {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}%
   {\printtext[bibhyperref]{\printfield{label}}}}
 %-----------------------
-\newbibmacro*{cite:labelyear+extrayear}{%
+\newbibmacro*{cite:labelyear+extradate}{%
   \iffieldundef{labelyear}
     {}
     {\printtext[bibhyperref]{%
@@ -358,7 +359,7 @@
      \iffieldnums{labelyear}%
        {\mkyearzeros{\thefield{labelyear}}}%
        {\printfield{labelyear}}%
-     \printfield{extrayear}%
+     \printfield{extradate}%
      \iffieldsequal{labeldateera}{labelenddateera}{}%
        {\dateeraprint{labelyear}}%
      \dateuncertainprint%
@@ -415,16 +416,16 @@
    \renewcommand*{\finalnamedelim}{%
    \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
    \addspace\bibstring{and}\space}%
-  \usebibmacro{prenote}%
   }%
   {\usebibmacro{citeindex}%
    \iffirstcitekey%
    {\setcounter{textcitetotal}{1}}%
    {\stepcounter{textcitetotal}%
-  \textcitedelim}%
+  \textcitedelim%
+	\usebibmacro{prenote}}%
    \ifbool{cbx:seenote}{\usebibmacro{cite:seenote}}%
    {\usebibmacro{textcite}}}%
-  {\ifbool{cbx:parens}%
+  {\ifbool{cbx:yearinparens}%
    {\bibcloseparen\global\boolfalse{cbx:yearinparens}}%
    {}}%
   {\ifbool{cbx:seenote}{\usebibmacro{postnote}}%
@@ -465,14 +466,10 @@
   {\multicitedelim}
   {\usebibmacro{postnote}}
 %-----------------------      
-\DeclareMultiCiteCommand{\cites}%
-  {\cite}{\multicitedelim}%
-\DeclareMultiCiteCommand{\parencites}[\mkbibparens]%
-  {\parencite}{\multicitedelim}%
-\DeclareMultiCiteCommand{\textcites}%
-  {\textcite}{\textcitedelim}
-\DeclareMultiCiteCommand{\smartcites}
-    [\iffootnote\textnormal\mkbibfootnote]{\smartcite}{\multicitedelim}
+\DeclareMultiCiteCommand{\cites}{\cite}{\multicitedelim}
+\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\multicitedelim}
+\DeclareMultiCiteCommand{\textcites}{\textcite}{}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\textnormal\mkbibfootnote]{\smartcite}{\multicitedelim}
 %----------------------- 
 \DeclareCiteCommand{\citeauthor}
   {\boolfalse{citetracker}%
@@ -585,5 +582,20 @@
   {\multicitedelim}%
   {\usebibmacro{postnote}}%
 
+\DeclareCiteCommand{\citetitle*} %
+  {\boolfalse{citetracker}%
+  \boolfalse{pagetracker}%
+  \usebibmacro{prenote}}%
+  {\ifboolexpr{
+    bool{bbx:inreferences}
+    and
+    test{\ifentrytype{inreference}}}
+   {\printtext}%
+   {\printtext[bibhyperref]}{%
+   \ifbool{cbx:ancient}{\printtext[emph]{\usebibmacro{cite:title}}}%
+  {\printtext[emph]{\usebibmacro{cite:title}}}}}%
+  {\multicitedelim}%
+  {\usebibmacro{postnote}}%
+  
 \endinput
 %% End of file `archaeologie.cbx'.
\ No newline at end of file