summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/README2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdfbin102665 -> 102549 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex4
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdfbin121349 -> 121777 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx1
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx22
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx89
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx1
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx1
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx1
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx1
13 files changed, 72 insertions, 60 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index 42d5f31683d..6504740178e 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/README
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/README
@@ -1,4 +1,4 @@
-Version 2.2
+Version 2.3
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 1e0384e5e0e..6d3fa173d35 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
@@ -626,7 +626,7 @@
ENTRYSUBTYPE = {Review of the video game},
ORIGTITLE = {BioShock},
VERBA = {produced by 2K Games, 2007},
- URL = {http://www.wattheyplay.com/products/bioshock-for-xbox-360/?fm=3&ob=1&t=0#166},
+ URL = {http://www.whattheyplay.com/products/bioshock-for-xbox-360/?fm=3&ob=1&t=0#166},
}
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
index cfe1d9175c5..21e197e8cd0 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
Binary files differ
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 db5216bd019..a40e9138981 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
@@ -35,6 +35,8 @@
\reversemarginpar
\renewbibmacro*{begentry}{\marginpar{\footnotesize \textcolor{blue}{\thefield{entrykey}}}}
+%\usepackage[colorlinks=true]{hyperref}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%% END PREAMBLE %%%%%%%%%%%%%%%%%%%%%%%%%
\DeclareLanguageMapping{american}{american-apa}
@@ -202,7 +204,7 @@ Two or more works withing the same parentheses:\\
same authors in the example.}
\noindent Compact citations in alphabetic order:\\
-\apaex{\parencite{6.16k,6.16l}}
+\apaex{\parencites{6.16k,6.16l}}
\noindent Compact citations with special order:\\
\apaex{\parencites{6.16m}[see also][]{6.16n,6.16o}}
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
index f511f4bea85..93010914058 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
Binary files differ
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 f3f8dd9351e..511d1d734fc 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
@@ -23,7 +23,7 @@
url={http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
author={Philip Kime},
email={Philip@kime.org.uk},
- revision={2.2},
+ revision={2.3},
date={\today}}
\hypersetup{%
@@ -336,7 +336,11 @@ to see how it was implemented. Some general notes:
\begin{changelog}
-\begin{release}{2.2}{2010-10-}
+\begin{release}{2.3}{2010-11-04}
+\item Overhauled hyperref functionality and made more robust
+\end{release}
+
+\begin{release}{2.2}{2010-10-15}
\item Parameterised max author/editor list (thanks to Paul Thompson)
\item Better rudimentary regression script
\item Completely reconfigured EPRINT/EPRINTTYPE
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 6df2e0a4619..90849369e29 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
@@ -1,3 +1,4 @@
+% v2.3
\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 d99360ea55d..f5f499f4c71 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
+%% apa.bbx v2.3
%% Copyright 2010 Philip Kime
%%
%% This work may be distributed and/or modified under the
@@ -381,12 +381,12 @@
\newbibmacro*{bookaddinfo}{%
\ifthenelse{\iffieldundef{edition}\AND\iffieldundef{volumes}}
{}
- {\printtext{\bibleftparen}%
+ {\printtext{\bibopenparen}%
\printfield{edition}%
\setunit*{\addcomma\addspace}%
\printfield{volumes}%
\setunit{}%
- \printtext{\bibrightparen}}%
+ \printtext{\bibcloseparen}}%
}
\renewbibmacro*{title}{%
@@ -483,7 +483,7 @@
\iffieldundef{number}\AND%
\(\iffieldundef{volume}\OR\boolean{bbx:volseen}\)}
{}
- {\printtext{\bibleftparen}%
+ {\printtext{\bibopenparen}%
\printfield{edition}%
\setunit*{\addcomma\addspace}%
\printfield{chapter}%
@@ -499,7 +499,7 @@
\setunit*{\addcomma\addspace}%
\printfield{pages}%
\setunit{}%
- \printtext{\bibrightparen}%
+ \printtext{\bibcloseparen}%
\newunit}}
%
@@ -620,14 +620,14 @@
\ifnameundef{translator}}%
{}%
{\ifnamesequal{editor}{translator}%
- {\printtext{\bibleftparen}\global\booltrue{bbx:parens}%
+ {\printtext{\bibopenparen}\global\booltrue{bbx:parens}%
\printnames[apaeditor]{editor}%
\setunit*{\addcomma\addspace}%
\usebibmacro{apaeditorstrg}{editor}%
\setunit*{\addspace\&\space}%
\printtext{\bibcpstring{translator}}%
- \ifbool{bbx:parens}{\printtext{\bibrightparen}\global\boolfalse{bbx:parens}}{}}
- {\printtext{\bibleftparen}\global\booltrue{bbx:parens}%
+ \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}
+ {\printtext{\bibopenparen}\global\booltrue{bbx:parens}%
\ifnameundef{editor}%
{}%
{\printnames[apaeditor]{editor}%
@@ -643,7 +643,7 @@
\printtext{\bibcpstring{translator}}%
\clearname{translator}%
\setunit{\adddot}}%
- \ifbool{bbx:parens}{\printtext{\bibrightparen}\global\boolfalse{bbx:parens}}{}}}}
+ \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}}}
\newbibmacro*{editor+trans}{%
\ifthenelse{\ifnameundef{editor}\AND%
@@ -655,11 +655,11 @@
{\ifnamesequal{editor}{translator}%
{\usebibmacro{in}%
\printnames[apaeditor]{editor}%
- \setunit{\addspace\bibleftparen\global\booltrue{bbx:parens}}%
+ \setunit{\addspace\bibopenparen\global\booltrue{bbx:parens}}%
\usebibmacro{apaeditorstrg}{editor}%
\setunit*{\addspace\&\space}%
\printtext{\bibcpstring{translator}}%
- \ifbool{bbx:parens}{\printtext{\bibrightparen}\global\boolfalse{bbx:parens}}{}}
+ \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}
{\ifnameundef{translator}%
{}%
{\setunit{\relax}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index 282d58067fe..27555b41b3b 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
+%% apa.cbx v2.3
%% Copyright 2010 Philip Kime
%%
%% This work may be distributed and/or modified under the
@@ -51,7 +51,7 @@
\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{\usebibmacro{cite}}}
+ \usebibmacro{cite}}
{}
{\usebibmacro{postnote}}
@@ -60,7 +60,7 @@
\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{\usebibmacro{citeyear}}}
+ \usebibmacro{citeyear}}
{}
{\usebibmacro{postnote}}
@@ -137,19 +137,21 @@
\iffieldequals{namehash}{\cbx@lasthash}
% Multiple cites in one command
{\setunit{\compcitedelim}%
- \usebibmacro{cite:plabelyear+extrayear}}%
+ \printtext[bibhyperref]{\usebibmacro{cite:plabelyear+extrayear}}}%
% Single cite
{\ifthenelse{\ifnameundef{labelname}\OR\equal{\thefield{entrytype}}{patent}}
% No author/editor
- {\usebibmacro{cite:noname}%
+ {\printtext[bibhyperref]{%
+ \usebibmacro{cite:noname}%
\setunit{\nameyeardelim}%
\iffieldundef{labelyear}
{\usebibmacro{cite:noyear}}
{\usebibmacro{cite:plabelyear+extrayear}%
- \savefield{namehash}{\cbx@lasthash}}}
+ \savefield{namehash}{\cbx@lasthash}}}}
% Normal cite
{\cbx@tempa
- \ifnameundef{shortauthor}
+ \printtext[bibhyperref]{%
+ \ifnameundef{shortauthor}
{\printnames{labelname}}
{\ifciteseen
{\printnames{shortauthor}}
@@ -159,29 +161,30 @@
{\usebibmacro{cite:noyear}}
{\usebibmacro{cite:plabelyear+extrayear}%
\savefield{namehash}{\cbx@lasthash}}%
- \global\let\cbx@tempa=\multicitedelim}}}
+ \global\let\cbx@tempa=\multicitedelim}}}}
\newbibmacro*{textcite}{%
\iffieldequals{namehash}{\cbx@lasthash}
% Compact cite - more than one thing for same author
- {\setunit{\compcitedelim}%
- \usebibmacro{cite:plabelyear+extrayear}}
+ {\compcitedelim%
+ \printtext[bibhyperref]{\bibopenparen\usebibmacro{cite:plabelyear+extrayear}\bibcloseparen\global\boolfalse{cbx:parens}}}
% Single cite
{\cbx@tempa
+ \printtext[bibhyperref]{%
\ifthenelse{\ifnameundef{labelname}\OR\equal{\thefield{entrytype}}{patent}}
% No author/editor or patent
- {\iffieldundef{shorthand}
+ {\iffieldundef{shorthand}%
% Cite using title
{\usebibmacro{cite:noname}%
\setunit{\ifbool{cbx:np}%
{\nameyeardelim}%
- {\global\booltrue{cbx:parens}\addspace\bibleftparen}}%
- \usebibmacro{cite:plabelyear+extrayear}}
+ {\global\booltrue{cbx:parens}\addspace\bibopenparen}}%
+ \usebibmacro{cite:plabelyear+extrayear}\bibcloseparen\global\boolfalse{cbx:parens}}
% Cite using shorthand
{\usebibmacro{cite:shorthand}}}
% Normal cite with author/editor
% Normal full cite
- {\ifnameundef{shortauthor}
+ {\ifnameundef{shortauthor}%
% Normal full cite
{\printnames{labelname}}
% Cite using short author
@@ -191,7 +194,7 @@
% Year
\setunit{\ifbool{cbx:np}
{\nameyeardelim}
- {\global\booltrue{cbx:parens}\addspace\bibleftparen}}%
+ {\global\booltrue{cbx:parens}\addspace\bibopenparen}}%
% Put the shortauthor inside the year brackets if necessary
\ifnameundef{shortauthor}
{}
@@ -199,15 +202,16 @@
{}
{\printnames{shortauthor}\setunit{\nameyeardelim}}}%
\iffieldundef{labelyear}%
- {\usebibmacro{cite:noyear}}%
- {\usebibmacro{cite:plabelyear+extrayear}}%
- \savefield{namehash}{\cbx@lasthash}}}%
- \gdef\cbx@tempa{\ifboolexpr{bool {cbx:parens} and not bool {cbx:np}}
- {\bibrightparen\global\boolfalse{cbx:parens}}
- {}%
- \multicitedelim}}
-
-
+ {\usebibmacro{cite:noyear}%
+ \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}}
+ {\usebibmacro{cite:plabelyear+extrayear}%
+ \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}}%
+ \savefield{namehash}{\cbx@lasthash}}}}%
+ \global\let\cbx@tempa=\multicitedelim}
\newcommand{\apashortdash}{-}
@@ -215,13 +219,13 @@
\iffieldundef{labelyear}
{}
{\printfield[noformat]{origyear}\setunit*{\addslash}%
- \printfield{labelyear}%
- \iffieldequalstr{labelyear}{in press}
- {\iffieldundef{extrayear}
- {\setunit{\relax}}
- {\setunit{\apashortdash}}%
- \printfield{extrayear}}
- {\printfield{extrayear}}}}%
+ \printfield{labelyear}%
+ \iffieldequalstr{labelyear}{in press}
+ {\iffieldundef{extrayear}
+ {\setunit{\relax}}
+ {\setunit{\apashortdash}}%
+ \printfield{extrayear}}
+ {\printfield{extrayear}}}}%
\newbibmacro*{cite:shorthand}{%
\ifciteseen
@@ -276,7 +280,7 @@
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\global\booltrue{cbx:np}%
- \printtext[bibhyperref]{\usebibmacro{textcite}}%
+ \usebibmacro{textcite}%
\global\boolfalse{cbx:np}}%
{}
{\iffieldundef{postnote}
@@ -307,8 +311,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newbool{cbx:parens}
-\newbool{cbx:np} % variable to say we're using a non-parentheses text cite
+\newbool{cbx:parens} % boolean to say we're inside parens
+\newbool{cbx:np} % boolean to say we're using a non-parentheses text cite
\newbibmacro*{cite:init}{%
\global\boolfalse{cbx:parens}%
@@ -339,7 +343,7 @@
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{\usebibmacro{cite}}}
+ \usebibmacro{cite}}
{}
{\usebibmacro{postnote}}
@@ -347,7 +351,7 @@
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{\usebibmacro{citeyear}}}
+ \usebibmacro{citeyear}}
{}
{\usebibmacro{postnote}}
@@ -356,24 +360,21 @@
\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{\usebibmacro{cite}}}
+ \usebibmacro{cite}}
{}
{\usebibmacro{postnote}}
-
\DeclareCiteCommand{\textcite}
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
- \printtext[bibhyperref]{\usebibmacro{textcite}}}%
+ \usebibmacro{textcite}}
{}
{\iffieldundef{postnote}
- {\ifbool{cbx:parens}
- {\bibrightparen}
- {}}
+ {}
{\ifbool{cbx:parens}
{\postnotedelim}
- {\addspace\bibleftparen}%
- \printfield{postnote}\bibrightparen}}
+ {\addspace\bibopenparen}%
+ \printfield{postnote}\bibcloseparen}}
\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 94c63729525..99a7d568fe0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
@@ -1,3 +1,4 @@
+% v2.3
\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 3bd468be530..417e0154ec4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
@@ -1,3 +1,4 @@
+% v2.3
\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 48bbd593fcf..e24146686e3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
@@ -1,3 +1,4 @@
+% v2.3
\ProvidesFile{german-apa.lbx}
\InheritBibliographyExtras{german}
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 dfb2d08dbf0..64982309900 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
@@ -1,3 +1,4 @@
+% v2.3
\ProvidesFile{ngerman-apa.lbx}
\InheritBibliographyExtras{ngerman}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-13 06:54:19 +0000