diff options
author | Karl Berry <karl@freefriends.org> | 2017-01-07 23:38:57 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-01-07 23:38:57 +0000 |
commit | c4bd7c61c3f6687a0dac0043d47e727b5e5814b7 (patch) | |
tree | 28b89afaac784241038a244caadd7d3ce7d54577 /Master | |
parent | 59d321e899ed5a0ba1607c5c2ffc39192feea615 (diff) |
biblatex-apa (8jan17)
git-svn-id: svn://tug.org/texlive/trunk@42893 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
32 files changed, 431 insertions, 120 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README index dc15599d3eb..054841a0737 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/README +++ b/Master/texmf-dist/doc/latex/biblatex-apa/README @@ -1,9 +1,9 @@ -Version 7.2 +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 -maintainer is Philip Kime (© 2016). +maintainer is Philip Kime (© 2017). This package is a biblatex style for APA (American Psychological Association) style compliant documents typeset in LaTeX. It diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib index 6b594437fb7..205bab92ab7 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib @@ -606,3 +606,18 @@ DATE = {2014-10-08}, LANGUAGE = {de} } + +% Testing date range with same months, different days +@BOOK{daterange1, + AUTHOR = {Freddy Furnishings}, + TITLE = {Authorship Provisions in Augment}, + DATE = {1984-02-01/1984-02-27}, +} + +% Testing date range with different months +@BOOK{daterange2, + AUTHOR = {Graham Granary}, + TITLE = {Authorship Provisions in Augment}, + DATE = {1984-02-27/1984-03-01}, +} + diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib index 9319c614d48..396258b05c6 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib @@ -961,7 +961,7 @@ @ONLINE{7.11:75, ENTRYSUBTYPE = {Electronic mailing list message}, AUTHOR = {S. Smith}, - TITLE = {Re: {D}isputed Estimates of {IQ}}, + TITLE = {Re: Disputed Estimates of {IQ}}, DATE = {2006-01-05}, URL = {http://tech.groups.yahoo.com/group/ForensicNetwork/message/670}, } diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf Binary files differindex c34ba609540..f9e6b2d2019 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex index 2ffccf8f1fc..63689dfcdf6 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex @@ -307,7 +307,7 @@ Classical works:\\ automated processing and specifying an anomalous infix format. It would be better and probably acceptable for it to be:}\\ \apaex{\parencite[][trans.]{6.18a}}\\\\ -Entries with an |ORIGYEAR| field will automatically use it:\\ +Entries with an |ORIGDATE| field will automatically use it:\\ \apaex{\textcite{6.18b}}\\\\ The other examples of standard classical texts in this section should just be typed by hand--there is little benefit to automating these examples and @@ -435,6 +435,12 @@ Second citation:\\ \noindent Testing citation formats for complete dates\\ \apaex{\textcite{Ludwig2014}} +\noindent Testing month ranges with same months, different days\\ +\apaex{\textcite{daterange1}} + +\noindent Testing month ranges with different months\\ +\apaex{\textcite{daterange2}} + \end{refsection} \begin{refsection}[../bibtex/bib/biblatex-apa-test-references] \nocite{*} diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf Binary files differindex 3ac75d14740..ca037f28af8 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf +++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex index 8ab1498cce6..21c5d38123c 100644 --- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex +++ b/Master/texmf-dist/doc/latex/biblatex-apa/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.2}, + revision={7.4}, date={\today}} \hypersetup{% @@ -455,6 +455,14 @@ applied to the data stream by |biber| and does not change your \file{.bib}. \begin{changelog} +\begin{release}{7.4}{2017-01-06} +\item Minor bugfix release +\end{release} + +\begin{release}{7.3}{2016-12-21} +\item Minor bugfix release +\end{release} + \begin{release}{7.2}{2016-10-24} \item Minor bugfix release for date fields \end{release} 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 ec400bddc41..447174dbf7e 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}[2016/10/24\space v7.2\space APA biblatex localisation] +\ProvidesFile{american-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] \InheritBibliographyExtras{american} % (APA 6.22) The example abbreviations @@ -82,7 +82,7 @@ \mkbibmonth{\thefield{#2}}}% \iffieldundef{#3}% {}% - {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {\iffieldundef{#2}% {}% {\addspace}% \stripzeros{\thefield{#3}}}}% @@ -98,7 +98,7 @@ \mkbibmonth{\thefield{#2}}}% \iffieldundef{#3}% {}% - {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {\iffieldundef{#2}% {}% {\addspace}% \stripzeros{\thefield{#3}}}}% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index 43a2f698078..64f9333f3f7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx @@ -1,4 +1,4 @@ -%% Copyright 2016 Philip Kime +%% Copyright 2017 Philip Kime %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -12,12 +12,34 @@ %% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa.bbx}[2016/10/24\space v7.2\space APA biblatex references style] +\ProvidesFile{apa.bbx}[2017/01/06\space v7.4\space APA biblatex references style] \RequireBiber[3] \RequireBibliographyStyle{standard} \urlstyle{rm} % APA examples all have URLs in same font as text %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Automated capitalisation after colons +% (http://blog.apastyle.org/apastyle/2011/06/capitalization-after-colons.html) +% Copied and adapted from ieee.bbx + +% {<process>} {*} {<text>} +\newcommand*{\bbx@colon@search}[3]{% + \bbx@colon@search@aux#1#2\empty#3: \stop +} +\long\def\bbx@colon@search@aux#1#2#3: #4\stop{% + \expandafter#1\expandafter#2\expandafter{#3}% + \ifblank{#4} + {} + {% + : % + \bbx@colon@search@aux#1#2\empty#4\stop + }% +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Used to join citations/references to % extrayear @@ -459,7 +481,7 @@ \iffieldundef{labelyear} {\iffieldundef{origyear} {} - {\printtext[apadate[{\printorigdate}}}% + {\printtext[apadate]{\printorigdate}}}% {\printtext[apadate]{\printlabeldateextra}}} \DeclareFieldFormat{apadate}{% @@ -474,21 +496,21 @@ % (APA 6.29) General format of titles. % Ugly Chicago-style lowercasing of English titles -\DeclareFieldFormat{apacase}{\MakeSentenceCase*{#1}} +\DeclareFieldFormat{apacase}{\bbx@colon@search\MakeSentenceCase*{#1}} \DeclareFieldFormat{issuetitle}{#1\isdot} \DeclareFieldFormat{title}{\iffieldequalstr{titleisdescription}{true}{\mkbibbrackets{#1}}{\mkbibemph{#1}\isdot}} -\DeclareFieldFormat{origtitle}{\mkbibemph{\MakeSentenceCase*{#1}}\isdot} +\DeclareFieldFormat{origtitle}{\mkbibemph{\bbx@colon@search\MakeSentenceCase*{#1}}\isdot} \DeclareFieldFormat[article]{title}{#1\isdot} -\DeclareFieldFormat[article]{origtitle}{\MakeSentenceCase*{#1}\isdot} +\DeclareFieldFormat[article]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} \DeclareFieldFormat[inbook]{title}{#1\isdot} -\DeclareFieldFormat[inbook]{origtitle}{\MakeSentenceCase*{#1}\isdot} +\DeclareFieldFormat[inbook]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} \DeclareFieldFormat[incollection]{title}{#1\isdot} -\DeclareFieldFormat[incollection]{origtitle}{\MakeSentenceCase*{#1}\isdot} +\DeclareFieldFormat[incollection]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} \DeclareFieldFormat[inproceedings]{title}{#1\isdot} -\DeclareFieldFormat[inproceedings]{origtitle}{\MakeSentenceCase*{#1}\isdot} +\DeclareFieldFormat[inproceedings]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} \DeclareFieldFormat[proceedings]{title}{#1\isdot} -\DeclareFieldFormat[proceedings]{origtitle}{\MakeSentenceCase*{#1}\isdot} +\DeclareFieldFormat[proceedings]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -517,9 +539,9 @@ % (APA 6.29) Additional {main}title information in brackets (using) % {MAIN}TITLEADDON field. Colon after maintitle. -\DeclareFieldFormat{titleaddon}{\mkbibbrackets{\MakeSentenceCase*{#1}}} -\DeclareFieldFormat{maintitleaddon}{\mkbibbrackets{\MakeSentenceCase*{#1}}} -\DeclareFieldFormat{booktitleaddon}{\mkbibbrackets{\MakeSentenceCase*{#1}}} +\DeclareFieldFormat{titleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}} +\DeclareFieldFormat{maintitleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}} +\DeclareFieldFormat{booktitleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}} \newbibmacro*{bookaddinfo}{% \ifthenelse{\iffieldundef{edition}\AND\iffieldundef{volumes}} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index 8b0f83f5389..e3fd66cfa82 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx @@ -1,4 +1,4 @@ -%% Copyright 2016 Philip Kime +%% Copyright 2017 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}[2016/10/24\space v7.2\space APA biblatex citation style] +\ProvidesFile{apa.cbx}[2017/01/06\space v7.4\space APA biblatex citation style] \RequireBiber[3] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -324,8 +324,13 @@ \newbibmacro*{cite:plabelyear+extrayear}{% \iffieldundef{labelyear}{} {\printtext[bibhyperref]{% - \clearfield{labelmonth}% dont' want months in citations - \clearfield{labelday}% dont' want days in citations + \clearfield{labelmonth}% don't want months in citations + \clearfield{labelday}% don't want days in citations + \clearfield{labelendmonth}% don't want months in citations + \clearfield{labelendday}% don't want days in citations + \iffieldsequal{labelyear}{labelendyear}% Don't want no-op year ranges + {\clearfield{labelendyear}} + {}% \iffieldundef{origyear}{} {\ifboolexpr{ test {\iforigdatecirca} or test {\iforigdateuncertain} } {\mkbibbrackets{\printorigdate}} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx index e0d84e4dea0..57c2547124a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx @@ -1,4 +1,4 @@ -%% Copyright 2016 Philip Kime +%% Copyright 2017 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}[2016/10/24\space v7.2\space APA biblatex style data model] +\ProvidesFile{apa.dbx}[2017/01/06\space v7.4\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 68fef7b9cba..bb5b63120a9 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}[2016/10/24\space v7.2\space APA biblatex localisation] +\ProvidesFile{austrian-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] \InheritBibliographyExtras{austrian} % Following DGPs guidlines for German/Austrian @@ -31,33 +31,33 @@ \DeclareBibliographyStrings{% inherit = {austrian}, andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, - revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddotspace Aufl\adddot}}, + revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, producer = {{Produzent}{Produzent}}, - execproducer = {{Produzent}{Produzent}}, + execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}}, director = {{Regisseur}{Regisseur}}, - writer = {{Schriftsteller}{Schriftsteller}}, + writer = {{Autor}{Autor}}, page = {{Seite}{{}S\adddot}}, pages = {{Seiten}{{}S\adddot}}, on = {{am}{am}}, retrieved = {{Zugriff\space am}{Zugriff\space am}}, - available = {{Erh\"altlich}{Erh\"altlich}}, + available = {{erh\"altlich}{erh\"altlich}}, with = {{mit}{mit}}, from = {{unter}{unter}}, archivedat = {{archiviert\space unter}{archiviert\space unter}}, reviewof = {{Rezension\space des}{Rezension\space des}}, paragraph = {{\P}{\P}}, paragraphs = {{\P\P}{\P\P}}, - origyear = {{Original\space ver\"offentlicht}{Original\space ver\"offentlicht}}, - typechair = {{Konferenzstuhl}{Konferenzstuhl}}, - typechairs = {{Konferenzst\"uhle}{Konferenzst\"uhle}}, - typevolume = {{Band\space Herausgeber}{Bd\adddotspace Hrsg\adddot}}, - typevolumes = {{Band\space Herausgeber}{Bd\adddotspace Hrsg\adddot}}, - typeseries = {{Reihe\space Herausgeber}{Reihe\space Hrsg\adddot}}, - typeseriess = {{Reihe\space Herausgeber}{Reihe\space Hrsg\adddot}}, - typevolseries = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddotspace Hrsg\adddot}}, - typevolseriess = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddotspace Hrsg\adddot}}, - annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, - beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, + origyear = {{Original\space erschienen}{Original\space erschienen}}, + typechair = {{Leitung}{Leitung}}, + typechairs = {{Leitung}{Leitung}}, + typevolume = {{Bandherausgeber}{Bandhrsg\adddot}}, + typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}}, + typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}}, + beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}}, } 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 ca267d736b2..2bb0e823fa2 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}[2016/10/24\space v7.2\space APA biblatex localisation] +\ProvidesFile{brazilian-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] \InheritBibliographyExtras{brazilian} % (APA 6.22) The example abbreviations @@ -74,7 +74,7 @@ \mkbibmonth{\thefield{#2}}}% \iffieldundef{#3}% {}% - {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {\iffieldundef{#2}% {}% {\addspace}% \stripzeros{\thefield{#3}}}}% @@ -90,7 +90,7 @@ \mkbibmonth{\thefield{#2}}}% \iffieldundef{#3}% {}% - {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {\iffieldundef{#2}% {}% {\addspace}% \stripzeros{\thefield{#3}}}}% 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 e31f0575af6..646658941f1 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}[2016/10/24\space v7.2\space APA biblatex localisation] +\ProvidesFile{british-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] \InheritBibliographyExtras{british} % (APA 6.22) The example abbreviations @@ -80,7 +80,7 @@ \mkbibmonth{\thefield{#2}}}% \iffieldundef{#3}% {}% - {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {\iffieldundef{#2}% {}% {\addspace}% \stripzeros{\thefield{#3}}}}% @@ -96,7 +96,7 @@ \mkbibmonth{\thefield{#2}}}% \iffieldundef{#3}% {}% - {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {\iffieldundef{#2}% {}% {\addspace}% \stripzeros{\thefield{#3}}}}% 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 a5cabe3d834..85801dad0c2 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}[2016/10/24\space v7.2\space APA biblatex localisation] +\ProvidesFile{danish-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] \InheritBibliographyExtras{danish} % (APA 6.22) The example abbreviations 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 4a944a1fae3..01ff0f4aa39 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}[2016/10/24\space v7.2\space APA biblatex localisation] +\ProvidesFile{dutch-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] \InheritBibliographyExtras{dutch} % (APA 6.22) The example abbreviations @@ -80,7 +80,7 @@ \mkbibmonth{\thefield{#2}}}% \iffieldundef{#3}% {}% - {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {\iffieldundef{#2}% {}% {\addspace}% \stripzeros{\thefield{#3}}}}% @@ -96,7 +96,7 @@ \mkbibmonth{\thefield{#2}}}% \iffieldundef{#3}% {}% - {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {\iffieldundef{#2}% {}% {\addspace}% \stripzeros{\thefield{#3}}}}% 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 4aee8c57ade..16a6fbc43dc 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}[2016/10/24\space v7.2\space APA biblatex localisation] +\ProvidesFile{english-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] \InheritBibliographyExtras{english} % (APA 6.22) The example abbreviations @@ -82,7 +82,7 @@ \mkbibmonth{\thefield{#2}}}% \iffieldundef{#3}% {}% - {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {\iffieldundef{#2}% {}% {\addspace}% \stripzeros{\thefield{#3}}}}% @@ -98,7 +98,7 @@ \mkbibmonth{\thefield{#2}}}% \iffieldundef{#3}% {}% - {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {\iffieldundef{#2}% {}% {\addspace}% \stripzeros{\thefield{#3}}}}% 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 3e25457311f..a07a44beee7 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}[2016/10/24\space v7.2\space APA biblatex localisation] +\ProvidesFile{french-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] \InheritBibliographyExtras{french} % (APA 6.22) The example abbreviations @@ -75,7 +75,7 @@ \mkbibmonth{\thefield{#2}}}% \iffieldundef{#3}% {}% - {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {\iffieldundef{#2}% {}% {\addspace}% \stripzeros{\thefield{#3}}}}% @@ -91,7 +91,7 @@ \mkbibmonth{\thefield{#2}}}% \iffieldundef{#3}% {}% - {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {\iffieldundef{#2}% {}% {\addspace}% \stripzeros{\thefield{#3}}}}% 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 fc8ea99c7f3..f41fb171360 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}[2016/10/24\space v7.2\space APA biblatex localisation] +\ProvidesFile{german-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] \InheritBibliographyExtras{german} % (APA 6.22) The example abbreviations @@ -31,11 +31,11 @@ \DeclareBibliographyStrings{% inherit = {german}, andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, - revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddotspace Aufl\adddot}}, + revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, producer = {{Produzent}{Produzent}}, - execproducer = {{Produzent}{Produzent}}, + execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}}, director = {{Regisseur}{Regisseur}}, - writer = {{Schriftsteller}{Schriftsteller}}, + writer = {{Autor}{Autor}}, page = {{Seite}{{}S\adddot}}, pages = {{Seiten}{{}S\adddot}}, on = {{am}{am}}, @@ -47,17 +47,17 @@ reviewof = {{Rezension\space des}{Rezension\space des}}, paragraph = {{\P}{\P}}, paragraphs = {{\P\P}{\P\P}}, - origyear = {{Original\space ver\"offentlicht}{Original\space ver\"offentlicht}}, - typechair = {{Konferenzstuhl}{Konferenzstuhl}}, - typechairs = {{Konferenzst\"uhle}{Konferenzst\"uhle}}, - typevolume = {{Band\space Herausgeber}{Bd\adddotspace Hrsg\adddot}}, - typevolumes = {{Band\space Herausgeber}{Bd\adddotspace Hrsg\adddot}}, - typeseries = {{Reihe\space Herausgeber}{Reihe\space Hrsg\adddot}}, - typeseriess = {{Reihe\space Herausgeber}{Reihe\space Hrsg\adddot}}, - typevolseries = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddotspace Hrsg\adddot}}, - typevolseriess = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddotspace Hrsg\adddot}}, - annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, - beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, + origyear = {{Original\space erschienen}{Original\space erschienen}}, + typechair = {{Leitung}{Leitung}}, + typechairs = {{Leitung}{Leitung}}, + typevolume = {{Bandherausgeber}{Bandhrsg\adddot}}, + typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}}, + typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}}, + beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}}, } 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 54471930fce..c588768ab2a 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}[2016/10/24\space v7.2\space APA biblatex localisation] +\ProvidesFile{greek-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] \InheritBibliographyExtras{greek} % (APA 6.22) The example abbreviations 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 715e02e2c1f..9a5a90e2341 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}[2016/10/24\space v7.2\space APA biblatex localisation] +\ProvidesFile{italian-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] \InheritBibliographyExtras{italian} % (APA 6.22) The example abbreviations @@ -80,7 +80,7 @@ \mkbibmonth{\thefield{#2}}}% \iffieldundef{#3}% {}% - {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {\iffieldundef{#2}% {}% {\addspace}% \stripzeros{\thefield{#3}}}}% @@ -96,7 +96,7 @@ \mkbibmonth{\thefield{#2}}}% \iffieldundef{#3}% {}% - {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {\iffieldundef{#2}% {}% {\addspace}% \stripzeros{\thefield{#3}}}}% 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 4da0e9fe1e6..2c986aaa468 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}[2016/10/24\space v7.2\space APA biblatex localisation] +\ProvidesFile{naustrian-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] \InheritBibliographyExtras{naustrian} % (APA 6.22) The example abbreviations @@ -31,33 +31,33 @@ \DeclareBibliographyStrings{% inherit = {naustrian}, andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, - revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddotspace Aufl\adddot}}, + revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, producer = {{Produzent}{Produzent}}, - execproducer = {{Produzent}{Produzent}}, - director = {{Regisseur}{Regisseur}}, + execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}}, + director = {{Autor}{Autor}}, writer = {{Schriftsteller}{Schriftsteller}}, with = {{mit}{mit}}, page = {{Seite}{{}S\adddot}}, pages = {{Seiten}{{}S\adddot}}, on = {{am}{am}}, retrieved = {{Zugriff\space am}{Zugriff\space am}}, - available = {{Erh\"altlich}{Erh\"altlich}}, + available = {{erh\"altlich}{erh\"altlich}}, from = {{unter}{unter}}, archivedat = {{archiviert\space unter}{archiviert\space unter}}, reviewof = {{Rezension\space des}{Rezension\space des}}, paragraph = {{\P}{\P}}, paragraphs = {{\P\P}{\P\P}}, - origyear = {{Original\space ver\"offentlicht}{Original\space ver\"offentlicht}}, - typechair = {{Konferenzstuhl}{Konferenzstuhl}}, - typechairs = {{Konferenzst\"uhle}{Konferenzst\"uhle}}, - typevolume = {{Band\space Herausgeber}{Bd\adddotspace Hrsg\adddot}}, - typevolumes = {{Band\space Herausgeber}{Bd\adddotspace Hrsg\adddot}}, - typeseries = {{Reihe\space Herausgeber}{Reihe\space Hrsg\adddot}}, - typeseriess = {{Reihe\space Herausgeber}{Reihe\space Hrsg\adddot}}, - typevolseries = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddotspace Hrsg\adddot}}, - typevolseriess = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddotspace Hrsg\adddot}}, - annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, - beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, + origyear = {{Original\space erschienen}{Original\space erschienen}}, + typechair = {{Leitung}{Leitung}}, + typechairs = {{Leitung}{Leitung}}, + typevolume = {{Bandherausgeber}{Bandhrsg\adddot}}, + typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}}, + typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}}, + beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}}, } 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 3fba6898dbe..c4cb355600b 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}[2016/10/24\space v7.2\space APA biblatex localisation] +\ProvidesFile{ngerman-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] \InheritBibliographyExtras{ngerman} % (APA 6.22) The example abbreviations @@ -31,11 +31,11 @@ \DeclareBibliographyStrings{% inherit = {ngerman}, andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, - revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddotspace Aufl\adddot}}, + revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, producer = {{Produzent}{Produzent}}, - execproducer = {{Produzent}{Produzent}}, + execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}}, director = {{Regisseur}{Regisseur}}, - writer = {{Schriftsteller}{Schriftsteller}}, + writer = {{Autor}{Autor}}, with = {{mit}{mit}}, page = {{Seite}{{}S\adddot}}, pages = {{Seiten}{{}S\adddot}}, @@ -47,17 +47,17 @@ reviewof = {{Rezension\space des}{Rezension\space des}}, paragraph = {{\P}{\P}}, paragraphs = {{\P\P}{\P\P}}, - origyear = {{Original\space ver\"offentlicht}{Original\space ver\"offentlicht}}, - typechair = {{Konferenzstuhl}{Konferenzstuhl}}, - typechairs = {{Konferenzst\"uhle}{Konferenzst\"uhle}}, - typevolume = {{Band\space Herausgeber}{Bd\adddotspace Hrsg\adddot}}, - typevolumes = {{Band\space Herausgeber}{Bd\adddotspace Hrsg\adddot}}, - typeseries = {{Reihe\space Herausgeber}{Reihe\space Hrsg\adddot}}, - typeseriess = {{Reihe\space Herausgeber}{Reihe\space Hrsg\adddot}}, - typevolseries = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddotspace Hrsg\adddot}}, - typevolseriess = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddotspace Hrsg\adddot}}, - annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, - beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, + origyear = {{Original\space erschienen}{Original\space erschienen}}, + typechair = {{Leitung}{Leitung}}, + typechairs = {{Leitung}{Leitung}}, + typevolume = {{Bandherausgeber}{Bandhrsg\adddot}}, + typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}}, + typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}}, + beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}}, } 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 bba1a60530e..b968a80af69 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}[2016/10/24\space v7.2\space APA biblatex localisation] +\ProvidesFile{norsk-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] \InheritBibliographyExtras{norsk} % (APA 6.22) The example abbreviations 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 00f516e36a5..dfb5ce17f7f 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}[2016/10/24\space v7.2\space APA biblatex localisation] +\ProvidesFile{norwegian-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] \InheritBibliographyExtras{norwegian} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx new file mode 100644 index 00000000000..cac90d28966 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx @@ -0,0 +1,128 @@ +\ProvidesFile{nswissgerman-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] +\InheritBibliographyExtras{nswissgerman} + +% (APA 6.22) The example abbreviations + +% Following DGPs guidlines for German/Austrian/Swiss German +% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf + +\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 = {nswissgerman}, + andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, + producer = {{Produzent}{Produzent}}, + execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}}, + director = {{Regisseur}{Regisseur}}, + writer = {{Autor}{Autor}}, + with = {{mit}{mit}}, + page = {{Seite}{{}S\adddot}}, + pages = {{Seiten}{{}S\adddot}}, + on = {{am}{am}}, + retrieved = {{Zugriff\space am}{Zugriff\space am}}, + available = {{erh\"altlich}{erh\"altlich}}, + from = {{unter}{unter}}, + archivedat = {{archiviert\space unter}{archiviert\space unter}}, + reviewof = {{Rezension\space des}{Rezension\space des}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + origyear = {{Original\space erschienen}{Original\space erschienen}}, + typechair = {{Leitung}{Leitung}}, + typechairs = {{Leitung}{Leitung}}, + typevolume = {{Bandherausgeber}{Bandhrsg\adddot}}, + typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}}, + typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}}, + beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}}, +} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored +\DeclareBibliographyExtras{% + \renewcommand{\apashortdash}{~}% + \def\urldatecomma{\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}} + + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput 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 8c653f85835..1d12d5c7e6b 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}[2016/10/24\space v7.2\space APA biblatex localisation] +\ProvidesFile{nynorsk-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] \InheritBibliographyExtras{nynorsk} % (APA 6.22) The example abbreviations 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 03e522930fe..8a3a06a95ab 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}[2016/10/24\space v7.2\space APA biblatex localisation] +\ProvidesFile{portuguese-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] \InheritBibliographyExtras{portuguese} % (APA 6.22) The example abbreviations @@ -72,7 +72,7 @@ \mkbibmonth{\thefield{#2}}}% \iffieldundef{#3}% {}% - {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {\iffieldundef{#2}% {}% {\addspace}% \stripzeros{\thefield{#3}}}}% @@ -88,7 +88,7 @@ \mkbibmonth{\thefield{#2}}}% \iffieldundef{#3}% {}% - {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {\iffieldundef{#2}% {}% {\addspace}% \stripzeros{\thefield{#3}}}}% 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 971b9f8dfbd..3eb3869ee41 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}[2016/10/24\space v7.2\space APA biblatex localisation] +\ProvidesFile{slovene-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] \InheritBibliographyExtras{slovene} % (APA 6.22) The example abbreviations 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 8e0dcb89ee6..120455edf26 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}[2016/10/24\space v7.2\space APA biblatex localisation] +\ProvidesFile{spanish-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] \InheritBibliographyExtras{spanish} \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced @@ -92,7 +92,7 @@ \mkbibmonth{\thefield{#2}}}% \iffieldundef{#3}% {}% - {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {\iffieldundef{#2}% {}% {\addspace}% \stripzeros{\thefield{#3}}}}% @@ -107,7 +107,7 @@ {\addcomma\addspace}% \iffieldundef{#3}% {}% - {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {\iffieldundef{#2}% {}% {\stripzeros{\thefield{#3}}\addspace de\addspace}}% \mkbibmonth{\thefield{#2}}% 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 a1a199ebb88..f773baa6305 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}[2016/10/24\space v7.2\space APA biblatex localisation] +\ProvidesFile{swedish-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] \InheritBibliographyExtras{swedish} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx new file mode 100644 index 00000000000..ce6714a292f --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx @@ -0,0 +1,127 @@ +\ProvidesFile{swissgerman-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation] +\InheritBibliographyExtras{swissgerman} + +% Following DGPs guidlines for German/Austrian/Swiss German +% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf + +% (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 = {swissgerman}, + andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, + producer = {{Produzent}{Produzent}}, + execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}}, + director = {{Regisseur}{Regisseur}}, + writer = {{Autor}{Autor}}, + page = {{Seite}{{}S\adddot}}, + pages = {{Seiten}{{}S\adddot}}, + on = {{am}{am}}, + retrieved = {{Zugriff\space am}{Zugriff\space am}}, + available = {{erh\"altlich}{erh\"altlich}}, + with = {{mit}{mit}}, + from = {{unter}{unter}}, + archivedat = {{archiviert\space unter}{archiviert\space unter}}, + reviewof = {{Rezension\space des}{Rezension\space des}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + origyear = {{Original\space erschienen}{Original\space erschienen}}, + typechair = {{Leitung}{Leitung}}, + typechairs = {{Leitung}{Leitung}}, + typevolume = {{Bandherausgeber}{Bandhrsg\adddot}}, + typevolumes = {{Bandherausgeber}{Bandhrsg\adddot}}, + typeseries = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typeseriess = {{Reihenherausgeber}{Reihenhrsg\adddot}}, + typevolseries = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}}, + annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}}, + beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}}, +} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 7.10 Example 68) Drop end* when they are the same as * + +% You must use \printdate to get here otherwise it will be ignored +\DeclareBibliographyExtras{% + \renewcommand{\apashortdash}{~}% + \def\urldatecomma{\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% + \iffieldundef{#3}% + {}% + {\iffieldundef{#1}% + {} + {\addcomma\addspace}% + \stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3} + {\iffieldundef{#1} + {} + {\addspace}}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\adddot\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\iffieldundef{#2}% + {}% + {\addspace}% + \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput |