diff options
| author | Karl Berry <karl@freefriends.org> | 2019-11-27 22:04:35 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2019-11-27 22:04:35 +0000 |
| commit | a928eb9724aca82d58f67dda4cdaf5f3628dbcb1 (patch) | |
| tree | 22555f50f049cb13466c5a9f4a89350e5b40c0c4 /Master/texmf-dist/tex/latex/biblatex-apa | |
| parent | fef92f3f1563f60dd34f405b87b18616879c277a (diff) | |
biblatex-apa (27nov19)
git-svn-id: svn://tug.org/texlive/trunk@52945 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-apa')
27 files changed, 856 insertions, 400 deletions
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 cb2a128c6df..8e9be027583 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}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{american-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{american} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,92 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{execorder} +\NewBibliographyString{senate} +\NewBibliographyString{resolution} +\NewBibliographyString{houseofrepresentatives} +\NewBibliographyString{report} +\NewBibliographyString{us} +\NewBibliographyString{southcarolina} +\NewBibliographyString{constitution} +\NewBibliographyString{section} +\NewBibliographyString{amendment} +\NewBibliographyString{proposed} +\NewBibliographyString{repealed} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} +\NewBibliographyString{alabama} +\NewBibliographyString{alaska} +\NewBibliographyString{arizona} +\NewBibliographyString{arkansas} +\NewBibliographyString{california} +\NewBibliographyString{colorado} +\NewBibliographyString{connecticut} +\NewBibliographyString{delaware} +\NewBibliographyString{florida} +\NewBibliographyString{georgia} +\NewBibliographyString{hawaii} +\NewBibliographyString{idaho} +\NewBibliographyString{illinois} +\NewBibliographyString{indiana} +\NewBibliographyString{iowa} +\NewBibliographyString{kansas} +\NewBibliographyString{kentucky} +\NewBibliographyString{louisiana} +\NewBibliographyString{maine} +\NewBibliographyString{maryland} +\NewBibliographyString{massachusetts} +\NewBibliographyString{michigan} +\NewBibliographyString{minnesota} +\NewBibliographyString{mississippi} +\NewBibliographyString{missouri} +\NewBibliographyString{montana} +\NewBibliographyString{nebraska} +\NewBibliographyString{nevada} +\NewBibliographyString{newhampshire} +\NewBibliographyString{newjersey} +\NewBibliographyString{newmexico} +\NewBibliographyString{newyork} +\NewBibliographyString{northcarolina} +\NewBibliographyString{northdakota} +\NewBibliographyString{ohio} +\NewBibliographyString{oklahoma} +\NewBibliographyString{oregon} +\NewBibliographyString{pennsylvania} +\NewBibliographyString{rhodeisland} +\NewBibliographyString{southcarolina} +\NewBibliographyString{southdakota} +\NewBibliographyString{tennessee} +\NewBibliographyString{texas} +\NewBibliographyString{utah} +\NewBibliographyString{vermont} +\NewBibliographyString{virginia} +\NewBibliographyString{washington} +\NewBibliographyString{westvirginia} +\NewBibliographyString{wisconsin} +\NewBibliographyString{wyoming} \DeclareBibliographyStrings{% inherit = {american}, - article = {{article}{article}}, + ofthe = {{of\space the}{of\space the}}, + tothe = {{to\space the}{to\space the}}, + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + proposed = {{proposed}{proposed}}, + repealed = {{was repealed in}{repealed}}, + execorder = {{Executive\space Order}{Exec\adddot\space Order}}, + senate = {{Senate}{S\adddot}}, + resolution = {{Resolution}{Res\adddot}}, + houseofrepresentatives = {{House\space of\space Representatives}{H\adddot R\adddot}}, + report = {{Report}{Rep\adddot}}, + us = {{U\adddot S\adddot}{U\adddot S\adddot}}, + southcarolina = {{South\space Carolina}{S\adddot C\adddot}}, + constitution = {{Constitution}{Const\adddot}}, + section = {{Section}{§}}, + amendment = {{amendment}{amend\adddot}}, + article = {{article}{art\adddot}}, painting = {{painting}{painting}}, present = {{present}{present}}, song = {{song}{song}}, @@ -99,10 +178,7 @@ with = {{with}{with}}, reprintas = {{reprinted as}{reprinted as}}, reprintfrom = {{reprinted from}{reprinted from}}, - commentonarticle = {{comment\space on\space the\space article}{comment\space on\space the\space article}}, - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}}, - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}}, - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}}, + commenton = {{comment\space on}{comment\space on}}, part = {{part}{pt\adddot}}, paragraph = {{paragraph}{para\adddot}}, paragraphs = {{paragraphs}{paras\adddot}}, @@ -136,7 +212,57 @@ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}}, beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}}, commonera = {{C\adddot E\adddot}{C\adddot E\adddot}}, - beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}} + beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}, + alabama = {{Alabama}{{A\adddot L\adddot}}}, + alaska = {{Alaska}{{A\adddot K\adddot}}}, + arizona = {{Arizona}{{A\adddot Z\adddot}}}, + arkansas = {{Arkansas}{{A\adddot R\adddot}}}, + california = {{California}{{C\adddot A\adddot}}}, + colorado = {{Colorado}{{C\adddot O\adddot}}}, + connecticut = {{Connecticut}{{C\adddot T\adddot}}}, + delaware = {{Delaware}{{D\adddot E\adddot}}}, + florida = {{Florida}{{F\adddot L\adddot}}}, + georgia = {{Georgia}{{G\adddot A\adddot}}}, + hawaii = {{Hawaii}{{H\adddot I\adddot}}}, + idaho = {{Idaho}{{I\adddot D\adddot}}}, + illinois = {{Illinois}{{I\adddot L\adddot}}}, + indiana = {{Indiana}{{I\adddot N\adddot}}}, + iowa = {{Iowa}{{I\adddot A\adddot}}}, + kansas = {{Kansas}{{K\adddot S\adddot}}}, + kentucky = {{Kentucky}{{K\adddot Y\adddot}}}, + louisiana = {{Louisiana}{{L\adddot A\adddot}}}, + maine = {{Maine}{{M\adddot E\adddot}}}, + maryland = {{Maryland}{{M\adddot D\adddot}}}, + massachusetts = {{Massachusetts}{{M\adddot A\adddot}}}, + michigan = {{Michigan}{{M\adddot I\adddot}}}, + minnesota = {{Minnesota}{{M\adddot N\adddot}}}, + mississippi = {{Mississippi}{{M\adddot S\adddot}}}, + missouri = {{Missouri}{{M\adddot O\adddot}}}, + montana = {{Montana}{{M\adddot T\adddot}}}, + nebraska = {{Nebraska}{{N\adddot E\adddot}}}, + nevada = {{Nevada}{{N\adddot V\adddot}}}, + newhampshire = {{New Hampshire}{{N\adddot H\adddot}}}, + newjersey = {{New Jersey}{{N\adddot J\adddot}}}, + newmexico = {{New Mexico}{{N\adddot M\adddot}}}, + newyork = {{New York}{{N\adddot Y\adddot}}}, + northcarolina = {{North Carolina}{{N\adddot C\adddot}}}, + northdakota = {{North Dakota}{{N\adddot D\adddot}}}, + ohio = {{Ohio}{{O\adddot H\adddot}}}, + oklahoma = {{Oklahoma}{{O\adddot K\adddot}}}, + oregon = {{Oregon}{{O\adddot R\adddot}}}, + pennsylvania = {{Pennsylvania}{{P\adddot A\adddot}}}, + rhodeisland = {{Rhode Island}{{R\adddot I\adddot}}}, + southcarolina = {{South Carolina}{{S\adddot C\adddot}}}, + southdakota = {{South Dakota}{{S\adddot D\adddot}}}, + tennessee = {{Tennessee}{{T\adddot N\adddot}}}, + texas = {{Texas}{{T\adddot X\adddot}}}, + utah = {{Utah}{{U\adddot T\adddot}}}, + vermont = {{Vermont}{{V\adddot T\adddot}}}, + virginia = {{Virginia}{{V\adddot A\adddot}}}, + washington = {{Washington}{{W\adddot A\adddot}}}, + westvirginia = {{West Virginia}{{W\adddot V\adddot}}}, + wisconsin = {{Wisconsin}{{W\adddot I\adddot}}}, + wyoming = {{Wyoming}{{W\adddot Y\adddot}}} } % diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx index 41480df9df5..b514708cea6 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}[2019/11/23\space v9.0\space APA biblatex references style] +\ProvidesFile{apa.bbx}[2019/11/27\space v9.1\space APA biblatex references style] \RequireBiber[3] \RequireBibliographyStyle{standard} \urlstyle{rm} % APA examples all have URLs in same font as text @@ -98,7 +98,16 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Multiple related entries, even though there are no +% examples in APA 7th, should probably be this + +\renewcommand*{\relateddelim}{\addcomma\addspace} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Force roman numerals into arabic using % etoolbox macros @@ -123,7 +132,10 @@ \blx@metadateinfo{#1}% \iffieldundef{#1year}{} {\datecircaprint - \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ... + \ifboolexpr{ test {\ifstrequal{#1}{url}} + or test {\ifentrytype{legal}} + or ( test {\ifentrytype{legadminmaterial}} and + test {\ifkeyword{proposed}} ) } {\printtext{% \mkbibdateapalongmdy{#1year}{#1month}{#1day}% \iffieldundef{#1endyear}% @@ -259,10 +271,13 @@ \literal{nodate} } +% CONSTITUTION entrytypes have no dates at all so no fall back to nodate literal either +\DeclareLabeldate[constitution]{\field{date}} + \ExecuteBibliographyOptions{% abbreviate=true,% autocite=inline,% - backref=true,% + backref=false,% citetracker=true,% date=apalong,% dateabbrev=false,% @@ -317,19 +332,6 @@ } } -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% It is not APA standard to have backrefs in the bib -% Some users might like it though. - -\newbool{apa:backref} -\DeclareBibliographyOption{apabackref}{% - \ifstrequal{#1}{true} - {\global\booltrue{apa:backref}} - {\global\boolfalse{apa:backref}}} - -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Flag to say whether the "in" has % been placed already in IN* @@ -352,27 +354,23 @@ \ifbibstring{#1}{\bibcpstring{#1}}{#1}}} % TITLE -\DeclareFieldFormat{title}{\mkbibemph{#1}\isdot} -\DeclareFieldFormat[article]{title}{#1\isdot} -\DeclareFieldFormat[inbook]{title}{#1\isdot} -\DeclareFieldFormat[incollection]{title}{#1\isdot} -\DeclareFieldFormat[inproceedings]{title}{\mkbibemph{#1}\isdot} -\DeclareFieldFormat[proceedings]{title}{\mkbibemph{#1}\isdot} -\DeclareFieldFormat[periodical]{title}{#1\isdot} -\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}} -\DeclareFieldFormat[patent]{title}{\mkbibemph{#1}} -\DeclareFieldFormat[unpublished]{title}{\mkbibemph{#1}} -\DeclareFieldFormat[image]{title}{\mkbibemph{#1}} -\DeclareFieldFormat[misc]{title}{#1\isdot} -\DeclareFieldFormat[audio]{title}{\iffieldundef{maintitle}{\mkbibemph{#1}\isdot}{#1}} -\DeclareFieldFormat[video]{title}{\iffieldundef{maintitle}{\mkbibemph{#1}\isdot}{#1}} +\DeclareFieldFormat*{title}{\mkbibemph{#1}\isdot} +\DeclareFieldFormat[article,inbook,incollection,periodical,misc,legislation,legadminmaterial,jurisdiction,inproceedings,legal]{title}{#1\isdot} +\DeclareFieldFormat[audio,video]{title}{\iffieldundef{maintitle}{\mkbibemph{#1}\isdot}{#1}} + +% SUBTITLE +\DeclareFieldFormat[legmaterial]{subtitle}{\mkbibemph{#1}} % TITLEADDON \DeclareFieldFormat{titleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}} +\DeclareFieldFormat[legislation]{titleaddon}{#1} % MAINTITLEADDON \DeclareFieldFormat{maintitleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}} +% NOTE +\DeclareFieldFormat[legmaterial,legadminmaterial]{note}{\mkbibparens{#1}} + % BOOKTITLEADDON \DeclareFieldFormat{booktitleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}} @@ -382,11 +380,8 @@ % ORIGTITLE \DeclareFieldFormat{origtitle}{\mkbibemph{\bbx@colon@search\MakeSentenceCase*{#1}}\isdot} -\DeclareFieldFormat[article]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} -\DeclareFieldFormat[inbook]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} -\DeclareFieldFormat[incollection]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} -\DeclareFieldFormat[inproceedings]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} -\DeclareFieldFormat[proceedings]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} + +\DeclareFieldFormat[article,inbook,incollection,inproceedings,proceedings]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot} % VOLUME \DeclareFieldFormat{volume}{\iffieldundef{maintitle} @@ -409,25 +404,35 @@ {\apanum{#1}}} {\mkbibemph{\apanum{#1}}}} \DeclareFieldFormat[report]{number}{\apanum{#1}} -\DeclareFieldFormat[article]{number}{\mkbibparens{\apanum{#1}}} +\DeclareFieldFormat[article,periodical]{number}{\mkbibparens{\apanum{#1}}} \DeclareFieldFormat[reprint]{number}{\mkbibbrackets{\apanum{#1}}} -\DeclareFieldFormat[periodical]{number}{\mkbibparens{\apanum{#1}}} +\DeclareFieldFormat{legmaterialnum}{% + \ifthenelse{% + \iffieldequalstr{type}{report}\OR% + \iffieldequalstr{type}{execorder}}{\bibcpstring{number}~\apanum{#1}}{\apanum{#1}}} + % PAGES -\DeclareFieldFormat[inbook]{pages}{\mkpageprefix[bookpagination]{#1}} -\DeclareFieldFormat[incollection]{pages}{\mkpageprefix[bookpagination]{#1}} +\DeclareFieldFormat[inbook,incollection]{pages}{\mkpageprefix[bookpagination]{#1}} \DeclareFieldFormat[periodical]{pages}{#1} +% PART +\DeclareFieldFormat*{part}{#1} + % LOCATION -\DeclareListFormat[misc]{location}{\mkbibemph{#1}} -\DeclareListFormat[periodical]{location}{\mkbibemph{#1}} +\DeclareListFormat[misc,periodical]{location}{\mkbibemph{#1}} +\DeclareListFormat{publisher}{% + \usebibmacro{publisher:delim}{#1}% + #1\isdot} +\DeclareListFormat{location}{% + \usebibmacro{location:delim}{#1}% + #1\isdot} % NAMEADDON \DeclareFieldFormat[misc]{nameaddon}{\mkbibparens{#1}} % VERSION -\DeclareFieldFormat[dataset]{version}{\bibcpstring{version}~#1} -\DeclareFieldFormat[software]{version}{\bibcpstring{version}~#1} +\DeclareFieldFormat[dataset,software]{version}{\bibcpstring{version}~#1} % URL \DeclareFieldFormat{url}{\url{#1}} @@ -529,6 +534,17 @@ \newunit\newblock% \usebibmacro{labelyear+extradate}} +\newbibmacro*{author/editor:related}{% + \ifthenelse{\ifnameundef{author}\AND\ifnameundef{groupauthor}} + {\ifnameundef{editor} + {\usebibmacro{title}% + % need to clear all title fields so we don't get them again later + \clearfield{title}% + \clearfield{subtitle}% + \clearfield{titleaddon}} + {\usebibmacro{editorinauthpos:related}}} + {\usebibmacro{author:related}}} + \newbibmacro*{editorinauthpos}{% \printnames[apaauthor][-\value{listtotal}]{editor}% \setunit{\addspace}% @@ -538,6 +554,15 @@ % need to clear editor so we don't get an "In" clause later \clearname{editor}}} +\newbibmacro*{editorinauthpos:related}{% + \printnames[apanames][-\value{listtotal}]{editor}% + \setunit{\addspace}% + \ifnameundef{editor} + {} + {\printtext[parens]{\usebibmacro{apaeditorstrg}{editor}}% + % need to clear editor so we don't get an "In" clause later + \clearname{editor}}} + \renewbibmacro*{author}{% \ifnameundef{author} {\printnames[apaauthor][-\value{listtotal}]{groupauthor}} @@ -550,6 +575,12 @@ \printnames[apaauthor][-\value{listtotal}]{with}} \setunit*{\addspace}}} +\newbibmacro*{author:related}{% + \ifnameundef{author} + {\printnames[apanames][-\value{listtotal}]{groupauthor}} + {\printnames[apanames][-\value{listtotal}]{author}}% + \setunit*{\addspace}} + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -650,17 +681,6 @@ \setunit{\addspace}% \ifentrytype{inbook}{}{\usebibmacro{addinfo1}}% additional info in parens \setunit{\addspace}% - \iffieldundef{related} - {} - {\ifthenelse{\iffieldequalstr{relatedtype}{reviewofbook}\OR% - \iffieldequalstr{relatedtype}{reviewoffilm}\OR% - \iffieldequalstr{relatedtype}{reviewoftv}\OR% - \iffieldequalstr{relatedtype}{commentonarticle}} - {\usebibmacro{related:init}% - \usebibmacro{related}% - \togglefalse{bbx:related}}% disable default related expansion later on - {}}% - \setunit{\addspace}% \printfield{titleaddon}% \setunit{\addspace}% \usebibmacro{addinfo2}}}% @@ -725,7 +745,7 @@ \iffieldundef{eprinttype} {} {\printtext{% - \iffieldbibstring{eprinttype}{\bibcpstring{\strfield{eprinttype}}}{\strfield{eprinttype}}% + \iffieldbibstring{eprinttype}{\bibcplstring{\strfield{eprinttype}}}{\strfield{eprinttype}}% \setunit{\addspace}}}% \printfield{eprint}} @@ -1100,10 +1120,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 10.2.24) Multiple publishers, semi-colon sep -\DeclareListFormat{publisher}{% - \usebibmacro{publisher:delim}{#1}% - #1\isdot} - \newbibmacro*{publisher:delim}[1]{% \ifnumgreater{\value{listcount}}{\value{liststart}} {\printdelim[publisher]{multilistdelim}} @@ -1132,10 +1148,10 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 10.1 Example 18) Comment on article -\newcommand*{\begrelateddelimcommentonarticle}{\addspace} -\DeclareFieldFormat{related:commentonarticle}{\def\bibstring{\blx@imc@bibcpstring}\mkbibbrackets{#1}} +\newcommand*{\begrelateddelimcommenton}{\addspace} +\DeclareFieldFormat{related:commenton}{\def\bibstring{\blx@imc@bibcpstring}\mkbibbrackets{#1}} -\renewbibmacro*{related:commentonarticle}[1]{% +\newbibmacro*{related:commenton}[1]{% \entrydata*{#1}{% \printtext{\mkbibquote{\printfield[apacase]{title}}}}} @@ -1146,24 +1162,15 @@ % (APA 10.7) Reviews - role strings need to be the % short versions in reviews -\newcommand*{\begrelateddelimreviewofbook}{\addspace} -\DeclareFieldFormat{related:reviewofbook}{\def\bibstring{\blx@imc@bibcpsstring}\mkbibbrackets{#1}} -\newbibmacro*{related:reviewofbook}[1]{\usebibmacro{related:reviewofx}{#1}} - -\newcommand*{\begrelateddelimreviewoffilm}{\addspace} -\DeclareFieldFormat{related:reviewoffilm}{\def\bibstring{\blx@imc@bibcpsstring}\mkbibbrackets{#1}} -\newbibmacro*{related:reviewoffilm}[1]{\usebibmacro{related:reviewofx}{#1}} - -\newcommand*{\begrelateddelimreviewoftv}{\addspace} -\DeclareFieldFormat{related:reviewoftv}{\def\bibstring{\blx@imc@bibcpsstring}\mkbibbrackets{#1}} -\newbibmacro*{related:reviewoftv}[1]{\usebibmacro{related:reviewofx}{#1}} - \DeclareFieldFormat{reviewtitle}{% \iffieldequalstr{entrysubtype}{tvepisode} {\mkbibquote{\bbx@colon@search\MakeSentenceCase*{#1}}} {\bbx@colon@search\MakeSentenceCase*{#1}}} -\newbibmacro*{related:reviewofx}[1]{% +\newcommand*{\begrelateddelimreviewof}{\addspace} +\DeclareFieldFormat{related:reviewof}{\def\bibstring{\blx@imc@bibcpsstring}\mkbibbrackets{#1}} + +\newbibmacro*{related:reviewof}[1]{% \entrydata*{#1}{% \printtext{\mkbibemph{% \printfield[reviewtitle]{title}% @@ -1174,7 +1181,7 @@ \setunit{\addcomma\addspace}% \biblstring{byauthor}% \setunit{\addspace}% - \printnames[apanames][-\value{listtotal}]{author}}}} + \usebibmacro{author/editor:related}}}} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1219,8 +1226,20 @@ {}} \newcommand*{\begrelateddelimreprintfrom}{\addperiod\addspace} + +% Some APA related entries are just after title, some are at the end of +% the entry. This is for those after the title +\newbibmacro*{apa:related}{% + \iffieldundef{related} + {} + {\ifthenelse{\iffieldequalstr{relatedtype}{reviewof}\OR% + \iffieldequalstr{relatedtype}{commenton}} + {\usebibmacro{related:init}% + \usebibmacro{related}% + \togglefalse{bbx:related}}% disable default related expansion later on + {}}} + \DeclareFieldFormat{related:reprintfrom}{\let\bibstring\bibcpstring\mkbibparens{#1}} -\DeclareFieldFormat{related:reviewof}{\mkbibbrackets{#1}} \renewbibmacro*{related:reprintfrom}[1]{% \entrydata*{#1}{% @@ -1294,7 +1313,76 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 11.4) Court cases + +\newtoggle{apa:courtdate} + +\DeclareListFormat{citation}{% + \global\toggletrue{apa:courtdate}% + \hasitemannotation[\currentlist][citeorg]% + {#1\addspace\mkbibparens{\getitemannotation[\currentlist][citeorg]% + \hasitemannotation[\currentlist][citedate] + {\addspace\getitemannotation[\currentlist][citedate]% + \global\togglefalse{apa:courtdate}} % disable normal date printing if it's in the citation info + {}}} + {\ifitemannotation[\currentlist][citeinfo]{appeal} + {\mkbibemph{#1}} + {#1}}% + \ifthenelse{\value{listcount}<\value{liststop}} + {\addcomma\addspace} + {}} + +\DeclareFieldFormat{courtdate}{% + % disable normal date printing if it's in the citation info + \iftoggle{apa:courtdate} + {\iflistundef{organization} + {\printtext{\mkbibparens{#1}}} + {\printtext{\mkbibparens{% + \printlist{organization}\space #1}}}} + {}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 11.5) Statutes + +\newbibmacro*{statdate}{% + \iffieldundef{origyear} + {\printtext[parens]{\printlabeldate}} + {\printtext[parens]{\printorigdate% + \addspace\&\addspace rev\adddot\addspace\printlabeldate}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% (APA 11.6) Legislative Material and Admin Material + +\newbibmacro*{location:delim}[1]{% + \ifnumgreater{\value{listcount}}{\value{liststart}} + {\printdelim[location]{multilistdelim}} + {}} + +\DeclareDelimFormat[location]{multilistdelim}{\addcomma\space} +\DeclareDelimFormat[location]{finallistdelim}{\addcomma\space} + +\newbibmacro*{legmattitle}{% + \iffieldundef{title} + {\bibcpsstring{\thefield{source}}% + \setunit*{\addspace}% + \bibcpsstring{\thefield{type}}% + \setunit*{\addspace}% + \printfield[legmaterialnum]{number}} + {\printfield{title}% + \setunit*{\addcolon\addspace}\newblock + \printfield{subtitle}}} + +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 10.x) General entrytype drivers % Custom driver to make a cleaner example for 9.44 @@ -1309,6 +1397,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \usebibmacro{journal+issuetitle}% \setunit{\bibpagespunct}% @@ -1326,7 +1416,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1336,6 +1426,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \usebibmacro{mainaudio}% \newunit\newblock @@ -1351,7 +1443,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1374,7 +1466,28 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% + \usebibmacro{annotation}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{constitution}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \bibcpsstring{\thefield{source}}% + \setunit{\addspace}\newblock + \bibcpsstring{\thefield{type}}% + \setunit{\addspace}\newblock + \iffieldundef{amendment}{}{\bibsstring{amendment}\setunit{\addspace}\printfield{amendment}}% + \setunit{\addcomma\addspace}\newblock + \iffieldundef{article}{}{\bibsstring{article}\setunit{\addspace}\printfield{article}}% + \setunit{\addcomma\addspace}\newblock + \iffieldundef{section}{}{\bibsstring{section}\setunit{\addspace}\printfield{section}}% + \setunit{\addcomma\addspace}\newblock + \iffieldundef{part}{}{\bibsstring{paragraph}\setunit{\addspace}\printfield{part}}% + \setunit{\addspace}\newblock + \ifkeyword{repealed}{\printtext[parens]{\biblcsstring{repealed}\setunit{\addspace}\printeventdate}}{}% + \usebibmacro{doi+url}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1403,7 +1516,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1424,7 +1537,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1434,6 +1547,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \usebibmacro{editor+trans}% \newblock @@ -1453,7 +1568,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1463,6 +1578,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \usebibmacro{editor+trans}% \setunit*{\addcomma\addspace}\newblock @@ -1482,7 +1599,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1492,6 +1609,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \usebibmacro{editor+trans}% \setunit*{\addcomma\addspace}\newblock @@ -1518,7 +1637,83 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% + \usebibmacro{annotation}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{jurisdiction}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \printfield{title}% + \setunit{\addcomma\addspace}\newblock + \printlist{citation}% + \setunit{\addspace}\newblock + \printtext[courtdate]{\printlabeldate}% + \newunit\newblock + \usebibmacro{doi+url}% + \usebibmacro{pageref}% + \usebibmacro{annotation}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{legal}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \printfield{title}% + \setunit{\addspace}% + \printfield{titleaddon}% + \setunit{\addcomma\addspace}\newblock + \printlabeldate% + \setunit{\addcomma\addspace}\newblock + \usebibmacro{doi+url}% + \usebibmacro{pageref}% + \usebibmacro{annotation}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{legislation}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \printfield{title}% + \setunit{\addspace}% + \printfield{titleaddon}% + \setunit{\addcomma\addspace}\newblock + \printlist{location}% + \setunit{\addspace}\newblock + \usebibmacro{statdate}% + \newunit\newblock + \usebibmacro{doi+url}% + \usebibmacro{pageref}% + \usebibmacro{annotation}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{legadminmaterial}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{legmattitle}% + \setunit{\addcomma\addspace}\newblock + \printlist{citation}% + \setunit{\addspace}\newblock + \printtext[parens]{\ifkeyword{proposed}{\bibstring{proposed}\space}{}\printlabeldate}% + \setunit{\addspace}\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{doi+url}% + \usebibmacro{pageref}% + \usebibmacro{annotation}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{legmaterial}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{legmattitle}% + \setunit{\addcomma\addspace}\newblock + \printlist{location}% + \setunit{\addspace}\newblock + \printtext[parens]{\printlabeldate}% + \setunit{\addspace}\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{doi+url}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1547,7 +1742,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1557,6 +1752,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \usebibmacro{location+publisher}% \newunit\newblock @@ -1568,7 +1765,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1578,6 +1775,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \printlist{organization}% \addperiod\addspace @@ -1590,7 +1789,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1600,6 +1799,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \usebibmacro{location+publisher}% \newunit\newblock @@ -1613,7 +1814,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{finentry}} \DeclareBibliographyDriver{periodical}{% @@ -1641,7 +1842,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1651,6 +1852,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \usebibmacro{eventinfo}% \setunit{\addcomma\addspace}% @@ -1674,7 +1877,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1684,6 +1887,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \printlist{institution}% \newunit\newblock @@ -1699,7 +1904,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1721,7 +1926,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1746,7 +1951,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1756,6 +1961,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \setunit{\addspace}% \printfield{howpublished}% \newunit\newblock @@ -1773,7 +1980,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1783,6 +1990,8 @@ \usebibmacro{author/editor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{title}% + \setunit{\addspace}\newblock + \usebibmacro{apa:related}% \newunit\newblock \usebibmacro{mainvideo}% \newunit\newblock @@ -1796,7 +2005,7 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{apa:pageref}% + \usebibmacro{pageref}% \usebibmacro{annotation}% \usebibmacro{finentry}} @@ -1878,15 +2087,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Wrapper for backrefs - -\newbibmacro{apa:pageref}{% - \ifbool{apa:backref}{\usebibmacro{pageref}}{}} - -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Unchanged from authoryear-comp \DeclareBibliographyOption{dashed}[true]{% diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx index 6989787742a..d1b5965ca87 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}[2019/11/23\space v9.0\space APA biblatex citation style] +\ProvidesFile{apa.cbx}[2019/11/27\space v9.1\space APA biblatex citation style] \RequireBiber[3] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -43,27 +43,33 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 8.17) ampersand separator in parenthetical cites +\newtoggle{apa:inpcite} + \DeclareDelimFormat[parencite]{finalnamedelim} {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space} \DeclareCiteCommand{\parencite}[\mkbibparens] {\usebibmacro{cite:init}% - \usebibmacro{prenote}} + \usebibmacro{prenote}% + \toggletrue{apa:inpcite}} {\usebibmacro{citeindex}% \usebibmacro{cite}% \usebibmacro{cite:post}} {} - {\usebibmacro{postnote}} + {\usebibmacro{postnote}% + \togglefalse{apa:inpcite}} \DeclareCiteCommand*{\parencite}[\mkbibparens] {\usebibmacro{cite:init}% - \usebibmacro{prenote}} + \usebibmacro{prenote}% + \toggletrue{apa:inpcite}} {\usebibmacro{citeindex}% \usebibmacro{citeyear}% - \usebibmacro{cite:post}} + \usebibmacro{cite:post}% + \togglefalse{apa:inpcite}} {} {\usebibmacro{postnote}} @@ -288,18 +294,83 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % (APA 8.14) Fall back to title for citations without authors +% (APA 11) Bizarre and special rules for legal information \DeclareFieldFormat{citetitle}{\mkbibquote{#1}} -\DeclareFieldFormat[online]{citetitle}{\mkbibquote{#1}} -\DeclareFieldFormat[inbook]{citetitle}{\mkbibquote{#1}} -\DeclareFieldFormat[book]{citetitle}{\mkbibemph{#1}} -\DeclareFieldFormat[manual]{citetitle}{\mkbibemph{#1}} -\DeclareFieldFormat[report]{citetitle}{\mkbibemph{#1}} -\DeclareFieldFormat[periodical]{citetitle}{\mkbibemph{#1}} +\DeclareFieldFormat[book,manual,report,preiodical,legmaterial,jurisdiction]{citetitle}{\mkbibemph{#1}} +\DeclareFieldFormat[legislation,legadminmaterial,legal]{citetitle}{#1} \newbibmacro*{cite:noname}{% - \printfield[citetitle]{labeltitle}} - + \iffieldundef{labeltitle} + {\ifthenelse{\ifentrytype{legmaterial}\OR% + \ifentrytype{legadminmaterial}} + {\let\blx@tempa\bibcplstring% \textcite default + \let\blx@tempb\bibcplstring% \textcite default + \iftoggle{apa:inpcite} + {\iffieldequalstr{type}{execorder}{\let\blx@tempb\bibcpsstring}{}% + \iffieldequalstr{type}{resolution}{\let\blx@tempa\bibcpsstring}{}% + \iffieldequalstr{type}{report}{\let\blx@tempa\bibcpsstring\let\blx@tempb\bibcpsstring}{}} + {}% + \iffieldundef{source}{}{\blx@tempa{\thefield{source}}}% + \setunit{\addspace}% + \iffieldundef{type}{}{\blx@tempb{\thefield{type}}}% + \setunit{\addspace}% + \printfield[legmaterialnum]{number}} + {\ifentrytype{constitution}{\usebibmacro{cite:noname:const}}{}}} + {\printfield[citetitle]{labeltitle}}} + +% CONSTITUTION entrytypes are messier +\newbibmacro*{cite:noname:const}{% + \iftoggle{apa:inpcite} + {\bibcpsstring{\thefield{source}}% + \setunit{\addspace}% + \bibcpsstring{\thefield{type}}% + \setunit{\addspace}% + \iffieldundef{amendment}{}{\bibsstring{amendment}% + \setunit{\addspace}% + \printfield{amendment}% + \setunit{\addcomma\addspace}% + \ifkeyword{repealed} + {\biblcsstring{repealed}% + \setunit{\addspace}% + \printeventdate} + {}}% + \setunit{\addspace}% + \iffieldundef{article}{}{\bibsstring{article}\setunit{\addspace}\printfield{article}}% + \setunit{\addcomma\addspace}\newblock + \iffieldundef{section}{}{\bibsstring{section}\setunit{\addspace}\printfield{section}}% + \setunit{\addcomma\addspace}\newblock + \iffieldundef{part}{}{\bibsstring{paragraph}\setunit{\addspace}\printfield{part}}} + {}% + \iftoggle{apa:intcite} + {\iffieldundef{amendment}{}{\bibcplstring{amendment}% + \setunit{\addspace}% + \printfield{amendment}% + \setunit{\addspace}% + \biblcsstring{tothe}}% + \iffieldundef{article}{}{\bibcplstring{article}\setunit{\addspace}\printfield{article}}% + \setunit{\addcomma\addspace}% + \iffieldundef{part}{}{\biblstring{paragraph}% + \setunit{\addspace}% + \printfield{part}% + \setunit{\addcomma\addspace}% + \biblcsstring{ofthe}}% + \setunit{\addcomma\addspace}% + \iffieldundef{section}{}{\bibcplstring{section}% + \setunit{\addspace}% + \printfield{section}% + \setunit{\addcomma\addspace}% + \biblcsstring{ofthe}} + \setunit{\addspace}% + \bibcplstring{\thefield{source}}% + \setunit{\addspace}% + \bibcplstring{\thefield{type}}% + \setunit{\addspace}% + \ifkeyword{repealed} + {\biblclstring{repealed}\setunit{\addspace}\printeventdate} + {}} + {}} + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -325,7 +396,8 @@ \DeclareDelimFormat[nptextcite]{finalnamedelim} {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space} -\DeclareMultiCiteCommand{\nptextcites}{\nptextcite}{\multicitedelim} +\DeclareMultiCiteCommand{\nptextcites}{\nptextcite}{\setunit{\multicitedelim}} + \DeclareCiteCommand{\nptextcite} {\usebibmacro{cite:init}% \usebibmacro{prenote}} @@ -462,14 +534,27 @@ {} {\usebibmacro{postnote}} -\DeclareMultiCiteCommand{\textcites}{\textcite}{\compcitedelim} +\DeclareMultiCiteCommand{\textcites}{\textcite}{\setunit{\compcitedelim}} +\DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite} + {\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite} + {\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext] + {\footcitetext}{\setunit{\multicitedelim}} +\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote] +{\smartcite}{\setunit{\multicitedelim}} + +\newtoggle{apa:intcite} \DeclareCiteCommand{\textcite} {\usebibmacro{cite:init}% - \usebibmacro{prenote}} + \usebibmacro{prenote}% + \toggletrue{apa:intcite}} {\usebibmacro{citeindex}% \usebibmacro{textcite}% - \usebibmacro{cite:post}} + \usebibmacro{cite:post}% + \togglefalse{apa:intcite}} {} {\usebibmacro{textcite:postnote}} diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx index 479c8d24a98..c3d07d40d23 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx @@ -12,10 +12,13 @@ %% %% The Current Maintainer of this work is Philip Kime. -\ProvidesFile{apa.dbx}[2019/11/23\space v9.0\space APA biblatex style data model] +\ProvidesFile{apa.dbx}[2019/11/27\space v9.1\space APA biblatex style data model] \RequireBiber[3] \DeclareDatamodelEntrytypes{ + constitution, + legmaterial, + legadminmaterial, nameonly} \DeclareDatamodelFields[type=list, datatype=name]{ @@ -25,23 +28,42 @@ execdirector, with} -\DeclareDatamodelFields[type=field, datatype=literal]{ - abstractloc, - appentry, - urldescription} +\DeclareDatamodelFields[type=list, datatype=literal]{ + citation} -\DeclareDatamodelFields[type=field, datatype=verbatim]{ - abstracturl} +\DeclareDatamodelFields[type=field, datatype=literal]{ + source, + article, + section, + amendment, + appentry} \DeclareDatamodelEntryfields{ with, groupauthor, narrator, execproducer, - execdirector, - abstractloc, - abstracturl, - urldescription} + execdirector} + +% APA Court cases +\DeclareDatamodelEntryfields[jurisdiction]{ + organization + citation} + +% Legislative material +\DeclareDatamodelEntryfields[legmaterial]{ + source} + +% Admin and Executive material +\DeclareDatamodelEntryfields[legadminmaterial]{ + citation, + source} + +% Constitution/charters +\DeclareDatamodelEntryfields[constitution]{ + article, + section, + amendment} \DeclareDatamodelEntryfields[software]{ appentry} 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 846ae4ae84f..b7308670f70 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}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{austrian-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{austrian} % Following DGPs guidlines for German/Austrian @@ -22,10 +22,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -64,10 +61,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {austrian}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -93,11 +98,7 @@ part = {{part}{pt\adddot}},%FIXME andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, - commentonarticle = {{Comment\space on\space the\space article} - {Comment\space on\space the\space article}},%FIXME - reviewofbook = {{Review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{Review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{Review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{Comment\space on}{Comment\space on}},%FIXME producer = {{Produzent}{Produzent}}, producers = {{producers}{producers}},%FIXME execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}}, 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 21c066eb3e0..30bab9da752 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}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{brazilian-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{brazilian} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {brazilian}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -106,11 +111,7 @@ part = {{part}{pt\adddot}},%FIXME paragraph = {{paragraph}{para\adddot}},%FIXME paragraphs = {{paragraphs}{paras\adddot}},%FIXME - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME revisededition = {{Edi\c{c}\~ao\space Revisada}{ed\adddotspace rev\adddot}}, on = {{em}{em}}, retrieved = {{recuperado}{recuperado}}, 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 24264adb556..825020df7aa 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}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{british-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{british} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {british}, - article = {{article}{article}}, + tothe = {{to\space the}{to\space the}}, + ofthe = {{of\space the}{of\space the}}, + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}}, painting = {{painting}{painting}}, present = {{present}{present}}, song = {{song}{song}}, @@ -113,11 +118,7 @@ from = {{from}{from}}, archivedat = {{archived\space at}{archived\space at}}, reviewof = {{Review\space of}{review\space of}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}}, - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}}, - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}}, - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}}, + commenton = {{comment\space on}{comment\space on}}, with = {{with}{with}}, paragraph = {{paragraph}{para\adddot}}, paragraphs = {{paragraphs}{paras\adddot}}, 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 71850bba646..d33d304e28c 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}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{danish-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{danish} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {danish}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -106,11 +111,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{revideret\space udgave}{rev\adddotspace udg\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{side}{{}s\adddot}}, pages = {{sider}{{}s\adddot}}, on = {{p{\aa}}{p{\aa}}}, 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 443cd13bf71..8b262773303 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}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{dutch-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{dutch} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {dutch}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -106,11 +111,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{Herziene\space editie}{herz\adddotspace ed\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{Pagina}{{}p\adddot}}, pages = {{Pagina's}{{}pp\adddot}}, on = {{op}{op}}, 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 e24f59bc72b..c2ef3e36b10 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}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{english-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{english} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {american}, - article = {{article}{article}}, + tothe = {{to\space the}{to\space the}}, + ofthe = {{of\space the}{of\space the}}, + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}}, painting = {{painting}{painting}}, present = {{present}{present}}, song = {{song}{song}}, @@ -106,11 +111,7 @@ supplement = {{supplement}{suppl\adddot}}, part = {{part}{pt\adddot}}, revisededition = {{Revised\space Edition}{rev\adddotspace ed\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}}, - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}}, - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}}, - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}}, + commenton = {{comment\space on}{comment\space on}}, page = {{Page}{{}p\adddot}}, pages = {{Pages}{{}pp\adddot}}, on = {{on}{on}}, 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 99d80e96539..80def4037e9 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}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{french-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{french} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {french}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}}, song = {{song}{song}},%FIXME @@ -106,11 +111,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{\'Edition\space R\'evis\'e}{\'Ed\adddotspace R\'ev\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{Page}{{}p\adddot}}, pages = {{Pages}{{}p\adddot}}, on = {{le}{le}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx index db115cc5e70..e788e900a6b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{galician-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{galician-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{galician} \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced @@ -21,10 +21,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -63,10 +60,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {galician}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -123,11 +128,7 @@ mathesis = {{tese\addabbrvspace de\addabbrvspace mestrado}{tese\addabbrvspace de\addabbrvspace mestrado}}, phdthesis = {{tese\addabbrvspace doutoral}{tese\addabbrvspace doutoral}}, revisededition = {{edici\'on\space revisada}{edici\'on\space revisada}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME host = {{host}{host}}, page = {{p\'axina}{{}p\adddot}}, pages = {{p\'axinas}{{}pp\adddot}}, 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 9b380179cd3..8926150f096 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}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{german-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{german} % Following DGPs guidlines for German/Austrian @@ -22,10 +22,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -64,10 +61,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {german}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -110,11 +115,7 @@ part = {{part}{pt\adddot}},%FIXME andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{Seite}{{}S\adddot}}, pages = {{Seiten}{{}S\adddot}}, on = {{am}{am}}, 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 7e2f4226f82..1bc92197523 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}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{greek-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{greek} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {greek}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -106,11 +111,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{Αναθεωρημένη\space Έκδοση}{εκδ \adddotspace εκ\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{Σελίδα}{{}σ\adddot}}, pages = {{Σελίδες}{{}σσ\adddot}}, on = {{στις}{στις}}, 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 d5f00590ab9..e5348919684 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}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{italian-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{italian} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {italian}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -106,11 +111,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{Edizione\space Revisionata}{Ed\adddotspace Rev\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{Pagina}{{}p\adddot}}, pages = {{Pagine}{{}pp\adddot}}, on = {{il}{il}}, 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 e9d8f44ec8f..a6867a932d3 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}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{naustrian-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{naustrian} % Following DGPs guidlines for German/Austrian @@ -22,10 +22,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -64,10 +61,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {naustrian}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -110,11 +115,7 @@ part = {{part}{pt\adddot}},%FIXME andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{Seite}{{}S\adddot}}, pages = {{Seiten}{{}S\adddot}}, on = {{am}{am}}, 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 c6be4e9b50e..c4f4b8e664a 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}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{ngerman-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{ngerman} % Following DGPs guidlines for German/Austrian @@ -22,10 +22,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -64,10 +61,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {ngerman}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -111,11 +116,7 @@ abstract = {{Abstract}{Abstract}}, andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{Seite}{{}S\adddot}}, pages = {{Seiten}{{}S\adddot}}, on = {{auf}{auf}}, 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 6c4132e8620..b9449b520ba 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}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{norsk-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{norsk} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {norsk}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -106,11 +111,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{revidert\space utgave}{rev\adddotspace utg\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{side}{{}s\adddot}}, pages = {{sider}{{}s\adddot}}, on = {{p{\aa}}{p{\aa}}}, 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 556a8c8841c..e8bbc7f0999 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}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{norwegian-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{norwegian} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {norwegian}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -106,11 +111,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{revidert\space utgave}{rev\adddotspace utg\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{side}{{}s\adddot}}, pages = {{sider}{{}s\adddot}}, on = {{p{\aa}}{p{\aa}}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx index 079a6c7e4f3..cf639c94834 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{nswissgerman-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{nswissgerman-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{nswissgerman} % Following DGPs guidlines for German/Austrian/Swiss German @@ -22,10 +22,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -64,10 +61,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {nswissgerman}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -110,11 +115,7 @@ part = {{part}{pt\adddot}},%FIXME andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{Seite}{{}S\adddot}}, pages = {{Seiten}{{}S\adddot}}, on = {{am}{am}}, 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 8837cbb3dc7..c52db140a03 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}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{nynorsk-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{nynorsk} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {nynorsk}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -106,11 +111,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{revidert\space utg{\aa}ve}{rev\adddotspace utg\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{side}{{}s\adddot}}, pages = {{sider}{{}s\adddot}}, on = {{p{\aa}}{p{\aa}}}, 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 aef149d64e0..982754efcf9 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}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{portuguese-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{portuguese} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {portuguese}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -108,11 +113,7 @@ paragraph = {{paragraph}{para\adddot}},%FIXME paragraphs = {{paragraphs}{paras\adddot}},%FIXME revisededition = {{Edi\c{c}\~ao\space Revista}{ed\adddotspace rev\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME on = {{em}{em}}, retrieved = {{obtido}{obtido}}, available = {{dispon\'ivel}{disp.}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx index e5a9e397d79..4b59c784067 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{russian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{russian-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{russian} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commento} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,10 +58,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {russian}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -106,11 +111,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{исправленное издание}{испр\adddotspace изд\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME on = {{на}{на}}, retrieved = {{получено}{получено}}, available = {{доступно}{доступно}}, 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 5e61d3fb3e3..2588071be5f 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}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{slovene-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{slovene} \NewBibliographyString{revisededition} @@ -19,10 +19,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -61,6 +58,10 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \NewBibliographyString{% Month name variants used after day datejanuary, @@ -79,7 +80,11 @@ \DeclareBibliographyStrings{% inherit = {slovene}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -121,11 +126,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{dopolnjena izdaja}{dopolnjena iz\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME on = {{na}{na}}, retrieved = {{pridobljeno}{pridobljeno}}, available = {{dostopno}{dostopno}}, 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 ba72381db8d..f94b47d9573 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}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{spanish-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{spanish} \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced @@ -21,10 +21,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -63,10 +60,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {spanish}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -123,11 +128,7 @@ mathesis = {{Tesis\addabbrvspace de\addabbrvspace maestr\'ia}{Tesis\addabbrvspace de\addabbrvspace maestr\'ia}}, phdthesis = {{Tesis\addabbrvspace doctoral}{Tesis\addabbrvspace doctoral}}, revisededition = {{Edici\'on\space revisada}{Edici\'on\space revisada}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{P\'agina}{{}p\adddot}}, pages = {{P\'aginas}{{}pp\adddot}}, on = {{el}{el}}, 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 3b6d70ef4ce..f0a247d54be 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}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{swedish-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{swedish} \NewBibliographyString{revisededition} @@ -20,10 +20,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -62,10 +59,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {swedish}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -107,11 +112,7 @@ supplement = {{supplement}{suppl\adddot}},%FIXME part = {{part}{pt\adddot}},%FIXME revisededition = {{reviderad\space utg{\aa}va}{rev\adddotspace utg\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{sida}{{}s\adddot}}, pages = {{sidor}{{}s\adddot}}, on = {{p{\aa}}{p{\aa}}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx index 2073ff067db..494869632c5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx @@ -1,4 +1,4 @@ -\ProvidesFile{swissgerman-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation] +\ProvidesFile{swissgerman-apa.lbx}[2019/11/27\space v9.1\space APA biblatex localisation] \InheritBibliographyExtras{swissgerman} % Following DGPs guidlines for German/Austrian/Swiss German @@ -22,10 +22,7 @@ \NewBibliographyString{reviewof} \NewBibliographyString{with} \NewBibliographyString{supplement} -\NewBibliographyString{commentonarticle} -\NewBibliographyString{reviewofbook} -\NewBibliographyString{reviewoffilm} -\NewBibliographyString{reviewoftv} +\NewBibliographyString{commenton} \NewBibliographyString{manunpub} \NewBibliographyString{maninprep} \NewBibliographyString{mansub} @@ -64,10 +61,18 @@ \NewBibliographyString{present} \NewBibliographyString{painting} \NewBibliographyString{article} +\NewBibliographyString{unitednations} +\NewBibliographyString{charter} +\NewBibliographyString{ofthe} +\NewBibliographyString{tothe} \DeclareBibliographyStrings{% inherit = {swissgerman}, - article = {{article}{article}},%FIXME + tothe = {{to\space the}{to\space the}},%FIXME + ofthe = {{of\space the}{of\space the}},%FIXME + unitednations = {{United\space Nations}{U\adddot N\adddot}}, + charter = {{charter}{charter}}, + article = {{article}{art\adddot}},%FIXME painting = {{painting}{painting}},%FIXME present = {{present}{present}},%FIXME song = {{song}{song}},%FIXME @@ -111,11 +116,7 @@ part = {{part}{pt\adddot}},%FIXME andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}}, revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}}, - commentonarticle = {{comment\space on\space the\space article} - {comment\space on\space the\space article}},%FIXME - reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME - reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME - reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME + commenton = {{comment\space on}{comment\space on}},%FIXME page = {{Seite}{{}S\adddot}}, pages = {{Seiten}{{}S\adddot}}, on = {{am}{am}}, |