diff options
author | Karl Berry <karl@freefriends.org> | 2010-03-09 00:22:50 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-03-09 00:22:50 +0000 |
commit | 62993c5bcad4ec24f4de93ef85f925278433b941 (patch) | |
tree | dbb395e18efdf1fba65bada6d0927ac55fbf292d /Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx | |
parent | 5d748b68d77bc6f3bf05eb9abbf7e7071a124449 (diff) |
biblatex-philosophy update (8mar10)
git-svn-id: svn://tug.org/texlive/trunk@17387 c570f23f-e606-0410-a88d-b1316a301751
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 | 222 |
1 files changed, 56 insertions, 166 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 8f686073d13..b42152fe62a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-philosophy/philosophy-modern.bbx @@ -1,11 +1,11 @@ - % $Id: philosophy-modern.bbx,v 0.4c 2010/02/27 Valbusa$ +% $Id: philosophy-modern.bbx,v 0.5 2010/03/07 Valbusa$ % Copyright 2009-2010 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.4c 2010/02/27 valbusa beta$] +\ProvidesFile{philosophy-modern.bbx}[philosophy-modern.bbx,v 0.5 2010/03/07 valbusa beta$] \RequireBibliographyStyle{philosophy-classic} @@ -35,7 +35,8 @@ yearleft=false% %% new commands %%--------------------------------------------------------------------------------------------- -\newcommand{\postsep}{\par\vspace*{\postnamesep}\hspace*{-\bibhang}\ignorespaces} +\newcommand{\postsep}{\par\nobreak\vskip\postnamesep\hskip-\bibhang\ignorespaces} + %\renewcommand{\labelnamepunct}{% % \ifthenelse{\ifnameundef{author}} @@ -55,50 +56,7 @@ yearleft=false% \AtBeginShorthands{% \renewcommand{\postsep}{} - \renewcommand{\labelnamepunct}{\addcomma\space} -\renewbibmacro*{commaloc}{% - \iflistundef{publisher}{} - {\printlist{publisher}} - \setunit*{\addcomma\space}% - \printlist{location}% - \setunit*{\space}% - \printtext{\printdateextra}% - \newunit} -\renewbibmacro*{colonloc}{% - \printlist{location}% - \iflistundef{publisher} - {\setunit*{\addspace}} - {\setunit*{\addcolon\space}}% - \printlist{publisher}% - \setunit*{\addcomma\space}% - \printtext{\printdateextra}% - \newunit} -\renewbibmacro*{date+extrayear}{} -\renewbibmacro*{origfields}{% - \iflistundef{origlocation}% - {} - {\setunit{\addsemicolon\space} - \iffieldundef{reprinttitle}% - {\printtext{\bibstring{reprintas}}} - {\printtext{\bibstring{reprint}}\nopunct} - \setunit{\addspace} - \iffieldundef{reprinttitle}% - {\usebibmacro{origtitle}} - {\usebibmacro{reprinttitle}} - \newunit\newblock - \usebibmacro{origpublisher+origlocation+origdate}} -} - -\renewbibmacro*{title}{% - \ifthenelse{\iffieldundef{title}\AND\iffieldundef{subtitle}} - {}% - {\printtext[title]{% - \printfield[titlecase]{title}% - \setunit{\subtitlepunct}% - \printfield[titlecase]{subtitle}}% - \newunit}% - \printfield{titleaddon}} -} + \renewcommand{\labelnamepunct}{\addcomma\space}} %%--------------------------------------------------------------------------------------------- @@ -109,38 +67,10 @@ yearleft=false% \iffieldundef{year}% {}% {\makebox[\bibhang][r]{% - \printtext{\printdateextra% + \printtext{\printfield{labelyear}\printfield{extrayear}% \hskip\yeartitle}}}} -\renewbibmacro*{title}{% - \ifthenelse{\iffieldundef{title}\AND\iffieldundef{subtitle}} - {}% - {\iflistundef{origlocation} - {\iffieldundef{origdate} - {} - {\printtext[parens]{\bibstring{reprintof}\addspace\printorigdate}} - \printtext[title]{% - \printfield[titlecase]{title}% - \setunit{\subtitlepunct}% - \printfield[titlecase]{subtitle}}} - {\printtext[title]{% - \printfield[titlecase]{title}% - \setunit{\subtitlepunct}% - \printfield[titlecase]{subtitle}} - }% - \newunit}% -\printfield{titleaddon}} - -\renewbibmacro*{maintitle}{% - \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{mainsubtitle}} - {} - {%\iffieldundef{origlocation}{\printtext{ed. or. \printfield{year}}}{} - \printtext[maintitle]{% - \printfield[titlecase]{maintitle}% - \setunit{\subtitlepunct}% - \printfield[titlecase]{mainsubtitle}}% - \newunit}% - \printfield{maintitleaddon}} + % label for entries without 'editor' and 'author' @@ -154,84 +84,52 @@ yearleft=false% {\printtext{\printfield{label}}% \postsep}} -% macro 'author' +% macro 'author' OKKKKK %%---------------------------------------------------- + \renewbibmacro*{author}{% - \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}} - {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND - \NOT\iffirstonpage} - {}% - {\savefield{fullhash}{\bbx@lasthash}% - \printnames{author}% - \postsep - \iffieldundef{authortype} - {}% - {\setunit{\addcomma\space}}}% + \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}} + {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND + \NOT\iffirstonpage\AND + \(\NOT\boolean{bbx@inset}\OR + \iffieldequalstr{entrysetcount}{1}\)} + {}%MOD + {\usebibmacro{bbx:savehash}% + \printnames{author}% + \postsep%ADD \iffieldundef{authortype} - {}% - {\usebibmacro{authorstrg}% + {\setunit{\addspace}} + {\setunit{\addcomma\space}}}% + \iffieldundef{authortype} + {} + {\usebibmacro{authorstrg}% \setunit{\addspace}}}% - {\global\undef\bbx@lasthash - \usebibmacro{labeltitle}}% - \usebibmacro{date+extrayear}} + {\global\undef\bbx@lasthash + \usebibmacro{labeltitle}% + \setunit*{\addspace}}% + \usebibmacro{date+extrayear}} -% macro 'editor' + +% macro 'editor' OKKKKKK %%---------------------------------------------------- \renewbibmacro*{bbx:editor}[1]{% - \ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}} - {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND - \NOT\iffirstonpage} - {}% - {\printnames{editor}% - \postsep\savefield{fullhash}{\bbx@lasthash}}% - \clearname{editor}}% - {\global\undef\bbx@lasthash - \usebibmacro{labeltitle}% - }% - \usebibmacro{date+extrayear}% - \setunit*{\unspace} - \iffieldundef{label} - {\usebibmacro{#1}}{}% - } - - -%%--------------------------------------------------------------------------------------------- -% Crossref -%%--------------------------------------------------------------------------------------------- - -\renewbibmacro*{crossdate+extrayear}{% - \iffieldundef{year}% - {}% - {\unspace\printtext[parens]{\printdateextra}}} - -\DeclareCiteCommand{\bbx@inbookcrossref} - {}% - {\ifsingletitle% - {\printtext[bibhyperref]{\ifthenelse{\value{listtotal}=2} - {\printnames[][-\value{maxnamesincross}]{labelname}} - {\printnames[][-\value{minnamesincross}]{labelname}}}}% - {\ifthenelse{\value{listtotal}=2} - {\printnames[][-\value{maxnamesincross}]{labelname}} - {\printnames[][-\value{minnamesincross}]{labelname}} - \setunit{\addspace} - \printtext[bibhyperref]{\usebibmacro{crossdate+extrayear}}}}% - {\unspace}% - {\unspace} - -\DeclareCiteCommand{\bbx@crossref} - {}% - {\ifsingletitle% - {\printtext[bibhyperref]{\ifthenelse{\value{listtotal}=2} - {\printnames[][-\value{maxnamesincross}]{labelname}} - {\printnames[][-\value{minnamesincross}]{labelname}}}}% - {\ifthenelse{\value{listtotal}=2} - {\printnames[][-\value{maxnamesincross}]{labelname}} - {\printnames[][-\value{minnamesincross}]{labelname}} - \setunit{\addspace} - \printtext[bibhyperref]{\usebibmacro{crossdate+extrayear}}}}% - {\unspace}% - {\unspace} + \ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}} + {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND + \NOT\iffirstonpage\AND + \(\NOT\boolean{bbx@inset}\OR + \iffieldequalstr{entrysetcount}{1}\)} + {}%MOD + {\printnames{editor}% + \postsep%ADD + \usebibmacro{bbx:savehash}}% + \clearname{editor}}% + {\global\undef\bbx@lasthash + \usebibmacro{labeltitle}}% + \usebibmacro{date+extrayear}% + \iffieldundef{label} + {\usebibmacro{#1}\setunit{\addcomma\space}}{}% + } %%--------------------------------------------------------------------------------------------- % BIBLIOGRAPHY DRIVERS @@ -241,16 +139,15 @@ yearleft=false% \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{editor+others}% - \ifuseeditor{\setunit{\addspace}}% - {\unspace}\newblock - \usebibmacro{maintitle+title}% + \setunit{\addcomma\space}\newblock + \usebibmacro{maintitle+title}% \newunit \printlist{language}% \newunit\newblock \usebibmacro{byeditor+others}% \newunit\newblock - \printfield{edition}% - \newunit% + \printfield{edition}% + \newunit \iffieldundef{maintitle} {\printfield{volume}% \printfield{part}} @@ -268,23 +165,16 @@ yearleft=false% \newunit \printfield{pagetotal}% \newunit\newblock - \printfield{isbn}% - \newunit\newblock - \printfield{doi}% + \iftoggle{bbx:isbn} + {\printfield{isbn}} + {}% \newunit\newblock - \usebibmacro{eprint}% + \usebibmacro{doi+eprint+url}% \newunit\newblock - \usebibmacro{url+urldate}% + \usebibmacro{addendum+pubstate}% \newunit\newblock - \printfield{addendum}% - \usebibmacro{origfields}% - \newunit\newblock - \usebibmacro{annotation}% - \newunit\newblock - \usebibmacro{pageref}% - \newunit\newblock - \usebibmacro{finentry}} - + \usebibmacro{pageref}% + \usebibmacro{finentry}} \DeclareBibliographyDriver{set}{% |