diff options
-rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf | bin | 97436 -> 97436 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex | 12 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx | 126 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx | 2 |
13 files changed, 150 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf Binary files differindex c33fe1068da..e5bd1128287 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex index 7832e1dbb24..ce67ec9c66c 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex @@ -25,7 +25,7 @@ url={http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-apa/}, author={Philip Kime}, email={Philip@kime.org.uk}, - revision={4.4}, + revision={4.5}, date={\today}} \hypersetup{% @@ -45,6 +45,11 @@ Please see the revision history below (section \ref{rev}) for details on change version. This section is just for important things like incompatible changes which users should be aware of. +\minisec{4.5} +|biber| is now \emph{required}. This is because APA style needs a custom +sorting scheme and only |biber| supports this. |bibtex| support is going +away in |biblatex| eventually anyway so it's best to switch. + \minisec{4.4} The |\maxprtauth| command is now a package option called «apamaxprtauth», see section \ref{opts}. @@ -370,6 +375,11 @@ general notes: \begin{changelog} +\begin{release}{4.5}{2012-01-31} +\item Noted in manual that |biber| is now required due to custom sorting. +\item Added |INSTITUTION| field to |REPORT| entries +\end{release} + \begin{release}{4.4}{2012-01-25} \item |\maxprtauth| command is now a package option «apamaxprtauth» \item New package option «apabackref» controlling whether 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 b163719ce5a..edaef1c2611 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.4 +% v4.5 \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 dbb195150af..eb5bb31e302 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.4 +%% apa.bbx v4.5 %% Copyright 2011 Philip Kime %% %% This work may be distributed and/or modified under the @@ -26,7 +26,7 @@ %% biblatex-apa-test-references.bib (Style examples - references) \ProvidesFile{apa.bbx} -\RequireBiber[1] +\RequireBiber[3] % Biber is strictly required now due to custom sorting \RequireBibliographyStyle{standard} \urlstyle{rm} % APA examples all have URLs in same font as text @@ -1460,6 +1460,8 @@ \usebibmacro{title}% \usebibmacro{apa:reportnum}% \newunit\newblock + \printlist{institution}% + \newunit\newblock \printfield{note}% \newunit\newblock \usebibmacro{location+publisher}% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index 83885d9e15c..b3caa2307cc 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.4 +%% apa.cbx v4.5 %% 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 acd2417c883..0002bc56f84 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.4 +% v4.5 \ProvidesFile{brazilian-apa.lbx} \InheritBibliographyExtras{brazilian} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx new file mode 100644 index 00000000000..f0b161589e1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx @@ -0,0 +1,126 @@ +% v4.5 +\ProvidesFile{british-apa.lbx} +\InheritBibliographyExtras{british} + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{nodate} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} + +\DeclareBibliographyStrings{% + inherit = {british}, + revisededition = {{Revised\space Edition}{rev\adddotspace ed\adddot}}, + page = {{Page}{{}p\adddot}}, + pages = {{Pages}{{}pp\adddot}}, + on = {{on}{on}}, + retrieved = {{retrieved}{retrieved}}, + available = {{available}{available}}, + from = {{from}{from}}, + archivedat = {{archived\space at}{archived\space at}}, + nodate = {{no\space date}{{}n\adddot d\adddot}}, + reviewof = {{Review\space of}{review\space of}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + january = {{January}{January}}, + february = {{February}{February}}, + march = {{March}{March}}, + april = {{April}{April}}, + may = {{May}{May}}, + june = {{June}{June}}, + july = {{July}{July}}, + august = {{August}{August}}, + september = {{September}{September}}, + october = {{October}{October}}, + november = {{November}{November}}, + december = {{December}{December}}, + mathesis = {{Master's thesis}{Master's\addabbrvspace thesis}}, + phdthesis = {{Doctoral\addabbrvspace dissertation}{Doctoral\addabbrvspace dissertation}}, + origyear = {{original\space work\space published}{original\space work\space published}}, + typechair = {{Chair}{Chair}}, + typechairs = {{Chairs}{Chairs}}, + typevolume = {{Volume\space Editor}{Vol\adddot\space Ed\adddot}}, + typevolumes = {{Volume\space Editors}{Vol\adddot\space Eds\adddot}}, + typeseries = {{Series\space Editor}{Series\space Ed\adddot}}, + typeseriess = {{Series\space Editors}{Series\space Eds\adddot}}, + typevolseries = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddot\space Ed\adddot}}, + typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddot\space Eds\adddot}}, +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored + +\DefineBibliographyExtras{british}{% + \protected\def\mkbibdateapalong#1#2#3{% + \iffieldundef{#1}% + {}% + {\thefield{#1}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + \iffieldundef{#1}% + {}% + {\thefield{#1}\printfield{extrayear}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}% + \iffieldundef{#1}% + {}% + {\ifthenelse{\iffieldundef{#3}}% + {\ifthenelse{\iffieldundef{#2}}% + {}% + {\addspace}}% + {\addcomma\addspace}% + \thefield{#1}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\endinput 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 04352f5174e..cab6eb44989 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.4 +% v4.5 \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 acbe9dd97ad..2394660a313 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.4 +% v4.5 \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 b55be2207c9..8a2271cee29 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.4 +% v4.5 \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 e5be6414e73..cea91d128e2 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.4 +% v4.5 \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 c51761438fa..8027d925c51 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.4 +% v4.5 \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 4f01945e9c6..8e069a2372a 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.4 +% v4.5 \ProvidesFile{spanish-apa.lbx} \InheritBibliographyExtras{spanish} |