summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-mla
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-02-22 21:06:35 +0000
committerKarl Berry <karl@freefriends.org>2022-02-22 21:06:35 +0000
commitb934a78f7689c165efe1150c31acdf0937e8ca5a (patch)
tree457c53e1a789d35f8bbcafda7eb18d4ff9d68319 /Master/texmf-dist/tex/latex/biblatex-mla
parent9e960471b491b281ebb8deada47620242d325376 (diff)
biblatex-mla (22feb22)
git-svn-id: svn://tug.org/texlive/trunk@62138 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-mla')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-mla/american-mla.lbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-mla/english-mla.lbx215
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-mla/italian-mla.lbx185
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-mla/mla-footnotes.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-mla/mla-new.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-mla/mla-new.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-mla/mla-strict.bbx1207
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-mla/mla-strict.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-mla/mla.bbx52
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-mla/mla.cbx188
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-mla/mla.dbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-mla/mla7.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-mla/mla7.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-mla/portuguese-mla.lbx176
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-mla/spanish-mla.lbx204
15 files changed, 1651 insertions, 606 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-mla/american-mla.lbx b/Master/texmf-dist/tex/latex/biblatex-mla/american-mla.lbx
index ca79f29c734..4abe816d97f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-mla/american-mla.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-mla/american-mla.lbx
@@ -1,8 +1,16 @@
-% american-mla.lbx v2.0 2021/06/07
-\ProvidesFile{american-mla.lbx}[2021/06/07 v2.0 biblatex style localization]
+% american-mla.lbx v2.1a 2022/02/22
+\ProvidesFile{american-mla.lbx}[2022/02/22 v2.1a biblatex style localization]
\InheritBibliographyExtras{american}
\DeclareBibliographyExtras{%
+ \protected\def\mkdaterangecomp{% 2.1 - corrected date ranges
+ \mkdaterangetrunc{long}}%
+ \protected\def\mkdaterangeterse{%
+ \mkdaterangetrunc{short}}%
+ \protected\def\mkdaterangecompextra{%
+ \mkdaterangetruncextra{long}}%
+ \protected\def\mkdaterangeterseextra{%
+ \mkdaterangetruncextra{short}}%
\protected\def\mkbibdatelong#1#2#3{%
\iffieldundef{#3}
{}
@@ -29,4 +37,4 @@
inherit = {english},
}%
-\endinput
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/biblatex-mla/english-mla.lbx b/Master/texmf-dist/tex/latex/biblatex-mla/english-mla.lbx
index 9246682fc5d..33b91bd408d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-mla/english-mla.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-mla/english-mla.lbx
@@ -1,9 +1,17 @@
-% english-mla.lbx v2.0 2021/05/12
+% english-mla.lbx v2.1a 2022/02/22
-\ProvidesFile{english-mla.lbx}[2021/05/12 v2.0 biblatex style localization]
+\ProvidesFile{english-mla.lbx}[2022/02/22 v2.1a biblatex style localization]
\InheritBibliographyExtras{english}
\DeclareBibliographyExtras{%
+ \protected\def\mkdaterangecomp{% 2.1 - corrected date ranges
+ \mkdaterangetrunc{long}}%
+ \protected\def\mkdaterangeterse{%
+ \mkdaterangetrunc{short}}%
+ \protected\def\mkdaterangecompextra{%
+ \mkdaterangetruncextra{long}}%
+ \protected\def\mkdaterangeterseextra{%
+ \mkdaterangetruncextra{short}}%
\protected\def\mkbibdatelong#1#2#3{%
\iffieldundef{#3}
{}
@@ -24,108 +32,130 @@
{\mkmonthzeros{\thefield{#2}}%
\iffieldundef{#1}{}{/}}%
\mkyearzeros{\thefield{#1}}}%
+ \blx@kv@setkeys{blx@opt@pre}{time=12h}%
}
+% \ExecuteBibliographyOptions{time=12h}
+
\DeclareBibliographyStrings{%
inherit = {english},
+ % bycompiler = {{compiled by}{comp\adddotspace by}},% 2.1 accept provided definitions where possible
+ % byeditor = {{edited by}{edited by}},%
+ % byeditoran = {{edited and annotated by}{edited and annotated by}},
+ % circa = {{circa}{ca\adddot}},
+ % composedby = {{composed~by}{composed~by}},
+ % editor = {{editor}{editor}},
+ % editors = {{editors}{editors}},
+ % newseries = {{new series}{new series}},
+ % oldseries = {{old series}{old series}},
+ % reprintof = {{reprint of}{rpt\adddotspace of}},
+ % reviewof = {{review of}{review of}},
+ % translator = {{translator}{translator}},%
+ % translators = {{translators}{translators}},%
+ % transof = {{translation of}{translation of}}, 2.1 replace with translationof
+ adaptation = {{adapt\adddot}{adapt\adddot}},
+ adaptor = {{adapt\adddot}{adapt\adddot}},
+ am = {{a.m\adddot}{a.m\adddot}},% changed in 2.1
bibliography = {{Works Cited}{Works Cited}},
- references = {{Works Cited}{Works Cited}},
- compilerandeditor = {{compiler and editor}{comp\adddotspace and ed\adddot}},% 0.95
- bycompilerandeditor = {{compiled and edited by}{compiled and edited by}},% 0.95
- % typecompilerandeditor = {{compiler and editor}{comp\adddotspace and ed\adddot}},% 0.7
- % bytypecompilerandeditor = {{compiled and edited by}{comp\adddotspace and ed\adddot}},% 0.7
- % typegeneraleditor = {{general editor}{gen\adddotspace ed\adddot}},% 0.7.1
- % bytypegeneraleditor = {{general editor}{gen\adddotspace ed\adddot}},% 0.7.1
- generaleditor = {{gen\adddot ed\adddot}{general editor}},
- bytranslator = {{translated by}{translated by}},
- byeditor = {{edited by}{edited by}},
- % byserieseditor = {{general editor}{general editor}},% not used?
- % page = {{\unskip}{\unskip}},
- % pages = {{\unskip}{\unskip}},
- byeditortr = {{ed\adddotspace and trans\adddot}{edited and translated}},
- byeditorco = {{ed\adddotspace and comm\adddot}{ed\adddotspace and comm\adddot}},
- byeditoran = {{ed\adddotspace and annot\adddot}{ed\adddotspace and annot\adddot}},
- byeditorin = {{ed\adddotspace and introd\adddot}{edited and introduced by}},
- byeditorfo = {{ed\adddotspace and forew\adddot}{ed\adddotspace and forew\adddot}},
- byeditoraf = {{ed\adddotspace and afterw\adddot}{ed\adddotspace and afterw\adddot}},
- byeditortrco = {{ed, trans\adddot, and comm\adddot}{ed, trans\adddot, and comm\adddot}},
- byeditortran = {{ed, trans\adddot, and annot\adddot}{ed, trans\adddot, and annot\adddot}},
- byeditortrin = {{ed, trans\adddot, and introd\adddot}{ed, trans\adddot, and introd\adddot}},
- byeditortrfo = {{ed, trans\adddot, and forew\adddot}{ed, trans\adddot, and forew\adddot}},
- byeditortraf = {{ed, trans\adddot, and afterw\adddot}{ed, trans\adddot, and afterw\adddot}},
- byeditorcoin = {{ed, comm\adddot, and introd\adddot}{ed, comm\adddot, and introd\adddot}},
- byeditorcofo = {{ed, comm\adddot, and forew\adddot}{ed, comm\adddot, and forew\adddot}},
- byeditorcoaf = {{ed, comm\adddot, and afterw\adddot}{ed, comm\adddot, and afterw\adddot}},
- byeditoranin = {{ed, annot\adddot, and introd\adddot}{ed, annot\adddot, and introd\adddot}},
- byeditoranfo = {{ed, annot\adddot, and forew\adddot}{ed, annot\adddot, and forew\adddot}},
- byeditoranaf = {{ed, annot\adddot, and afterw\adddot}{ed, annot\adddot, and afterw\adddot}},
- byeditortrcoin = {{ed, trans\adddot, comm\adddot, and introd\adddot}{ed, trans\adddot, comm\adddot, and introd\adddot}},
- byeditortrcofo = {{ed, trans\adddot, comm\adddot, and forew\adddot}{ed, trans\adddot, comm\adddot, and forew\adddot}},
- byeditortrcoaf = {{ed, trans\adddot, comm\adddot, and afterw\adddot}{ed, trans\adddot, comm\adddot, and afterw\adddot}},
- byeditortranin = {{ed, trans\adddot, annot\adddot, and introd\adddot}{ed, trans\adddot, annot\adddot, and introd\adddot}},
- byeditortranfo = {{ed, trans\adddot, annot\adddot, and forew\adddot}{ed, trans\adddot, annot\adddot, and forew\adddot}},
- byeditortranaf = {{ed, trans\adddot, annot\adddot, and afterw\adddot}{ed, trans\adddot, annot\adddot, and afterw\adddot}},
- bytranslatorco = {{trans\adddotspace and comm\adddot}{trans\adddotspace and comm\adddot}},
- bytranslatoran = {{trans\adddotspace and annot\adddot}{trans\adddotspace and annot\adddot}},
- bytranslatorin = {{trans\adddotspace and introd\adddot}{trans\adddotspace and introd\adddot}},
- bytranslatorfo = {{trans\adddotspace and forew\adddot}{trans\adddotspace and forew\adddot}},
- bytranslatoraf = {{trans\adddotspace and afterw\adddot}{trans\adddotspace and afterw\adddot}},
- bytranslatorcoin = {{trans\adddot, comm\adddot, and introd\adddot}{trans\adddot, comm\adddot, and introd\adddot}},
- bytranslatorcofo = {{trans\adddot, comm\adddot, and forew\adddot}{trans\adddot, comm\adddot, and forew\adddot}},
- bytranslatorcoaf = {{trans\adddot, comm\adddot, and afterw\adddot}{trans\adddot, comm\adddot, and afterw\adddot}},
- bytranslatoranin = {{trans\adddot, annot\adddot, and introd\adddot}{trans\adddot, annot\adddot, and introd\adddot}},
- bytranslatoranfo = {{trans\adddot, annot\adddot, and forew\adddot}{trans\adddot, annot\adddot, and forew\adddot}},
- bytranslatoranaf = {{trans\adddot, annot\adddot, and afterw\adddot}{trans\adddot, annot\adddot, and afterw\adddot}},
- circa = {{ca\adddot}{circa}},
- newseries = {{ns}{ns}},
- oldseries = {{os}{os}},
- reprintof = {{reprint of}{rpt\adddotspace of}},% 0.7.1 fixed
- phdthesis = {{PhD dissertation}{PhD dissertation}},
- reviewof = {{rev\adddotspace of}{rev\adddotspace of}},
- specissue = {{spec\adddot\addspace issue of}{spec\adddot\addspace issue of}},
- section = {{sec\adddot}{sec\adddot}},
- withcommentator = {{comm\adddot}{comm\adddot}},
- withannotator = {{annot\adddot}{annot\adddot}},
- withintroduction = {{introd\adddot}{introd\adddot}},
- withforeword = {{forew\adddot}{forew\adddot}},
- withafterword = {{afterw\adddot}{afterw\adddot}},
- phd = {{PhD dissertation}{PhD dissertation}},
- dphil = {{DPhil dissertation}{DPhil dissertation}},
+ bycompilerandeditor = {{compiled and edited by}{comp\adddotspace and ed\adddotspace by}},
+ bycomposer = {{composed by}{composed by}},% new in 2.1
+ byconductor = {{conducted by}{conduct\adddotspace by}},% new in 2.1
+ bycreator = {{created by}{created by}},% new in 2.1
+ bydirector = {{directed by}{dir\adddotspace by}},% new in 2.1
+ byeditoraf = {{edited and with an afterword by}{ed\adddotspace and with an afterw\adddotspace by}},% changed in 2.1
+ byeditoranaf = {{edited, annotated, and with an afterword by}{ed., annot., and afterw\adddotspace by}},% changed in 2.1
+ byeditoranfo = {{edited, annotated, and with a foreword by}{ed., annot., and forew\adddotspace by}},% changed in 2.1
+ byeditoranin = {{edited, annotated, and with an introduction by}{ed., annot., and introd\adddotspace by}},% changed in 2.1
+ byeditorco = {{edited and with commentary by}{ed\adddotspace and with commentary by}},% changed in 2.1
+ byeditorcoaf = {{edited and with commentary and afterword by}{ed\adddotspace and with commentary and afterw\adddotspace by}},% changed in 2.1
+ byeditorcofo = {{edited and with foreword and commentary by}{ed\adddotspace and with commentary and forew\adddotspace by}},% changed in 2.1
+ byeditorcoin = {{edited and with introduction and commentary by}{ed., introd., and with commentary by}},% changed in 2.1
+ byeditorfo = {{edited and with a foreword by}{ed\adddotspace and forew\adddotspace by}},% changed in 2.1
+ byeditorin = {{edited and with an introduction by}{edi\adddotspace and introd\adddotspace by}},% changed in 2.1
+ byeditortr = {{edited and translated by}{ed\adddotspace and trans\adddotspace by}},% changed in 2.1
+ byeditortraf = {{edited, translated, and with an afterword by}{ed., trans., and with afterw\adddotspace by}},% changed in 2.1
+ byeditortran = {{edited, translated, and annotated by}{ed., trans., and annot\adddotspace by}},% changed in 2.1
+ byeditortranaf = {{edited, translated, annotated, and with an afterword by}{ed., trans., annot., and with afterw\adddotspace by}},% changed in 2.1
+ byeditortranfo = {{edited, translated, annotated, and with a foreword by}{ed., trans., annot., and with a forew\adddotspace by}},% changed in 2.1
+ byeditortranin = {{edited, translated, annotated, and with an introduction by}{ed., trans., annot., and introd\adddotspace by}},% changed in 2.1
+ byeditortrco = {{edited, translated, and with commentary by}{ed., trans., and with commentary by}},% changed in 2.1
+ byeditortrcoaf = {{edited, translated, and with commentary and afterword by}{ed., trans., and with afterw\adddotspace and commentary by}},% changed in 2.1
+ byeditortrcofo = {{edited, translated, and with a foreword and commentary by}{ed., trans., and with forew\adddotspace and commentary by}},% changed in 2.1
+ byeditortrcoin = {{edited, translated, and with an introduction and commentary by}{ed., trans., introd., and with commentary by}},% changed in 2.1
+ byeditortrfo = {{edited, translated, and with a foreword by}{ed., trans., and with forew\adddotspace by}},% changed in 2.1
+ byeditortrin = {{edited, translated, and with an introduction by}{ed., trans., and introd\adddotspace by}},% changed in 2.1
+ byhost = {{hosted by}{hosted by}},% new in 2.1
+ byinterviewer = {{interview by}{interview by}},% new in 2.1
+ bynarrator = {{narrated by}{narr\adddotspace by}},% new in 2.1
+ byperformer = {{performed by}{perf\adddotspace by}},% new in 2.1
+ byscreenplay = {{screenplay by}{screenplay by}},% new in 2.1
+ bytranslator = {{translated by}{trans\adddotspace by}},
+ bytranslatoraf = {{translated and with an afterword by}{trans\adddotspace and with afterw\adddotspace by}},% changed in 2.1
+ bytranslatoran = {{translated and annotated by}{trans\adddotspace and annot\adddotspace by}},% changed in 2.1
+ bytranslatoranaf = {{translated, annotated, and with an afterword by}{trans., annot., and with afterw\adddotspace by}},% changed in 2.1
+ bytranslatoranfo = {{translated, annotated, and with a foreword by}{trans., annot., and with forew\adddotspace by}},% changed in 2.1
+ bytranslatoranin = {{translated, annotated, and with an introduction by}{trans., annot., and introd\adddotspace by}},% changed in 2.1
+ bytranslatorco = {{translated and with commentary by}{trans\adddotspace and with commentary by}},% changed in 2.1
+ bytranslatorcoaf = {{translated and with an afterword and commentary by}{trans\adddotspace and with afterw\adddotspace and commentary by}},% changed in 2.1
+ bytranslatorcofo = {{translated and with a foreword and commentary by}{trans\adddotspace and with forew\adddotspace and commentary by}},% changed in 2.1
+ bytranslatorcoin = {{translated and with introduction and commentary by}{trans., introd., and with commentary by}},% changed in 2.1
+ bytranslatorfo = {{translated and with a foreword by}{trans\adddotspace and forew\adddotspace by}},% changed in 2.1
+ bytranslatorin = {{translated and with an introduction by}{trans\adddotspace and introd\adddotspace by}},% changed in 2.1
+ compilerandeditor = {{compiler and editor}{comp\adddotspace and ed\adddot}},
+ composer = {{composer}{comp\adddot}},% changed in 2.1
+ conductor = {{conductor}{cond\adddot}},% new in 2.1
+ creator = {{creator}{creator}},% new in 2.1
+ director = {{director}{dir\adddot}},% changed in 2.1
+ dphil = {{DPhil dissertation}{DPhil diss\adddot}},
+ edition = {{ed\adddot}{ed\adddot}},
+ generaleditor = {{general editor}{general editor}},
+ host = {{host}{host}},% new in 2.1
+ interviewer = {{interviewer}{interviewer}},% new in 2.1
lic = {{Licentiate thesis}{Licentiate thesis}},
- ma = {{{MA} thesis}{{MA} thesis}},
- ms = {{{MS} thesis}{{MS} thesis}},
- msc = {{{MS}c thesis}{{MS}c thesis}},
- mphil = {{{MP}hil thesis}{{MP}hil thesis}},
- mlitt = {{{ML}itt thesis}{{ML}itt thesis}},
+ ma = {{MA\addabbrvspace thesis}{MA\addabbrvspace thesis}},
manuscript = {{manuscript}{manuscript}},
+ mlitt = {{MLitt\addabbrvspace thesis}{MLitt\addabbrvspace thesis}},
+ mphil = {{MPhil\addabbrvspace thesis}{MPhil\addabbrvspace thesis}},
+ ms = {{MS\addabbrvspace thesis}{MS\addabbrvspace thesis}},
+ msc = {{MSc\addabbrvspace thesis}{MSc\addabbrvspace thesis}},
+ narrator = {{narrator}{narr\adddot}},% new in 2.1
+ number = {{no\adddot}{no\adddot}},% changed in 2.1
+ numbers = {{nos\adddot}{nos\adddot}},% changed in 2.1
+ page = {{p\adddot}{p\adddot}},
+ pages = {{pp\adddot}{pp\adddot}},
patentde = {{Deutsches Patent- und Markenamt}{DE}},
patenteu = {{European Patent Office}{EU}},
patentfr = {{Institut National de la Propriété Industrielle}{FR}},
patentuk = {{The Intellectual Property Office of the United Kingdom}{UK}},
patentus = {{United States Patent and Trademark Office}{US}},
- % patreq = {{patent request}{pat\adddot\ req\adddot}},
- % patreqde = {{German patent request}{German pat\adddot\ req\adddot}},
- % patreqeu = {{European patent request}{European pat\adddot\ req\adddot}},
patreqfr = {{Institut National de la Propriété Industrielle}{FR pat\adddot req\adddot}},
- % patrequk = {{British patent request}{British pat\adddot\ req\adddot}},
- % patrequs = {{U.S\adddotspace patent request}{U.S\adddotspace pat\adddot\ req\adddot}},
- typescript = {{typescript}{typescript}},
- director = {{dir\adddot}{dir\adddot}},
- screenplay = {{adapt\adddot}{adapt\adddot}},
- adaptation = {{adapt\adddot}{adapt\adddot}},
- adaptor = {{adapt\adddot}{adapt\adddot}},
- performer = {{perf\adddot}{perf\adddot}},
- performers = {{perf\adddot}{perf\adddot}},
- composer = {{composer\adddot}{composer\adddot}},
- composedby = {{composed~by}{composed~by}},
+ performer = {{performer}{perf\adddot}},% changed in 2.1
+ performers = {{performers}{perf\adddot}},% changed in 2.1
+ phd = {{PhD\addabbrvspace dissertation}{PhD\addabbrvspace diss\adddot}},
+ phdthesis = {{PhD\addabbrvspace dissertation}{PhD\addabbrvspace diss\adddot}},
+ pm = {{p.m\adddot}{p.m\adddot}},% changed in 2.1
+ print = {{print}{print}},
+ proceedings = {{proc\adddot}{proc\adddot}},
producer = {{prod\adddot}{prod\adddot}},
+ recorded = {{recorded}{recorded}},% new in 2.1
+ references = {{Works Cited}{Works Cited}},
+ screenplay = {{screenplay}{screenplay}},
+ section = {{sec\adddot}{sec\adddot}},
+ specissue = {{special issue of}{special issue of}},% changed in 2.1
+ supptotitle = {{to}{to}},
+ tvepisode = {{episode}{episode}},% new in 2.1
+ tvseason = {{season}{season}},% new in 2.1
+ typescript = {{typescript}{typescript}},
+ urlseen = {{accessed}{accessed}},% changed in 2.1
+ volstodate = {{vols\adddotspace to date}{vols\adddotspace to date}},
+ volume = {{vol\adddot}{vol\adddot}},% changed in 2.1
+ web = {{web}{web}},
with = {{with}{with}},
- proceedings = {{proc\adddot}{proc\adddot}},
- transof = {{translation of}{trans\adddotspace of}},% 0.7
- volstodate = {{volumes to date}{vols\adddotspace to date}},% 0.7.1
- supptotitle = {{to}{to}},% 0.7.1
- print = {{print}{print}},% 0.9
- web = {{web}{web}},% 0.9
+ withafterword = {{afterword by}{afterw\adddot}},% changed in 2.1
+ withannotator = {{annotations by}{annot\adddot}},% changed in 2.1
+ withcommentator = {{commentary by}{comm\adddot}},% changed in 2.1
+ withforeword = {{foreword by}{forew\adddot}},% changed in 2.1
+ withintroduction = {{introduction by}{introd\adddot}},% changed in 2.1
}%
\protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
@@ -145,10 +175,3 @@
{\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
\endinput
-
-% ignore the below. It's a reference for me so I don't continually need to
-% teach myself regular expressions. -JC
-%
-% regex for find and replace (moving from mla.bbx to localized modules)
-% find: {(.*?)},
-% replace: {{$1}{$1}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-mla/italian-mla.lbx b/Master/texmf-dist/tex/latex/biblatex-mla/italian-mla.lbx
index 20aee0c0ece..f7f736945bc 100644
--- a/Master/texmf-dist/tex/latex/biblatex-mla/italian-mla.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-mla/italian-mla.lbx
@@ -1,10 +1,10 @@
-% italian-mla.lbx v0.1.6 2021/06/08
+% italian-mla.lbx v2.1a 2022/02/22
%
% Italian localization in this file provided by Andrea Marchitelli.
% Abbreviations taken, whenever possible, from Italian Cataloguing Rules
% Updated inexpertly by a non-native speaker many years later.
-\ProvidesFile{italian-mla.lbx}[2021/06/08 v0.1.6 biblatex style localization]
+\ProvidesFile{italian-mla.lbx}[2022/02/22 v2.1a biblatex style localization]
\InheritBibliographyExtras{italian}
@@ -33,101 +33,118 @@
\DeclareBibliographyStrings{%
inherit = {italian},
+ %% byserieseditor = {{a cura di}{a c\adddot di}},% ---- never used?
+ %% composedby = {{composto~da}{composto~da}},%
+ % andothers = {{et~al\adddot}{et~al\adddot}},
+ % bycompiler = {{compilato da}{comp\adddotspace da}},
+ % byeditor = {{a cura di}{a c\adddot di}}, % check
+ % byeditoraf = {{cur\adddotspace e ep\'{i}l\adddot}{cur\adddotspace e ep\'{i}l\adddot}},
+ % byeditoran = {{cur\adddotspace e anot\adddot}{cur\adddotspace e anot\adddot}},
+ % byeditoranaf = {{cur\adddot, anot\adddotspace e ep\'{i}l\adddot}{cur\adddot, anot\adddotspace e ep\'{i}l\adddot}},
+ % byeditoranfo = {{cur\adddot, anot\adddotspace e pr\'{o}l\adddot}{cur\adddot, anot\adddotspace e pr\'{o}l\adddot}},
+ % byeditoranin = {{cur\adddot, anot\adddotspace e introd\adddot}{cur\adddot, anot\adddotspace e introd\adddot}},
+ % byeditorco = {{cur\adddotspace e com\adddot}{cur\adddotspace e com\adddot}},
+ % byeditorcoaf = {{cur\adddot, com\adddotspace e ep\'{i}l\adddot}{cur\adddot, com\adddotspace e ep\'{i}l\adddot}},
+ % byeditorcofo = {{cur\adddot, com\adddotspace e pr\'{o}l\adddot}{cur\adddot, com\adddotspace e pr\'{o}l\adddot}},
+ % byeditorcoin = {{cur\adddot, com\adddotspace e introd\adddot}{cur\adddot, com\adddotspace e introd\adddot}},
+ % byeditorfo = {{cur\adddotspace e pr\'{o}l\adddot}{cur\adddotspace e pr\'{o}l\adddot}},
+ % byeditorin = {{cur\adddotspace e introd\adddot}{cur\adddotspace e introd\adddot}},
+ % byeditortr = {{cur\adddotspace e trad\adddot}{cur\adddotspace e trad\adddot}},
+ % byeditortraf = {{cur\adddot, trad\adddotspace e ep\'{i}l\adddot}{cur\adddot, trad\adddotspace e ep\'{i}l\adddot}},
+ % byeditortran = {{cur\adddot, trad\adddotspace e anot\adddot}{cur\adddot, trad\adddotspace e anot\adddot}},
+ % byeditortranaf = {{cur\adddot, trad\adddot, anot\adddotspace e ep\'{i}l\adddot}{cur\adddot, trad\adddot, anot\adddotspace e ep\'{i}l\adddot}},
+ % byeditortranfo = {{cur\adddot, trad\adddot, anot\adddotspace e pr\'{o}l\adddot}{cur\adddot, trad\adddot, anot\adddotspace e pr\'{o}l\adddot}},
+ % byeditortranin = {{cur\adddot, trad\adddot, anot\adddotspace e introd\adddot}{cur\adddot, trad\adddot, anot\adddotspace e introd\adddot}},
+ % byeditortrco = {{cur\adddot, trad\adddotspace e com\adddot}{cur\adddot, trad\adddotspace e com\adddot}},
+ % byeditortrcoaf = {{cur\adddot, trad\adddot, com\adddotspace e ep\'{i}l\adddot}{cur\adddot, trad\adddot, com\adddotspace e ep\'{i}l\adddot}},
+ % byeditortrcofo = {{cur\adddot, trad\adddot, com\adddotspace e pr\'{o}l\adddot}{cur\adddot, trad\adddot, com\adddotspace e pr\'{o}l\adddot}},
+ % byeditortrcoin = {{cur\adddot, trad\adddot, com\adddotspace e introd\adddot}{cur\adddot, trad\adddot, com\adddotspace e introd\adddot}},
+ % byeditortrfo = {{cur\adddot, trad\adddotspace e pr\'{o}l\adddot}{cur\adddot, trad\adddotspace e pr\'{o}l\adddot}},
+ % byeditortrin = {{cur\adddot, trad\adddotspace e introd\adddot}{cur\adddot, trad\adddotspace e introd\adddot}},
+ % bygeneraleditor = {{cura generale di}{cur\adddotspace gen\adddot di}},
+ % bytranslator = {{tradotto da}{trad\adddot da}},
+ % bytranslatoraf = {{trad\adddotspace e ep\'{i}l\adddot}{trad\adddotspace e ep\'{i}l\adddot}},
+ % bytranslatoran = {{trad\adddotspace e annot\adddot}{trad\adddotspace e annot\adddot}},
+ % bytranslatoranaf = {{trad\adddot, anot\adddotspace e ep\'{i}l\adddot}{trad\adddot, anot\adddotspace e ep\'{i}l\adddot}},
+ % bytranslatoranfo = {{trad\adddot, anot\adddotspace e pr\'{o}l\adddot}{trad\adddot, anot\adddotspace e pr\'{o}l\adddot}},
+ % bytranslatoranin = {{trad\adddot, anot\adddotspace e introd\adddot}{trad\adddot, anot\adddotspace e introd\adddot}},
+ % bytranslatorco = {{trad\adddotspace e com\adddot}{trad\adddotspace e com\adddot}},
+ % bytranslatorcoaf = {{trad\adddot, com\adddotspace e ep\'{i}l\adddot}{trad\adddot, com\adddotspace e ep\'{i}l\adddot}},
+ % bytranslatorcofo = {{trad\adddot, com\adddotspace e pr\'{o}l\adddot}{trad\adddot, com\adddotspace e pr\'{o}l\adddot}},
+ % bytranslatorcoin = {{trad\adddot, com\adddotspace e introd\adddot}{trad\adddot, com\adddotspace e introd\adddot}},
+ % bytranslatorfo = {{trad\adddotspace e pref\adddot}{trad\adddotspace e pref\adddot}},
+ % bytranslatorin = {{trad\adddotspace e introd\adddot}{trad\adddotspace e introd\adddot}},
+ % compiler = {{compilatore}{comp\adddot}},
+ % compilers = {{compilatori}{comp\adddot}},
+ % composedby = {{composto~da}{composto~da}},
+ % patreq = {{patent request}{pat\adddot\ req\adddot}},
+ % patreqde = {{German patent request}{German pat\adddot\ req\adddot}},
+ % patreqeu = {{European patent request}{European pat\adddot\ req\adddot}},
+ % patrequk = {{British patent request}{British pat\adddot\ req\adddot}},
+ % patrequs = {{U.S\adddotspace patent request}{U.S\adddotspace pat\adddot\ req\adddot}},
+ % reprintof = {{ristampa di}{rpt\adddotspace of}},
+ % transof = {{traduzione di}{traduzione di}},
+ % volume = {{{Vol\adddot}}{{Vol\adddot}}}, % for correct capitalization of volume reference
+ adaptation = {{adattamento}{adatt\adddot}},
+ adaptor = {{adatt\adddot}{adatt\adddot}},%
bibliography = {{Bibliografia}{Bibliografia}},
- references = {{Riferimenti bibliografici}{Riferimenti bibliografici}},
- typecompiler = {{compilatore}{comp\adddot}},
- typecompilers = {{compilatori}{comp\adddot}},
- typecompilerandeditor = {{comp\adddotspace e cur\adddot}{comp\adddotspace e cur\adddot}},
- bytranslator = {{tradotto da}{trad\adddot da}},
- byeditor = {{a cura di}{a c\adddot di}},
- typegeneraleditor = {{curatore generale}{cur\adddotspace gen\adddot}},
- bytypegeneraleditor = {{cura generale di}{cur\adddotspace gen\adddot di}},
- byserieseditor = {{a cura di}{a c\adddot di}},
- page = {{pagina}{p\addot}},
- pages = {{pagine}{p\addot}},
- andothers = {{et~al\adddot}{et~al\adddot}},
- byeditortr = {{cur\adddotspace e trad\adddot}{cur\adddotspace e trad\adddot}},
- byeditorco = {{cur\adddotspace e com\adddot}{cur\adddotspace e com\adddot}},
- byeditoran = {{cur\adddotspace e anot\adddot}{cur\adddotspace e anot\adddot}},
- byeditorin = {{cur\adddotspace e introd\adddot}{cur\adddotspace e introd\adddot}},
- byeditorfo = {{cur\adddotspace e pr\'{o}l\adddot}{cur\adddotspace e pr\'{o}l\adddot}},
- byeditoraf = {{cur\adddotspace e ep\'{i}l\adddot}{cur\adddotspace e ep\'{i}l\adddot}},
- byeditortrco = {{cur\adddot, trad\adddotspace e com\adddot}{cur\adddot, trad\adddotspace e com\adddot}},
- byeditortran = {{cur\adddot, trad\adddotspace e anot\adddot}{cur\adddot, trad\adddotspace e anot\adddot}},
- byeditortrin = {{cur\adddot, trad\adddotspace e introd\adddot}{cur\adddot, trad\adddotspace e introd\adddot}},
- byeditortrfo = {{cur\adddot, trad\adddotspace e pr\'{o}l\adddot}{cur\adddot, trad\adddotspace e pr\'{o}l\adddot}},
- byeditortraf = {{cur\adddot, trad\adddotspace e ep\'{i}l\adddot}{cur\adddot, trad\adddotspace e ep\'{i}l\adddot}},
- byeditorcoin = {{cur\adddot, com\adddotspace e introd\adddot}{cur\adddot, com\adddotspace e introd\adddot}},
- byeditorcofo = {{cur\adddot, com\adddotspace e pr\'{o}l\adddot}{cur\adddot, com\adddotspace e pr\'{o}l\adddot}},
- byeditorcoaf = {{cur\adddot, com\adddotspace e ep\'{i}l\adddot}{cur\adddot, com\adddotspace e ep\'{i}l\adddot}},
- byeditoranin = {{cur\adddot, anot\adddotspace e introd\adddot}{cur\adddot, anot\adddotspace e introd\adddot}},
- byeditoranfo = {{cur\adddot, anot\adddotspace e pr\'{o}l\adddot}{cur\adddot, anot\adddotspace e pr\'{o}l\adddot}},
- byeditoranaf = {{cur\adddot, anot\adddotspace e ep\'{i}l\adddot}{cur\adddot, anot\adddotspace e ep\'{i}l\adddot}},
- byeditortrcoin = {{cur\adddot, trad\adddot, com\adddotspace e introd\adddot}{cur\adddot, trad\adddot, com\adddotspace e introd\adddot}},
- byeditortrcofo = {{cur\adddot, trad\adddot, com\adddotspace e pr\'{o}l\adddot}{cur\adddot, trad\adddot, com\adddotspace e pr\'{o}l\adddot}},
- byeditortrcoaf = {{cur\adddot, trad\adddot, com\adddotspace e ep\'{i}l\adddot}{cur\adddot, trad\adddot, com\adddotspace e ep\'{i}l\adddot}},
- byeditortranin = {{cur\adddot, trad\adddot, anot\adddotspace e introd\adddot}{cur\adddot, trad\adddot, anot\adddotspace e introd\adddot}},
- byeditortranfo = {{cur\adddot, trad\adddot, anot\adddotspace e pr\'{o}l\adddot}{cur\adddot, trad\adddot, anot\adddotspace e pr\'{o}l\adddot}},
- byeditortranaf = {{cur\adddot, trad\adddot, anot\adddotspace e ep\'{i}l\adddot}{cur\adddot, trad\adddot, anot\adddotspace e ep\'{i}l\adddot}},
- bytranslatorco = {{trad\adddotspace e com\adddot}{trad\adddotspace e com\adddot}},
- bytranslatoran = {{trad\adddotspace e annot\adddot}{trad\adddotspace e annot\adddot}},
- bytranslatorin = {{trad\adddotspace e introd\adddot}{trad\adddotspace e introd\adddot}},
- bytranslatorfo = {{trad\adddotspace e pref\adddot}{trad\adddotspace e pref\adddot}},
- bytranslatoraf = {{trad\adddotspace e ep\'{i}l\adddot}{trad\adddotspace e ep\'{i}l\adddot}},
- bytranslatorcoin = {{trad\adddot, com\adddotspace e introd\adddot}{trad\adddot, com\adddotspace e introd\adddot}},
- bytranslatorcofo = {{trad\adddot, com\adddotspace e pr\'{o}l\adddot}{trad\adddot, com\adddotspace e pr\'{o}l\adddot}},
- bytranslatorcoaf = {{trad\adddot, com\adddotspace e ep\'{i}l\adddot}{trad\adddot, com\adddotspace e ep\'{i}l\adddot}},
- bytranslatoranin = {{trad\adddot, anot\adddotspace e introd\adddot}{trad\adddot, anot\adddotspace e introd\adddot}},
- bytranslatoranfo = {{trad\adddot, anot\adddotspace e pr\'{o}l\adddot}{trad\adddot, anot\adddotspace e pr\'{o}l\adddot}},
- bytranslatoranaf = {{trad\adddot, anot\adddotspace e ep\'{i}l\adddot}{trad\adddot, anot\adddotspace e ep\'{i}l\adddot}},
- phdthesis = {{Tesi di dottorato}{Tesi di dottorato}},
- reviewof = {{recensione di}{rec\adddotspace}},
- volume = {{{Vol\adddot}}{{Vol\adddot}}}, % for correct capitalization of volume reference
- phd = {{Tesis}{Tesis}},% 0.6
- dphil = {{Tesis}{Tesis}},% 0.6
+ compilerandeditor = {{comp\adddotspace e cur\adddot}{comp\adddotspace e cur\adddot}},
+ composer = {{comp\adddot}{comp\adddot}},
+ director = {{regista}{regista}},
+ dphil = {{tesis}{tesis}},% 0.6
lic = {{Lic\adddotspace tesis}{Lic\adddotspace tesis}},% 0.6
ma = {{MA\addabbrvspace tesis}{MA\addabbrvspace tesis}},% 0.6
+ manuscript = {{manoscritto}{manoscritto}},
+ mlitt = {{MLitt\addabbrvspace tesis}{MLitt\addabbrvspace tesis}},% 0.6
+ mphil = {{MPhil\addabbrvspace tesis}{MPhil\addabbrvspace tesis}},% 0.6
ms = {{MS\addabbrvspace tesis}{MS\addabbrvspace tesis}},% 0.6
msc = {{MSc\addabbrvspace tesis}{MSc\addabbrvspace tesis}},% 0.6
- mphil = {{MPhil\addabbrvspace tesis}{MPhil\addabbrvspace tesis}},% 0.6
- mlitt = {{MLitt\addabbrvspace tesis}{MLitt\addabbrvspace tesis}},% 0.6
- manuscript = {{manoscritto}{manoscritto}},
- typescript = {{dattiloscritto}{dattiloscritto}},
- director = {{regista}{regista}},
- screenplay = {{sceneggiatura}{scen\adddot}},
- adaptation = {{adattamento}{adatt\adddot}},
- adaptor = {{adatt\adddot}{adatt\adddot}},%
- % performer = {{perf\adddot}{perf\adddot}},%
- % performers = {{perf\adddot}{perf\adddot}},%
- % composer = {{compositore}{compositore}},
- % composedby = {{composto~da}{composto~da}},%
- % producer = {{produttore}{produttore}},
- with = {{con}{con}},
- proceedings = {{atti}{atti}},
- bycompiler = {{compilato da}{comp\addotspace da}},
- print = {{a stampa}{a stampa}},% 0.9
- web = {{web}{web}},% 2.0 changed
- transof = {{traduzione di}{traduzione di},
- reprintof = {{ristampa di}{rpt\adddotspace of}},
- % FIXME 2.0 check the following for quality of Italian translation
+ page = {{p\adddot}{p\adddot}},
+ pages = {{pp\adddot}{pp\adddot}},
patentde = {{Deutsches Patent- und Markenamt}{DE}},% localised in German
patenteu = {{Ufficio europeo dei brevetti}{EU}},
patentfr = {{Institut National de la Propriété Industrielle}{FR}},% localised in French
patentuk = {{The Intellectual Property Office of the United Kingdom}{UK}},% localised in English
patentus = {{United States Patent and Trademark Office}{US}},% localised in English
- % patreq = {{patent request}{pat\adddot\ req\adddot}},
- % patreqde = {{German patent request}{German pat\adddot\ req\adddot}},
- % patreqeu = {{European patent request}{European pat\adddot\ req\adddot}},
patreqfr = {{Institut National de la Propriété Industrielle}{FR pat\adddot req\adddot}},
- % patrequk = {{British patent request}{British pat\adddot\ req\adddot}},
- % patrequs = {{U.S\adddotspace patent request}{U.S\adddotspace pat\adddot\ req\adddot}},
- performer = {{artista}{artista},
- performers = {{art\adddot}{art\adddot},
- composer = {{comp\adddot}{comp\adddot}},
- composedby = {{composto~da}{composto~da}},
+ performer = {{artista}{artista}},
+ performers = {{art\adddot}{art\adddot}},
+ phd = {{tesis}{tesis}},% 0.6
+ phdthesis = {{tesi di dottorato}{tesi di dottorato}},
+ print = {{a stampa}{a stampa}},% 0.9
+ proceedings = {{atti}{atti}},
producer = {{prod\adddot}{prod\adddot}},
+ references = {{Riferimenti bibliografici}{Riferimenti bibliografici}},
+ reviewof = {{recensione di}{rec\adddotspace}},
+ screenplay = {{sceneggiatura}{scen\adddot}},
+ supptotitle = {{a}{a}},
+ typegeneraleditor = {{curatore generale}{cur\adddotspace gen\adddot}},
+ typescript = {{dattiloscritto}{dattiloscritto}},
volstodate = {{volumi fino ad oggi}{volumi fino ad oggi}},
- supptotitle = {{a}{a}},
+ web = {{web}{web}},% 2.0 changed
+ with = {{con}{con}},
+ %%%%%%%%%%%%%%%%%%%%%%% The following translations still need to be verified
+ bycompilerandeditor = {{compilato e curato da}{comp\adddotspace e cur\adddotspace da}},% unverified - differs from "a cura di" for edited by: tense?
+ bycomposer = {{composto da}{composto da}},% unverified
+ byconductor = {{diretto da}{diretto da}},% unverified
+ bycreator = {{creato da}{creato da}},% unverified
+ bydirector = {{diretto da}{dirett\adddotspace da}},% unverified
+ byhost = {{ospitato da}{ospitato da}},% unverified
+ byinterviewer = {{intervista da}{intervista da}},% unverified
+ bynarrator = {{narrato da}{narrato da}},% unverified
+ byperformer = {{eseguita da}{eseguita da}},% unverified
+ byscreenplay = {{sceneggiatura di}{sceneggiatura di}},% unverified
+ conductor = {{dirett\adddot}{dirett\adddot}},% unverified
+ creator = {{creat\adddot}{creat\adddot}},% unverified
+ generaleditor = {{curatore generale}{cur\adddotspace gen\adddot}},
+ host = {{ospite}{ospite}},% unverified
+ interviewer = {{intervist\adddot}{intervist\adddot}},% unverified
+ narrator = {{narrat\adddot}{narrat\adddot}},% unverified
+ numbers = {{numeri}{numeri}},% unverified
+ recorded = {{registrato}{registrato}},% unverified
+ specissue = {{numero speciale della}{numero speciale della}},% unverified
+ tvepisode = {{episodio}{episodio}},% unverified
+ tvseason = {{stagione}{stagione}}% unverified
}
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-mla/mla-footnotes.cbx b/Master/texmf-dist/tex/latex/biblatex-mla/mla-footnotes.cbx
index ff89a9212f7..e5f7f8e262a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-mla/mla-footnotes.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-mla/mla-footnotes.cbx
@@ -1,5 +1,5 @@
% This cbx file does not supply a stand-alone type. Rather, these functions are separated in order to simplify maintenance of the main mla-strict.cbx file, since the MLA Handbook no longer advises on ways to style full bibliographic information in the footnote. To use MLA-style footnotes, please set your style to "mla" or "mla-strict" and add the option "autocite=footnote".
-\ProvidesFile{mla-footnotes.cbx}[2021/05/12 v2.0 biblatex citation style]
+\ProvidesFile{mla-footnotes.cbx}[2022/02/22 v2.1a biblatex citation style]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%% Format Declarations %%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-mla/mla-new.bbx b/Master/texmf-dist/tex/latex/biblatex-mla/mla-new.bbx
index fa518c9e519..8cbb688f91c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-mla/mla-new.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-mla/mla-new.bbx
@@ -1,5 +1,5 @@
% This file exists just to help avoid any breakage when updating from older versions of biblatex-mla.
-\ProvidesFile{mla-new.bbx}[2021/06/07 v2.0 biblatex citation style]
+\ProvidesFile{mla-new.bbx}[2022/02/22 v2.1a biblatex citation style]
\RequireBibliographyStyle{mla}
diff --git a/Master/texmf-dist/tex/latex/biblatex-mla/mla-new.cbx b/Master/texmf-dist/tex/latex/biblatex-mla/mla-new.cbx
index 6f5d00babfc..75d7bbb4c14 100644
--- a/Master/texmf-dist/tex/latex/biblatex-mla/mla-new.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-mla/mla-new.cbx
@@ -1,5 +1,5 @@
% This file exists just to help avoid any breakage when updating from older versions of biblatex-mla.
-\ProvidesFile{mla-new.cbx}[2021/06/07 v2.0 biblatex citation style]
+\ProvidesFile{mla-new.cbx}[2022/02/22 v2.1a biblatex citation style]
\RequireCitationStyle{mla}
diff --git a/Master/texmf-dist/tex/latex/biblatex-mla/mla-strict.bbx b/Master/texmf-dist/tex/latex/biblatex-mla/mla-strict.bbx
index ce97a2b3a04..2fe55a04e5b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-mla/mla-strict.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-mla/mla-strict.bbx
@@ -1,19 +1,133 @@
-% mla-strict.bbx, v2.0 2021/06/07 * compatible with biblatex 3.16
+% mla-strict.bbx, v2.1a 2022/02/22 * compatible with biblatex 3.16
% Maintained at <https://github.com/jmclawson/biblatex-mla>.
%
% Feel free to improve, redistribute, and adapt to your own ends. Please share improvements back to the project on GitHub or to James Clawson: <clawson@gmail.com>.
%
% This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license.
-\ProvidesFile{mla-strict.bbx}[2021/06/07 v2.0 biblatex bibliography style]
+\ProvidesFile{mla-strict.bbx}[2022/02/22 v2.1a biblatex bibliography style]
\RequireBibliographyStyle{standard}
\DeclareLanguageMappingSuffix{-mla}
-\NewBibliographyString{byserieseditor}
-\NewBibliographyString{reviewof}
+
+
+% add leading zero to page range
+\newrobustcmd*{\mkcomprangezero}{%
+ \begingroup
+ \@ifstar
+ {\blx@range@aux\blx@comprange@ii}
+ {\blx@range@aux\blx@comprange@i}}
+\def\blx@comprange@i[#1][#2]#3{%
+ \let\blx@tempa\@empty
+ \protected\def\blx@range@out@value{\appto\blx@tempa}%
+ \def\blx@range@out@item@process{#2}%
+ \let\blx@range@out@delim\blx@range@out@value
+ \let\blx@range@split\blx@genrange@split
+ \let\blx@range@process\blx@comprange@check
+ \blx@range@chunk{#3}%
+ \begingroup
+ \edef\blx@tempa{\endgroup
+ \unexpanded{#1}{\expandonce\blx@tempa}}%
+ \blx@tempa
+ \endgroup}
+\def\blx@comprange@ii[#1][#2]#3{%
+ \protected\def\blx@range@out@value{#1}%
+ \def\blx@range@out@item@process{#2}%
+ \let\blx@range@out@delim\@firstofone
+ \let\blx@range@split\blx@genrange@split
+ \let\blx@range@process\blx@comprange@check
+ \blx@range@chunk{#3}%
+ \endgroup}
+\def\blx@comprange@check#1#2{%
+ \blx@imc@ifinteger{#1}
+ {\blx@imc@ifinteger{#2}
+ {\@firstoftwo}
+ {\@secondoftwo}}
+ {\@secondoftwo}
+ {\blx@comprange@comp{#1}{#2}}
+ {\begingroup
+ \protected@edef\blx@tempc{\endgroup
+ \blx@range@out@value{%
+ \blx@range@out@item@process{\unexpanded{#1}}%
+ \noexpand\bibrangedash
+ \blx@range@out@item@process{\unexpanded{#2}}}}%
+ \blx@tempc}}
+\def\blx@comprange@comp#1#2{%
+ \def\blx@tempb{#1}%
+ \def\blx@tempc{#2}%
+ \let\blx@tempd\blx@tempc
+ \ifnum\c@maxcomprange<\abx@rangeproclimit\relax
+ \numdef\blx@tempe\abx@rangeproclimit
+ \else
+ \numdef\blx@tempe\c@maxcomprange
+ \fi
+ \blx@tempcntc=\blx@tempe\relax
+ \ifnum
+ \ifnum\c@mincompwidth<1\space1\fi
+ \ifnum\c@maxcomprange<10\space1\fi
+ \ifnum\c@mincomprange<\blx@tempb\space\else1\fi
+ \ifnum\blx@tempb<\numexpr\blx@tempcntc*10\relax\else1\fi
+ 0=\z@
+ \expandafter\blx@comprange@comp@div
+ \else
+ \expandafter\blx@comprange@end
+ \fi}
+\def\blx@comprange@end{%
+ \numdef\blx@tempb\blx@tempb
+ \ifnum\blx@tempe>\c@maxcomprange\relax
+ \numdef\blx@tempc\blx@tempc
+ \else
+ \numdef\blx@tempc\blx@tempd
+ \fi
+ \begingroup
+ \protected@edef\blx@tempb{\endgroup
+ \blx@range@out@value{%
+ \blx@range@out@item@process{\blx@tempb}%
+ \noexpand\bibrangedash
+ % mkcomprangezero changes start here
+ \ifnum\blx@tempc<10
+ \ifnum\blx@tempb<10
+ \blx@range@out@item@process{\blx@tempc}
+ \else
+ \blx@range@out@item@process{0\blx@tempc}% force leading zero
+ \fi
+ \else
+ \blx@range@out@item@process{\blx@tempc}
+ \fi}}% mkcomprangezero changes end here
+ \blx@tempb}
+\def\blx@comprange@comp@div{%
+ \unless\ifnum\blx@tempb<\blx@tempcntc
+ \blx@tempcnta\blx@tempb\relax
+ \blx@tempcntb\blx@tempc\relax
+ \divide\blx@tempcnta\blx@tempcntc
+ \divide\blx@tempcntb\blx@tempcntc
+ \ifnum\blx@tempcnta=\blx@tempcntb
+ \edef\blx@tempd{\expandafter\@gobble\blx@tempd}%
+ \numdef\blx@tempe\blx@tempcntc
+ \fi
+ \fi
+ \divide\blx@tempcntc10\relax
+ \ifnum
+ \ifnum\blx@tempcntc<10 1\fi
+ \ifnum\blx@tempcntc>\c@mincompwidth\else 1\fi
+ 0=\z@
+ \expandafter\blx@comprange@comp@div
+ \else
+ \expandafter\blx@comprange@end
+ \fi}
+%%%%% \end add leading zero to page range
+
+% \NewBibliographyString{byserieseditor}
+\NewBibliographyString{bydirector}
+\NewBibliographyString{bycreator}% 2.1
+\NewBibliographyString{creator}% 2.1
+\NewBibliographyString{byscreenplay}% 2.1
+\NewBibliographyString{tvseason}% 2.1
+\NewBibliographyString{tvepisode}% 2.1
+% \NewBibliographyString{reviewof} 2.1 ---- remove in favor of provided string reviewof
\NewBibliographyString{specissue}
-\NewBibliographyString{phd}
+\NewBibliographyString{phd}% ---------- FIXME: should these use some standard?
\NewBibliographyString{dphil}
\NewBibliographyString{lic}
\NewBibliographyString{ma}
@@ -29,6 +143,10 @@
\NewBibliographyString{adaptor}
\NewBibliographyString{performer}
\NewBibliographyString{performers}
+\NewBibliographyString{byperformer}
+\NewBibliographyString{bynarrator}% 2.1
+\NewBibliographyString{narrator}% 2.1
+\NewBibliographyString{numbers}% 2.1
\NewBibliographyString{composer}
\NewBibliographyString{composedby}
\NewBibliographyString{producer}
@@ -36,39 +154,79 @@
\NewBibliographyString{proceedings}
\NewBibliographyString{compilerandeditor}%
\NewBibliographyString{bycompilerandeditor}%
-\NewBibliographyString{transof}%
+% \NewBibliographyString{transof}% -------- 2.1 replace with provided string translationof
\NewBibliographyString{volstodate}%
\NewBibliographyString{supptotitle}%
\NewBibliographyString{print}%
\NewBibliographyString{web}%
\NewBibliographyString{generaleditor}%
+\NewBibliographyString{conductor}% 2.1
+\NewBibliographyString{byconductor}% 2.1
+\NewBibliographyString{bycomposer}% 2.1
+\NewBibliographyString{recorded}% 2.1
+\NewBibliographyString{byhost}% 2.1
+\NewBibliographyString{host}% 2.1
+\NewBibliographyString{interviewer}% 2.1
+\NewBibliographyString{byinterviewer}% 2.1
\setlength{\bibitemsep}{0pt}
\renewcommand*{\mkbibnamesuffix}[1]{\addcomma\addlowpenspace#1}
+\renewcommand*{\bibdatetimesep}{\addcomma\addspace}
+\DeclareDelimFormat{andothersdelim}{\addspace}
+\DeclareDelimFormat[notreversed]{andothersdelim}{\addspace}
+\DeclareDelimFormat[bib]{andothersdelim}{\addcomma\addspace}
\DeclareNameAlias{author}{sortname}
-\@ifpackagelater{biblatex}{2016/03/01}{%
- \DeclareNameFormat{mla:last}{\nameparts{#1}\namepartfamily}%
- \DeclareNameFormat{default}{%
- \nameparts{#1}%
+\DeclareNameFormat{mla:last}{\nameparts{#1}\namepartfamily}%
+\DeclareNameFormat{default}{%
+ \nameparts{#1}%
\ifgiveninits{%
\usebibmacro{name:given-family}{\namepartfamily}{\namepartgiveni}{\namepartprefix}{\namepartsuffix}%
}{%
\usebibmacro{name:given-family}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}%
}%
- \usebibmacro{name:andothers}%
- }%
-}{%
- \DeclareNameFormat{mla:last}{#1}%
- \DeclareNameFormat{default}{%
- \iffirstinits{%
- \usebibmacro{name:first-last}{#1}{#4}{#5}{#7}%
- }{%
- \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
- }%
\usebibmacro{name:andothers}%
}%
-}
+
+% Redefined in 2.1 to move the name suffix (junior) after the given name in the bibliography
+\renewbibmacro*{name:family-given}[4]{%
+ \ifuseprefix
+ {\usebibmacro{name:delim}{#3#1}%
+ \usebibmacro{name:hook}{#3#1}%
+ \mkbibcompletenamefamilygiven{%
+ \ifdefvoid{#3}
+ {}
+ {\ifcapital
+ {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
+ {\mkbibnameprefix{#3}\isdot}%
+ \ifprefchar{}{\bibnamedelimc}}%
+ \mkbibnamefamily{#1}\isdot
+ \ifdefvoid{#2}
+ {}
+ {\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
+ \ifdefvoid{#4}
+ {}
+ {\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}
+ {\usebibmacro{name:delim}{#1}%
+ \usebibmacro{name:hook}{#1}%
+ \mkbibcompletenamefamilygiven{%
+ \mkbibnamefamily{#1}\isdot
+ \ifboolexpe{%
+ test {\ifdefvoid{#2}}
+ and
+ test {\ifdefvoid{#3}}}
+ {}
+ {\revsdnamepunct}%
+ \ifdefvoid{#2}
+ {}
+ {\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
+ \ifdefvoid{#3}
+ {}
+ {\bibnamedelimd\mkbibnameprefix{#3}\isdot}%
+ \ifdefvoid{#4}
+ {}
+ {\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}}
+
\defbibenvironment{bibliography}
{\list
@@ -80,7 +238,19 @@
{\endlist}
{\item}
+
+% compressing page ranges
+\setcounter{mincomprange}{100}
+% \setcounter{maxcomprange}{1000}
+\setcounter{mincompwidth}{10}
+
\DeclareFieldFormat{title:article}{\mkbibquote{#1}}%
+\DeclareFieldFormat{title:manuscript}{\mkbibquote{#1}}% 2.1
+\DeclareFieldFormat{title:artwork}{\mkbibemph{#1}}%
+\DeclareFieldFormat{title:music}{\mkbibquote{#1}}%
+\DeclareFieldFormat{title:audio}{\mkbibquote{#1}}%
+\DeclareFieldFormat{booktitle:music}{\mkbibemph{#1}}%
+\DeclareFieldFormat{booktitle:audio}{\mkbibemph{#1}}%
\DeclareFieldFormat{title:online}{\mkbibquote{#1}}%
\DeclareFieldFormat{title:inreference}{\mkbibquote{#1}}%
\DeclareFieldFormat{title:book}{\mkbibemph{#1}}
@@ -91,19 +261,37 @@
\DeclareFieldFormat{title:inproceedings}{\mkbibquote{#1}}%
\DeclareFieldFormat{title:mvbook}{\mkbibemph{#1}}% mla-2.0
\DeclareFieldFormat{title:patent}{\mkbibquote{#1}}
+\DeclareFieldFormat{title:proceedings}{\mkbibemph{#1}}% 2.1
+\DeclareFieldFormat{title:report}{\mkbibemph{#1}}% 2.1
+\DeclareFieldFormat{title:review}{\mkbibquote{#1}}% 2.1
+\DeclareFieldFormat{title:video}{\mkbibquote{#1}}% 2.1
+\DeclareFieldFormat{title:software}{\mkbibemph{#1}}% 2.1 added support for software
+\DeclareFieldFormat{title:performance}{\mkbibemph{#1}}% 2.1 added support for performance
+\DeclareFieldFormat{title:dataset}{\mkbibquote{#1}}% 2.1 added support for dataset
+\DeclareFieldFormat{title:misc}{#1}% 2.1 TRIED to support proper styling for citations of misc titles
+\DeclareFieldFormat{title:image}{#1}% 2.1 TRIED to support proper styling for citations of images
\DeclareFieldFormat{title:thesis}{\mkbibquote{#1}}%
\DeclareFieldFormat{title:unpublished}{\mkbibquote{#1}}%
\DeclareFieldFormat{title:reviewedbook}{\bibstring{reviewof}\addspace\mkbibemph{#1}}%
\DeclareFieldFormat{title:reference}{\mkbibemph{#1}}%
\DeclareFieldFormat{isbn}{#1}%
-\DeclareFieldFormat{pages}{\mkpageprefix[bookpagination]{#1}}
+% \DeclareFieldFormat{pages}{\mkpageprefix[bookpagination]{#1}}
+\DeclareFieldFormat{pages}{\mkcomprangezero[{\mkpageprefix[pagination]}]{#1}}% 2.1
\DeclareFieldFormat[review]{volume}{#1}%
\DeclareFieldFormat[article]{volume}{#1}%
\DeclareListFormat[article]{location}%
- {\unspace\mkbibbrackets{#1}\addspace}%
+ {\mkbibbrackets{#1}}% 2.1 removed spacing controls
\DeclareFieldFormat[article]{version}{#1\isdot}%
+\DeclareFieldFormat[review]{version}{#1\isdot}% 2.1
\DeclareFieldFormat[incollection]{bibliography:origyear}{\openrangeformat{#1}\addperiod}%
\DeclareFieldFormat[video]{mla:publimedium}{\MakeCapital{film}}%
+\DeclareFieldFormat[movie]{titleaddon}{\mkbibbrackets{\mkbibemph{#1}}}%
+\DeclareFieldFormat[movie]{version}{#1}%
+\DeclareFieldFormat[video]{title}{\mkbibquote{#1}}% 2.1
+\DeclareFieldFormat[video]{season}{\bibstring{tvseason}\addspace#1}% 2.1
+\DeclareFieldFormat[video]{number}{\bibstring{tvepisode}\addspace#1}% 2.1
+\DeclareFieldFormat{date:brackets}{\mkbibbrackets{#1}}% 2.1
+
\DeclareFieldFormat[patent]{number}{#1}%
@@ -116,7 +304,8 @@
\DeclareFieldFormat{mla:lowercase}{\MakeLowercase{#1}}%
\DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1}}%
\DeclareFieldFormat{issuetitle}{\mkbibemph{#1}}
-\DeclareFieldFormat{mla:newspaper:section}{\bibstring{section}\addspace#1}%
+\DeclareFieldFormat{mla:news:section:name}{#1\addspace\bibstring{section}}% 2.1
+\DeclareFieldFormat{mla:news:section:number}{\bibstring{section}\addspace#1}%
\DeclareFieldFormat{library}{#1\isdot}%
\DeclareFieldFormat{reviewededitor}{\bibstring{byeditor}\addspace#1}%
\DeclareFieldFormat{reviewedauthor}{\bibstring{byauthor}\addspace#1}%
@@ -147,43 +336,50 @@
\mkbibemph{Project Muse}}}
\DeclareFieldFormat{eprint}{\emph{#1}}%
\DeclareFieldFormat{doi}{%
- doi\addcolon%
+ https://doi.org/% 2.1
\ifhyperref%
{\href{https://doi.org/#1}{\nolinkurl{#1}}}%
{\nolinkurl{#1}}}
\DeclareFieldFormat{urldate}{#1}%
\DeclareFieldFormat[article,periodical,review]{volume}{\bibstring{volume}\ppspace#1}% volume of a journal
-\DeclareFieldFormat[article,periodical,review]{number}{\bibstring{number}\ppspace#1}% number of a journal
+% \DeclareFieldFormat[article,periodical,review]{number}{\bibstring{number}\ppspace#1}% number of a journal
+\DeclareFieldFormat[article,periodical,review,dataset]{number}{% 2.1
+ \ifnumerals{#1}%
+ {\ifnumeral{#1}%
+ {\bibstring{number}}%
+ {\bibstring{numbers}}}%
+ {}%
+ ~\mkcomprangezero{#1}}%
-\DeclareBibliographyAlias{artwork}{article}%
-\DeclareBibliographyAlias{audio}{article}%
\DeclareBibliographyAlias{booklet}{book}%
\DeclareBibliographyAlias{bookinbook}{incollection}%
\DeclareBibliographyAlias{collection}{book}%
\DeclareBibliographyAlias{reference}{book}%
-\DeclareBibliographyAlias{image}{article}%
+% \DeclareBibliographyAlias{image}{article}%
\DeclareBibliographyAlias{inbook}{incollection}%
\DeclareBibliographyAlias{letter}{article}%
\DeclareBibliographyAlias{manual}{book}% 2.0 ADDED √
\DeclareBibliographyAlias{misc}{article}% 2.0 ADDED √
-\DeclareBibliographyAlias{movie}{video}% 2.0 ADDED √
-\DeclareBibliographyAlias{music}{audio}%
+% \DeclareBibliographyAlias{video}{incollection}% 2.1 ADDED ... and then commented out this line
+\DeclareBibliographyAlias{audio}{music}%
\DeclareBibliographyAlias{online}{article}
\DeclareBibliographyAlias{patent}{article}% 2.0 ADDED √
\DeclareBibliographyAlias{report}{book}% 2.0 ADDED √
\DeclareBibliographyAlias{suppcollection}{suppbook}%
+\DeclareBibliographyAlias{dataset}{article}% 2.1 ADDED
\DeclareFieldAlias[online]{maintitle}{journaltitle}
\DeclareFieldAlias[book]{subtitle}{booksubtitle}
\DeclareFieldAlias[book]{title}{booktitle}
+\DeclareListAlias[report]{institution}{publisher}
% \DeclareFieldAlias[patent]{holder}{addendum}
\renewcommand*{\newunitpunct}{\addcomma\addspace}
-\renewcommand*{\multilistdelim}{/}
-\renewcommand*{\finallistdelim}{/}
+\renewcommand*{\multilistdelim}{\addspace/\addspace}
+\renewcommand*{\finallistdelim}{\addspace/\addspace}
+\renewcommand*{\revsdnamedelim}{\addcomma}
\renewcommand*{\newblockpunct}{\addperiod\addspace}
-\renewcommand*{\andothersdelim}{\ifcitation{}{\addcomma}\addspace}
\renewcommand*{\subtitlepunct}{\ifterm{}{\addcolon}\addspace}
\newboolean{bbx@mla-incollection}
@@ -209,6 +405,17 @@
\newboolean{bbx@uniquetranslator}%
\DeclareEntryOption{uniquetranslator}[true]{%
\setbool{bbx@uniquetranslator}{#1}}
+
+% especially for a tv episode with a unique named individual
+\newboolean{bbx@uniquenamea}%
+\newboolean{bbx@uniquenameb}%
+\newboolean{bbx@uniquenamec}%
+\DeclareEntryOption{uniquenamea}[true]{%
+ \setbool{bbx@uniquenamea}{#1}}
+\DeclareEntryOption{uniquenameb}[true]{%
+ \setbool{bbx@uniquenameb}{#1}}
+\DeclareEntryOption{uniquenamec}[true]{%
+ \setbool{bbx@uniquenamec}{#1}}
\newtoggle{bbx:showlocation}% 2.0 add a global/entry toggle to show location
\settoggle{bbx:showlocation}{false}
@@ -219,6 +426,53 @@
\settoggle{bbx:longdash}{true}
\DeclareBibliographyOption{longdash}[true]{\settoggle{bbx:longdash}{#1}}
+\newtoggle{bbx:datebrackets}% 2.1 new toggle to print date in brackets
+\settoggle{bbx:datebrackets}{false}
+\DeclareEntryOption{datebrackets}[true]{\settoggle{bbx:datebrackets}{#1}}
+
+\newtoggle{mla:image}% 2.1 new internal toggle for images
+\settoggle{mla:image}{false}
+
+\newtoggle{mla:delayed}% 2.1 new internal toggle for logic testing
+\settoggle{mla:delayed}{false}
+\newtoggle{del:p}% 2.1 delay plus, to add to containing
+\settoggle{del:p}{false}
+\newtoggle{del:m}% 2.1 delay minus, to subtract from containing
+\settoggle{del:m}{false}
+\newcounter{containing}% 2.1 new global/entry options for multivolumes
+\setcounter{containing}{0}
+\DeclareBibliographyOption[string]{containerized}[auto]{%
+ \ifthenelse{\equal{\detokenize{#1}}{\detokenize{auto}}}
+ {\settoggle{del:p}{false}\settoggle{del:m}{false}}% containerized=auto
+ {\ifthenelse{\equal{\detokenize{#1}}{\detokenize{true}}}
+ {\settoggle{del:p}{true}\settoggle{del:m}{false}}% ...=true
+ {\ifthenelse{\equal{\detokenize{#1}}{\detokenize{false}}}
+ {\settoggle{del:p}{false}\settoggle{del:m}{true}}% ...=false
+ {\PackageError{biblatex-mla}
+ {Option 'containerized=#1' invalid}
+ {The option you have supplied is invalid.\MessageBreak
+ Please choose among auto, true, and false.}}% ...!=auto;!=true;!=false
+ }% ...!=auto;!=true
+ }% ...!=auto
+}%
+\DeclareEntryOption[string]{containerized}[true]{%
+ \ifthenelse{\equal{\detokenize{#1}}{\detokenize{auto}}}
+ {\settoggle{del:p}{false}\settoggle{del:m}{false}}% containerized=auto
+ {\ifthenelse{\equal{\detokenize{#1}}{\detokenize{true}}}
+ {\settoggle{del:p}{true}\settoggle{del:m}{false}}% ...=true
+ {\ifthenelse{\equal{\detokenize{#1}}{\detokenize{false}}}
+ {\settoggle{del:p}{false}\settoggle{del:m}{true}}% ...=false
+ {\PackageError{biblatex-mla}
+ {Option 'containerized=#1' invalid}
+ {The option you have supplied is invalid.\MessageBreak
+ Please choose among auto, true, and false.}}% ...!=auto;!=true;!=false
+ }% ...!=auto;!=true
+ }% ...!=auto
+}%
+
+\ExecuteBibliographyOptions{containerized=auto}
+\ExecuteBibliographyOptions[inreference]{useeditor=false}
+
\newbool{bbx:gnoreminfo}%
\setbool{bbx:gnoreminfo}{false}
\DeclareBibliographyOption{noremoteinfo}[true]{\setbool{bbx:gnoreminfo}{#1}}
@@ -242,6 +496,7 @@
\newboolean{mla@nodate}%
\DeclareEntryOption{nodate}[true]{\setbool{mla@nodate}{#1}}
+
\ExecuteBibliographyOptions{maxnames=2,datezeros=false,eprint=true}%
\newrobustcmd{\openrangeformat}[1]{%
@@ -346,70 +601,132 @@
\usebibmacro{translator+othersstrg}\clearname{translator}}%
{\global\undef\bbx@lasthash}}
+\renewbibmacro*{bytranslator+othersstrg}{%
+ \let\abx@tempb=\empty
+ \ifnamesequal{editor}{translator}
+ {\iffieldundef{editortype}
+ {\def\abx@tempa{byeditortr}}
+ {\edef\abx@tempa{by\thefield{editortype}tr}}
+ \appto\abx@tempb{\clearname{editor}}}
+ {\def\abx@tempa{bytranslator}}%
+ \ifnamesequal{translator}{commentator}
+ {\appto\abx@tempa{co}%
+ \clearname{commentator}}
+ {\ifnamesequal{translator}{annotator}
+ {\appto\abx@tempa{an}%
+ \clearname{annotator}}
+ {}}%
+ \ifnamesequal{translator}{introduction}
+ {\appto\abx@tempa{in}%
+ \clearname{introduction}}
+ {\ifnamesequal{translator}{foreword}
+ {\appto\abx@tempa{fo}%
+ \clearname{foreword}}
+ {\ifnamesequal{translator}{afterword}
+ {\appto\abx@tempa{af}%
+ \clearname{afterword}}
+ {}}}%
+ \bibstring{\abx@tempa}\abx@tempb}
+
\newbibmacro*{journal+issue+year+pages}{%
\usebibmacro{journal+ser+vol+num}%
\setunit{\addspace}%
\printtext[parens]{%
\iffieldundef{issue}%
{\iffieldundef{month}%
- {\printfield{year}}%
+ {\printfield{year}\clearfield{year}}%
{\iffieldundef{day}%
- {\printfield{month}%
+ {\printfield{month}\clearfield{month}%
\setunit{\addspace}%
- \printfield{year}}%
- {\printtext{\bibdate}}}}%
+ \printfield{year}\clearfield{year}}%
+ {\printtext{\bibdate}\clearfield{year}\clearfield{month}\clearfield{day}}}}%
{\printfield{issue}%
\setunit{\addspace}%
- \printfield{year}}}%
+ \printfield{year}\clearfield{year}}}%
\newunit%
\printfield{pages}}
\renewbibmacro*{url+urldate}{%
\printfield[mla:capital:web]{url}\clearfield{url}%
\printunit{\addperiod\space}\newblock%
- \iffieldundef{urlyear}{}{\printtext{Accessed}\space\printurldate\clearfield{urlyear}}%
+ \iffieldundef{urlyear}{}{\bibstring{urlseen}\space\printurldate\clearfield{urlyear}}%
}
\newbibmacro*{mla:container:top}{%
\usebibmacro{bibindex}%
\usebibmacro{author/editor+others/translator+others}% bibnamedash
\setunit{\addperiod\space}\newblock%
- \ifthenelse{%
- \iffieldequalstr{entrytype}{suppbook}%
- \OR%
- \iffieldequalstr{entrytype}{suppcollection}}%
+ \ifthenelse{\iffieldequalstr{entrytype}{suppbook}%
+ \OR\iffieldequalstr{entrytype}{suppcollection}}%
{\usebibmacro{title}%
\printunit{\addperiod\space}\newblock%
\printfield[mla:capital]{entrysubtype}}% 2.0 adjusted to show both title and entrysubtype
{\ifentrytype{book}
{\usebibmacro{booktitle}}
{\usebibmacro{maintitle+booktitle}}}%
+ \newunit%
+ % \usebibmacro{byauthor}%
\printunit{\addperiod\space}\newblock%
- }
+ \ifthenelse{\ifentrytype{letter}}
+ {\usebibmacro{mla:archival}\newunit}
+ {}
+}
+
+\newbibmacro*{mla:imageholder:top}{% 2.1 used for works containing a cited image
+ \ifthenelse{\iffieldequalstr{entrytype}{suppbook}%
+ \OR\iffieldequalstr{entrytype}{suppcollection}}%
+ {\usebibmacro{title}%
+ \printunit{\addperiod\space}\newblock%
+ \printfield[mla:capital]{entrysubtype}}%
+ {\ifentrytype{book}
+ {\usebibmacro{booktitle}}
+ {\usebibmacro{maintitle+booktitle}}}%
+ \newunit%
+ \usebibmacro{byauthor}%
+ \newunit%
+}
\newbibmacro*{mla:container:one}{%
- \usebibmacro{mla:article:journal+issuetitle}%
+ \ifthenelse{\iffieldequalstr{entrytype}{software}}%
+ {\usebibmacro{mla:container:software}}%
+ {\usebibmacro{mla:article:journal+issuetitle}}%
\newunit\newblock
- \printfield{note}%
+ \printfield{note}\clearfield{note}%
\newunit%
\printfield{pages}%
\newunit%
- \ifthenelse{\iffieldundef{eprinttype} \OR \(\iffieldundef{eprinttype} \AND \iffieldundef{eprint}\)}
+ \ifthenelse{\iffieldundef{eprinttype}\OR%
+ \(\iffieldundef{eprinttype}\AND%
+ \iffieldundef{eprint}\)}%
{}%\usebibmacro{url+urldate}}% mla9 - drop
{}%
- \printunit{\addperiod\space}\newblock%
}
\newbibmacro*{mla:container:two}{%
\usebibmacro{mla:isbn/issn+doi+eprint}%
- \newunit\newblock
+ \ifthenelse{\iffieldequalstr{entrytype}{software}}%
+ {\ifthenelse{\iffieldundef{eventyear}}
+ {}
+ {\bibstring{urlseen}\space\printeventdate%
+ \clearfield{eventyear}\clearfield{eventmonth}\clearfield{eventday}}}% 2.1
+ {}%
+ \newunit
+ \printfield{note}\clearfield{note}%
+ \newunit
\usebibmacro{url+urldate}%
- \newunit\newblock
+ \newunit
\printfield{addendum}%
\printunit{\addperiod\space}\newblock%
\usebibmacro{pageref}%
}
+\newbibmacro*{mla:container:software}{%
+ \newunit\newblock
+ \printfield{version}\clearfield{version}%
+ \newunit%
+ \printlist{publisher}\clearlist{publisher}
+ }
+
\DeclareFieldFormat{titlea}{\mkbibemph{#1}}
\DeclareFieldFormat{titleb}{\mkbibemph{#1}}
\DeclareFieldFormat[mlasource]{mla:unstyled}{#1}
@@ -449,19 +766,19 @@
\newbibmacro*{mla:containerb}{%
\printfield{titleb}%
- \newunit\newblock
+ \newunit
\printfield{contributorb}%
- \newunit\newblock
+ \newunit
\printfield{versionb}%
- \newunit\newblock
+ \newunit
\printfield{numberb}%
- \newunit\newblock
+ \newunit
\printfield{publisherb}%
- \newunit\newblock
+ \newunit
\printfield{dateb}%
- \newunit\newblock
+ \newunit
\printfield{locationb}%
- \newunit\newblock
+ \newunit
\printfield{supplementalb}%
}
@@ -476,40 +793,63 @@
\DeclareBibliographyDriver{book}{%
\usebibmacro{mla:container:top}%
\printunit{\addperiod\space}\newblock%
+ \newunit{}%
+ \usebibmacro{test:mla:delayed}% 2.1 new test and toggle
+ \usebibmacro{byauthor}% 2.1 moved
+ \newunit{}%
\usebibmacro{bytranslator+others}%
\newunit%
\usebibmacro{byeditor+others}%
\newunit%
\printfield{edition}\isdot%
\newunit%
- \iffieldundef{maintitle}{\printfield{volume}\clearfield{volume}\printfield{part}}{}%
+ \iffieldundef{maintitle}% 2.1
+ % \iftoggle{mla:delayed}% 2.1
+ % \ifnumcomp{\value{containing}}{<}{2}% 2.1
+ {\printfield{volume}\clearfield{volume}\printfield{part}}%
+ {}%
% \newunit%
% \iffieldundef{volume}{\printfield{volumes}\clearfield{volumes}}{}%% 2.0 undefined to show later
\newunit%
- \usebibmacro{series+number}%
- \newunit%
\printfield{note}%
\newunit%
- \iftoggle{bbx:showlocation}{\printlist{location}}{}% new toggle IN 2.0
- \newunit%
- \iffieldundef{maintitle}
- {\newunit%
- \printlist{publisher}\clearlist{publisher}}
- {}%
+ \iftoggle{mla:delayed}%
+ {}%
+ {\printfield{version}\clearfield{version}%
+ \newunit%
+ \iftoggle{bbx:showlocation}%
+ {\printlist{location}\clearlist{location}}%
+ {}%
+ \newunit%
+ \printlist{publisher}\clearlist{publisher}%
+ \newunit%
+ \printlist{institution}\clearlist{institution}}%
\newunit%
- \printdate%
+ \usebibmacro{mla:date}%
+ % \printdate\clearfield{year}\clearfield{month}\clearfield{day}%
\newunit%
\printfield{pages}% really?
\newunit\newblock%
\usebibmacro{mla:isbn/issn+doi+eprint}%
\newunit%
+ \usebibmacro{url+urldate}%
+ \newunit%
\iffieldundef{origtitle}%
{}%
{\usebibmacro{mla:reprint}}%
\setunit{\addperiod\addspace}%
- \iffieldundef{volumes}%
- {}%
- {\usebibmacro{mla:multivolumes}}%
+ % \ifthenelse{\NOT\iffieldundef{volume}%
+ % \AND\NOT\iffieldundef{maintitle}}% 2.1
+ % {\printfield{volume}\clearfield{volume}%
+ % \setunit{\addspace\bibstring{ofseries}\addspace}%
+ % \usebibmacro{mla:multivolumes}}%
+ % {}%
+ % \newunit%
+ \usebibmacro{mla:series+maintitle+combo}% 2.1
+ % \newunit%
+ % \iffieldundef{volumes}%
+ % {}%
+ % {\usebibmacro{mla:multivolumes}}% mla:series+maintitle+combo
\newunit%
\printfield[mla:sentence-case]{addendum}%
\newunit%
@@ -520,11 +860,55 @@
\DeclareBibliographyDriver{article}{%
\usebibmacro{mla:container:top}%
\printunit{\addperiod\space}\newblock%
- \usebibmacro{mla:container:one}%
+ \ifnameundef{translator}% 2.1 include article translator
+ {}
+ {\usebibmacro{bytranslator+othersstrg}%
+ \setunit{\addspace}%
+ \ifnamesequal{labelname}{translator}%
+ {\printnames[mla:last]{translator}}%
+ {\printnames[byauthor]{translator}}%
+ \clearname{translator}}%
\printunit{\addperiod\space}\newblock%
+ \usebibmacro{mla:container:one}%
+ \ifthenelse{\iffieldequalstr{entrysubtype}{newspaper} \or \iffieldequalstr{entrysubtype}{magazine} \or \iffieldequalstr{entrysubtype}{blog} \or \iffieldequalstr{entrysubtype}{comment} \or \iffieldequalstr{entrysubtype}{online} \or \iffieldequalstr{entrytype}{online} \or \iffieldequalstr{entrytype}{software}}%
+ {\printunit{\addcomma\space}\newblock}% 2.1
+ {\printunit{\addperiod\space}\newblock}%
\usebibmacro{mla:container:two}%
\usebibmacro{finentry}}
+\newbibmacro*{test:mla:delayed}{% 2.1
+ \setcounter{containing}{0}
+ \ifthenelse{\iffieldequalstr{editortype}{generaleditor}\OR%
+ \iffieldequalstr{editoratype}{generaleditor}\OR%
+ \iffieldequalstr{editorbtype}{generaleditor}\OR%
+ \iffieldequalstr{editorctype}{generaleditor}}%
+ {\addtocounter{containing}{1}}%
+ {}%
+ \ifthenelse{\NOT\iffieldundef{maintitle}\AND%
+ \(\NOT\iffieldundef{booktitle}\OR
+ \NOT\iffieldundef{title}\)}%
+ {\addtocounter{containing}{1}}%
+ {}%
+ \ifthenelse{\NOT\iffieldundef{eventdate}}%
+ {\addtocounter{containing}{1}}%
+ {}%
+ \ifthenelse{\NOT\iffieldundef{volumes}}%
+ {\addtocounter{containing}{1}}%
+ {}%
+ \ifthenelse{\NOT\iffieldundef{volume}}%
+ {\addtocounter{containing}{1}}%
+ {}%
+ \iftoggle{del:p}% if delay plus
+ {\addtocounter{containing}{10}}
+ {}
+ \iftoggle{del:m}% if delay minus
+ {\addtocounter{containing}{-10}}
+ {}
+ \ifnumcomp{\value{containing}}{>}{2}%
+ {\settoggle{mla:delayed}{true}}%
+ {\settoggle{mla:delayed}{false}}%
+}
+
\DeclareBibliographyDriver{periodical}{%
\usebibmacro{bibindex}%
\usebibmacro{author/editor+others/translator+others}%
@@ -545,21 +929,46 @@
\newunit%
\usebibmacro{finentry}}
+\newbibmacro*{mla:date}{% 2.1
+ \iftoggle{bbx:datebrackets}%
+ {\printtext[date:brackets]{\printdate}}%
+ {\printdate}%
+ \clearfield{year}%
+}%
+
\newbibmacro*{mla:reprint}{%
\iffieldundef{origtitle}%
{\newunit}%
{\iflistundef{origlanguage}
{\setunit{\newunitpunct\bibstring{reprintof}\addspace}}%
- {\setunit{\newunitpunct\bibstring{transof}\addspace}}%
-}%
+ {\setunit{\newunitpunct\bibstring{translationof}\addspace}}%
+ }%
\printfield[title:\strfield{entrytype}]{origtitle}%
\newunit\newblock%
- \printlist{origlocation}\clearlist{origlocation}%
- \setunit*{\addcolon\addspace}%
- \printlist{origpublisher}\clearlist{origpublisher}%
- \newunit%
+ \iffieldequalstr{entrysubtype}{artwork}%
+ {}%
+ {\printlist{origlocation}\clearlist{origlocation}%
+ \newunit%
+ \printlist{origpublisher}\clearlist{origpublisher}%
+ \newunit}%
\ifbool{bbx@mla-incollection}%
- {\printfield[bibliography:origyear]{origyear}\clearfield{origyear}}%
+ {\ifthenelse{\iffieldequalstr{entrytype}{music}\OR%
+ \iffieldequalstr{entrytype}{audio}}%
+ {\iffieldundef{origyear}%
+ {}%
+ {\bibstring{recorded}% platypus - localize this
+ \addspace%
+ \printorigdate\clearfield{origyear}}}%
+ {%\printfield[bibliography:origyear]{origyear}
+ \printorigdate\clearfield{origyear}%
+ \newunit%
+ \iffieldequalstr{entrysubtype}{artwork}%
+ {\printlist{institution}\clearlist{institution}%
+ \newunit%
+ \printlist{origlocation}\clearlist{location}}%
+ {}
+ }%
+ }%
{\ifthenelse{\iffieldundef{volume}\OR\iffieldundef{volumes}}%
{\printorigdate\clearfield{origyear}}%
{}%
@@ -573,6 +982,12 @@
\newunit%
\printfield{volume}%
\newunit%
+ \printfield{version}\clearfield{version}%
+ \newunit%
+ \iftoggle{bbx:showlocation}%
+ {\printlist{location}\clearlist{location}}%
+ {}%
+ \newunit%
\printlist{publisher}\clearlist{publisher}%
\newunit%
\printeventdate\clearfield{eventyear}%
@@ -609,14 +1024,20 @@
\newbibmacro*{mla:generaleditor:internal}[1]{%
\iffieldequalstr{editor#1type}{generaleditor}%
- {\printnames{editor#1}%
+ {\printnames{editor#1}\clearname{editor#1}%
\setunit{\addcomma\addspace}
- \bibstring{generaleditor}
+ \bibstring{generaleditor}\clearfield{editor#1type}
\newunit}%
{}%
}
\newbibmacro*{mla:isbn/issn+doi+eprint}{%
+ \iftoggle{bbx:eprint}
+ {\setunit{\addperiod\space}\newblock\usebibmacro{eprint+extra}}
+ {}%
+ \newunit\newblock
+ \printdate\clearfield{year}\clearfield{month}\clearfield{day}% 2.1
+ \newunit\newblock
\iftoggle{bbx:isan}{\printfield{isan}\clearfield{isan}}{}%
\newunit\newblock%
\iftoggle{bbx:isbn}{\printfield{isbn}\clearfield{isbn}}{}%
@@ -629,13 +1050,12 @@
\newunit\newblock%
\iftoggle{bbx:doi}{\printfield{doi}\clearfield{doi}}{}%
\newunit\newblock%
- \iftoggle{bbx:eprint}{\setunit{\addperiod\space}\newblock\usebibmacro{eprint+extra}}{}%
- \newunit\newblock}
+}
\newbibmacro*{eprint+extra}{%
\iffieldundef{eprinttype}
{\printfield{eprint}}
- {\iffieldundef{eprint}
+ {\printunit{\addperiod\space}\iffieldundef{eprint}
{\printfield{eprinttype}}
{\printfield[eprint:\strfield{eprinttype}]{eprint}}}}
@@ -671,12 +1091,11 @@
\usebibmacro{bibindex}%
\usebibmacro{author/editor+others/translator+others}%
\setunit{\addperiod\space}\newblock%
- \ifthenelse{%
- \iffieldequalstr{entrysubtype}{book}%
- \OR%
- \iffieldequalstr{entrysubtype}{play}%
- \OR%
- \iffieldequalstr{entrytype}{bookinbook}}%
+ \ifthenelse{\iffieldequalstr{entrysubtype}{book}%
+ \OR\iffieldequalstr{entrysubtype}{play}%
+ \OR\iffieldequalstr{entrysubtype}{album}%
+ \OR\iffieldequalstr{entrysubtype}{artwork}%
+ \OR\iffieldequalstr{entrytype}{bookinbook}}%
{\usebibmacro{title:incollection:italics}}%
{\setbool{bbx@mla-incollection}{true}%
\usebibmacro{title}%
@@ -685,6 +1104,21 @@
\ifbool{bbx@uniquetranslator}%
{\usebibmacro{bytranslator+others}}%
{}%
+ \ifbool{bbx@uniquenamea}% new in 2.1
+ {\newunit%
+ \usebibmacro{mla:special:localized:first-last}{namea}
+ \clearname{namea}}%
+ {}%
+ \ifbool{bbx@uniquenameb}% new in 2.1
+ {\newunit%
+ \usebibmacro{mla:special:localized:first-last}{nameb}
+ \clearname{nameb}}%
+ {}%
+ \ifbool{bbx@uniquenamec}% new in 2.1
+ {\newunit%
+ \usebibmacro{mla:special:localized:first-last}{namec}
+ \clearname{namec}}%
+ {}%
\setunit{\addperiod\addspace}%
\iffieldundef{crossref}%
{\iffieldundef{xref}%
@@ -700,28 +1134,132 @@
\newunit}%
\newunit%
\usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{music}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{author/editor+others/translator+others}%
+ \setunit{\addperiod\space}\newblock%
+ \ifthenelse{\iffieldequalstr{entrysubtype}{album}}%
+ {\usebibmacro{title:incollection:italics}\clearfield{title}}%
+ {\setbool{bbx@mla-incollection}{true}%
+ \usebibmacro{title}%
+ \setbool{bbx@mla-incollection}{false}\clearfield{title}}%
+ \newunit\newblock%
+ \ifbool{bbx@uniquenamea}%
+ {\newunit%
+ \usebibmacro{mla:special:localized:first-last}{namea}
+ \clearname{namea}}%
+ {}%
+ \ifbool{bbx@uniquenameb}%
+ {\newunit%
+ \usebibmacro{mla:special:localized:first-last}{nameb}
+ \clearname{nameb}}%
+ {}%
+ \ifbool{bbx@uniquenamec}%
+ {\newunit%
+ \usebibmacro{mla:special:localized:first-last}{namec}
+ \clearname{namec}}%
+ {}%
+ \setunit{\addperiod\addspace}%
+ \iffieldundef{crossref}%
+ {\iffieldundef{xref}%
+ {\usebibmacro{mla:incollection:internal}}%
+ {\bbx@crossref{\thefield{xref}}%
+ \setunit{\addspace}%
+ \printfield{pages}}}%
+ {\bbx@crossref{\thefield{crossref}}%
+ \setunit{\addcomma\addspace}%
+ \printfield{volume}%
+ \setunit{\addcomma\addspace}%
+ \printfield{pages}%
+ \newunit}%
+ \newunit%
+ \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{artwork}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{author/editor+others/translator+others}%
+ \setunit{\addperiod\space}\newblock%
+ \usebibmacro{title}
+ \setunit{\addperiod\space}\newblock%
+ \iffieldundef{eventtitle}%
+ {}%
+ {\printfield[booktitle]{eventtitle}}%
+ \newunit%
+ \iffieldundef{eventyear}%
+ {}%
+ {\printeventdate\clearfield{eventyear}\clearfield{eventmonth}\clearfield{eventday}}%
+ \newunit%
+ \printdate\clearfield{year}\clearfield{month}\clearfield{day}%
+ \newunit%
+ \printlist{institution}%
+ \newunit%
+ \printlist{location}%
+ \newunit%
+ \usebibmacro{mla:isbn/issn+doi+eprint}
+ \newunit
+ \usebibmacro{url+urldate}%
+ \setunit{\addperiod\space}\newblock%
+ \printfield{addendum}%
+ \newunit%
+ \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{image}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{author/editor+others/translator+others}%
+ \setunit{\addperiod\space}\newblock%
+ \usebibmacro{title}
+ \setunit{\addperiod\space}\newblock%
+ \iffieldundef{related}%
+ {}%
+ {\entrydata{\thefield{related}}
+ {\usedriver
+ {\togglefalse{blx@useauthor}%
+ \settoggle{mla:image}{true}}%
+ {\thefield{entrytype}}%
+ % \usebibmacro{mla:imageholder:top}
+ % \printunit{\addperiod\space}\newblock%
+ % \usebibmacro{mla:container:one}%
+ % \setunit{\addperiod\space}\newblock%
+ % \usebibmacro{mla:container:two}%
+ % \usebibmacro{finentry}
+ }
+ }%
+ % \printdate%
+ % \newunit%
+ % \printlist{institution}%
+ % \newunit%
+ % \printlist{location}%
+ % \newunit%
+ % \usebibmacro{mla:isbn/issn+doi+eprint}
+ % \newunit
+ % \usebibmacro{url+urldate}%
+ % \setunit{\addperiod\space}\newblock%
+ % \printfield{addendum}%
+ \newunit%
+ \usebibmacro{finentry}}
\newbibmacro*{mla:incollection:internal}{%
\setbool{bbx@mla-incollection}{true}%
\usebibmacro{maintitle+booktitle}%
\ifthenelse{%
- \iffieldequalstr{entrytype}{suppbook}%
- \OR%
- \iffieldequalstr{entrytype}{suppcollection}%
- \OR%
- \iffieldequalstr{entrysubtype}{interview}%
- \OR%
+ \iffieldequalstr{entrytype}{suppbook}\OR%
+ \iffieldequalstr{entrytype}{suppcollection}\OR%
+ \iffieldequalstr{entrysubtype}{interview}\OR%
+ \iffieldequalstr{entrysubtype}{artwork}\OR%
\iffieldequalstr{entrysubtype}{untitled}}%
{\setunit{\newunitpunct\bibstring{byauthor}\addspace}%
\ifnamesequal{labelname}{bookauthor}%
{\printnames[mla:last]{bookauthor}}%
{\printnames[byauthor]{bookauthor}}}%
{}%
- \newunit\newblock%
+ \newunit%
\usebibmacro{byauthor}%
- \newunit\newblock
- \usebibmacro{byeditor+others}%
- \newunit\newblock
+ \newunit
+ \usebibmacro{mla:generaleditor}%
+ \newunit
+ \usebibmacro{byeditor+others}% platypus-return
+ \newunit
\printfield{edition}\isdot%
\newunit
\iffieldundef{maintitle}%
@@ -753,6 +1291,59 @@
\usebibmacro{pageref}%
\setbool{bbx@mla-incollection}{false}}
+\renewbibmacro*{byeditor+others}{% 2.1 redefined
+ \delimcontext{notreversed}
+ \ifnameundef{editor}
+ {}
+ {\iffieldequalstr{editortype}{generaleditor}
+ {}
+ {\usebibmacro{byeditor+othersstrg}%
+ \setunit{\addspace}}%
+ \ifnamesequal{labelname}{editor}%
+ {\printnames[mla:last]{editor}}% 2.1 print only last with repeat
+ {\printnames[byauthor]{editor}}%
+ \clearname{editor}%
+ \newunit}%
+ \usebibmacro{byeditorx}%
+ \iftoggle{mla:delayed}
+ {}
+ {\usebibmacro{mla:generaleditor}}%
+ \usebibmacro{bytranslator+others}}
+
+\renewbibmacro*{bytranslator+others}{% 2.1 renewed
+ \ifnameundef{translator}
+ {}
+ {\usebibmacro{bytranslator+othersstrg}%
+ \setunit{\addspace}%
+ \ifnamesequal{labelname}{translator}%
+ {\printnames[mla:last]{translator}}% 2.1 print only last with repeat
+ {\printnames[byauthor]{translator}}%
+ \clearname{translator}%
+ \newunit}%
+ \usebibmacro{withothers}}
+
+\renewbibmacro*{withothers}{% 2.1 nameb
+ \usebibmacro{withcommentator}%
+ \clearname{commentator}%
+ \newunit
+ \usebibmacro{withannotator}%
+ \clearname{annotator}%
+ \newunit
+ \usebibmacro{withintroduction}%
+ \clearname{introduction}%
+ \newunit
+ \usebibmacro{withforeword}%
+ \clearname{foreword}%
+ \newunit
+ \usebibmacro{withafterword}%
+ \clearname{afterword}%
+ \newunit%
+ \usebibmacro{mla:special:localized:first-last}{namea}
+ \newunit%
+ \usebibmacro{mla:special:localized:first-last}{nameb}
+ \newunit%
+ \usebibmacro{mla:special:localized:first-last}{namec}}
+
\DeclareBibliographyDriver{inproceedings}{%
\usebibmacro{bibindex}%
\usebibmacro{author/editor+others/translator+others}%
@@ -771,10 +1362,7 @@
\newunit\newblock
\usebibmacro{chapter+pages}%
\newunit\newblock
- \printfield{addendum}%
- \newunit\newblock
- \usebibmacro{pageref}%
- \newunit%
+ \usebibmacro{mla:container:two}% 2.1
\usebibmacro{finentry}}
\DeclareBibliographyDriver{proceedings}{%
@@ -807,7 +1395,25 @@
\setunit{\addperiod\space}\newblock%
\printfield{note}%
\newunit\newblock%
- \printfield{origyear}
+ \iffieldundef{eventyear}%
+ {\usebibmacro{mla:archival}}%
+ {\printlist{organization}%
+ \newunit
+ \printeventdate\clearfield{eventyear}%
+ \newunit
+ \printfield{venue}%
+ \newunit
+ \printlist{location}}%
+ \newunit%
+ \printdate\clearfield{year}\clearfield{month}\clearfield{day}%
+ \setunit{\addperiod\addspace}
+ \printfield{addendum}%
+ \newunit%
+ \usebibmacro{finentry}}
+
+\newbibmacro*{mla:archival}{%
+ \printorigdate\clearfield{origyear}\clearfield{origmonth}\clearfield{origday}%
+ \iforigdateuncertain{\unspace,\addspace}{\newunit\newblock}% 2.1
\newunit\newblock
\printfield{library}%
\newunit%
@@ -816,10 +1422,7 @@
\usebibmacro{mla:all:type}%
\setunit{\addspace}
\printfield{number}%
- \setunit{\addperiod\addspace}
- \printfield{addendum}%
- \newunit%
- \usebibmacro{finentry}}
+}
\DeclareBibliographyDriver{thesis}{%
\usebibmacro{bibindex}%
@@ -829,7 +1432,7 @@
\setunit{\addperiod\space}\newblock%
\iffieldequalstr{entrysubtype}{published}%
{\printfield{origyear}\clearfield{origyear}}%
- {\printfield{year}}%
+ {\printfield{year}\clearfield{year}}% 2.1 add clearfield
\printunit{\addperiod\space}\newblock%
\newunit\newblock
\printlist{institution}%
@@ -841,6 +1444,11 @@
\newunit%
\usebibmacro{publisher+location+date}}%
{}%
+ \newunit%
+ \usebibmacro{mla:isbn/issn+doi+eprint}%
+ \newunit%
+ \usebibmacro{url+urldate}%
+ \newunit%
\newunit\newblock
\printfield{addendum}%
\newunit\newblock
@@ -851,14 +1459,19 @@
\usebibmacro{bibindex}%
\usebibmacro{author}%
\setunit{\addperiod\space}\newblock%
- \printfield[title:article]{title}%
+ \iffieldundef{title}%
+ {}%
+ {\usebibmacro{title+stitle}}% 2.1
+ % \printfield[title:article]{title}%
\setunit{\addperiod\space}\newblock%
\printfield[title:reviewedbook]{booktitle}%
\newunit%
\ifnameundef{bookauthor}%
- {\printtext[reviewededitor]{\printnames[default]{editor}}}%
+ {\ifnameundef{editor}%
+ {}%
+ {\printtext[reviewededitor]{\printnames[default]{editor}}}}%
{\printtext[reviewedauthor]{\printnames[default]{bookauthor}}}%
- \setunit{\addperiod\space}\newblock%
+ \printunit{\addperiod\space}\newblock%
\usebibmacro{mla:container:one}%
\setunit{\addperiod\space}\newblock%
\usebibmacro{mla:container:two}%
@@ -936,62 +1549,181 @@
\clearname{#1}%
}
-\newbibmacro{mla:video:localized:first-last}[1]{%
+\newbibmacro{mla:special:localized:first-last}[1]{%
\ifnameundef{#1}%
{}%
{\ifthenelse{\iffieldbibstring{#1type} \and \not %
- \iffieldundef{#1type} \and \not %
- \iffieldequalstr{#1type}{composer}}%
- {\bibstring{\thefield{#1type}}}%
+ \iffieldundef{#1type}}% \and \not \iffieldequalstr{#1type}{composer}% 2.1 clean up composer, moving from composedby to bycomposer
+ {\ifbibxstring{by\thefield{#1type}}
+ {\bibstring{by\thefield{#1type}}}
+ {\bibstring{\thefield{#1type}}}}%
{\iffieldundef{#1type}%
{\bibstring{with}}%
- {\iffieldequalstr{#1type}{composer}%
- {\bibstring{composedby}}%
- {\printfield[mla:capital]{#1type}}}}%
- \addspace\printnames[byeditor][-\value{listtotal}]{#1}}%
+ % {\iffieldequalstr{#1type}{composer}%
+ % {\bibstring{composedby}}%
+ % {\printfield[mla:capital]{#1type}}}}%
+ {\printfield[mla:capital]{#1type}}}%
+ \addspace%
+ % Check to see if the name matches the labelname
+ \ifnamesequal{labelname}{#1}%
+ {\printnames[mla:last]{#1}\clearname{#1}}%
+ {\printnames[byeditor][-\value{listtotal}]{#1}\clearname{#1}}%
+ }%
\newunit}%
\newbibmacro{mla:video:name:second:footnote}[1]{%
\ifnameundef{#1}%
{}%
{\ifthenelse{\iffieldbibstring{#1type} \and \not %
- \iffieldundef{#1type} \and \not %
- \iffieldequalstr{#1type}{composer}}%
+ \iffieldundef{#1type}}% \and \not \iffieldequalstr{#1type}{composer}% 2.1 clean up composer, moving from composedby to bycomposer
{\bibstring{\thefield{#1type}}}%
{\iffieldundef{#1type}%
{\bibstring{with}}%
- {\iffieldequalstr{#1type}{composer}%
- {\bibstring{composedby}}%
- {\printfield[mla:lowercase]{#1type}}}}%
+ % {\iffieldequalstr{#1type}{composer}%
+ % {\bibstring{composedby}}%
+ % {\printfield[mla:lowercase]{#1type}}}}%
+ {\printfield[mla:lowercase]{#1type}}}%
\addspace\printnames[byeditor][-\value{listtotal}]{#1}%
}}%
-\DeclareBibliographyDriver{video}{%
+\DeclareBibliographyDriver{movie}{%
\ifnamesequal{labelname}{author}%
{\usebibmacro{mla:video:localized:last-first}{author}}{}%
\ifnamesequal{labelname}{editor}%
{\usebibmacro{mla:video:localized:last-first}{editor}}{}%
\printfield{title}%
- \setunit{\newunitpunct\bibstring{byauthor}\addspace}%
- \printnames[byeditor]{bookauthor}%
- \newunit%
+ \setunit{\addspace}%
+ \printfield{titleaddon}%
+ \setunit{\addperiod\addspace}%
+ \printfield{origyear}\clearfield{origyear}%
+ \printunit{\addperiod\addspace}%
+ \iffieldundef{bookauthor}%
+ {}%
+ {\bibstring{byauthor}\addspace\printnames[byeditor]{bookauthor}%
+ \newunit}%
\ifthenelse{\NOT\ifnamesequal{author}{labelname}%
- \AND\NOT\ifnameundef{author}}%
- {\usebibmacro{mla:video:localized:first-last}{author}}%
+ \AND\NOT\ifnameundef{author}}%
+ {\usebibmacro{mla:special:localized:first-last}{author}}%
{}%
\ifthenelse{\NOT\ifnamesequal{editor}{labelname}%
- \AND\NOT\ifnameundef{editor}}%
- {\usebibmacro{mla:video:localized:first-last}{editor}}%
+ \AND\NOT\ifnameundef{editor}}%
+ {\usebibmacro{mla:special:localized:first-last}{editor}}%
{}%
- \usebibmacro{mla:video:localized:first-last}{namea}%
- \usebibmacro{mla:video:localized:first-last}{nameb}%
- \usebibmacro{mla:video:localized:first-last}{namec}%
- \printfield{origyear}\clearfield{origyear}%
+ \usebibmacro{mla:special:localized:first-last}{namea}%
+ \usebibmacro{mla:special:localized:first-last}{nameb}%
+ \usebibmacro{mla:special:localized:first-last}{namec}%
+ \newunit%
+ \printfield{version}%
+ \newunit%
+ \printlist{publisher}%
+ \newunit%
+ \printfield{year}\clearfield{year}%
\newunit\newblock%
+ \usebibmacro{mla:container:two}%
+ \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{video}{%
+ \usebibmacro{author/editor+others/translator+others}% 2.1 changed
+ \setunit{\addperiod\space}\newblock%
+ \iffieldundef{maintitle}
+ {\printfield[maintitle]{title}}%
+ {\iffieldundef{title}%
+ {}%
+ {\usebibmacro{title+stitle}}% 2.1
+ }%
+ \printunit{\addperiod\addspace}%
+ \printfield{origyear}
+ \ifbool{bbx@uniquenamea}%
+ {\newunit%
+ \usebibmacro{mla:special:localized:first-last}{namea}
+ \clearname{namea}}%
+ {}%
+ \ifbool{bbx@uniquenameb}%
+ {\newunit%
+ \usebibmacro{mla:special:localized:first-last}{nameb}
+ \clearname{nameb}}%
+ {}%
+ \ifbool{bbx@uniquenamec}%
+ {\newunit%
+ \usebibmacro{mla:special:localized:first-last}{namec}
+ \clearname{namec}}%
+ {}%
+ \printunit{\addperiod\addspace}%
+ \iffieldundef{maintitle}% 2.1 added support for subtitles in maintitle
+ {}%
+ {\printtext[maintitle]{%
+ \printfield[noformat]{maintitle}%
+ \setunit{\subtitlepunct}%
+ \printfield[noformat]{mainsubtitle}}}%
+ \newunit%
+ \printfield{maintitleaddon}
+ \newunit%
+ \iffieldundef{bookauthor}%
+ {}%
+ {\bibstring{byauthor}\addspace\printnames[byeditor]{bookauthor}%
+ \newunit}%
+ \ifthenelse{\NOT\ifnamesequal{author}{labelname}%
+ \AND\NOT\ifnameundef{author}}%
+ {\usebibmacro{mla:special:localized:first-last}{author}}%
+ {}%
+ \ifthenelse{\NOT\ifnamesequal{editor}{labelname}%
+ \AND\NOT\ifnameundef{editor}}%
+ {\usebibmacro{mla:special:localized:first-last}{editor}}%
+ {}%
+ \usebibmacro{mla:special:localized:first-last}{namea}%
+ \usebibmacro{mla:special:localized:first-last}{nameb}%
+ \usebibmacro{mla:special:localized:first-last}{namec}%
+ \newunit%
+ \printfield{version}%
+ \newunit%
+ \printfield{season}\clearfield{season}
+ \newunit%
+ \printfield{number}\clearfield{number}
+ \newunit%
\printlist{publisher}%
\newunit%
- \printfield{year}%
+ \printdate\clearfield{year}\clearfield{month}\clearfield{day}%
\newunit\newblock%
+ \usebibmacro{mla:container:two}%
+ \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{performance}{% New in 2.1
+ \usebibmacro{mla:container:top}%
+ % \ifnamesequal{labelname}{author}%
+% {\usebibmacro{mla:video:localized:last-first}{author}}{}%
+% \ifnamesequal{labelname}{editor}%
+% {\usebibmacro{mla:video:localized:last-first}{editor}}{}%
+% \usebibmacro{title}%
+ \setunit{\addspace}%
+ \printfield{titleaddon}%
+ \setunit{\addperiod\addspace}%
+ \iffieldundef{bookauthor}%
+ {}%
+ {\bibstring{byauthor}\addspace\printnames[byeditor]{bookauthor}%
+ \newunit}%
+ \ifthenelse{\NOT\ifnamesequal{author}{labelname}%
+ \AND\NOT\ifnameundef{author}}%
+ {\usebibmacro{mla:special:localized:first-last}{author}}%
+ {}%
+ \ifthenelse{\NOT\ifnamesequal{editor}{labelname}%
+ \AND\NOT\ifnameundef{editor}}%
+ {\usebibmacro{mla:special:localized:first-last}{editor}}%
+ {}%
+ \usebibmacro{mla:special:localized:first-last}{namea}%
+ \usebibmacro{mla:special:localized:first-last}{nameb}%
+ \usebibmacro{mla:special:localized:first-last}{namec}%
+ \newunit%
+ \printlist{organization}%
+ \newunit%
+ \printeventdate\clearfield{eventyear}%
+ \newunit%
+ \printdate\clearfield{year}%
+ \newunit%
+ \printfield{venue}%
+ \newunit%
+ \printlist{location}%
+ \newunit\newblock%
+ \usebibmacro{mla:container:two}%
\usebibmacro{finentry}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -999,19 +1731,13 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% drivers to add eventually:
% * \DeclareBibliographyDriver{performance}
-%
-% Specifically important mainstay types to check for MLA users
-% 0 support for multiple publishers? % can't do with bibtex
-% * editorial
-% * letter (to the editor, etc.)
-% * interview
\newbibmacro*{mtitle+mstitle+vol+part+title+stitle}{%
\iffieldundef{maintitle}%
{}%
{\printtext[maintitle]{%
\printfield[noformat]{maintitle}%
- \newunit
+ \setunit{\subtitlepunct}% 2.1 fixed
\printfield[noformat]{mainsubtitle}}%
\setunit{\addspace}% 2.0 include titleaddon inside unit punctuation
\printfield{maintitleaddon}%
@@ -1029,10 +1755,22 @@
{\printfield{series}\clearfield{series}\setunit*{\addspace}\printfield{number}}%
}
+\newbibmacro*{mla:series+maintitle+combo}{% 2.1
+ \usebibmacro{series+number}%
+ \setunit{\addperiod\addspace}%
+ \iftoggle{mla:delayed}%
+ {}%
+ {\printfield{volume}\clearfield{volume}%
+ \setunit{\addspace\bibstring{ofseries}\addspace}}%
+ \usebibmacro{mla:multivolumes}%
+}
+
\renewbibmacro*{title}{%
\iffieldequalstr{entrytype}{thesis}%
{\usebibmacro{mla:title:thesis}}%
- {\ifthenelse{\iffieldequalstr{entrytype}{unpublished}\OR\iffieldequalstr{entrytype}{misc}} %
+ {\ifthenelse{\iffieldequalstr{entrytype}{unpublished}\OR%
+ \iffieldequalstr{entrysubtype}{untitled}\OR%
+ \iffieldequalstr{entrytype}{misc}} %
{\usebibmacro{mla:title:unpublished}}%
{\usebibmacro{title+stitle}}}}%
@@ -1042,7 +1780,7 @@
\printlist{publisher}%
\newunit%
\ifbool{mla@nodate}{\printtext{n.d.}}%
- \printdate%
+ \printdate\clearfield{year}\clearfield{month}\clearfield{day}%
\newunit}
\newbibmacro*{mla:title:unpublished}{%
@@ -1058,11 +1796,16 @@
\setunit*{\subtitlepunct}%
\printfield[noformat]{subtitle}}}%
}%
- \setunit{\addspace}% 2.0 include titleaddon inside unit punctuation
+ \ifthenelse{\ifentrytype{misc} \OR \iffieldequalstr{entrysubtype}{untitled}}
+ {\setunit{\addperiod\space}}% 2.1 add block for unformatted titleaddon
+ {\setunit{\addspace}}% 2.0 include titleaddon inside unit punctuation
\printfield[noformat]{titleaddon}%
- \printunit{\addperiod\space}%
+ \printunit{\addperiod\space}
+ % \setunit{\addspace}% 2.0 include titleaddon inside unit punctuation
+ % \printfield[noformat]{titleaddon}%
+ % \printunit{\addperiod\space}%
\usebibmacro{byauthor}%
- \iffieldundef{origtitle}%
+ \ifthenelse{\iffieldundef{origtitle}\AND\NOT\ifentrytype{letter}}%
{\usebibmacro{mla:reprint}}%
{}%
}%
@@ -1124,18 +1867,21 @@
\newunit}
\renewbibmacro*{maintitle+booktitle}{%
- \usebibmacro{booktitle}%
- \printunit*{\addperiod\space}%
+ \usebibmacro{booktitle}\clearfield{booktitle}% 2.1
+ \newunit%
\iffieldundef{maintitle}%
{}%
- {\usebibmacro{maintitle}%
+ {\usebibmacro{maintitle}\clearfield{maintitle}% 2.1
\newunit%
\iffieldundef{volume}%
{}%
{\printfield{volume}%
\printfield{part}%
\setunit{\addcolon\space}}}%
- \printunit*{\addperiod\space}}
+ \iftoggle{mla:image}
+ {\printunit{\addcomma\space}}
+ {\setunit*{\addperiod\space}}
+ }
\renewbibmacro*{booktitle}{%
\ifboolexpr{
@@ -1154,14 +1900,17 @@
}
\newbibmacro*{mla:proceedings:booktitle}{%
- \usebibmacro{booktitle}%
- \newunit%
- \iffieldundef{eventtitle}%
- {}%
- {\printtext[default]{%
- \bibstring{proceedings}\addspace\bibstring{ofseries}\addspace%
- \printfield[default]{eventtitle}\isdot}}%
- \setunit*{\isdot\addcomma\addspace}%
+ \iffieldundef{booktitle}% 2.1 for unpublished
+ {\printfield[default]{eventtitle}
+ \setunit*{\isdot\addcomma\addspace}}
+ {\usebibmacro{booktitle}%
+ \printunit{\addperiod\addspace}%
+ \iffieldundef{eventtitle}%
+ {}%
+ {\printtext[default]{%
+ \bibstring{proceedings}\addspace\bibstring{ofseries}\addspace%
+ \printfield[default]{eventtitle}\isdot}}
+ \setunit*{\isdot\addcomma\addspace}}%
\printlist{organization}%
\newunit%
\printeventdate%
@@ -1173,9 +1922,9 @@
\newbibmacro*{title+stitle}{%
\iffieldundef{title}%
{\ifthenelse{%
- \iffieldequalstr{entrytype}{suppbook}%
- \OR%
- \iffieldequalstr{entrytype}{suppcollection}}%
+ \iffieldequalstr{entrytype}{suppbook}\OR%
+ \iffieldequalstr{entrytype}{suppcollection}\OR%
+ \iffieldequalstr{entrytype}{review}}% added review in 2.1
{}%
{\ifthenelse{% 2.0 changed logic to allow for untitled pieces (e.g. for interviews)% CHECK
\iffieldundef{booktitle}}%
@@ -1184,19 +1933,27 @@
\printfield[noformat]{booktitle}%
\setunit*{\subtitlepunct}%
\printfield[noformat]{booksubtitle}}}}}%
- {\iffieldequalstr{entrysubtype}{untitled}% 2.0 added check to allow for works with unformatted titles
+ {\ifthenelse{\iffieldequalstr{entrysubtype}{untitled}\OR%
+ \iffieldequalstr{entrysubtype}{comment}}% 2.1
{\printfield[noformat]{title}%
\setunit*{\subtitlepunct}%
\printfield[noformat]{subtitle}}%
- {\printtext[title:\strfield{entrytype}]{%
+ {\ifthenelse{\iffieldequalstr{entrysubtype}{website}\AND
+ \iffieldequalstr{entrytype}{online}}
+ {\printtext[title:book]{%
\printfield[noformat]{title}%
\setunit*{\subtitlepunct}%
- \printfield[noformat]{subtitle}}}}%
+ \printfield[noformat]{subtitle}}%
+ \clearfield{title}\clearfield{subtitle}}%
+ {\printtext[title:\strfield{entrytype}]{%
+ \printfield[noformat]{title}%
+ \setunit*{\subtitlepunct}%
+ \printfield[noformat]{subtitle}}\clearfield{title}}}}%
\setunit{\addspace}% 2.0 include titleaddon inside unit punctuation
\printfield[noformat]{titleaddon}%
- \printunit{\addperiod\space}% 2.0 include titleaddon inside unit punctuation
- \usebibmacro{byauthor}%
- \iffieldundef{origtitle}%
+ \printunit{\addperiod\space}
+ % \usebibmacro{byauthor}% 2.1 commented out and moved
+ \ifthenelse{\iffieldundef{origtitle}\AND\NOT\ifentrytype{letter}}%
{\usebibmacro{mla:reprint}}%
{}%
}%
@@ -1207,7 +1964,8 @@
{\printtext[title:book]{%
\printfield[noformat]{title}%
\setunit*{\subtitlepunct}%
- \printfield[noformat]{subtitle}}%
+ \printfield[noformat]{subtitle}%
+ \clearfield{title}\clearfield{subtitle}}%
\setunit{\addspace}% 2.0 include titleaddon inside unit punctuation
\printfield[noformat]{titleaddon}%
% \newunit\newblock% platyp
@@ -1220,55 +1978,90 @@
\newunit\newblock%
\iffieldundef{issuetitle}%
{}%
- {\usebibmacro{byeditor+others}%
- \newunit\newblock%
- \bibstring{specissue}\setunit*{\addspace}}%
+ {\ifthenelse{\NOT\iffieldundef{entrysubtype}%
+ \AND\iffieldequalstr{entrysubtype}{specissue}}%
+ {\bibstring{specissue}
+ \setunit*{\addspace}}%
+ {\setunit{\addperiod\addspace}}}% 2.1? added star
+ % (above) 2.1 added support for named issues that aren't specissues
\ifthenelse{\iffieldequalstr{entrytype}{periodical} \AND \iffieldundef{journaltitle}}%
{\usebibmacro{periodical}}%
{\usebibmacro{journal}}%
- \ifthenelse{\iffieldequalstr{entrytype}{online}}{\usebibmacro{mla:online}}{\setunit*{\addspace}}%
- \ifthenelse{\iffieldequalstr{entrysubtype}{newspaper} \or \iffieldequalstr{entrysubtype}{magazine} \or \iffieldequalstr{entrytype}{online}}%
- {\printlist[brackets]{location}%
- \newunit%
- \printtext{\printdate}%
- \newunit%
- \printfield{version}%
+ \newunit
+ \usebibmacro{byeditor+others}
+ \newunit% 2.1?
+ \ifthenelse{\iffieldequalstr{entrytype}{online}}%
+ {\usebibmacro{mla:online}}%
+ {\setunit{\addspace}}% 2.1? removed asterisk
+ \ifthenelse{\iffieldequalstr{entrysubtype}{newspaper} \or \iffieldequalstr{entrysubtype}{magazine} \or \iffieldequalstr{entrysubtype}{blog} \or \iffieldequalstr{entrysubtype}{comment} \or \iffieldequalstr{entrytype}{online}}%
+ {\setunit{\addspace}%
+ \printlist[brackets]{location}%
\newunit%
- \printfield[mla:newspaper:section]{chapter}%
+ \iffieldequalstr{entrysubtype}{magazine}% 2.1
+ {\printfield{volume}%
+ \newunit%
+ \printfield{number}\clearfield{number}%
+ \newunit%
+ \ifthenelse{\iffieldequalstr{entrytype}{online} \and \not\iffieldundef{eprinttype} \and \iffieldundef{journaltitle}}%
+ {}%
+ {\usebibmacro{issue+date}\clearfield{year}\clearfield{month}\clearfield{day}}%
+ }%
+ {\printfield{version}%
+ \newunit%
+ \ifthenelse{\iffieldequalstr{entrytype}{online} \and \not\iffieldundef{eprinttype} \and \iffieldundef{journaltitle}}%
+ {}%
+ {\printtext{\printdate}\clearfield{year}\clearfield{month}\clearfield{day}}%
+ }%
+ \newunit
+ \iffieldnum{chapter}% 2.1
+ {\printfield[mla:news:section:number]{chapter}}% 2.1
+ {\printfield[mla:news:section:name]{chapter}}% 2.1
+ % }%
}%
- {\printfield{series}\clearfield{series}%
+ {\newunit% 2.1
+ \printfield{series}\clearfield{series}%
\newunit%
\printfield{volume}%
\newunit%
- \ifthenelse{\iffieldequalstr{entrytype}{patent}}%
- {\printfield{type}%
- \setunit*{\addspace}%
- \printfield{number}\clearfield{number}%
- \newunit}%
- {\printfield{number}\clearfield{number}
- \newunit}%
+ \ifthenelse{\iffieldequalstr{entrytype}{patent}}%
+ {\printfield{type}%
+ \setunit*{\addspace}%
+ \printfield{number}\clearfield{number}%
+ \newunit}%
+ {\printfield{number}\clearfield{number}%
+ \newunit}%
\printnames{holder}% mla9- NEW IN 2.0 - preliminary support for patents
\newunit%
- \ifthenelse{\iffieldequalstr{entrytype}{patent}}%
- {\iffieldbibstring{type}%
- {\biblstring{\strfield{type}}%
- \newunit}%
- {}%
- }%
- {}%
- \usebibmacro{issue+date}%
+ \ifthenelse{\iffieldequalstr{entrytype}{patent}}%
+ {\iffieldbibstring{type}%
+ {\biblstring{\strfield{type}}%
+ \newunit}%
+ {}%
+ }%
+ {}%
+ \ifthenelse{\NOT\iffieldundef{issuetitle}\AND
+ \NOT\iffieldequalstr{entrysubtype}{specissue}}
+ {\printlist{publisher}%
+ \newunit}%
+ {}%
+ \usebibmacro{issue+date}\clearfield{year}\clearfield{month}\clearfield{day}%
\newunit\newblock
\newunit}%
}
\newbibmacro*{mla:online}{%
\iffieldundef{maintitle}%
- {}%
+ {\ifthenelse{\iffieldequalstr{entrysubtype}{website}}
+ {}
+ {\printunit{\addcomma\addspace}}}%\printunit{\addcomma\addspace}}%
{\printtext[maintitle]{%
\printfield[titlecase]{maintitle}%
\setunit{\subtitlepunct}%
- \printfield[titlecase]{mainsubtitle}}}%
- \newunit\newblock%
+ \printfield[titlecase]{mainsubtitle}}
+ \iffieldequalstr{entrysubtype}{website}
+ {\printunit{\addperiod\addspace}}%
+ {\printunit{\addcomma\addspace}}%
+ }%
\printlist{publisher}%
\newunit%
}
@@ -1276,9 +2069,9 @@
\renewbibmacro*{journal+issuetitle}{%
\usebibmacro{journal}%
\setunit*{\addspace}%
- \ifthenelse{\iffieldequalstr{entrysubtype}{newspaper} \or \iffieldequalstr{entrysubtype}{magazine}}%
+ \ifthenelse{\iffieldequalstr{entrysubtype}{newspaper} \or \iffieldequalstr{entrysubtype}{magazine} \or \iffieldequalstr{entrysubtype}{blog} \or \iffieldequalstr{entrysubtype}{comment}}%
{\printlist[brackets]{location}%
- \printtext{\printdate}%
+ \printtext{\printdate}\clearfield{year}\clearfield{month}\clearfield{day}%
\newunit%
\printfield{version}%
\newunit%
@@ -1300,10 +2093,10 @@
\renewbibmacro*{issue+date}{%
\printtext{%
\iffieldundef{issue}
- {\usebibmacro{date}}
+ {\usebibmacro{date}\clearfield{year}\clearfield{month}\clearfield{day}}
{\printfield{issue}%
\setunit*{\addspace}%
- \usebibmacro{date}}}%
+ \usebibmacro{date}\clearfield{year}\clearfield{month}\clearfield{day}}}%
\newunit}
\renewbibmacro{finentry}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex-mla/mla-strict.cbx b/Master/texmf-dist/tex/latex/biblatex-mla/mla-strict.cbx
index e95302f1adb..596294afd72 100644
--- a/Master/texmf-dist/tex/latex/biblatex-mla/mla-strict.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-mla/mla-strict.cbx
@@ -1,4 +1,4 @@
-\ProvidesFile{mla-strict.cbx}[2021/05/12 v2.0 biblatex citation style]
+\ProvidesFile{mla-strict.cbx}[2022/02/22 v2.1a biblatex citation style]
\RequireCitationStyle{mla}
diff --git a/Master/texmf-dist/tex/latex/biblatex-mla/mla.bbx b/Master/texmf-dist/tex/latex/biblatex-mla/mla.bbx
index 2ee9431d576..a821bc701ed 100644
--- a/Master/texmf-dist/tex/latex/biblatex-mla/mla.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-mla/mla.bbx
@@ -1,5 +1,5 @@
% These sourcemap declarations allow for .bib file oddities. Additionally, to comport with MLA expectations, they modify strings in publisher fields, drop unneeded parts of URLs, and look for patterns in a URL field to fill in missing eprint fields. If the choices here seem to do too much, use "style=mla-strict", which makes fewer accommodations and more exactly prints entries as they're defined in a given bibtex file.
-\ProvidesFile{mla.bbx}[2021/06/07 v2.0 biblatex bibliography style]
+\ProvidesFile{mla.bbx}[2022/02/22 v2.1a biblatex bibliography style]
\RequireBibliographyStyle{mla-strict}
@@ -19,6 +19,39 @@
\step[fieldset=booktitle, null]
\step[fieldset=entrysubtype, fieldvalue={book}]
}
+ \map{% Add italics to app names for videos, movies, music, audio
+ \pertype{video}
+ \step[fieldsource=addendum, notmatch=\regexp{mkbibemph}, final]
+ \step[fieldsource=addendum, match=\regexp{(.+)\s+app$}, replace={\\mkbibemph\{$1\} app}]
+ }
+ \map{% Add italics to app names for videos, movies, music, audio
+ \pertype{movie}
+ \step[fieldsource=addendum, notmatch=\regexp{mkbibemph}, final]
+ \step[fieldsource=addendum, match=\regexp{(.+)\s+app$}, replace={\\mkbibemph\{$1\} app}]
+ }
+ \map{% Add italics to app names for videos, movies, music, audio
+ \pertype{music}
+ \step[fieldsource=addendum, notmatch=\regexp{mkbibemph}, final]
+ \step[fieldsource=addendum, match=\regexp{(.+)\s+app$}, replace={\\mkbibemph\{$1\} app}]
+ }
+ \map{% Add italics to app names for videos, movies, music, audio
+ \pertype{audio}
+ \step[fieldsource=addendum, notmatch=\regexp{mkbibemph}, final]
+ \step[fieldsource=addendum, match=\regexp{(.+)\s+app$}, replace={\\mkbibemph\{$1\} app}]
+ }
+ \map{% Add italics to app names for software
+ \pertype{software}
+ \step[fieldsource=maintitle, notmatch=\regexp{mkbibemph}, final]
+ \step[fieldsource=maintitle, match=\regexp{(.+)\s+app$}, replace={$1 \\mkbibemph\{app\}}]
+ }
+ \map{% Accommodate music albums defined simply
+ \pertype{music}
+ \step[notfield=title, final]
+ \step[fieldsource=booktitle, match=\regexp{(.+)}, final]
+ \step[fieldset=title, fieldvalue=\regexp{$1}, final]
+ \step[fieldset=booktitle, null]
+ \step[fieldset=entrysubtype, fieldvalue={album}]
+ }
\map{% Fill in missing publisher for US patents
\pertype{patent}
\step[notfield=publisher, final]
@@ -37,7 +70,11 @@
\step[fieldsource=publisher, match={University}, replace={U}]
\step[fieldsource=publisher, match=\regexp{Press\b}, replace={P}]
\step[fieldsource=publisher, match=\regexp{Corporation|Corp.|Incorporated|Inc.|Limited|Ltd.}, replace={}]
- \step[fieldsource=url, match=\regexp{http(s)?://}, replace={}]
+ % \step[fieldsource=url, match=\regexp{http(s)?://}, replace={}]
+ }
+ \map{% abbreviate and drop unneeded parts of institutions
+ \step[fieldsource=institution, match={University}, replace={U}]
+ \step[fieldsource=school, match={University}, replace={U}]
}
\map{% JSTOR url to eprint
\step[fieldsource=url, match={jstor.org}, final]
@@ -84,6 +121,14 @@
\step[fieldsource=doi, match=\regexp{http(s)?://dx.doi.org/(.+)}, replace=\regexp{$1}]
\step[fieldsource=doi, match=\regexp{dx.doi.org/(.+)}, replace=\regexp{$1}]
}
+ % \map{% doi to url when eprinttype set and url empty
+ % \step[notfield=url, final]
+ % \step[field=eprinttype, final]
+ % \step[field=doi, final]
+ % \step[fieldsource=doi, fieldtarget=url]
+ % \step[fieldsource=url, match=\regexp{(.+)}, replace=\regexp{https://doi.org/$1}]
+ % \step[fieldset=doi, null]
+ % }
\map{ % remove isbns from Works Cited
\step[fieldsource=isbn, final]
\step[fieldset=isbn, null]
@@ -93,6 +138,9 @@
\step[fieldset=url, null]
\step[fieldset=urldate, null]
}
+ \map[overwrite]{ % clean url + urldate field from all entries that have a doi field
+ \step[fieldsource=url, match=\regexp{http(s)?://}, replace={}]
+ }
}
}
diff --git a/Master/texmf-dist/tex/latex/biblatex-mla/mla.cbx b/Master/texmf-dist/tex/latex/biblatex-mla/mla.cbx
index 1085fb5623f..d39588869c5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-mla/mla.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-mla/mla.cbx
@@ -1,11 +1,11 @@
-% mla.cbx, v2.0 2021/06/07 * compatible with biblatex 3.16
+% mla.cbx, v2.1a 2022/02/22 * compatible with biblatex 3.16
% Maintained at <https://github.com/jmclawson/biblatex-mla>.
%
% Feel free to improve, redistribute, and adapt to your own ends. Please share improvements back to the project on GitHub or to James Clawson: <clawson@gmail.com>.
%
% This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license.
-\ProvidesFile{mla.cbx}[2021/06/07 v2.0 biblatex citation style]
+\ProvidesFile{mla.cbx}[2022/02/22 v2.1a biblatex citation style]
\RequireCitationStyle{mla-footnotes}
@@ -40,7 +40,7 @@
\xdef\split@prev{\the\insertpenalties}%
}}
-\ExecuteBibliographyOptions{citetracker=true,ibidtracker=constrict,opcittracker=constrict,singletitle,autocite=inline,uniquename=init,hyperref=true,useprefix=true,firstlonghand,annotation=false,loccittracker=strict,noremoteinfo=true,date=comp,urldate=long,mancitepar=false,datezeros=false,datecirca=true,eprint=true}%
+\ExecuteBibliographyOptions{citetracker=true,ibidtracker=constrict,opcittracker=constrict,singletitle,autocite=inline,uniquename=init,hyperref=true,useprefix=true,firstlonghand,annotation=false,loccittracker=strict,noremoteinfo=true,date=comp,urldate=long,mancitepar=false,datezeros=false,datecirca=true,dateuncertain=true,eprint=true,abbreviate=false}%
\newbool{cbx@named}%
\newbool{cbx@mlafootnotes}%
@@ -65,7 +65,61 @@
\blx@ibidreset@force
\blx@idemreset@force
\blx@opcitreset@force
- \blx@loccitreset@force}}
+ \blx@loccitreset@force}
+ \global\undef\bbx@lasthash}% 2.1 last part added
+
+% 2.1 adding citeauthor tracking for full / partial names
+\newrobustcmd*{\cbx@nametracker@global}[1]{%
+ \xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}
+ {}
+ {\listcsxadd{cbx@bseen@names@\the\c@refsection}{#1}}}
+
+\newrobustcmd*{\cbx@nametracker@context}[1]{%
+ \iftoggle{blx@footnote}
+ {\xifinlistcs{#1}{cbx@fseen@names@\the\c@refsection}
+ {}
+ {\listcsxadd{cbx@fseen@names@\the\c@refsection}{#1}}}
+ {\xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}
+ {}
+ {\listcsxadd{cbx@bseen@names@\the\c@refsection}{#1}}}}
+
+\newrobustcmd*{\cbx@ifnameseen@global}[1]{%
+ \xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}}
+
+\newrobustcmd*{\cbx@ifnameseen@context}[1]{%
+ \iftoggle{blx@footnote}%
+ {\xifinlistcs{#1}{cbx@fseen@names@\the\c@refsection}}%
+ {\xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}}}
+
+\DeclareBibliographyOption[string]{nametracker}[true]{%
+ \ifcsdef{blx@opt@nametracker@#1}
+ {\csuse{blx@opt@nametracker@#1}}
+ {\blx@err@invopt{nametracker=#1}{}}}
+
+\def\blx@opt@nametracker@global{%
+ \let\cbx@ifnameseen\cbx@ifnameseen@global
+ \let\cbx@nametracker\cbx@nametracker@global}
+
+\let\blx@opt@nametracker@true\blx@opt@nametracker@global
+
+\def\blx@opt@nametracker@false{%
+ \protected\long\def\cbx@ifnameseen##1##2##3{##3}%
+ \let\cbx@nametracker\relax}
+
+\def\blx@opt@nametracker@context{%
+ \let\cbx@ifnameseen\cbx@ifnameseen@context
+ \let\cbx@nametracker\cbx@nametracker@context}
+
+\appto\blx@secinit{%
+ \ifcsundef{cbx@bseen@names@\the\c@refsection}
+ {\global\cslet{cbx@bseen@names@\the\c@refsection}\@empty}
+ {}%
+ \ifcsundef{cbx@fseen@names@\the\c@refsection}
+ {\global\cslet{cbx@fseen@names@\the\c@refsection}\@empty}
+ {}}
+
+\ExecuteBibliographyOptions{nametracker=context}
+% 2.1 adding citeauthor tracking for full / partial names
\InitializeCitationStyle{%
\usebibmacro{cite:reset}%
@@ -75,7 +129,9 @@
\fi
\long\def\mlasymbolfootnote#1{\begingroup\def%
\thefootnote{\fnsymbol{footnote}}\footnote[0]{#1}\endgroup}%
- \newcounter{mladraftnote}}
+ \newcounter{mladraftnote}%
+ \global\cslet{cbx@bseen@names@\the\c@refsection}\@empty%
+ \global\cslet{cbx@fseen@names@\the\c@refsection}\@empty}
\OnManualCitation{%
\usebibmacro{cite:reset}%
@@ -146,10 +202,11 @@
\newbibmacro*{cite:name}{%
\ifsingletitle%
- {\printtext[bibhyperref]{%
- \printnames{labelname}}%
- \savefield{namehash}{\cbx@lasthash}%
- \global\booltrue{cbx@named}}%
+ {\ifbool{cbx@totalnames}%
+ {\printtext[bibhyperref]{\printnames[][-\value{listtotal}]{labelname}}}%
+ {\printtext[bibhyperref]{\printnames{labelname}}}%
+ \savefield{namehash}{\cbx@lasthash}%
+ \global\booltrue{cbx@named}}%
{\printnames{labelname}%
\savefield{namehash}{\cbx@lasthash}%
\global\booltrue{cbx@named}}}%
@@ -166,7 +223,9 @@
{\printtext[bibhyperref]{\printfield[citetitle:\strfield{entrysubtype}]{labeltitle}}\clearfield{title}}%
{\iffieldequalstr{entrysubtype}{untitled}%
{\printtext[bibhyperref]{\printfield[noformat]{labeltitle}}}%
- {\printtext[bibhyperref]{\printfield[citetitle:\strfield{entrytype}]{labeltitle}}}}}}
+ {\iffieldequalstr{entrytype}{online}% 2.1 format online titles by entrysubtype
+ {\printtext[bibhyperref]{\printfield[citetitle:online:\strfield{entrysubtype}]{labeltitle}}}
+ {\printtext[bibhyperref]{\printfield[citetitle:\strfield{entrytype}]{labeltitle}}}}}}}
\newbibmacro*{cite:mla:title}{%
\ifnameundef{labelname}%
@@ -250,21 +309,27 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\DeclareFieldFormat{citetitle:article}{\mkbibquote{#1}}
-\DeclareFieldFormat{citetitle:inreference}{\mkbibquote{#1}}
\DeclareFieldFormat{citetitle:book}{\mkbibemph{#1}}
\DeclareFieldFormat{citetitle:bookinbook}{\mkbibemph{#1}}% NEW in 2.0
\DeclareFieldFormat{citetitle:booklet}{\mkbibemph{#1}}%
\DeclareFieldFormat{citetitle:collection}{\mkbibemph{#1}}%
-\DeclareFieldFormat{citetitle:reference}{\mkbibemph{#1}}%
-\DeclareFieldFormat{citetitle:incollection}{\mkbibquote{#1}}
+\DeclareFieldFormat{citetitle:dataset}{\mkbibquote{#1}}% NEW in 2.1
+\DeclareFieldFormat{citetitle:image}{#1}% 2.1 finally styled right
\DeclareFieldFormat{citetitle:inbook}{\mkbibquote{#1}}% NEW in 2.0
+\DeclareFieldFormat{citetitle:incollection}{\mkbibquote{#1}}
+\DeclareFieldFormat{citetitle:inproceedings}{\mkbibquote{#1}}
+\DeclareFieldFormat{citetitle:inreference}{\mkbibquote{#1}}
+\DeclareFieldFormat{citetitle:misc}{#1}% 2.1 finally styled right
\DeclareFieldFormat{citetitle:mvbook}{\mkbibemph{#1}}% NEW in 2.0
\DeclareFieldFormat{citetitle:online}{\mkbibquote{#1}}%
-\DeclareFieldFormat{citetitle:inproceedings}{\mkbibquote{#1}}
-\DeclareFieldFormat{citetitle:unpublished}{\mkbibquote{#1}}
+\DeclareFieldFormat{citetitle:online:website}{\mkbibemph{#1}}%
+\DeclareFieldFormat{citetitle:performance}{\mkbibemph{#1}}% NEW in 2.1
+\DeclareFieldFormat{citetitle:reference}{\mkbibemph{#1}}%
+\DeclareFieldFormat{citetitle:review}{\mkbibquote{#1}}%
+\DeclareFieldFormat{citetitle:software}{\mkbibemph{#1}}% NEW in 2.1
\DeclareFieldFormat{citetitle:thesis}{\mkbibquote{#1}}
+\DeclareFieldFormat{citetitle:unpublished}{\mkbibquote{#1}}% fixme still needs work for unstyled types
\DeclareFieldFormat{citetitle:video}{\mkbibemph{#1}}
-\DeclareFieldFormat{citetitle:review}{\mkbibquote{#1}}%
\DeclareFieldFormat{mla:lowercase}{\MakeLowercase{#1}}%
\DeclareFieldFormat[mlasource]{mla:unstyled}{#1\unspace}%
\DeclareFieldFormat[mlasource]{mla:complete}{\mkbibemph{#1}\unspace}%
@@ -405,24 +470,87 @@
{\ifciteindex
{\indexnames{labelname}}
{}%
- \printnames[given-family]{labelname}%FUTURE add check for citeseen (to print first name on first mention)
- }
+ \printnames[citeauthor]{labelname}}%
{\multicitedelim}
{\usebibmacro{postnote}\usebibmacro{cite:save}}
-\DeclareCiteCommand*{\citeauthor}%
+\DeclareCiteCommand*{\citeauthor}% print just the surname
{\usebibmacro{prenote}}
{\ifciteindex
{\indexnames{labelname}}
{}%
- \printnames[family]{labelname}%
- % \ifentryseen{labelname}%FUTURE skeleton to check for first mention - doesn't work just now
- % {\printnames{labelname}}% TRUE
- % {\printnames[given-family]{labelname}}% FALSE
- }
+ \printnames[citeauthorstar]{labelname}}%
{\multicitedelim}
{\usebibmacro{postnote}\usebibmacro{cite:save}}
+% 2.1 tracking seen names for citeauthor
+\DeclareNameFormat{citeauthor}{%
+ \cbx@ifnameseen{\thefield{hash}}
+ {\ifcase\value{uniquename}%
+ \usebibmacro{name:family}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}%
+ \or
+ \ifuseprefix
+ {\usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefix}
+ {\namepartsuffixi}}
+ {\usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefixi}
+ {\namepartsuffixi}}%
+ \or
+ \usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}%
+ \fi}
+ {\usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}%
+ \cbx@nametracker{\thefield{hash}}}%
+ \usebibmacro{name:andothers}}
+
+\DeclareNameFormat{citeauthorstar}{%
+ \ifcase\value{uniquename}%
+ \usebibmacro{name:family}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}%
+ \or
+ \ifuseprefix
+ {\usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefix}
+ {\namepartsuffixi}}
+ {\usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiveni}
+ {\namepartprefixi}
+ {\namepartsuffixi}}%
+ \or
+ \usebibmacro{name:given-family}
+ {\namepartfamily}
+ {\namepartgiven}
+ {\namepartprefix}
+ {\namepartsuffix}%
+ \fi
+ \cbx@ifnameseen{\thefield{hash}}
+ {}
+ {\cbx@nametracker{\thefield{hash}}}%
+ \usebibmacro{name:andothers}}
+% 2.1 tracking seen names for citeauthor
+
\DeclareCiteCommand{\citetitle}
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
@@ -430,11 +558,7 @@
{\ifciteindex
{\indexfield{indextitle}}
{}%
- \ifthenelse{\iffieldequalstr{entrytype}{unpublished}%
- \AND\NOT%
- \iffieldundef{entrysubtype}}%
- {\printfield[citetitle:\strfield{entrysubtype}]{labeltitle}}%
- {\printfield[citetitle]{labeltitle}}}
+ \usebibmacro{just:title:it}}% 2.1 simplified
{\multicitedelim}
{\usebibmacro{postnote}}
@@ -445,11 +569,7 @@
{\ifciteindex
{\indexfield{indextitle}}
{}%
- \ifthenelse{\iffieldequalstr{entrytype}{unpublished}%
- \AND\NOT%
- \iffieldundef{entrysubtype}}%
- {\printfield[citetitle:\strfield{entrysubtype}]{title}}%
- {\printfield[citetitle]{title}}}%
+ \usebibmacro{just:title:it}}% 2.1 simplified
{\multicitedelim}
{\usebibmacro{postnote}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-mla/mla.dbx b/Master/texmf-dist/tex/latex/biblatex-mla/mla.dbx
index 7db24ca4440..e26fb466ab4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-mla/mla.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-mla/mla.dbx
@@ -1,11 +1,11 @@
-% mla.dbx, v2.0 2021/06/07 * compatible with biblatex 3.16
+% mla.dbx, v2.1a 2022/02/22 * compatible with biblatex 3.16
% Maintained at <https://github.com/jmclawson/biblatex-mla>.
%
% Feel free to improve, redistribute, and adapt to your own ends. Please share improvements back to the project on GitHub or to James Clawson: <clawson@gmail.com>.
%
% This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license.
-\ProvidesFile{mla.dbx}[2021/06/07 v2.0 biblatex citation style]
+\ProvidesFile{mla.dbx}[2022/02/22 v2.1a biblatex citation style]
\DeclareDatamodelEntrytypes{mlasource}
diff --git a/Master/texmf-dist/tex/latex/biblatex-mla/mla7.bbx b/Master/texmf-dist/tex/latex/biblatex-mla/mla7.bbx
index e43dc555cd5..1d85a996a65 100644
--- a/Master/texmf-dist/tex/latex/biblatex-mla/mla7.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-mla/mla7.bbx
@@ -1,6 +1,6 @@
% This bbx file is provided for minimal compatibility with bibliographic entries described by the 7th edition of the MLA Handbook (2009). This style was superseded by a major redesign in the 8th edition in 2016, which was further clarified by the 9th edition in 2021. To use this older version, set "style=mla7" in the biblatex package options. To use the current version of the handbook, set "style=mla" for best outcomes. Biblatex-mla support and updates will prioritize the most recent edition of the MLA Handbook.
-\ProvidesFile{mla7.bbx}[2021/05/12 v2.0 biblatex bibliography style]
+\ProvidesFile{mla7.bbx}[2022/02/22 v2.1a biblatex bibliography style]
\RequireBibliographyStyle{standard}
\DeclareLanguageMapping{american}{american-mla}
diff --git a/Master/texmf-dist/tex/latex/biblatex-mla/mla7.cbx b/Master/texmf-dist/tex/latex/biblatex-mla/mla7.cbx
index b781433e83a..a1ad5df2f7a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-mla/mla7.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-mla/mla7.cbx
@@ -1,4 +1,4 @@
-\ProvidesFile{mla7.cbx}[2021/05/12 v2.0 biblatex bibliography style]
+\ProvidesFile{mla7.cbx}[2022/02/22 v2.1a biblatex bibliography style]
\RequireCitationStyle{mla}
diff --git a/Master/texmf-dist/tex/latex/biblatex-mla/portuguese-mla.lbx b/Master/texmf-dist/tex/latex/biblatex-mla/portuguese-mla.lbx
index c9300b8a3ab..dd86fac022a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-mla/portuguese-mla.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-mla/portuguese-mla.lbx
@@ -1,8 +1,8 @@
-% portuguese-mla.lbx v0.2 2009/07/07
+% portuguese-mla.lbx v2.1a 2022/02/22
%
% Portuguese localization in this file provided by Paulo Ferreira.
-\ProvidesFile{portuguese-mla.lbx}[2009/07/07 v0.1.1 biblatex style localization]
+\ProvidesFile{portuguese-mla.lbx}[2022/02/22 v2.1a biblatex style localization]
\InheritBibliographyExtras{portuguese}
@@ -31,92 +31,114 @@
\DeclareBibliographyStrings{%
inherit = {portuguese},
- bibliography = {{Bibliografia}{Bibliografia}},
- references = {{Obras citadas}{Obras citadas}},
- % typecompilerandeditor = {{compiler and editor}{comp\adddot\ and ed\adddot}},% 0.7 FIXME in Portuguese
- bytranslator = {{trad\adddot}{trad\adddot}},
- byeditor = {{ed\adddot}{ed\adddot}},
- typegeneraleditor = {{editor geral}{ed\adddotspace geral}},% 0.7.1 FIXME?
- bytypegeneraleditor = {{editor geral}{ed\adddotspace geral}},% 0.7.1 FIXME?
- % byserieseditor = {{editor geral}{editor geral}},
- page = {{\unskip}{\unskip}},
- pages = {{\unskip}{\unskip}},
- andothers = {{et~al\adddot}{et~al\adddot}},
- byeditortr = {{ed\adddot\ e trad\adddot}{ed\adddot\ e trad\adddot}}, % Capitalize Trans?
- byeditorco = {{ed\adddot\ e com\adddot}{ed\adddot\ e com\adddot}}, % Etc?
- byeditoran = {{ed\adddot\ e anot\adddot}{ed\adddot\ e anot\adddot}},
- byeditorin = {{ed\adddot\ e intr\adddot}{ed\adddot\ e intr\adddot}},
- byeditorfo = {{ed\adddot\ e pref\adddot}{ed\adddot\ e pref\adddot}},
- byeditoraf = {{ed\adddot\ e posf\adddot}{ed\adddot\ e posf\adddot}},
- byeditortrco = {{ed., trad. e com\adddot}{ed., trad. e com\adddot}},
- byeditortran = {{ed., trad. e anot\adddot}{ed., trad. e anot\adddot}},
- byeditortrin = {{ed., trad. e intro\adddot}{ed., trad. e intro\adddot}},
- byeditortrfo = {{ed., trad. e pref\adddot}{ed., trad. e pref\adddot}},
- byeditortraf = {{ed., trad. e posf\adddot}{ed., trad. e posf\adddot}},
- byeditorcoin = {{ed., com. e introd\adddot}{ed., com. e introd\adddot}},
- byeditorcofo = {{ed., com. e pref\adddot}{ed., com. e pref\adddot}},
- byeditorcoaf = {{ed., com. e posf\adddot}{ed., com. e posf\adddot}},
- byeditoranin = {{ed., anot. e introd\adddot}{ed., anot. e introd\adddot}},
- byeditoranfo = {{ed., anot. e pref\adddot}{ed., anot. e pref\adddot}},
- byeditoranaf = {{ed., anot. e posf\adddot}{ed., anot. e posf\adddot}},
- byeditortrcoin = {{ed., trad., com. e introd\adddot}{ed., trad., com. e introd\adddot}},
- byeditortrcofo = {{ed., trad., com. e pref\adddot}{ed., trad., com. e pref\adddot}},
- byeditortrcoaf = {{ed., trad., com. e posf\adddot}{ed., trad., com. e posf\adddot}},
- byeditortranin = {{ed., trad., anot. e introd\adddot}{ed., trad., anot. e introd\adddot}},
- byeditortranfo = {{ed., trad., anot. e pref\adddot}{ed., trad., anot. e pref\adddot}},
- byeditortranaf = {{ed., trad., anot. e posf\adddot}{ed., trad., anot. e posf\adddot}},
- bytranslatorco = {{trad\adddot\ e com\adddot}{trad\adddot\ e com\adddot}},
- bytranslatoran = {{trad\adddot\ e anot\adddot}{trad\adddot\ e anot\adddot}},
- bytranslatorin = {{trad\adddot\ e introd\adddot}{trad\adddot\ e introd\adddot}},
- bytranslatorfo = {{trad\adddot\ e pref\adddot}{trad\adddot\ e pref\adddot}},
- bytranslatoraf = {{trad\adddot\ e posf\adddot}{trad\adddot\ e posf\adddot}},
- bytranslatorcoin = {{trad., com. e introd\adddot}{trad., com. e introd\adddot}},
- bytranslatorcofo = {{trad., com. e pref\adddot}{trad., com. e pref\adddot}},
- bytranslatorcoaf = {{trad., com. e posf\adddot}{trad., com. e posf\adddot}},
- bytranslatoranin = {{trad., anot. e introd\adddot}{trad., anot. e introd\adddot}},
- bytranslatoranfo = {{trad., anot. e pref\adddot}{trad., anot. e pref\adddot}},
- bytranslatoranaf = {{trad., anot. e posf\adddot}{trad., anot. e posf\adddot}},
- phdthesis = {{Tese de Doutor\adddot}{Tese de Doutor\adddot}},
- reviewof = {{recens\~{a}o de}{recens\~{a}o de}},
- volume = {{{Vol\adddot}}{{Vol\adddot}}}, % for correct capitalization of volume reference
- phd = {{Tese de Doutor\adddot}{Tese de Doutor\adddot}},% 0.6
- dphil = {{Tese de Doutor\adddot}{Tese de Doutor\adddot}},% 0.6
- lic = {{Diss. de Lic\adddot}{Diss. de Lic\adddot}},% 0.6
- ma = {{Tese de Mestr\adddot}{Tese de Mestr\adddot}},% 0.6
- ms = {{Tese de Mestr\adddot}{Tese de Mestr\adddot}},% 0.6
- msc = {{Tese de Mestr\adddot}{Tese de Mestr\adddot}},% 0.6
- mphil = {{Tese de Mestr\adddot}{Tese de Mestr\adddot}},% 0.6
- mlitt = {{Tese de Mestr\adddot}{Tese de Mestr\adddot}},% 0.6
- % FIXME 2.0 check the following for quality of Portuguese translation
- manuscript = {{manuscrito}{manuscrito}},
- patentde = {{Deutsches Patent- und Markenamt}{DE}},% localised in German
- patenteu = {{Escritório Europeu de Patentes}{EU}},
- patentfr = {{Institut National de la Propriété Industrielle}{FR}},% localised in French
- patentuk = {{The Intellectual Property Office of the United Kingdom}{UK}},% localised in English
- patentus = {{United States Patent and Trademark Office}{US}},% localised in English
+ % andothers = {{et~al\adddot}{et~al\adddot}},
+ % byeditor = {{ed\adddot}{ed\adddot}},
+ % byeditoraf = {{ed\adddot\ e posf\adddot}{ed\adddot\ e posf\adddot}},
+ % byeditoran = {{ed\adddot\ e anot\adddot}{ed\adddot\ e anot\adddot}},
+ % byeditoranaf = {{ed., anot. e posf\adddot}{ed., anot. e posf\adddot}},
+ % byeditoranfo = {{ed., anot. e pref\adddot}{ed., anot. e pref\adddot}},
+ % byeditoranin = {{ed., anot. e introd\adddot}{ed., anot. e introd\adddot}},
+ % byeditorco = {{ed\adddot\ e com\adddot}{ed\adddot\ e com\adddot}}, % Etc?
+ % byeditorcoaf = {{ed., com. e posf\adddot}{ed., com. e posf\adddot}},
+ % byeditorcofo = {{ed., com. e pref\adddot}{ed., com. e pref\adddot}},
+ % byeditorcoin = {{ed., com. e introd\adddot}{ed., com. e introd\adddot}},
+ % byeditorfo = {{ed\adddot\ e pref\adddot}{ed\adddot\ e pref\adddot}},
+ % byeditorin = {{ed\adddot\ e intr\adddot}{ed\adddot\ e intr\adddot}},
+ % byeditortr = {{ed\adddot\ e trad\adddot}{ed\adddot\ e trad\adddot}}, % Capitalize Trans?
+ % byeditortraf = {{ed., trad. e posf\adddot}{ed., trad. e posf\adddot}},
+ % byeditortran = {{ed., trad. e anot\adddot}{ed., trad. e anot\adddot}},
+ % byeditortranaf = {{ed., trad., anot. e posf\adddot}{ed., trad., anot. e posf\adddot}},
+ % byeditortranfo = {{ed., trad., anot. e pref\adddot}{ed., trad., anot. e pref\adddot}},
+ % byeditortranin = {{ed., trad., anot. e introd\adddot}{ed., trad., anot. e introd\adddot}},
+ % byeditortrco = {{ed., trad. e com\adddot}{ed., trad. e com\adddot}},
+ % byeditortrcoaf = {{ed., trad., com. e posf\adddot}{ed., trad., com. e posf\adddot}},
+ % byeditortrcofo = {{ed., trad., com. e pref\adddot}{ed., trad., com. e pref\adddot}},
+ % byeditortrcoin = {{ed., trad., com. e introd\adddot}{ed., trad., com. e introd\adddot}},
+ % byeditortrfo = {{ed., trad. e pref\adddot}{ed., trad. e pref\adddot}},
+ % byeditortrin = {{ed., trad. e intro\adddot}{ed., trad. e intro\adddot}},
+ % bygeneraleditor = {{editor geral}{ed\adddotspace geral}},%
+ % bytranslator = {{trad\adddot}{trad\adddot}},
+ % bytranslatoraf = {{trad\adddot\ e posf\adddot}{trad\adddot\ e posf\adddot}},
+ % bytranslatoran = {{trad\adddot\ e anot\adddot}{trad\adddot\ e anot\adddot}},
+ % bytranslatoranaf = {{trad., anot. e posf\adddot}{trad., anot. e posf\adddot}},
+ % bytranslatoranfo = {{trad., anot. e pref\adddot}{trad., anot. e pref\adddot}},
+ % bytranslatoranin = {{trad., anot. e introd\adddot}{trad., anot. e introd\adddot}},
+ % bytranslatorco = {{trad\adddot\ e com\adddot}{trad\adddot\ e com\adddot}},
+ % bytranslatorcoaf = {{trad., com. e posf\adddot}{trad., com. e posf\adddot}},
+ % bytranslatorcofo = {{trad., com. e pref\adddot}{trad., com. e pref\adddot}},
+ % bytranslatorcoin = {{trad., com. e introd\adddot}{trad., com. e introd\adddot}},
+ % bytranslatorfo = {{trad\adddot\ e pref\adddot}{trad\adddot\ e pref\adddot}},
+ % bytranslatorin = {{trad\adddot\ e introd\adddot}{trad\adddot\ e introd\adddot}},
+ % page = {{\unskip}{\unskip}},
+ % pages = {{\unskip}{\unskip}},
% patreq = {{patent request}{pat\adddot\ req\adddot}},
% patreqde = {{German patent request}{German pat\adddot\ req\adddot}},
% patreqeu = {{European patent request}{European pat\adddot\ req\adddot}},
- patreqfr = {{Institut National de la Propriété Industrielle}{FR pat\adddot req\adddot}},
% patrequk = {{British patent request}{British pat\adddot\ req\adddot}},
% patrequs = {{U.S\adddotspace patent request}{U.S\adddotspace pat\adddot\ req\adddot}},
- typescript = {{texto datilografado}{texto datilografado}},
- director = {{dir\adddot}{dir\adddot}},
- screenplay = {{adapt\adddot}{adapt\adddot}},
+ % transof = {{traduç\~{a}o~de}{traduç\~{a}o~de}},
+ % volume = {{{Vol\adddot}}{{Vol\adddot}}}, % for correct capitalization of volume reference
+ %% byserieseditor = {{editor geral}{editor geral}},% ---- never used?
adaptation = {{adapt\adddot}{adapt\adddot}},
adaptor = {{adapt\adddot}{adapt\adddot}},
- performer = {{artista}{artista},
- performers = {{artistas}{artistas},
+ bibliography = {{Bibliografia}{Bibliografia}},
+ composedby = {{composto por}{composto por}},
composer = {{comp\adddot}{comp\adddot}},
- composedby = {{composto~por}{composto~por}},
- producer = {{prod\adddot}{prod\adddot}},
- with = {{com}{com}},
+ director = {{dir\adddot}{dir\adddot}},
+ dphil = {{tese de Doutor\adddot}{tese de Doutor\adddot}},
+ generaleditor = {{editor geral}{ed\adddotspace geral}},%
+ lic = {{diss\adddotspace de Lic\adddot}{diss\adddotspace de Lic\adddot}},
+ ma = {{tese de Mestr\adddot}{tese de Mestr\adddot}},
+ manuscript = {{manuscrito}{manuscrito}},
+ mlitt = {{tese de Mestr\adddot}{tese de Mestr\adddot}},
+ mphil = {{tese de Mestr\adddot}{tese de Mestr\adddot}},
+ ms = {{tese de Mestr\adddot}{tese de Mestr\adddot}},
+ msc = {{tese de Mestr\adddot}{tese de Mestr\adddot}},
+ page = {{p\addot}{p\addot}},
+ pages = {{pp\addot}{pp\addot}},
+ patentde = {{Deutsches Patent- und Markenamt}{DE}},% localised in German
+ patenteu = {{Escrit\'{o}rio Europeu de Patentes}{EU}},
+ patentfr = {{Institut National de la Propri\'{e}t\'{e} Industrielle}{FR}},% localised in French
+ patentuk = {{The Intellectual Property Office of the United Kingdom}{UK}},% localised in English
+ patentus = {{United States Patent and Trademark Office}{US}},% localised in English
+ patreqfr = {{Institut National de la Propri\'{e}t\'{e} Industrielle}{FR pat\adddot req\adddot}},
+ performer = {{artista}{artista}},
+ performers = {{artistas}{artistas}},
+ phd = {{tese de doutor\adddot}{tese de doutor\adddot}},%
+ phdthesis = {{tese de doutor\adddot}{tese de doutor\adddot}},
+ print = {{impress\~{a}o}{impress\~{a}o}},
proceedings = {{processo}{processo}},
- transof = {{tradução~de}{tradução~de}},
- volstodate = {{volumes até hoje}{volumes até hoje}},
+ producer = {{prod\adddot}{prod\adddot}},
+ references = {{Obras citadas}{Obras citadas}},
+ reviewof = {{recens\~{a}o de}{recens\~{a}o de}},% Double check translation, which differs markedly from supplied lbx file
+ screenplay = {{adapt\adddot}{adapt\adddot}},
supptotitle = {{a}{a}},
- print = {{impressão}{impressão}},
+ typescript = {{texto datilografado}{texto datilografado}},
+ volstodate = {{volumes at\'{e} hoje}{volumes at\'{e} hoje}},
web = {{rede}{rede}},
+ with = {{com}{com}},
+ %%%%%%%%%%%%%%%%%%%%%%% The following translations still need to be verified
+ bycompilerandeditor = {{compilado e editado por}{comp\adddotspace e ed\adddotspace por}},% unverified
+ bycomposer = {{comp\adddotspace por}{comp\adddotspace por}},% unverified
+ byconductor = {{dir\adddotspace por}{dir\adddotspace por}},% unverified
+ bycreator = {{criado por}{criado por}},% unverified
+ bydirector = {{dirigido por}{dirigido por}},% unverified
+ byhost = {{apresentado por}{apresentado por}},% unverified
+ byinterviewer = {{entrevista de}{entrevista de}},% unverified
+ bynarrator = {{narrado por}{narr\adddotspace por}},% unverified
+ byperformer = {{interpretado por}{interpretado por}},% unverified
+ byscreenplay = {{roteiro de}{roteiro de}},% unverified
+ compilerandeditor = {{compilador e editor}{comp\adddotspace e ed\adddot}},% unverified
+ conductor = {{maestro}{maestro}},% 2.1 unverified
+ creator = {{criad\adddot}{criad\adddot}},% 2.1 unverified
+ host = {{anfit\adddot}{anfit\adddot}},% 2.1 unverified
+ interviewer = {{entrevistador}{entrevistador}},% 2.1 unverified
+ narrator = {{narrador}{narrador}},% 2.1 unverified
+ numbers = {{n\'umeros}{n\'umeros}},% 2.1 unverified
+ recorded = {{gravado}{gravado}},% 2.1 unverified
+ specissue = {{edi\c\~ao especial}{edi\c\~ao especial}},% unverified
+ tvepisode = {{epis\'odio}{epis\'odio}},% 2.1 unverified
+ tvseason = {{temporada}{temporada}},% 2.1 unverified
}
\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/biblatex-mla/spanish-mla.lbx b/Master/texmf-dist/tex/latex/biblatex-mla/spanish-mla.lbx
index 3414eb8ac91..2d7307849e5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-mla/spanish-mla.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-mla/spanish-mla.lbx
@@ -1,13 +1,119 @@
-% spanish-mla.lbx v0.2.5 2013/03/24
+% spanish-mla.lbx v2.1a 2022/02/22
%
% Spanish localization in this file provided by Ivan Fernandez.
% Abbreviations taken, whenever possible, from Appendix 2 of the
% Diccionario Panhispánico de Dudas, http://buscon.rae.es/dpdI/
-\ProvidesFile{spanish-mla.lbx}[2013/03/24 v0.2.5 biblatex style localization]
+\ProvidesFile{spanish-mla.lbx}[2022/02/22 v2.1a biblatex style localization]
\InheritBibliographyExtras{spanish}
+\DeclareBibliographyStrings{%
+ inherit = {spanish},
+ % andothers = {{et~al\adddot}{et~al\adddot}},
+ % byeditor = {{ed\adddot}{ed\adddot}},%
+ % byeditoraf = {{ed\adddotspace y ep\'{i}l\adddot}{ed\adddotspace y ep\'{i}l\adddot}},
+ % byeditoran = {{ed\adddotspace y anot\adddot}{ed\adddotspace y anot\adddot}},
+ % byeditoranaf = {{ed\adddot, anot\adddotspace y ep\'{i}l\adddot}{ed\adddot, anot\adddotspace y ep\'{i}l\adddot}},
+ % byeditoranfo = {{ed\adddot, anot\adddotspace y pr\'{o}l\adddot}{ed\adddot, anot\adddotspace y pr\'{o}l\adddot}},
+ % byeditoranin = {{ed\adddot, anot\adddotspace e introd\adddot}{ed\adddot, anot\adddotspace e introd\adddot}},
+ % byeditorco = {{ed\adddotspace y com\adddot}{ed\adddotspace y com\adddot}},
+ % byeditorcoaf = {{ed\adddot, com\adddotspace y ep\'{i}l\adddot}{ed\adddot, com\adddotspace y ep\'{i}l\adddot}},
+ % byeditorcofo = {{ed\adddot, com\adddotspace y pr\'{o}l\adddot}{ed\adddot, com\adddotspace y pr\'{o}l\adddot}},
+ % byeditorcoin = {{ed\adddot, com\adddotspace e introd\adddot}{ed\adddot, com\adddotspace e introd\adddot}},
+ % byeditorfo = {{ed\adddotspace y pr\'{o}l\adddot}{ed\adddotspace y pr\'{o}l\adddot}},
+ % byeditorin = {{ed\adddotspace y introd\adddot}{ed\adddotspace y introd\adddot}},
+ % byeditortr = {{ed\adddotspace y trad\adddot}{ed\adddotspace y trad\adddot}},
+ % byeditortraf = {{ed\adddot, trad\adddotspace y ep\'{i}l\adddot}{ed\adddot, trad\adddotspace y ep\'{i}l\adddot}},
+ % byeditortran = {{ed\adddot, trad\adddotspace y anot\adddot}{ed\adddot, trad\adddotspace y anot\adddot}},
+ % byeditortranaf = {{ed\adddot, trad\adddot, anot\adddotspace y ep\'{i}l\adddot}{ed\adddot, trad\adddot, anot\adddotspace y ep\'{i}l\adddot}},
+ % byeditortranfo = {{ed\adddot, trad\adddot, anot\adddotspace y pr\'{o}l\adddot}{ed\adddot, trad\adddot, anot\adddotspace y pr\'{o}l\adddot}},
+ % byeditortranin = {{ed\adddot, trad\adddot, anot\adddotspace e introd\adddot}{ed\adddot, trad\adddot, anot\adddotspace e introd\adddot}},
+ % byeditortrco = {{ed\adddot, trad\adddotspace y com\adddot}{ed\adddot, trad\adddotspace y com\adddot}},
+ % byeditortrcoaf = {{ed\adddot, trad\adddot, com\adddotspace y ep\'{i}l\adddot}{ed\adddot, trad\adddot, com\adddotspace y ep\'{i}l\adddot}},
+ % byeditortrcofo = {{ed\adddot, trad\adddot, com\adddotspace y pr\'{o}l\adddot}{ed\adddot, trad\adddot, com\adddotspace y pr\'{o}l\adddot}},
+ % byeditortrcoin = {{ed\adddot, trad\adddot, com\adddotspace e introd\adddot}{ed\adddot, trad\adddot, com\adddotspace e introd\adddot}},
+ % byeditortrfo = {{ed\adddot, trad\adddotspace y pr\'{o}l\adddot}{ed\adddot, trad\adddotspace y pr\'{o}l\adddot}},
+ % byeditortrin = {{ed\adddot, trad\adddotspace e introd\adddot}{ed\adddot, trad\adddotspace e introd\adddot}},
+ % bygeneraleditor = {{editor general}{ed\adddotspace gen\adddot}},%
+ % bytranslator = {{trad\adddot}{trad\adddot}},% FIXME to read "trans. by" in the first instance
+ % bytranslatoraf = {{trad\adddotspace y ep\'{i}l\adddot}{trad\adddotspace y ep\'{i}l\adddot}},
+ % bytranslatoran = {{trad\adddotspace y anot\adddot}{trad\adddotspace y anot\adddot}},
+ % bytranslatoranaf = {{trad\adddot, anot\adddotspace y ep\'{i}l\adddot}{trad\adddot, anot\adddotspace y ep\'{i}l\adddot}},
+ % bytranslatoranfo = {{trad\adddot, anot\adddotspace y pr\'{o}l\adddot}{trad\adddot, anot\adddotspace y pr\'{o}l\adddot}},
+ % bytranslatoranin = {{trad\adddot, anot\adddotspace e introd\adddot}{trad\adddot, anot\adddotspace e introd\adddot}},
+ % bytranslatorco = {{trad\adddotspace y com\adddot}{trad\adddotspace y com\adddot}},
+ % bytranslatorcoaf = {{trad\adddot, com\adddotspace y ep\'{i}l\adddot}{trad\adddot, com\adddotspace y ep\'{i}l\adddot}},
+ % bytranslatorcofo = {{trad\adddot, com\adddotspace y pr\'{o}l\adddot}{trad\adddot, com\adddotspace y pr\'{o}l\adddot}},
+ % bytranslatorcoin = {{trad\adddot, com\adddotspace e introd\adddot}{trad\adddot, com\adddotspace e introd\adddot}},
+ % bytranslatorfo = {{trad\adddotspace y pr\'{o}l\adddot}{trad\adddotspace y pr\'{o}l\adddot}},
+ % bytranslatorin = {{trad\adddotspace e introd\adddot}{trad\adddotspace e introd\adddot}},
+ % compiler = {{recopilador}{rec\adddot}},% unverified
+ % compilers = {{recopiladors}{recs\adddot}},% unverified
+ % composedby = {{compuesto por}{compuesto por}},
+ % reviewof = {{rese\~{n}a de}{rese\~{n}a de}},
+ % transof = {{traducci\'{o}n~de}{traducci\'{o}n~de}},
+ % volume = {{Vol\adddot}{Vol\adddot}},
+ adaptation = {{adapt\adddot}{adapt\adddot}},
+ adaptor = {{adapt\adddot}{adapt\adddot}},
+ bibliography = {{Obras citadas}{Obras citadas}},
+ composer = {{comp\adddot}{comp\adddot}},
+ director = {{dir\adddot}{dir\adddot}},
+ dphil = {{Tesis}{Tesis}},%
+ lic = {{Lic\adddotspace tesis}{Lic\adddotspace tesis}},
+ ma = {{MA\addabbrvspace tesis}{MA\addabbrvspace tesis}},
+ manuscript = {{manuscrito}{manuscrito}},
+ mlitt = {{MLitt\addabbrvspace tesis}{MLitt\addabbrvspace tesis}},
+ mphil = {{MPhil\addabbrvspace tesis}{MPhil\addabbrvspace tesis}},
+ ms = {{MS\addabbrvspace tesis}{MS\addabbrvspace tesis}},
+ msc = {{MSc\addabbrvspace tesis}{MSc\addabbrvspace tesis}},
+ page = {{p\'ag\adddot}{p\'ag\adddot}},
+ pages = {{p\'ags\adddot}{p\'ags\adddot}},
+ patentde = {{Deutsches Patent- und Markenamt}{DE}},% patent offices presented by local names
+ patenteu = {{Oficina Europea de Patentes}{EU}},% Hmmm...
+ patentfr = {{Institut National de la Propri\'{e}t\'{e} Industrielle}{FR}},% patent offices presented by local names
+ patentuk = {{The Intellectual Property Office of the United Kingdom}{UK}},% patent offices presented by local names
+ patentus = {{United States Patent and Trademark Office}{US}},% patent offices presented by local names
+ patreqfr = {{Institut National de la Propri\'{e}t\'{e} Industrielle}{FR pat\adddot req\adddot}},
+ performer = {{ejecutante}{ejecutante}},
+ performers = {{ejecutantes}{ejecutantes}},
+ phd = {{Tesis}{Tesis}},%
+ phdthesis = {{Tesis}{Tesis}},
+ print = {{impresi\'{o}n}{impresi\'{o}n}},
+ proceedings = {{actas}{actas}},
+ producer = {{prod\adddot}{prod\adddot}},
+ references = {{Obras citadas}{Obras citadas}},
+ screenplay = {{adapt\adddot}{adapt\adddot}},
+ supptotitle = {{a}{a}},
+ typescript = {{mecanografiado}{mecanografiado}},
+ volstodate = {{vol\'{u}menes hasta ahora}{vol\'{u}menes hasta ahora}},
+ web = {{web}{web}},
+ with = {{con}{con}},
+ %%%%%%%%%%%%%%%%%%%%%%% The following translations still need to be verified
+ bycompilerandeditor = {{compilado y editado por}{comp\adddotspace y ed\adddotspace por}},% unverified
+ bycomposer = {{comp\adddotspace por}{comp\adddotspace por}},% unverified
+ byconductor = {{dir\adddotspace por}{dir\adddotspace por}},% unverified
+ bycreator = {{creado por}{creado por}},% unverified
+ bydirector = {{dirigido por}{dirigido por}},% unverified
+ byhost = {{organizado por}{organizado por}},% unverified
+ byinterviewer = {{entrevista por}{entrevista por}},% unverified
+ bynarrator = {{narrado por}{narr\adddotspace por}},% unverified
+ byperformer = {{interpretado por}{interpretado por}},% unverified
+ byscreenplay = {{gui\'on de}{gui\'on de}},% unverified
+ compilerandeditor = {{compilaci\'{o}n y edici\'on}{comp\adddotspace y ed\adddot}},% unverified
+ conductor = {{direct\adddot}{direct\adddot}},% 2.1 unverified
+ creator = {{cread\adddot}{cread\adddot}},% 2.1 unverified
+ generaleditor = {{edici\'on general}{ed\adddotspace gen\adddot}},% unverified
+ host = {{anfit\adddot}{anfit\adddot}},% 2.1 unverified
+ interviewer = {{entrevist\adddot}{entrevist\adddot}},% 2.1 unverified
+ narrator = {{narr\adddot}{narr\adddot}},% 2.1 unverified
+ numbers = {{n\'umeros}{n\'umeros}},% 2.1 unverified
+ recorded = {{grabado}{grabado}},% 2.1 unverified
+ specissue = {{n\'umero especial}{n\'umero especial}},% unverified
+ tvepisode = {{episodio}{episodio}},% 2.1 unverified
+ tvseason = {{temporada}{temporada}},% 2.1 unverified
+}
+
\DeclareBibliographyExtras{%
\protected\def\mkbibdatelong#1#2#3{%
\iffieldundef{#3}
@@ -28,99 +134,7 @@
{}
{\mkmonthzeros{\thefield{#2}}%
\iffieldundef{#1}{}{/}}%
- \mkyearzeros{\thefield{#1}}}%
-}
+ \mkyearzeros{\thefield{#1}}}}
-\DeclareBibliographyStrings{%
- inherit = {spanish},
- bibliography = {{Obras citadas}{Obras citadas}},
- references = {{Obras citadas}{Obras citadas}},
- typecompiler = {{recopilador}{rec\adddot}}, % FIXME: is this right?
- typecompilers = {{recopiladors}{recs\adddot}}, % FIXME: is this right?
- typecompilerandeditor = {{rec\adddotspace y ed\adddot}{rec\adddotspace y ed\adddot}},% 0.7 FIXME: is this right?
- bytranslator = {{trad\adddot}{trad\adddot}},% FIXME to read "trans. by" in the first instance
- byeditor = {{ed\adddot}{ed\adddot}},% FIXME "ed. by" in first instance
- typegeneraleditor = {{editor general}{ed\adddotspace gen\adddot}},% 0.7.1 FIXME?
- bytypegeneraleditor = {{editor general}{ed\adddotspace gen\adddot}},% 0.7.1 FIXME?
- % byserieseditor = {editor general},
- page = {{\unskip}{\unskip}},
- pages = {{\unskip}{\unskip}},
- andothers = {{et~al\adddot}{et~al\adddot}},
- byeditortr = {{ed\adddotspace y trad\adddot}{ed\adddotspace y trad\adddot}},
- byeditorco = {{ed\adddotspace y com\adddot}{ed\adddotspace y com\adddot}},
- byeditoran = {{ed\adddotspace y anot\adddot}{ed\adddotspace y anot\adddot}},
- byeditorin = {{ed\adddotspace y introd\adddot}{ed\adddotspace y introd\adddot}},
- byeditorfo = {{ed\adddotspace y pr\'{o}l\adddot}{ed\adddotspace y pr\'{o}l\adddot}},
- byeditoraf = {{ed\adddotspace y ep\'{i}l\adddot}{ed\adddotspace y ep\'{i}l\adddot}},
- byeditortrco = {{ed\adddot, trad\adddotspace y com\adddot}{ed\adddot, trad\adddotspace y com\adddot}},
- byeditortran = {{ed\adddot, trad\adddotspace y anot\adddot}{ed\adddot, trad\adddotspace y anot\adddot}},
- byeditortrin = {{ed\adddot, trad\adddotspace e introd\adddot}{ed\adddot, trad\adddotspace e introd\adddot}},
- byeditortrfo = {{ed\adddot, trad\adddotspace y pr\'{o}l\adddot}{ed\adddot, trad\adddotspace y pr\'{o}l\adddot}},
- byeditortraf = {{ed\adddot, trad\adddotspace y ep\'{i}l\adddot}{ed\adddot, trad\adddotspace y ep\'{i}l\adddot}},
- byeditorcoin = {{ed\adddot, com\adddotspace e introd\adddot}{ed\adddot, com\adddotspace e introd\adddot}},
- byeditorcofo = {{ed\adddot, com\adddotspace y pr\'{o}l\adddot}{ed\adddot, com\adddotspace y pr\'{o}l\adddot}},
- byeditorcoaf = {{ed\adddot, com\adddotspace y ep\'{i}l\adddot}{ed\adddot, com\adddotspace y ep\'{i}l\adddot}},
- byeditoranin = {{ed\adddot, anot\adddotspace e introd\adddot}{ed\adddot, anot\adddotspace e introd\adddot}},
- byeditoranfo = {{ed\adddot, anot\adddotspace y pr\'{o}l\adddot}{ed\adddot, anot\adddotspace y pr\'{o}l\adddot}},
- byeditoranaf = {{ed\adddot, anot\adddotspace y ep\'{i}l\adddot}{ed\adddot, anot\adddotspace y ep\'{i}l\adddot}},
- byeditortrcoin = {{ed\adddot, trad\adddot, com\adddotspace e introd\adddot}{ed\adddot, trad\adddot, com\adddotspace e introd\adddot}},
- byeditortrcofo = {{ed\adddot, trad\adddot, com\adddotspace y pr\'{o}l\adddot}{ed\adddot, trad\adddot, com\adddotspace y pr\'{o}l\adddot}},
- byeditortrcoaf = {{ed\adddot, trad\adddot, com\adddotspace y ep\'{i}l\adddot}{ed\adddot, trad\adddot, com\adddotspace y ep\'{i}l\adddot}},
- byeditortranin = {{ed\adddot, trad\adddot, anot\adddotspace e introd\adddot}{ed\adddot, trad\adddot, anot\adddotspace e introd\adddot}},
- byeditortranfo = {{ed\adddot, trad\adddot, anot\adddotspace y pr\'{o}l\adddot}{ed\adddot, trad\adddot, anot\adddotspace y pr\'{o}l\adddot}},
- byeditortranaf = {{ed\adddot, trad\adddot, anot\adddotspace y ep\'{i}l\adddot}{ed\adddot, trad\adddot, anot\adddotspace y ep\'{i}l\adddot}},
- bytranslatorco = {{trad\adddotspace y com\adddot}{trad\adddotspace y com\adddot}},
- bytranslatoran = {{trad\adddotspace y anot\adddot}{trad\adddotspace y anot\adddot}},
- bytranslatorin = {{trad\adddotspace e introd\adddot}{trad\adddotspace e introd\adddot}},
- bytranslatorfo = {{trad\adddotspace y pr\'{o}l\adddot}{trad\adddotspace y pr\'{o}l\adddot}},
- bytranslatoraf = {{trad\adddotspace y ep\'{i}l\adddot}{trad\adddotspace y ep\'{i}l\adddot}},
- bytranslatorcoin = {{trad\adddot, com\adddotspace e introd\adddot}{trad\adddot, com\adddotspace e introd\adddot}},
- bytranslatorcofo = {{trad\adddot, com\adddotspace y pr\'{o}l\adddot}{trad\adddot, com\adddotspace y pr\'{o}l\adddot}},
- bytranslatorcoaf = {{trad\adddot, com\adddotspace y ep\'{i}l\adddot}{trad\adddot, com\adddotspace y ep\'{i}l\adddot}},
- bytranslatoranin = {{trad\adddot, anot\adddotspace e introd\adddot}{trad\adddot, anot\adddotspace e introd\adddot}},
- bytranslatoranfo = {{trad\adddot, anot\adddotspace y pr\'{o}l\adddot}{trad\adddot, anot\adddotspace y pr\'{o}l\adddot}},
- bytranslatoranaf = {{trad\adddot, anot\adddotspace y ep\'{i}l\adddot}{trad\adddot, anot\adddotspace y ep\'{i}l\adddot}},
- phdthesis = {{Tesis}{Tesis}},
- reviewof = {{rese\~{n}a de}{rese\~{n}a de}},
- volume = {{{Vol\adddot}}{{Vol\adddot}}}, % for correct capitalization of volume reference
- phd = {{Tesis}{Tesis}},% 0.6
- dphil = {{Tesis}{Tesis}},% 0.6
- lic = {{Lic\adddotspace tesis}{Lic\adddotspace tesis}},% 0.6
- ma = {{MA\addabbrvspace tesis}{MA\addabbrvspace tesis}},% 0.6
- ms = {{MS\addabbrvspace tesis}{MS\addabbrvspace tesis}},% 0.6
- msc = {{MSc\addabbrvspace tesis}{MSc\addabbrvspace tesis}},% 0.6
- mphil = {{MPhil\addabbrvspace tesis}{MPhil\addabbrvspace tesis}},% 0.6
- mlitt = {{MLitt\addabbrvspace tesis}{MLitt\addabbrvspace tesis}},% 0.6
- % FIXME 2.0 check the following for quality of Spanish translation
- manuscript = {{manuscrito}{manuscrito}},
- patentde = {{Deutsches Patent- und Markenamt}{DE}},% localised in German
- patenteu = {{Oficina Europea de Patentes}{EU}},
- patentfr = {{Institut National de la Propriété Industrielle}{FR}},% localised in French
- patentuk = {{The Intellectual Property Office of the United Kingdom}{UK}},% localised in English
- patentus = {{United States Patent and Trademark Office}{US}},% localised in English
- % patreq = {{patent request}{pat\adddot\ req\adddot}},
- % patreqde = {{German patent request}{German pat\adddot\ req\adddot}},
- % patreqeu = {{European patent request}{European pat\adddot\ req\adddot}},
- patreqfr = {{Institut National de la Propriété Industrielle}{FR pat\adddot req\adddot}},
- % patrequk = {{British patent request}{British pat\adddot\ req\adddot}},
- % patrequs = {{U.S\adddotspace patent request}{U.S\adddotspace pat\adddot\ req\adddot}},
- typescript = {{mecanografiado}{mecanografiado}},
- director = {{dir\adddot}{dir\adddot}},
- screenplay = {{adapt\adddot}{adapt\adddot}},
- adaptation = {{adapt\adddot}{adapt\adddot}},
- adaptor = {{adapt\adddot}{adapt\adddot}},
- performer = {{ejecutante}{ejecutante},
- performers = {{ejecutantes}{ejecutantes},
- composer = {{comp\adddot}{comp\adddot}},
- composedby = {{compuesto~por}{compuesto~por}},
- producer = {{prod\adddot}{prod\adddot}},
- with = {{con}{con}},
- proceedings = {{actas}{actas}},
- transof = {{traducción~de}{traducción~de}},
- volstodate = {{volúmenes hasta ahora}{volúmenes hasta ahora}},
- supptotitle = {{a}{a}},
- print = {{impresión}{impresión}},
- web = {{web}{web}},
-}
\endinput \ No newline at end of file