texlive[46864] Master/texmf-dist: biblatex-apa (6mar18)

commits+karl at tug.org commits+karl at tug.org
Tue Mar 6 23:53:21 CET 2018


Revision: 46864
          http://tug.org/svn/texlive?view=revision&revision=46864
Author:   karl
Date:     2018-03-06 23:53:21 +0100 (Tue, 06 Mar 2018)
Log Message:
-----------
biblatex-apa (6mar18)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/biblatex-apa/README
    trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
    trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
    trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
    trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
    trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/README	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/README	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,7 +1,7 @@
 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
-maintainer is Philip Kime (© 2017).
+maintainer is Philip Kime (© 2018).
 
 This package is a biblatex style for APA (American Psychological
 Association) style compliant documents typeset in LaTeX. It

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib	2018-03-06 22:53:21 UTC (rev 46864)
@@ -594,7 +594,7 @@
 @BOOK{plato,
   AUTHOR = {Plato},
   TITLE  = {Meno},
-  DATE = {-0379?~}
+  DATE = {-0379%}
 }
 
 % Testing citation with complete dates

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib	2018-03-06 22:53:21 UTC (rev 46864)
@@ -137,12 +137,10 @@
 }
 
 % (APA 7.01 Example 12)
-% Use the TITLEADDON field for things in brackets after the title. This has many
-% uses in the APA style.
- at ARTICLE{7.01:12a,
+ at PERIODICAL{7.01:12a,
   EDITOR         = {C. Haney and R. L. Wiener},
-  TITLE          = {Capital Punishment in the United States},
-  TITLEADDON     = {Special issue},
+  TITLE          = {Capital Punishment in the {United States}},
+  ISSUETITLE     = {Special issue},
   JOURNALTITLE   = {Psychology, Public Policy and Law},
   VOLUME         = {10},
   NUMBER         = {4},
@@ -149,10 +147,10 @@
   DATE           = {2004}
 }
 
- at ARTICLE{7.01:12b,
+ at PERIODICAL{7.01:12b,
   EDITOR         = {P. Greenfield and Z. Yan},
   TITLE          = {Children, Adolescents, and the {I}nternet},
-  TITLEADDON     = {Special section},
+  ISSUETITLE     = {Special section},
   JOURNALTITLE   = {Developmental Psychology},
   VOLUME         = {42},
   PAGES          = {391--458},
@@ -160,10 +158,10 @@
 }
 
 % APA manual implicit example made explicit - no editors
- at ARTICLE{7.01:12c,
-  TITLE          = {Capital Punishment in the United Kingdom},
+ at PERIODICAL{7.01:12c,
+  TITLE          = {Capital Punishment in the {United Kingdom}},
   SHORTTITLE     = {Capital Punishment},
-  TITLEADDON     = {Special issue},
+  ISSUETITLE     = {Special issue},
   JOURNALTITLE   = {Psychology, Public Policy and Law},
   VOLUME         = {10},
   NUMBER         = {4},

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex	2018-03-06 22:53:21 UTC (rev 46864)
@@ -24,7 +24,7 @@
   url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
   author={Philip Kime},
   email={Philip at kime.org.uk},
-  revision={7.5},
+  revision={7.6},
   date={\today}}
 
 \hypersetup{%
@@ -458,6 +458,10 @@
 
 \begin{changelog}
 
+\begin{release}{7.6}{2018-03-05}
+\item Internal cleanup and bugfixes
+\end{release}
+
 \begin{release}{7.5}{2017-11-05}
 \item Compat for bibaltex 3.8
 \item |\DeclareLanguageMapping| is now no longer necessary due to the new

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{american-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{american}
 
 % (APA 6.22) The example abbreviations

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-%% Copyright 2017 Philip Kime
+%% Copyright 2018 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -9,10 +9,10 @@
 %% version 2005/12/01 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
-%% 
+%%
 %% The Current Maintainer of this work is Philip Kime.
 
-\ProvidesFile{apa.bbx}[2017/11/05\space v7.5\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2018/03/05\space v7.6\space APA biblatex references style]
 \RequireBiber[3]
 \RequireBibliographyStyle{standard}
 \urlstyle{rm} % APA examples all have URLs in same font as text
@@ -100,66 +100,70 @@
 
 % Date formats. Suppress end range of less specific fields
 \newcommand*{\mkdaterangeapalong}[1]{%
-  \blx at metadateinfo{#1}%
-  \iffieldundef{#1year}{}
-    {\datecircaprint
-     \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
-       {\printtext{%
-           \mkbibdateapalongmdy{#1year}{#1month}{#1day}%
-           \iffieldundef{#1endyear}%
-             {}%
-             {\iffieldequalstr{#1endyear}{}% open-ended range?
-               {\mbox{\bibdatedash}}
-               {\bibdatedash%
-                \iffieldsequal{#1year}{#1endyear}%
-                  {\iffieldsequal{#1month}{#1endmonth}%
-                    {\iffieldsequal{#1day}{#1endday}%
-                      {}%
-                      {\mkbibdateapalongmdy{}{}{#1endday}}}%
-                    {\mkbibdateapalongmdy{}{#1endmonth}{#1endday}}}%
-                  {\mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}}%
-           \dateuncertainprint}}
-       {\printtext{%
-           \mkbibdateapalong{#1year}{#1month}{#1day}%
-           \dateeraprint{#1year}%
-           \iffieldundef{#1endyear}%
-             {}%
-             {\iffieldequalstr{#1endyear}{}% open-ended range?
-               {\mbox{\bibdatedash}}
-               {\bibdatedash%
-                \iffieldsequal{#1year}{#1endyear}%
-                  {\iffieldsequal{#1month}{#1endmonth}%
-                    {\iffieldsequal{#1day}{#1endday}%
-                      {}%
-                      {\mkbibdateapalong{}{}{#1endday}}}%
-                    {\mkbibdateapalong{}{#1endmonth}{#1endday}}}%
-                  {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
-                 \dateeraprint{#1endyear}}}%
-             \enddateuncertainprint}}}}}
+  \begingroup
+    \blx at metadateinfo{#1}%
+    \iffieldundef{#1year}{}
+      {\datecircaprint
+       \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+         {\printtext{%
+             \mkbibdateapalongmdy{#1year}{#1month}{#1day}%
+             \iffieldundef{#1endyear}%
+               {}%
+               {\iffieldequalstr{#1endyear}{}% open-ended range?
+                 {\mbox{\bibdatedash}}
+                 {\bibdatedash%
+                  \iffieldsequal{#1year}{#1endyear}%
+                    {\iffieldsequal{#1month}{#1endmonth}%
+                      {\iffieldsequal{#1day}{#1endday}%
+                        {}%
+                        {\mkbibdateapalongmdy{}{}{#1endday}}}%
+                      {\mkbibdateapalongmdy{}{#1endmonth}{#1endday}}}%
+                    {\mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}}%
+             \dateuncertainprint}}
+         {\printtext{%
+             \mkbibdateapalong{#1year}{#1month}{#1day}%
+             \dateeraprint{#1year}%
+             \iffieldundef{#1endyear}%
+               {}%
+               {\iffieldequalstr{#1endyear}{}% open-ended range?
+                 {\mbox{\bibdatedash}}
+                 {\bibdatedash%
+                  \iffieldsequal{#1year}{#1endyear}%
+                    {\iffieldsequal{#1month}{#1endmonth}%
+                      {\iffieldsequal{#1day}{#1endday}%
+                        {}%
+                        {\mkbibdateapalong{}{}{#1endday}}}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}}%
+                    {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                   \dateeraprint{#1endyear}}}%
+               \enddateuncertainprint}}}}%
+  \endgroup}
 
 % Only for DATE as only \printdateextra is used
 \newcommand*{\mkdaterangeapalongextra}[1]{%
-  \blx at metadateinfo{#1}%
-  \iffieldundef{#1year}{}
-    {\printtext{%
-      \datecircaprint
-      \mkbibdateapalongextra{#1year}{#1month}{#1day}%
-      \dateeraprint{#1year}%
-      \dateuncertainprint
-      \iffieldundef{#1endyear}%
-        {}%
-        {\iffieldequalstr{#1endyear}{}% open-ended range?
-          {\mbox{\bibdatedash}}
-          {\bibdatedash%
-           \iffieldsequal{#1year}{#1endyear}%
-             {\iffieldsequal{#1month}{#1endmonth}%
-                {\iffieldsequal{#1day}{#1endday}%
-                  {}%
-                  {\mkbibdateapalongextra{}{}{#1endday}}}
-                {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}}
-             {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
-              \dateeraprint{#1endyear}}}%
-         \enddateuncertainprint}}}}
+  \begingroup
+    \blx at metadateinfo{#1}%
+    \iffieldundef{#1year}{}
+      {\printtext{%
+        \datecircaprint
+        \mkbibdateapalongextra{#1year}{#1month}{#1day}%
+        \dateeraprint{#1year}%
+        \dateuncertainprint
+        \iffieldundef{#1endyear}%
+          {}%
+          {\iffieldequalstr{#1endyear}{}% open-ended range?
+            {\mbox{\bibdatedash}}
+            {\bibdatedash%
+             \iffieldsequal{#1year}{#1endyear}%
+               {\iffieldsequal{#1month}{#1endmonth}%
+                  {\iffieldsequal{#1day}{#1endday}%
+                    {}%
+                    {\mkbibdateapalongextra{}{}{#1endday}}}
+                  {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}}
+               {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                \dateeraprint{#1endyear}}}%
+           \enddateuncertainprint}}}%
+  \endgroup}
 
 \AtEndPreamble{%
   \renewcommand*{\datecircaprint}{%
@@ -264,6 +268,7 @@
                             mincrossrefs=999,%
                             origdate=apalong,%
                             pagetracker=true,%
+                            sortcites=true,%
                             sorting=apa,%
                             uniquelist=minyear,%
                             uniquename=full,%
@@ -327,7 +332,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 6.30) Sometimes "Vol" is inside the additional
 %            material parens, sometimes not. This bool
-%            tracks if it has been inserted yet.     
+%            tracks if it has been inserted yet.
 %            Can't use \clearfield{volume} as some
 %            later number format tests need to know
 %            whether volume was defined.
@@ -447,12 +452,10 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 6.27) References section delimiters are ampersands, not " and "
-%            Needs to be in this hook otherwise it sets this for all
-%            citations too.
 % (APA 6.27) Use blank for long lists
 % (APA 4.03) Serial comma for lists of three or more
 
-\DeclareDelimFormat[bib]{finalnamedelim}{%
+\DeclareDelimFormat[bib,biblist]{finalnamedelim}{%
   \ifthenelse{\value{listcount}>\maxprtauth}
     {}
     {\ifthenelse{\value{liststop}>2}
@@ -459,6 +462,11 @@
        {\finalandcomma\addspace\&\space}
        {\addspace\&\space}}}
 
+\DeclareDelimFormat[bib,biblist]{finalnamedelim:apa:family-given}{%
+  \ifthenelse{\value{listcount}>\maxprtauth}
+    {}
+    {\finalandcomma\addspace\&\space}}
+
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -639,7 +647,7 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 6.29) Additional information for non-periodicals in
-%            parenthesis after title. This is ugly but it's 
+%            parenthesis after title. This is ugly but it's
 %            hard to put in "optional parens" like this
 %            around an unknown amount of characters.
 
@@ -740,20 +748,31 @@
 % #4 = name prefix
 % #5 = name suffix
 
+\newbibmacro*{name:delim:apa:family-given}[1]{%
+  \ifnumgreater{\value{listcount}}{\value{liststart}}
+    {\ifboolexpr{
+       test {\ifnumless{\value{listcount}}{\value{liststop}}}
+       or
+       test \ifmorenames
+     }
+       {\printdelim{multinamedelim}}
+       {\printdelim{finalnamedelim:apa:family-given}}}
+    {}}
+
 \newbibmacro*{name:apa:family-given}[5]{%
   \ifuseprefix
-    {\usebibmacro{name:delim}{#4#1}%
+    {\usebibmacro{name:delim:apa:family-given}{#4#1}%
      \usebibmacro{name:hook}{#4#1}%
      \ifdefvoid{#4}{}{%
-       \mkbibnameprefix{#4}%
-       \ifpunctmark{'}{}{\addhighpenspace}}%
-     \mkbibnamefamily{#1\isdot}%
-     \ifdefvoid{#2}{}{\addcomma\addlowpenspace\mkbibnamegiven{#3}\isdot%
-                    \ifthenelse{\value{uniquename}>1}
-                      {\addspace\mkbibbrackets{#2}}
-                      {}}%
-     \ifdefvoid{#5}{}{\addcomma\addlowpenspace\mkbibnamesuffix{#5}\isdot}}
-    {\usebibmacro{name:delim}{#1}%
+       \mkbibnameprefix{#4}\isdot%
+       \ifprefchar{}{\bibnamedelimc}}%
+     \mkbibnamefamily{#1}\isdot%
+     \ifdefvoid{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#3}\isdot%
+                      \ifthenelse{\value{uniquename}>1}
+                        {\bibnamedelimd\mkbibbrackets{#2}}
+                        {}}%
+     \ifdefvoid{#5}{}{\addcomma\bibnamedelimd\mkbibnamesuffix{#5}\isdot}}
+    {\usebibmacro{name:delim:apa:family-given}{#1}%
      \usebibmacro{name:hook}{#1}%
      \mkbibnamefamily{#1}\isdot
      \ifboolexpe{%
@@ -761,37 +780,29 @@
        and
        test {\ifdefvoid{#4}}}
        {}
-       {\addcomma}%
-     \ifdefvoid{#2}{}{\addlowpenspace\mkbibnamegiven{#3}%
-                    \ifthenelse{\value{uniquename}>1}
-                      {\addspace\mkbibbrackets{#2}}
-                      {}}%
+       {\revsdnamepunct}%
+     \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#3}%
+                      \ifthenelse{\value{uniquename}>1}
+                        {\bibnamedelimd\mkbibbrackets{#2}}
+                        {}}%
      \ifdefvoid{#4}{}{%
-       \addhighpenspace\mkbibnameprefix{#4}%
-       \ifpunctmark{'}{}{\addhighpenspace}}%
-     \ifdefvoid{#5}{}{\addcomma\addlowpenspace\mkbibnamesuffix{#5}\isdot}}}
+       \bibnamedelimc\mkbibnameprefix{#4}%
+       \ifprefchar{}{\bibnamedelimc}}%
+     \ifdefvoid{#5}{}{\addcomma\bibnamedelimd\mkbibnamesuffix{#5}\isdot}}}
 
 \newbibmacro*{name:apa:given-family}[5]{%
-  \ifuseprefix
-    {\usebibmacro{name:delim}{#2}%
-     \usebibmacro{name:hook}{#2}%
-     \ifdefvoid{#2}{}{\mkbibnamegiven{#3}\isdot%
-                    \ifthenelse{\value{uniquename}>1}
-                      {\addspace\mkbibbrackets{#2}}
-                      {}\addspace}%
-     \ifdefvoid{#4}{}{%
-       \mkbibnameprefix{#4\isdot}%
-       \ifpunctmark{'}{}{\addhighpenspace}}%
-     \mkbibnamefamily{#1\isdot}%
-     \ifdefvoid{#5}{}{\addlowpenspace\mkbibnamesuffix{#5}\isdot}}
-    {\usebibmacro{name:delim}{#1}%
-     \usebibmacro{name:hook}{#1}%
-     \ifdefvoid{#2}{}{\mkbibnamegiven{#3}\isdot%
-                    \ifthenelse{\value{uniquename}>1}
-                      {\addspace\mkbibbrackets{#2}}
-                      {}\addspace}%
-     \mkbibnamefamily{#1}\isdot
-     \ifdefvoid{#5}{}{\addcomma\addlowpenspace\mkbibnamesuffix{#5}\isdot}}}
+  \usebibmacro{name:delim}{#2#4#1#5}%
+  \usebibmacro{name:hook}{#2#4#1#5}%
+  \ifdefvoid{#2}{}{\mkbibnamegiven{#3}\isdot%
+                   \ifthenelse{\value{uniquename}>1}
+                     {\bibnamedelimd\mkbibbrackets{#2}}
+                     {}%
+                   \bibnamedelimd}%
+  \ifdefvoid{#4}{}{%
+    \mkbibnameprefix{#4}\isdot
+    \ifprefchar{}{\bibnamedelimc}}%
+  \mkbibnamefamily{#1}\isdot%
+  \ifdefvoid{#5}{}{\bibnamedelimd\mkbibnamesuffix{#5}\isdot}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -837,7 +848,7 @@
            \clearname{translator}%
            \setunit{\adddot}}%
         \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}}}
- 
+
 \newbibmacro*{editor+trans}{%
   \ifthenelse{\ifnameundef{editor}\AND%
               \ifnameundef{editora}\AND%
@@ -869,10 +880,14 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.29) Special journal issues
+% (APA 6.29) Special journal issues are periodicals
 
+\DeclareFieldFormat[periodical]{pages}{#1}
 \DeclareFieldFormat[periodical]{title}{#1\isdot}
-\DeclareFieldFormat[periodical]{issuetitle}{\mkbibemph{#1}\isdot}
+\DeclareFieldFormat[periodical]{issuetitle}{\mkbibbrackets{#1}}
+\DeclareFieldFormat[periodical]{volume}{\mkbibemph{\apanum{#1}}}
+\DeclareFieldFormat[periodical]{number}{\mkbibparens{\apanum{#1}}}
+\DeclareListFormat[periodical]{location}{\mkbibemph{#1}}
 
 \renewbibmacro*{periodical}{%
   \iffieldundef{title}
@@ -884,11 +899,17 @@
 
 \renewbibmacro*{title+issuetitle}{%
   \usebibmacro{periodical}%
-  \newunit
-  \usebibmacro{issue}%
-  \setunit*{\addcomma\addspace}%
-  \setunit{\addcomma\space}}
+  \setunit{\addspace}%
+  \printfield{issuetitle}%
+  \notbool{bbx:editorinauthpos}
+    {\newunit
+     \usebibmacro{labelyear+extradate}}
+    {}}
 
+\newbibmacro*{pnumber}{%
+  \printfield{volume}%
+  \printfield{number}}
+
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -1019,17 +1040,6 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.30) Periodicals emph number, location
-%            and pages (with no prefix)
-
-\DeclareFieldFormat[periodical]{pages}{\mkbibemph{#1}}
-\DeclareFieldFormat[periodical]{number}{\mkbibemph{\apanum{#1}}}
-\DeclareListFormat[periodical]{location}{\mkbibemph{#1}}
-
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 7.02 Example 38) Proceedings emph number, location
 %                       and location. Pages have no prefix
@@ -1063,6 +1073,7 @@
 % (APA 7.06) Reviews
 
 % The title of the review depends on the entrytype of the thing reviewed
+\newcommand*{\begrelateddelimreviewof}{\addspace}
 \DeclareFieldFormat[review]{title}{%
   \entrydata*{\thefield{related}}{%
     \iffieldequalstr{entrytype}{article}
@@ -1276,7 +1287,7 @@
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-       
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Related entries
 
@@ -1693,12 +1704,12 @@
   \usebibmacro{author/editor}%
   \setunit{\labelnamepunct}\newblock
   \usebibmacro{title+issuetitle}%
+  \setunit{\adddot\addspace}
+  \usebibmacro{journal}%
   \setunit{\addcomma\addspace}
   \printlist{location}%
   \setunit{\addcomma\addspace}
-  \printfield{volume}%
-  \setunit*{\adddot}%
-  \printfield{number}%
+  \usebibmacro{pnumber}%
   \setunit{\addcomma\addspace}
   \printfield{pages}%
   \newunit\newblock
@@ -2128,7 +2139,7 @@
     {\href{https://dx.doi.org/#1}{\nolinkurl{#1}}}
     {\nolinkurl{#1}}}
 
-% APA 6th 
+% APA 6th
 \newbibmacro*{location+publisher}{%
   \printlist[default][1-1]{location}%
   \setunit*{\addcolon\space}%

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-%% Copyright 2017 Philip Kime
+%% Copyright 2018 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -12,7 +12,7 @@
 %% 
 %% The Current Maintainer of this work is Philip Kime.
 
-\ProvidesFile{apa.cbx}[2017/11/05\space v7.5\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2018/03/05\space v7.6\space APA biblatex citation style]
 \RequireBiber[3]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-%% Copyright 2017 Philip Kime
+%% Copyright 2018 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -12,7 +12,7 @@
 %% 
 %% The Current Maintainer of this work is Philip Kime.
 
-\ProvidesFile{apa.dbx}[2017/11/05\space v7.5\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2018/03/05\space v7.6\space APA biblatex style data model]
 \RequireBiber[3]
 
 \DeclareDatamodelEntrytypes{

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{austrian-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{austrian}
 
 % Following DGPs guidlines for German/Austrian
@@ -71,48 +71,45 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
     \iffieldundef{#3}%
       {}%
-      {\iffieldundef{#1}%
-        {}
-        {\addcomma\addspace}%
-       \stripzeros{\thefield{#3}}}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
     \iffieldundef{#2}%
       {}%
-      {\iffieldundef{#3}
-        {\iffieldundef{#1}
-          {}
-          {\addspace}}%
-        {\adddot\addspace}%
-       \mkbibmonth{\thefield{#2}}}}%
+      {\mkbibmonth{\thefield{#2}}}}%
   \protected\def\mkbibdateapalongextra#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \printfield{extradate}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
     \iffieldundef{#3}%
       {}%
-      {\iffieldundef{#1}%
-        {}
-        {\addcomma\addspace}%
-       \stripzeros{\thefield{#3}}}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
     \iffieldundef{#2}%
       {}%
-      {\iffieldundef{#3}
-        {\iffieldundef{#1}
-          {}
-          {\addspace}}%
-        {\adddot\addspace}%
-       \mkbibmonth{\thefield{#2}}}}%
+      {\mkbibmonth{\thefield{#2}}}}%
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     \iffieldundef{#3}%
       {}%
-      {\stripzeros{\thefield{#3}}}%
+      {\mkbibordinal{\thefield{#3}}}%
     \iffieldundef{#2}%
       {}%
       {\iffieldundef{#3}%
         {}%
-        {\adddot\addspace}%
+        {\addspace}%
        \mkbibmonth{\thefield{#2}}}%
     \iffieldundef{#1}%
       {}%
@@ -119,8 +116,79 @@
       {\iffieldundef{#2}%
         {}%
         {\addspace}%
-       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
+       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
+  \def\apa at lbx@de at mkdaterangeapalong#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\datecircaprint
+         \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+           {\printtext{%
+               \iffieldsequal{#1year}{#1endyear}
+                 {\iffieldsequal{#1month}{#1endmonth}
+                    {\mkbibdateapalongmdy{}{}{#1day}}
+                    {\mkbibdateapalongmdy{}{#1month}{#1day}}}
+                 {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
+               \dateuncertainprint}}
+           {\printtext{%
+               \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+                 {\mkbibdateapalong{#1year}{}{#1day}}%
+                 {\mkbibdateapalong{#1year}{#1month}{#1day}}%
+               \dateeraprint{#1year}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \iffieldsequal{#1year}{#1endyear}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
+                      {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                     \dateeraprint{#1endyear}}}%
+                 \enddateuncertainprint}}}}%
+    \endgroup}%
+  \def\apa at lbx@de at mkdaterangeapalongextra#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\printtext{%
+          \datecircaprint
+          \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+            {\mkbibdateapalongextra{#1year}{}{#1day}}%
+            {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
+          \dateeraprint{#1year}%
+          \dateuncertainprint
+          \iffieldundef{#1endyear}%
+            {}%
+            {\iffieldequalstr{#1endyear}{}% open-ended range?
+              {\mbox{\bibdatedash}}
+              {\bibdatedash%
+               \iffieldsequal{#1year}{#1endyear}%
+                 {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
+                 {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                  \dateeraprint{#1endyear}}}%
+             \enddateuncertainprint}}}%
+    \endgroup}%
+  \savecommand\mkdaterangeapalong
+  \savecommand\mkdaterangeapalongextra
+  \def\mkdaterangeapalong{%
+    \apa at lbx@de at mkdaterangeapalong}%
+  \def\mkdaterangeapalongextra#1{%
+    \apa at lbx@de at mkdaterangeapalongextra{#1}}%
+}
 
+\UndeclareBibliographyExtras{%
+  \restorecommand\mkdaterangeapalong
+  \restorecommand\mkdaterangeapalongextra
+}
+
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{brazilian-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{brazilian}
 
 % (APA 6.22) The example abbreviations

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{british-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{british}
 
 % (APA 6.22) The example abbreviations

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{danish-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{danish-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{danish}
 
 % (APA 6.22) The example abbreviations

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{dutch-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{dutch}
 
 % (APA 6.22) The example abbreviations

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{english-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{english}
 
 % (APA 6.22) The example abbreviations

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{french-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{french}
 
 % (APA 6.22) The example abbreviations

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{german-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{german}
 
 % (APA 6.22) The example abbreviations
@@ -71,48 +71,45 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
     \iffieldundef{#3}%
       {}%
-      {\iffieldundef{#1}%
-        {}
-        {\addcomma\addspace}%
-       \stripzeros{\thefield{#3}}}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
     \iffieldundef{#2}%
       {}%
-      {\iffieldundef{#3}
-        {\iffieldundef{#1}
-          {}
-          {\addspace}}%
-        {\adddot\addspace}%
-       \mkbibmonth{\thefield{#2}}}}%
+      {\mkbibmonth{\thefield{#2}}}}%
   \protected\def\mkbibdateapalongextra#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \printfield{extradate}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
     \iffieldundef{#3}%
       {}%
-      {\iffieldundef{#1}%
-        {}
-        {\addcomma\addspace}%
-       \stripzeros{\thefield{#3}}}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
     \iffieldundef{#2}%
       {}%
-      {\iffieldundef{#3}
-        {\iffieldundef{#1}
-          {}
-          {\addspace}}%
-        {\adddot\addspace}%
-       \mkbibmonth{\thefield{#2}}}}%
+      {\mkbibmonth{\thefield{#2}}}}%
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     \iffieldundef{#3}%
       {}%
-      {\stripzeros{\thefield{#3}}}%
+      {\mkbibordinal{\thefield{#3}}}%
     \iffieldundef{#2}%
       {}%
       {\iffieldundef{#3}%
         {}%
-        {\adddot\addspace}%
+        {\addspace}%
        \mkbibmonth{\thefield{#2}}}%
     \iffieldundef{#1}%
       {}%
@@ -119,8 +116,78 @@
       {\iffieldundef{#2}%
         {}%
         {\addspace}%
-       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
+       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
+  \def\apa at lbx@de at mkdaterangeapalong#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\datecircaprint
+         \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+           {\printtext{%
+               \iffieldsequal{#1year}{#1endyear}
+                 {\iffieldsequal{#1month}{#1endmonth}
+                    {\mkbibdateapalongmdy{}{}{#1day}}
+                    {\mkbibdateapalongmdy{}{#1month}{#1day}}}
+                 {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
+               \dateuncertainprint}}
+           {\printtext{%
+               \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+                 {\mkbibdateapalong{#1year}{}{#1day}}%
+                 {\mkbibdateapalong{#1year}{#1month}{#1day}}%
+               \dateeraprint{#1year}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \iffieldsequal{#1year}{#1endyear}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
+                      {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                     \dateeraprint{#1endyear}}}%
+                 \enddateuncertainprint}}}}%
+    \endgroup}%
+  \def\apa at lbx@de at mkdaterangeapalongextra#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\printtext{%
+          \datecircaprint
+          \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+            {\mkbibdateapalongextra{#1year}{}{#1day}}%
+            {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
+          \dateeraprint{#1year}%
+          \dateuncertainprint
+          \iffieldundef{#1endyear}%
+            {}%
+            {\iffieldequalstr{#1endyear}{}% open-ended range?
+              {\mbox{\bibdatedash}}
+              {\bibdatedash%
+               \iffieldsequal{#1year}{#1endyear}%
+                 {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
+                 {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                  \dateeraprint{#1endyear}}}%
+             \enddateuncertainprint}}}%
+    \endgroup}%
+  \savecommand\mkdaterangeapalong
+  \savecommand\mkdaterangeapalongextra
+  \def\mkdaterangeapalong{%
+    \apa at lbx@de at mkdaterangeapalong}%
+  \def\mkdaterangeapalongextra#1{%
+    \apa at lbx@de at mkdaterangeapalongextra{#1}}%
+}
 
+\UndeclareBibliographyExtras{%
+  \restorecommand\mkdaterangeapalong
+  \restorecommand\mkdaterangeapalongextra
+}
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{greek-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{greek}
 
 % (APA 6.22) The example abbreviations

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{italian-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{italian}
 
 % (APA 6.22) The example abbreviations

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{naustrian-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{naustrian}
 
 % (APA 6.22) The example abbreviations
@@ -71,48 +71,45 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
     \iffieldundef{#3}%
       {}%
-      {\iffieldundef{#1}%
-        {}
-        {\addcomma\addspace}%
-       \stripzeros{\thefield{#3}}}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
     \iffieldundef{#2}%
       {}%
-      {\iffieldundef{#3}
-        {\iffieldundef{#1}
-          {}
-          {\addspace}}%
-        {\adddot\addspace}%
-       \mkbibmonth{\thefield{#2}}}}%
+      {\mkbibmonth{\thefield{#2}}}}%
   \protected\def\mkbibdateapalongextra#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \printfield{extradate}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
     \iffieldundef{#3}%
       {}%
-      {\iffieldundef{#1}%
-        {}
-        {\addcomma\addspace}%
-       \stripzeros{\thefield{#3}}}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
     \iffieldundef{#2}%
       {}%
-      {\iffieldundef{#3}
-        {\iffieldundef{#1}
-          {}
-          {\addspace}}%
-        {\adddot\addspace}%
-       \mkbibmonth{\thefield{#2}}}}%
+      {\mkbibmonth{\thefield{#2}}}}%
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     \iffieldundef{#3}%
       {}%
-      {\stripzeros{\thefield{#3}}}%
+      {\mkbibordinal{\thefield{#3}}}%
     \iffieldundef{#2}%
       {}%
       {\iffieldundef{#3}%
         {}%
-        {\adddot\addspace}%
+        {\addspace}%
        \mkbibmonth{\thefield{#2}}}%
     \iffieldundef{#1}%
       {}%
@@ -119,9 +116,80 @@
       {\iffieldundef{#2}%
         {}%
         {\addspace}%
-       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
+       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
+  \def\apa at lbx@de at mkdaterangeapalong#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\datecircaprint
+         \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+           {\printtext{%
+               \iffieldsequal{#1year}{#1endyear}
+                 {\iffieldsequal{#1month}{#1endmonth}
+                    {\mkbibdateapalongmdy{}{}{#1day}}
+                    {\mkbibdateapalongmdy{}{#1month}{#1day}}}
+                 {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
+               \dateuncertainprint}}
+           {\printtext{%
+               \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+                 {\mkbibdateapalong{#1year}{}{#1day}}%
+                 {\mkbibdateapalong{#1year}{#1month}{#1day}}%
+               \dateeraprint{#1year}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \iffieldsequal{#1year}{#1endyear}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
+                      {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                     \dateeraprint{#1endyear}}}%
+                 \enddateuncertainprint}}}}%
+    \endgroup}%
+  \def\apa at lbx@de at mkdaterangeapalongextra#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\printtext{%
+          \datecircaprint
+          \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+            {\mkbibdateapalongextra{#1year}{}{#1day}}%
+            {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
+          \dateeraprint{#1year}%
+          \dateuncertainprint
+          \iffieldundef{#1endyear}%
+            {}%
+            {\iffieldequalstr{#1endyear}{}% open-ended range?
+              {\mbox{\bibdatedash}}
+              {\bibdatedash%
+               \iffieldsequal{#1year}{#1endyear}%
+                 {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
+                 {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                  \dateeraprint{#1endyear}}}%
+             \enddateuncertainprint}}}%
+    \endgroup}%
+  \savecommand\mkdaterangeapalong
+  \savecommand\mkdaterangeapalongextra
+  \def\mkdaterangeapalong{%
+    \apa at lbx@de at mkdaterangeapalong}%
+  \def\mkdaterangeapalongextra#1{%
+    \apa at lbx@de at mkdaterangeapalongextra{#1}}%
+}
 
+\UndeclareBibliographyExtras{%
+  \restorecommand\mkdaterangeapalong
+  \restorecommand\mkdaterangeapalongextra
+}
 
+
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{ngerman-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{ngerman}
 
 % (APA 6.22) The example abbreviations
@@ -71,48 +71,45 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
     \iffieldundef{#3}%
       {}%
-      {\iffieldundef{#1}%
-        {}
-        {\addcomma\addspace}%
-       \stripzeros{\thefield{#3}}}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
     \iffieldundef{#2}%
       {}%
-      {\iffieldundef{#3}
-        {\iffieldundef{#1}
-          {}
-          {\addspace}}%
-        {\adddot\addspace}%
-       \mkbibmonth{\thefield{#2}}}}%
+      {\mkbibmonth{\thefield{#2}}}}%
   \protected\def\mkbibdateapalongextra#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \printfield{extradate}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
     \iffieldundef{#3}%
       {}%
-      {\iffieldundef{#1}%
-        {}
-        {\addcomma\addspace}%
-       \stripzeros{\thefield{#3}}}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
     \iffieldundef{#2}%
       {}%
-      {\iffieldundef{#3}
-        {\iffieldundef{#1}
-          {}
-          {\addspace}}%
-        {\adddot\addspace}%
-       \mkbibmonth{\thefield{#2}}}}%
+      {\mkbibmonth{\thefield{#2}}}}%
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     \iffieldundef{#3}%
       {}%
-      {\stripzeros{\thefield{#3}}}%
+      {\mkbibordinal{\thefield{#3}}}%
     \iffieldundef{#2}%
       {}%
       {\iffieldundef{#3}%
         {}%
-        {\adddot\addspace}%
+        {\addspace}%
        \mkbibmonth{\thefield{#2}}}%
     \iffieldundef{#1}%
       {}%
@@ -119,8 +116,78 @@
       {\iffieldundef{#2}%
         {}%
         {\addspace}%
-       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
+       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
+  \def\apa at lbx@de at mkdaterangeapalong#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\datecircaprint
+         \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+           {\printtext{%
+               \iffieldsequal{#1year}{#1endyear}
+                 {\iffieldsequal{#1month}{#1endmonth}
+                    {\mkbibdateapalongmdy{}{}{#1day}}
+                    {\mkbibdateapalongmdy{}{#1month}{#1day}}}
+                 {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
+               \dateuncertainprint}}
+           {\printtext{%
+               \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+                 {\mkbibdateapalong{#1year}{}{#1day}}%
+                 {\mkbibdateapalong{#1year}{#1month}{#1day}}%
+               \dateeraprint{#1year}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \iffieldsequal{#1year}{#1endyear}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
+                      {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                     \dateeraprint{#1endyear}}}%
+                 \enddateuncertainprint}}}}%
+    \endgroup}%
+  \def\apa at lbx@de at mkdaterangeapalongextra#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\printtext{%
+          \datecircaprint
+          \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+            {\mkbibdateapalongextra{#1year}{}{#1day}}%
+            {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
+          \dateeraprint{#1year}%
+          \dateuncertainprint
+          \iffieldundef{#1endyear}%
+            {}%
+            {\iffieldequalstr{#1endyear}{}% open-ended range?
+              {\mbox{\bibdatedash}}
+              {\bibdatedash%
+               \iffieldsequal{#1year}{#1endyear}%
+                 {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
+                 {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                  \dateeraprint{#1endyear}}}%
+             \enddateuncertainprint}}}%
+    \endgroup}%
+  \savecommand\mkdaterangeapalong
+  \savecommand\mkdaterangeapalongextra
+  \def\mkdaterangeapalong{%
+    \apa at lbx@de at mkdaterangeapalong}%
+  \def\mkdaterangeapalongextra#1{%
+    \apa at lbx@de at mkdaterangeapalongextra{#1}}%
+}
 
+\UndeclareBibliographyExtras{%
+  \restorecommand\mkdaterangeapalong
+  \restorecommand\mkdaterangeapalongextra
+}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{norsk-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{norsk}
 
 % (APA 6.22) The example abbreviations

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{norwegian-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{norwegian}
 
 % (APA 6.22) The example abbreviations

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{nswissgerman-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{nswissgerman-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{nswissgerman}
 
 % (APA 6.22) The example abbreviations
@@ -71,48 +71,45 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
     \iffieldundef{#3}%
       {}%
-      {\iffieldundef{#1}%
-        {}
-        {\addcomma\addspace}%
-       \stripzeros{\thefield{#3}}}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
     \iffieldundef{#2}%
       {}%
-      {\iffieldundef{#3}
-        {\iffieldundef{#1}
-          {}
-          {\addspace}}%
-        {\adddot\addspace}%
-       \mkbibmonth{\thefield{#2}}}}%
+      {\mkbibmonth{\thefield{#2}}}}%
   \protected\def\mkbibdateapalongextra#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \printfield{extradate}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
     \iffieldundef{#3}%
       {}%
-      {\iffieldundef{#1}%
-        {}
-        {\addcomma\addspace}%
-       \stripzeros{\thefield{#3}}}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
     \iffieldundef{#2}%
       {}%
-      {\iffieldundef{#3}
-        {\iffieldundef{#1}
-          {}
-          {\addspace}}%
-        {\adddot\addspace}%
-       \mkbibmonth{\thefield{#2}}}}%
+      {\mkbibmonth{\thefield{#2}}}}%
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     \iffieldundef{#3}%
       {}%
-      {\stripzeros{\thefield{#3}}}%
+      {\mkbibordinal{\thefield{#3}}}%
     \iffieldundef{#2}%
       {}%
       {\iffieldundef{#3}%
         {}%
-        {\adddot\addspace}%
+        {\addspace}%
        \mkbibmonth{\thefield{#2}}}%
     \iffieldundef{#1}%
       {}%
@@ -119,9 +116,80 @@
       {\iffieldundef{#2}%
         {}%
         {\addspace}%
-       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
+       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
+  \def\apa at lbx@de at mkdaterangeapalong#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\datecircaprint
+         \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+           {\printtext{%
+               \iffieldsequal{#1year}{#1endyear}
+                 {\iffieldsequal{#1month}{#1endmonth}
+                    {\mkbibdateapalongmdy{}{}{#1day}}
+                    {\mkbibdateapalongmdy{}{#1month}{#1day}}}
+                 {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
+               \dateuncertainprint}}
+           {\printtext{%
+               \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+                 {\mkbibdateapalong{#1year}{}{#1day}}%
+                 {\mkbibdateapalong{#1year}{#1month}{#1day}}%
+               \dateeraprint{#1year}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \iffieldsequal{#1year}{#1endyear}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
+                      {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                     \dateeraprint{#1endyear}}}%
+                 \enddateuncertainprint}}}}%
+    \endgroup}%
+  \def\apa at lbx@de at mkdaterangeapalongextra#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\printtext{%
+          \datecircaprint
+          \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+            {\mkbibdateapalongextra{#1year}{}{#1day}}%
+            {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
+          \dateeraprint{#1year}%
+          \dateuncertainprint
+          \iffieldundef{#1endyear}%
+            {}%
+            {\iffieldequalstr{#1endyear}{}% open-ended range?
+              {\mbox{\bibdatedash}}
+              {\bibdatedash%
+               \iffieldsequal{#1year}{#1endyear}%
+                 {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
+                 {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                  \dateeraprint{#1endyear}}}%
+             \enddateuncertainprint}}}%
+    \endgroup}%
+  \savecommand\mkdaterangeapalong
+  \savecommand\mkdaterangeapalongextra
+  \def\mkdaterangeapalong{%
+    \apa at lbx@de at mkdaterangeapalong}%
+  \def\mkdaterangeapalongextra#1{%
+    \apa at lbx@de at mkdaterangeapalongextra{#1}}%
+}
 
+\UndeclareBibliographyExtras{%
+  \restorecommand\mkdaterangeapalong
+  \restorecommand\mkdaterangeapalongextra
+}
 
+
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{nynorsk-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{nynorsk}
 
 % (APA 6.22) The example abbreviations

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{portuguese-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{portuguese-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{portuguese}
 
 % (APA 6.22) The example abbreviations

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{russian-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{russian-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{russian}
 
 % (APA 6.22) The example abbreviations

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{slovene-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{slovene-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{slovene}
 
 % (APA 6.22) The example abbreviations

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{spanish-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{spanish}
 
 \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{swedish-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{swedish}
 
 % (APA 6.22) The example abbreviations

Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx	2018-03-06 22:52:46 UTC (rev 46863)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx	2018-03-06 22:53:21 UTC (rev 46864)
@@ -1,4 +1,4 @@
-\ProvidesFile{swissgerman-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\ProvidesFile{swissgerman-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
 \InheritBibliographyExtras{swissgerman}
 
 % Following DGPs guidlines for German/Austrian/Swiss German
@@ -71,48 +71,45 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
     \iffieldundef{#3}%
       {}%
-      {\iffieldundef{#1}%
-        {}
-        {\addcomma\addspace}%
-       \stripzeros{\thefield{#3}}}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
     \iffieldundef{#2}%
       {}%
-      {\iffieldundef{#3}
-        {\iffieldundef{#1}
-          {}
-          {\addspace}}%
-        {\adddot\addspace}%
-       \mkbibmonth{\thefield{#2}}}}%
+      {\mkbibmonth{\thefield{#2}}}}%
   \protected\def\mkbibdateapalongextra#1#2#3{%
     \iffieldundef{#1}%
       {}%
-      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \printfield{extradate}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
     \iffieldundef{#3}%
       {}%
-      {\iffieldundef{#1}%
-        {}
-        {\addcomma\addspace}%
-       \stripzeros{\thefield{#3}}}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
     \iffieldundef{#2}%
       {}%
-      {\iffieldundef{#3}
-        {\iffieldundef{#1}
-          {}
-          {\addspace}}%
-        {\adddot\addspace}%
-       \mkbibmonth{\thefield{#2}}}}%
+      {\mkbibmonth{\thefield{#2}}}}%
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     \iffieldundef{#3}%
       {}%
-      {\stripzeros{\thefield{#3}}}%
+      {\mkbibordinal{\thefield{#3}}}%
     \iffieldundef{#2}%
       {}%
       {\iffieldundef{#3}%
         {}%
-        {\adddot\addspace}%
+        {\addspace}%
        \mkbibmonth{\thefield{#2}}}%
     \iffieldundef{#1}%
       {}%
@@ -119,8 +116,79 @@
       {\iffieldundef{#2}%
         {}%
         {\addspace}%
-       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}
+       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
+  \def\apa at lbx@de at mkdaterangeapalong#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\datecircaprint
+         \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+           {\printtext{%
+               \iffieldsequal{#1year}{#1endyear}
+                 {\iffieldsequal{#1month}{#1endmonth}
+                    {\mkbibdateapalongmdy{}{}{#1day}}
+                    {\mkbibdateapalongmdy{}{#1month}{#1day}}}
+                 {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
+               \dateuncertainprint}}
+           {\printtext{%
+               \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+                 {\mkbibdateapalong{#1year}{}{#1day}}%
+                 {\mkbibdateapalong{#1year}{#1month}{#1day}}%
+               \dateeraprint{#1year}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \iffieldsequal{#1year}{#1endyear}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
+                      {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                     \dateeraprint{#1endyear}}}%
+                 \enddateuncertainprint}}}}%
+    \endgroup}%
+  \def\apa at lbx@de at mkdaterangeapalongextra#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\printtext{%
+          \datecircaprint
+          \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+            {\mkbibdateapalongextra{#1year}{}{#1day}}%
+            {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
+          \dateeraprint{#1year}%
+          \dateuncertainprint
+          \iffieldundef{#1endyear}%
+            {}%
+            {\iffieldequalstr{#1endyear}{}% open-ended range?
+              {\mbox{\bibdatedash}}
+              {\bibdatedash%
+               \iffieldsequal{#1year}{#1endyear}%
+                 {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
+                 {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                  \dateeraprint{#1endyear}}}%
+             \enddateuncertainprint}}}%
+    \endgroup}%
+  \savecommand\mkdaterangeapalong
+  \savecommand\mkdaterangeapalongextra
+  \def\mkdaterangeapalong{%
+    \apa at lbx@de at mkdaterangeapalong}%
+  \def\mkdaterangeapalongextra#1{%
+    \apa at lbx@de at mkdaterangeapalongextra{#1}}%
+}
 
+\UndeclareBibliographyExtras{%
+  \restorecommand\mkdaterangeapalong
+  \restorecommand\mkdaterangeapalongextra
+}
+
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 



More information about the tex-live-commits mailing list