From 736bbc10d656b425590e7a4453c288fcd3fc77d4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 14 Sep 2016 22:21:25 +0000 Subject: biblatex-apa (14sep16) git-svn-id: svn://tug.org/texlive/trunk@42064 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-apa/american-apa.lbx | 14 +- Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx | 200 ++++++++++++--------- Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx | 21 ++- Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx | 19 +- .../tex/latex/biblatex-apa/austrian-apa.lbx | 21 ++- .../tex/latex/biblatex-apa/brazilian-apa.lbx | 18 +- .../tex/latex/biblatex-apa/british-apa.lbx | 14 +- .../tex/latex/biblatex-apa/danish-apa.lbx | 6 +- .../tex/latex/biblatex-apa/dutch-apa.lbx | 6 +- .../tex/latex/biblatex-apa/english-apa.lbx | 16 +- .../tex/latex/biblatex-apa/french-apa.lbx | 20 ++- .../tex/latex/biblatex-apa/german-apa.lbx | 21 ++- .../tex/latex/biblatex-apa/greek-apa.lbx | 14 +- .../tex/latex/biblatex-apa/italian-apa.lbx | 20 ++- .../tex/latex/biblatex-apa/naustrian-apa.lbx | 21 ++- .../tex/latex/biblatex-apa/ngerman-apa.lbx | 21 ++- .../tex/latex/biblatex-apa/norsk-apa.lbx | 6 +- .../tex/latex/biblatex-apa/norwegian-apa.lbx | 6 +- .../tex/latex/biblatex-apa/nynorsk-apa.lbx | 6 +- .../tex/latex/biblatex-apa/portuguese-apa.lbx | 116 ++++++++++++ .../tex/latex/biblatex-apa/slovene-apa.lbx | 6 +- .../tex/latex/biblatex-apa/spanish-apa.lbx | 18 +- .../tex/latex/biblatex-apa/swedish-apa.lbx | 6 +- 23 files changed, 400 insertions(+), 216 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/biblatex-apa/portuguese-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 80d786e25f7..66485f84eeb 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/05/13\space v6.9\space APA biblatex localisation] +\ProvidesFile{american-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation] \InheritBibliographyExtras{american} % (APA 6.22) The example abbreviations @@ -50,12 +50,14 @@ origyear = {{original\space work\space published}{original\space work\space published}}, typechair = {{Chair}{Chair}}, typechairs = {{Chairs}{Chairs}}, - typevolume = {{Volume\space Editor}{Vol\adddot\space Ed\adddot}}, - typevolumes = {{Volume\space Editors}{Vol\adddot\space Eds\adddot}}, + typevolume = {{Volume\space Editor}{Vol\adddotspace Ed\adddot}}, + typevolumes = {{Volume\space Editors}{Vol\adddotspace Eds\adddot}}, typeseries = {{Series\space Editor}{Series\space Ed\adddot}}, typeseriess = {{Series\space Editors}{Series\space Eds\adddot}}, - typevolseries = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddot\space Ed\adddot}}, - typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddot\space Eds\adddot}}, + typevolseries = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddotspace Ed\adddot}}, + typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, } % @@ -67,7 +69,7 @@ % You must use \printdate to get here otherwise it will be ignored \DeclareBibliographyExtras{% - \def\finalandcomma{\addcomma}% + \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% \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 4944245cda7..85456ea612c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa.bbx}[2016/05/13\space v6.9\space APA biblatex references style] +\ProvidesFile{apa.bbx}[2016/07/01\space v7.0\space APA biblatex references style] \RequireBiber[3] \RequireBibliographyStyle{standard} \urlstyle{rm} % APA examples all have URLs in same font as text @@ -74,56 +74,71 @@ % % Date formats. Suppress end range of less specific fields - -\newcommand*{\mkbibrangeapalong}[1]{% - \ifthenelse{\equal{#1}{url}} - {\printtext{% - \mkbibdateapalongmdy{#1year}{#1month}{#1day}% - \iffieldundef{#1endyear}% - {}% - {\iffieldequalstr{#1endyear}{}% open-ended range? - {\mbox{\bibdatedash}} - {\bibdatedash% - \iffieldsequal{#1year}{#1endyear}% - {\iffieldsequal{#1month}{#1endmonth}% - {\iffieldsequal{#1day}{#1endday}% - {}% - {\mkbibdateapalongmdy{}{}{#1endday}}}% - {\mkbibdateapalongmdy{}{#1endmonth}{#1endday}}}% - {\mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}}}} - {\printtext{% - \mkbibdateapalong{#1year}{#1month}{#1day}% - \iffieldundef{#1endyear}% - {}% - {\iffieldequalstr{#1endyear}{}% open-ended range? - {\mbox{\bibdatedash}} - {\bibdatedash% - \iffieldsequal{#1year}{#1endyear}% - {\iffieldsequal{#1month}{#1endmonth}% - {\iffieldsequal{#1day}{#1endday}% - {}% - {\mkbibdateapalong{}{}{#1endday}}}% - {\mkbibdateapalong{}{#1endmonth}{#1endday}}}% - {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}}}}}}} - +\newcommand*{\mkdaterangeapalong}[1]{% + \blx@metadateinfo{#1}% + \iffieldundef{#1year}{} + {\datecircaprint + \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ... + {\printtext{% + \mkbibdateapalongmdy{#1year}{#1month}{#1day}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\iffieldsequal{#1month}{#1endmonth}% + {\iffieldsequal{#1day}{#1endday}% + {}% + {\mkbibdateapalongmdy{}{}{#1endday}}}% + {\mkbibdateapalongmdy{}{#1endmonth}{#1endday}}}% + {\mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}}% + \dateuncertainprint}} + {\printtext{% + \mkbibdateapalong{#1year}{#1month}{#1day}% + \dateeraprint{#1year}% + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\iffieldsequal{#1month}{#1endmonth}% + {\iffieldsequal{#1day}{#1endday}% + {}% + {\mkbibdateapalong{}{}{#1endday}}}% + {\mkbibdateapalong{}{#1endmonth}{#1endday}}}% + {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}% + \dateeraprint{#1endyear}}}% + \enddateuncertainprint}}}}} % Only for DATE as only \printdateextra is used -\newcommand*{\mkbibrangeapalongextra}[1]{% - \printtext{% - \mkbibdateapalongextra{#1year}{#1month}{#1day}% - \iffieldundef{#1endyear}% - {}% - {\iffieldequalstr{#1endyear}{}% open-ended range? - {\mbox{\bibdatedash}} - {\bibdatedash% - \iffieldsequal{#1year}{#1endyear}% - {\iffieldsequal{#1month}{#1endmonth}% - {\iffieldsequal{#1day}{#1endday}% - {}% - {\mkbibdateapalongextra{}{}{#1endday}}} - {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}} - {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}}}}}} - +\newcommand*{\mkdaterangeapalongextra}[1]{% + \blx@metadateinfo{#1}% + \iffieldundef{#1year}{} + {\printtext{% + \datecircaprint + \mkbibdateapalongextra{#1year}{#1month}{#1day}% + \dateeraprint{#1year}% + \dateuncertainprint + \iffieldundef{#1endyear}% + {}% + {\iffieldequalstr{#1endyear}{}% open-ended range? + {\mbox{\bibdatedash}} + {\bibdatedash% + \iffieldsequal{#1year}{#1endyear}% + {\iffieldsequal{#1month}{#1endmonth}% + {\iffieldsequal{#1day}{#1endday}% + {}% + {\mkbibdateapalongextra{}{}{#1endday}}} + {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}} + {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}% + \dateeraprint{#1endyear}}}% + \enddateuncertainprint}}}} + +\AtEndPreamble{% + \renewcommand*{\datecircaprint}{% + \ifdatecirca{\biblcstring{circa}\printdelim{datecircadelim}}{}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -146,12 +161,12 @@ % (APA 6.12) Five author max before "et al" and a one author truncation policy % However, only after the first cite, see the labelname format % in .cbx. It's also overridden per-entry by uniquelist -% (APA 6.x) citation tracking is global -% (APA 6.14) uses initials to disambiguate shared surnames -% (APA 6.16) uses year postfix to disambiguate multiple items in same year +% (APA 6.x) Citation tracking is global +% (APA 6.14) Use initials to disambiguate shared surnames +% (APA 6.16) Use year postfix to disambiguate multiple items in same year % (APA 6.10) Never reference anything not cited -% (APA 6.25) author initials only -% (APA 6.25) sorting is nyt but we need to account for PUBSTATE which comes +% (APA 6.25) Author initials only +% (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}{ @@ -170,22 +185,24 @@ \field{director} \field{producer} \field{execproducer} - \field{origauthor} \field{sorttitle} \field{title} } + \sort{ + \field{pubstate} + } \sort{ \field{sortyear} \field{year} - \field{pubstate} + \literal{-2000000000}% APA has "nodates" coming first } \sort{ \field{sorttitle} \field{title} } \sort{ - \field[padside=left,padwidth=4,padchar=0]{volume} - \literal{0000} + \field{volume} + \literal{0} } } @@ -201,29 +218,33 @@ % ellipsis from 7th to n-1 in bib, there might be some really strange % edge cases which can't be handled as this needs treating in the style % after biber has finished. Very unlikely though. -\ExecuteBibliographyOptions{labeldate=true,% - sorting=apa,% +\ExecuteBibliographyOptions{% + abbreviate=true,% autocite=inline,% backref=true,% - pagetracker=true,% - useprefix=true,% - usetranslator=true,% - uniquelist=minyear,% - uniquename=full,% citetracker=true,% - maxcitenames=2,% - mincitenames=1,% + date=apalong,% + dateabbrev=false,% + datecirca=true,% + dateera=christian,% + labeldate=apalong,% + dateuncertain=true,% + eventdate=comp,% + labeldateparts=true,% maxbibnames=7,% + maxcitenames=2,% minbibnames=6,% - abbreviate=true,% + mincitenames=1,% mincrossrefs=999,% - uniqueprimaryauthor=true,% - eventdate=comp,% - date=apalong,% - datelabel=apalong,% origdate=apalong,% + pagetracker=true,% + sorting=apa,% + uniquelist=minyear,% + uniquename=full,% + uniqueprimaryauthor=true,% urldate=apalong,% - dateabbrev=false} + useprefix=true,% + usetranslator=true} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -365,7 +386,7 @@ {\addcomma\addspace\ldots\addspace} {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}} {} - {\iffieldequalstr{doubtfulauthor}{true} + {\iffieldannotation{uncertain} {\mkbibbrackets{\usebibmacro{name:apa:family-given}% {\namepartfamily}% {\namepartgiven}% @@ -420,6 +441,7 @@ % Months and days go into parenthesis with year, if set % (APA 6.29) Issue goes where month normally goes if it % is set. +% (APA 7.10) circa or uncertain dates in brackets % Make sure endmonth gets an expansion too \DeclareFieldFormat{endmonth}{\mkbibmonth{#1}} @@ -436,13 +458,13 @@ \iffieldundef{labelyear} {\iffieldundef{origyear} {} - {\printtext[yearorunkyear]{\printfield[noformat]{origyear}}}}% - {\printtext[yearorunkyear]{\printdateextralabel}}} + {\printtext[apadate[{\printorigdate}}}% + {\printtext[apadate]{\printlabeldateextra}}} -\DeclareFieldFormat{yearorunkyear}{% - \ifthenelse{\iffieldequalstr{doubtfuldate}{true}} - {\mkbibbrackets{ca\adddot\addspace#1}} - {\mkbibparens{#1}}} +\DeclareFieldFormat{apadate}{% + \ifboolexpr{ test {\ifdatecirca} or test {\ifdateuncertain} } + {\printtext{\mkbibbrackets{#1}}} + {\printtext{\mkbibparens{#1}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -847,16 +869,17 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 7.02 Example 21) Original year -\DeclareFieldFormat{origyear}{\mkbibparens{\bibcpstring{origyear}~\thefield{origyear}}} - % Only give ORIGYEAR in references if both: % YEAR is also given % YEAR and ORIGYEAR are different \newbibmacro*{origyear}{% - \ifthenelse{\NOT\iffieldundef{labelyear}\AND\NOT\iffieldsequal{labelyear}{origyear}} - {\printfield{origyear}} - {}} + \ifboolexpr{% + not test {\iffieldundef{origyear}} + not test {\iffieldundef{labelyear}} + and not test {\iffieldsequal{labelyear}{origyear}}} + {\printtext{\mkbibparens{\bibcpstring{origyear}~\printorigdate}}} + {}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1159,8 +1182,8 @@ \setunit{\addspace}% \iffieldundef{urlyear} {} - {\printurldate% - \setunit*{\addcomma\addspace}}% + {\printtext{\printurldate}% + \setunit*{\urldatecomma}}% \printtext{\bibstring{from}}% \setunit*{\addspace}% \printfield{urldescription}% @@ -1249,7 +1272,7 @@ \usebibmacro{related}}} \newbibmacro*{related:reviewof}[1]{% - \setunit{}% Sanitize this in case no author + \setunit{}% Sanitise this in case no author \entrydata*{#1}{% \ifentrytype{article} {\printtext{\printfield[apacase]{title}}} @@ -2171,7 +2194,6 @@ \newbibmacro*{bbx:savehash}{% \savefield{fullhash}{\bbx@lasthash}} - \newbool{bbx@inset} \DeclareBibliographyDriver{set}{% \booltrue{bbx@inset}% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index 220709a82ff..ce17e03dff2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa.cbx}[2016/05/13\space v6.9\space APA biblatex citation style] +\ProvidesFile{apa.cbx}[2016/07/01\space v7.0\space APA biblatex citation style] \RequireBiber[3] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -322,14 +322,19 @@ \savefield{fullhash}{\cbx@lasthash}}}} \newbibmacro*{cite:plabelyear+extrayear}{% - \iffieldundef{labelyear} - {} + \iffieldundef{labelyear}{} {\printtext[bibhyperref]{% - \printfield[noformat]{origyear}\setunit*{\addslash}% - \printfield{labelyear}\printfield{extrayear}}}% - \iffieldundef{issue} - {} - {\addcomma\addspace\printfield{issue}}} + \iffieldundef{origyear}{} + {\ifboolexpr{ test {\iforigdatecirca} or test {\iforigdateuncertain} } + {\mkbibbrackets{\printorigdate}} + {\printorigdate}% + \setunit*{\addslash}}% + \ifboolexpr{ test {\iflabeldatecirca} or test {\iflabeldateuncertain} } + {\mkbibbrackets{\printlabeldateextra}} + {\printlabeldateextra}}}% + \iffieldundef{issue} + {} + {\addcomma\addspace\printfield{issue}}} \newbibmacro*{cite:shorthand}{% \ifciteseen diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx index cdf4592a0ac..7035ed87832 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx @@ -11,21 +11,8 @@ %% This work has the LPPL maintenance status `maintained'. %% %% The Current Maintainer of this work is Philip Kime. -%% -%% This work consists of the files: -%% -%% apa.cbx (biblatex citation style) -%% apa.bbx (biblatex references style) -%% apa.dbx (biblatex style data model) -%% *.lbx (localisation files for APA-specific strings) -%% biblatex-apa.pdf (Style documentation) -%% biblatex-apa.tex (Style documentation source) -%% biblatex-apa-test.pdf (Style examples) -%% biblatex-apa-test.tex (Style examples source) -%% biblatex-apa-test-citations.bib (Style examples - citations) -%% biblatex-apa-test-references.bib (Style examples - references) -\ProvidesFile{apa.dbx}[2016/05/13\space v6.9\space APA biblatex style data model] +\ProvidesFile{apa.dbx}[2016/07/01\space v7.0\space APA biblatex style data model] \RequireBiber[3] \DeclareDatamodelEntrytypes{ @@ -42,8 +29,6 @@ \DeclareDatamodelFields[type=field, datatype=literal]{ abstractloc, - doubtfulauthor, - doubtfuldate, titleisdescription, newspaper, urldescription} @@ -54,8 +39,6 @@ \DeclareDatamodelEntryfields{ titleisdescription, with, - doubtfulauthor, - doubtfuldate, abstractloc, abstracturl, urldescription} 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 9c4f0cef641..fbae1e68dab 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx @@ -1,6 +1,9 @@ -\ProvidesFile{austrian-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation] +\ProvidesFile{austrian-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation] \InheritBibliographyExtras{austrian} +% Following DGPs guidlines for German/Austrian +% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf + % (APA 6.22) The example abbreviations \NewBibliographyString{revisededition} @@ -27,7 +30,8 @@ \DeclareBibliographyStrings{% inherit = {austrian}, - revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddot\space Aufl\adddot}}, + andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddotspace Aufl\adddot}}, producer = {{Produzent}{Produzent}}, execproducer = {{Produzent}{Produzent}}, director = {{Regisseur}{Regisseur}}, @@ -46,12 +50,14 @@ origyear = {{Original\space ver\"offentlicht}{Original\space ver\"offentlicht}}, typechair = {{Konferenzstuhl}{Konferenzstuhl}}, typechairs = {{Konferenzst\"uhle}{Konferenzst\"uhle}}, - typevolume = {{Band\space Herausgeber}{Bd\adddot\space Hrsg\adddot}}, - typevolumes = {{Band\space Herausgeber}{Bd\adddot\space Hrsg\adddot}}, + 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\adddot\space Hrsg\adddot}}, - typevolseriess = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddot\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}}, } @@ -60,7 +66,8 @@ % You must use \printdate to get here otherwise it will be ignored \DeclareBibliographyExtras{% - \def\finalandcomma{\addcomma}% + \renewcommand{\apashortdash}{~}% + \def\urldatecomma{\addspace}% \protected\def\mkbibdateapalong#1#2#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 dadc19d8716..72a16af1a24 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/05/13\space v6.9\space APA biblatex localisation] +\ProvidesFile{brazilian-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation] \InheritBibliographyExtras{brazilian} % (APA 6.22) The example abbreviations @@ -42,12 +42,14 @@ origyear = {{trabalho\space original\space publicado\space em}{trabalho\space original\space publicado\space em}}, typechair = {{Coordenador}{Coord\adddot}}, typechairs = {{Coordenadores}{Coords\adddot}}, - typevolume = {{Editor\space do\space Volume}{Ed\adddot\space Vol\adddot}}, - typevolumes = {{Editores\space do\space Volume}{Eds\adddot\space Vol\adddot}}, - typeseries = {{Editor\space da\space S\'erie}{Ed\adddot\space S\'erie\adddot}}, - typeseriess = {{Editores\space da\space S\'erie}{Eds\adddot\space S\'erie\adddot}}, - typevolseries = {{Editor\space da\space S\'erie\space e\space do\space Volume}{Ed\adddot\space Vol\space\&\space S\'erie}}, - typevolseriess = {{Editores\space da\space S\'erie\space e\space do\space Volume}{Eds\adddot\space Vol\space\&\space S\'erie}}, + typevolume = {{Editor\space do\space Volume}{Ed\adddotspace Vol\adddot}}, + typevolumes = {{Editores\space do\space Volume}{Eds\adddotspace Vol\adddot}}, + typeseries = {{Editor\space da\space S\'erie}{Ed\adddotspace S\'erie\adddot}}, + typeseriess = {{Editores\space da\space S\'erie}{Eds\adddotspace S\'erie\adddot}}, + typevolseries = {{Editor\space da\space S\'erie\space e\space do\space Volume}{Ed\adddotspace Vol\space\&\space S\'erie}}, + typevolseriess = {{Editores\space da\space S\'erie\space e\space do\space Volume}{Eds\adddotspace Vol\space\&\space S\'erie}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, } % @@ -59,7 +61,7 @@ % You must use \printdate to get here otherwise it will be ignored \DeclareBibliographyExtras{% - \def\finalandcomma{\addcomma}% + \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% \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 6b390450de6..f8c827e1363 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/05/13\space v6.9\space APA biblatex localisation] +\ProvidesFile{british-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation] \InheritBibliographyExtras{british} % (APA 6.22) The example abbreviations @@ -48,12 +48,14 @@ origyear = {{original\space work\space published}{original\space work\space published}}, typechair = {{Chair}{Chair}}, typechairs = {{Chairs}{Chairs}}, - typevolume = {{Volume\space Editor}{Vol\adddot\space Ed\adddot}}, - typevolumes = {{Volume\space Editors}{Vol\adddot\space Eds\adddot}}, + typevolume = {{Volume\space Editor}{Vol\adddotspace Ed\adddot}}, + typevolumes = {{Volume\space Editors}{Vol\adddotspace Eds\adddot}}, typeseries = {{Series\space Editor}{Series\space Ed\adddot}}, typeseriess = {{Series\space Editors}{Series\space Eds\adddot}}, - typevolseries = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddot\space Ed\adddot}}, - typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddot\space Eds\adddot}}, + typevolseries = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddotspace Ed\adddot}}, + typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, } % @@ -65,7 +67,7 @@ % You must use \printdate to get here otherwise it will be ignored \DeclareBibliographyExtras{% - \def\finalandcomma{\addcomma}% + \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% \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 9e9599850b0..557ee9dcec0 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/05/13\space v6.9\space APA biblatex localisation] +\ProvidesFile{danish-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation] \InheritBibliographyExtras{danish} % (APA 6.22) The example abbreviations @@ -66,6 +66,8 @@ typeseriess = {{serieredakt{\o}rer}{seriered\adddot}}, typevolseries = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}}, typevolseriess = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, } % @@ -77,7 +79,7 @@ % You must use \printdate to get here otherwise it will be ignored \DeclareBibliographyExtras{% - \def\finalandcomma{\addcomma}% + \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#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 da83afff1f5..00439e7dc70 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/05/13\space v6.9\space APA biblatex localisation] +\ProvidesFile{dutch-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation] \InheritBibliographyExtras{dutch} % (APA 6.22) The example abbreviations @@ -54,6 +54,8 @@ typeseriess = {{Reeksredacteuren}{Reeksred\adddot}}, typevolseries = {{Reeks-\space en\space deelredacteur}{Reeks-\space\& deelred\adddot}}, typevolseriess = {{Reeks-\space en\space deelredacteuren}{Reeks-\space\& deelred\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, } % @@ -65,7 +67,7 @@ % You must use \printdate to get here otherwise it will be ignored \DeclareBibliographyExtras{% - \def\finalandcomma{\addcomma}% + \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% \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 8034403c063..e8a35789e03 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/05/13\space v6.9\space APA biblatex localisation] +\ProvidesFile{english-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation] \InheritBibliographyExtras{english} % (APA 6.22) The example abbreviations @@ -50,12 +50,14 @@ origyear = {{original\space work\space published}{original\space work\space published}}, typechair = {{Chair}{Chair}}, typechairs = {{Chairs}{Chairs}}, - typevolume = {{Volume\space Editor}{Vol\adddot\space Ed\adddot}}, - typevolumes = {{Volume\space Editors}{Vol\adddot\space Eds\adddot}}, + typevolume = {{Volume\space Editor}{Vol\adddotspace Ed\adddot}}, + typevolumes = {{Volume\space Editors}{Vol\adddotspace Eds\adddot}}, typeseries = {{Series\space Editor}{Series\space Ed\adddot}}, typeseriess = {{Series\space Editors}{Series\space Eds\adddot}}, - typevolseries = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddot\space Ed\adddot}}, - typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddot\space Eds\adddot}}, + typevolseries = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddotspace Ed\adddot}}, + typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, } % @@ -64,10 +66,10 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (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 +% You must use \print*date to get here otherwise it will be ignored \DeclareBibliographyExtras{% - \def\finalandcomma{\addcomma}% + \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% \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 918fcf39c3c..f368f17e022 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/05/13\space v6.9\space APA biblatex localisation] +\ProvidesFile{french-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation] \InheritBibliographyExtras{french} % (APA 6.22) The example abbreviations @@ -28,7 +28,7 @@ \DeclareBibliographyStrings{% inherit = {french}, inpress = {{sous presse}{sous presse}},% remove when biblatex has it - revisededition = {{\'Edition\space R\'evis\'e}{\'Ed\adddot\space R\'ev\adddot}}, + revisededition = {{\'Edition\space R\'evis\'e}{\'Ed\adddotspace R\'ev\adddot}}, page = {{Page}{{}p\adddot}}, pages = {{Pages}{{}p\adddot}}, on = {{le}{le}}, @@ -47,12 +47,14 @@ origyear = {{Date\space de\space premi\`ere publication}{Date\space de\space premi\`ere publication}}, typechair = {{Ma\^itre\space de\space Conf\'erence}{Ma\^itre\space de\space Conf\'erence}}, typechairs = {{Ma\^itres\space de\space Conf\'erence}{Ma\^itres\space de\space Conf\'erence}}, - typevolume = {{R\'edacteur\space du\space volume}{R\'ed\adddot\space vol\adddot}}, - typevolumes = {{R\'edacteur\space du\space volume}{R\'eds\adddot\space vol\adddot}}, - typeseries = {{R\'edacteur\space de\space la\space s\'erie}{R\'ed\adddot\space ser\adddot}}, - typeseriess = {{R\'edacteurs\space de\space la\space s\'erie}{R\'eds\adddot\space ser\adddot}}, - typevolseries = {{R\'edacteur\space de\space la\space s\'erie\space et\space du volume}{Red\adddot\space vol\space\&\space ser\adddot}}, - typevolseriess = {{Directeurs\space de\space Publication\space et\space R\'edacteurs\space en\space chef}{Reds\adddot\space vol\space\&\space ser\adddot}}, + typevolume = {{R\'edacteur\space du\space volume}{R\'ed\adddotspace vol\adddot}}, + typevolumes = {{R\'edacteur\space du\space volume}{R\'eds\adddotspace vol\adddot}}, + typeseries = {{R\'edacteur\space de\space la\space s\'erie}{R\'ed\adddotspace ser\adddot}}, + typeseriess = {{R\'edacteurs\space de\space la\space s\'erie}{R\'eds\adddotspace ser\adddot}}, + typevolseries = {{R\'edacteur\space de\space la\space s\'erie\space et\space du volume}{Red\adddotspace vol\space\&\space ser\adddot}}, + typevolseriess = {{Directeurs\space de\space Publication\space et\space R\'edacteurs\space en\space chef}{Reds\adddotspace vol\space\&\space ser\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -60,7 +62,7 @@ % You must use \printdate to get here otherwise it will be ignored \DeclareBibliographyExtras{% - \def\finalandcomma{\addcomma}% + \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% \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 0aedb668c99..27bde3bc9a3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx @@ -1,8 +1,11 @@ -\ProvidesFile{german-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation] +\ProvidesFile{german-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation] \InheritBibliographyExtras{german} % (APA 6.22) The example abbreviations +% Following DGPs guidlines for German/Austrian +% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf + \NewBibliographyString{revisededition} \NewBibliographyString{typechair} \NewBibliographyString{typechairs} @@ -27,7 +30,8 @@ \DeclareBibliographyStrings{% inherit = {german}, - revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddot\space Aufl\adddot}}, + andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddotspace Aufl\adddot}}, producer = {{Produzent}{Produzent}}, execproducer = {{Produzent}{Produzent}}, director = {{Regisseur}{Regisseur}}, @@ -46,12 +50,14 @@ origyear = {{Original\space ver\"offentlicht}{Original\space ver\"offentlicht}}, typechair = {{Konferenzstuhl}{Konferenzstuhl}}, typechairs = {{Konferenzst\"uhle}{Konferenzst\"uhle}}, - typevolume = {{Band\space Herausgeber}{Bd\adddot\space Hrsg\adddot}}, - typevolumes = {{Band\space Herausgeber}{Bd\adddot\space Hrsg\adddot}}, + 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\adddot\space Hrsg\adddot}}, - typevolseriess = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddot\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}}, } @@ -60,7 +66,8 @@ % You must use \printdate to get here otherwise it will be ignored \DeclareBibliographyExtras{% - \def\finalandcomma{\addcomma}% + \renewcommand{\apashortdash}{~}% + \def\urldatecomma{\addspace}% \protected\def\mkbibdateapalong#1#2#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 000f26c2c9e..00cc54889f4 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/05/13\space v6.9\space APA biblatex localisation] +\ProvidesFile{greek-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation] \InheritBibliographyExtras{greek} % (APA 6.22) The example abbreviations @@ -48,12 +48,14 @@ origyear = {{πρωτότυπη\space εργασία\space δημοσιευμένη}{πρωτότυπη\space εργασία\space δημοσιευμένη}}, typechair = {{Πρόεδρος}{Πρόεδρος}}, typechairs = {{Πρόεδροι}{Πρόεδροι}}, - typevolume = {{Τόμος\space Συντάκτης}{Τομ\adddot\space Συν\adddot}}, - typevolumes = {{Τόμοι\space Συντάκτες}{Τομ\adddot\space Συν\adddot}}, + typevolume = {{Τόμος\space Συντάκτης}{Τομ\adddotspace Συν\adddot}}, + typevolumes = {{Τόμοι\space Συντάκτες}{Τομ\adddotspace Συν\adddot}}, typeseries = {{Σειρά\space Συντάκτης}{Σειρά\space Συν\adddot}}, typeseriess = {{Σειρά\space Συντάκτες}{Σειρά\space Συν\adddot}}, - typevolseries = {{Σειρά\space και\space Τόμος\space Συντάκτης}{Σειρά\space\& Τομ\adddot\space Συν\adddot}}, - typevolseriess = {{Σειρά\space και\space Τόμος\space Συντάκτες}{Σειρά\space\& Τομ\adddot\space Συν\adddot}}, + typevolseries = {{Σειρά\space και\space Τόμος\space Συντάκτης}{Σειρά\space\& Τομ\adddotspace Συν\adddot}}, + typevolseriess = {{Σειρά\space και\space Τόμος\space Συντάκτες}{Σειρά\space\& Τομ\adddotspace Συν\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, } % @@ -65,7 +67,7 @@ % You must use \printdate to get here otherwise it will be ignored \DeclareBibliographyExtras{% - \def\finalandcomma{\addcomma}% + \def\urldatecomma{\addcomma\addspace}% \protected\def\lbx@gr@mkbibmonth#1{% \ifcase0#1\relax #1\BibliographyWarning{Month out of range}% 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 c1b829207ef..8a56d04867d 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/05/13\space v6.9\space APA biblatex localisation] +\ProvidesFile{italian-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation] \InheritBibliographyExtras{italian} % (APA 6.22) The example abbreviations @@ -27,7 +27,7 @@ \DeclareBibliographyStrings{% inherit = {italian}, - revisededition = {{Edizione\space Revisionata}{Ed\adddot\space Rev\adddot}}, + revisededition = {{Edizione\space Revisionata}{Ed\adddotspace Rev\adddot}}, page = {{Pagina}{{}p\adddot}}, pages = {{Pagine}{{}pp\adddot}}, on = {{il}{il}}, @@ -48,12 +48,14 @@ origyear = {{Data\space di\space prima\space pubblicazione}{Data\space di\space prima\space pubblicazione}}, typechair = {{Moderatore}{Moderatore}}, typechairs = {{Moderatori}{Moderatori}}, - typevolume = {{Redattore\space del\space Volume}{Red\adddot\space Vol\adddot}}, - typevolumes = {{Redattori\space del\space Volume}{Red\adddot\space Vol\adddot}}, - typeseries = {{Curatore\space della\space Collana}{Cur\addot\space Coll\adddot}}, - typeseriess = {{Curatori\space della\space Collana}{Cur\addot\space Coll\adddot}}, - typevolseries = {{Curatore\space della\space Collana\space e\space del\space Volume}{Cur\addot\space Coll\addot\& Vol\adddot}}, - typevolseriess = {{Curatori\space della\space Collana\space e\space del\space Volume}{Cur\addot\space Coll\addot\& Vol\adddot}}, + typevolume = {{Redattore\space del\space Volume}{Red\adddotspace Vol\adddot}}, + typevolumes = {{Redattori\space del\space Volume}{Red\adddotspace Vol\adddot}}, + typeseries = {{Curatore\space della\space Collana}{Cur\addotspace Coll\adddot}}, + typeseriess = {{Curatori\space della\space Collana}{Cur\addotspace Coll\adddot}}, + typevolseries = {{Curatore\space della\space Collana\space e\space del\space Volume}{Cur\addotspace Coll\addot\& Vol\adddot}}, + typevolseriess = {{Curatori\space della\space Collana\space e\space del\space Volume}{Cur\addotspace Coll\addot\& Vol\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, } % @@ -65,7 +67,7 @@ % You must use \printdate to get here otherwise it will be ignored \DeclareBibliographyExtras{% - \def\finalandcomma{\addcomma}% + \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% \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 937f3e3cb48..0e0063eb631 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx @@ -1,8 +1,11 @@ -\ProvidesFile{naustrian-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation] +\ProvidesFile{naustrian-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation] \InheritBibliographyExtras{naustrian} % (APA 6.22) The example abbreviations +% Following DGPs guidlines for German/Austrian +% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf + \NewBibliographyString{revisededition} \NewBibliographyString{typechair} \NewBibliographyString{typechairs} @@ -27,7 +30,8 @@ \DeclareBibliographyStrings{% inherit = {naustrian}, - revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddot\space Aufl\adddot}}, + andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddotspace Aufl\adddot}}, producer = {{Produzent}{Produzent}}, execproducer = {{Produzent}{Produzent}}, director = {{Regisseur}{Regisseur}}, @@ -46,12 +50,14 @@ origyear = {{Original\space ver\"offentlicht}{Original\space ver\"offentlicht}}, typechair = {{Konferenzstuhl}{Konferenzstuhl}}, typechairs = {{Konferenzst\"uhle}{Konferenzst\"uhle}}, - typevolume = {{Band\space Herausgeber}{Bd\adddot\space Hrsg\adddot}}, - typevolumes = {{Band\space Herausgeber}{Bd\adddot\space Hrsg\adddot}}, + 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\adddot\space Hrsg\adddot}}, - typevolseriess = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddot\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}}, } @@ -60,7 +66,8 @@ % You must use \printdate to get here otherwise it will be ignored \DeclareBibliographyExtras{% - \def\finalandcomma{\addcomma}% + \renewcommand{\apashortdash}{~}% + \def\urldatecomma{\addspace}% \protected\def\mkbibdateapalong#1#2#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 18a347bf38a..c5618821575 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx @@ -1,8 +1,11 @@ -\ProvidesFile{ngerman-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation] +\ProvidesFile{ngerman-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation] \InheritBibliographyExtras{ngerman} % (APA 6.22) The example abbreviations +% Following DGPs guidlines for German/Austrian +% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf + \NewBibliographyString{revisededition} \NewBibliographyString{typechair} \NewBibliographyString{typechairs} @@ -27,7 +30,8 @@ \DeclareBibliographyStrings{% inherit = {ngerman}, - revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddot\space Aufl\adddot}}, + andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, + revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddotspace Aufl\adddot}}, producer = {{Produzent}{Produzent}}, execproducer = {{Produzent}{Produzent}}, director = {{Regisseur}{Regisseur}}, @@ -46,12 +50,14 @@ origyear = {{Original\space ver\"offentlicht}{Original\space ver\"offentlicht}}, typechair = {{Konferenzstuhl}{Konferenzstuhl}}, typechairs = {{Konferenzst\"uhle}{Konferenzst\"uhle}}, - typevolume = {{Band\space Herausgeber}{Bd\adddot\space Hrsg\adddot}}, - typevolumes = {{Band\space Herausgeber}{Bd\adddot\space Hrsg\adddot}}, + 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\adddot\space Hrsg\adddot}}, - typevolseriess = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddot\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}}, } @@ -60,7 +66,8 @@ % You must use \printdate to get here otherwise it will be ignored \DeclareBibliographyExtras{% - \def\finalandcomma{\addcomma}% + \renewcommand{\apashortdash}{~}% + \def\urldatecomma{\addspace}% \protected\def\mkbibdateapalong#1#2#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 cea9a6e3dba..62583e6ed52 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/05/13\space v6.9\space APA biblatex localisation] +\ProvidesFile{norsk-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation] \InheritBibliographyExtras{norsk} % (APA 6.22) The example abbreviations @@ -54,6 +54,8 @@ typeseriess = {{serieredakt{\o}rer}{seriered\adddot}}, typevolseries = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}}, typevolseriess = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, } % @@ -65,7 +67,7 @@ % You must use \printdate to get here otherwise it will be ignored \DeclareBibliographyExtras{% - \def\finalandcomma{\addcomma}% + \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#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 f41e917e0af..a5a9e11a5fc 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/05/13\space v6.9\space APA biblatex localisation] +\ProvidesFile{norwegian-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation] \InheritBibliographyExtras{norwegian} % (APA 6.22) The example abbreviations @@ -54,6 +54,8 @@ typeseriess = {{serieredakt{\o}rer}{seriered\adddot}}, typevolseries = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}}, typevolseriess = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, } % @@ -65,7 +67,7 @@ % You must use \printdate to get here otherwise it will be ignored \DeclareBibliographyExtras{% - \def\finalandcomma{\addcomma}% + \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#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 513cce7c0e1..2d296df8576 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/05/13\space v6.9\space APA biblatex localisation] +\ProvidesFile{nynorsk-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation] \InheritBibliographyExtras{nynorsk} % (APA 6.22) The example abbreviations @@ -54,6 +54,8 @@ typeseriess = {{serieredakt{\o}rar}{seriered\adddot}}, typevolseries = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}}, typevolseriess = {{serie- og bindredakt{\o}rar}{serie- og bindred\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, } % @@ -65,7 +67,7 @@ % You must use \printdate to get here otherwise it will be ignored \DeclareBibliographyExtras{% - \def\finalandcomma{\addcomma}% + \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#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 new file mode 100644 index 00000000000..deff932d3a8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx @@ -0,0 +1,116 @@ +\ProvidesFile{portuguese-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation] +\InheritBibliographyExtras{portuguese} + +% (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 = {portuguese}, + revisededition = {{Edi\c{c}\~ao\space Revista}{ed\adddotspace rev\adddot}}, + on = {{em}{em}}, + retrieved = {{obtido}{obtido}}, + available = {{dispon\'ivel}{disp.}}, + from = {{de}{de}}, + archivedat = {{arquivado\space em}{arquivado\space em}}, + reviewof = {{Revis\~ao\space de}{revis\~ao\space de}}, + producer = {{produtor}{produtor}}, + execproducer = {{produtor executivo}{produtor executivo}}, + director = {{diretor}{diretor}}, + writer = {{escritor}{escritor}}, + with = {{com}{com}}, + origyear = {{trabalho\space original\space publicado\space em}{trabalho\space original\space publicado\space em}}, + typechair = {{Coordenador}{Coord\adddot}}, + typechairs = {{Coordenadores}{Coords\adddot}}, + typevolume = {{Editor\space do\space Volume}{Ed\adddot\space Vol\adddot}}, + typevolumes = {{Editores\space do\space Volume}{Eds\adddot\space Vol\adddot}}, + typeseries = {{Editor\space da\space S\'erie}{Ed\adddot\space S\'erie\adddot}}, + typeseriess = {{Editores\space da\space S\'erie}{Eds\adddot\space S\'erie\adddot}}, + typevolseries = {{Editor\space da\space S\'erie\space e\space do\space Volume}{Ed\adddot\space Vol\space\&\space S\'erie}}, + typevolseriess = {{Editores\space da\space S\'erie\space e\space do\space Volume}{Eds\adddot\space Vol\space\&\space S\'erie}}, +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (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{% + \def\urldatecomma{\addcomma\addspace}% + \protected\def\mkbibdateapalong#1#2#3{% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongextra#1#2#3{% + \iffieldundef{#1}% + {}% + {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#1}% + {}% + {\addcomma\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#3}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}% + {}% + {\addspace}% + \stripzeros{\thefield{#3}}}}% + \protected\def\mkbibdateapalongmdy#1#2#3{% + \iffieldundef{#3}% + {}% + {\stripzeros{\thefield{#3}}}% + \iffieldundef{#2}% + {}% + {\iffieldundef{#3}% + {}% + {\addspace}% + \mkbibmonth{\thefield{#2}}}% + \iffieldundef{#1}% + {}% + {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}% + {}% + {\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 f584c00aeeb..6a4c47633c1 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/05/13\space v6.9\space APA biblatex localisation] +\ProvidesFile{slovene-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation] \InheritBibliographyExtras{slovene} % (APA 6.22) The example abbreviations @@ -76,6 +76,8 @@ typeseriess = {{uredniki}{ur\adddot}}, typevolseries = {{urednik}{ur\adddot}}, typevolseriess = {{uredniki}{ur\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, } \protected\gdef\lbx@sl@mkbibmonth#1{% @@ -98,7 +100,7 @@ \fi}% \DeclareBibliographyExtras{% - \def\finalandcomma{\addcomma}% + \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#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 df830f485c1..ceaa0da071c 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/05/13\space v6.9\space APA biblatex localisation] +\ProvidesFile{spanish-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation] \InheritBibliographyExtras{spanish} \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced @@ -64,12 +64,14 @@ origyear = {{Fecha\space inicial\space de\space publicaci\'on}{Fecha\space inicial\space de\space publicaci\'on}}, typechair = {{Coordinador}{Coord\adddot}}, typechairs = {{Coordinadores}{Coords\adddot}}, - typevolume = {{Editor\space del\space volumen}{Ed\adddot\space vol\adddot}}, - typevolumes = {{Editores\space del\space volumen}{Eds\adddot\space vol\adddot}}, - typeseries = {{Editor\space de\space la\space serie}{Ed\adddot\space ser\adddot}}, - typeseriess = {{Editores\space de\space la\space serie}{Eds\adddot\space ser\adddot}}, - typevolseries = {{Editor\space de\space la\space serie\space y\space del\space volumen}{Ed\adddot\space vol\space\&\space ser\adddot}}, - typevolseriess = {{Editores\space de\space la\space serie\space y\space del\space volumen}{Eds\adddot\space vol\space\&\space ser\adddot}}, + typevolume = {{Editor\space del\space volumen}{Ed\adddotspace vol\adddot}}, + typevolumes = {{Editores\space del\space volumen}{Eds\adddotspace vol\adddot}}, + typeseries = {{Editor\space de\space la\space serie}{Ed\adddotspace ser\adddot}}, + typeseriess = {{Editores\space de\space la\space serie}{Eds\adddotspace ser\adddot}}, + typevolseries = {{Editor\space de\space la\space serie\space y\space del\space volumen}{Ed\adddotspace vol\space\&\space ser\adddot}}, + typevolseriess = {{Editores\space de\space la\space serie\space y\space del\space volumen}{Eds\adddotspace vol\space\&\space ser\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -77,7 +79,7 @@ % You must use \printdate to get here otherwise it will be ignored \DeclareBibliographyExtras{% - \def\finalandcomma{\addcomma}% + \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% \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 dae141f77a7..6a26d2711b1 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/05/13\space v6.9\space APA biblatex localisation] +\ProvidesFile{swedish-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation] \InheritBibliographyExtras{swedish} % (APA 6.22) The example abbreviations @@ -58,11 +58,13 @@ typeseriess = {{redakt\"orer}{red\adddot}}, typevolseries = {{redakt\"or}{red\adddot}}, typevolseriess = {{redakt\"orer}{red\adddot}}, + annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, + beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, } \DeclareBibliographyExtras{% - \def\finalandcomma{\addcomma}% + \def\urldatecomma{\addcomma\addspace}% \protected\def\mkbibdateapalong#1#2#3{% \iffieldundef{#1}% {}% -- cgit v1.2.3