diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx | 80 |
1 files changed, 33 insertions, 47 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx index 9bb0cdbb994..4bc6c1bff6e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx @@ -1,26 +1,23 @@ -% $Id: philosophy-modern.bbx,v 0.7b 2010/11/20 Valbusa$ -% Copyright 2009-2010 Ivan Valbusa. This package is author-maintained. +% $Id: philosophy-modern.bbx,v 0.7c 2011/05/16 Valbusa$ +% Copyright 2009-2011 Ivan Valbusa. This package is author-maintained. % Permission is granted to copy, distribute and/or modify this software under the % terms of the LaTeX Project Public License, version 1.3c % http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt. -\ProvidesFile{philosophy-modern.bbx}[philosophy-modern.bbx,v 0.7b 2010/11/20 valbusa beta$] +\ProvidesFile{philosophy-modern.bbx}[philosophy-modern.bbx,v 0.7c 2011/05/16 valbusa beta$] \RequireBibliographyStyle{philosophy-classic} -\newbool{bbx:yearleft} +\newtoggle{bbx:yearleft} \DeclareBibliographyOption{yearleft}[true]{% - \csuse{bool#1}{bbx:yearleft}} + \settoggle{bbx:yearleft}{#1}} \ExecuteBibliographyOptions{% yearleft=false} +%% new lengths %%--------------------------------------------------------------------------------------------- -%% new lengths -%%--------------------------------------------------------------------------------------------- - - \newlength{\yeartitle} \newlength{\postnamesep} \setlength{\yeartitle}{0.8em}% @@ -29,40 +26,31 @@ yearleft=false} \setlength{\bibnamesep}{1.5ex plus 2pt minus 1pt} \setlength{\bibhang}{4\parindent} - -%%--------------------------------------------------------------------------------------------- -%% new commands +%% new commands %%--------------------------------------------------------------------------------------------- - \newcommand{\postsep}{\par\nobreak\vskip\postnamesep\hskip-\bibhang\ignorespaces} - \renewcommand{\labelnamepunct}{\unspace} -%%--------------------------------------------------------------------------------------------- -% List of shorthands -%%--------------------------------------------------------------------------------------------- - \AtBeginBibliography{ - \ifbool{bbx:yearleft}{% + \iftoggle{bbx:yearleft}{% \setlength{\yeartitle}{\fill}} {}% } - \AtBeginShorthands{% \renewcommand{\postsep}{}% \renewcommand{\labelnamepunct}{\addcomma\space}} - %%--------------------------------------------------------------------------------------------- -% Macro +%% MACROS %%--------------------------------------------------------------------------------------------- -% + \renewbibmacro*{date+extrayear}{% - \iffieldundef{year}% - {}% - {\makebox[\bibhang][r]{% - \printtext{\printfield{labelyear}\printfield{extrayear}% - \hskip\yeartitle}}}} + \makebox[\bibhang][r]{% + \printtext{% + \iffieldundef{year}% + {\bibstring{nodate}}% + {\printfield{labelyear}\printfield{extrayear}}% + \hskip\yeartitle}}} % label for entries without 'editor' and 'author' %%------------------------------------------------------------- @@ -75,15 +63,15 @@ yearleft=false} {\printtext{\printfield{label}}% \postsep}} -% macro 'author' OKKKKK -%%---------------------------------------------------- - +% macro 'author' +%%--------------------------------------------------- \renewbibmacro*{author}{% - \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}} - {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND - \NOT\iffirstonpage\AND - \(\NOT\boolean{bbx@inset}\OR - \iffieldequalstr{entrysetcount}{1}\)} + \ifboolexpr{ + test \ifuseauthor + and + not test {\ifnameundef{author}} + } + {\usebibmacro{bbx:dashcheck} {}%MOD {\usebibmacro{bbx:savehash}% \printnames{author}% @@ -98,17 +86,15 @@ yearleft=false} \usebibmacro{labeltitle}% \setunit*{\addspace}}% \usebibmacro{date+extrayear}} - - -% macro 'editor' -%%---------------------------------------------------- + \renewbibmacro*{bbx:editor}[1]{% - \ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}} - {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND - \NOT\iffirstonpage\AND - \(\NOT\boolean{bbx@inset}\OR - \iffieldequalstr{entrysetcount}{1}\)} - {}% removed \bibnamedash + \ifboolexpr{ + test \ifuseeditor + and + not test {\ifnameundef{editor}} + } + {\usebibmacro{bbx:dashcheck} + {}% removed \bibnamedash {\printnames{editor}% \postsep%ADD \usebibmacro{bbx:savehash}}% @@ -120,10 +106,10 @@ yearleft=false} {\usebibmacro{#1}\setunit{\addcomma\space}}{}% } + %%--------------------------------------------------------------------------------------------- % BIBLIOGRAPHY DRIVERS %%--------------------------------------------------------------------------------------------- - \newbibmacro*{crosslabeltitle}{% \iffieldundef{label}% {\iffieldundef{shorttitle} |