From ecebd0a4440421fc97630ee9d225c7d7fc475fea Mon Sep 17 00:00:00 2001 From: Philip Kime Date: Sun, 5 Nov 2017 17:06:49 +0100 Subject: [PATCH] Readying 7.5 --- README | 2 - RELEASE | 1 - doc/biblatex-apa-test.tex | 4 +- doc/biblatex-apa.tex | 5 ++- doc/reference.pdf | Bin 109583 -> 109601 bytes tex/latex/biblatex-apa/bbx/apa.bbx | 22 +++++------ tex/latex/biblatex-apa/cbx/apa.cbx | 36 +++++++++--------- tex/latex/biblatex-apa/dbx/apa.dbx | 2 +- tex/latex/biblatex-apa/lbx/american-apa.lbx | 4 +- tex/latex/biblatex-apa/lbx/austrian-apa.lbx | 4 +- tex/latex/biblatex-apa/lbx/brazilian-apa.lbx | 4 +- tex/latex/biblatex-apa/lbx/british-apa.lbx | 4 +- tex/latex/biblatex-apa/lbx/danish-apa.lbx | 4 +- tex/latex/biblatex-apa/lbx/dutch-apa.lbx | 4 +- tex/latex/biblatex-apa/lbx/english-apa.lbx | 4 +- tex/latex/biblatex-apa/lbx/french-apa.lbx | 4 +- tex/latex/biblatex-apa/lbx/german-apa.lbx | 4 +- tex/latex/biblatex-apa/lbx/greek-apa.lbx | 4 +- tex/latex/biblatex-apa/lbx/italian-apa.lbx | 4 +- tex/latex/biblatex-apa/lbx/naustrian-apa.lbx | 4 +- tex/latex/biblatex-apa/lbx/ngerman-apa.lbx | 4 +- tex/latex/biblatex-apa/lbx/norsk-apa.lbx | 4 +- tex/latex/biblatex-apa/lbx/norwegian-apa.lbx | 4 +- .../biblatex-apa/lbx/nswissgerman-apa.lbx | 4 +- tex/latex/biblatex-apa/lbx/nynorsk-apa.lbx | 4 +- tex/latex/biblatex-apa/lbx/portuguese-apa.lbx | 4 +- tex/latex/biblatex-apa/lbx/russian-apa.lbx | 4 +- tex/latex/biblatex-apa/lbx/slovene-apa.lbx | 4 +- tex/latex/biblatex-apa/lbx/spanish-apa.lbx | 4 +- tex/latex/biblatex-apa/lbx/swedish-apa.lbx | 4 +- .../biblatex-apa/lbx/swissgerman-apa.lbx | 4 +- 31 files changed, 81 insertions(+), 83 deletions(-) diff --git a/README b/README index 054841a..b027df2 100644 --- 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 index 7a710cc..1c23e98 100644 --- 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 index 5370890..6350f1c 100644 --- 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 index 11245fe..82c84b7 100644 --- 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 index c8ccea66672c9356889a6a068d8e8c6f0933e664..71d2b963de2b4c2c716ec8650ac2bbc6fc8f9ce0 100644 GIT binary patch delta 29647 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

