diff options
author | Karl Berry <karl@freefriends.org> | 2010-09-06 22:29:57 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-09-06 22:29:57 +0000 |
commit | 240dbb5ee820f2e77e4106bf872f363540c413e2 (patch) | |
tree | 3921b3f18013915f30f418d31199a3770604a0db /Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx | |
parent | 6892558c73756d9f24023e6269e025fa6f3cf15d (diff) |
biblatex 0.9d (4sep10)
git-svn-id: svn://tug.org/texlive/trunk@19592 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx | 56 |
1 files changed, 37 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx index ac08c959d7e..184e5249cd1 100644 --- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx +++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx @@ -1,7 +1,7 @@ -% $Id: authortitle.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $ +% $Id: authortitle.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $ \ProvidesFile{authortitle.bbx} -[\abx@bbxid $Id: authortitle.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $] +[\abx@bbxid $Id: authortitle.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $] \RequireBibliographyStyle{standard} \ExecuteBibliographyOptions{pagetracker} @@ -56,15 +56,16 @@ \finentry} \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} {\bibnamedash} {\printnames{author}% \setunit{\addcomma\space}% - \usebibmacro{bbx:savehash}}% + \usebibmacro{bbx:savehash}}% \usebibmacro{authorstrg}} {\global\undef\bbx@lasthash}} @@ -73,15 +74,16 @@ \renewbibmacro*{editor+others}{% \usebibmacro{bbx:editor}{editor+othersstrg}} \newbibmacro*{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{\addcomma\space}% - \usebibmacro{bbx:savehash}}% + \usebibmacro{bbx:savehash}}% \usebibmacro{#1}% \clearname{editor}} {\global\undef\bbx@lasthash}} @@ -91,11 +93,12 @@ \renewbibmacro*{translator+others}{% \usebibmacro{bbx:translator}{translator+othersstrg}} \newbibmacro*{bbx:translator}[1]{% - \ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{translator}} - {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND - \NOT\iffirstonpage\AND - \(\NOT\boolean{bbx@inset}\OR - \iffieldequalstr{entrysetcount}{1}\)} + \ifboolexpr{ + test \ifusetranslator + and + not test {\ifnameundef{translator}} + } + {\usebibmacro{bbx:dashcheck} {\bibnamedash} {\printnames{translator}% \setunit{\addcomma\space}% @@ -104,4 +107,19 @@ \clearname{translator}} {\global\undef\bbx@lasthash}} +\newbibmacro*{bbx:dashcheck}[2]{% + \ifboolexpr{ + test {\iffieldequals{fullhash}{\bbx@lasthash}} + and + not test \iffirstonpage + and + ( + not bool {bbx@inset} + or + test {\iffieldequalstr{entrysetcount}{1}} + ) + } + {#1} + {#2}} + \endinput |