Readying 7.5

plk · Nov 5, 2017 · ecebd0a · ecebd0a
1 parent 73018c9
commit ecebd0a
Show file tree

Hide file tree

Showing 31 changed files with 81 additions and 83 deletions.
diff --git a/README b/README
@@ -1,5 +1,3 @@
-Version 7.4
-
 Permission is granted to copy, distribute and/or modify this software under
 the terms of the LaTeX Project Public License, version
 1.3c (http://www.latex-project.org/lppl.txt). The current

diff --git a/RELEASE b/RELEASE
@@ -1,6 +1,5 @@
 Update version string in:
 * doc .tex (including revision history)
-* README
 * apa.cbx
 * apa.bbx
 * apa.dbx

diff --git a/doc/biblatex-apa-test.tex b/doc/biblatex-apa-test.tex
@@ -344,7 +344,7 @@ \section*{Citations}
 
 \noindent Some tests of uniqueness and uniquelist
 
-\noindent Two works by same authors in same year are disambiguated by extrayear «a»
+\noindent Two works by same authors in same year are disambiguated by extradate «a»
 and «b» and are truncated after first cite because it is the same author
 list and therefore not ambiguous:\\
 \apaex{\textcite{UL1}}\\
@@ -397,7 +397,7 @@ \section*{Citations}
 \apaex{\textcite{nopretest}}
 
 % presufftest2 and nopresufftest are the same name and so even though
-% useprefix=false nopresufftest, hashes are the same so there is an extrayear
+% useprefix=false nopresufftest, hashes are the same so there is an extradate
 \noindent Testing prefices plus suffices\\
 \apaex{\textcite{presufftest}}\\
 \apaex{\textcite{presufftest2}}\\

diff --git a/doc/biblatex-apa.tex b/doc/biblatex-apa.tex
@@ -24,7 +24,7 @@
   url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
   author={Philip Kime},
   email={Philip@kime.org.uk},
-  revision={7.4},
+  revision={7.5},
   date={\today}}
 
 \hypersetup{%
@@ -458,7 +458,8 @@ \section{Revision history}\label{rev}
 
 \begin{changelog}
 
-\begin{release}{7.5}{}
+\begin{release}{7.5}{2017-11-05}
+\item Compat for bibaltex 3.8
 \item |\DeclareLanguageMapping| is now no longer necessary due to the new
   |\DeclareLanguageMappingSuffix| macro.
 \end{release}

diff --git a/doc/reference.pdf b/doc/reference.pdf
diff --git a/tex/latex/biblatex-apa/bbx/apa.bbx b/tex/latex/biblatex-apa/bbx/apa.bbx
@@ -12,7 +12,7 @@
 %% 
 %% The Current Maintainer of this work is Philip Kime.
 
-\ProvidesFile{apa.bbx}[2017/01/06\space v7.4\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2017/11/05\space v7.5\space APA biblatex references style]
 \RequireBiber[3]
 \RequireBibliographyStyle{standard}
 \urlstyle{rm} % APA examples all have URLs in same font as text
@@ -44,7 +44,7 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %  Used to join citations/references to
-%  extrayear
+%  extradate
 
 \newcommand{\apashortdash}{-}
 
@@ -194,7 +194,7 @@
 % (APA 6.25) Sorting is nyt but we need to account for PUBSTATE which comes
 %            after all normal cites for the same author
 
-\DeclareSortingScheme{apa}{
+\DeclareSortingTemplate{apa}{
   \sort{
     \field{presort}
   }
@@ -440,7 +440,7 @@
         \printnames[apaauthor][-\value{listtotal}]{with}}
         \setunit*{\addspace}}}%
   \newunit\newblock%
-  \usebibmacro{labelyear+extrayear}}
+  \usebibmacro{labelyear+extradate}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -480,7 +480,7 @@
       \iffieldundef{endmonth}{}{/\printfield{endmonth}}}}
     {\addcomma\space\printfield{issue}}}
 
-\newbibmacro*{labelyear+extrayear}{%
+\newbibmacro*{labelyear+extradate}{%
   \iffieldundef{labelyear}
     {\iffieldundef{origyear}
       {}
@@ -583,7 +583,7 @@
        \ifnameundef{director}\AND%
        \ifnameundef{writer}}
         {\newunit\newblock
-         \usebibmacro{labelyear+extrayear}}
+         \usebibmacro{labelyear+extradate}}
         {}}}
 
 \renewbibmacro*{maintitle}{%
@@ -724,7 +724,7 @@
        % various year placement tests
        \clearname{editor}%
        \setunit{\adddot\addspace}%
-       \usebibmacro{labelyear+extrayear}%
+       \usebibmacro{labelyear+extradate}%
        \setunit{\adddot\addspace}}}
 
 %
@@ -1777,7 +1777,7 @@
      \usebibmacro{related}}
     {}%
   \newunit\newblock
-  \ifbool{bbx:noreviewauthor}{\usebibmacro{labelyear+extrayear}}{}%
+  \ifbool{bbx:noreviewauthor}{\usebibmacro{labelyear+extradate}}{}%
   \newunit\newblock
   \usebibmacro{journal+issuetitle}%
   \newunit\newblock
