summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-10-06 23:15:29 +0000
committerKarl Berry <karl@freefriends.org>2011-10-06 23:15:29 +0000
commit0cc9d75d99a00ca3206f389fde8fe87cccec4424 (patch)
tree15128cdee82f0dda537adeac62c3043b126a35e7 /Master
parentf8f8f50c5c01afd3ec1a49fad396659cbd4e804b (diff)
biblatex-apa (6oct11)
git-svn-id: svn://tug.org/texlive/trunk@24221 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/README2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdfbin98231 -> 98217 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdfbin66224 -> 66335 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/brazilian-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/ngerman-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx4
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
15 files changed, 19 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index 4d8a4b866d4..2b74412f6c4 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/README
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/README
@@ -1,4 +1,4 @@
-Version 3.9
+Version 4.0
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.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
index 6d0d62eff43..3005fc6a981 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.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
index b7795041572..d37850b8ff6 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 9bac73f377b..671cdc169a8 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={3.9},
+ revision={4.0},
date={\today}}
\hypersetup{%
@@ -312,6 +312,10 @@ general notes:
\begin{changelog}
+\begin{release}{4.0}{2011-10-05}
+\item Disabled «smart and» for spanish localisation as it breaks ampersands
+\end{release}
+
\begin{release}{3.9}{2011-10-03}
\item Fixed data format issue in localisations
\end{release}
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 d0eb23d3ca7..5ffd66c083f 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 @@
-% v3.9
+% v4.0
\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 1744e8f97b9..dd35b737343 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 v3.9
+%% apa.bbx v4.0
%% Copyright 2011 Philip Kime
%%
%% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index 20a9d10a9f4..a8f58b9993d 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 v3.9
+%% apa.cbx v4.0
%% 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 2f89aae8b6d..3b8ebe39739 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 @@
-% v3.9
+% v4.0
\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 e3b645d309c..87b94a70606 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 @@
-% v3.9
+% v4.0
\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 bbd064812d2..b65e4697732 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 @@
-% v3.9
+% v4.0
\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 827d5d1224a..7f54827b767 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 @@
-% v3.9
+% v4.0
\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 fd666d1f60b..f48c907f833 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 @@
-% v3.9
+% v4.0
\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 baa2f393f19..32cdd86c311 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 @@
-% v3.9
+% v4.0
\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 0b3f0a20eb9..c61b092755a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
@@ -1,7 +1,9 @@
-% v3.9
+% v4.0
\ProvidesFile{spanish-apa.lbx}
\InheritBibliographyExtras{spanish}
+\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
+
% (APA 6.22) The example abbreviations
\NewBibliographyString{revisededition}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index cd5d1f6f1ab..b48080de15e 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -864,6 +864,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'univers', "die 'skipping, nonfree font'",
'upgreek', "die 'skipping, use was'",
'upmethodology',"&MAKEflatten",
+ 'varioref', "die 'skipping, use latex[-tds]'",
'vector', "die 'skipping, noinfo license, 1994'",
'velthuis', "&MAKEcopy",
'venturisadf', "&MAKEcopy",