summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-05-16 22:09:09 +0000
committerKarl Berry <karl@freefriends.org>2011-05-16 22:09:09 +0000
commit974432f9910907645c85a06a8692eff260de45b2 (patch)
treecaaddbfde35d04383fb8786a532608df662516c3 /Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
parent417e91d078352571aefe2bffd3cc2c1e5cc08f60 (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.bbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx154
1 files changed, 79 insertions, 75 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
index af0b0a9066c..ba6c2b445a8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx
@@ -1,11 +1,11 @@
-% $Id: philosophy-classic.bbx,v 0.7b 2010/11/20 Valbusa$
-% Copyright 2009-2010 Ivan Valbusa. This package is author-maintained.
+% $Id: philosophy-classic.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-classic.bbx}[philosophy-classic.bbx,v 0.7b 2010/11/20 valbusa beta$]
+\ProvidesFile{philosophy-classic.bbx}[philosophy-classic.bbx,v 0.7c 2011/05/16 valbusa beta$]
\RequireBibliographyStyle{authoryear}
\RequireBibliographyStyle{philosophy-standard}
@@ -13,18 +13,16 @@
% DECLARE AND EXECUTE BIBLIOGRAPHY OPTIONS
%*********************************************************************
-
-\newbool{bbx:square}
-
-
+\newtoggle{bbx:square}
\DeclareBibliographyOption{square}[true]{%
- \csuse{bool#1}{bbx:square}}
+ \settoggle{bbx:square}{#1}}
\ExecuteBibliographyOptions{%
uniquename=false,
pagetracker,
singletitle=false,
-square=false}
+square=false,
+mergedate=basic}
%$$$$$$
\newcounter{maxnamesincross}
@@ -34,7 +32,7 @@ square=false}
% AT BEGIN SHORTHANDS
%*****************************************
\AtBeginShorthands{%
-\boolfalse{bbx:annotation}
+\togglefalse{bbx:annotation}
\renewcommand{\labelnamepunct}{\addcomma\space}
\renewbibmacro*{publocyear}{%
\iflistundef{publisher}{}
@@ -70,7 +68,7 @@ square=false}
\setcounter{maxnamesincross}{\value{maxnames}}
\setcounter{minnamesincross}{\value{minnames}}
- \ifbool{bbx:square}
+ \iftoggle{bbx:square}
{\renewcommand{\bibopenparen}{\bibopenbracket}%
\renewcommand{\bibcloseparen}{\bibclosebracket}}
{}}
@@ -78,33 +76,45 @@ square=false}
%*********************************************************************
% NUOVE MACRO
%*********************************************************************
-
-% per eliminare il mese nelle etichette delle voci article
-\renewbibmacro*{date+extrayear}{%
- \iffieldundef{year}
- {}%
- {\printtext[parens]{\printfield{labelyear}\printfield{extrayear}}}}
-\renewbibmacro*{issue+date}{%
-\ifdefstring{\bbx@volnumformat}{volnumparens}
-{\ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}}{}{\printtext{%
- \iffieldundef{issue}
- {\printfield{month}}%
- {\printfield{issue}}}}}%
- {\ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}}{}{\printtext[parens]{%
- \iffieldundef{issue}
- {\printfield{month}}%
- {\printfield{issue}}}}}%
- \newunit}
+% mergedate=basic
+%\renewbibmacro*{date+extrayear}{%
+% \iffieldundef{labelyear}
+% {}
+% {\printtext[parens]{%
+% \printfield{labelyear}%
+% \printfield{extrayear}}}}%
+% \renewbibmacro*{date}{%
+% \iffieldundef{month}
+% {}
+% {\printdate}}%
+ \renewbibmacro*{issue+date}{%
+ \ifboolexpr{
+ test {\iffieldundef{issue}}
+ and
+ test {\iffieldundef{month}}
+ }
+ {}
+ {\ifdefstring{\bbx@volnumformat}{volnumparens}
+ {\printtext{%
+ \printfield{issue}%
+ \setunit*{\addspace}%
+ \printdate}}%
+ {\printtext[parens]{%
+ \printfield{issue}%
+ \setunit*{\addspace}%
+ \printdate}}}%
+ \newunit}%
% changed
\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}\)}
+ \ifboolexpr{
+ test \ifuseeditor
+ and
+ not test {\ifnameundef{editor}}
+ }
+ {\usebibmacro{bbx:dashcheck}
{\bibnamedash}
{\printnames{editor}%
\setunit{\addspace}%
@@ -126,7 +136,6 @@ square=false}
\setunit*{\addcomma\space}%
\printlist{location}%
\newunit}
-
\newbibmacro*{inpublocyear}{%
\iflistundef{institution}%
{}
@@ -134,7 +143,6 @@ square=false}
\setunit*{\addcomma\space}%
\printlist{location}%
\newunit}
-
\newbibmacro*{orgpublocyear}{%
\iflistundef{organization}%
{}
@@ -146,54 +154,50 @@ square=false}
% Macro per la forma ``Location: Publisher, Year''
%****************************************************************
\newbibmacro*{loccolonpub}{%
- \printlist{location}%
- \iflistundef{publisher}%
- {\setunit*{\addspace}}
- {\setunit*{\addcolon\space}}%
- \printlist{publisher}%
-\newunit}
-
+ \printlist{location}%
+ \iflistundef{publisher}%
+ {\setunit*{\addspace}}
+ {\setunit*{\addcolon\space}}%
+ \printlist{publisher}%
+ \newunit}
\newbibmacro*{inloccolonpub}{%
- \printlist{location}%
- \iflistundef{institution}%
- {\setunit*{\addspace}}
- {\setunit*{\addcolon\space}}%
- \printlist{institution}%
-\newunit}
-
+ \printlist{location}%
+ \iflistundef{institution}%
+ {\setunit*{\addspace}}
+ {\setunit*{\addcolon\space}}%
+ \printlist{institution}%
+ \newunit}
\newbibmacro*{orgloccolonpub}{%
- \printlist{location}%
- \iflistundef{organization}%
- {\setunit*{\addspace}}
- {\setunit*{\addcolon\space}}%
- \printlist{organization}%
-\newunit}
+ \printlist{location}%
+ \iflistundef{organization}%
+ {\setunit*{\addspace}}
+ {\setunit*{\addcolon\space}}%
+ \printlist{organization}%
+ \newunit}
% Macro per la forma ``Location, Publisher, Year''
%**************************************************************
\newbibmacro*{locpubyear}{%
- \printlist{location}%
- \iflistundef{publisher}%
- {\setunit*{\addspace}}
- {\setunit*{\addcomma\space}}%
- \printlist{publisher}%
-\newunit}
-
+ \printlist{location}%
+ \iflistundef{publisher}%
+ {\setunit*{\addspace}}
+ {\setunit*{\addcomma\space}}%
+ \printlist{publisher}%
+ \newunit}
\newbibmacro*{inlocpubyear}{%
- \printlist{location}%
- \iflistundef{institution}%
- {\setunit*{\addspace}}
- {\setunit*{\addcomma\space}}%
- \printlist{institution}%
-\newunit}
-
+ \printlist{location}%
+ \iflistundef{institution}%
+ {\setunit*{\addspace}}
+ {\setunit*{\addcomma\space}}%
+ \printlist{institution}%
+ \newunit}
\newbibmacro*{orglocpubyear}{%
- \printlist{location}%
- \iflistundef{organization}%
- {\setunit*{\addspace}}
- {\setunit*{\addcomma\space}}%
- \printlist{organization}%
-\newunit}
+ \printlist{location}%
+ \iflistundef{organization}%
+ {\setunit*{\addspace}}
+ {\setunit*{\addcomma\space}}%
+ \printlist{organization}%
+ \newunit}
%*********************************************************************
%% BIBLIOGRAPHY DRIVERS