@@ -1915,7 +1915,7 @@
   \usebibmacro{director}%
   \usebibmacro{producer}%
   \newunit\newblock
-  \usebibmacro{labelyear+extrayear}%
+  \usebibmacro{labelyear+extradate}%
   \setunit{\labelnamepunct}\newblock
   \usebibmacro{title}%
   \setunit{\addspace}\newblock
@@ -1944,7 +1944,7 @@
   \usebibmacro{director}%
   \usebibmacro{producer}%
   \newunit\newblock
-  \usebibmacro{labelyear+extrayear}%
+  \usebibmacro{labelyear+extradate}%
   \setunit{\labelnamepunct}\newblock
   \usebibmacro{title}%
   \setunit{\addspace}\newblock
@@ -1973,7 +1973,7 @@
   \usebibmacro{director}%
   \usebibmacro{producer}%
   \newunit\newblock
-  \usebibmacro{labelyear+extrayear}%
+  \usebibmacro{labelyear+extradate}%
   \setunit{\labelnamepunct}\newblock
   \usebibmacro{title}%
   \setunit{\addspace}\newblock

diff --git a/tex/latex/biblatex-apa/cbx/apa.cbx b/tex/latex/biblatex-apa/cbx/apa.cbx
@@ -12,14 +12,14 @@
 %% 
 %% The Current Maintainer of this work is Philip Kime.
 
-\ProvidesFile{apa.cbx}[2017/01/06\space v7.4\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2017/11/05\space v7.5\space APA biblatex citation style]
 \RequireBiber[3]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 6.16) labelyear postfix is not emphasised or italic
 %            Dashes between labelyear and non-numeric year (or pseudo-year)
 
-\DeclareFieldFormat{extrayear}{\iffieldnums{labelyear}{\mknumalph{#1}}{\apashortdash\mknumalph{#1}}}
+\DeclareFieldFormat{extradate}{\iffieldnums{labelyear}{\mknumalph{#1}}{\apashortdash\mknumalph{#1}}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -216,7 +216,7 @@
 % (APA 6.13) Deal with SHORTAUTHOR fields
 % (APA 6.16) Multiple same author cites in a compact citation call do not
 %            need to be repeated but the full years must be repeated with
-%            their extrayear postfixes
+%            their extradate postfixes
 % (APA 6.18) Cite ORIGYEAR/YEAR if ORIGYEAR present
 % (APA 6.28) ISSUE after year when available
 \def\citeresetapa{\global\let\cbx@apa@names\@empty}
@@ -230,7 +230,7 @@
   \iffieldequals{fullhash}{\cbx@lasthash}
 % Multiple cites in one command
    {\setunit{\compcitedelim}%
-    \usebibmacro{cite:plabelyear+extrayear}}%
+    \usebibmacro{cite:plabelyear+extradate}}%
 % Single cite
    {\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}}
 % No author/editor
@@ -258,13 +258,13 @@
   \iffieldequals{fullhash}{\cbx@lasthash}
 % Multiple cites in one command
    {\setunit{\compcitedelim}%
-    \usebibmacro{cite:plabelyear+extrayear}}%
+    \usebibmacro{cite:plabelyear+extradate}}%
 % Single cite
    {\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}}
 % No author/editor
      {\usebibmacro{cite:noname}%
        \setunit{\printdelim{nameyeardelim}}%
-       \usebibmacro{cite:plabelyear+extrayear}%
+       \usebibmacro{cite:plabelyear+extradate}%
        \savefield{fullhash}{\cbx@lasthash}}
 % Normal cite
      {\ifnameundef{shortauthor}
@@ -273,15 +273,15 @@
           {\printnames{shortauthor}}
           {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}%
       \setunit{\printdelim{nameyeardelim}}%
-      \usebibmacro{cite:plabelyear+extrayear}%
+      \usebibmacro{cite:plabelyear+extradate}%
       \savefield{fullhash}{\cbx@lasthash}}}%
    \setunit{\multicitedelim}}
 
 \newbibmacro*{textcite}{%
   \iffieldequals{fullhash}{\cbx@lasthash}
 % Compact cite - more than one thing for same author
     {\setunit{\compcitedelim}%
-     \usebibmacro{cite:plabelyear+extrayear}}
+     \usebibmacro{cite:plabelyear+extradate}}
 % New cite
     {%
     \ifbool{cbx:parens}
@@ -296,7 +296,7 @@
           \setunit{\ifbool{cbx:np}%
                    {\printdelim{nameyeardelim}}%
                    {\global\booltrue{cbx:parens}\addspace\bibopenparen}}%
-          \usebibmacro{cite:plabelyear+extrayear}}
+          \usebibmacro{cite:plabelyear+extradate}}
     % Cite using shorthand
          {\usebibmacro{cite:shorthand}}}
   % Normal cite with author/editor
@@ -319,11 +319,11 @@
            {}
            {\printnames{shortauthor}\setunit{\printdelim{nameyeardelim}}}}%
   % Actual year printing
