summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2011-08-02 18:36:21 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2011-08-02 18:36:21 +0000
commit2880aaf97110f638a133d7ba59e8ecbd15150b2f (patch)
tree81f95247ff36364cd2611dbd307ed4072bbf25e0
parentc047122dd76be17f819bf86afd136bddf9f8c41f (diff)
biblatex-apa 3.1
git-svn-id: svn://tug.org/texlive/trunk@23325 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/README2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdfbin97620 -> 97609 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdfbin64428 -> 64423 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.bbx31
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx12
-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
13 files changed, 38 insertions, 27 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index e688ca6a5ce..1cf89cd39a3 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.0
+Version 3.1
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 05106d05fd0..cb6c856bec4 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 819e7d62069..5b431849234 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 c8e7641afa1..3bb742ce55d 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.0},
+ revision={3.1},
date={\today}}
\hypersetup{%
@@ -311,6 +311,10 @@ to see how it was implemented. Some general notes:
\begin{changelog}
+\begin{release}{3.1}{2011-07-31}
+\item Made compatible with |biblatex| 1.6
+\end{release}
+
\begin{release}{3.0}{2011-05-06}
\item |maxnames| and |minnames| are now set to sensible things and actually
used. |biber| $\geq$ 0.9.3 is now required as this implements a fix for
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 0786757afa1..059074506fa 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.0
+% v3.1
\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 8cbb242700a..026d038b624 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.0
+%% apa.bbx v3.1
%% Copyright 2011 Philip Kime
%%
%% This work may be distributed and/or modified under the
@@ -1683,6 +1683,15 @@
\printlist{location}}%
\newunit}}
+\newbibmacro*{labeltitle}{%
+ \iffieldundef{label}
+ {\iffieldundef{shorttitle}
+ {\printfield{title}%
+ \clearfield{title}
+ \global\booltrue{bbx:titleinauthpos}}
+ {\printfield[title]{shorttitle}}}
+ {\printfield{label}}}
+
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1700,15 +1709,13 @@
\renewbibmacro*{bbx:savehash}{}}}
\DeclareFieldFormat{shorthandwidth}{#1}
-\renewcommand*{\thebibitem}{\item}
-\renewcommand*{\thelositem}{\item}
\setlength{\bibitemsep}{0pt}
\DeclareNameAlias{author}{sortname}
\DeclareNameAlias{editor}{sortname}
\DeclareNameAlias{translator}{sortname}
-\renewenvironment*{thebibliography}
+\defbibenvironment{bibliography}
{\list
{}
{\setlength{\leftmargin}{\bibhang}%
@@ -1716,8 +1723,9 @@
\setlength{\itemsep}{\bibitemsep}%
\setlength{\parsep}{\bibparsep}}}
{\endlist}
+ {\item}
-\renewenvironment*{theshorthands}
+\defbibenvironment{shorthands}
{\list
{\printfield[shorthandwidth]{shorthand}}
{\setlength{\labelwidth}{\shorthandwidth}%
@@ -1728,6 +1736,7 @@
\setlength{\parsep}{\bibparsep}%
\renewcommand*{\makelabel}[1]{##1\hss}}}
{\endlist}
+ {\item}
\InitializeBibliographyStyle{%
\global\undef\bbx@lasthash}
@@ -1735,19 +1744,13 @@
\newbibmacro*{bbx:savehash}{%
\savefield{fullhash}{\bbx@lasthash}}
+
\newbool{bbx@inset}
\DeclareBibliographyDriver{set}{%
\booltrue{bbx@inset}%
\entryset{}{}%
+ \newunit\newblock
+ \usebibmacro{setpageref}%
\finentry}
-\newbibmacro*{labeltitle}{%
- \iffieldundef{label}
- {\iffieldundef{shorttitle}
- {\printfield{title}%
- \clearfield{title}
- \global\booltrue{bbx:titleinauthpos}}
- {\printfield[title]{shorttitle}}}
- {\printfield{label}}}
-
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index 993c3166815..c2da9896e51 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.0
+%% apa.cbx v3.1
%% Copyright 2011 Philip Kime
%%
%% This work may be distributed and/or modified under the
@@ -342,12 +342,16 @@
\DeclareCiteCommand{\fullcitebib}
{\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}%
- \begin{thebibliography}\thebibitem}
+ \list{}
+ {\setlength{\leftmargin}{\bibhang}%
+ \setlength{\itemindent}{-\leftmargin}%
+ \setlength{\itemsep}{\bibitemsep}%
+ \setlength{\parsep}{\bibparsep}}\item}
{\usedriver
{\DeclareNameAlias{sortname}{default}}
{\thefield{entrytype}}\finentry}
- {\thebibitem}
- {\end{thebibliography}}
+ {\item}
+ {\endlist}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
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 dd7dd40e733..b50f4af9c35 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.0
+% v3.1
\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 a68c5058d16..996ccde7cb8 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.0
+% v3.1
\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 43d86243f5c..bf336c7cb9d 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.0
+% v3.1
\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 3902e82e09b..6f22441d09e 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.0
+% v3.1
\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 2929087fb7d..f90cbd6a6a2 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.0
+% v3.1
\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 4a92f667981..6da9e9869f9 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.0
+% v3.1
\ProvidesFile{ngerman-apa.lbx}
\InheritBibliographyExtras{ngerman}