summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-apa
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-04-20 23:23:23 +0000
committerKarl Berry <karl@freefriends.org>2012-04-20 23:23:23 +0000
commitef035dc84f3184df9fe30b4566203da2b8eee254 (patch)
tree20a7038e68a388f495d91e05fbd3d2ef4fcf7772 /Master/texmf-dist/tex/latex/biblatex-apa
parent5ade70efc58e89e317d3d339d625690086652043 (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')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx31
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx2
10 files changed, 24 insertions, 25 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}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index 94f7cc8823b..14cee944036 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
@@ -1,4 +1,4 @@
-%% apa.cbx v4.6
+%% apa.cbx v4.7
%% Copyright 2011 Philip Kime
%%
%% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
index 3b6e71416db..a4196e8f3d2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
@@ -1,4 +1,4 @@
-% v4.6
+% v4.7
\ProvidesFile{british-apa.lbx}
\InheritBibliographyExtras{british}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
index f6c8ea27509..a0eee6a4b39 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
@@ -1,4 +1,4 @@
-% v4.6
+% v4.7
\ProvidesFile{dutch-apa.lbx}
\InheritBibliographyExtras{dutch}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
index 5a933bf2717..82c4be76ffa 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
@@ -1,4 +1,4 @@
-% v4.6
+% v4.7
\ProvidesFile{french-apa.lbx}
\InheritBibliographyExtras{french}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
index 63a358164bc..72127eeb8c2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
@@ -1,4 +1,4 @@
-% v4.6
+% v4.7
\ProvidesFile{german-apa.lbx}
\InheritBibliographyExtras{german}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
index 9a48a6b6fbf..eef20f1564e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
@@ -1,4 +1,4 @@
-% v4.6
+% v4.7
\ProvidesFile{greek-apa.lbx}
\InheritBibliographyExtras{greek}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
index 3c7c0b7e1db..62858b83328 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
@@ -1,4 +1,4 @@
-% v4.6
+% v4.7
\ProvidesFile{italian-apa.lbx}
\InheritBibliographyExtras{italian}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
index eda43de4791..61a352828df 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
@@ -1,4 +1,4 @@
-% v4.6
+% v4.7
\ProvidesFile{ngerman-apa.lbx}
\InheritBibliographyExtras{ngerman}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
index 093d69a9738..5ea970378a2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
@@ -1,4 +1,4 @@
-% v4.6
+% v4.7
\ProvidesFile{spanish-apa.lbx}
\InheritBibliographyExtras{spanish}