From 130a38c55bf2d923363d6697b46c67e5ce59d5fb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 12 Nov 2017 22:33:48 +0000 Subject: biblatex-apa git-svn-id: svn://tug.org/texlive/trunk@45766 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-apa/american-apa.lbx | 4 +- Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx | 43 +++---- Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx | 81 +++++++------ Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx | 2 +- .../tex/latex/biblatex-apa/austrian-apa.lbx | 4 +- .../tex/latex/biblatex-apa/brazilian-apa.lbx | 4 +- .../tex/latex/biblatex-apa/british-apa.lbx | 4 +- .../tex/latex/biblatex-apa/danish-apa.lbx | 4 +- .../tex/latex/biblatex-apa/dutch-apa.lbx | 4 +- .../tex/latex/biblatex-apa/english-apa.lbx | 4 +- .../tex/latex/biblatex-apa/french-apa.lbx | 4 +- .../tex/latex/biblatex-apa/german-apa.lbx | 4 +- .../tex/latex/biblatex-apa/greek-apa.lbx | 4 +- .../tex/latex/biblatex-apa/italian-apa.lbx | 4 +- .../tex/latex/biblatex-apa/naustrian-apa.lbx | 4 +- .../tex/latex/biblatex-apa/ngerman-apa.lbx | 4 +- .../tex/latex/biblatex-apa/norsk-apa.lbx | 4 +- .../tex/latex/biblatex-apa/norwegian-apa.lbx | 4 +- .../tex/latex/biblatex-apa/nswissgerman-apa.lbx | 4 +- .../tex/latex/biblatex-apa/nynorsk-apa.lbx | 4 +- .../tex/latex/biblatex-apa/portuguese-apa.lbx | 4 +- .../tex/latex/biblatex-apa/russian-apa.lbx | 132 +++++++++++++++++++++ .../tex/latex/biblatex-apa/slovene-apa.lbx | 4 +- .../tex/latex/biblatex-apa/spanish-apa.lbx | 4 +- .../tex/latex/biblatex-apa/swedish-apa.lbx | 4 +- .../tex/latex/biblatex-apa/swissgerman-apa.lbx | 4 +- 26 files changed, 243 insertions(+), 103 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx (limited to 'Master/texmf-dist/tex/latex/biblatex-apa') diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx index 447174dbf7e..84dc79cf5b0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx @@ -1,4 +1,4 @@ -\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/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index 64f9333f3f7..6ae6d0d0b07 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx @@ -12,11 +12,14 @@ %% %% 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 +% Declare the language mapping suffix +\DeclareLanguageMappingSuffix{-apa} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Automated capitalisation after colons % (http://blog.apastyle.org/apastyle/2011/06/capitalization-after-colons.html) @@ -41,7 +44,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Used to join citations/references to -% extrayear +% extradate \newcommand{\apashortdash}{-} @@ -191,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} } @@ -423,7 +426,7 @@ {\namepartprefix}% {\namepartsuffix}}}}% \ifthenelse{\value{listcount}=\value{listtotal}}% - {\ifmorenames{\andothersdelim\bibstring{andothers}}{}}{}} + {\ifmorenames{\printdelim{andothersdelim}\bibstring{andothers}}{}}{}} \renewbibmacro*{author}{% \ifnameundef{author} @@ -437,7 +440,7 @@ \printnames[apaauthor][-\value{listtotal}]{with}} \setunit*{\addspace}}}% \newunit\newblock% - \usebibmacro{labelyear+extrayear}} + \usebibmacro{labelyear+extradate}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -449,12 +452,12 @@ % (APA 6.27) Use blank for long lists % (APA 4.03) Serial comma for lists of three or more -\AtBeginBibliography{\renewcommand*{\finalnamedelim}{% - \ifthenelse{\value{listcount}>\maxprtauth} - {} - {\ifthenelse{\value{liststop}>2} - {\finalandcomma\addspace\&\space} - {\addspace\&\space}}}} +\DeclareDelimFormat[bib]{finalnamedelim}{% + \ifthenelse{\value{listcount}>\maxprtauth} + {} + {\ifthenelse{\value{liststop}>2} + {\finalandcomma\addspace\&\space} + {\addspace\&\space}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -477,7 +480,7 @@ \iffieldundef{endmonth}{}{/\printfield{endmonth}}}} {\addcomma\space\printfield{issue}}} -\newbibmacro*{labelyear+extrayear}{% +\newbibmacro*{labelyear+extradate}{% \iffieldundef{labelyear} {\iffieldundef{origyear} {} @@ -580,7 +583,7 @@ \ifnameundef{director}\AND% \ifnameundef{writer}} {\newunit\newblock - \usebibmacro{labelyear+extrayear}} + \usebibmacro{labelyear+extradate}} {}}} \renewbibmacro*{maintitle}{% @@ -698,7 +701,7 @@ {\namepartprefix}% {\namepartsuffix}}}% \ifthenelse{\value{listcount}=\value{listtotal}}% - {\ifmorenames{\andothersdelim\bibstring{andothers}}{}}{}} + {\ifmorenames{\printdelim{andothersdelim}\bibstring{andothers}}{}}{}} \renewbibmacro*{author/editor}{% \ifnameundef{author} @@ -721,7 +724,7 @@ % various year placement tests \clearname{editor}% \setunit{\adddot\addspace}% - \usebibmacro{labelyear+extrayear}% + \usebibmacro{labelyear+extradate}% \setunit{\adddot\addspace}}} % @@ -1212,7 +1215,7 @@ \printfield{urldescription}% \setunit*{\addcolon\addspace}% \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}% - \iffieldundef{abstractloc}{}{\printfield{abstractloc}\renewcommand*{\finentrypunct}{\relax}} + \iffieldundef{abstractloc}{}{\printfield{abstractloc}\renewcommand*{\finentrypunct}{\relax}}% \iffieldundef{abstracturl}{}{\printfield{abstracturl}\renewcommand*{\finentrypunct}{\relax}}}} % @@ -1774,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 @@ -1912,7 +1915,7 @@ \usebibmacro{director}% \usebibmacro{producer}% \newunit\newblock - \usebibmacro{labelyear+extrayear}% + \usebibmacro{labelyear+extradate}% \setunit{\labelnamepunct}\newblock \usebibmacro{title}% \setunit{\addspace}\newblock @@ -1941,7 +1944,7 @@ \usebibmacro{director}% \usebibmacro{producer}% \newunit\newblock - \usebibmacro{labelyear+extrayear}% + \usebibmacro{labelyear+extradate}% \setunit{\labelnamepunct}\newblock \usebibmacro{title}% \setunit{\addspace}\newblock @@ -1970,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/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index e3fd66cfa82..8fdc1f2c0f4 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/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}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -27,7 +27,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 6.11) requires comma separator between authors and years -\renewcommand*{\nameyeardelim}{\addcomma\space} +\DeclareDelimFormat{nameyeardelim}{\addcomma\space} +\DeclareDelimFormat[textcite]{nameyeardelim}{\addcomma\space} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -36,7 +37,7 @@ % (APA 6.12) No comma before "et al" if there is only one name % preceding it -\renewcommand*{\andothersdelim}{\ifnum\value{listcount}>2 \finalandcomma\fi\addspace} +\DeclareDelimFormat{andothersdelim}{\ifnum\value{listcount}>2 \finalandcomma\fi\addspace} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -44,9 +45,11 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 6.12) ampersand separator in parenthetical cites +\DeclareDelimFormat[parencite]{finalnamedelim} + {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space} + \DeclareCiteCommand{\parencite}[\mkbibparens] - {\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}% - \usebibmacro{cite:init}% + {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% \usebibmacro{cite}} @@ -55,8 +58,7 @@ \usebibmacro{cite:post}} \DeclareCiteCommand*{\parencite}[\mkbibparens] - {\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}% - \usebibmacro{cite:init}% + {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% \usebibmacro{citeyear}} @@ -147,7 +149,7 @@ % least one more element after the current potential truncation point % so that "et al" covers at least two elements. {\ifnumcomp{\value{listcount}}{<}{\value{listtotal}} - {\andothersdelim\bibstring{andothers}} + {\printdelim{andothersdelim}\bibstring{andothers}} {\usebibmacro{labelname:doname}% {\namepartfamily}% {\namepartfamilyi}% @@ -214,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} @@ -228,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 @@ -256,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{\nameyeardelim}% - \usebibmacro{cite:plabelyear+extrayear}% + \setunit{\printdelim{nameyeardelim}}% + \usebibmacro{cite:plabelyear+extradate}% \savefield{fullhash}{\cbx@lasthash}} % Normal cite {\ifnameundef{shortauthor} @@ -270,8 +272,8 @@ {\cbx@apa@ifnamesaved {\printnames{shortauthor}} {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}% - \setunit{\nameyeardelim}% - \usebibmacro{cite:plabelyear+extrayear}% + \setunit{\printdelim{nameyeardelim}}% + \usebibmacro{cite:plabelyear+extradate}% \savefield{fullhash}{\cbx@lasthash}}}% \setunit{\multicitedelim}} @@ -279,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} @@ -292,9 +294,9 @@ % Cite using title {\usebibmacro{cite:noname}% \setunit{\ifbool{cbx:np}% - {\nameyeardelim}% + {\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 @@ -308,20 +310,20 @@ {\printnames[labelname][-\value{listtotal}]{author}}}% % Year \setunit{\ifbool{cbx:np} - {\nameyeardelim} + {\printdelim{nameyeardelim}} {\global\booltrue{cbx:parens}\addspace\bibopenparen}}% % Put the shortauthor inside the year brackets if necessary \ifnameundef{shortauthor} {} {\cbx@apa@ifnamesaved {} - {\printnames{shortauthor}\setunit{\nameyeardelim}}}% + {\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 @@ -347,7 +349,7 @@ \ifciteseen {\printfield{shorthand}} {\printnames[labelname][-\value{listtotal}]{labelname}% - \setunit{\nameyeardelim}% + \setunit{\printdelim{nameyeardelim}}% \printfield{title}\space\printfield{shorthand}}} % @@ -374,11 +376,12 @@ % (APA 6.21) No parens round year for cites when the cite is in % parentheses. Use new command \nptextcite for such cites. +\DeclareDelimFormat[nptextcite]{finalnamedelim} + {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space} \DeclareMultiCiteCommand{\nptextcites}{\nptextcite}{\multicitedelim} \DeclareCiteCommand{\nptextcite} - {\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}% - \usebibmacro{cite:init}% + {\usebibmacro{cite:init}% \usebibmacro{prenote}} {\usebibmacro{citeindex}% \global\booltrue{cbx:np}% @@ -387,7 +390,7 @@ {} {\iffieldundef{postnote} {} - {\nameyeardelim + {\printdelim{nameyeardelim}% \printfield{postnote}}% \usebibmacro{cite:post}} @@ -402,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}} @@ -414,9 +417,12 @@ % Fullcite should use "&" % Also need to reset the global booleans which are normally done at % every bib item but since these aren't bib items, they are not reset + +\DeclareDelimFormat[fullcite,fullcitebib]{finalnamedelim} + {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space} + \DeclareCiteCommand{\fullcite} - {\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}% - \usebibmacro{prenote}} + {\usebibmacro{prenote}} {\usedriver {\DeclareNameAlias{sortname}{default}% \global\boolfalse{bbx:parens}% @@ -431,8 +437,7 @@ \usebibmacro{cite:post}} \DeclareCiteCommand{\fullcitebib} - {\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}% - \list{} + {\list{} {\setlength{\leftmargin}{\bibhang}% \setlength{\itemindent}{-\leftmargin}% \setlength{\itemsep}{\bibitemsep}% @@ -473,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/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx index 57c2547124a..95c7b97ff43 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/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/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx index bb5b63120a9..17ee78ad18e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/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/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx index 2bb0e823fa2..c04fd334cf5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx @@ -1,4 +1,4 @@ -\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/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx index 646658941f1..faa16e453e3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/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/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx index 85801dad0c2..92bd17f08ca 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/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/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx index 01ff0f4aa39..025aeffe1a2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx @@ -1,4 +1,4 @@ -\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/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx index 16a6fbc43dc..e3c6f5e8c6e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/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/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx index a07a44beee7..5575696a536 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx @@ -1,4 +1,4 @@ -\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/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx index f41fb171360..8c7fc83e7b6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx @@ -1,4 +1,4 @@ -\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/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx index c588768ab2a..28b81da4cb5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx @@ -1,4 +1,4 @@ -\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/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx index 9a5a90e2341..11eebac8923 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/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/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx index 2c986aaa468..21cf05f7c77 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/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/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx index c4cb355600b..5d954cb2dad 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx @@ -1,4 +1,4 @@ -\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/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx index b968a80af69..6fed73d22d1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/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/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx index dfb5ce17f7f..abaf82f649c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/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/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx index cac90d28966..fae5e60925d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/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/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx index 1d12d5c7e6b..c1e7ed82aa3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/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/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx index 8a3a06a95ab..df436c3a9ae 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/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/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx new file mode 100644 index 00000000000..2527951deab --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx @@ -0,0 +1,132 @@ +\ProvidesFile{russian-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation] +\InheritBibliographyExtras{russian} + +% (APA 6.22) The example abbreviations + +\NewBibliographyString{revisededition} +\NewBibliographyString{typechair} +\NewBibliographyString{typechairs} +\NewBibliographyString{typevolume} +\NewBibliographyString{typevolumes} +\NewBibliographyString{typeseries} +\NewBibliographyString{typeseriess} +\NewBibliographyString{typevolseries} +\NewBibliographyString{typevolseriess} +\NewBibliographyString{on} +\NewBibliographyString{retrieved} +\NewBibliographyString{available} +\NewBibliographyString{from} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {russian}, + revisededition = {{исправленное издание}{испр\adddotspace изд\adddot}}, + on = {{на}{на}}, + retrieved = {{получено}{получено}}, + available = {{доступно}{доступно}}, + from = {{c}{c}}, + archivedat = {{в архиве\space на}{в архиве\space на}}, + with = {{с}{с}}, + paragraph = {{абзац}{абз\adddot}}, + paragraphs = {{абзацы}{абз\adddot}}, + producer = {{продюсер}{продюсер}}, + execproducer = {{исполнительный продюсер}{исполнительный продюсер}}, + director = {{режиссер}{режиссер}}, + writer = {{сценарист}{сценарист}}, + origyear = {{оригинальная\space работа\space опубликована}{ориг\adddotspace работа\space опубл\adddot}}, + typechair = {{Председатель}{Председатель}}, + typechairs = {{Председатели}{Председатели}}, + typevolume = {{Редактор\space тома}{Ред\adddotspace т\adddot}}, + typevolumes = {{Редакторы\space тома}{Ред\adddotspace т\adddot}}, + typeseries = {{Редактор\space серии}{Ред\adddotspace сер\adddot}}, + typeseriess = {{Редакторы\space серии}{Ред\adddotspace сер\adddot}}, + typevolseries = {{Редактор\space серии\space и\space тома}{Ред\adddotspace сер\adddotspace и\space т\adddot}}, + typevolseriess = {{Редакторы\space серии\space и\space тома}{Ред\adddotspace сер\adddotspace и\space т\adddot}}, + annodomini = {{нашей\space эры}{н\adddotspace э\adddot}}, + beforechrist = {{до\space нашей\space эры}{до н\adddotspace э\adddot}}, +} + +\protected\gdef\lbx@sl@mkbibmonth#1{% + \ifcase0#1\relax + #1\BibliographyWarning{Month out of range}% + \or\abx@bibmonth{datejanuary}% + \or\abx@bibmonth{datefebruary}% + \or\abx@bibmonth{datemarch}% + \or\abx@bibmonth{dateapril}% + \or\abx@bibmonth{datemay}% + \or\abx@bibmonth{datejune}% + \or\abx@bibmonth{datejuly}% + \or\abx@bibmonth{dateaugust}% + \or\abx@bibmonth{dateseptember}% + \or\abx@bibmonth{dateoctober}% + \or\abx@bibmonth{datenovember}% + \or\abx@bibmonth{datedecember}% + \else + #1\BibliographyWarning{Month out of range}% + \fi}% + +\DeclareBibliographyExtras{% + \def\urldatecomma{\addspace}% + % + \protected\def\mkbibdateapalong#1#2#3{% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + {\addspace\lbx@sl@mkbibmonth{\thefield{#2}}}}}% + % + \protected\def\mkbibdateapalongextra#1#2#3{% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + {\addspace\lbx@sl@mkbibmonth{\thefield{#2}}}}}% + % + \protected\def\mkbibdateapalongmdy#1#2#3{% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {\mkbibmonth{\thefield{#2}}}% + {\addspace\lbx@sl@mkbibmonth{\thefield{#2}}}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}} + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx index 3eb3869ee41..f0c9a28c3ed 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/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/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx index 120455edf26..564c2797408 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/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/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx index f773baa6305..9c33c3d2e06 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/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/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx index ce6714a292f..00ec43c9881 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/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}% -- cgit v1.2.3