diff options
author | Karl Berry <karl@freefriends.org> | 2016-07-30 23:09:45 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-07-30 23:09:45 +0000 |
commit | ef1b5554439daf89b038b385c15e92f969a88a37 (patch) | |
tree | f75e1f0d3178506542dd56b87c6c7428a7e892b4 /Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx | |
parent | 6bc76ff170ee1e2992b12073207cc9a412e6bfe9 (diff) |
archaeologie (28jul16)
git-svn-id: svn://tug.org/texlive/trunk@41771 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx | 104 |
1 files changed, 54 insertions, 50 deletions
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx index 5a8ab8b7477..9f65776118f 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx @@ -26,8 +26,8 @@ {\listcsxadd{cbx@fseen@names}{#1}} {\listcsxadd{cbx@tseen@names}{#1}}} \newrobustcmd*{\cbx@ifnameseen}[1]{% - \iftoggle{blx@footnote} - {\xifinlistcs{#1}{cbx@fseen@names}} + \iftoggle{blx@footnote}% + {\xifinlistcs{#1}{cbx@fseen@names}}% {\xifinlistcs{#1}{cbx@tseen@names}}} \renewcommand*{\multicitedelim}{\addsemicolon\addspace} @@ -43,21 +43,22 @@ } %----------------------- \DeclareBibliographyOption{yearinparens}[true]{% - \ifstrequal{#1}{true} - {\DeclareFieldFormat{citeyear}{\mkbibparens{##1}} - \csuse{bool#1}{cbx:yearinparens}} - {\DeclareFieldFormat{citeyear}{##1}}} + \ifstrequal{#1}{true}% + {\DeclareFieldFormat{citeyear}{\mkbibparens{##1}}% + \csuse{bool#1}{cbx:yearinparens}}% + {\DeclareFieldFormat{citeyear}{##1}}}% \DeclareBibliographyOption{seenote}[true]{\csuse{bool#1}% {cbx:seenote}% \ExecuteBibliographyOptions{maxnames=999}% }% \DeclareBibliographyOption[string]{citeauthorformat}{% - \ifcsdef{cbx@arch@citeauthorformat@#1} - {\csuse{cbx@arch@citeauthorformat@#1}} - {\PackageError{biblatex-archaeologie} - {Option 'citeauthorformat=#1' invalid} - {The option you have supplied is invalid.\MessageBreak - Use one of the values 'initials', 'full', 'family' or 'firstfull'.}}} + \ifcsdef{cbx@arch@citeauthorformat@#1}% + {\csuse{cbx@arch@citeauthorformat@#1}}% + {\PackageError{biblatex-archaeologie}% + {Option 'citeauthorformat=#1' invalid.\MessageBreak% + Use one of the values 'initials', 'full', 'family' or 'firstfull'.}{}}% +\def\citeauthorformatVALUE{#1}% +} %----------------------- \DeclareFieldFormat{citeyear}{#1} \DeclareFieldFormat{prenote}{#1\isdot} @@ -153,34 +154,37 @@ \def\cbx@arch@citeauthorformat@initials{% \DeclareNameAlias{citeauthor}{name:initials}} + \DeclareNameFormat{citeauthor:fancy}{% + \cbx@ifnameseen{\thefield{hash}} + {\ifnum\value{uniquename}=2 + \usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% + \else + \ifuseprefix + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefix} + {\namepartsuffixi}} + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiveni} + {\namepartprefixi} + {\namepartsuffixi}}% + \fi} + {\usebibmacro{name:given-family} + {\namepartfamily} + {\namepartgiven} + {\namepartprefix} + {\namepartsuffix}% + \cbx@nameseen{\thefield{hash}}}% + \usebibmacro{name:andothers}} + \def\cbx@arch@citeauthorformat@firstfull{% - \DeclareNameFormat{citeauthor}{% - \cbx@ifnameseen{\thefield{hash}} - {\ifnum\value{uniquename}=2% - \usebibmacro{name:given-family} - {\namepartfamily} - {\namepartgiven} - {\namepartprefix} - {\namepartsuffix}% - \else - \ifuseprefix - {\usebibmacro{name:given-family} - {\namepartfamily} - {\namepartgiveni} - {\namepartprefix} - {\namepartsuffixi}} - {\usebibmacro{name:given-family} - {\namepartfamily} - {\namepartgiveni} - {\namepartprefixi} - {\namepartsuffixi}}} - {\usebibmacro{name:given-family} - {\namepartfamily} - {\namepartgiven} - {\namepartprefix} - {\namepartsuffix}% - \cbx@nameseen{\thefield{hash}}}% - \usebibmacro{name:andothers}}} + \DeclareNameAlias{citeauthor}{citeauthor:fancy}} %----------------------- \ExecuteBibliographyOptions{% citetracker=true,% @@ -294,7 +298,7 @@ {\usebibmacro{cite:labelyear+extrayear}}}% {\usebibmacro{cite}}} %----------------------- -\newbibmacro*{textcite}{%aus authoryear +\newbibmacro*{textcite}{% \ifnameundef{labelname}% {\iffieldundef{shorthand}% {\usebibmacro{cite:label}% @@ -355,7 +359,7 @@ test{\ifentrytype{inreference}}% }{}{\usebibmacro{postnote}}}% %----------------------- -\DeclareCiteCommand{\textcite}%aus authoryear +\DeclareCiteCommand{\textcite}% {\boolfalse{cbx:yearinparens}% \usebibmacro{prenote}% }% @@ -384,11 +388,11 @@ }{}{\usebibmacro{postnote}}}% %----------------------- \DeclareMultiCiteCommand{\cites}% - {\cite}{\multicitedelim} + {\cite}{\multicitedelim}% \DeclareMultiCiteCommand{\parencites}[\mkbibparens]% - {\parencite}{\multicitedelim} - \DeclareMultiCiteCommand{\textcites}% - {\textcite}{\textcitedelim} + {\parencite}{\multicitedelim}% +\DeclareMultiCiteCommand{\textcites}% + {\textcite}{\textcitedelim}% %----------------------- \DeclareCiteCommand{\citeauthor} {\boolfalse{citetracker}% @@ -398,8 +402,8 @@ \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}% \addspace\bibstring{and}\space}% \usebibmacro{prenote}}% - {\ifciteindex - {\indexnames{labelname}} + {\ifciteindex% + {\indexnames{labelname}}% {}% \ifboolexpr{% test {\ifbool{bbx:inreferences}}% @@ -407,9 +411,9 @@ test {\ifentrytype{inreference}}% }% {\printtext}% - {\printtext[bibhyperref]} - {\printnames[citeauthor]{labelname}}} - {\multicitedelim} + {\printtext[bibhyperref]}% + {\printnames[citeauthor]{labelname}}}% + {\multicitedelim}% {\usebibmacro{postnote}} %----------------------- \DeclareCiteCommand{\citetitle} % |