diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx | 98 |
1 files changed, 69 insertions, 29 deletions
diff --git a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx index 6998b86506e..ad6118d4238 100644 --- a/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx +++ b/Master/texmf-dist/tex/latex/archaeologie/archaeologie.cbx @@ -1,6 +1,6 @@ % archaeologie --% % biblatex fuer Archaeologen, Historiker und Philologen -% Copyright (c) 2015 Lukas C. Bossert | Johannes Friedl +% Copyright (c) 2016 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 @@ -11,7 +11,7 @@ % version 2005/12/01 or later. \ProvidesFile{archaeologie.cbx}% - [2015/12/06 v1.22 archaeologie --% + [2016/01/31 v1.3 archaeologie --% biblatex fuer Archaeologen, Historiker und Philologen, cbx-Datei] \ExecuteBibliographyOptions{% citetracker=true,% @@ -20,7 +20,6 @@ opcittracker=true,% loccittracker=true,% labeldate=true,% - sortcites=false% }% %%%%%%%% cbx %%%%%%%%%% @@ -43,7 +42,7 @@ {\addspace\textendash\addspace}{}% }% -\renewcommand*{\multicitedelim}{\setunit{\addsemicolon\addspace}}% +\renewcommand*{\multicitedelim}{\addsemicolon\addspace}% \newcommand*{\labelyeardelim}{\addspace} @@ -101,7 +100,7 @@ \printfield[parens]{year}% \setunit{\addspace}% \iffieldundef{postnote}{\printfield{pages}}{\printfield{postnote}}% - \setunit{\addspace}\printtext{s\adddot\addnbthinspace v\adddot}% + \iffieldundef{title}{}{\setunit{\addspace}\printtext{s\adddot\addnbthinspace v\adddot}}% \setunit{\addspace}\printfield{title}% \iffieldundef{number}{}{\setunit{\addspace}\printtext[brackets]{\printfield{number}}}% \setunit{\addspace}\printtext[parens]{\c@uniquename=1 \printnames{labelname}}% @@ -109,9 +108,13 @@ \newbibmacro{cite}{% - \ifboolexpr{bool{cbx:lexikon} and bool {bbx:lexika}}% - {\usebibmacro{cite:lexikon}}% - {\printtext[bibhyperref]{\iffieldundef{shorthand} + \ifboolexpr{% + test {\ifbool{bbx:lexika}}% + and % + test {\ifentrytype{inreference}}% + }% +{\usebibmacro{cite:lexikon}}% + {\printtext[bibhyperref]{\iffieldundef{shorthand}% {\ifnameundef{labelname}% {\usebibmacro{cite:label}% \setunit{\labelyeardelim}}% @@ -120,33 +123,37 @@ \usebibmacro{cite:year}}% {\printfield{shorthand}}}}% } -%%\newbibmacro{cite:bib}{% -%% {\iffieldundef{shorthand} -%% {\ifnameundef{labelname}% -%% {\usebibmacro{cite:label}% -%% \setunit{\labelyeardelim}}% -%% {\printnames{labelname}% -%% \setunit{\nameyeardelim}}% -%% \usebibmacro{cite:year}}% -%% {\printfield{shorthand}}}% -%%} + -%%% Cite Commands %%% +%% Cite Commands %%% \DeclareCiteCommand{\cite}% {\usebibmacro{prenote}}% - {\usebibmacro{citeindex}% - \usebibmacro{cite}}% - {\multicitedelim}% - {\ifboolexpr{bool{cbx:lexikon} and bool {bbx:lexika}}{}{\usebibmacro{postnote}}}% - +{\usebibmacro{citeindex}% +\usebibmacro{cite}}% +{\multicitedelim}% +{\ifboolexpr{% +test{\ifbool{bbx:lexika}}% +and% +test{\ifentrytype{inreference}}% +}{}{\usebibmacro{postnote}}}% + + + + + + \DeclareCiteCommand{\parencite}[\mkbibparens]% {\usebibmacro{prenote}}% {\usebibmacro{citeindex}% \usebibmacro{cite}}% {\multicitedelim}% - {\ifboolexpr{bool{cbx:lexikon} and bool {bbx:lexika}}{}{\usebibmacro{postnote}}}% + {\ifboolexpr{% + test{\ifbool{bbx:lexika}}% + and% + test{\ifentrytype{inreference}}% + }{}{\usebibmacro{postnote}}}% \DeclareCiteCommand{\citeauthor}% @@ -156,8 +163,8 @@ \renewcommand*{\finalnamedelim}{% \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}% \addspace\bibstring{and}\space}% - \usebibmacro{prenote}} - {\usebibmacro{cite:name}} + \usebibmacro{prenote}}% + {\usebibmacro{cite:name}}% {\multicitedelim}% {\usebibmacro{postnote}}% @@ -175,7 +182,40 @@ }}}% {\multicitedelim}% {\usebibmacro{postnote}}% -% + + +\DeclareMultiCiteCommand{\cbx@cites}{\cite}{\multicitedelim} +\DeclareMultiCiteCommand{\cites}[\cbx@cite@wrapper\cbx@cites]{\cbx@cite}{} +\DeclareMultiCiteCommand{\cbx@parencites}[\mkbibparens]{\parencite}{\multicitedelim} +\DeclareMultiCiteCommand{\parencites}[\cbx@cite@wrapper\cbx@parencites]{\cbx@cite}{} + + +\DeclareCiteCommand{\cbx@cite} +{\csxdef{prenote:\thefield{entrykey}}{\thefield{prenote}}} +{\listxadd\cbx@savekeys{\thefield{entrykey}}} +{} +{\csxdef{postnote:\thefield{entrykey}}{\thefield{postnote}}} + +\newrobustcmd{\cbx@cite@wrapper}[2]{% + \def\cbx@savekeys{}% + \def\cbx@citecall{#1}% + #2\cbx@sortkeysinit\cbx@citesort\cbx@citecall} + +\def\cbx@citesort{% + \def\do##1{% + \ifinlist{##1}{\cbx@savekeys} + {\protected@xappto\cbx@citecall{% + [\csuse{prenote:##1}][\csuse{postnote:##1}]{##1}}} + {}}% + \dolistloop{\cbx@sortkeys}} +\def\cbx@sortkeysinit{% + \ifcsundef{blx@sort@\the\c@refsection} + {\global\letcs{\cbx@sortkeys} + {blx@slists@\the\c@refsection @entry@\blx@sorting}}% Biber + {\global\letcs{\cbx@sortkeys}{blx@sort@\the\c@refsection}}}% BibTeX +\def\cbx@sortkeys{} + + + \endinput -%% %% End of file `archaeologie.cbx'. |