diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx | 124 |
1 files changed, 102 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx index d5d8bfc1440..6a8f96db32e 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx @@ -11,7 +11,7 @@ % version 2005/12/01 or later. \ProvidesFile{archaeologie.cbx}% - [2016/03/12 v1.41 archaeologie --% + [2016/03/17 v1.42 archaeologie --% biblatex fuer Archaeologen, Historiker und Philologen, cbx-Datei] \ExecuteBibliographyOptions{% citetracker=true,% @@ -58,20 +58,21 @@ \renewcommand*{\multicitedelim}{\addsemicolon\addspace}% \newcommand*{\labelyeardelim}{\addspace} - - - - -\renewbibmacro*{postnote}{% +\renewcommand{\textcitedelim}{} +\renewcommand{\postnotedelim}{ \ifboolexpr{bool {cbx:antik}% or bool {cbx:frgantik}% or bool {cbx:corpus}% }% {\setunit{\addspace}}% - {\newunit}% - \iffieldundef{postnote} + {\newunitpunct}% +} + + +\renewbibmacro*{postnote}{% +\iffieldundef{postnote} {}% - {\printfield{postnote}% + {\postnotedelim\printfield{postnote}% \ifbool{cbx:frgantik}% {\setunit{\addspace}% \usebibmacro{cite:frgname}}% @@ -81,7 +82,7 @@ \newbibmacro*{cite:frgname}{% \ifnameundef{shorteditor}% {\printnames[frg]{editor}}% - {\printnames[frg]{shorteditor}} + {\printnames[frg]{shorteditor}}% } \newbibmacro*{cite:name}{% % 0: only last names, 1: last name + first name initials, 2: full name @@ -94,14 +95,11 @@ \newbibmacro*{cite:year}{% - \iffieldundef{labelyear} + \iffieldundef{labelyear}% {}% {{\printtext[citeyear]{\printfield{labelyear}\printfield{extrayear}}}}} -\newbibmacro*{cite:label}{% - \iffieldundef{label} - {\printfield[citetitle]{labeltitle}} - {\printfield{label}}} + @@ -135,11 +133,75 @@ {\printnames{labelname}% \setunit{\nameyeardelim}}% \usebibmacro{cite:year}}% - {\printfield{shorthand}}}}% + {\usebibmacro{cite:shorthand}}}}% } - +\newbibmacro*{citeyear}{% + \iffieldundef{shorthand} + {\iffieldundef{labelyear} + {\usebibmacro{cite:label}} + {\usebibmacro{cite:labelyear+extrayear}}} + {\usebibmacro{cite}}} + +\newbibmacro*{textcite}{%aus authoryear + \ifnameundef{labelname} + {\iffieldundef{shorthand} + {\usebibmacro{cite:label}% + \setunit{% + \global\booltrue{cbx:yearinparens}% + \nonameyeardelim\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{cite:labelyear+extrayear}} + {\usebibmacro{cite}}} + {\printnames{labelname}% + \setunit{% + \global\booltrue{cbx:yearinparens}% + \nameyeardelim\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% + \usebibmacro{citeyear}}} + +\newbibmacro*{cite:shorthand}{% + \printtext[bibhyperref]{\printfield{shorthand}}} + +\newbibmacro*{cite:label}{% + \iffieldundef{label} + {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}} + {\printtext[bibhyperref]{\printfield{label}}}} + +\newbibmacro*{cite:labelyear+extrayear}{% + \iffieldundef{labelyear}% + {}% + {\printtext[bibhyperref]{% + \printfield{labelyear}% + \printfield{extrayear}}}} + +\newbibmacro*{textcite:postnote}{% + \ifboolexpr{bool {cbx:antik}% + or bool {cbx:frgantik}% + or bool {cbx:corpus}% + }% + {\setunit{\addspace}}% +{}% + \iffieldundef{postnote} + {\ifbool{cbx:yearinparens} + {\bibcloseparen} + {}} + {\ifbool{cbx:yearinparens} + {\setunit{\postnotedelim}} + {\setunit{\extpostnotedelim\bibopenparen}}% + \printfield{postnote}% + \ifbool{cbx:frgantik}% + {\setunit{\addspace}% + \usebibmacro{cite:frgname}% + \bibcloseparen}% + \bibcloseparen}} + + %% Cite Commands %%% \DeclareCiteCommand{\cite}% @@ -153,10 +215,19 @@ and% test{\ifentrytype{inreference}}% }{}{\usebibmacro{postnote}}}% - - - - +\DeclareCiteCommand{\textcite}%aus authoryear + {\boolfalse{cbx:yearinparens}} + {\usebibmacro{citeindex}% + \iffirstcitekey + {\setcounter{textcitetotal}{1}} + {\stepcounter{textcitetotal}% + \textcitedelim}% + \usebibmacro{textcite}} + {\ifbool{cbx:parens} + {\bibcloseparen\global\boolfalse{cbx:yearinparens}} + {}} + {\usebibmacro{textcite:postnote}} + \DeclareCiteCommand{\parencite}[\mkbibparens]% {\usebibmacro{prenote}}% @@ -169,7 +240,16 @@ test{\ifentrytype{inreference}}% test{\ifentrytype{inreference}}% }{}{\usebibmacro{postnote}}}% - + +\DeclareMultiCiteCommand{\cites}% + {\cite}{\multicitedelim} +\DeclareMultiCiteCommand{\parencites}[\mkbibparens]% + {\parencite}{\multicitedelim} + \DeclareMultiCiteCommand{\textcites}% + {\textcite}{\addspace\bibstring{and}\space} + + + \DeclareCiteCommand{\citeauthor}% {\boolfalse{citetracker}% \boolfalse{pagetracker}% |