APEdYRzyK!rN^0t`4NvjgT)DBW66ZwQSMa z9L0EyT-3Z&By&`I(4M^^u1i}oupg1MY@$@V@%bO>C=SjgvuuOS3hu8*W=wC(_dMH%fUM2^76KTC<7+tD zJ^?mU86u&oLAk0qo56E(4NtpFYQ5FU@&-)D`V^9ZS@FXO*$7&EPOtj(;Ej=O?GH#C z*Ju!QkVg58dGo&-Bgd5kxu4USksQHIBoAun5wllueF&tgZfM1ok0D`@gyHs-{(2M~ zkY`f=fn0QGJJn?xkU?7juk;Te^2%nfA8s!l-xQFS<>EPJF#pn+!Q6c`jo4cLM85-h z{Q^^vi}QVe0mX&UZ~{%)vVJIg09}rGQUXaM+@=hubgtw>#F2Me z_rBxic*4ojv1936D68$Prg$u-WSO77GtiZ#$v_U{bOtKd?sQnpwzm&yCXN zNU-uT^-s@r%wKF-?4~yRZlk_t=jfUhXA_Gvr!nDw%`l|F3MM{;FH|G{V`~jFS7v>r z!p9m)z}IcGxAZA#0k1`WpmYcEc;R#TiFN(%8ou{cwCQC&omRi0=I>Aw0AtRcxsven zUNqtAl^U2(m$TDh|G3emw@pc(a{BaVSzIOGw>TG5Qbp+t>1eJT38ke+_z%2>Kd0PI zdbIxVD=0y&l4t2&-h3oxgPpYHv_-v1s3Mak14=UGSrL0*a`Cyttqhr@ShK#B7!*rs zwf{8E{mjUn>a=q}2MPa4`jfH5@28U#BiPe1wksJ>c8bb6i6|?9rbedtV%OX-?`L#c za+lR?e?pj-uWRIN?;vX#Hw5cyCP=x3T5hOtfP;Dy%v;VTtIDhkr^uRA#?c%$QExcA z9ZdFxZn9dKe%w!hJB8Wt40$x9VX`&8x~C>Q2yN3SfE`C2(vv^<1($TwKn8`L$lUL1 zZZ`<9+opXWyk(byw}BFM%!mEbixwY5OHMT6pN;Dv-d=4rO)iJS{S}j6UCzKGG@SC9 z3Lh?S3GFk>@HVGl>)U9^NKbk`IoRJ|hZ#1KLVQQP0=Gtdx<2^I-NeAqTK@tOCJY6W zep|JNBbStsfvTIUJBQR|$Wc^{t~;vRihU2DXe`zjQ~y;F)*3pz&T+MO?z$DZV1BCU-=UOvrcw9&Bn_7k=+pTBUo-d=l3+blPokUW1YTh zIkF9kZ@IBC2@3uE1Y!ngPlxPX<@YiQ^zZeyCO#e{d-s-&*(aOcUd7+S06iduB)pYqlviR-& z+_8<%=gPB<54O*>sVig<9d@d536E3FZ0%IVta6LRT&_ z{8YV!P-pO4qVC4hl_8qP^7-;&V-N(am(3Pif_B=~gxO;pW6YYf(rej{6=YI*10N_5m|{OQcC9 zYirC2EiiBGS)G=v2_m!$J!BK(E$m?}&JQ6dhZdlE43eVefs%JAWpo1#I-qcEy(c(n zoCr*rtaqDE?eD+Yx_zQI*9--Wp7V*y)tRDBi=XHpz8(UAmjvOwBK=KYUu+TUUTL?>aA^jt}#hL(6hcR;@jC1|IUSXPX`V-?Jk?_I0 zPpFm0U+eF?C3`6W2}sFpeyv&HviRc&^-?3R{SmsRaoEkp5r<2ZmH1T$xZk6&c$Z8b zd7x39YhFgWexRwTzv6jl>~tAGvKo^+X6>gA zYf#vy>f4%V;oiZG=UE<$y0mph54P{LvJ{D0M2M z)ft1?ok3ISny9(lsFo-csUf;}2a6*5g;(8AC#v^EO|C_^eb6;$ocqs_CqS&`_)FeiY3wLXjf; zB#Q#6ly8$elPgS}&z7$IYT5|^kn#8W z6tK7nr<7ndQTURua$wt`%je_y&SM~tPg2oV%*nuLAAfTSFcCdm<-8OrnAxRyJ~dh& z)^Q%<)w%6wGu%(KWPW}W{Ei>3gUHQ^4RRN^tcf$M+-_Yr*4}@UC>v&Y65e+z$6O4S zU{{kim)7YyvJwX*^ z$$=I|&}H=$IRBaV*IB1JW5R2qdG5A607{sM4gDH7>dK?Y=fGtPQtjhQ8 zV1U!E(_8KBdgmW;iMDd=u9fQ_@%q$~yGI`3M%PZ|xWqJ7n1*@x#a3{SRTXd6Gz++~1YuERO;}I)N8|Wo1$ozq`T5p?J3;~N$Uk)K3{Gx-81Q~TOpai z!mFr4Q7Z&3iM2K*y@~ z!k4?D>(AcSjn7oSDnq?%cr>_VqlUwOi@xjma`0Z zHl*C(hOrML;_R#g0&QR_-(Xr(B3JaSGHRPWm^US?TLfhJd>{ zCMHg+9p-GaBI~hVB_wK;v6N$Gfm@cTGFM} z^V;|~T=hkjB%ZwUIs!8b){MCH{P3#&tr>p5r|Dm&XylGvZQSOpcSoksF)C zuj>SHmU`sEK9ysi(|-cCn#Re;Mj*#YEOZ%8%~ZZJ_dZAD<>)1h392($y)!P2kLKM% zp{4op?X|6{$U?ltv57GaHW3GnVkkpI~zf3=|(;@Z@zGWv8w;#E$IyC6DvE!yXssm1=sI^bpgr9FXSs3-%9X|Kzh!1oh>=7tvfd{9k%(ft?SPe9AvQs2rg?fJRP9(A@Ap zQ1^k(Zu)dM)m;^F{yIx6O~(=l=x0Z0`O(@OFgojF^p5C1a6RgF0&nMlZh@sYvWIeN z3^zd!tcH|6tH@reS9&o=EI_U>^67f8FXMUM-~x)yXn7zn;~61uT_h&c&{klW_9+!y zMViQV15TY0(RWO}L2+F);M^(a<@?DC7#cAv^00N86VAr}bl5KYuS zxz}HG-LptO^o@UH_T+OqQOM*bVPg%5iaC_~i*Ya!>ca~ay*ZWk>@=AcJMez0_q*Nq zVQ1`;!%kpRchSld6c#vH;thIH5F^4O=`)`X)rl}zzN*LIO`s=mEqQ=UnVE5liIDlS zSS7hlkeJM{-Gzb(fTcs|77+!$E{t0b7Z(+deN&B#gYlNDPm!Uu!JvRd`))RtoD3c1 ziOS$s0^<%wc#O+36|cG*l8x$GwdtuLqYVhB+ijD7=pWFyL~G{_$n4&xVRgcX*m(Od zl@qQC z{Bp$aFhUK0Y?vcSVyB;SIG(QtmK&2sl~e*#49SuH8rk@Be3eiP(br+oLGsuL9R~$*=ekr7Hyz zrPsmzQyBrILkDc65(oIXtCG25VK!f8$on~d9KD`M=H8SQVRGXT9TdLp!sAd!pm8RX zD#RY>3UJ;xa*wQ(REcZvfroarV&M2FVtSshr0~p8O)QBTmfXrP7TBl!>A@vf0v+Nw zINpHp9%%#;gy?BX)F>Ag65Yc*dA+^*g)oAUr@01Q3=Ood9%`~Z@fk}^Op9aSpw*aJ zp}>Qvy#_^XU#CrLlex$s<+H>K@?YY;D-X3how-dve)O};`9CsguI9yJIhapeQR##c z-J?i5Ffd8-%v~i-axHCbt(IfI5F%GVRsq0_Cla@#@C~_m{dudoRWZ-~fqHpoayU#w zhU1Hk(ZA|J@B2c_SMV+(KvT9+i4u8bVDNCA zc^Iqnlw)bvjw@2(fuN>oD;AJN@-$TghT%1~L=eY~Uk|7e!%q-RmXNFGgJR|{W&#Z7 z)xBc=Am>Mk9)C(I;Nto>XaGUQRC&!Sgna7HyoUK$M1gkTBz>y1Ju3E?5xk!*=4bsp zSvXnuPe>yAp;FU0A%mjzZ0lo2JZwM1?~;zb8u$n1LYN-4K(`#jd%BVcw7DIRGh z(xemgN#*2r=qJI#)VDj(=(6W=%kcm;K5~!DIVp+sIVLJhQPG*7(vCY;Uk^HnRTO=@ zB!(S!)OpOO8M6qQfi{+n6#hFT3^tI6%CPGr4Eio#k6)i**RT>)s8p&xJ}hMejD?vJ z?-ujtbHyUel3uX@f935GP_=d`EKCwgrv3+O2c8q9@Z3+K@%Vn}lII^b4PAh61BeOv zWttMwm{>rLW6MWwNoIWyM+ACKh;EBgaLO2V zUymRGE1Mv>MnI3ERgjE>qE&t~hB_4OOwx;=nD*sZ35>dLgohk{lD?#T^8-9a=h@(x?wQnx(ld^E-pFnAFTGp#zdO)5eO-_D5Z8lwS{da*7enXx}t zr3zhtQ1S056n;I9=7eHrA3XU~BXKP=f%+&FeZHq`$9D?}EFmC=;AUaa5@PfI5{%6; zbT0p#<$uZYG>r>q6$%^Obg+%vo)crNE<5KfNILz8`138twCde~-e$C?aNm5kf_X8F zPun_{ftUSLPo|duTC$5)fh}6&4&VJQh>3m(IVxvJ zI?4z~)drM(MiQ>T@by!SZ-KLZ@n4}% zT|qNlG3svr+xWTN?!i}&1}siG6lX+3Z%N~($q6ogn3(xVm514Jn#|v4A-fCqr1#@N z*j0~3TMkoEN2@`%-NBvQ;h1c&Jvf|9x&%PuzdEmpPxk104Z{S)Yp@spO=(~wCdBv_ zI%wp38sn=fk^fSx=ZS<;17p-2cxXS^r-^7qRvui9+pCE<61vx?8HO}WPXD7?Qur%b z_Hww6qF3>^d16b9hR{`!^PKzt$3^@$sO4ts0{ZosCx4F&@O2ZP4Y1Sj(uY-(_68uL zkpCZxT>iqBW|Zh5=hI5N;>!lyov4k=K@;sB`FYLdfC=|t6nCV75EpEA07WV*KjI^c2&A$zpGB!)V{2w#KNhE4X6h|=m%KJyZOg0H`2}SUIwT0-kz)g zCuY1G<`@_!5t<$#Likn?5#%;n(y<>+tAkx=M6AE_MhmAC@( zxI&cNgWRgSTu5Y>pt7I_lQ)Z?Z~@zGj*BhEm|a-;9pVe#OqUS!f9JhLpu0u6IZ$1g zWbIWvpP6sM+*bPpt&D-EG0%~{(Q5|VaHrB*_xhiy-@{}K7fWk5e8SI0Y79ZzSOY|f8WNkXgm|CVHFEv_QGzoX-&`<6FgbP;tv&pdlp z+MOpTHL!247QI(8s1B delta 29733 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 E0Mj5v+W-In diff --git a/tex/latex/biblatex-apa/bbx/apa.bbx b/tex/latex/biblatex-apa/bbx/apa.bbx index 765c95f..6ae6d0d 100644 --- 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 index e758a8b..8fdc1f2 100644 --- 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,7 +273,7 @@ {\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}} @@ -281,7 +281,7 @@ \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 index 57c2547..95c7b97 100644 --- 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 index 447174d..84dc79c 100644 --- 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 index bb5b631..17ee78a 100644 --- 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 index 2bb0e82..c04fd33 100644 --- 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 index 6466589..faa16e4 100644 --- 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 index 85801da..92bd17f 100644 --- 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 index 01ff0f4..025aeff 100644 --- 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 index 16a6fbc..e3c6f5e 100644 --- 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}% diff --git a/tex/latex/biblatex-apa/lbx/french-apa.lbx b/tex/latex/biblatex-apa/lbx/french-apa.lbx index a07a44b..5575696 100644 --- a/tex/latex/biblatex-apa/lbx/french-apa.lbx +++ b/tex/latex/biblatex-apa/lbx/french-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{french-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] +\ProvidesFile{french-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation] \InheritBibliographyExtras{french} % (APA 6.22) The example abbreviations @@ -82,7 +82,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/german-apa.lbx b/tex/latex/biblatex-apa/lbx/german-apa.lbx index f41fb17..8c7fc83 100644 --- a/tex/latex/biblatex-apa/lbx/german-apa.lbx +++ b/tex/latex/biblatex-apa/lbx/german-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{german-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] +\ProvidesFile{german-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation] \InheritBibliographyExtras{german} % (APA 6.22) The example abbreviations @@ -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/greek-apa.lbx b/tex/latex/biblatex-apa/lbx/greek-apa.lbx index c588768..28b81da 100644 --- a/tex/latex/biblatex-apa/lbx/greek-apa.lbx +++ b/tex/latex/biblatex-apa/lbx/greek-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{greek-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] +\ProvidesFile{greek-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation] \InheritBibliographyExtras{greek} % (APA 6.22) The example abbreviations @@ -105,7 +105,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/italian-apa.lbx b/tex/latex/biblatex-apa/lbx/italian-apa.lbx index 9a5a90e..11eebac 100644 --- a/tex/latex/biblatex-apa/lbx/italian-apa.lbx +++ b/tex/latex/biblatex-apa/lbx/italian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{italian-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] +\ProvidesFile{italian-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation] \InheritBibliographyExtras{italian} % (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/naustrian-apa.lbx b/tex/latex/biblatex-apa/lbx/naustrian-apa.lbx index 2c986aa..21cf05f 100644 --- a/tex/latex/biblatex-apa/lbx/naustrian-apa.lbx +++ b/tex/latex/biblatex-apa/lbx/naustrian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{naustrian-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] +\ProvidesFile{naustrian-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation] \InheritBibliographyExtras{naustrian} % (APA 6.22) The example abbreviations @@ -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/ngerman-apa.lbx b/tex/latex/biblatex-apa/lbx/ngerman-apa.lbx index c4cb355..5d954cb 100644 --- a/tex/latex/biblatex-apa/lbx/ngerman-apa.lbx +++ b/tex/latex/biblatex-apa/lbx/ngerman-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{ngerman-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] +\ProvidesFile{ngerman-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation] \InheritBibliographyExtras{ngerman} % (APA 6.22) The example abbreviations @@ -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/norsk-apa.lbx b/tex/latex/biblatex-apa/lbx/norsk-apa.lbx index b968a80..6fed73d 100644 --- a/tex/latex/biblatex-apa/lbx/norsk-apa.lbx +++ b/tex/latex/biblatex-apa/lbx/norsk-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{norsk-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] +\ProvidesFile{norsk-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation] \InheritBibliographyExtras{norsk} % (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{#3}% {}% {\iffieldundef{#1}% diff --git a/tex/latex/biblatex-apa/lbx/norwegian-apa.lbx b/tex/latex/biblatex-apa/lbx/norwegian-apa.lbx index dfb5ce1..abaf82f 100644 --- a/tex/latex/biblatex-apa/lbx/norwegian-apa.lbx +++ b/tex/latex/biblatex-apa/lbx/norwegian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{norwegian-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] +\ProvidesFile{norwegian-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation] \InheritBibliographyExtras{norwegian} % (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{#3}% {}% {\iffieldundef{#1}% diff --git a/tex/latex/biblatex-apa/lbx/nswissgerman-apa.lbx b/tex/latex/biblatex-apa/lbx/nswissgerman-apa.lbx index cac90d2..fae5e60 100644 --- a/tex/latex/biblatex-apa/lbx/nswissgerman-apa.lbx +++ b/tex/latex/biblatex-apa/lbx/nswissgerman-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{nswissgerman-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] +\ProvidesFile{nswissgerman-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation] \InheritBibliographyExtras{nswissgerman} % (APA 6.22) The example abbreviations @@ -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/nynorsk-apa.lbx b/tex/latex/biblatex-apa/lbx/nynorsk-apa.lbx index 1d12d5c..c1e7ed8 100644 --- a/tex/latex/biblatex-apa/lbx/nynorsk-apa.lbx +++ b/tex/latex/biblatex-apa/lbx/nynorsk-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{nynorsk-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] +\ProvidesFile{nynorsk-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation] \InheritBibliographyExtras{nynorsk} % (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{#3}% {}% {\iffieldundef{#1}% diff --git a/tex/latex/biblatex-apa/lbx/portuguese-apa.lbx b/tex/latex/biblatex-apa/lbx/portuguese-apa.lbx index 8a3a06a..df436c3 100644 --- a/tex/latex/biblatex-apa/lbx/portuguese-apa.lbx +++ b/tex/latex/biblatex-apa/lbx/portuguese-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{portuguese-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] +\ProvidesFile{portuguese-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation] \InheritBibliographyExtras{portuguese} % (APA 6.22) The example abbreviations @@ -79,7 +79,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/russian-apa.lbx b/tex/latex/biblatex-apa/lbx/russian-apa.lbx index aca6839..2527951 100644 --- a/tex/latex/biblatex-apa/lbx/russian-apa.lbx +++ b/tex/latex/biblatex-apa/lbx/russian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{russian-apa.lbx}[2017/07/09\space v0.1\space APA biblatex localisation] +\ProvidesFile{russian-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation] \InheritBibliographyExtras{russian} % (APA 6.22) The example abbreviations @@ -97,7 +97,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{#3}% {}% {\iffieldundef{#1}% diff --git a/tex/latex/biblatex-apa/lbx/slovene-apa.lbx b/tex/latex/biblatex-apa/lbx/slovene-apa.lbx index 3eb3869..f0c9a28 100644 --- a/tex/latex/biblatex-apa/lbx/slovene-apa.lbx +++ b/tex/latex/biblatex-apa/lbx/slovene-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{slovene-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] +\ProvidesFile{slovene-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation] \InheritBibliographyExtras{slovene} % (APA 6.22) The example abbreviations @@ -122,7 +122,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{#3}% {}% {\iffieldundef{#1}% diff --git a/tex/latex/biblatex-apa/lbx/spanish-apa.lbx b/tex/latex/biblatex-apa/lbx/spanish-apa.lbx index 120455e..564c279 100644 --- a/tex/latex/biblatex-apa/lbx/spanish-apa.lbx +++ b/tex/latex/biblatex-apa/lbx/spanish-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{spanish-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] +\ProvidesFile{spanish-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation] \InheritBibliographyExtras{spanish} \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced @@ -99,7 +99,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/swedish-apa.lbx b/tex/latex/biblatex-apa/lbx/swedish-apa.lbx index f773baa..9c33c3d 100644 --- a/tex/latex/biblatex-apa/lbx/swedish-apa.lbx +++ b/tex/latex/biblatex-apa/lbx/swedish-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{swedish-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] +\ProvidesFile{swedish-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation] \InheritBibliographyExtras{swedish} % (APA 6.22) The example abbreviations @@ -86,7 +86,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{#3}% {}% {\iffieldundef{#1}% diff --git a/tex/latex/biblatex-apa/lbx/swissgerman-apa.lbx b/tex/latex/biblatex-apa/lbx/swissgerman-apa.lbx index ce6714a..00ec43c 100644 --- a/tex/latex/biblatex-apa/lbx/swissgerman-apa.lbx +++ b/tex/latex/biblatex-apa/lbx/swissgerman-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{swissgerman-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] +\ProvidesFile{swissgerman-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation] \InheritBibliographyExtras{swissgerman} % Following DGPs guidlines for German/Austrian/Swiss German @@ -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}%