-        \usebibmacro{cite:plabelyear+extrayear}%
+        \usebibmacro{cite:plabelyear+extradate}%
   % Save name hash for checks later
         \savefield{fullhash}{\cbx@lasthash}}}}
 
-\newbibmacro*{cite:plabelyear+extrayear}{%
+\newbibmacro*{cite:plabelyear+extradate}{%
   \iffieldundef{labelyear}{}
     {\printtext[bibhyperref]{%
         \clearfield{labelmonth}% don't want months in citations
@@ -405,8 +405,8 @@
     {\usebibmacro{cite:init}}
     {\iffieldequals{fullhash}{\cbx@lasthash}
        {\setunit{\compcitedelim}%
-        \usebibmacro{cite:plabelyear+extrayear}}
-       {\usebibmacro{cite:plabelyear+extrayear}%
+        \usebibmacro{cite:plabelyear+extradate}}
+       {\usebibmacro{cite:plabelyear+extradate}%
         \savefield{fullhash}{\cbx@lasthash}}}%
   \setunit{\multicitedelim}}
 
@@ -478,20 +478,20 @@
 \newbibmacro*{cite:labelyear}{%
   \printfield{labelyear}}
 
-\newbibmacro*{cite:extrayear}{%
-  \printfield{extrayear}}
+\newbibmacro*{cite:extradate}{%
+  \printfield{extradate}}
 
-\newbibmacro*{cite:labelyear+extrayear}{%
+\newbibmacro*{cite:labelyear+extradate}{%
   \iffieldundef{labelyear}
     {}
     {\printfield{labelyear}%
-       \printfield{extrayear}}}
+       \printfield{extradate}}}
 
 \DeclareCiteCommand{\citeyear}
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
    \usebibmacro{prenote}}
-  {\usebibmacro{cite:plabelyear+extrayear}}
+  {\usebibmacro{cite:plabelyear+extradate}}
   {\multinamedelim}
   {\usebibmacro{postnote}}
 

diff --git a/tex/latex/biblatex-apa/dbx/apa.dbx b/tex/latex/biblatex-apa/dbx/apa.dbx
@@ -12,7 +12,7 @@
 %% 
 %% The Current Maintainer of this work is Philip Kime.
 
-\ProvidesFile{apa.dbx}[2017/01/06\space v7.4\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2017/11/05\space v7.5\space APA biblatex style data model]
 \RequireBiber[3]
 
 \DeclareDatamodelEntrytypes{

diff --git a/tex/latex/biblatex-apa/lbx/american-apa.lbx b/tex/latex/biblatex-apa/lbx/american-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{american-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
 \InheritBibliographyExtras{american}
 
 % (APA 6.22) The example abbreviations
@@ -89,7 +89,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
     \iffieldundef{#2}%
       {}%
       {\iffieldundef{#1}%

diff --git a/tex/latex/biblatex-apa/lbx/austrian-apa.lbx b/tex/latex/biblatex-apa/lbx/austrian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{austrian-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
 \InheritBibliographyExtras{austrian}
 
 % Following DGPs guidlines for German/Austrian
@@ -89,7 +89,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
     \iffieldundef{#3}%
       {}%
       {\iffieldundef{#1}%

diff --git a/tex/latex/biblatex-apa/lbx/brazilian-apa.lbx b/tex/latex/biblatex-apa/lbx/brazilian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{brazilian-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
 \InheritBibliographyExtras{brazilian}
 
 % (APA 6.22) The example abbreviations
@@ -81,7 +81,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
     \iffieldundef{#2}%
       {}%
       {\iffieldundef{#1}%

diff --git a/tex/latex/biblatex-apa/lbx/british-apa.lbx b/tex/latex/biblatex-apa/lbx/british-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{british-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
 \InheritBibliographyExtras{british}
 
 % (APA 6.22) The example abbreviations
@@ -87,7 +87,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
     \iffieldundef{#2}%
       {}%
       {\iffieldundef{#1}%

diff --git a/tex/latex/biblatex-apa/lbx/danish-apa.lbx b/tex/latex/biblatex-apa/lbx/danish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{danish-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{danish-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
 \InheritBibliographyExtras{danish}
 
 % (APA 6.22) The example abbreviations
@@ -101,7 +101,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\thefield{#1}\printfield{extrayear}}%
+      {\thefield{#1}\printfield{extradate}}%
     \iffieldundef{#3}%
       {}%
       {\iffieldundef{#1}%

diff --git a/tex/latex/biblatex-apa/lbx/dutch-apa.lbx b/tex/latex/biblatex-apa/lbx/dutch-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{dutch-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
 \InheritBibliographyExtras{dutch}
 
 % (APA 6.22) The example abbreviations
@@ -87,7 +87,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
     \iffieldundef{#2}%
       {}%
       {\iffieldundef{#1}%

diff --git a/tex/latex/biblatex-apa/lbx/english-apa.lbx b/tex/latex/biblatex-apa/lbx/english-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{english-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
 \InheritBibliographyExtras{english}
 
 % (APA 6.22) The example abbreviations
@@ -89,7 +89,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
     \iffieldundef{#2}%
       {}%
       {\iffieldundef{#1}%