diff options
author | Karl Berry <karl@freefriends.org> | 2012-04-20 23:23:23 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-04-20 23:23:23 +0000 |
commit | ef035dc84f3184df9fe30b4566203da2b8eee254 (patch) | |
tree | 20a7038e68a388f495d91e05fbd3d2ef4fcf7772 /Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx | |
parent | 5ade70efc58e89e317d3d339d625690086652043 (diff) |
biblatex-apa (20apr12)
git-svn-id: svn://tug.org/texlive/trunk@26075 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index eb5bc5bcd94..1d346fad9e4 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx @@ -1,4 +1,4 @@ -%% apa.bbx v4.6 +%% apa.bbx v4.7 %% Copyright 2011 Philip Kime %% %% This work may be distributed and/or modified under the @@ -326,15 +326,21 @@ % to do \printnames[format][-\value{listtotal}]{field} to ensure we get % all of the names in the list to work on +\DeclareNameAlias{default}{apaauthor} + \DeclareNameFormat{apaauthor}{% \ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{listtotal}} {\addcomma\addspace\ldots\addspace} {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}} {} {\ifthenelse{\iffieldequalstr{usere}{unkauth}\OR\iffieldequalstr{usere}{unkauthdate}} - {\mkbibbrackets{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}?}} - {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}}}} - + {\iffirstinits + {\mkbibbrackets{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}?}} + {\mkbibbrackets{\usebibmacro{name:last-first}{#1}{#3}{#5}{#7}?}}} + {\iffirstinits + {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}} + {\usebibmacro{name:last-first}{#1}{#3}{#5}{#7}}}}}% + \ifmorenames{\andothersdelim\bibstring{andothers}}{}} \renewbibmacro*{author}{% \ifnameundef{author} @@ -602,7 +608,10 @@ {\addcomma\addspace\ldots} {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}} {} - {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}}} + {\iffirstinits + {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}} + {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}}} + \ifmorenames{\andothersdelim\bibstring{andothers}}{}} \renewbibmacro*{author/editor}{% \ifnameundef{author} @@ -683,7 +692,7 @@ {}% {\ifnamesequal{editor}{translator}% {\printtext{\bibopenparen}\global\booltrue{bbx:parens}% - \printnames[apaenames][-\value{listtotal}]{editor}% + \printnames[apanames][-\value{listtotal}]{editor}% \setunit*{\addcomma\addspace}% \usebibmacro{apaeditorstrg}{editor}% \setunit*{\addspace\&\space}% @@ -970,9 +979,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Films -\DeclareNameFormat[movie]{namea}{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}} -\DeclareNameFormat[movie]{nameb}{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}} - \newbibmacro*{mediaauthor}{% \ifnameundef{namea} {} @@ -994,8 +1000,6 @@ %%%%%%%%%%%%%%%%% % (APA 7.07) Misc -\DeclareNameFormat[misc]{namea}{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}} -\DeclareNameFormat[misc]{namea}{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}} \DeclareFieldFormat[misc]{title}{\iffieldequalstr{userd}{dataset}{\mkbibemph{#1}}{% \iffieldequalstr{userd}{description}{\mkbibbrackets{#1}}{#1}}} \DeclareFieldFormat[misc]{entrysubtype}{\mkbibbrackets{#1}} @@ -1007,11 +1011,6 @@ %%%%%%%%%%%%%%%%%%%%%%%% % (APA 7.07) Audiovisual -\DeclareNameFormat[audio]{namea}{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}} -\DeclareNameFormat[audio]{nameb}{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}} -\DeclareNameFormat[video]{namea}{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}} -\DeclareNameFormat[video]{nameb}{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}} -\DeclareNameFormat[video]{namec}{\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}} \DeclareFieldFormat[video]{title}{\iffieldundef{maintitle}{\mkbibemph{#1}}{#1}} \DeclareFieldFormat[video]{maintitle}{\mkbibemph{#1}} \DeclareFieldFormat[video]{entrysubtype}{\mkbibbrackets{#1}} |