diff options
author | Karl Berry <karl@freefriends.org> | 2011-05-16 22:09:09 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-05-16 22:09:09 +0000 |
commit | 974432f9910907645c85a06a8692eff260de45b2 (patch) | |
tree | caaddbfde35d04383fb8786a532608df662516c3 /Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx | |
parent | 417e91d078352571aefe2bffd3cc2c1e5cc08f60 (diff) |
biblatex-philosophy (16may11)
git-svn-id: svn://tug.org/texlive/trunk@22499 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx index eab5022f01b..dc495a44c8b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.cbx @@ -1,30 +1,26 @@ -% $Id: philosophy-classic.cbx,v 0.7b 2010/11/20 Valbusa$ -% Copyright 2009-2010 Ivan Valbusa. This package is author-maintained. +% $Id: philosophy-classic.cbx,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-classic.cbx}[philosophy-classic.cbx,v 0.7b 2010/11/20 valbusa beta$] +\ProvidesFile{philosophy-classic.cbx}[philosophy-classic.cbx,v 0.7c 2011/05/16 valbusa beta$] -\RequireCitationStyle{authoryear-icomp} - -\newbool{cbx:scauthorscite} +\RequireCitationStyle{authoryear-comp} +\newtoggle{cbx:scauthorscite} \DeclareBibliographyOption{scauthorscite}[true]{% - \csuse{bool#1}{cbx:scauthorscite}} + \settoggle{cbx:scauthorscite}{#1}} \ExecuteBibliographyOptions{% scauthorscite=false, } -%*************************************************************************************************** -% -% AT EVERY CITE -% -%*************************************************************************************************** +% AT EVERY CITE +%************************************************************* \AtEveryCite{% - \ifbool{cbx:scauthorscite}% + \iftoggle{cbx:scauthorscite}% {\renewcommand*{\mkbibnamelast}[1]{\textsc{#1}}% \renewcommand*{\mkbibnamefirst}[1]{\textsc{#1}}% \renewcommand*{\mkbibnameprefix}[1]{\textsc{#1}}}% @@ -45,12 +41,10 @@ scauthorscite=false, \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}% \fi \usebibmacro{name:andothers}}} - - - - \newbibmacro*{textcitet}{% + +\newbibmacro*{textcitet}{% \iffieldequals{namehash}{\cbx@lasthash} - {\iffieldundef{shorthand} + {\iffieldundef{shorthandt} {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)} {\setunit{\addcomma}% @@ -67,12 +61,18 @@ scauthorscite=false, \setunit{% \global\booltrue{cbx:parens}% \addspace\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% \usebibmacro{cite:labelyear+extrayear}} {\usebibmacro{cite:shorthand}}} {\printnames{labelname}% \setunit{% \global\booltrue{cbx:parens}% \addspace\bibopenparen}% + \ifnumequal{\value{citecount}}{1} + {\usebibmacro{prenote}} + {}% \iffieldundef{shorthand} {\iffieldundef{labelyear} {\usebibmacro{cite:label}} @@ -82,7 +82,7 @@ scauthorscite=false, \global\undef\cbx@lastyear}% \savefield{namehash}{\cbx@lasthash}}}% \setunit{% - \ifbool{cbx:parens} + \iftoggle{cbx:parens} {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \multicitedelim}} @@ -128,7 +128,6 @@ scauthorscite=false, {\multicitedelim} {\usebibmacro{postnote}} - \DeclareCiteCommand{\footcitet}[\mkbibfootnote] {\usebibmacro{cite:init}% \usebibmacro{prenote}} @@ -140,7 +139,7 @@ scauthorscite=false, \ifthenelse{\value{multicitecount}=\value{multicitetotal}} {\setunit{}} {\setunit{% - \ifbool{cbx:parens} + \iftoggle{cbx:parens} {\bibcloseparen\global\boolfalse{cbx:parens}} {}% \multicitedelim}}} |