diff options
author | Karl Berry <karl@freefriends.org> | 2012-05-05 22:02:18 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-05-05 22:02:18 +0000 |
commit | 657c5892770a6a90aa8626c27e61a87586e5565c (patch) | |
tree | 03670a95290f09f179812afe300da8a993fa8104 /Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-classic.bbx | |
parent | 4c56a7f771b8c9fabb57b8def881a6c6785e5699 (diff) |
biblatex-philosophy (5may12)
git-svn-id: svn://tug.org/texlive/trunk@26219 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.bbx | 173 |
1 files changed, 100 insertions, 73 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 ba6c2b445a8..e73a0c88271 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.7c 2011/05/16 Valbusa$ -% Copyright 2009-2011 Ivan Valbusa. This package is author-maintained. +% $Id: philosophy-classic.bbx,v 0.8b 2012/05/06 Valbusa$ +% Copyright 2009-2012 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.7c 2011/05/16 valbusa beta$] +\ProvidesFile{philosophy-classic.bbx}[philosophy-classic.bbx,v 0.8b 2012/05/06 valbusa beta$] \RequireBibliographyStyle{authoryear} \RequireBibliographyStyle{philosophy-standard} @@ -18,11 +18,13 @@ \settoggle{bbx:square}{#1}} \ExecuteBibliographyOptions{% -uniquename=false, -pagetracker, -singletitle=false, -square=false, -mergedate=basic} +uniquename =false, +pagetracker =true, +singletitle =false, +square =false, +mergedate =basic, +dashed=false, +} %$$$$$$ \newcounter{maxnamesincross} @@ -32,34 +34,34 @@ mergedate=basic} % AT BEGIN SHORTHANDS %***************************************** \AtBeginShorthands{% -\togglefalse{bbx:annotation} -\renewcommand{\labelnamepunct}{\addcomma\space} +\togglefalse{bbx:annotation}% +\renewcommand{\labelnamepunct}{\addcomma\space}% \renewbibmacro*{publocyear}{% - \iflistundef{publisher}{} - {\printlist{publisher}} + \iflistundef{publisher}{}% + {\printlist{publisher}}% \setunit*{\addcomma\space}% \printlist{location}% \setunit*{\space}% \printtext{\printfield{labelyear}}% - \newunit} + \newunit}% \renewbibmacro*{loccolonpub}{% \printlist{location}% - \iflistundef{publisher} - {\setunit*{\addspace}} + \iflistundef{publisher}% + {\setunit*{\addspace}}% {\setunit*{\addcolon\space}}% \printlist{publisher}% \setunit*{\addcomma\space}% \printtext{\printfield{labelyear}}% - \newunit} + \newunit}% \renewbibmacro*{locpubyear}{% \printlist{location}% - \iflistundef{publisher} - {\setunit*{\addspace}} + \iflistundef{publisher}% + {\setunit*{\addspace}}% {\setunit*{\addcomma\space}}% \printlist{publisher}% \setunit*{\addcomma\space}% \printtext{\printfield{labelyear}}% - \newunit} + \newunit}% \renewbibmacro*{date+extrayear}{}} % AT BEGIN DOCUMENT @@ -76,44 +78,58 @@ mergedate=basic} %********************************************************************* % NUOVE MACRO %********************************************************************* - -% 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}}}% + \printfield{issue}% \setunit*{\addspace}% + \printdate + }}{\printtext[parens]{% + \printfield{issue}% \setunit*{\addspace}% + \printdate + }}}% \newunit}% % changed +\renewbibmacro*{author}{% + \ifboolexpr{ + test \ifuseauthor + and + not test {\ifnameundef{author}} + }% + {\usebibmacro{bbx:dashcheck} + {\bibnamedash} + {\usebibmacro{bbx:savehash}% + \printnames{author}% + \iffieldundef{nameaddon}{}% + {\setunit{\addspace}% + \printtext[brackets]{\printfield{nameaddon}}}% + \iffieldundef{authortype} + {\setunit{\addspace}} + {\setunit{\addcomma\space}}}% + \iffieldundef{authortype} + {}% + {\usebibmacro{authorstrg}% + \setunit{\addspace}}}% + {\global\undef\bbx@lasthash + \usebibmacro{labeltitle}% + \setunit*{\addspace}}% + \usebibmacro{date+extrayear}} + +\renewbibmacro*{editor+others}{% + \usebibmacro{bbx:editor}{editorstrg}} \renewbibmacro*{bbx:editor}[1]{% \ifboolexpr{ test \ifuseeditor and not test {\ifnameundef{editor}} - } + }% {\usebibmacro{bbx:dashcheck} {\bibnamedash} {\printnames{editor}% @@ -126,32 +142,33 @@ mergedate=basic} \usebibmacro{labeltitle}% \setunit*{\addspace}}% \usebibmacro{date+extrayear}} - -% Macro per la forma ``Publisher, Location Year''. + +%************************************************************** +%``Publisher, Location Year''. %**************************************************************** \newbibmacro*{publocyear}{% \iflistundef{publisher}% - {} + {}% {\printlist{publisher}} \setunit*{\addcomma\space}% \printlist{location}% \newunit} \newbibmacro*{inpublocyear}{% \iflistundef{institution}% - {} + {}% {\printlist{institution}} \setunit*{\addcomma\space}% \printlist{location}% - \newunit} + \newunit} \newbibmacro*{orgpublocyear}{% \iflistundef{organization}% - {} + {}% {\printlist{organization}} \setunit*{\addcomma\space}% \printlist{location}% \newunit} - -% Macro per la forma ``Location: Publisher, Year'' +%************************************************************** +%``Location: Publisher, Year'' %**************************************************************** \newbibmacro*{loccolonpub}{% \printlist{location}% @@ -173,9 +190,9 @@ mergedate=basic} {\setunit*{\addspace}} {\setunit*{\addcolon\space}}% \printlist{organization}% - \newunit} - -% Macro per la forma ``Location, Publisher, Year'' + \newunit} +%************************************************************** +%``Location, Publisher, Year'' %************************************************************** \newbibmacro*{locpubyear}{% \printlist{location}% @@ -198,10 +215,6 @@ mergedate=basic} {\setunit*{\addcomma\space}}% \printlist{organization}% \newunit} - -%********************************************************************* -%% BIBLIOGRAPHY DRIVERS -%********************************************************************* \newbibmacro*{crossdate+extrayear}{% \iffieldundef{year}% @@ -210,16 +223,21 @@ mergedate=basic} \DeclareCiteCommand{\bbx@crossref} {}% - {\ifuseeditor{%\ifthenelse{\value{listtotal}=2} - %{\printnames[][-\value{maxnamesincross}]{labelname}} - %{\printnames[][-\value{minnamesincross}]{labelname}} - \printnames{labelname}} + {\ifuseeditor{\ifthenelse{\value{listtotal}=2}% + {\printnames[][-\value{maxnamesincross}]{labelname}}% + {\printnames[][-\value{minnamesincross}]{labelname}}}% {\usebibmacro{labeltitle}} \setunit*{\addspace}% \printtext{\usebibmacro{crossdate+extrayear}}}% {}% {}% +%----------------------------------------------------------------- +% +% DRIVERS +% +%----------------------------------------------------------------- + \DeclareBibliographyDriver{incollection}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% @@ -234,11 +252,16 @@ mergedate=basic} \usebibmacro{in:}% \iffieldundef{crossref}% {\usebibmacro{incollection:full}}% - {\printtext{\setunit{\unspace}}% Thanks to Sander Gliboff - \bbx@crossref{\thefield{crossref}}% - \newunit\newblock - \printfield{userd}% - \newunit\newblock + {\bbx@crossref{\thefield{crossref}}% +% \newunit\newblock +% \printfield{userd}% +% \newunit\newblock + \newunit\newblock + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} @@ -247,7 +270,7 @@ mergedate=basic} \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock - \usebibmacro{incolladdendum+pubstate}% + \usebibmacro{addendum+pubstate:article-book-incoll}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}}} @@ -266,11 +289,16 @@ mergedate=basic} \usebibmacro{in:}% \iffieldundef{crossref}% {\usebibmacro{inbook:full}}% - {%\printtext{\setunit{\unspace}}% Thanks to Sander Gliboff - \bbx@crossref{\thefield{crossref}}% - \newunit\newblock - \printfield{userd}% - \newunit\newblock + {\bbx@crossref{\thefield{crossref}}% +% \newunit\newblock +% \printfield{userd}% +% \newunit\newblock + \newunit\newblock + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit \usebibmacro{chapter+pages}% \newunit\newblock \iftoggle{bbx:isbn} @@ -279,10 +307,9 @@ mergedate=basic} \newunit\newblock \usebibmacro{doi+eprint+url}% \newunit\newblock - \usebibmacro{inbookaddendum+pubstate}% + \usebibmacro{addendum+pubstate:article-book-incoll}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}}} - - + \endinput
\ No newline at end of file |