From 4d51899968f90298de218bf83b94b1fe6a9ec2b0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 27 Jan 2012 00:10:07 +0000 Subject: biblatex-apa (26jan12) git-svn-id: svn://tug.org/texlive/trunk@25208 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-apa/american-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx | 51 +++++++++++++++++++++- Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx | 2 +- .../tex/latex/biblatex-apa/brazilian-apa.lbx | 2 +- .../tex/latex/biblatex-apa/dutch-apa.lbx | 2 +- .../tex/latex/biblatex-apa/french-apa.lbx | 2 +- .../tex/latex/biblatex-apa/german-apa.lbx | 2 +- .../tex/latex/biblatex-apa/greek-apa.lbx | 2 +- .../tex/latex/biblatex-apa/ngerman-apa.lbx | 2 +- .../tex/latex/biblatex-apa/spanish-apa.lbx | 2 +- 10 files changed, 59 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-apa') diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx index 69eb0f5457c..b163719ce5a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx @@ -1,4 +1,4 @@ -% v4.3 +% v4.4 \ProvidesFile{american-apa.lbx} \InheritBibliographyExtras{american} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index d1a813d4377..dbb195150af 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.3 +%% apa.bbx v4.4 %% Copyright 2011 Philip Kime %% %% This work may be distributed and/or modified under the @@ -44,6 +44,10 @@ % Allow variable max authors/editors limit \newcommand{\maxprtauth}{7} +\DeclareBibliographyOption{apamaxprtauth}{% + \ifstrempty{#1} + {} + {\renewcommand{\maxprtauth}{#1}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -201,6 +205,7 @@ \ExecuteBibliographyOptions{labelyear=true,% sorting=apa,% + backref=true,% pagetracker=true,% firstinits=true,% useprefix=true,% @@ -217,6 +222,19 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% It is not APA standard to have backrefs in the bib +% Some users might like it though. + +\newbool{apa:backref} +\DeclareBibliographyOption{apabackref}{% + \ifstrequal{#1}{true} + {\global\booltrue{apa:backref}} + {\global\boolfalse{apa:backref}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 6.29) Additional material sometimes goes in parens % after title. This bool tracks the parens. @@ -1143,6 +1161,7 @@ \newunit\newblock \printfield{addendum}% \usebibmacro{apa:finpunct}% + \usebibmacro{apa:pageref}% \usebibmacro{finentry}} \DeclareBibliographyDriver{book}{% @@ -1165,6 +1184,7 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1186,6 +1206,7 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1213,6 +1234,7 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1234,6 +1256,7 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1261,6 +1284,7 @@ \usebibmacro{origyear}% \newunit\newblock \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1288,6 +1312,7 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1321,6 +1346,7 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1348,6 +1374,7 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1374,6 +1401,7 @@ \iffieldundef{url}{}{\renewcommand*{\finentrypunct}{\relax}} \newunit\newblock \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1396,6 +1424,7 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1419,6 +1448,7 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1437,6 +1467,7 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1454,6 +1485,7 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1475,6 +1507,7 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1502,6 +1535,7 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1523,6 +1557,7 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1542,6 +1577,7 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1561,6 +1597,7 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1578,6 +1615,7 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1592,6 +1630,7 @@ \newunit\newblock \usebibmacro{location+publisher}% \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1606,6 +1645,7 @@ \newunit\newblock \usebibmacro{doi+eprint+url}% \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct}% \usebibmacro{finentry}} @@ -1627,6 +1667,7 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{addendum}% + \usebibmacro{apa:pageref}% \usebibmacro{apa:finpunct} \usebibmacro{finentry}} @@ -1730,6 +1771,14 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Wrapper for backrefs + +\newbibmacro{apa:pageref}{% + \ifbool{apa:backref}{\usebibmacro{pageref}}{}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index 7b3ac3e965a..83885d9e15c 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.3 +%% apa.cbx v4.4 %% Copyright 2011 Philip Kime %% %% This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx index 390bed25f2b..acd2417c883 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx @@ -1,4 +1,4 @@ -% v4.3 +% v4.4 \ProvidesFile{brazilian-apa.lbx} \InheritBibliographyExtras{brazilian} 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 a4e007561a5..04352f5174e 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.3 +% v4.4 \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 27b2f4fe17e..acbe9dd97ad 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.3 +% v4.4 \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 9335699464a..b55be2207c9 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.3 +% v4.4 \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 682f338aaca..e5be6414e73 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.3 +% v4.4 \ProvidesFile{greek-apa.lbx} \InheritBibliographyExtras{greek} 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 fc836917b8d..c51761438fa 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.3 +% v4.4 \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 9a8a54ac3cb..4f01945e9c6 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.3 +% v4.4 \ProvidesFile{spanish-apa.lbx} \InheritBibliographyExtras{spanish} -- cgit v1.2.3