diff options
16 files changed, 37 insertions, 30 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README index cc7bea63f2b..ecd1a4adf83 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/README +++ b/Master/texmf-dist/doc/latex/biblatex-apa/README @@ -1,4 +1,4 @@ -Version 4.4 +Version 4.7 Permission is granted to copy, distribute and/or modify this software under the terms of the LaTeX Project Public License, version diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib index df76978ca76..53bfb6f55a0 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib @@ -91,7 +91,7 @@ % (APA 7.01 Example 8) @ARTICLE{7.01:8, - AUTHOR = {R. Clay}, + AUTHOR = {Richard Clay}, TITLE = {Science vs. Ideology}, SUBTITLE = {Psychologists Fight Back About the Misuse of Research}, JOURNALTITLE = {Monitor on Psychology}, 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 0562aabc25f..b9f1eeed274 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-test.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex index 861260936a7..a6db225eeeb 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex @@ -46,8 +46,10 @@ \setlength{\parskip}{3ex} -\def\apaex#1{\hbox{\hspace{-4em}\texttt{\small\detokenize{#1}}}\\$\rcurvearrowse$ \textbf{#1}} -\def\apaexs#1{\hbox{\texttt{\footnotesize\detokenize{#1}}} \textbf{\small #1}} +\makeatletter +\def\apaex#1{\hbox{\hspace{-4em}\texttt{\small\expandafter\zap@space\detokenize{#1} \@empty}}\\$\rcurvearrowse$ \textbf{#1}} +\def\apaexs#1{\hbox{\texttt{\footnotesize\expandafter\zap@space\detokenize{#1} \@empty}} \textbf{\small #1}} +\makeatother % This just makes it easier to find a specific (APA 7.x) example in the % typeset references section diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf Binary files differindex f5b6e4ca223..38b0673d6b5 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.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 5f794814e6b..22d8f2b063e 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.6}, + revision={4.7}, date={\today}} \hypersetup{% @@ -375,6 +375,12 @@ general notes: \begin{changelog} +\begin{release}{4.7}{2012-04-19} +\item Made |firstinits=false| possible +\item Fixed a problem with explicit «and others» with names (thanks to + George Pigman) +\end{release} + \begin{release}{4.6}{2012-02-08} \item Reduced the Biber requirement to a warning due to bug in |biblatex| 1.7 \item Added Italian localisation (thanks to Luca Montanelli) 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} |