From 3f66843772666314e29eaff3a4257870505321dd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 23 Nov 2012 22:44:45 +0000 Subject: biblatex-apa (23nov12) git-svn-id: svn://tug.org/texlive/trunk@28341 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/biblatex-apa/american-apa.lbx | 2 +- Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx | 37 ++++-- Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx | 14 ++- Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx | 2 +- .../tex/latex/biblatex-apa/austrian-apa.lbx | 133 ++++++++++++++++++++ .../tex/latex/biblatex-apa/brazilian-apa.lbx | 2 +- .../tex/latex/biblatex-apa/british-apa.lbx | 2 +- .../tex/latex/biblatex-apa/dutch-apa.lbx | 2 +- .../tex/latex/biblatex-apa/french-apa.lbx | 2 +- .../tex/latex/biblatex-apa/german-apa.lbx | 4 +- .../tex/latex/biblatex-apa/greek-apa.lbx | 2 +- .../tex/latex/biblatex-apa/italian-apa.lbx | 2 +- .../tex/latex/biblatex-apa/naustrian-apa.lbx | 134 ++++++++++++++++++++ .../tex/latex/biblatex-apa/ngerman-apa.lbx | 4 +- .../tex/latex/biblatex-apa/norsk-apa.lbx | 139 +++++++++++++++++++++ .../tex/latex/biblatex-apa/norwegian-apa.lbx | 139 +++++++++++++++++++++ .../tex/latex/biblatex-apa/nynorsk-apa.lbx | 139 +++++++++++++++++++++ .../tex/latex/biblatex-apa/spanish-apa.lbx | 2 +- 18 files changed, 734 insertions(+), 27 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx create mode 100644 Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx create mode 100644 Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx create mode 100644 Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx create mode 100644 Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx (limited to 'Master/texmf-dist/tex/latex') 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 fdccae125f5..d011ecbd039 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}[2012/07/01\space v5.0\space APA biblatex localisation] +\ProvidesFile{american-apa.lbx}[2012/07/01\space v5.3\space APA biblatex localisation] \InheritBibliographyExtras{american} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index 49cb6e1bc2b..3974c535386 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx @@ -25,7 +25,7 @@ %% biblatex-apa-test-citations.bib (Style examples - citations) %% biblatex-apa-test-references.bib (Style examples - references) -\ProvidesFile{apa.bbx}[2012/07/01\space v5.0\space APA biblatex references style] +\ProvidesFile{apa.bbx}[2012/07/01\space v5.2\space APA biblatex references style] \RequireBiber[3] \RequireBibliographyStyle{standard} \urlstyle{rm} % APA examples all have URLs in same font as text @@ -202,7 +202,12 @@ } } -\DeclareLabelyear{pubstate,year,eventyear,origyear,urlyear} +% Don't fall back on other year fields if there is no year, use +% "nodate" string +\DeclareLabelyear{% + \field{pubstate} + \field{year} +} % Due to APA strange requirements like truncation after first cite and % ellipsis from 7th to n-1 in bib, there might be some really strange @@ -393,9 +398,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% (APA 6.28) Use "(n.d.)." for references with no year. This depends -% on the noyear macros and strings from apa.cbx +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.28) Use "nodate" bibstring for references with no year % Months and days go into parenthesis with year, if set % (APA 6.29) Issue goes where month normally goes if it % is set. @@ -437,10 +441,14 @@ {\ifciteseen {} {\printnames{shortauthor}\setunit{\nameyeardelim}}}% - \biblcstring{nodate}} + \bibstring{nodate}% + \iffieldundef{extrayear} + {\setunit{\relax}} + {\setunit{\apashortdash}}% + \printfield{extrayear}} % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 6.29) General format of titles. @@ -915,6 +923,16 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.30) Location only shows first item + +\DeclareListFormat{default}{% + \usebibmacro{list:delim}{#1}% + #1\isdot} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 6.30) Periodicals emph number, location % and pages (with no prefix) @@ -969,7 +987,7 @@ \DeclareFieldFormat[review]{volume}{\mkbibemph{\apanum{#1}}} \DeclareFieldFormat[review]{number}{\mkbibparens{\apanum{#1}}} -\renewbibmacro*{reviewauthor}{% +\newbibmacro*{reviewauthor}{% \ifnameundef{author} {\booltrue{bbx:noreviewauthor}} {\usebibmacro{author}}} @@ -1928,8 +1946,9 @@ {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}} {\nolinkurl{#1}}} +% APA 6th \newbibmacro*{location+publisher}{% - \printlist{location}% + \printlist[default][1-1]{location}% \setunit*{\addcolon\space}% \printlist{publisher}% \newunit} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index 13d0e397643..d60d059f269 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx @@ -25,7 +25,7 @@ %% biblatex-apa-test-citations.bib (Style examples - citations) %% biblatex-apa-test-references.bib (Style examples - references) -\ProvidesFile{apa.cbx}[2012/07/01\space 5.0\space APA biblatex citation style] +\ProvidesFile{apa.cbx}[2012/07/01\space 5.3\space APA biblatex citation style] \RequireBiber[3] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -297,8 +297,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% (APA 6.22) Fall back to "n.d." for citations without dates +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 6.22) Fall back to "nodate" bibstring for citations without dates % Strings defined in apa.bbx % (APA 6.16) "in press" for PUBSTATE "inpress" @@ -308,10 +308,14 @@ {\ifciteseen {} {\printnames{shortauthor}\setunit{\nameyeardelim}}}% - \printtext[bibhyperref]{\biblcstring{nodate}}} + \printtext[bibhyperref]{\bibstring{nodate}% + \iffieldundef{extrayear} + {\setunit{\relax}} + {\setunit{\apashortdash}}% + \printfield{extrayear}}} % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 6.21) No parens round year for cites when the cite is in diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx index a29a1c2c545..4940eeb95b6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx @@ -25,7 +25,7 @@ %% biblatex-apa-test-citations.bib (Style examples - citations) %% biblatex-apa-test-references.bib (Style examples - references) -\ProvidesFile{apa.dbx}[2012/07/01\space v5.0\space APA biblatex style data model] +\ProvidesFile{apa.dbx}[2012/07/01\space v5.3\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 new file mode 100644 index 00000000000..a7159d9d6c7 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx @@ -0,0 +1,133 @@ +\ProvidesFile{austrian-apa.lbx}[2012/07/01\space v5.3\space APA biblatex localisation] +\InheritBibliographyExtras{austrian} + +% (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{nodate} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {austrian}, + january = {{J\"anner}{J\"anner}}, + february = {{Februar}{Februar}}, + march = {{M\"arz}{M\"arz}}, + april = {{April}{April}}, + may = {{Mai}{Mai}}, + june = {{Juni}{Juni}}, + july = {{Juli}{Juli}}, + august = {{August}{August}}, + september = {{September}{September}}, + october = {{Oktober}{Oktober}}, + november = {{November}{November}}, + december = {{Dezember}{Dezember}}, + revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddot\space Aufl\adddot}}, + producer = {{Produzent}{Produzent}}, + execproducer = {{Produzent}{Produzent}}, + director = {{Regisseur}{Regisseur}}, + writer = {{Schriftsteller}{Schriftsteller}}, + 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}}, + nodate = {{ohne\space Datum}{{}o\adddot D\adddot}}, + 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\adddot\space Hrsg\adddot}}, + typevolumes = {{Band\space Herausgeber}{Bd\adddot\space 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}}, +} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (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 +\DefineBibliographyExtras{austrian}{% + \protected\def\mkbibdateapalong#1#2#3{% + \iffieldundef{#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}% + {}% + {\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}% + \thefield{#1}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput 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 78ee414a269..426b9bf0a4c 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}[2012/07/01\space v5.0\space APA biblatex localisation] +\ProvidesFile{brazilian-apa.lbx}[2012/07/01\space v5.3\space APA biblatex localisation] \InheritBibliographyExtras{brazilian} % (APA 6.22) The example abbreviations 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 da4080ef7e3..bb8883f5dd3 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}[2012/07/01\space v5.0\space APA biblatex localisation] +\ProvidesFile{british-apa.lbx}[2012/07/01\space v5.3\space APA biblatex localisation] \InheritBibliographyExtras{british} % (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 d61f489088e..851d5f8121e 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}[2012/07/01\space v5.0\space APA biblatex localisation] +\ProvidesFile{dutch-apa.lbx}[2012/07/01\space v5.3\space APA biblatex localisation] \InheritBibliographyExtras{dutch} % (APA 6.22) The example abbreviations 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 4283c0d10b0..da77683c126 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}[2012/07/01\space v5.0\space APA biblatex localisation] +\ProvidesFile{french-apa.lbx}[2012/07/01\space v5.3\space APA biblatex localisation] \InheritBibliographyExtras{french} % (APA 6.22) The example abbreviations 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 6ccca606d32..945ffd4ddd2 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}[2012/07/01\space v5.0\space APA biblatex localisation] +\ProvidesFile{german-apa.lbx}[2012/07/01\space v5.3\space APA biblatex localisation] \InheritBibliographyExtras{german} % (APA 6.22) The example abbreviations @@ -48,7 +48,7 @@ page = {{Seite}{{}S\adddot}}, pages = {{Seiten}{{}S\adddot}}, on = {{am}{am}}, - retrieved = {{Zugriff\space am}{Zugriff\space am}}, + retrieved = {{Zugriff}{Zugriff}}, available = {{Erh\"altlich}{Erh\"altlich}}, with = {{mit}{mit}}, from = {{unter}{unter}}, 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 46ff26e2071..5bd94af5f98 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}[2012/07/01\space v5.0\space APA biblatex localisation] +\ProvidesFile{greek-apa.lbx}[2012/07/01\space v5.3\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 c000e3d47f4..6bff289d193 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}[2012/07/01\space v5.0\space APA biblatex localisation] +\ProvidesFile{italian-apa.lbx}[2012/07/01\space v5.3\space APA biblatex localisation] \InheritBibliographyExtras{italian} % (APA 6.22) The example abbreviations diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx new file mode 100644 index 00000000000..6d64eeeeccc --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx @@ -0,0 +1,134 @@ +\ProvidesFile{naustrian-apa.lbx}[2012/07/01\space v5.3\space APA biblatex localisation] +\InheritBibliographyExtras{naustrian} + +% (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{nodate} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {naustrian}, + january = {{J\"anner}{J\"anner}}, + february = {{Februar}{Februar}}, + march = {{M\"arz}{M\"arz}}, + april = {{April}{April}}, + may = {{Mai}{Mai}}, + june = {{Juni}{Juni}}, + july = {{Juli}{Juli}}, + august = {{August}{August}}, + september = {{September}{September}}, + october = {{Oktober}{Oktober}}, + november = {{November}{November}}, + december = {{Dezember}{Dezember}}, + revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddot\space Aufl\adddot}}, + producer = {{Produzent}{Produzent}}, + execproducer = {{Produzent}{Produzent}}, + director = {{Regisseur}{Regisseur}}, + 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}}, + from = {{unter}{unter}}, + archivedat = {{archiviert\space unter}{archiviert\space unter}}, + nodate = {{ohne\space Datum}{{}o\adddot D\adddot}}, + 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\adddot\space Hrsg\adddot}}, + typevolumes = {{Band\space Herausgeber}{Bd\adddot\space 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}}, +} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (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 +\DefineBibliographyExtras{naustrian}{% + \protected\def\mkbibdateapalong#1#2#3{% + \iffieldundef{#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}% + {}% + {\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}% + \thefield{#1}}}} + + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput 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 594fe2e509a..a7115db32f4 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}[2012/07/01\space v5.0\space APA biblatex localisation] +\ProvidesFile{ngerman-apa.lbx}[2012/07/01\space v5.3\space APA biblatex localisation] \InheritBibliographyExtras{ngerman} % (APA 6.22) The example abbreviations @@ -49,7 +49,7 @@ page = {{Seite}{{}S\adddot}}, pages = {{Seiten}{{}S\adddot}}, on = {{am}{am}}, - retrieved = {{Zugriff\space am}{Zugriff\space am}}, + retrieved = {{Zugriff}{Zugriff}}, available = {{Erh\"altlich}{Erh\"altlich}}, from = {{unter}{unter}}, archivedat = {{archiviert\space unter}{archiviert\space unter}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx new file mode 100644 index 00000000000..8a7f43e6410 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx @@ -0,0 +1,139 @@ +\ProvidesFile{norsk-apa.lbx}[2012/07/01\space v5.3\space APA biblatex localisation] +\InheritBibliographyExtras{norsk} + +% (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{nodate} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {norsk}, + revisededition = {{revidert\space utgave}{rev\adddotspace utg\adddot}}, + page = {{side}{{}s\adddot}}, + pages = {{sider}{{}s\adddot}}, + on = {{p{\aa}}{p{\aa}}}, + retrieved = {{hentet}{hentet}}, + available = {{tilgjengelig}{tilgjengelig}}, + from = {{fra}{fra}}, + archivedat = {{arkivert\space ved}{arkivert\space ved}}, + nodate = {{udatert}{udatert}}, + reviewof = {{anmeldelse\space av}{anmeldelse\space av}}, + producer = {{produsent}{produsent}}, + execproducer = {{ut{\o}vende produsent}{ut{\o}vende produsent}}, + director = {{regiss{\o}r}{regiss{\o}r}}, + writer = {{manus}{manus}}, + with = {{med}{med}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + january = {{januar}{januar}}, + february = {{februar}{februar}}, + march = {{mars}{mars}}, + april = {{april}{april}}, + may = {{mai}{mai}}, + june = {{juni}{juni}}, + july = {{juli}{juli}}, + august = {{august}{august}}, + september = {{september}{september}}, + october = {{oktober}{oktober}}, + november = {{november}{november}}, + december = {{desember}{desember}}, + mathesis = {{Masteroppgave}{Masteroppgave}}, + phdthesis = {{Doktoravhandling}{Doktoravhandling}}, + origyear = {{opprinnelig\space publisert}{opprinnelig\space publisert}}, + typechair = {{ordstyrer}{ordstyrer}}, + typechairs = {{ordstyrere}{ordstyrere}}, + typevolume = {{bindredakt{\o}r}{bindred\adddot}}, + typevolumes = {{bindredakt{\o}rer}{bindred\adddot}}, + typeseries = {{serieredakt{\o}r}{seriered\adddot}}, + 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}}, +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (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 + +\DefineBibliographyExtras{norsk}{% + \protected\def\mkbibdateapalong#1#2#3{% + \iffieldundef{#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}% + {}% + {\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}% + \thefield{#1}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx new file mode 100644 index 00000000000..205e35d66bf --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx @@ -0,0 +1,139 @@ +\ProvidesFile{norwegian-apa.lbx}[2012/07/01\space v5.3\space APA biblatex localisation] +\InheritBibliographyExtras{norwegian} + +% (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{nodate} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {norwegian}, + revisededition = {{revidert\space utgave}{rev\adddotspace utg\adddot}}, + page = {{side}{{}s\adddot}}, + pages = {{sider}{{}s\adddot}}, + on = {{p{\aa}}{p{\aa}}}, + retrieved = {{hentet}{hentet}}, + available = {{tilgjengelig}{tilgjengelig}}, + from = {{fra}{fra}}, + archivedat = {{arkivert\space ved}{arkivert\space ved}}, + nodate = {{udatert}{udatert}}, + reviewof = {{anmeldelse\space av}{anmeldelse\space av}}, + producer = {{produsent}{produsent}}, + execproducer = {{ut{\o}vende produsent}{ut{\o}vende produsent}}, + director = {{regiss{\o}r}{regiss{\o}r}}, + writer = {{manus}{manus}}, + with = {{med}{med}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + january = {{januar}{januar}}, + february = {{februar}{februar}}, + march = {{mars}{mars}}, + april = {{april}{april}}, + may = {{mai}{mai}}, + june = {{juni}{juni}}, + july = {{juli}{juli}}, + august = {{august}{august}}, + september = {{september}{september}}, + october = {{oktober}{oktober}}, + november = {{november}{november}}, + december = {{desember}{desember}}, + mathesis = {{Masteroppgave}{Masteroppgave}}, + phdthesis = {{Doktoravhandling}{Doktoravhandling}}, + origyear = {{opprinnelig\space publisert}{opprinnelig\space publisert}}, + typechair = {{ordstyrer}{ordstyrer}}, + typechairs = {{ordstyrere}{ordstyrere}}, + typevolume = {{bindredakt{\o}r}{bindred\adddot}}, + typevolumes = {{bindredakt{\o}rer}{bindred\adddot}}, + typeseries = {{serieredakt{\o}r}{seriered\adddot}}, + 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}}, +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (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 + +\DefineBibliographyExtras{norwegian}{% + \protected\def\mkbibdateapalong#1#2#3{% + \iffieldundef{#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}% + {}% + {\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}% + \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 new file mode 100644 index 00000000000..7f9ec87e228 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx @@ -0,0 +1,139 @@ +\ProvidesFile{nynorsk-apa.lbx}[2012/07/01\space v5.3\space APA biblatex localisation] +\InheritBibliographyExtras{nynorsk} + +% (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{nodate} +\NewBibliographyString{archivedat} +\NewBibliographyString{origyear} +\NewBibliographyString{reviewof} +\NewBibliographyString{producer} +\NewBibliographyString{execproducer} +\NewBibliographyString{director} +\NewBibliographyString{writer} +\NewBibliographyString{with} + +\DeclareBibliographyStrings{% + inherit = {nynorsk}, + revisededition = {{revidert\space utg{\aa}ve}{rev\adddotspace utg\adddot}}, + page = {{side}{{}s\adddot}}, + pages = {{sider}{{}s\adddot}}, + on = {{p{\aa}}{p{\aa}}}, + retrieved = {{henta}{henta}}, + available = {{tilgjengeleg}{tilgjengeleg}}, + from = {{fr{\aa}}{fr{\aa}}}, + archivedat = {{arkivert\space ved}{arkivert\space ved}}, + nodate = {{udatert}{udatert}}, + reviewof = {{melding\space av}{melding\space av}}, + producer = {{produsent}{produsent}}, + execproducer = {{ut{\o}vande produsent}{ut{\o}vande produsent}}, + director = {{regiss{\o}r}{regiss{\o}r}}, + writer = {{manus}{manus}}, + with = {{med}{med}}, + paragraph = {{\P}{\P}}, + paragraphs = {{\P\P}{\P\P}}, + january = {{januar}{januar}}, + february = {{februar}{februar}}, + march = {{mars}{mars}}, + april = {{april}{april}}, + may = {{mai}{mai}}, + june = {{juni}{juni}}, + july = {{juli}{juli}}, + august = {{august}{august}}, + september = {{september}{september}}, + october = {{oktober}{oktober}}, + november = {{november}{november}}, + december = {{desember}{desember}}, + mathesis = {{Masteroppg{\aa}ve}{Masteroppg{\aa}ve}}, + phdthesis = {{Doktoravhandling}{Doktoravhandling}}, + origyear = {{opphavleg\space publisert}{opphavleg\space publisert}}, + typechair = {{ordstyrar}{ordstyrar}}, + typechairs = {{ordstyrarar}{ordstyrarar}}, + typevolume = {{bindredakt{\o}r}{bindred\adddot}}, + typevolumes = {{bindredakt{\o}rar}{bindred\adddot}}, + typeseries = {{serieredakt{\o}r}{seriered\adddot}}, + 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}}, +} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (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 + +\DefineBibliographyExtras{nynorsk}{% + \protected\def\mkbibdateapalong#1#2#3{% + \iffieldundef{#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}% + {}% + {\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}% + \thefield{#1}}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\endinput 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 a85ed039e37..94737cd74c9 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}[2012/07/01\space v5.0\space APA biblatex localisation] +\ProvidesFile{spanish-apa.lbx}[2012/07/01\space v5.3\space APA biblatex localisation] \InheritBibliographyExtras{spanish} \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced -- cgit v1.2.3