summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-02-22 03:00:54 +0000
committerNorbert Preining <norbert@preining.info>2022-02-22 03:00:54 +0000
commitfb013a78d9e3aef2ecf58702d4adcec8d9ab6b28 (patch)
treed4402a058adb8131b94ec026d7be01cca51d8862 /macros/latex
parenta9409c96664c73e4fd0586f358845df19b1afd62 (diff)
CTAN sync 202202220300
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/animate/ChangeLog3
-rw-r--r--macros/latex/contrib/animate/animate.pdfbin3753810 -> 3751389 bytes
-rw-r--r--macros/latex/contrib/animate/animate.sty20
-rw-r--r--macros/latex/contrib/animate/animate.tex12
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/CHANGELOG.md1
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/LICENSE.md (renamed from macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/LICENSE)0
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/README.md2
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamercolorthemefocus.sty2
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerfontthemefocus.sty2
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerinnerthemefocus.sty2
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerouterthemefocus.sty9
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerthemefocus.sty4
-rw-r--r--macros/latex/contrib/bfh-ci/README.md10
-rw-r--r--macros/latex/contrib/bfh-ci/doc/DEMO-BFHBeamer-Sidebar.pdfbin51003 -> 43198 bytes
-rw-r--r--macros/latex/contrib/bfh-ci/doc/DEMO-BFHBeamer.pdfbin40918 -> 36047 bytes
-rw-r--r--macros/latex/contrib/bfh-ci/doc/DEMO-BFHFactsheet.pdfbin50275 -> 39921 bytes
-rw-r--r--macros/latex/contrib/bfh-ci/doc/DEMO-BFHLetter.pdfbin13840 -> 12405 bytes
-rw-r--r--macros/latex/contrib/bfh-ci/doc/DEMO-BFHProjektProposal.pdfbin54761 -> 44255 bytes
-rw-r--r--macros/latex/contrib/bfh-ci/doc/DEMO-BFHPub.pdfbin92251 -> 87480 bytes
-rw-r--r--macros/latex/contrib/bfh-ci/doc/DEMO-BFHSciPoster.pdfbin46618 -> 42697 bytes
-rw-r--r--macros/latex/contrib/bfh-ci/doc/DEMO-BFHThesis.pdfbin41461 -> 36852 bytes
-rw-r--r--macros/latex/contrib/bfh-ci/example/DEMO-BFHFromaddress.lco2
-rw-r--r--macros/latex/contrib/bfh-ci/example/DEMO-BFHProjektProposal.tex17
-rw-r--r--macros/latex/contrib/bfh-ci/example/DEMO-BFHPub.tex22
-rw-r--r--macros/latex/contrib/bfh-ci/tex/beamercolorthemeBFH.sty6
-rw-r--r--macros/latex/contrib/bfh-ci/tex/beamerfontthemeBFH.sty6
-rw-r--r--macros/latex/contrib/bfh-ci/tex/beamerinnerthemeBFH.sty6
-rw-r--r--macros/latex/contrib/bfh-ci/tex/beamerouterthemeBFH-sidebar.sty6
-rw-r--r--macros/latex/contrib/bfh-ci/tex/beamerouterthemeBFH.sty6
-rw-r--r--macros/latex/contrib/bfh-ci/tex/beamerthemeBFH.sty8
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-a0paper.clo6
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-a1paper.clo6
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-a2paper.clo6
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-a3paper.clo6
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-a4paper.clo6
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-a5paper.clo6
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-a6paper.clo12
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-beamerarticle.cfg6
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-factsheet.cfg6
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-layout-boxes.cfg8
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-layout-listings.cfg6
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-layout-rules.cfg6
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-layout-tabular.cfg6
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-layout-terminal.cfg77
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-projectproposal.cfg6
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhbeamer.cls23
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhcolors.sty8
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhfonts.sty6
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhlayout.sty27
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhletter.sty6
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhlettersize9.5pt.clo4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhmodule.sty59
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhpub.cls8
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhsciposter.cls20
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhthesis.cls6
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhtranslations-english.trsl2
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhtranslations-french.trsl2
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhtranslations-german.trsl6
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-mla/CHANGES62
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-mla/README3
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-mla/american-mla.lbx14
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/biblatex-mla.pdfbin167698 -> 509498 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/biblatex-mla.tex2786
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/bibtex_documentation.sty79
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/examples.pdfbin116506 -> 117337 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/handbook9.bib2003
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/handbook9_messy.bib2249
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-mla/english-mla.lbx215
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-mla/italian-mla.lbx181
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-mla/mla-new.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-mla/mla-strict.bbx1207
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-mla/mla-strict.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-mla/mla.bbx52
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-mla/mla.cbx188
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-mla/portuguese-mla.lbx172
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-mla/spanish-mla.lbx200
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx13
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin578152 -> 578195 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.tex78
-rw-r--r--macros/latex/contrib/l3kernel/CHANGELOG.md162
-rw-r--r--macros/latex/contrib/l3kernel/README.md85
-rw-r--r--macros/latex/contrib/l3kernel/expl3.dtx4
-rw-r--r--macros/latex/contrib/l3kernel/expl3.pdfbin622534 -> 622339 bytes
-rw-r--r--macros/latex/contrib/l3kernel/interface3.pdfbin1764443 -> 1766164 bytes
-rw-r--r--macros/latex/contrib/l3kernel/interface3.tex2
-rw-r--r--macros/latex/contrib/l3kernel/l3basics.dtx13
-rw-r--r--macros/latex/contrib/l3kernel/l3bootstrap.dtx27
-rw-r--r--macros/latex/contrib/l3kernel/l3box.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3candidates.dtx6
-rw-r--r--macros/latex/contrib/l3kernel/l3cctab.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3clist.dtx16
-rw-r--r--macros/latex/contrib/l3kernel/l3coffins.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3color.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3debug.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3deprecation.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3doc.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3doc.pdfbin551471 -> 551269 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3docstrip.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3docstrip.pdfbin151570 -> 151363 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3expan.dtx4
-rw-r--r--macros/latex/contrib/l3kernel/l3file.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3flag.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-assign.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-aux.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-basics.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-convert.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-expo.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-extended.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-logic.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-parse.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-random.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-round.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-traps.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp-trig.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fp.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3fparray.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3int.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3intarray.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3kernel-functions.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3keys.dtx15
-rw-r--r--macros/latex/contrib/l3kernel/l3legacy.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3luatex.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3msg.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3names.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3news.pdfbin395879 -> 395879 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news01.pdfbin122710 -> 122710 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news02.pdfbin150676 -> 150676 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news03.pdfbin148702 -> 148702 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news04.pdfbin114588 -> 114588 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news05.pdfbin112487 -> 112487 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news06.pdfbin151573 -> 151573 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news07.pdfbin128309 -> 128309 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news08.pdfbin163454 -> 163454 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news09.pdfbin250139 -> 250139 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news10.pdfbin150279 -> 150279 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news11.pdfbin170063 -> 170063 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3news12.pdfbin204990 -> 204990 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3pdf.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3prefixes.pdfbin80970 -> 80970 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3prg.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3prop.dtx14
-rw-r--r--macros/latex/contrib/l3kernel/l3quark.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3regex.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3seq.dtx10
-rw-r--r--macros/latex/contrib/l3kernel/l3skip.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3sort.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3str-convert.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3str.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3styleguide.pdfbin296009 -> 295820 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3styleguide.tex2
-rw-r--r--macros/latex/contrib/l3kernel/l3syntax-changes.pdfbin242685 -> 242489 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3syntax-changes.tex2
-rw-r--r--macros/latex/contrib/l3kernel/l3sys.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3term-glossary.pdfbin231077 -> 230882 bytes
-rw-r--r--macros/latex/contrib/l3kernel/l3term-glossary.tex2
-rw-r--r--macros/latex/contrib/l3kernel/l3text-case.dtx51
-rw-r--r--macros/latex/contrib/l3kernel/l3text-purify.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3text.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3tl-analysis.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3tl.dtx18
-rw-r--r--macros/latex/contrib/l3kernel/l3token.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/l3unicode.dtx2
-rw-r--r--macros/latex/contrib/l3kernel/source3.pdfbin6934491 -> 6938663 bytes
-rw-r--r--macros/latex/contrib/l3kernel/source3.tex2
-rw-r--r--macros/latex/contrib/moderncv/CHANGELOG5
-rw-r--r--macros/latex/contrib/moderncv/README.md8
-rw-r--r--macros/latex/contrib/moderncv/moderncv.cls12
-rw-r--r--macros/latex/contrib/moderncv/moderncvbodyi.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvbodyiii.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvbodyiv.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvbodyv.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvcollection.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvcolorblack.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvcolorblue.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvcolorburgundy.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvcolorgreen.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvcolorgrey.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvcolororange.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvcolorpurple.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvcolorred.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvcompatibility.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvdebugtools.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvfooti.sty6
-rw-r--r--macros/latex/contrib/moderncv/moderncvheadi.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvheadii.sty6
-rw-r--r--macros/latex/contrib/moderncv/moderncvheadiii.sty6
-rw-r--r--macros/latex/contrib/moderncv/moderncvheadiv.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvheadv.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvheadvi.sty6
-rw-r--r--macros/latex/contrib/moderncv/moderncviconsacademic.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncviconsawesome.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncviconsletters.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncviconsmarvosym.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncviconssymbols.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncviconstikz.sty33
-rw-r--r--macros/latex/contrib/moderncv/moderncvskillmatrix.sty2
-rw-r--r--macros/latex/contrib/moderncv/moderncvstylebanking.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvstylecasual.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvstyleclassic.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvstyleempty.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvstylefancy.sty4
-rw-r--r--macros/latex/contrib/moderncv/moderncvstyleoldstyle.sty4
-rw-r--r--macros/latex/contrib/moderncv/template.tex13
-rw-r--r--macros/latex/contrib/moderncv/tweaklist.sty2
-rw-r--r--macros/latex/contrib/nwejm/README.md2
-rw-r--r--macros/latex/contrib/nwejm/doc/french/nwejm-fr.pdfbin339327 -> 339118 bytes
-rw-r--r--macros/latex/contrib/nwejm/doc/french/nwejm-fr.tex8
-rw-r--r--macros/latex/contrib/nwejm/source/nwejm.dtx21
-rw-r--r--macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdfbin408204 -> 470786 bytes
-rw-r--r--macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex739
-rw-r--r--macros/latex/contrib/proflycee/tex/ProfLycee.sty24
211 files changed, 9436 insertions, 2096 deletions
diff --git a/macros/latex/contrib/animate/ChangeLog b/macros/latex/contrib/animate/ChangeLog
index e2ef9c8a9e..e30e23a04f 100644
--- a/macros/latex/contrib/animate/ChangeLog
+++ b/macros/latex/contrib/animate/ChangeLog
@@ -1,3 +1,6 @@
+2022-02-21
+ * improvement: svg clipping code simplified
+
2022-02-04
* fix: ocg method: moving back to /OC method (instead of BDC/EMC)
diff --git a/macros/latex/contrib/animate/animate.pdf b/macros/latex/contrib/animate/animate.pdf
index 1046dfa24c..6920b0466d 100644
--- a/macros/latex/contrib/animate/animate.pdf
+++ b/macros/latex/contrib/animate/animate.pdf
Binary files differ
diff --git a/macros/latex/contrib/animate/animate.sty b/macros/latex/contrib/animate/animate.sty
index c18e4f3657..6964db89a1 100644
--- a/macros/latex/contrib/animate/animate.sty
+++ b/macros/latex/contrib/animate/animate.sty
@@ -13,7 +13,7 @@
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
-\def\@anim@version{2022/02/04}
+\def\@anim@version{2022/02/21}
\ProvidesPackage{animate}
[\@anim@version\space PDF & SVG animations from files and inline graphics]
@@ -460,7 +460,7 @@
\def\@anim@zaptrailingcommafromxref#1,\@nil{\if@anim@dvips{#1}\else#1\fi}%
% inserts one animation frame into the output acc. to \ifcase\@anim@method
-% as a non-interactive Widget annotation (0 or 1) or an an xform (2) that is
+% as a non-interactive Widget annotation (0 or 1) or as an xform (2) that is
% referenced in the page content (and tagged as OCG or for multipage PDF export)
% args: #1 animation num, #2 frame number, #3 comma-separated list of xform
% refs (transparencies)
@@ -2209,17 +2209,17 @@
% clip animation to final dimensions (dvisvgm)
\def\@anim@beginsvgclip#1{%
\special{dvisvgm:raw
- <g transform="translate({?x},{?(y-\@anim@getkeyval{a#1.htbp})})">%
- <svg overflow="hidden"
- width="\@anim@getkeyval{a#1.wdbp}" height="\@anim@getkeyval{a#1.thtbp}"
- viewBox="%
- {?x} {?(y-\@anim@getkeyval{a#1.htbp})}
- \@anim@getkeyval{a#1.wdbp} \@anim@getkeyval{a#1.thtbp}%
- ">%
+ <svg overflow="hidden"
+ x="{?x}" y="{?(y-\@anim@getkeyval{a#1.htbp})}"
+ width="\@anim@getkeyval{a#1.wdbp}" height="\@anim@getkeyval{a#1.thtbp}"
+ viewBox="%
+ {?x} {?(y-\@anim@getkeyval{a#1.htbp})}
+ \@anim@getkeyval{a#1.wdbp} \@anim@getkeyval{a#1.thtbp}%
+ ">%
}%
}%
\def\@anim@endsvgclip{%
- \special{dvisvgm:raw </svg></g>}%
+ \special{dvisvgm:raw </svg>}%
}
%usercommand for use within `animateinline' environment;
diff --git a/macros/latex/contrib/animate/animate.tex b/macros/latex/contrib/animate/animate.tex
index 6d3101f084..9c1e922325 100644
--- a/macros/latex/contrib/animate/animate.tex
+++ b/macros/latex/contrib/animate/animate.tex
@@ -1385,12 +1385,12 @@ dvilualatex
xelatex -no-pdf
\end{verbatim}
to produce DVI or XDV output from the \LaTeX{} source. After this, SVG is obtained by running
-%\begin{verbatim}
-%dvisvgm --font-format=woff --exact --zoom=-1 --page=1,- --optimize ...
-%\end{verbatim}
\begin{verbatim}
-dvisvgm --font-format=woff --exact --zoom=-1 --page=1,- ...
+dvisvgm --font-format=woff --exact --zoom=-1 --page=1,- --optimize ...
\end{verbatim}
+%\begin{verbatim}
+%dvisvgm --font-format=woff --exact --zoom=-1 --page=1,- ...
+%\end{verbatim}
on the intermediate DVI or XDV file.
Option `\verb+--font-format=woff+' (or `\verb+--font-format=woff2+') prompts \verb+dvisvgm+ to embed document fonts in a format that is understood by Web browsers. It ensures that typeset text looks as in normal PDF output.
@@ -1401,7 +1401,7 @@ The purpose of `\verb+--zoom=-1+' is to produce responsive SVG. If embedded in a
By default, \verb+dvisvgm+ processes only the very first page of the input file. To convert multipage DVI/XDV with several animations, add option `\verb+--page=1,-+'.
-%With option `\verb+--optimize+', \verb+dvisvgm+ applies several optimizations to reduce the output file size.
+With option `\verb+--optimize+', \verb+dvisvgm+ applies several optimizations to reduce the output file size.
As SVG derives from XML it is not known to be particularly economical in terms of file size. Compressed SVG, with file extension `\verb+svgz+', shortens download times and is supported by most Web browsers. It can be generated by adding option `\verb+-z+'. Also, option `\verb+--precision=1+' may be used to reduce the SVG file size. It limits the precision of floating point numbers, such as coordinates, to one decimal figure. Sometimes, animations may behave stangely after applying this option. Then, of course, it should be omitted.
@@ -1420,7 +1420,7 @@ In \TeX4ht documents, the whole \verb+<object>...</object>+ tag can be inserted
\begin{itemize}
\item The maximum frame rate that can actually be achieved largely depends on the complexity of the graphics and on the available hardware. In Acrobat Reader, you might want to experiment with the 2D graphical hardware acceleration feature. Go to menu `Edit' $\rightarrow$ `Preferences' $\rightarrow$ `Page Display' $\rightarrow$ `Rendering' to see whether hardware acceleration is available. A 2D GPU acceleration check box will be visible if a supported video card has been detected. Also, enabling or disabling the page cache (`Edit' $\rightarrow$ `Preferences' $\rightarrow$ `Page Display' $\rightarrow$ `Rendering' $\rightarrow$ `Use page cache') may affect the rendering performance.
- \item Animated SVG is best viewed in Web browsers that are based on the Blink rendering engine. The most prominent representatives are Chrome, its open-source base Chromium and Opera. Unfortunately, Firefox is very slow.
+ \item Animated SVG is best viewed in Web browsers that are based on the Blink rendering engine. The most prominent representatives are Chrome, its open-source base Chromium and Opera. Unfortunately, in Firefox some animations run slowly, especially if the graphics make use of clipping operations.
\item The \verb+dvips+ option `\verb+-Ppdf+' should be avoided entirely or followed by something like `\verb+-D 1200+' on the command line in order to set a sensible DVI resolution. This does \emph{not} degrade the output quality! The configuration file `config.pdf' loaded by option `\verb+-Ppdf+' specifies an excessively high DVI resolution that will be passed on to the final PDF. Eventually, Acrobat Reader gets confused and will not display the frames within the animation widget.
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/CHANGELOG.md b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/CHANGELOG.md
new file mode 100644
index 0000000000..187f8a43cd
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/CHANGELOG.md
@@ -0,0 +1 @@
+Fix frame numbering on frames when both `noframenumbering` and `allowframebreaks` options are used.
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/LICENSE b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/LICENSE.md
index f288702d2f..f288702d2f 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/LICENSE
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/LICENSE.md
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/README.md b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/README.md
index a98aeb29d7..2e6f3c2d04 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/README.md
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/README.md
@@ -1,4 +1,4 @@
-# Focus v3.1.0
+# Focus v3.2.0
A presentation theme for LaTeX Beamer that aims at a clean and minimalist design,
so to minimize distractions and put the focus directly on the content.
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamercolorthemefocus.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamercolorthemefocus.sty
index 3f4455c795..657b4eba80 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamercolorthemefocus.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamercolorthemefocus.sty
@@ -1,4 +1,4 @@
-% Copyright (C) 2018-2021 Pasquale Claudio Africa and the LaTeX community.
+% Copyright (C) 2018-2022 Pasquale Claudio Africa and the LaTeX community.
% A full list of contributors can be found at
%
% https://github.com/elauksap/focus-beamertheme
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerfontthemefocus.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerfontthemefocus.sty
index 2319885a1a..e87abb1e1a 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerfontthemefocus.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerfontthemefocus.sty
@@ -1,4 +1,4 @@
-% Copyright (C) 2018-2021 Pasquale Claudio Africa and the LaTeX community.
+% Copyright (C) 2018-2022 Pasquale Claudio Africa and the LaTeX community.
% A full list of contributors can be found at
%
% https://github.com/elauksap/focus-beamertheme
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerinnerthemefocus.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerinnerthemefocus.sty
index 557893c43a..bb04821be1 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerinnerthemefocus.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerinnerthemefocus.sty
@@ -1,4 +1,4 @@
-% Copyright (C) 2018-2021 Pasquale Claudio Africa and the LaTeX community.
+% Copyright (C) 2018-2022 Pasquale Claudio Africa and the LaTeX community.
% A full list of contributors can be found at
%
% https://github.com/elauksap/focus-beamertheme
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerouterthemefocus.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerouterthemefocus.sty
index e65db21774..edd9ca40d5 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerouterthemefocus.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerouterthemefocus.sty
@@ -1,4 +1,4 @@
-% Copyright (C) 2018-2021 Pasquale Claudio Africa and the LaTeX community.
+% Copyright (C) 2018-2022 Pasquale Claudio Africa and the LaTeX community.
% A full list of contributors can be found at
%
% https://github.com/elauksap/focus-beamertheme
@@ -205,6 +205,11 @@
% Empty footline.
\defbeamertemplate{footline}{none}{}
+% Empty footline for noframenumbering.
+\defbeamertemplate{footline}{noframenumbering}{
+ \addtocounter{framenumber}{-1}
+}
+
\DeclareOptionBeamer{numbering}{\def\beamer@focus@numbering{#1}}
\ExecuteOptionsBeamer{numbering=progressbar}
@@ -276,8 +281,6 @@
\setbeamertemplate{footline}[none]%
\setlength{\focus@pbar@height}{0cm}%
\focus@calculatefootheight%
- %
- \addtocounter{framenumber}{-1}%
}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerthemefocus.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerthemefocus.sty
index 60fe0d644a..195d850f45 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerthemefocus.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerthemefocus.sty
@@ -1,4 +1,4 @@
-% Copyright (C) 2018-2021 Pasquale Claudio Africa and the LaTeX community.
+% Copyright (C) 2018-2022 Pasquale Claudio Africa and the LaTeX community.
% A full list of contributors can be found at
%
% https://github.com/elauksap/focus-beamertheme
@@ -19,7 +19,7 @@
% along with beamerthemefocus. If not, see <http://www.gnu.org/licenses/>.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerthemefocus}[2021/12/08 v3.1.0 Focus Beamer theme]
+\ProvidesPackage{beamerthemefocus}[2022/02/21 v3.2.0 Focus Beamer theme]
\mode<presentation>
diff --git a/macros/latex/contrib/bfh-ci/README.md b/macros/latex/contrib/bfh-ci/README.md
index 084f584cc0..593516e009 100644
--- a/macros/latex/contrib/bfh-ci/README.md
+++ b/macros/latex/contrib/bfh-ci/README.md
@@ -1,8 +1,8 @@
# BFH-CI – Corporate Design LaTeX Templates for Bern University of Applied Sciences
-Copyright (C) Marei Peischl <marei@peitex.de> & Andreas Habegger <andreas.habegger@bfh.ch>, 2021
+Copyright (C) Marei Peischl <marei@peitex.de> & Andreas Habegger <andreas.habegger@bfh.ch>, 2021–2022
-bfh 2021/12/23 v2.0.0
+bfh 2022/01/24 v2.1.0
***************************************************************************
@@ -84,4 +84,8 @@ BFH-CI uses the translations package to provide translations for specific elemen
# Version History
-* v2.0.0 (2021/12/23) First public version on CTAN \ No newline at end of file
+* v2.0.0 (2021/12/23) First public version on CTAN
+* v2.1.0 (2022/01/24)
+ - Fix some typos and translations
+ - Move the bfhmodule mechanism to bfhmodule.sty
+ - add a starred variant for bfhterminal environments \ No newline at end of file
diff --git a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHBeamer-Sidebar.pdf b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHBeamer-Sidebar.pdf
index 767df336ea..665d7ad0e0 100644
--- a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHBeamer-Sidebar.pdf
+++ b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHBeamer-Sidebar.pdf
Binary files differ
diff --git a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHBeamer.pdf b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHBeamer.pdf
index 8ba9c51c36..8369c22bf8 100644
--- a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHBeamer.pdf
+++ b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHBeamer.pdf
Binary files differ
diff --git a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHFactsheet.pdf b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHFactsheet.pdf
index e00fd01cf4..99ea55262d 100644
--- a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHFactsheet.pdf
+++ b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHFactsheet.pdf
Binary files differ
diff --git a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHLetter.pdf b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHLetter.pdf
index 182d0df3d0..79fa48e94a 100644
--- a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHLetter.pdf
+++ b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHLetter.pdf
Binary files differ
diff --git a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHProjektProposal.pdf b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHProjektProposal.pdf
index 9c7b3639d0..48fc26ccc1 100644
--- a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHProjektProposal.pdf
+++ b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHProjektProposal.pdf
Binary files differ
diff --git a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHPub.pdf b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHPub.pdf
index 692ea98379..561a244fc2 100644
--- a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHPub.pdf
+++ b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHPub.pdf
Binary files differ
diff --git a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHSciPoster.pdf b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHSciPoster.pdf
index f70e850f2e..67f55ac19b 100644
--- a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHSciPoster.pdf
+++ b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHSciPoster.pdf
Binary files differ
diff --git a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHThesis.pdf b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHThesis.pdf
index 0e14fc370b..99fa40620c 100644
--- a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHThesis.pdf
+++ b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHThesis.pdf
Binary files differ
diff --git a/macros/latex/contrib/bfh-ci/example/DEMO-BFHFromaddress.lco b/macros/latex/contrib/bfh-ci/example/DEMO-BFHFromaddress.lco
index dd074d1506..20185ee1a1 100644
--- a/macros/latex/contrib/bfh-ci/example/DEMO-BFHFromaddress.lco
+++ b/macros/latex/contrib/bfh-ci/example/DEMO-BFHFromaddress.lco
@@ -10,7 +10,7 @@
%%
%% The Current Maintainers of this work are
%% Marei Peischl <marei@peitex.de>
-%% Andreas HABEGGER <andreas.habegger@bfh.ch>
+%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
%% The development respository can be found at
%% https://gitlab.ti.bfh.ch/bfh-latex/bfh-ci/
diff --git a/macros/latex/contrib/bfh-ci/example/DEMO-BFHProjektProposal.tex b/macros/latex/contrib/bfh-ci/example/DEMO-BFHProjektProposal.tex
index f0f35c9b2b..5011c5c0a3 100644
--- a/macros/latex/contrib/bfh-ci/example/DEMO-BFHProjektProposal.tex
+++ b/macros/latex/contrib/bfh-ci/example/DEMO-BFHProjektProposal.tex
@@ -29,23 +29,20 @@
\begin{ProjectDescription}
-\section{Projektbeschreibung}
-Es sollen Testverfahren ausgearbeitet und anhand einer konkreten Anwendung überprüft werden, um die Echtzeitfähigkeit eines Linux basierten Embedded Systems zu charakte-risieren\cite{lamport94}. Zur Realisierung der Echtzeitfähigkeit im Linux Kernel wurden verschiedene Echtzeit-Patches entwickelt. Seit 2020 ist der RT Patch in der Kernel-Mainline.
-Weiter soll untersucht werden, ob und wann es sinnvoll ist ein Embedded Linux System mit einem Echtzeitbetriebssystem zu ergänzen.
+ \section{Projektbeschreibung}
+ Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diem nonummy nibh euismod tincidunt ut lacreet dolore magna aliguam erat volutpat. Ut wisis enim ad minim veniam, quis nostrud exerci tution ullam corper suscipit lobortis nisi ut aliquip ex ea commodo consequat. Duis te feugi facilisi. Duis autem dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit au gue duis dolore te feugat nulla facilisi.
\end{ProjectDescription}
\maketitle
\section{Projektziele}
\begin{itemize}
- \item In Betrieb nehmen der STM32MP1 basierten Entwicklungsplattform.
- \item Testkriterien für die Charakterisierung festlegen.
- \item Schnittstelle zur konkreten Testanwendung festlegen und umsetzen.
- \item Linux System mit RT Patch und einer Echtzeitanwendung realisieren.
+ \item Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+ \item Aenean commodo ligula eget dolor. \cite{lamport94}
+ \item Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.
\end{itemize}
-\vfill
-
+\vfill
\includegraphics[width=\linewidth]{example-image}
\par\nointerlineskip\bfhRule
@@ -70,6 +67,4 @@ Weiter soll untersucht werden, ob und wann es sinnvoll ist ein Embedded Linux Sy
Conceptual=6
}
-
-
\end{document}
diff --git a/macros/latex/contrib/bfh-ci/example/DEMO-BFHPub.tex b/macros/latex/contrib/bfh-ci/example/DEMO-BFHPub.tex
index 18d4887a46..8e9ed03487 100644
--- a/macros/latex/contrib/bfh-ci/example/DEMO-BFHPub.tex
+++ b/macros/latex/contrib/bfh-ci/example/DEMO-BFHPub.tex
@@ -158,35 +158,35 @@ Please have a look at the corresponding demo files if you use want to create ano
To support some layout elements among all document types BFH-CI introduces the Macro
\begin{verbatim}
- \LoadBFHModule{<List of Modules>}
+ \LoadBFHModule{<List of Modules>}
\end{verbatim}
These modules can be used to extend the basic mechanisms on additional elements.
Currently there are 3 Modules prepared:
\begin{itemize}
- \item table
- \item listings
- \item terminal
- \item boxes
- \item rules
+\item tabular
+\item listings
+\item terminal
+\item boxes
+\item rules
\end{itemize}
The corresponding filenames following the structure \file{bfh-layout-<modulename>.cfg}. User defined modules can be added.
-\subsection{table module}
+\subsection{The table module}
This module is automatically loaded by all document types beside \cls{bfhletter.cls}.
\begin{verbatim}
- \LoadBFHModule{table}
+ \LoadBFHModule{tabular}
\end{verbatim}
-BFH-CI should used colored tabulars. It combined all necessary adjustments in the \verb+\setupBfhTabular+ macro. It will adjust the rowcolor using \pkg{xcolor}. To use the recommended tabular setup one could use
+BFH-CI should used colored tabulars. It combined all necessary adjustments in the \verb+\setupBfhTabular+ macro. It will adjust the rowcolor using \pkg{xcolor}. To use the recommended tabular setup one could use:
\begin{verbatim}
\begin{table}
- \centering
+ \centering
\setupBfhTabular
\begin{tabular}{lll}
\rowcolor{BFH-tablehead}
@@ -226,7 +226,7 @@ To simplify the usage the \pkg{bfhlayout} also provides a \verb+bfhTabular+ envi
\end{table}
\end{verbatim}
-In case the package \pkg{tabularray} ist loaded the table module will also implement a tblr environ to use the layout.
+In case the package \pkg{tabularray} is loaded the tabular module will also implement a tblr environ to use the layout.
For further usage information please have a look at the \pkg{tabularray} documentation.
\begin{verbatim}
diff --git a/macros/latex/contrib/bfh-ci/tex/beamercolorthemeBFH.sty b/macros/latex/contrib/bfh-ci/tex/beamercolorthemeBFH.sty
index 3d197f6eb9..d1da9298e8 100644
--- a/macros/latex/contrib/bfh-ci/tex/beamercolorthemeBFH.sty
+++ b/macros/latex/contrib/bfh-ci/tex/beamercolorthemeBFH.sty
@@ -1,9 +1,9 @@
-%% This is file `beamercolorthemeBFH.sty' version 2.0.0 (2021/12/23),
+%% This is file `beamercolorthemeBFH.sty' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesPackage{beamercolorthemeBFH}[2021/12/23 v2.0.0 BFH-CI beamer color theme, CI of Bern University of Applied Sciences]
+\ProvidesPackage{beamercolorthemeBFH}[2022/01/24 v2.1.0 BFH-CI beamer color theme, CI of Bern University of Applied Sciences]
% ====================
% Dependencies
diff --git a/macros/latex/contrib/bfh-ci/tex/beamerfontthemeBFH.sty b/macros/latex/contrib/bfh-ci/tex/beamerfontthemeBFH.sty
index 491894721b..5c3b6f05ab 100644
--- a/macros/latex/contrib/bfh-ci/tex/beamerfontthemeBFH.sty
+++ b/macros/latex/contrib/bfh-ci/tex/beamerfontthemeBFH.sty
@@ -1,9 +1,9 @@
-%% This is file `beamerfontthemeBFH.sty' version 2.0.0 (2021/12/23),
+%% This is file `beamerfontthemeBFH.sty' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesPackage{beamerfontthemeBFH}[2021/12/23 v2.0.0 BFH-CI beamer font theme, CI of Bern University of Applied Sciences]
+\ProvidesPackage{beamerfontthemeBFH}[2022/01/24 v2.1.0 BFH-CI beamer font theme, CI of Bern University of Applied Sciences]
% ====================
% Dependencies
diff --git a/macros/latex/contrib/bfh-ci/tex/beamerinnerthemeBFH.sty b/macros/latex/contrib/bfh-ci/tex/beamerinnerthemeBFH.sty
index 41856ab212..11408ca455 100644
--- a/macros/latex/contrib/bfh-ci/tex/beamerinnerthemeBFH.sty
+++ b/macros/latex/contrib/bfh-ci/tex/beamerinnerthemeBFH.sty
@@ -1,9 +1,9 @@
-%% This is file `beamerinnerthemeBFH.sty' version 2.0.0 (2021/12/23),
+%% This is file `beamerinnerthemeBFH.sty' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesExplPackage{beamerinnerthemeBFH}{2021/12/23}{2.0.0}{BFH-CI beamer inner theme, CI of Bern University of Applied Sciences}
+\ProvidesExplPackage{beamerinnerthemeBFH}{2022/01/24}{2.1.0}{BFH-CI beamer inner theme, CI of Bern University of Applied Sciences}
\RequirePackage{l3keys2e}
diff --git a/macros/latex/contrib/bfh-ci/tex/beamerouterthemeBFH-sidebar.sty b/macros/latex/contrib/bfh-ci/tex/beamerouterthemeBFH-sidebar.sty
index 458e091fb5..f116bbd457 100644
--- a/macros/latex/contrib/bfh-ci/tex/beamerouterthemeBFH-sidebar.sty
+++ b/macros/latex/contrib/bfh-ci/tex/beamerouterthemeBFH-sidebar.sty
@@ -1,9 +1,9 @@
-%% This is file `beamerouterthemeBFH-sidebar.sty' version 2.0.0 (2021/12/23),
+%% This is file `beamerouterthemeBFH-sidebar.sty' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesPackage{beamerouterthemeBFH-sidebar}[2021/12/23 v2.0.0 BFH-CI beamer outer theme sidebar variant, CI of Bern University of Applied Sciences]
+\ProvidesPackage{beamerouterthemeBFH-sidebar}[2022/01/24 v2.1.0 BFH-CI beamer outer theme sidebar variant, CI of Bern University of Applied Sciences]
\mode<presentation>
\useoutertheme{BFH}
diff --git a/macros/latex/contrib/bfh-ci/tex/beamerouterthemeBFH.sty b/macros/latex/contrib/bfh-ci/tex/beamerouterthemeBFH.sty
index f5c49e33ec..a569175ee0 100644
--- a/macros/latex/contrib/bfh-ci/tex/beamerouterthemeBFH.sty
+++ b/macros/latex/contrib/bfh-ci/tex/beamerouterthemeBFH.sty
@@ -1,9 +1,9 @@
-%% This is file `beamerouterthemeBFH.sty' version 2.0.0 (2021/12/23),
+%% This is file `beamerouterthemeBFH.sty' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesPackage{beamerouterthemeBFH}[2021/12/23 v2.0.0 BFH-CI beamer outer theme, CI of Bern University of Applied Sciences]
+\ProvidesPackage{beamerouterthemeBFH}[2022/01/24 v2.1.0 BFH-CI beamer outer theme, CI of Bern University of Applied Sciences]
\RequirePackage{l3keys2e}
diff --git a/macros/latex/contrib/bfh-ci/tex/beamerthemeBFH.sty b/macros/latex/contrib/bfh-ci/tex/beamerthemeBFH.sty
index 21dfa5a1ca..23c23faac9 100644
--- a/macros/latex/contrib/bfh-ci/tex/beamerthemeBFH.sty
+++ b/macros/latex/contrib/bfh-ci/tex/beamerthemeBFH.sty
@@ -1,9 +1,9 @@
-%% This is file `beamerthemeBFH.sty' version 2.0.0 (2021/12/23),
+%% This is file `beamerthemeBFH.sty' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesPackage{beamerthemeBFH}[2021/12/23 v2.0.0 BFH-CI beamer theme, CI of Bern University of Applied Sciences]
+\ProvidesPackage{beamerthemeBFH}[2022/01/24 v2.1.0 BFH-CI beamer theme, CI of Bern University of Applied Sciences]
% ====================
% Dependencies
% ====================
@@ -68,7 +68,7 @@
\newcommand*{\version}[1]{\gdef\insertversion{\versionformat{#1}}}
\newcommand*{\versionformat}[1]{v#1}
-\version{}
+\def\insertversion{}
\mode<all>
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-a0paper.clo b/macros/latex/contrib/bfh-ci/tex/bfh-a0paper.clo
index dd9ecde839..b052af6988 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-a0paper.clo
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-a0paper.clo
@@ -1,9 +1,9 @@
-%% This is file `bfh-a0paper.clo' version 2.0.0 (2021/12/23),
+%% This is file `bfh-a0paper.clo' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesExplFile{bfh-a0paper.clo}{2021/12/23}{2.0.0}{bfh-ci~size~adjustments~for~a0paper}
+\ProvidesExplFile{bfh-a0paper.clo}{2022/01/24}{2.1.0}{bfh-ci~size~adjustments~for~a0paper}
\cs_set:Nn \ptxcd_setup_title_sizes: {
\cs_set:Nn \ptxcd_title_fontsize: {{126bp}{165bp}}
\cs_set:Nn \ptxcd_subtitle_fontsize: {{38bp}{55bp}}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-a1paper.clo b/macros/latex/contrib/bfh-ci/tex/bfh-a1paper.clo
index b475c9144f..b957ecd812 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-a1paper.clo
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-a1paper.clo
@@ -1,9 +1,9 @@
-%% This is file `bfh-a1paper.clo' version 2.0.0 (2021/12/23),
+%% This is file `bfh-a1paper.clo' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesExplFile{bfh-a1paper.clo}{2021/12/23}{2.0.0}{bfh-ci~size~adjustments~for~a1paper}
+\ProvidesExplFile{bfh-a1paper.clo}{2022/01/24}{2.1.0}{bfh-ci~size~adjustments~for~a1paper}
\cs_set:Nn \ptxcd_setup_title_sizes: {
\cs_set:Nn \ptxcd_title_fontsize: {{90bp}{108bp}}
\cs_set:Nn \ptxcd_subtitle_fontsize: {{27bp}{32.5bp}}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-a2paper.clo b/macros/latex/contrib/bfh-ci/tex/bfh-a2paper.clo
index 7f8f44aca1..67e6ace4bc 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-a2paper.clo
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-a2paper.clo
@@ -1,9 +1,9 @@
-%% This is file `bfh-a2paper.clo' version 2.0.0 (2021/12/23),
+%% This is file `bfh-a2paper.clo' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesExplFile{bfh-a2paper.clo}{2021/12/23}{2.0.0}{bfh-ci~size~adjustments~for~a2paper}
+\ProvidesExplFile{bfh-a2paper.clo}{2022/01/24}{2.1.0}{bfh-ci~size~adjustments~for~a2paper}
\cs_set:Nn \ptxcd_setup_title_sizes: {
\cs_set:Nn \ptxcd_title_fontsize: {{64bp}{77bp}}
\cs_set:Nn \ptxcd_subtitle_fontsize: {{19.5bp}{23.4bp}}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-a3paper.clo b/macros/latex/contrib/bfh-ci/tex/bfh-a3paper.clo
index 1897a70292..c4ed3ef3cf 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-a3paper.clo
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-a3paper.clo
@@ -1,9 +1,9 @@
-%% This is file `bfh-a3paper.clo' version 2.0.0 (2021/12/23),
+%% This is file `bfh-a3paper.clo' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesExplFile{bfh-a0paper.clo}{2021/12/23}{2.0.0}{bfh-ci~size~adjustments~for~a1paper}
+\ProvidesExplFile{bfh-a0paper.clo}{2022/01/24}{2.1.0}{bfh-ci~size~adjustments~for~a1paper}
\cs_set:Nn \ptxcd_setup_title_sizes: {
\cs_set:Nn \ptxcd_title_fontsize: {{46bp}{55.2bp}}
\cs_set:Nn \ptxcd_subtitle_fontsize: {{19.5bp}{23.4bp}}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-a4paper.clo b/macros/latex/contrib/bfh-ci/tex/bfh-a4paper.clo
index be54617d7d..a3f023ed2f 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-a4paper.clo
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-a4paper.clo
@@ -1,9 +1,9 @@
-%% This is file `bfh-a4paper.clo' version 2.0.0 (2021/12/23),
+%% This is file `bfh-a4paper.clo' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesExplFile{bfh-a0paper.clo}{2021/12/23}{2.0.0}{bfh-ci~size~adjustments~for~a4paper}
+\ProvidesExplFile{bfh-a0paper.clo}{2022/01/24}{2.1.0}{bfh-ci~size~adjustments~for~a4paper}
\cs_set:Nn \ptxcd_setup_base_sizes: {
\dim_gset:Nn \g_ptxcd_rule_height_dim {2.5mm}
\dim_gset:Nn \g_ptxcd_rule_arc_dim {.5mm}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-a5paper.clo b/macros/latex/contrib/bfh-ci/tex/bfh-a5paper.clo
index 52af529a50..d654128eff 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-a5paper.clo
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-a5paper.clo
@@ -1,9 +1,9 @@
-%% This is file `bfh-a5paper.clo' version 2.0.0 (2021/12/23),
+%% This is file `bfh-a5paper.clo' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesExplFile{bfh-a5paper.clo}{2021/12/23}{2.0.0}{bfh-ci~size~adjustments~for~a5paper}
+\ProvidesExplFile{bfh-a5paper.clo}{2022/01/24}{2.1.0}{bfh-ci~size~adjustments~for~a5paper}
\cs_set:Nn \ptxcd_setup_base_sizes: {
\dim_gset:Nn \g_ptxcd_rule_height_dim {2.5mm}
\dim_gset:Nn \g_ptxcd_rule_arc_dim {.5mm}%
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-a6paper.clo b/macros/latex/contrib/bfh-ci/tex/bfh-a6paper.clo
index 6409a8bc0e..16468c412b 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-a6paper.clo
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-a6paper.clo
@@ -1,11 +1,11 @@
-%% This is file `bfh-a6paper.clo' version 2.0.0 (2021/12/23),
+%% This is file `bfh-a6paper.clo' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
-%% Andreas HABEGGER <andreas.habegger@bfh.ch>
+%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
%% ============================================================================
%% This work may be distributed and/or modified under the
@@ -28,10 +28,10 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.0.0}
-\def\filedate{2021/12/23}
+\def\fileversion{2.1.0}
+\def\filedate{2022/01/24}
\def\fileversion{0.01}
-\def\filedate{2021/06/06}
+\def\filedate{2022/01/24}
\ProvidesExplFile{bfh-a5paper.clo}{\filedate}{\fileversion}{bfh-ci~size~adjustments~for~a5paper}
\cs_set:Nn \ptxcd_setup_base_sizes: {
\dim_gset:Nn \g_ptxcd_rule_height_dim {2mm}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-beamerarticle.cfg b/macros/latex/contrib/bfh-ci/tex/bfh-beamerarticle.cfg
index f8aaebe936..94387d0815 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-beamerarticle.cfg
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-beamerarticle.cfg
@@ -1,9 +1,9 @@
-%% This is file `bfh-beamerarticle.cfg' version 2.0.0 (2021/12/23),
+%% This is file `bfh-beamerarticle.cfg' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesFile{bfh-beamerarticle.cfg} [2021/12/23 v2.0.0 beamerarticle configuration for bfhlayout]
+\ProvidesFile{bfh-beamerarticle.cfg} [2022/01/24 v2.1.0 beamerarticle configuration for bfhlayout]
\let\orig@titlegraphic\titlegraphic
\let\titlegraphic\@undefined
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-factsheet.cfg b/macros/latex/contrib/bfh-ci/tex/bfh-factsheet.cfg
index 003f94f7e3..0639934526 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-factsheet.cfg
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-factsheet.cfg
@@ -1,9 +1,9 @@
-%% This is file `bfh-factsheet.cfg' version 2.0.0 (2021/12/23),
+%% This is file `bfh-factsheet.cfg' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesFile{bfh-factsheet.cfg}[2021/12/23 v2.0.0 factsheet configuration for bfhlayout]
+\ProvidesFile{bfh-factsheet.cfg}[2022/01/24 v2.1.0 factsheet configuration for bfhlayout]
\KOMAoptions{headsepline=false}
\clearpairofpagestyles
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-layout-boxes.cfg b/macros/latex/contrib/bfh-ci/tex/bfh-layout-boxes.cfg
index 11264734e0..fdbe19db36 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-layout-boxes.cfg
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-layout-boxes.cfg
@@ -1,11 +1,11 @@
-%% This is file `bfh-layout-boxes.cfg' version 2.0.0 (2021/12/23),
+%% This is file `bfh-layout-boxes.cfg' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
-%% Andreas HABEGGER <andreas.habegger@bfh.ch>
+%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
%% ============================================================================
%% This work may be distributed and/or modified under the
@@ -29,7 +29,7 @@
%% ============================================================================
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{bfh-layout-boxes.cfg}[2021/12/23 v2.0.0 boxes configuration for bfhlayout]
+\ProvidesFile{bfh-layout-boxes.cfg}[2022/01/24 v2.1.0 boxes configuration for bfhlayout]
\RequirePackage{bfhcolors}
\RequirePackage{fontawesome}
\PassOptionsToPackage{most}{tcolorbox}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-layout-listings.cfg b/macros/latex/contrib/bfh-ci/tex/bfh-layout-listings.cfg
index 2a99235d73..95c5a23dd2 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-layout-listings.cfg
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-layout-listings.cfg
@@ -1,9 +1,9 @@
-%% This is file `bfh-layout-listings.cfg' version 2.0.0 (2021/12/23),
+%% This is file `bfh-layout-listings.cfg' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesFile{bfh-layout-listings.cfg}[2021/12/23 v2.0.0 listings configuration for bfhlayout]
+\ProvidesFile{bfh-layout-listings.cfg}[2022/01/24 v2.1.0 listings configuration for bfhlayout]
\RequirePackage{bfhcolors}
%% Hack to fix issue with float env used in listings package
%% ref. : https://tex.stackexchange.com/questions/51867/koma-warning-about-toc
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-layout-rules.cfg b/macros/latex/contrib/bfh-ci/tex/bfh-layout-rules.cfg
index 09a1ede007..3ff156a372 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-layout-rules.cfg
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-layout-rules.cfg
@@ -1,9 +1,9 @@
-%% This is file `bfh-layout-rules.cfg' version 2.0.0 (2021/12/23),
+%% This is file `bfh-layout-rules.cfg' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesExplFile{bfh-layout-rules.cfg}{2021/12/23}{2.0.0}{rules configuration for bfhlayout}
+\ProvidesExplFile{bfh-layout-rules.cfg}{2022/01/24}{2.1.0}{rules configuration for bfhlayout}
\int_if_exist:NF \g_ptxcd_paper_int {
\int_new:N \g_ptxcd_paper_int
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-layout-tabular.cfg b/macros/latex/contrib/bfh-ci/tex/bfh-layout-tabular.cfg
index 30a2e9ad35..961ae6fe14 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-layout-tabular.cfg
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-layout-tabular.cfg
@@ -1,9 +1,9 @@
-%% This is file `bfh-layout-tabular.cfg' version 2.0.0 (2021/12/23),
+%% This is file `bfh-layout-tabular.cfg' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesExplFile{bfh-layout-tabular.cfg}{2021/12/23}{v2.0.0}{tabular and tabularray configuration for bfhlayout}
+\ProvidesExplFile{bfh-layout-tabular.cfg}{2022/01/24}{v2.1.0}{tabular and tabularray configuration for bfhlayout}
\colorlet{BFH-table}{BFH-LightGreen!10}
\colorlet{BFH-tablehead}{BFH-LightGreen!50}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-layout-terminal.cfg b/macros/latex/contrib/bfh-ci/tex/bfh-layout-terminal.cfg
index fce09fcdcf..02f6bd8b99 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-layout-terminal.cfg
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-layout-terminal.cfg
@@ -1,9 +1,9 @@
-%% This is file `bfh-layout-tabular.cfg' version 2.0.0 (2021/12/23),
+%% This is file `bfh-layout-tabular.cfg' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -29,7 +29,7 @@
%% ============================================================================
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{bfh-layout-tabular.cfg}[2021/12/23 v2.0.0 terminal configuration for bfhlayout]
+\ProvidesFile{bfh-layout-terminal.cfg}[2022/01/24 v2.1.0 terminal configuration for bfhlayout]
\RequirePackage{bfhcolors}
\RequirePackage{tcolorbox}
@@ -50,22 +50,46 @@
}
+
+\tcbset{
+ ptxcd/terminal/default/.style={
+ listing only,
+ listing options={style=tcblatex,language=sh,escapeinside=``,},
+ listing inputencoding=utf8,
+ minted options={escapeinside=\\`\\`,autogobble,formatcom=\BFHterminalFormatLine,breaklines,breaksymbol=\quad},
+ every listing line={\BFHterminalPrompt{}},
+ size=small,
+ halign title=flush left,
+ },
+ ptxcd/terminal/macos/.style={
+ colback=macosx-terminalBackground,
+ colupper=macosx-terminalText,
+ colframe=macosx-terminalFrame,
+ title={\textcolor{macosx-terminalFirstBullet}{\huge\ttfamily\bfseries{$\bullet$}\textcolor{macosx-terminalSecondBullet}{\huge\ttfamily\bfseries{$\bullet$}\textcolor{macosx-terminalThirdBullet}{\huge\ttfamily\bfseries{$\bullet$}}}}},
+ },
+ ptxcd/terminal/ubuntu/.style={
+ colback=ubuntu-terminalBackground,
+ colupper=ubuntu-terminalText,
+ colframe=ubuntu-terminalFrame,
+ title={\textcolor{ubuntu-terminalFirstBullet}{\huge{$\bullet$}}{\textcolor{ubuntu-terminalSecondBullet}{\huge{$\bullet$}}}{\textcolor{ubuntu-terminalThirdBullet}{\huge{$\bullet$}}}},
+ }
+}
+
+
\newcommand{\BFHterminalFormatLine}{%
\def\FancyVerbFormatLine##1{\BFHterminalPrompt{}##1}%
}
-\newtcblisting{ubuntu}{ %
- colback=ubuntu-terminalBackground,
- colupper=ubuntu-terminalText,
- colframe=ubuntu-terminalFrame,
- listing only,
- listing options={style=tcblatex,language=sh,escapeinside=``,},
- listing inputencoding=utf8,
- minted options={escapeinside=\\`\\`,autogobble,formatcom=\BFHterminalFormatLine,breaklines,breaksymbol=\quad},
- size=small,
- halign title=flush left,
- title={\textcolor{ubuntu-terminalFirstBullet}{\huge{$\bullet$}}{\textcolor{ubuntu-terminalSecondBullet}{\huge{$\bullet$}}}{\textcolor{ubuntu-terminalThirdBullet}{\huge{$\bullet$}}}},
- every listing line={\BFHterminalPrompt{}}
-} %%
+
+\newtcblisting{ubuntu}{
+ ptxcd/terminal/default,
+ ptxcd/terminal/ubuntu
+}
+
+\newtcblisting{ubuntu*}[1]{
+ ptxcd/terminal/default,
+ ptxcd/terminal/ubuntu,
+ #1
+}
\newcommand{\setupLinuxPrompt}[1]{\pgfkeys{/terminal/.cd,host=ubuntu,#1}%
\gdef\BFHterminalPrompt{\textcolor{\TerminalColor}{\small\ttfamily\bfseries \TerminalUser\url{@}\TerminalHost{\textcolor{ubuntu-terminalText}:}\textcolor{ubuntu-terminalText}{\url{~}}{\textcolor{ubuntu-terminalText}\TerminalPromptChar}\,}}
@@ -81,18 +105,15 @@
\colorlet{macosx-terminalSecondBullet}{orange!52!yellow}
\colorlet{macosx-terminalThirdBullet}{green!80!black}
-\newtcblisting{macos}{ %
- colback=macosx-terminalBackground,
- colupper=macosx-terminalText,
- colframe=macosx-terminalFrame,
- listing only,
- listing options={style=tcblatex,language=sh,escapeinside=``},
- listing inputencoding=utf8,
- size=small,
- halign title=flush left,
- title={\textcolor{macosx-terminalFirstBullet}{\huge\ttfamily\bfseries{$\bullet$}\textcolor{macosx-terminalSecondBullet}{\huge\ttfamily\bfseries{$\bullet$}\textcolor{macosx-terminalThirdBullet}{\huge\ttfamily\bfseries{$\bullet$}}}}},
- every listing line={\BFHterminalPrompt{}},
- minted options={escapeinside=\\`\\`,autogobble,formatcom=\BFHterminalFormatLine,breaklines,breaksymbol=\quad}
+\newtcblisting{macos}{
+ ptxcd/terminal/default,
+ ptxcd/terminal/macos
+}
+
+\newtcblisting{macos*}[1]{
+ ptxcd/terminal/default,
+ ptxcd/terminal/macos,
+ #1
}
\newcommand{\setupOSXPrompt}[1]{\pgfkeys{/terminal/.cd,host=macintosh,#1}%
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-projectproposal.cfg b/macros/latex/contrib/bfh-ci/tex/bfh-projectproposal.cfg
index afa1ce4a14..6020ac8013 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-projectproposal.cfg
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-projectproposal.cfg
@@ -1,9 +1,9 @@
-%% This is file `bfh-projectproposal.cfg' version 2.0.0 (2021/12/23),
+%% This is file `bfh-projectproposal.cfg' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesFile{bfh-projectproposal.cfg}[2021/12/23 v2.0.0 projectproposal configuration for bfhlayout]
+\ProvidesFile{bfh-projectproposal.cfg}[2022/01/24 v2.1.0 projectproposal configuration for bfhlayout]
\KOMAoptions{headsepline=false}
\clearpairofpagestyles
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhbeamer.cls b/macros/latex/contrib/bfh-ci/tex/bfhbeamer.cls
index 66da85d5f5..1dbe416001 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhbeamer.cls
+++ b/macros/latex/contrib/bfh-ci/tex/bfhbeamer.cls
@@ -1,9 +1,9 @@
-%% This is file `bfhbeamer.cls' version 2.0.0 (2021/12/23),
+%% This is file `bfhbeamer.cls' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -29,7 +29,7 @@
%% ============================================================================
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{bfhbeamer}[2021/12/23 v2.0.0 BFH-CI beamer layout, CI of Bern University of Applied Sciences]
+\ProvidesClass{bfhbeamer}[2022/01/24 v2.1.0 BFH-CI beamer layout, CI of Bern University of Applied Sciences]
\RequirePackage{l3keys2e}
\PassOptionsToPackage{table}{xcolor}
@@ -86,22 +86,9 @@
\RequirePackage{handoutWithNotes}
\pgfpagesuselayout{3~on~1~with~notes}[a4paper,border~shrink=5mm]
}
-
-
-\msg_new:nnn {bfhbeamer} {module-not-found} {
- You~tried~to~load~the~BFH~layout~module~#1.\\
- I~could~not~find~a~file~named~bfh-layout-#1.cfg.
-}
-
-\newcommand*\LoadBFHModule[1]{
- \clist_map_inline:nn {#1} {
- \file_if_exist_input:nF {bfh-layout-##1.cfg}
- {\msg_error:nnn {bfhbeamer} {module-not-found} {##1}}
- }
-}
-
\ExplSyntaxOff
-\LoadBFHModule{tabular}
+
+\RequirePackage{bfhmodule}
\endinput
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhcolors.sty b/macros/latex/contrib/bfh-ci/tex/bfhcolors.sty
index e45e03896e..4aa4c0516d 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhcolors.sty
+++ b/macros/latex/contrib/bfh-ci/tex/bfhcolors.sty
@@ -1,11 +1,11 @@
-%% This is file `bfhcolors.sty' version 2.0.0 (2021/12/23),
+%% This is file `bfhcolors.sty' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
-%% Andreas HABEGGER <andreas.habegger@bfh.ch>
+%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
%% ============================================================================
%% This work may be distributed and/or modified under the
@@ -29,7 +29,7 @@
%% ============================================================================
%%
\RequirePackage{expl3}
-\ProvidesExplPackage{bfhcolors}{2021/12/23}{2.0.0}{color setup for BFH-CI, CI of Bern Universitry of Applied Sciences}
+\ProvidesExplPackage{bfhcolors}{2022/01/24}{2.1.0}{color setup for BFH-CI, CI of Bern Universitry of Applied Sciences}
\RequirePackage{l3keys2e}
\tl_new:N \g__ptxcd_colormode_tl
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhfonts.sty b/macros/latex/contrib/bfh-ci/tex/bfhfonts.sty
index dfc11c24be..8adab2e5b5 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhfonts.sty
+++ b/macros/latex/contrib/bfh-ci/tex/bfhfonts.sty
@@ -1,9 +1,9 @@
-%% This is file `bfhfonts.sty' version 2.0.0 (2021/12/23),
+%% This is file `bfhfonts.sty' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -29,7 +29,7 @@
%% ============================================================================
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bfhfonts}[2021/12/23 v2.0.0 BFH-CI (fonts Module)]
+\ProvidesPackage{bfhfonts}[2022/01/24 v2.1.0 BFH-CI (fonts Module)]
\RequirePackage{iftex}
\RequirePackage{anyfontsize}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhlayout.sty b/macros/latex/contrib/bfh-ci/tex/bfhlayout.sty
index 8700483f37..7654d87243 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhlayout.sty
+++ b/macros/latex/contrib/bfh-ci/tex/bfhlayout.sty
@@ -1,9 +1,9 @@
-%% This is file `bfhlayout.sty' version 2.0.0 (2021/12/23),
+%% This is file `bfhlayout.sty' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -28,10 +28,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{2.0.0}
-\def\filedate{2021/12/23}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bfhlayout}[2021/08/17 -- v1.2.4 BFH style package (layout)]
+\ProvidesPackage{bfhlayout}[2022/01/25 -- v2.1.0 BFH style package (layout)]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Process Options created for bfharticle
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -705,26 +703,11 @@
}
-\ExplSyntaxOn
-\msg_new:nnn {bfhlayout} {module-not-found} {
- You~tried~to~load~the~BFH~layout~module~#1.\\
- I~could~not~find~a~file~named~bfh-layout-#1.cfg.
-}
-
-\seq_new:N \g__ptxcd_module_seq
-
-\newcommand*\LoadBFHModule[1]{
- \clist_map_inline:nn {#1} {
- \seq_if_in:NnF \g__ptxcd_module_seq {##1} {
- \file_if_exist_input:nF {bfh-layout-##1.cfg}
- {\msg_error:nnn {bfhlayout} {module-not-found} {##1}}
- \seq_gpush:Nn \g__ptxcd_module_seq {##1}
- }
- }
-}
+\RequirePackage{bfhmodule}
\LoadBFHModule{tabular,rules}
%type dependent config
+\ExplSyntaxOn
\file_if_exist_input:n {bfh-\g_ptxcd_pubType_tl.cfg}
\ExplSyntaxOff
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhletter.sty b/macros/latex/contrib/bfh-ci/tex/bfhletter.sty
index ef0393f6bc..4d47f13e69 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhletter.sty
+++ b/macros/latex/contrib/bfh-ci/tex/bfhletter.sty
@@ -1,9 +1,9 @@
-%% This is file `bfhletter.sty' version 2.0.0 (2021/12/23),
+%% This is file `bfhletter.sty' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesPackage{bfhletter}[2021/12/23 v2.0.0 letter layouts for BFH-CI, CI of Bern University of Applied Sciences]
+\ProvidesPackage{bfhletter}[2022/01/24 v2.1.0 letter layouts for BFH-CI, CI of Bern University of Applied Sciences]
\PassOptionsToPackage{fromlogo=true,refline=false,addrfield=topaligned,pagenumber=botright}{scrletter}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhlettersize9.5pt.clo b/macros/latex/contrib/bfh-ci/tex/bfhlettersize9.5pt.clo
index 6db499de20..8656c1e80d 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhlettersize9.5pt.clo
+++ b/macros/latex/contrib/bfh-ci/tex/bfhlettersize9.5pt.clo
@@ -1,9 +1,9 @@
-%% This is file `bfhlettersize9.5pt.clo' version 2.0.0 (2021/12/23),
+%% This is file `bfhlettersize9.5pt.clo' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhmodule.sty b/macros/latex/contrib/bfh-ci/tex/bfhmodule.sty
new file mode 100644
index 0000000000..cf1856d984
--- /dev/null
+++ b/macros/latex/contrib/bfh-ci/tex/bfhmodule.sty
@@ -0,0 +1,59 @@
+%% This is file `bfhmodule.sty' version 2.1.0 (2022/01/24),
+%% it is part of
+%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
+%% ----------------------------------------------------------------------------
+%%
+%% Copyright (C) 2021–2022 by
+%% Marei Peischl <marei@peitex.de>
+%% Andreas Habegger <andreas.habegger@bfh.ch>
+%%
+%% ============================================================================
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainers of this work are
+%% Marei Peischl <bfh-ci@peitex.de>
+%% Andreas Habegger <andreas.habegger@bfh.ch>
+%%
+%% The development respository can be found at
+%% https://gitlab.ti.bfh.ch/bfh-latex/bfh-ci/
+%% Please use the issue tracker for feedback!
+%%
+%% ============================================================================
+%%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesExplPackage{bfhmodule}{2022/01/25}{2.1.0}{BFH module package -- modular extensions for bfh-ci}
+
+\msg_new:nnn {bfhmodule} {module-not-found} {
+ You~tried~to~load~the~BFH~layout~module~#1.\\
+ I~could~not~find~a~file~named~bfh-layout-#1.cfg.
+}
+
+\msg_new:nnn {bfhmodule} {module-already-loaded} {
+ You~tried~to~load~the~BFH~layout~module~#1.\\
+ This~module~has~already~been~loaded.
+}
+
+\seq_new:N \g__ptxcd_module_seq
+
+\newcommand*\LoadBFHModule[1]{
+ \clist_map_inline:nn {#1} {
+ \seq_if_in:NnTF \g__ptxcd_module_seq {##1} {
+ \msg_warning:nnn {bfhmodule} {module-already-loaded} {##1}
+ }{
+ \file_if_exist_input:nF {bfh-layout-##1.cfg}
+ {\msg_error:nnn {bfhmodule} {module-not-found} {##1}}
+ \seq_gpush:Nn \g__ptxcd_module_seq {##1}
+ }
+ }
+ \ExplSyntaxOff
+}
+
+\endinput
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhpub.cls b/macros/latex/contrib/bfh-ci/tex/bfhpub.cls
index eb20168673..2950f282f0 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhpub.cls
+++ b/macros/latex/contrib/bfh-ci/tex/bfhpub.cls
@@ -1,11 +1,11 @@
-%% This is file `bfhpub.cls' version 2.0.0 (2021/12/23),
+%% This is file `bfhpub.cls' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
-%% Andreas HABEGGER <andreas.habegger@bfh.ch>
+%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
%% ============================================================================
%% This work may be distributed and/or modified under the
@@ -31,7 +31,7 @@
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplClass{bfhpub}
-{2021/12/23}{2.0.0}{Publications using Corporate Design of BFH (BFH-CI)}
+{2022/01/24}{2.1.0}{Publications using Corporate Design of BFH (BFH-CI)}
\RequirePackage{l3keys2e}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhsciposter.cls b/macros/latex/contrib/bfh-ci/tex/bfhsciposter.cls
index d60284ecba..95e2fbac2f 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhsciposter.cls
+++ b/macros/latex/contrib/bfh-ci/tex/bfhsciposter.cls
@@ -1,9 +1,9 @@
-%% This is file `bfhsciposter.cls' version 2.0.0 (2021/12/23),
+%% This is file `bfhsciposter.cls' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -30,7 +30,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\ProvidesExplPackage{bfhsciposter}{2021/12/23}{2.0.0}{Scientific poster layout of BFH}
+\ProvidesExplPackage{bfhsciposter}{2022/01/24}{2.1.0}{Scientific poster layout of BFH}
\RequirePackage{l3keys2e}
\prop_new:N \g_ptxcd_clsopts_prop
@@ -557,19 +557,9 @@
every~ box~ on~ layer~ 4/.style={reset,\g_ptxcd_boxstyle_tl -inner},
}
-
-\msg_new:nnn {bfhsciposter} {module-not-found} {
- You~tried~to~load~the~BFH~layout~module~#1.\\
- I~could~not~find~a~file~named~bfh-layout-#1.cfg.
-}
-
-\newcommand*\LoadBFHModule[1]{
- \clist_map_inline:nn {#1} {
- \file_if_exist_input:nF {bfh-layout-##1.cfg}
- {\msg_error:nnn {bfhsciposter} {module-not-found} {##1}}
- }
-}
+\RequirePackage{bfhmodule}
\LoadBFHModule{tabular}
+\ExplSyntaxOn% because \LoadBFHModule is required to switch it off
\file_if_exist_input:n {bfh\g_ptxcd_department_str.cfg}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhthesis.cls b/macros/latex/contrib/bfh-ci/tex/bfhthesis.cls
index 4348574e1a..08a68ae696 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhthesis.cls
+++ b/macros/latex/contrib/bfh-ci/tex/bfhthesis.cls
@@ -1,9 +1,9 @@
-%% This is file `bfhthesis.cls' version 2.0.0 (2021/12/23),
+%% This is file `bfhthesis.cls' version 2.1.0 (2022/01/24),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
%%
-%% Copyright (C) 2021 by
+%% Copyright (C) 2021–2022 by
%% Marei Peischl <marei@peitex.de>
%% Andreas Habegger <andreas.habegger@bfh.ch>
%%
@@ -30,7 +30,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\ProvidesExplClass{bfhthesis}{2021/12/23}{2.0.0}{Theses using Corporate Design of BFH (BFH-CI), CI of Bern University of Applied Sciences}
+\ProvidesExplClass{bfhthesis}{2022/01/24}{2.1.0}{Theses using Corporate Design of BFH (BFH-CI), CI of Bern University of Applied Sciences}
\RequirePackage{l3keys2e}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhtranslations-english.trsl b/macros/latex/contrib/bfh-ci/tex/bfhtranslations-english.trsl
index 7bf19e472b..6083f8a8e6 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhtranslations-english.trsl
+++ b/macros/latex/contrib/bfh-ci/tex/bfhtranslations-english.trsl
@@ -1,4 +1,4 @@
-\ProvideDictionaryFor{English}{bfhtranslations}[2021/12/13]
+\ProvideDictionaryFor{English}{bfhtranslations}[2022/01/24]
%% ==== Translations for
\ProvideDictTranslation{Learning Objectives}{Learning Objectives}
\ProvideDictTranslation{learning objectives}{learning objectives}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhtranslations-french.trsl b/macros/latex/contrib/bfh-ci/tex/bfhtranslations-french.trsl
index 91d9d31c79..5e0d605a1f 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhtranslations-french.trsl
+++ b/macros/latex/contrib/bfh-ci/tex/bfhtranslations-french.trsl
@@ -1,4 +1,4 @@
-\ProvideDictionaryFor{French}{bfhtranslations}[2021/12/13]
+\ProvideDictionaryFor{French}{bfhtranslations}[2022/01/24]
%%
%% ==== Translations for
\ProvideDictTranslation{Learning Objectives}{Objectifs}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhtranslations-german.trsl b/macros/latex/contrib/bfh-ci/tex/bfhtranslations-german.trsl
index d5ff5eda91..aeb45d86bd 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhtranslations-german.trsl
+++ b/macros/latex/contrib/bfh-ci/tex/bfhtranslations-german.trsl
@@ -1,4 +1,4 @@
-\ProvideDictionaryFor{German}{bfhtranslations}[2021/12/15]
+\ProvideDictionaryFor{German}{bfhtranslations}[2022/01/24]
%% ==== Translations for
\ProvideDictTranslation{Learning Objectives}{Lernziele}
\ProvideDictTranslation{learning objectives}{Lernziele}
@@ -18,8 +18,8 @@
\ProvideDictTranslation{Co-advisor}{Mitbetreuer}
\ProvideDictTranslation{co-advisors}{Mitbetreuer}
\ProvideDictTranslation{Co-advisors}{Mitbetreuer}
-\ProvideDictTranslation{expert}{Expert}
-\ProvideDictTranslation{Expert}{Expert}
+\ProvideDictTranslation{expert}{Experte}
+\ProvideDictTranslation{Expert}{Experte}
\ProvideDictTranslation{experts}{Experten}
\ProvideDictTranslation{Experts}{Experten}
\ProvideDictTranslation{project partner}{Projekt Partner}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-mla/CHANGES b/macros/latex/contrib/biblatex-contrib/biblatex-mla/CHANGES
index f750e28d10..17540ee377 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-mla/CHANGES
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-mla/CHANGES
@@ -1,3 +1,65 @@
+Changelog for version 2.1
+- Improved documentation, recreating more than 200 examples from an appendix
+ of the ninth edition of the MLA Handbook (2021).
+- Added support for @dataset, @performance, and @software entrytypes.
+- Added internal counter for delaying certain elements of multivolume books,
+ along with a three-way option toggle (auto, true, false) for bibliography and
+ entry. The MLA allows for a few different ways to display the information for
+ a multivolume set when citing a book from that set, whether displaying it
+ alongside the book information or delaying it for an additional container.
+ With the default "containerized=auto" setting, biblatex-mla tries to choose a
+ method based on the number of fields defined, but setting the option to
+ "true" or "false" will force the behavior for an entry.
+- Substantially updated the display of audiovisual sources. Among other things,
+ new entry options "uniquenamea", "uniquenameb", and "uniquenamec=true" allow
+ for the indication that the namea, nameb, or namec field should apply to an
+ individual work, rather than to a larger collection in which it is included.
+ This option makes it possible to show, for instance, that the director of a
+ single episode of a TV show is not responsible for the whole series.
+- Changed the display of numeric ranges in pages and some dates to match MLA
+ guidelines, compressing them accordingly: 250-258 now displays as 250-58,
+ dropping the redundant hundreds digit; additionally, 101-108 displays as
+ 101-08, deliberately retaining leading zeroes. FIXME: This feature is not yet
+ correctly applied to some date ranges, as for the eventdate field.
+- Added pluralization to number marker, showing "nos. 3-4" instead of "no. 3-4."
+- Added missing support for subtitles in some entry types.
+- Added "website" entrysubtype to @online entries to display a title in
+ italics.
+- Added datebrackets entry option to support showing date as something added.
+- Fixed some repeating fields.
+- Fixed the format of some titles presented with \citetitle differing from how
+ they're shown in citations.
+- Fixed the ordering of name suffixes like "Jr" in the bibliography.
+- In citations, support the "totalnames" entry option to allow citations to
+ match bibliography entries beyond the typical maximum number.
+- In the bibliography, print only the last name of book editor / book translator
+ who is also the author of the entry (e.g., an editor's foreword).
+- Added support for named issues of periodicals that aren't special issues
+ (e.g., for comic books).
+- Added support for automatic combining of editor and translator without needing
+ to call the editor before the translator and without needing to set
+ "editortype = {editortr}".
+- Defined revsdnamedelim as comma and improved spacing around slash when
+ crediting multiple publishers.
+- Added context shifting for comma before et al: When names are "Last, First"
+ the phrase should now be preceded by a comma, and when names are "First Last"
+ it should not be.
+- Added support for including a url in a book entry.
+- Fixed placement of named series.
+- Uodated the bibstrings for English, Spanish, Italian, and Portuguese. (The
+ non-English strings should still be verified by someone with knowledge of these
+ languages.) By default, Biblatex-mla adopts the unabbreviated bibstrings
+ provided by Biblatex. A number of bibstrings have been newly added or modified
+ in this release where needed. See the english-mla.lbx file for details of
+ additions and changes.
+- BREAKING: @video and @movie are no longer aliases for each other. The first of
+ these is now reserved for shorter videos with titles that should be placed in
+ quotation marks (e.g., a YouTube video or a TV episode), while the latter is
+ reserved for works with titles that belong in italics (e.g., a feature-length
+ film).
+- BREAKING: Dropped styling for @proceedings titles. Define the "booktitle"
+ field for @proceedings published as books.
+
Changelog for version 2.0
- changes for compatibility with the 9th edition of the MLA handbook, which is
very similar to that of the 8th edition; call "style=mla" to use the new
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-mla/README b/macros/latex/contrib/biblatex-contrib/biblatex-mla/README
index 25d2a52bcc..3104fa2124 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-mla/README
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-mla/README
@@ -8,6 +8,9 @@ biblatex-mla, you will need to install Biblatex. Biblatex is commonly
included with most installations of LaTeX, but it can also be found at
http://www.ctan.org/pkg/biblatex
+Managed Installation (recommended):
+1. Use whatever provided installer is packaged with your installation of Latex.
+ - For instance, use the TeX Live Utility program or tlmgr from the command line.
Manual Installation:
1. Locate your latex installation folder
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-mla/american-mla.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-mla/american-mla.lbx
index ca79f29c73..e3959be521 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-mla/american-mla.lbx
+++ b/macros/latex/contrib/biblatex-contrib/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.1 2022/02/21
+\ProvidesFile{american-mla.lbx}[2022/02/21 v2.1 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/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/biblatex-mla.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/biblatex-mla.pdf
index dca222c0fc..2c3b2fcbea 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/biblatex-mla.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/biblatex-mla.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/biblatex-mla.tex b/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/biblatex-mla.tex
index 63e0567090..68e5f12a98 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/biblatex-mla.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/biblatex-mla.tex
@@ -1,35 +1,76 @@
-% biblatex-mla.tex v2.0 2021/06/07
+% !TEX TS-program = xelatex
+% biblatex-mla.tex v2.1 2022/02/21
% Maintained at <https://github.com/jmclawson/biblatex-mla/> by James Clawson.
%
-% This material is subject to the LaTeX Project Public License. Feel free to improve, redistribute, and adapt to your own ends, as allowed by that license. (See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for license details.) For inclusion in future versions, please share improvements in formatting and MLA standards compliance back to James Clawson: <biblatex-mla@konx.net>.
+% This material is subject to the LaTeX Project Public License. Feel free to improve, redistribute, and adapt to your own ends, as allowed by that license. (See https://ctan.org/license/lppl1.3 for license details.) For inclusion in future versions, please share improvements in formatting and MLA standards compliance back to James Clawson: <biblatex-mla@konx.net>.
\documentclass{ltxdockit}
-\usepackage{xcolor}
-% \usepackage{btxdockit}
-% \usepackage[latin9]{inputenc}
-\usepackage[american]{babel}
-\usepackage[strict]{csquotes}
-\usepackage[style=mla,mancitepar=false]{biblatex}
+\usepackage[document]{ragged2e}
+\setlength\parindent{0.5in}
+\setlength{\RaggedRightParindent}{\parindent}
+\usepackage{fontspec}
+\setmainfont{Times}
+% \usepackage[utf8]{inputenc}
+\usepackage[italian]{babel}
+\usepackage{csquotes}
+% \setlength{\parindent}{0.5in}
+\usepackage[style=mla,dateusetime=true]{biblatex}
+\usepackage{bibtex_documentation}
+\usepackage{shortvrb}
+% \usepackage[toc]{multitoc}
+\usepackage{multicol}
+\usepackage{hyperref}
+\usepackage[tight]{shorttoc}
+\usepackage[margin=1.25in]{geometry}
+% \usepackage{bidi}
+% \hypersetup{colorlinks,%
+% citecolor=black,%
+% % filecolor=black,%
+% % linkcolor=black,%
+% urlcolor=black
+% }
+%
+%
+% \documentclass{ltxdockit}
+% \usepackage[usenames,dvipsnames]{xcolor}
+% % \usepackage{btxdockit}
+% % \usepackage[latin9]{inputenc}
+% \usepackage[american]{babel}
+% \usepackage[strict]{csquotes}
+% \usepackage[style=mla,mancitepar=false]{biblatex}
\usepackage{tabularx}
\usepackage{booktabs}
-\usepackage{shortvrb}
-\usepackage{libertine}
-\usepackage[scaled=0.8]{beramono}
-\usepackage{microtype}
+% \usepackage{shortvrb}
+% \usepackage{libertine}
+% \usepackage[scaled=0.8]{beramono}
+% \usepackage{microtype}
\usepackage{graphicx}
-\usepackage{hyperref}
-\hypersetup{colorlinks,%
-citecolor=black,%
-% filecolor=black,%
-% linkcolor=black,%
-% urlcolor=black}
-}
+% \usepackage{hyperref}
+% \hypersetup{%colorlinks,%
+% citecolor=black,%
+% % filecolor=black,%
+% % linkcolor=black,%
+% % urlcolor=black}
+% }
-\addbibresource{handbooksamples.bib}
+% \addbibresource{handbooksamples.bib}
+\addbibresource{handbook9_messy.bib}
\MakeAutoQuote{<}{>}
\MakeShortVerb{\|}
+\usepackage{fancyhdr}
+\renewcommand{\sectionmark}[1]{\markright{#1}}
+\newcommand{\myparagraph}[1]{\paragraph{#1}\mbox{}\\}
+\pagestyle{fancy}
+\fancyhf{}
+\fancyhead[LE,RO]{\thepage}
+\fancyhead[LO]{\itshape\nouppercase{\rightmark}}
+\fancyhead[RE]{\itshape\nouppercase{\leftmark}}
+\renewcommand{\headrulewidth}{1pt}
+
+% \newcommand*{\biblatexmla}{\textcolor{RedOrange}{\sty{biblatex-mla}}\xspace}
+% \newcommand*{\Biblatexmla}{\textcolor{RedOrange}{\sty{Biblatex-mla}}\xspace}
\newcommand*{\biblatexmla}{\sty{biblatex-mla}\xspace}
\newcommand*{\Biblatexmla}{\sty{Biblatex-mla}\xspace}
\newcommand*{\biblatexcms}{\sty{biblatex-chicago}\xspace}
@@ -42,13 +83,23 @@ citecolor=black,%
\newcommand*{\mycommand}[1]{\mycode{\textbackslash{}#1}}
\newcommand{\superscript}[1]{\ensuremath{^{\textrm{\tiny{#1}}}}}
+\newcommand*{\mlatype}[1]{\textcolor{BurntOrange}{\sty{#1}}\xspace}
+\newcommand*{\mlafield}[1]{\textcolor{teal}{\sty{#1}}\xspace}
+
\newcommand*{\biber}{\sty{biber}\xspace}
\newcommand*{\biblatex}{\sty{Biblatex}\xspace}
\newcommand*{\biblatexhome}{http://sourceforge.net/projects/biblatex/}
\newcommand*{\biblatexctan}{http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex/}
+\newcommand*{\bibref}[1]{the entry for \sty{\{#1\}} %on page~\pageref{#1}}%
+in \secref{#1}}
+\newcommand*{\parentref}[2]{For an example \mlatype{@#1} entry and its output, see \sty{\{#2\}} in \secref{#2}.}
+\newcommand*{\longerref}[2]{For an example \mlatype{@#1} source, see \citeauthor*{#2}'s \citetitle{#2} in \secref{#2}.}
+\newcommand*{\titleref}[2]{For an example using \mlatype{@#1}, see \citetitle{#2} in \secref{#2}.}
+\newcommand*{\authorref}[2]{For an example using \mlatype{@#1}, see \citeauthor{#2}'s entry in \secref{#2}.}
+
\makeatletter
-\def\subsubsection{\@startsection{subsubsection}{3}{-2.2em}{-5.25ex plus -1ex minus -.2ex}{0.5ex plus .2ex}{\large\textbf}}
+% \def\subsubsection{\@startsection{subsubsection}{3}{-2.2em}{-5.25ex plus -1ex minus -.2ex}{0.5ex plus .2ex}{\large\textbf}}
\newenvironment*{commandlist}
{\list{}{%
\setlength{\labelwidth}{\marglistwidth}%
@@ -82,26 +133,56 @@ citecolor=black,%
\titlepage{%
- title={\biblatexmla},
+ title={\textcolor{orange}{\biblatexmla}},
subtitle={\mla{} Style Using \biblatex},
url={\biblatexmlahome},
- author={James Clawson},
+ author={James Clawson \\ \mbox{}},
email={},%},
- revision={2.0},
- date={\today}}
+ revision={2.1 (2021-02-21)},
+ date={}}
\hypersetup{%
- pdftitle={biblatex-mla},
+ pdftitle={biblatex-mla (version 2.1)},
pdfsubject={MLA Style Using biblatex},
- pdfauthor={James Clawson},
- pdfkeywords={mla, biblatex, bibtex, bibliography, citation}}
+ pdfauthor={James M. Clawson},
+ pdfkeywords={mla, biblatex, bibtex, bibliography, citation},
+ colorlinks,%
+ citecolor=black,%
+ urlcolor=black}
% colors
-\definecolor{spot}{rgb}{1,0.5,0}
+% \definecolor{spot}{rgb}{1,0.5,0}
+% \definecolor{spot}{rgb}{0.2,0.1,0}
+% \definecolor{spot}{HTML}{184C52}
\definecolor{new}{rgb}{0,0.5,1}
-\newcommand*{\newthis}{\textbf{\textcolor{new}{|(new in 2.0)|}} }
+% \definecolor{spot}{RGB}{170,85,0}
+\definecolor{spot}{RGB}{255,127,0}
+% \definecolor{lightorange}{RGB}{255,191,127}
+\definecolor{lightorange}{RGB}{255,195,131}
+% \definecolor{lightlightorange}{RGB}{255,212,148}
+% \definecolor{orange}{RGB}{255,127,0}
+\definecolor{darkorange}{RGB}{127,63,0}
+
+% \newcommand*{\newthis}{\textbf{\textcolor{new}{|(new in 2.0)|}} }
+% \newcommand*{\newnov}{\textbf{\textcolor{new}{|(new in 2.1)|}} }
+
+\newcommand*{\newthis}{\leavevmode\marginpar{\textbf{\colorbox{lightorange}{\textcolor{white}{|2.0|}}}}}
+\newcommand*{\newnov}{\leavevmode\marginpar{\textbf{\colorbox{orange}{\textcolor{white}{|2.1|}}}}}
+
+
+% Added \emph{} because there's no italic in Arabic fonts
+\newfontfamily\arabicfont[Script=Arabic]{Geeza Pro}
+\newcommand{\textarabic}[1] % Arabic inside LTR
+ {\emph{\foreignlanguage{arabic}{{\arabicfont #1}}}}
+
+% \newcommand{\bibcitem}[1]{\lstinputlisting[linerange=#1-end,includerangemarker=false,breaklines=true,postbreak=\mbox{\textcolor{gray}{$\hookrightarrow$}\space} ]{\thebibfile}\nocite{#1}}
+% \renewcommand{\bibcitem}[1]{\nocite{#1}}
+
+% \pagestyle{headings}
+\pagestyle{fancy}
+
% tables
@@ -141,166 +222,37 @@ citecolor=black,%
bib-latex
}
-\newcommand*{\mlabibbox}[2]{\begin{center}\colorbox{#1!30}{\parbox{.9\linewidth}{#2}}\end{center}}
-\newcommand*{\mlaprintbox}[2]{\begin{center}\colorbox{#1!30}{\parbox{.9\linewidth}{\begin{center}\textbf{Works Cited}\end{center}#2}}\end{center}}
-
-\DeclareFieldFormat{braces}{\{#1\}}%
-\DeclareNameAlias{default}{first-last}%
-\DeclareNameAlias{author}{first-last}%
-\DeclareNameAlias{editor}{first-last}%
-\DeclareNameAlias{translator}{first-last}%
-\DeclareNameAlias{namea}{first-last}%
-\DeclareNameAlias{nameb}{first-last}%
-\DeclareNameAlias{namec}{first-last}%
-\DeclareListFormat{location}{%
- #1%
- \ifthenelse{\value{listcount}<\value{liststop}}
- {\addcomma\space}
- {}}%
-\DeclareListFormat[article]{location}{%
- #1%
- \ifthenelse{\value{listcount}<\value{liststop}}
- {\addcomma\space}
- {}}%
-\DefineBibliographyExtras{british}{%
- \protected\def\bibdatedash{$/$}
- \def\finalandcomma{}%
- \protected\def\mkbibdatelong#1#2#3{%
- \iffieldundef{#1}
- {}
- {\thefield{#1}\iffieldundef{#2}{}{-}}%
- \iffieldundef{#2}
- {}
- {\thefield{#2}\iffieldundef{#3}{}{-}}%
- \thefield{#3}}}
-
-\renewcommand*{\multinamedelim}{\addspace\bibstring{and}\space}
-
-\newcommand{\mlafullexample}[2]{%\newline%
-\mlabibbox{orange}{\begin{description}\item\mlaexample{#1}\end{description}}%
-\normalfont{#2}\selectlanguage{american}%
-\mlaprintbox{white}{\begin{description}\item\normalfont\fullcite{#1}\end{description}}}
-
-\DeclareCiteCommand{\mlaexample}[\texttt]
- {\selectlanguage{british}\printtext{$@$}\printfield{entrytype}}%
- {\{\printfield{entrykey}\usebibmacro{cite:mlaexample}}%
- {}%
- {\selectlanguage{american}}
-\newbibmacro*{cite:mlaexample}{%
- \setunit{\addcomma\printtext{\newline}}
- \usebibmacro{cite:mlaexample:internal}{author}%
- \usebibmacro{cite:mlaexample:internal}{authortype}%
- \usebibmacro{cite:mlaexample:internal}{bookauthor}%
- \usebibmacro{cite:mlaexample:internal}{booktitle}%
- \usebibmacro{cite:mlaexample:internal}{booksubtitle}%
- \usebibmacro{cite:mlaexample:internal}{date}%
- \usebibmacro{cite:mlaexample:internal}{edition}%
- \usebibmacro{cite:mlaexample:internal}{editor}%
- \usebibmacro{cite:mlaexample:internal}{editortype}%
- \usebibmacro{cite:mlaexample:internal}{entrysubtype}%
- \usebibmacro{cite:mlaexample:internal}{eprint}%
- \usebibmacro{cite:mlaexample:internal}{eprinttype}%
- \usebibmacro{cite:mlaexample:internal}{howpublished}%
- \usebibmacro{cite:mlaexample:internal}{institution}%
- \usebibmacro{cite:mlaexample:internal}{introduction}%
- \usebibmacro{cite:mlaexample:internal}{journaltitle}%
- \usebibmacro{cite:mlaexample:internal}{location}%
- \usebibmacro{cite:mlaexample:internal}{maintitle}%
- \usebibmacro{cite:mlaexample:internal}{mainsubtitle}%
- \usebibmacro{cite:mlaexample:internal}{nameaddon}%
- \usebibmacro{cite:mlaexample:internal}{namea}%
- \usebibmacro{cite:mlaexample:internal}{nameatype}%
- \usebibmacro{cite:mlaexample:internal}{nameb}%
- \usebibmacro{cite:mlaexample:internal}{namebtype}%
- \usebibmacro{cite:mlaexample:internal}{namec}%
- \usebibmacro{cite:mlaexample:internal}{namectype}%
- \usebibmacro{cite:mlaexample:internal}{number}%
- \usebibmacro{cite:mlaexample:internal}{options}%
- \usebibmacro{cite:mlaexample:internal}{origdate}%
- \usebibmacro{cite:mlaexample:internal}{pages}%
- \usebibmacro{cite:mlaexample:internal}{publisher}%
- \usebibmacro{cite:mlaexample:internal}{series}%
- \usebibmacro{cite:mlaexample:internal}{subtitle}%
- \usebibmacro{cite:mlaexample:internal}{title}%
- \usebibmacro{cite:mlaexample:internal}{titleaddon}%
- \usebibmacro{cite:mlaexample:internal}{translator}%
- \usebibmacro{cite:mlaexample:internal}{type}%
- \usebibmacro{cite:mlaexample:internal}{url}%
- \usebibmacro{cite:mlaexample:internal}{urldate}%
- \usebibmacro{cite:mlaexample:internal}{version}%
- \usebibmacro{cite:mlaexample:internal}{volume}%
- \setunit{\printtext{}}\printtext{\}\selectlanguage{american}%
- }%
-}
-\newbibmacro{cite:mlaexample:internal}[1]{%
- \ifthenelse{\equal{#1}{date}}{%
- \iffieldundef{year}{}{%
- \printtext{\indent date}%
- \printtext{$=$ \addspace}%
- \printtext[braces]{\printdate}%
- }%
- }{}%
- \ifthenelse{\equal{#1}{origdate}}{%
- \iffieldundef{origyear}{}{
- \printtext{\indent origdate}%
- \printtext{$=$ \addspace}%
- \printtext[braces]{\printorigdate}%
- }%
- }{}%
- \ifthenelse{\equal{#1}{urldate}}{%
- \iffieldundef{urlyear}{}{
- \printtext{\indent urldate}%
- \printtext{$=$ \addspace}%
- \printtext[braces]{\printurldate}%
- }%
- }{}%
- \iffieldundef{#1}{}{%
- \printtext{\indent#1}%
- \printtext{$=$ \addspace}%
- \printfield[braces]{#1}%
- }%
- \ifnameundef{#1}{}{%
- \printtext{\indent#1}%
- \printtext{$=$ \addspace}%
- \printtext[braces]{\printnames{#1}}%
- }%
- \iflistundef{#1}{}{%
- \printtext{\indent#1}%
- \printtext{$=$ \addspace}%
- \printtext[braces]{\printlist{#1}}%
- }%
- \setunit{\addcomma\printtext{\newline}}}
-
-
+\setcounter{tocdepth}{1}
\begin{document}
-\printtitlepage
+\printtitlepage\thispagestyle{empty}
+
\tableofcontents
+\section{About these style files}
+\label{int}
-% \subsection{Examples} % (fold)
-% \label{ssub:examples}
-% \autocite{sendak63aa}
+\Biblatexmla provides support to \biblatex, \bibtex, and \latex for citations and Works Cited lists in the style of the Modern Language Association (\mla). For commands and options to change package defaults, see \secref{mla:subsec:commands} and \secref{mla:subsec:options}, respectively, below.
-% subsection examples (end)
+\mla style, a common standard for writers in the humanities, is outlined in the \emph{MLA Style Manual}, in its 3\superscript{rd} edition, and the \emph{MLA Handbook for Writers of Research Papers}, now in its 9\superscript{th} edition. \Biblatexmla follows the style outlined in the latter of these. It also follows the logic of the \mla{} when citing similar material repeatedly, trimming unnecessary information from citations where necessary. \Biblatexmla is compatible with \biblatex's support for \sty{hyperref} and \sty{tex4ht}, and the main word in each citation (either the author's name, the title, or the page number) serves as a link to the particular entry in the Works Cited. For anything not covered by this manual, please also see the \biblatex documentation or reach out via GitHub.
-\section{Version Note}
-This update is to improve compatibility with the 9\superscript{th} edition of the \emph{MLA Handbook}, published April 2021. See \secref{mla:sec:use} for more on switching between editions.
+Version 2.1 improves documentation and compatibility with the 9\superscript{th} edition of the \emph{MLA Handbook}, published April 2021. Changes for this release and the previous release of \biblatexmla are called out in the right-hand margin with \colorbox{orange}{\textcolor{white}{|2.1|}} and \colorbox{lightorange}{\textcolor{white}{|2.0|}}, with color fading to show age. See the |CHANGES| file for more details of releases.
-\section{Introduction}
-\label{int}
+\subsection{License}
-\Biblatexmla provides support to \biblatex, \bibtex, and \latex for citations and Works Cited lists in the style established by the Modern Language Association (\mla). For commands and options to change package defaults, see \secref{mla:subsec:commands} and \secref{mla:subsec:options}, respectively, below.
+\Biblatexmla is copyrighted \textcopyright\ 2007--2022, by James Clawson. Permission is granted to copy, distribute, and modify this software under the terms of the \lppl, version 1.3: \mylink{https://ctan.org/license/lppl1.3}.
-\mla style, a common standard for writers in the humanities, is outlined in the \emph{MLA Style Manual}, in its 3\superscript{rd} edition, and the \emph{MLA Handbook for Writers of Research Papers}, now in its 9\superscript{th} edition. \Biblatexmla follows the style outlined in the latter of these. It also follows the logic of the \mla{} when citing similar material repeatedly, trimming unnecessary information from citations where necessary. \Biblatexmla is compatible with \biblatex's support for \sty{hyperref} and \sty{tex4ht}, and the main word in each citation (either the author's name, the title, or the page number) serves as a link to the particular entry in the Works Cited. For anything not covered by this manual, please also see the \biblatex documentation or reach out via GitHub.
+\subsection[Feedback]{Feedback}
+\label{int:feb}
-\newpage
-\section{Use}
+If you end up improving the code to be more accurate to the \mla{} standard, please be kind to the rest of us and share; improvements are strongly encouraged. Direct any feedback to the package's GitHub page: \mylink{https://github.com/jmclawson/biblatex-mla/}.
+
+\section{Setup and Use}
\label{mla:sec:use}
-To ensure American-style quotation marks (if that's your thing),%
+For American-style quotation marks,%
%%
\footnote{Other localization files, \sty{mla-spanish.lbx}, \sty{mla-portuguese.lbx}, and \sty{mla-italian.lbx}, are also available to use \biblatexmla in languages other than English. These and other localization files are included in \biblatexmla releases, but they have fallen out of sync with the English versions. The latest version of these files will be kept on GitHub (\mylink{\biblatexmlahome}); new translations are welcome. There is also support for proper punctuation in non-American dialects of English. Try \mycode{british}, \mycode{canadian}, or other Babel identifiers, such as \mycode{spanish}.} %
%%
@@ -315,7 +267,7 @@ of your \latex document:
\end{verbatim}
\end{quote}
-By default, \biblatexmla will transform some data in ways preferred by \mla style: for example, URLs will omit protocol prefixes like |http://|, some URLs will be converted to eprint entries, and publisher names will be simplified to abbreviate ``University Press'' to ``UP.'' To skip these transformations, change the style referenced in the third line to \textbf{|mla-strict|}:
+By default, \biblatexmla will transform some data in ways preferred by \mla style: for example, URLs will omit protocol prefixes like |http://|, some URLs will be converted to eprint entries, and publisher names will be simplified to abbreviate ``University Press'' to ``UP.'' To avoid these automatic transformations, change the style referenced in the third line to \textbf{|mla-strict|}:
\begin{quote}
\begin{verbatim}
\usepackage[american]{babel}
@@ -412,60 +364,6 @@ Insert a citation in a footnote. The |\footcite| command should be reserved for
\end{commandlist}
-\begin{table}
-\tablesetup
-\noindent\begin{tabular}{@{}V{0.33\textwidth}@{}V{0.33\textwidth}@{}p{0.3\textwidth}@{}}
-\toprule
-\multicolumn{1}{@{}H}{Input} &
-\multicolumn{1}{@{}H}{Output} &
-\multicolumn{1}{@{}H}{Comment} \\
-\cmidrule(r){1-1}\cmidrule(r){2-2}\cmidrule{3-3}
-\verb!\autocite[12]{morrison02aa}! & \autocite[12]{morrison02aa} & A typical citation includes everything necessary.\\
-% \hline
-\\
-\verb!\autocite[34]{morrison02aa}! & \autocite*[34]{morrison02aa} & Immediately subsequent citations to the same source shorten the citation by dropping redundant information.\\% I had to star it here to show the true output that happens in a paragraph. Something about the table seems to be resetting the tracker.
-% \hline
-\\
-\verb!\autocite{morrison02aa}! & \autocite{morrison02aa} & Immediately subsequent citations lacking page reference add back information to show a citation.\\
-% \hline
-\\
-\verb!\autocite[12]{frye57ab}! & \autocite[12]{frye57ab} & A citation to a text by an author with multiple works cited also includes a short title.\\
-% \hline
-\\
-\verb!\autocite[34]{frye57ab}! & (34) %\autocite[34]{frye57ab} % I have to do weird things here, as the table seems to reset the tracker.
-& Subsequent immediate citations to the same source shorten the citation as much as possible.\\
-% \hline
-\\
-\verb!\autocite[56]{frye91aa}! & \autocite*[56]{frye91aa} & Citations to a new source by the same author omit the repetition of the author's name.\\
-% \hline
-\\
-\verb!\autocite[101]{morrison02aa}! & \autocite[101]{morrison02aa} & A citation interrupting those by Frye will reset the trackers. \\
-% \hline
-\\
-\verb!\autocite[78]{frye91aa}! & \autocite[78]{frye91aa} & With a reset author tracker, the citation includes all necessary information.\\
-% \hline
-\\
-\verb!\autocite*[102]{morrison02aa}! & \autocite*[102]{morrison02aa} & The asterisked version suppresses the author's name---useful when the author is named in the sentence.\\
-% \hline
-\\
-\verb!\autocite*[91]{frye57ab}! & \autocite*[91]{frye57ab} & Suppressing the name of a prolific author will still print the short title to avoid ambiguity.\\
-% \hline
-\\
-\verb!\autocite*{morrison02aa}! & \autocite*{morrison02aa} & Suppressing the author's name without page numbers given will print the title of the work.\\
-% \hline
-\\
-% \small& & \\
-\verb!\mancite! \verb! \autocite[34]{morrison02aa}! & \mancite\autocite[34]{morrison02aa} & Resetting the author tracker makes sure that the author's name is always printed---useful to avoid ambiguity.\\
-% \hline
-\bottomrule
-\end{tabular}
-\caption[Typical citations]
-{Syntax and output showing effects of citation trackers, starred variants, and manual resets with typical citations using \biblatexmla}
-\label{use:cit:all}
-\end{table}
-
-\clearpage
-
\subsubsection{In-Text Commands}
\label{mla:subsubsec:intext}
@@ -477,11 +375,11 @@ Insert a citation without parentheses or footnote styling. These kinds of citati
\commanditem{citeauthor}
-Print the names of the author(s) or editor(s) associated with a source. In its current form, the unstarred command will always print given and family names, while the starred variant (\cmd{citeauthor*\{x\}}) will omit given names.
+Print the names of the author(s) or editor(s) associated with a source. In its current form, the unstarred command will always print given and family names, while it is possible to omit given names by using the starred variant: \cmd{citeauthor*\{x\}}
\commanditem{citetitle}
-Print the title of a source. The unstarred version will print the |shorttitle| if it is available; the starred version (\cmd{citetitle*\{x\}}) will always print the full title.
+Print the title of a source. The unstarred version will print the |shorttitle| if it is available; the starred version (\cmd{citetitle*\{x\}}) will always print the full title field.
\commanditem{citeyear}
@@ -538,7 +436,7 @@ An alias to |\cite|, above.
% \end{quote}
\optionitem{annotation}
-It is possible to print annotations to entries in the Works Cited if the \mycode{annotation} field is defined in an entry. To turn on this option, add \mycode{annotation=true} to your
+It is possible to print annotations to entries in the Works Cited if the \mlafield{annotation} field is defined in an entry. To turn on this option, add \mycode{annotation=true} to your
preamble:
\begin{quote}
\begin{verbatim}
@@ -546,8 +444,70 @@ preamble:
\end{verbatim}
\end{quote}
+\end{optionslist}
+
+\newpage
+\thispagestyle{empty}
+\begin{table}
+\tablesetup
+\noindent\caption[Typical citations]
+{Syntax and output showing cumulative effects of citation trackers, starred variants, and manual resets with typical citations using \biblatexmla}
+\label{use:cit:all}
+\noindent\begin{tabular}{@{}V{0.33\textwidth}@{}V{0.33\textwidth}@{}p{0.3\textwidth}@{}}
+\toprule
+\multicolumn{1}{@{}H}{Input} &
+\multicolumn{1}{@{}H}{Output} &
+\multicolumn{1}{@{}H}{Explanation} \\
+\cmidrule(r){1-1}\cmidrule(r){2-2}\cmidrule{3-3}
+\verb!\autocite[12]{morrison02aa}! & \autocite[12]{morrison02aa} & \noindent{}A typical citation includes everything necessary.\\
+% \hline
+\\
+\verb!\autocite[34]{morrison02aa}! & \autocite*[34]{morrison02aa} & \noindent{}Immediately subsequent citations to the same source shorten the citation by dropping redundant information.\\% I had to star it here to show the true output that happens in a paragraph. Something about the table seems to be resetting the tracker.
+% \hline
+\\
+\verb!\autocite{morrison02aa}! & \autocite{morrison02aa} & \noindent{}Immediately subsequent citations lacking page reference add back information to show a citation.\\
+% \hline
+\\
+\verb!\autocite[12]{frye57ab}! & \autocite[12]{frye57ab} & \noindent{}A citation to a text by an author with multiple works cited also includes a short title.\\
+% \hline
+\\
+\verb!\autocite[34]{frye57ab}! & (34) %\autocite[34]{frye57ab} % I have to do weird things here, as the table seems to reset the tracker.
+& \noindent{}Subsequent immediate citations to the same source shorten the citation as much as possible.\\
+% \hline
+\\
+\verb!\autocite[56]{frye91aa}! & \autocite*[56]{frye91aa} & \noindent{}Citations to a new source by the same author omit the repetition of the author's name.\\
+% \hline
+\\
+\verb!\autocite[101]{morrison02aa}! & \autocite[101]{morrison02aa} & \noindent{}A citation interrupting those by Frye will reset the trackers. \\
+% \hline
+\\
+\verb!\autocite[78]{frye91aa}! & \autocite[78]{frye91aa} & \noindent{}With a reset author tracker, the citation includes all necessary information.\\
+% \hline
+\\
+\verb!\autocite*[102]{morrison02aa}! & \autocite*[102]{morrison02aa} & \noindent{}The asterisked version suppresses the author's name---useful when the author is named in the sentence.\\
+% \hline
+\\
+\verb!\autocite*[91]{frye57ab}! & \autocite*[91]{frye57ab} & \noindent{}Suppressing the name of a prolific author will still print the short title to avoid ambiguity.\\
+% \hline
+\\
+\verb!\autocite*{morrison02aa}! & \autocite*{morrison02aa} & \noindent{}Suppressing the author's name without page numbers given will print the title of the work.\\
+% \hline
+\\
+% \small& & \\
+\verb!\mancite! \verb!\autocite[34]{morrison02aa}! & \mancite\autocite[34]{morrison02aa} & \noindent{}Resetting the author tracker ensures that the author's name is printed in the next citation---useful to avoid ambiguity.\\
+% \hline
+\bottomrule
+\end{tabular}
+\end{table}
+
+\clearpage
+
+%%%%%%%%%%%%%%
+
+\begin{optionslist}
+
\optionitem{firstlonghand}\label{mla:internal:firstlonghand}
-The first citation of a source with a shorthand defined will always print a citation with author's name and, potentially, the \sty{shorttitle} field. (For more on this field, see section \secref{mla:subsec:unnusualfields}, below.) Add \mycode{firstlonghand=false} to your preamble to disable this option and print only the shorthand even on the first citation:
+The first citation of a source with a shorthand defined will always print a citation with author's name and, potentially, the \mlafield{shorttitle} field. (For more on this field, see section \secref{mla:subsec:unnusualfields}, below.) Add \mycode{firstlonghand=false} to your preamble to disable this option and print only the shorthand even on the first citation:
\begin{quote}
\begin{verbatim}
\usepackage[style=mla,firstlonghand=false]{biblatex}
@@ -557,7 +517,7 @@ The first citation of a source with a shorthand defined will always print a cita
% \end{minipage}
\optionitem{guessmedium}
-When using the |style=mla7| option, an entry with no defined \sty{howpublished} field will default either to a <Web> publication (if there's a defined \sty{url} field or \sty{eprint} field) or a <Print> publication (if there's not). To avoid \biblatexmla guessing the publication medium, thereby printing nothing when the field is undefined, deactivate the \mycode{guessmedium} option:
+When using the |style=mla7| option, an entry with no defined \mlafield{howpublished} field will default either to a <Web> publication (if there's a defined \mlafield{url} field or \mlafield{eprint} field) or a <Print> publication (if there's not). To avoid \biblatexmla guessing the publication medium, thereby printing nothing when the field is undefined, deactivate the \mycode{guessmedium} option:
\begin{quote}
\begin{verbatim}
\usepackage[style=mla7,guessmedium=false]{biblatex}
@@ -565,7 +525,7 @@ When using the |style=mla7| option, an entry with no defined \sty{howpublished}
\end{quote}
\optionitem{longdash}\label{mla:internal:longdash}
-\newthis The 9\superscript{th} edition of the \emph{\mla Handbook} clarifies that dashes indicating multiple entries by one author can either be styled wih three em-dashes or three hyphens. From version 2.0, \biblatexmla defaults to em-dashes, but setting |longdash| to false in the document header reverts to using hyphens:
+\newthis The 9\superscript{th} edition of the \emph{\mla Handbook} clarifies that dashes indicating multiple entries by one author can either be styled wih three em-dashes or three hyphens. From version 2.0, output defaults to em-dashes, but setting |longdash| to false reverts back to hyphens:
\begin{quote}
\begin{verbatim}
\usepackage[style=mla,longdash=false]{biblatex}
@@ -589,7 +549,7 @@ When using \mla{} parenthetical citations, it is best practice to cite only when
\end{quote}
\optionitem{nofullfootnote}\label{mla:internal:nofullfootnote}
-When using \biblatexmla for footnotes, the style file will provide full bibliographic detail for the first citation of every source. To turn off this option, add to your preamble \mycode{nofullfootnote}:
+When using \biblatexmla for footnotes, the style file will provide full bibliographic detail for the first citation of every source. To turn off this option, add \mycode{nofullfootnote} among the package options:
\begin{quote}
\begin{verbatim}
\usepackage[style=mla,autocite=footnote,nofullfootnote]{biblatex}
@@ -597,7 +557,7 @@ When using \biblatexmla for footnotes, the style file will provide full bibliogr
\end{quote}
\optionitem{noremoteinfo}\label{mla:internal:noremoteinfo}
-Modeled after the implementation in |biblatex-apa| to suppress remote information in the \sty{.bib} file from being printed in the bibliography, this option affects \sty{isbn}, \sty{issn}, \sty{isrn}, \sty{doi}, and \sty{eprint} fields.
+Modeled after the implementation in |biblatex-apa| to suppress remote information in the \sty{.bib} file from being printed in the bibliography, this option affects \sty{isbn}, \sty{issn}, \sty{isrn}, \sty{doi}, and \mlafield{eprint} fields.
\begin{quote}
\begin{verbatim}
\usepackage[style=mla,noremoteinfo=true]{biblatex}
@@ -623,7 +583,7 @@ Alternatively, selectively show the location for individual entries by defining
\end{quote}
\optionitem{showmedium}
-When using the |style=mla7| option, \biblatexmla will print the publication medium at the end of each entry in the list of Works Cited. Turn off this option---and some other new changes from the 3\superscript{rd} edition---by setting the \mycode{showmedium} option to false:
+When using the |style=mla7| option, \biblatexmla will print the publication medium at the end of each entry in the list of Works Cited. Turn off this option---and some other changes from the 3\superscript{rd} edition---by setting the \mycode{showmedium} option to false:
\begin{quote}
\begin{verbatim}
\usepackage[style=mla7,showmedium=false]{biblatex}
@@ -632,28 +592,12 @@ When using the |style=mla7| option, \biblatexmla will print the publication medi
\end{optionslist}
-\section{Database Guide}
+\section{\bibtex Entry Types and Fields}
\label{bib}
-% I lost my original documentation files, including original style files I created to maintain them, so I'm transitioning everything to Philipp Lehman's \sty{ltxdockit}. This part of the user guide, explaining how to create \sty{bibtex} entries for use with \biblatexmla, will be updated shortly. Until then, please see \S{} 4 (pages 7--20) of the previous version: \mylink{http://konx.net/biblatex-mla/biblatex-mla.pdf}.
+\biblatex uses \bibtex-style databases to define the bibliographic information of sources. With few notable distinctions, \biblatexmla tries to follow typical \biblatex conventions for \textcolor{orange}{entry types} and \textcolor{teal}{fields}, explained in this section. Keep in mind that some of the \textcolor{teal}{fields} listed in the \mlatype{@book} and \mlatype{@article} types (for example, \mlafield{nameaddon}, \mlafield{origyear}, and others) are also available in other entry types and are not repeated only for brevity.
-\biblatex uses \bibtex-style databases to manage the citations and list of works cited. With some notable distinctions, \biblatexmla tries to follow typical \biblatex conventions for fields and entry types. % The guide below explains some are the different \sty{@types} and the \mycode{fields} available to them. Keep in mind that some of the fields in the \sty{@book} and \sty{@article} types (e.g., \sty{nameaddon}, \sty{origyear}, and others) are also available in others where it makes sense; I don't repeat them here to save room.
-%
-% \subsection{Typical fields} % (fold)
-% \label{sub:typical_fields}
-%
-% The best way to acquaint oneself with \biblatexmla is to explore the included \sty{.bib} file, \sty{.tex} files, and the resulting \sty{.pdf} output. Much of the the bibfile database is pretty obvious. Take a look at \tabref{fig:example-book}, for example.
-% \begin{table}[tbp]
-% \centering
-% \includegraphics[width=4.8in]{example-book.pdf}
-% \caption{A standard \sty{.bib} file \mycode{@book} entry and its corresponding output in the list of Works Cited, beneath.}
-% \label{fig:example-book}
-% \end{table}
-% In addition to many of the standard fields one might expect to find, \biblatexmla is also capable of handling unusual fields, described below. For a fuller consideration of the fields supported by \biblatexmla, see the example files and consult the Biblatex manual.
-%
-%
-% \mlafullexample{douglas93aa}{The above entry, found in the \sty{.bib} file, outputs to the below entry in the list of works cited:} %
-Much of the the bibfile database is pretty obvious, so the best way to get acquainted with \biblatexmla is to explore the included \sty{.bib}, \sty{.tex}, and \sty{.pdf} files. Additionally, some of the different \sty{@types} and fields are explained below. Keep in mind that some of the fields in the \sty{@book} and \sty{@article} types (for example, \sty{nameaddon}, \sty{origyear}, and others) are also available in others where it makes sense; I don't repeat them here to save room.
+Following the explanations in this section, section \secref{mla:sec:samples} offers specific examples modeled after the 9th edition of the \emph{MLA Handbook}.
% subsection typical_fields (end)
@@ -662,25 +606,30 @@ Much of the the bibfile database is pretty obvious, so the best way to get acqua
\begin{optionslistNOT}
- \optionitem{crossref}
- the \sty{key} of a parent source in which a shorter source is found. The \sty{crossref} field is handy to avoid spending time re-inputting similar data, but it is also useful for including \mla{}-style cross-references in the list of Works Cited. Keep in mind the problems of the \sty{crossref} field, explained in section 2.4.1 of the \biblatex manual.% In the future, \biblatexmla may provide further support for the \biblatex \sty{xref} field, making \sty{crossref} secondary in importance.
+ \optionitem{\mlafield{crossref}}
+ the \sty{key} of a parent source in which a shorter source is found. The \mlafield{crossref} field is handy to avoid spending time re-inputting similar data, but it is also useful for including \mla{}-style cross-references in the list of Works Cited. Keep in mind the problems of the \mlafield{crossref} field, explained in section 2.4.1 of the \biblatex manual.% In the future, \biblatexmla may provide further support for the \biblatex \sty{xref} field, making \mlafield{crossref} secondary in importance.
- \optionitem{shorttitle}
- the shortened title to be printed in citations to disambiguate among multiple titles by one author. \Biblatexmla will only print this field in citations when necessary; when this field is not defined, \biblatexmla will use the whole of the \sty{title} field.
+ \optionitem{\mlafield{shorttitle}}
+ the shortened title to be printed in citations to disambiguate among multiple titles by one author. \Biblatexmla will only print this field in citations when necessary; when this field is not defined, \biblatexmla will use the whole of the \mlafield{title} field.
- \optionitem{shorthand}
- when defined, a unique label to be printed in citations instead of the author and shorttitle. By default, \biblatexmla will only use the \sty{shorthand} label after a first citation with author (and title, if necessary). See the \mycode{firstlonghand} option on page~\pageref{mla:internal:firstlonghand} to disable this feature.
+ \optionitem{\mlafield{shorthand}}
+ when defined, a unique label to be printed in citations instead of the author and shorttitle. By default, \biblatexmla will only use the \mlafield{shorthand} label after a first citation with author (and title, if necessary). See the \mycode{firstlonghand} option on page~\pageref{mla:internal:firstlonghand} to disable this feature.
- \optionitem{options}
+ \optionitem{\mlafield{options}}
separate the following options with a comma:
\begin{description}
- \item[noremoteinfo=false] indicates that the ``remote'' information of an entry is to be printed, including the fields \sty{isbn}, \sty{issn}, \sty{isrn}, \sty{doi}, and \sty{eprint}. These fields are usually omitted. See also the global option also called \mycode{noremoteinfo}, on page~\pageref{mla:internal:noremoteinfo}, above, for defining this option on a per-document basis. The \mycode{noremoteinfo} option defaults to true.
- \item[showlocation=true] \newthis indicates that the publisher's city of operations for an entry is to be printed. These fields are usually omitted. See also the global option also called \mycode{showlocation}, on page~\pageref{mla:internal:showlocation}, above, for defining this option on a per-document basis. The \mycode{showlocation} option defaults to false.
- \item[totalnames=true] allows the label to include all the names in its list, rather than maxing out at three. The \mycode{totalnames} option defaults to false.
- \item[uniquetranslator=true] indicates that a translator of a particular \sty{@incollection} entry is unique to that work, rather than the collection at large. The \mycode{uniquetranslator} option defaults to false.
- \item[useauthor=false] allows the label of the entry to default to something other than the author, when the author field is defined. If the editor is defined, the label will default to that. The \mycode{useauthor} option defaults to true.
- \item[useeditor=false] allows the label of the entry default to something other than the editor in the case of the author field being undefined or the \mycode{useauthor} option set to false. The \mycode{useeditor} option defaults to true.
- \item[usetranslator=true] allows the label of the entry to inherit the name of the translator when the author and editor fields are undefined or the \mycode{useauthor} and \mycode{useeditor} options are set to false. The \mycode{usetranslator} option defaults to false.
+ \item[|containerized=auto|] \newnov allows \biblatexmla to determine whether a multivolume set should be displayed as a container. The \mycode{containerized} option defaults to \mycode{auto}. To force behavior, set the option to \mycode{true} or \mycode{false}. See \bibref{Howells:1968wo}, which has \mycode{containerized} set to \mycode{true}.
+ \item[|datebrackets=true|] \newnov styles the date of a source in square brackets to indicate that the date was not indicated on the original source. To see the option in use, check \bibref{Bauer:1971ui}. This option currently only works with the \mlatype{@book} entry type, but it seems reasonable to expand the option to other entry types in future releases. The \mycode{datebrackets} option defaults to \mycode{false}.
+ \item[|showlocation=true|] \newthis indicates that the publisher's city of operations for an entry is to be printed. These fields are usually omitted. See also the global option also called \mycode{showlocation}, on page~\pageref{mla:internal:showlocation}, above, for defining this option on a per-document basis. The \mycode{showlocation} option defaults to false.
+ \item[|uniquenamea=false|] \newnov indicates that the \mlafield{namea} field is related to a broader container, rather than to the particular source being cited within that container. This is useful, e.g., to indicate someone who directed an entire television series, rather than just a particular episode. The \mycode{uniquenamea} option defaults to \mycode{true}, indicating association with the particular source.
+ \item[|uniquenameb=false|] as above, for the \mlafield{nameb} field. This option defaults to \mycode{true}.
+ \item[|uniquenamec=false|] as above, for the \mlafield{namec} field. This option defaults to \mycode{true}.
+ \item[|noremoteinfo=false|] indicates that the ``remote'' information of an entry is to be printed, including the fields \mlafield{isbn}, \mlafield{issn}, \mlafield{isrn}, \mlafield{doi}, and \mlafield{eprint}. These fields may otherwise be omitted. See also the global option which shares the name \mycode{noremoteinfo}, on page~\pageref{mla:internal:noremoteinfo}, above, for defining this option on a per-document basis. The \mycode{noremoteinfo} option defaults to true.
+ \item[|totalnames=true|] allows the label to include all the names in its list, rather than maxing out at three. The \mycode{totalnames} option defaults to false.
+ \item[|uniquetranslator=true|] indicates that a translator of a particular entry with the \mlatype{@incollection} entrytype is unique to that work, rather than the collection at large. The \mycode{uniquetranslator} option defaults to false.
+ \item[|useauthor=false|] allows the label of the entry to default to something other than the author, when the author field is defined. If the editor is defined, the label will default to that. The \mycode{useauthor} option defaults to true.
+ \item[|useeditor=false|] allows the label of the entry default to something other than the editor in the case of the author field being undefined or the \mycode{useauthor} option set to false. The \mycode{useeditor} option defaults to true.
+ \item[|usetranslator=true|] allows the label of the entry to inherit the name of the translator when the author and editor fields are undefined or the \mycode{useauthor} and \mycode{useeditor} options are set to false. The \mycode{usetranslator} option defaults to false.
\end{description}
\end{optionslistNOT}
@@ -688,86 +637,92 @@ Much of the the bibfile database is pretty obvious, so the best way to get acqua
\subsection{Standalone Sources}
The following entrytypes are for long sources not part of any other publication except, potentially, multivolume sets or publishers' series.
-\subsubsection*{@book}
-A book, usually with one author. \mla{}-style book entries are straightforward, and the \biblatexmla files style all the potential fields for a typical book
+\subsubsection*{\mlatype{@book}}
+A book, usually with one author. \mla{}-style book entries are straightforward, and \biblatex will style all the potential fields for a typical book. \longerref{book}{Davis:1998we}
\begin{optionslistNOT}
- \optionitem{author}
+ \optionitem{\mlafield{author}}
the author of the book
- \optionitem{title}
- book title; when using \sty{crossref}, also define \sty{booktitle} and be sure to define \sty{title} of the child entry
+ \optionitem{\mlafield{title}}
+ book title; when using \mlafield{crossref}, also define \mlafield{booktitle} and be sure to define \mlafield{title} of the child entry
- \optionitem{subtitle}
- book subtitle; when using \sty{crossref}, also define \sty{booksubtitle} and be sure to define \sty{subtitle} of the child
+ \optionitem{\mlafield{subtitle}}
+ book subtitle; when using \mlafield{crossref}, also define \mlafield{booksubtitle} and be sure to define \mlafield{subtitle} of the child
- \optionitem{location}
+ \optionitem{\mlafield{location}}
place of publication; ignored unless |showlocation| is |true|
- \optionitem{publisher}
- publishing house
-
- \optionitem{date}
- date of publication; defined as \sty{YYYY} for a year, \sty{YYYY-MM} for a month, \sty{YYYY-MM-DD} for a day, or \sty{YYYY-MM-DD/YYYY-MM-DD} for a range. Use a tilde to indicate uncertainty: \sty{{\raisebox{0.5ex}{\texttildelow}}1400} will print as ``circa 1400'' in the list of Works Cited.
+ \optionitem{\mlafield{publisher}}
+ publishing house. When using \mycode{style=mla}, a number of corrections will be made automatically:
+ \begin{itemize}
+ \item the phrases ``and Company'' and ``and Co.'' will be dropped
+ \item ``University Press'' will be converted to ``UP'', ``University'' will become ``U'', and ``Press'' will become ``P''; see \bibref{Charon:2017tw}
+ \item the strings ``Corporation'', ``Corp.'', ``Incorporated'', ``Inc.'', ``Limited'', and ``Ltd.'' will all be stripped
+ \end{itemize}
+ These MLA-style substitions can be skipped document-wide by changing the style setting to \mycode{style=mla-strict} in the package options. Alternatively, curly brackets can be used on a per-entry basis to interrupt the string matching, as shown in \bibref{Milkis:1994vv}.
+
+ \optionitem{\mlafield{date}}
+ date of publication; defined as \sty{YYYY} for a year, \sty{YYYY-MM} for a month, \sty{YYYY-MM-DD} for a day, or \sty{YYYY-MM-DD/YYYY-MM-DD} for a range. For any date fields, use a tilde to indicate uncertainty: \sty{1618$\sim$} will print as ``circa 1618'' in the list of Works Cited, as shown for the \mlafield{origdate} detail in \bibref{Velazquez:2016ud}.
\end{optionslistNOT}
Other fields might come in handy for further granularity:
\begin{optionslistNOT}
- \optionitem{origdate}
+ \optionitem{\mlafield{origdate}}
original publication date, for reprints; defined as \sty{YYYY} for a year, \sty{YYYY-MM} for a month, \sty{YYYY-MM-DD} for a day, or \sty{YYYY-MM-DD/YYYY-MM-DD} for a range
- \optionitem{edition}
- edition number, preferably an integer
+ \optionitem{\mlafield{edition}}
+ edition number, preferably an integer. When using \mycode{style=mla}, the word ``edition'' will be automatically abbreviated to ``ed.'', unless curly brackets are used to interrupt string matching.
- \optionitem{volume}
+ \optionitem{\mlafield{volume}}
volume number of book
- \optionitem{volumes}
+ \optionitem{\mlafield{volumes}}
total number of volumes
- \optionitem{maintitle}
+ \optionitem{\mlafield{maintitle}}
title of multi-volume collection of which this book is one volume
- \optionitem{mainsubtitle}
- subtitle of the above \sty{maintitle}
+ \optionitem{\mlafield{mainsubtitle}}
+ subtitle of the above \mlafield{maintitle}
- \optionitem{series}
+ \optionitem{\mlafield{series}}
name of a publication series
- \optionitem{number}
- number of the above \sty{series} represented by this book
+ \optionitem{\mlafield{number}}
+ number of the above \mlafield{series} represented by this book
\end{optionslistNOT}
Additionally, the style files support more name types for situations needing them:
\begin{optionslistNOT}
- \optionitem{editor}
+ \optionitem{\mlafield{editor}}
editor of a book
- \optionitem{editortype}
- to indicate if the named \sty{editor} is actually an \sty{editor} (``ed.''), a \sty{compiler} (``comp.'') or a \sty{compilerandeditor} (``comp. and ed.''). Default value is \sty{editor}.
+ \optionitem{\mlafield{editortype}}
+ optional, used to indicate that a named \mlafield{editor} is actually another of the many kinds of contributors defined in section 2.3.6 of the \biblatex documentation
- \optionitem{translator}
+ \optionitem{\mlafield{translator}}
translator of a work
- \optionitem{introduction}
+ \optionitem{\mlafield{introduction}}
author of a book's introduction
- \optionitem{foreword}
+ \optionitem{\mlafield{foreword}}
author of a book's foreword
- \optionitem{afterword}
+ \optionitem{\mlafield{afterword}}
author of a book's afterword
- \optionitem{redactor}
+ \optionitem{\mlafield{redactor}}
name of redactor
- \optionitem{commentator}
+ \optionitem{\mlafield{commentator}}
name of commentator
- \optionitem{annotator}
+ \optionitem{\mlafield{annotator}}
name of annotator
\end{optionslistNOT}
@@ -775,19 +730,19 @@ Additionally, the style files support more name types for situations needing the
Finally, the style files also define the following note fields for further clarification:
\begin{optionslistNOT}
- \optionitem{nameaddon}
- pseudonym, misattribution, or other note (printed in brackets after \sty{author})
+ \optionitem{\mlafield{nameaddon}}
+ pseudonym, misattribution, or other note (printed in brackets after \mlafield{author})
- \optionitem{booktitleaddon}
- note after the \sty{booktitle}
+ \optionitem{\mlafield{booktitleaddon}}
+ note after the \mlafield{booktitle}
- \optionitem{maintitleaddon}
- note after the \sty{maintitle}
+ \optionitem{\mlafield{maintitleaddon}}
+ note after the \mlafield{maintitle}
- \optionitem{note}
- miscellaneous data printed before \sty{publisher}
+ \optionitem{\mlafield{note}}
+ miscellaneous data printed before \mlafield{publisher}
- \optionitem{addendum}
+ \optionitem{\mlafield{addendum}}
miscellaneous data printed at the end of the entry
\end{optionslistNOT}
@@ -812,168 +767,168 @@ Finally, the style files also define the following note fields for further clari
%
% \end{optionslistNOT}
-\subsubsection*{@booklet}
-Small pamphlet, often without an author listed. In \biblatexmla, \mycode{@booklet} is an alias for \mycode{@book} (see above), and is styled similarly.
+\subsubsection*{\mlatype{@booklet}}
+Small pamphlet, often without an author listed. In \biblatexmla, \mlatype{@booklet} is an alias for \mlatype{@book} (see above), and is styled similarly. \titleref{booklet}{Language:vu}
-\subsubsection*{@collection}
-A book that is a collection of self-contained essays, stories, or poems, usually with multiple unique authors and collectively edited by a single editorial body. In \biblatexmla, \mycode{@collection} is an an alias for \mycode{@book} (see above), and is styled similarly. To accurately support \mycode{@incollection} entries using \mycode{crossref}, be sure to define the following fields instead of \mycode{title} and \mycode{subtitle} in the parent \mycode{@collection} entry:
+\subsubsection*{\mlatype{@collection}}
+A book that is a collection of self-contained essays, stories, or poems, usually with multiple unique authors and collectively edited by a single editorial body. In \biblatexmla, the entry type \mlatype{@collection} is an an alias for \mlatype{@book} (see above), and is styled similarly. To accurately support \mlatype{@incollection} entries using \mlafield{crossref}, be sure to define the following fields instead of \mlafield{title} and \mlafield{subtitle} in the parent \mlatype{@collection} entry:
\begin{optionslistNOT}
- \optionitem{booktitle}
+ \optionitem{\mlafield{booktitle}}
the title of a book or collection
- \optionitem{booksubtitle}
+ \optionitem{\mlafield{booksubtitle}}
the subtitle of a book or collection
\end{optionslistNOT}
-Additionally, remember to define the \mycode{editor} field if needed.
+Additionally, remember to define the \mlafield{editor} field if needed.
-\subsubsection*{@periodical}
-An entire issue of a journal, usually cited by editor. \biblatexmla accepts the following fields:
+\subsubsection*{\mlatype{@periodical}}
+An entire issue of a journal, usually cited by editor. The \mlatype{@periodical} type is especially good for citing a titled issue of a numbered comic book, as in \bibref{Clowes:1998wp}. \Biblatexmla accepts the following fields:
\begin{optionslistNOT}
- \optionitem{editor}
+ \optionitem{\mlafield{editor}}
the editor or editors of an issue
- \optionitem{issuetitle}
+ \optionitem{\mlafield{issuetitle}}
title of a special issue
- \optionitem{issuesubtitle}
+ \optionitem{\mlafield{issuesubtitle}}
subtitle of a special issue
- \optionitem{title}
+ \optionitem{\mlafield{title}}
title of the journal
- \optionitem{subtitle}
+ \optionitem{\mlafield{subtitle}}
subtitle of the journal
- \optionitem{volume}
+ \optionitem{\mlafield{volume}}
volume number
- \optionitem{number}
+ \optionitem{\mlafield{number}}
issue number
- \optionitem{issue}
+ \optionitem{\mlafield{issue}}
season, when used in place of month (as in the ``spring'' issue of a journal)
- \optionitem{date}
+ \optionitem{\mlafield{date}}
date of publication, defined as \sty{YYYY} for a year, \sty{YYYY-MM} for a month, \sty{YYYY-MM-DD} for a day, or \sty{YYYY-MM-DD/YYYY-MM-DD} for a range.
- \optionitem{pages}
+ \optionitem{\mlafield{pages}}
complete pagination of the issue
\end{optionslistNOT}
-\subsubsection*{@proceedings}
-The published proceedings of a conference. \Biblatexmla styles \sty{@proceedings} entries like \sty{@book} or \sty{@collection} entries, but it also provides support for the following unique fields:
+\subsubsection*{\mlatype{@proceedings}}
+The published proceedings of a conference. \Biblatexmla styles \mlatype{@proceedings} entries like \mlatype{@book} or \mlatype{@collection} entries, but \newnov the \mlafield{title} field is not italicized. To italicize the title of published proceedings, define the \mlafield{booktitle} field. \authorref{proceedings}{Chang:2000uv} The \mlatype{@proceedings} entry type also provides support for the following unique fields:
\begin{optionslistNOT}
- \optionitem{eventtitle}
+ \optionitem{\mlafield{eventtitle}}
- title of the conference represented by the proceedings (if not included in the \sty{title} of the published proceedings)
+ title of the conference represented by the proceedings (if not included in the \mlafield{title} of the published proceedings)
- \optionitem{organization}
+ \optionitem{\mlafield{organization}}
body sponsoring the conference
- \optionitem{urldate}
+ \optionitem{\mlafield{urldate}}
- original date of the conference; defined as \sty{YYYY} for a year, \sty{YYYY-MM} for a month, \sty{YYYY-MM-DD} for a day, or \sty{YYYY-MM-DD/YYYY-MM-DD} for a range. Please note that this is an unusual and temporary use of the \sty{urldate} field; in a future version of \biblatexmla, it will change to \sty{eventdate}.
+ original date of the conference; defined as \sty{YYYY} for a year, \sty{YYYY-MM} for a month, \sty{YYYY-MM-DD} for a day, or \sty{YYYY-MM-DD/YYYY-MM-DD} for a range. Please note that this is an unusual and temporary use of the \mlafield{urldate} field; in a future version of \biblatexmla, it will change to \mlafield{eventdate}.
- \optionitem{institution}
+ \optionitem{\mlafield{institution}}
- university or institution hosting the conference
+ university or institution hosting the conference. When using \mycode{style=mla}, the word ``University'' will be automatically abbreviated to ``U'' unless curly brackets are used to interrupt string matching.
- \optionitem{venue}
+ \optionitem{\mlafield{venue}}
location of the conference
\end{optionslistNOT}
-\subsubsection*{@reference}
-A reference book such as a dictionary or encyclopedia, often supporting \sty{@inreference} entries through \sty{crossref} fields. \Biblatexmla styles a \sty{@reference} entry as it would a \sty{@book} entry.
+\subsubsection*{\mlatype{@reference}}
+A reference book such as a dictionary or encyclopedia, often supporting \mlatype{@inreference} entries through \mlafield{crossref} fields. \Biblatexmla styles a \mlatype{@reference} entry as it would a \mlatype{@book} entry.
-\subsubsection*{@thesis}
-The thesis or dissertation resulting from a doctorate or a master's degree, whether published or unpublished. Supports the following fields typical for defining such an entry:
+\subsubsection*{\mlatype{@thesis}}
+The thesis or dissertation resulting from a doctorate or a master's degree, whether published or unpublished. \parentref{thesis}{Njus:2010vc} The \mlatype{@thesis} entry type supports the following fields typical for defining such an entry:
\begin{optionslistNOT}
- \optionitem{author}
+ \optionitem{\mlafield{author}}
the author of the thesis/dissertation
- \optionitem{title}
+ \optionitem{\mlafield{title}}
title
- \optionitem{subtitle}
+ \optionitem{\mlafield{subtitle}}
subtitle
- \optionitem{type}
+ \optionitem{\mlafield{type}}
- degree type. \Biblatexmla defines some MLA-style \sty{@thesis} types pre-localized; choose from the following strings to get accurate styling:
+ degree type. \Biblatexmla defines some MLA-style \mlatype{@thesis} types pre-localized; choose from the following strings to get accurate styling:
\begin{description}
- \item[phd] for doctorate; prints as ``Diss.'' in English
- \item[dphil] for doctorate; prints as ``Diss.'' in English
- \item[lic] for licentiate; prints as ``Licentiate thesis''
- \item[ma] for master's; prints as ``MA thesis''
- \item[ms] for master's; prints as ``MS thesis''
- \item[msc] for master's; prints as ``MSc thesis''
- \item[mphil] for master's; prints as ``MPhil thesis''
- \item[mlitt] for master's; prints as ``MLitt thesis''
+ \item[|phd|] for doctorate; prints as ``PhD dissertation'' in English
+ \item[|dphil|] for doctorate; prints as ``DPhil dissertation'' in English
+ \item[|lic|] for licentiate; prints as ``Licentiate thesis''
+ \item[|ma|] for master's; prints as ``MA thesis''
+ \item[|ms|] for master's; prints as ``MS thesis''
+ \item[|msc|] for master's; prints as ``MSc thesis''
+ \item[|mphil|] for master's; prints as ``MPhil thesis''
+ \item[|mlitt|] for master's; prints as ``MLitt thesis''
\end{description}
- For all other types not matching the above codes, biblatex- mla will print the type field exactly as entered, respecting all existing capitalization
+ For all other types not matching the above codes, \biblatexmla will print the \mlafield{type} field as entered, respecting capitalization.
- \optionitem{institution}
+ \optionitem{\mlafield{institution}}
- name of degree-granting university
+ name of degree-granting university. When using \mycode{style=mla}, the word ``University'' will be automatically abbreviated to ``U'' unless curly brackets are used to interrupt string matching. See \bibref{Njus:2010aa}.
- \optionitem{date}
+ \optionitem{\mlafield{date}}
date degree awarded, defined as \sty{YYYY} for a year, \sty{YYYY-MM} for a month, \sty{YYYY-MM-DD}
\end{optionslistNOT}
-The entry for a @thesis that has been published needs a few additional fields:
+A published \mlatype{@thesis} has some additional fields:
\begin{optionslistNOT}
- \optionitem{entrysubtype}
+ \optionitem{\mlafield{entrysubtype}}
- When using the 7\superscript{th} edition style, which differentiates between published and unpublished dissertation titles, \biblatexmla recognizes two keys in the \sty{entrysubtype} field for the \sty{@thesis}:
+ When documenting a \mlatype{@thesis} using the 7\superscript{th} edition style, which differentiates between published and unpublished dissertation titles, \biblatexmla recognizes two keys in the \mlafield{entrysubtype} field:
\begin{description}
- \item[published] for published theses
- \item[unpublished] for unpublished theses
+ \item[|published|] for published theses
+ \item[|unpublished|] for unpublished theses
\end{description}
- Any key other than \sty{published} or \sty{unpublished} will be treated as if it were \sty{unpublished}.
+ Any other key will be treated as \sty{unpublished}.
- \optionitem{location}
+ \optionitem{\mlafield{location}}
place of publication
- \optionitem{publisher}
+ \optionitem{\mlafield{publisher}}
publisher
- \optionitem{origdate}
+ \optionitem{\mlafield{origdate}}
- date degree was awarded, defined as \sty{YYYY} for a year, \sty{YYYY-MM} for a month, \sty{YYYY-MM-DD}; please note this difference from an unpublished thesis
+ date degree was awarded, defined as \sty{YYYY} for a year, \sty{YYYY-MM} for a month, and adding \sty{YYYY-MM-DD} for the day; please note this difference from an unpublished thesis
- \optionitem{date}
+ \optionitem{\mlafield{date}}
date of publication, defined as \sty{YYYY} for a year; please note this difference from an unpublished thesis
- \optionitem{series}
+ \optionitem{\mlafield{series}}
name of a publication series
- \optionitem{number}
+ \optionitem{\mlafield{number}}
number of the above \sty{series} represented by this book
@@ -982,32 +937,32 @@ The entry for a @thesis that has been published needs a few additional fields:
%%%%%%
\subsection{Sources within other works}
-The following entrytypes are for shorter works (essays, poems, and other things) that are part of another publication. Many have corresponding standalone sources representing the larger work of which they are a part (i.e., \sty{@incollection} and \sty{@collection}). Entries of shorter works can inherit fields of parent entries by using the \sty{crossref} field.
+The following entrytypes are for shorter works (essays, poems, and other things) that are part of another publication. Many have corresponding standalone sources representing the larger work of which they are a part (i.e., \mlatype{@incollection} and \mlatype{@collection}). Entries of shorter works can inherit fields of parent entries by using the \mlafield{crossref} field.
-\subsubsection*{@article}
-Articles appearing in periodicals in many media, including academic journals, newspapers, and online sources. \Biblatexmla supports the following fields typical of an article in an academic journal:
+\subsubsection*{\mlatype{@article}}
+Articles appearing in periodicals in many media, including academic journals, newspapers, and online sources. \longerref{article}{Boggs:2016tp} \Biblatexmla supports the following fields typical of an article in an academic journal:
\begin{optionslistNOT}
- \optionitem{author} author of the article
+ \optionitem{\mlafield{author}} author of the article
- \optionitem{title} title of the article
+ \optionitem{\mlafield{title}} title of the article
- \optionitem{subtitle} subtitle of the article
+ \optionitem{\mlafield{subtitle}} subtitle of the article
- \optionitem{journaltitle} title of journal
+ \optionitem{\mlafield{journaltitle}} title of journal
- \optionitem{journalsubtitle} subtitle of journal
+ \optionitem{\mlafield{journalsubtitle}} subtitle of journal
- \optionitem{volume} journal volume number
+ \optionitem{\mlafield{volume}} journal volume number
- \optionitem{number} journal issue number
+ \optionitem{\mlafield{number}} journal issue number
- \optionitem{issue} season, when used in place of month (as in the ``spring'' issue of a journal)
+ \optionitem{\mlafield{issue}} season, when used in place of month (as in the ``spring'' issue of a journal)
- \optionitem{date} date, defined as \sty{YYYY} for a year, \sty{YYYY-MM} for a month, \sty{YYYY-MM-DD} for a day, or \sty{YYYY-MM-DD/YYYY-MM-DD} for a range
+ \optionitem{\mlafield{date}} date, defined as \sty{YYYY} for a year, \sty{YYYY-MM} for a month, \sty{YYYY-MM-DD} for a day, or \sty{YYYY-MM-DD/YYYY-MM-DD} for a range
- \optionitem{pages} page numbers of the article
+ \optionitem{\mlafield{pages}} page numbers of the article
\end{optionslistNOT}
@@ -1015,26 +970,41 @@ For online and newspaper articles, the style provides additional support for the
\begin{optionslistNOT}
- \optionitem{entrysubtype} defines an article's medium, allowing finer control over styling. \Biblatexmla responds to the following keys in the \sty{entrysubtype} field:
+ \optionitem{\mlafield{entrysubtype}} defines an article's medium, allowing finer control over styling. \Biblatexmla responds to the following keys in the \mlafield{entrysubtype} field:
\begin{description}
- \item[newspaper] used for newspaper articles
- \item[magazine] used for magazine articles
+ \item[|magazine|] used for magazine articles. See \bibref{Deresiewicz:un}.
+ \item[|newspaper|] used for newspaper articles. See \bibref{Evacuation:wj}.
+ \item[|comment|] \newnov used for reader's comment posted to an article online. See \bibref{Max:the:Pen:ve}.
\end{description}
- online articles are styled by the presence or absence of a \sty{url} field
+ online articles are further styled by the presence or absence of a \mlafield{url} field
+
+ \optionitem{\mlafield{eprint}} the electronic identifier of a source held by some specific database, repository, or archive service defined by \mlafield{eprinttype}.
+
+ \optionitem{\mlafield{eprinttype}} the specific database, repository, or archive service that holds an item. See the definition of \mlafield{eprinttype}| = {jstor}| in \bibref{Fisher:vu}. \Biblatexmla tries to be forgiving in the use of fields such as \mlafield{eprint} and \mlafield{eprinttype}, when one might easily be omitted. If \mlafield{eprinttype} is undefined, \mlafield{eprint} is treated as the name of the database, repository, or archive service. When using \mycode{style=mla}, an empty \mlafield{eprint} field may automatically be filled from a value found in the \mlafield{url} field. (See further explanation below).
- \optionitem{url} the url address of an online article
+ \optionitem{\mlafield{url}} the url address of an online article. When using \mycode{style=mla}, the \mlafield{url} field will be cleaned up, dropping the protocols |http://| and |https://| for everything but DOIs. Additionally, this field will be parsed to fill empty \mlafield{eprint} and \mlafield{doi} information for URLs containing a limited set of strings:
+ \begin{itemize}
+ \item |jstor.org| --- \mlafield{eprint} is set to ``JSTOR''; see \bibref{Goldman:2010wd}.
+ \item |muse.jhu.edu|--- \mlafield{eprint} is set to ``Project Muse''
+ \item |books.google| --- \mlafield{eprint} is set to ``Google Books''
+ \item |db=a9h| --- \mlafield{eprint} is set to ``Academic Search Complete''
+ \item |db=fdcaae48| --- \mlafield{eprint} is set to ``LexisNexis Academic''
+ \item |db=mzh| --- \mlafield{eprint} is set to ``MLA International Bibliography''
+ \item |patft.uspto.gov| --- \mlafield{eprint} is set to ``USPTO Patent Full-Text and Image Database''
+ \item |dx.doi.org| --- \mlafield{doi} is set to the identifier defined in the URL
+ \end{itemize}
- \optionitem{urldate} date of access of an online article, defined as \sty{YYYY-MM-DD}
+ \optionitem{\mlafield{urldate}} date an online article was accessed, defined as \sty{YYYY-MM-DD}
- \optionitem{date} date a newspaper article is published, defined as \sty{YYYY-MM-DD} for a day
+ \optionitem{\mlafield{date}} date a newspaper article is published, defined as \sty{YYYY-MM-DD} for a day
- \optionitem{location} for newspapers lacking a place-name in their title, the city of publication
+ \optionitem{\mlafield{location}} for newspapers lacking a place-name in their title, the city of publication
- \optionitem{version} the printing edition of a newspaper (ie, early edition, national edition, etc.)
+ \optionitem{\mlafield{version}} the printing edition of a newspaper (ie, early edition, national edition, etc.)
- \optionitem{chapter} the section of a newspaper article if it uses numbers instead of letters; if the newspaper uses letters, combine the letter with the page number (ie, page ``B12'') in the \sty{page} field
+ \optionitem{\mlafield{chapter}} the section of a newspaper article if it uses numbers instead of letters; if the newspaper uses letters, combine the letter with the page number (ie, page ``B12'') in the \mlafield{page} field
\end{optionslistNOT}
@@ -1042,404 +1012,522 @@ In addition, the style provides support for the following fields, used in edge c
\begin{optionslistNOT}
- \optionitem{nameaddon} pseudonym, misattribution, or other note (printed in brackets after author)
+ \optionitem{\mlafield{nameaddon}} pseudonym, misattribution, or other note (printed in brackets after author)
- \optionitem{titleaddon} note after the title
+ \optionitem{\mlafield{titleaddon}} note after the title
- \optionitem{origdate} year of original publication for a reprinted article
+ \optionitem{\mlafield{origdate}} year of original publication for a reprinted article
- \optionitem{issuetitle} title of the special issue in which it appeared
+ \optionitem{\mlafield{issuetitle}} title of the special issue in which it appeared
- \optionitem{issuesubtitle} subtitle of the special issue
+ \optionitem{\mlafield{issuesubtitle}} subtitle of the special issue
- \optionitem{editor} editor of the special issue
+ \optionitem{\mlafield{editor}} editor of the special issue
- \optionitem{translator} translator of the article
+ \optionitem{\mlafield{translator}} translator of the article
- \optionitem{redactor} name of redactor
+ \optionitem{\mlafield{redactor}} name of redactor
- \optionitem{commentator} name of commentator
+ \optionitem{\mlafield{commentator}} name of commentator
- \optionitem{annotator} name of annotator
+ \optionitem{\mlafield{annotator}} name of annotator
- \optionitem{introduction} author of introduction to special issue
+ \optionitem{\mlafield{introduction}} author of introduction to special issue
- \optionitem{foreword} author of foreword to special issue
+ \optionitem{\mlafield{foreword}} author of foreword to special issue
- \optionitem{afterword} author of afterword to special issue
+ \optionitem{\mlafield{afterword}} author of afterword to special issue
- \optionitem{series} name of journal series; define the series name or define as \sty{newseries} or \sty{oldseries} to let \biblatexmla style the series name correctly
+ \optionitem{\mlafield{series}} name of journal series; define the series name manually, or choose one of the predefined strings \sty{\textbf{newseries}} or \sty{\textbf{oldseries}} to let \biblatexmla style the series name correctly
- \optionitem{note} miscellaneous data to print before the page numbers
+ \optionitem{\mlafield{note}} miscellaneous data to print before the page numbers
- \optionitem{addendum} further miscellaneous note at the end of an entry
+ \optionitem{\mlafield{addendum}} further miscellaneous note at the end of an entry
\end{optionslistNOT}
-\subsubsection*{@bookinbook}
-A particular kind of \sty{@incollection}. (See below.)
+\subsubsection*{\mlatype{@bookinbook}}
+A particular kind of \mlatype{@incollection}. (See below.)
-\subsubsection*{@incollection}
-A self-contained unit in a \sty{@collection}. Supports the following fields typical of an essay, short story, or poem found in an anthology:
+\subsubsection*{\mlatype{@incollection}}
+A self-contained unit in a \mlatype{@collection}. Supports the following fields typical of an essay, short story, or poem found in an anthology:
\begin{optionslistNOT}
- \optionitem{author} the author of the work
+ \optionitem{\mlafield{author}} the author of the work
- \optionitem{title} title of the work
+ \optionitem{\mlafield{title}} title of the work
- \optionitem{subtitle} subtitle of the work
+ \optionitem{\mlafield{subtitle}} subtitle of the work
- \optionitem{entrysubtype} defines a work's medium, allowing finer control over styling. By default, \sty{@incollection} entries are printed inside quotation marks, like essays, poems, stories, and other shorter works. \Biblatexmla responds to \mycode{book} and \mycode{play} in the \sty{entrysubtype} field, each of which will cause the title to be printed italicized rather than inside quotation marks. Alternatively, set the entry to a \sty{@bookinbook} type for the same effect.
+ \optionitem{\mlafield{entrysubtype}} defines a work's medium, allowing finer control over styling. By default, entries labeled \mlatype{@incollection} are printed inside quotation marks, like essays, poems, stories, and other shorter works. \Biblatexmla responds to \mycode{book} and \mycode{play} in the \mlafield{entrysubtype} field, each of which will cause the title to be printed italicized rather than inside quotation marks. Compare \bibref{Euripides:1998tx} to \bibref{Marvell:1979tp}, along with their respective outputs. Setting the entry to a \mlatype{@bookinbook} type will also yield an italicized title.
- \optionitem{origdate} original publication date of the work, defined as \sty{YYYY}, \sty{YYYY-MM}, or \sty{YYYY-MM-DD}
+ \optionitem{\mlafield{origdate}} original publication date of the work, defined as \sty{YYYY}, \sty{YYYY-MM}, or \sty{YYYY-MM-DD}
- \optionitem{booktitle} title of the anthology
+ \optionitem{\mlafield{booktitle}} title of the anthology
- \optionitem{booksubtitle} subtitle of the anthology
+ \optionitem{\mlafield{booksubtitle}} subtitle of the anthology
- \optionitem{editor} anthology's editor
+ \optionitem{\mlafield{editor}} anthology's editor
- \optionitem{location} anthology's city of publication
+ \optionitem{\mlafield{location}} anthology's city of publication
- \optionitem{publisher} anthology's publisher
+ \optionitem{\mlafield{publisher}} anthology's publisher
- \optionitem{date} date anthology is published, defined as \sty{YYYY}
+ \optionitem{\mlafield{date}} date anthology is published, defined as \sty{YYYY}
- \optionitem{pages} page numbers of the work
+ \optionitem{\mlafield{pages}} page numbers of the work
\end{optionslistNOT}
-Further fields supported include all of those supported by the @book type.
+Further fields supported include all of those supported by the \mlatype{@book} type.
-\subsubsection*{@inproceedings}
+\subsubsection*{\mlatype{@inproceedings}}
-A work published in the proceedings of a conference. Supports all the fields of the \sty{@incollection} and \sty{@proceedings} types.
+A work published in the proceedings of a conference. Supports all the \textcolor{teal}{fields} found above in \mlatype{@incollection} and \mlatype{@proceedings} types. \longerref{inproceedings}{Werner:vh}
-\subsubsection*{@inreference}
+\subsubsection*{\mlatype{@inreference}}
-A particular type of \sty{@incollection}, potentially without an author. In addition to those fields defined by \sty{@incollection}, \sty{@inreference} adds or refines the following:
+A particular type of \mlatype{@incollection}, potentially without an author, used for dictionaries and other reference books. See \bibref{Patanjali:1996wu}. In addition to those fields defined by \mlatype{@incollection}, \mlatype{@inreference} adds or refines the following:
\begin{optionslistNOT}
- \optionitem{title} name of entry in reference book
+ \optionitem{\mlafield{title}} name of entry in reference book
- \optionitem{titleaddon} particular definition of the word
+ \optionitem{\mlafield{titleaddon}} particular definition of the word
- \optionitem{booktitle} the title of the reference book
+ \optionitem{\mlafield{booktitle}} the title of the reference book
\end{optionslistNOT}
-Note that \sty{@inreference} entries do not need to cite page numbers, though they should specify the edition used. If the year and edition fields match, \biblatexmla styles the entry accordingly.
+Note that \mlatype{@inreference} entries should specify the edition used. If the \mlafield{year} and \mlafield{edition} fields match, \biblatexmla styles the entry accordingly.
-\subsubsection*{@letter}
+\subsubsection*{\mlatype{@letter}}
-The \sty{@letter} entry type is defined similarly to the \sty{@article} type, so it will accept additional fields used in those entries.
+The \mlatype{@letter} entry type is defined similarly to the \mlatype{@article} type, so it will accept additional fields used in those entries. For an example \bibtex{} entry and output related to a letter that has been published, see \citeauthor{Schlesinger:wm}'s letter in \secref{Schlesinger:wm}. For an unpublished letter, see \citeauthor{Apfelbaum:un}'s entry in \secref{Apfelbaum:un}. The following fields are especially important:
\begin{optionslistNOT}
- \optionitem{author} main author of the letter
+ \optionitem{\mlafield{author}} main author of the letter
- \optionitem{title} indication of sender and addressee
+ \optionitem{\mlafield{title}} indication of sender and addressee
- \optionitem{titleaddon} additional information
+ \optionitem{\mlafield{titleaddon}} additional information
- \optionitem{pages} pages
+ \optionitem{\mlafield{pages}} pages
- \optionitem{origdate} original date letter was sent
+ \optionitem{\mlafield{origdate}} original date letter was sent
\end{optionslistNOT}
-\subsubsection*{@review}
+\subsubsection*{\mlatype{@review}}
-A particular type of \sty{@article}, potentially without a title. In addition to those fields defined by \sty{@article}, \sty{@review} adds or refines the following:
+A particular type of \mlatype{@article}, potentially without a title. See the entry for \citeauthor{Rohrbaugh:aa}'s review in \secref{Rohrbaugh:aa}. In addition to those fields defined by an \mlatype{@article} entry, \mlatype{@review} adds or refines the following:
\begin{optionslistNOT}
- \optionitem{booktitle} the title of the book being reviewed
+ \optionitem{\mlafield{booktitle}} the title of the book being reviewed
- \optionitem{bookauthor} the author of the book being reviewed
+ \optionitem{\mlafield{bookauthor}} the author of the book being reviewed
- \optionitem{editor} the editor of the book being reviewed
+ \optionitem{\mlafield{editor}} the editor of the book being reviewed
\end{optionslistNOT}
-Note that reviews found in special issues of journals (using the \sty{issuetitle} and \sty{issuesubtitle} fields) are not fully supported yet.
+% Note that reviews found in special issues of journals using the \mlafield{issuetitle} field are not fully supported yet.
+% platypus - Check the above: is it true?
-\subsubsection*{@suppbook}
+\subsubsection*{\mlatype{@suppbook}}
-A foreword, introduction, preface, or other supplementary (and often untitled) material to a \sty{@book}. Supports the following fields typical of such a piece:
+A foreword, introduction, preface, or other supplementary (and often untitled) material to a \mlatype{@book}. See \bibref{Felstiner:2001aa}. Supports the following fields typical of such a piece:
\begin{optionslistNOT}
- \optionitem{author} author of the piece
+ \optionitem{\mlafield{author}} author of the piece
- \optionitem{title} title of the piece
+ \optionitem{\mlafield{title}} title of the piece
- \optionitem{subtitle} subtitle of the piece
+ \optionitem{\mlafield{subtitle}} subtitle of the piece
- \optionitem{entrysubtype} the type of supplemental material, including subtypes like ``introduction,'' ``foreword,'' and ``Editor's note.''
+ \optionitem{\mlafield{entrysubtype}} the type of supplemental material, including subtypes like \textbf{|introduction|}, \textbf{|foreword|}, and ``Editor's note.''
- \optionitem{booktitle} title of the book the piece appears in
+ \optionitem{\mlafield{booktitle}} title of the book in which the piece appears
- \optionitem{booksubtitle} subtitle of the book the piece appears in
+ \optionitem{\mlafield{booksubtitle}} subtitle of the book in which the piece appears
- \optionitem{location} city of publication of the book the piece appears in
+ \optionitem{\mlafield{location}} city of publication of the book in which the piece appears
- \optionitem{publisher} publisher of the book the piece appears in
+ \optionitem{\mlafield{publisher}} publisher of the book in which the piece appears
- \optionitem{date} date of publication of the book the piece appears in, defined as \sty{YYYY}
+ \optionitem{\mlafield{date}} date of publication of the book the piece appears in, defined as \sty{YYYY}
- \optionitem{pages} page numbers of the piece
+ \optionitem{\mlafield{pages}} page numbers of the piece
\end{optionslistNOT}
-Further fields supported include all of those supported by the \sty{@book} type.
+Further fields supported include all of those supported by the \mlatype{@book} type.
-\subsubsection*{@suppcollection}
+\subsubsection*{\mlatype{@suppcollection}}
-A foreword, introduction, preface, or other supplementary (and often untitled) material to a \sty{@collection}. Supports all the same fields as \sty{@suppbook}.
+A foreword, introduction, preface, or other supplementary (and often untitled) material to a \mlatype{@collection}. Supports all the same fields as \mlatype{@suppbook}.
%%%%%%
\subsection{Other media}
-\subsubsection*{@artwork}
-The \sty{@artwork} entry type is defined similarly to the \sty{@article} type, so it will accept additional fields used in those entries.
+\subsubsection*{\mlatype{@artwork}}
+A painting, sculpture, or some other work of art. For an example entry using the \mlatype{@artwork} entrytype, see the definition for \citeauthor{Cave:wf}'s exhibition in \secref{Cave:wf}. %The \mlatype{@artwork} entry type is defined similarly to the \mlatype{@article} type, so it will accept some additional fields used in those entries.
\begin{optionslistNOT}
- \optionitem{author} artist responsible for the work
+ \optionitem{\mlafield{author}} artist responsible for the work
- \optionitem{title} title of the piece
+ \optionitem{\mlafield{title}} title of the piece
- \optionitem{type} description of the medium. (Please note that this field doesn't yet work with the current version of \biblatexmla, though support will be added to support bibliographies made for \biblatexcms.)
+ % \optionitem{\mlafield{type}} description of the medium. (Please note that this field doesn't yet work with the current version of \biblatexmla, though support will be added to support bibliographies made for \biblatexcms.)
- \optionitem{note} additional note on the work
+ % \optionitem{\mlafield{note}} additional note on the work
- \optionitem{date} date of creation, defined as \sty{YYYY} for a year, \sty{YYYY-MM} for a month, \sty{YYYY-MM-DD} for a day, or \sty{YYYY-MM-DD/YYYY-MM-DD} for a range
+ \optionitem{\mlafield{date}} date of creation or exhibition, defined as \sty{YYYY} for a year, \sty{YYYY-MM} for a month, \sty{YYYY-MM-DD} for a day, or \sty{YYYY-MM-DD/YYYY-MM-DD} for a range
- \optionitem{institution} institution holding the artwork. (Please note that this field doesn't yet work with the current version of \biblatexmla, though support will be added to support bibliographies made for \biblatexcms.)
+ \optionitem{\mlafield{institution}} institution holding the artwork
- \optionitem{location} city of the institution. (Please note that this field doesn't yet work with the current version of \biblatexmla, though support will be added to support bibliographies made for \biblatexcms.)
+ \optionitem{\mlafield{location}} city of the institution
\end{optionslistNOT}
-\subsubsection*{@audio}
-The \sty{@audio} entry type is defined similarly to the \sty{@article} type, so it will accept additional fields used in those entries.
+\subsubsection*{\mlatype{@audio}}
+Optimized for audio recordings, podcasts, audiobooks, etc. See \bibref{Li:ty}. %the \mlatype{@audio} entry type is defined similarly to the \mlatype{@article} type, so it will accept additional fields used in those entries.
\begin{optionslistNOT}
- \optionitem{author} author or composer of a work
+ \optionitem{\mlafield{author}} author, performer, or composer of a work
+
+ \optionitem{\mlafield{title}} title of the speech, song, or other short piece.
+
+ \optionitem{\mlafield{booktitle}} title of the opera, cycle, or other larger collection
+
+ \optionitem{\mlafield{origdate}} date work was originally written.
- \optionitem{title} title of the speech, song, or other short piece. (Please note that this field doesn't yet work with the current version of \biblatexmla, though support will be added.)
+ \optionitem{\mlafield{maintitle}} title of a book or collection containing the work
+
+ \optionitem{\mlafield{date}} date of publication of work being referenced
+
+ \optionitem{\mlafield{publisher}} publisher of work being referenced.
+
+ \optionitem{\mlafield{location}} city of publisher.
+
+ \optionitem{\mlafield{addendum}} When listening to audio via an app, name the app in the \mlafield{addendum} field. The app's name ought to be italicized in MLA style, but this should not be a concern: when using \mycode{style=mla} and following the app's unstyled name with the word ``app,'' as with \emph{iTunes} in \bibref{YiyunLiReads:ub}, italics will automatically be applied.
+
+\end{optionslistNOT}
+
+Additionally, \biblatexmla supports the \mlafield{author}, \mlafield{editor}, \mlafield{namea}, \mlafield{nameb}, and \mlafield{namec} fields, modified with the \mlafield{authortype}, \mlafield{editortype}, \mlafield{nameatype}, \mlafield{namebtype}, and \mlafield{namectype} fields, attuned to the following localization keys:
+
+\begin{optionslistNOT}
+
+ \optionitem{\mlafield{$<$x$>$type}}
+ \begin{description}
+ \item[|composer|] composer of a soundtrack
+ \item[|director|] director of a work
+ \item[|narrator|] narrator of a spoken track
+ \item[|performer|] list of crucial performers
+ \item[|producer|] producer of a work
+ \item[|screenplay|] author of the screenplay
+ \end{description}
+
+Note that \biblatexmla will print the \mlafield{author} field before the \mlafield{title} (styled using the appropriate \mlafield{authortype} key) unless the field is empty or the \mycode{useauthor} option is false---at which point it will cascade to the \mlafield{editor} field, unless \emph{it} is undefined or the \mycode{useeditor} option is false. No other name fields will be printed before the title. Except for any printed before the title, these fields will be printed after the title in the following order: \mlafield{author}, \mlafield{editor}, \mlafield{namea}, \mlafield{nameb}, \mlafield{namec}.
+
+\end{optionslistNOT}
+
+\subsubsection*{\mlatype{@dataset}}
+\newnov Data, files, or similar material, useful for referencing raw supplementary data. \parentref{dataset}{Moskowitz:2021uw}
+
+\subsubsection*{\mlatype{@image}}
+Photographs and electronic images. See, for example, \citeauthor{Sheldon:tr}'s entry in \secref{Sheldon:tr}. The \mlatype{@image} entry type is defined similarly to the \mlatype{@article} type, so it will accept additional fields used in those entries.
+
+\begin{optionslistNOT}
+
+ \optionitem{\mlafield{author}} creator of the image
- \optionitem{booktitle} title of the opera, cycle, or other larger collection
+ \optionitem{\mlafield{title}} title of the work
- \optionitem{origdate} date work was originally written. (Please note that this field doesn't yet work with the current version of \biblatexmla, though support will be added.)
+ \optionitem{\mlafield{type}} description of the medium. (Please note that this field doesn't yet work with the current version of \biblatexmla, though support will be added to support bibliographies made for \biblatexcms.)
- \optionitem{maintitle} title of a book containing the work
+ \optionitem{\mlafield{note}} additional description of the work
- \optionitem{date} date of publication of work being referenced
+ \optionitem{\mlafield{date}} date of creation
- \optionitem{publisher} publisher of work being referenced. (Please note that this field doesn't yet work with the current version of \biblatexmla, though support will be added.)
+ \optionitem{\mlafield{institution}} institution holding the work. (Please note that this field doesn't yet work with the current version of \biblatexmla, though support will be added.)
- \optionitem{location} city of publisher. (Please note that this field doesn't yet work with the current version of \biblatexmla, though support will be added.)
+ \optionitem{\mlafield{location}} city of the institution holding the work. (Please note that this field doesn't yet work with the current version of \biblatexmla, though support will be added.)
\end{optionslistNOT}
-\subsubsection*{@image}
-The \sty{@image} entry type is defined similarly to the \sty{@article} type, so it will accept additional fields used in those entries.
+\subsubsection*{\mlatype{@manual}}
+\newthis This entry type is an alias for \mlatype{@book}, but it may be well suited for particular uses.
+
+\subsubsection*{\mlatype{@misc}}
+\newthis Sources including interviews, personal communications, billboards, and classroom material are ideal for the \mlatype{@misc} entry type. For an example \mlatype{@misc} source, see \citeauthor{Salter:uc}'s interview in \secref{Salter:uc}. This entry type behaves like \mlatype{@article} entries, but titles are printed unstyled, without quotation marks.
+
+\subsubsection*{\mlatype{@movie}}
+\newnov A movie or some similar video that stands alone. \parentref{movie}{OpeningNight:tf} \Biblatexmla supports the following fields necessary for a movie:
\begin{optionslistNOT}
- \optionitem{author} creator of the image
+ \optionitem{\mlafield{title}} title of the movie
+
+ \optionitem{\mlafield{subtitle}} subtitle of the movie
+
+ \optionitem{\mlafield{namea}} person(s) associated with a movie in some role
+
+ \optionitem{\mlafield{nameb, namec}} (as above)
+
+ \optionitem{\mlafield{nameatype}} the kind of association for the \mlafield{namea} field
- \optionitem{title} title of the work
+ \optionitem{\mlafield{namebtype, namectype}} (as above)
- \optionitem{type} description of the medium. (Please note that this field doesn't yet work with the current version of \biblatexmla, though support will be added to support bibliographies made for \biblatexcms.)
+ \optionitem{\mlafield{bookauthor}} author of the book on which a movie is based
- \optionitem{note} additional description of the work
+ \optionitem{\mlafield{version}} the version of a movie
+
+ \optionitem{\mlafield{publisher}} distributor
- \optionitem{date} date of creation
+ \optionitem{\mlafield{origdate}} original date of movie
- \optionitem{institution} institution holding the work. (Please note that this field doesn't yet work with the current version of \biblatexmla, though support will be added.)
+ \optionitem{\mlafield{date}} date of source
- \optionitem{location} city of the institution holding the work. (Please note that this field doesn't yet work with the current version of \biblatexmla, though support will be added.)
+ \optionitem{\mlafield{url}} the url address of an online source
+
+ \optionitem{\mlafield{addendum}} When viewing a movie via an app, name the app in the \mlafield{addendum} field. The app's name ought to be italicized in MLA style, but this should not be a concern: when using \mycode{style=mla} and following the app's unstyled name with the word ``app,'' as with \emph{Netflix} in \bibref{ET:1982:vj}, italics will automatically be added.
\end{optionslistNOT}
-\subsubsection*{@manual}
-\newthis This entry type is an alias for \sty{@book}.
+\subsubsection*{\mlatype{@music}}
+Similar to the \mlatype{@audio} entry type, ideal for songs and albums. For the former, see \bibref{Beyonce:ta}; for the latter, \bibref{Beatles:aa}.
+
+\subsubsection*{\mlatype{@online}}
+Online resources such as webpages or entire websites. This entry type is an alias for \sty{\mlatype{@article}} with many of the same fields.
-\subsubsection*{@misc}
-\newthis This entry type behaves like \sty{@article} entries, but titles aren't printed inside quotation marks.
+\begin{optionslistNOT}
-\subsubsection*{@movie}
-\newthis This entry type is an alias for \sty{@video}.
+ \optionitem{\mlafield{entrysubtype}} \newnov Setting \mlafield{entrysubtype} to \sty{website} toggles the title of the entry to be set in italics. \emph{The William Blake Archive} is a good example of a project that would be cited this way; see \bibref{BlakeArchive:uh}.
-\subsubsection*{@music}
-This entry type is an alias for \sty{@audio}.
+\end{optionslistNOT}
-\subsubsection*{@online}
-This entry type is an alias for \sty{@article}.
-\subsubsection*{@patent}
-\newthis This entry type is currently built onto the same backend as \sty{@article} entries, so it accepts additional fields used in that entry type. Additionally, it adds some additional operations to the type field:
+\subsubsection*{\mlatype{@patent}}
+\newthis Legal patent filed with a country's patent office. This entry type is currently built onto the same backend as \mlatype{@article} entries, so it accepts additional fields used in that entry type, with some variation. See \secref{kowalik:1995qw} for examples of these entries and output.
\begin{optionslistNOT}
- \optionitem{type} the type of patent, with relation to the country in which it was issued. For instance, \sty{patenteu} or \sty{patentus} will automatically establish some standard expectations for the Works Cited entry of a patent from the European Union or one from the United States. See section 4.9.2.20 of the \biblatex manual for more of these expected strings.
+ \optionitem{\mlafield{author}} inventor or creator of patented work
+ \optionitem{\mlafield{title}} title of work
+ \optionitem{\mlafield{date}} date of patent
+ \optionitem{\mlafield{holder}} the holder of the patent, if different from the \mlafield{author} field
+ \optionitem{\mlafield{number}} patent number
+ \optionitem{\mlafield{type}} the type of patent, with relation to the country in which it was issued. For instance, \sty{patenteu} or \sty{patentus} will automatically establish some standard expectations for the Works Cited entry of a patent from the European Union or one from the United States.
\end{optionslistNOT}
-\subsubsection*{@report}
-\newthis This entry type is an alias for \sty{@book}.
+\subsubsection*{\mlatype{@performance}}
+\newnov A play, dance performance, concert, or something similar. \longerref{performance}{Shaw:2006vz}
+
+\begin{optionslistNOT}
+
+ \optionitem{\mlafield{author}} playwright, composer, or principal performer
+
+ \optionitem{\mlafield{title}} title of performance
+
+ \optionitem{\mlafield{eventdate}} date associated with the performance, entered in \sty{YYYY-MM-DD} format for a single date and \sty{YYYY-MM-DD/YYYY-MM-DD} for a single performance that spans multiple days
+
+ \optionitem{\mlafield{location}} city of performance
+
+ \optionitem{\mlafield{organization}} organization or group sponsoring or organizing the event
+
+ \optionitem{\mlafield{venue}} name of theater or performance space
-\subsubsection*{@unpublished}
-An unpublished manuscript or typescript. \Biblatexmla supports the following fields typical to an unpublished entry:
+ \optionitem{\mlafield{entrysubtype}} set to \sty{untitled} to omit title decoration with italics and quotation marks in case of an untitled event, as in \bibref{Lynn:2016wu}.
+
+\end{optionslistNOT}
+
+ Additionally, \biblatexmla supports the \mlafield{author}, \mlafield{editor}, \mlafield{namea}, \mlafield{nameb}, and \mlafield{namec} fields, modified with the \mlafield{authortype}, \mlafield{editortype}, \mlafield{nameatype}, \mlafield{namebtype}, and \mlafield{namectype} fields, attuned to localization keys such as the following:
+
+ \begin{optionslistNOT}
+
+ \optionitem{\mlafield{$<$x$>$type}}
+ \begin{description}
+ \item[|composer|] composer of a soundtrack
+ \item[|director|] director of a work
+ \item[|performer|] significant performers of a work
+ \item[|producer|] producer of a work
+ \end{description}
+
+ \end{optionslistNOT}
+
+\subsubsection*{\mlatype{@report}}
+\newthis Report issued by an agency or organization. This entry type is an alias for \mlatype{@book}. See \bibref{ReadingRisk:vu}.
+
+\subsubsection*{\mlatype{@software}}
+\newnov Software, app, videogame, or similar digital experience. \parentref{software}{AngryBirds:2016vs}
\begin{optionslistNOT}
- \optionitem{author} author of the work
+ \optionitem{\mlafield{author}} company producing the software
+
+ \optionitem{\mlafield{title}} title of the work
- \optionitem{title} title of a short work (i.e., an essay or poem)
+ \optionitem{\mlafield{version}} release version
- \optionitem{subtitle} subtitle of a short work
+ \optionitem{\mlafield{maintitle}} enclosing app, as used in \bibref{VidaSystems:2020ua}.
- \optionitem{booktitle} title of a longer work (i.e., a book or play)
+ \optionitem{\mlafield{date}} release date of the version used
- \optionitem{booksubtitle} subtitle of a longer work
+ \optionitem{\mlafield{eventdate}} date of access, if relevant
+
+\end{optionslistNOT}
+
+\subsubsection*{\mlatype{@unpublished}}
+An unpublished paper, book, or similar material. See \bibref{Auden:wg}. \Biblatexmla supports the following fields typical to an unpublished entry:
+
+\begin{optionslistNOT}
+
+ \optionitem{\mlafield{author}} author of the work
- \optionitem{titleaddon} description of untitled work
+ \optionitem{\mlafield{title}} title of a short work (i.e., an essay or poem)
- \optionitem{note} further information used to classify the collection; typeset before the \sty{type} field
+ \optionitem{\mlafield{subtitle}} subtitle of a short work
- \optionitem{type} form of the material. For example, some of the following strings are recognized:
+ \optionitem{\mlafield{booktitle}} title of a longer work (i.e., a book or play)
+
+ \optionitem{\mlafield{booksubtitle}} subtitle of a longer work
+
+ \optionitem{\mlafield{titleaddon}} description of untitled work
+
+ \optionitem{\mlafield{note}} further information used to classify the collection; typeset before the \mlafield{type} field
+
+ \optionitem{\mlafield{type}} form of the material. For example, some of the following strings are recognized:
\begin{description}
- \item[manuscript] printed as ``Manuscript'' or ``ms'' in English
- \item[transcript] printed as ``Typescript'' or ``ts'' in English
+ \item[\sty{manuscript}] printed as ``Manuscript'' or ``ms'' in English
+ \item[\sty{transcript}] printed as ``Typescript'' or ``ts'' in English
\end{description}
- For all other types not matching the above codes, \biblatexmla will print the \sty{type} field exactly as entered, respecting all existing capitalization
+ For all other types not matching the above codes, \biblatexmla will print the \mlafield{type} field exactly as entered, respecting all existing capitalization
- \optionitem{entrysubtype} \newthis special consideration for styling the title of the work or for indicating that a given title is just a description of the material consulted. The following strings are recognized:
+ \optionitem{\mlafield{entrysubtype}} \newthis special consideration for styling the title of the work or for indicating that a given title is just a description of the material consulted. The following strings are recognized:
\begin{description}
- \item[untitled] for unstyled titles
- \item[book] for titles that should be styled like a book
- \item[article] for titles that should be styled like an article
+ \item[\sty{untitled}] for untitled sources---e.g., a course lecture, as with \citeauthor{Ford:2016vm}'s entry in \secref{Ford:2016vm}.
+ \item[\sty{book}] for titles that should be styled like a book's title, in italics
+ \item[\sty{article}] for titles that should be styled like an article's title, in quotation marks
\end{description}
- \Biblatexmla will further try to style the title to match any type listed in the \sty{entrysubtype} field.
+ \Biblatexmla will further try to style the title to match any type listed in the \mlafield{entrysubtype} field.
- \optionitem{number} identifying number (such as a call number, box, or folio reference) in a library or archive
+ \optionitem{\mlafield{number}} identifying number (such as a call number, box, or folio reference) in a library or archive
- \optionitem{library} library, archive, or other research institution holding the unpublished work
+ \optionitem{\mlafield{library}} library, archive, or other research institution holding the unpublished work
- \optionitem{location} location of the \sty{library}
+ \optionitem{\mlafield{location}} location of the \mlafield{library}
- \optionitem{addendum} extra material printed at the end of an entry
+ \optionitem{\mlafield{addendum}} extra material printed at the end of an entry
\end{optionslistNOT}
-\subsubsection*{@video}
-A recording of a movie, television program, etc. \Biblatexmla supports the following fields necessary for a video:
+\subsubsection*{\mlatype{@video}}
+\newnov An online video, a recording of a television program, or some similar video that is part of some larger project or channel. See for instance \bibref{WhatIsMLA:2016:wq}. \Biblatexmla supports the following fields necessary for a video:
\begin{optionslistNOT}
- \optionitem{title}
-
- title of the work
+ \optionitem{\mlafield{title}} title of the work
- \optionitem{subtitle}
+ \optionitem{\mlafield{subtitle}} subtitle of the work
- subtitle of the work
+ \optionitem{\mlafield{maintitle}} title of the enclosing work of which this video is part
- \optionitem{bookauthor}
+ \optionitem{\mlafield{bookauthor}} author of the book on which the video is based
- author of the book on which the video is based
+ \optionitem{\mlafield{version}} the version of a video
- \optionitem{publisher}
+ \optionitem{\mlafield{season}} used especially to indicate the season of a television show
- distributor
+ \optionitem{\mlafield{number}} used especially to indicate the episode number of a television show
- \optionitem{origdate}
+ \optionitem{\mlafield{publisher}} distributor
- original date of release
+ \optionitem{\mlafield{origdate}} original date of release
- \optionitem{howpublished}
+ \optionitem{\mlafield{url}} the url address of an online video
- publishing medium (ie, DVD, videocassette, etc.)
+ \optionitem{\mlafield{addendum}} When viewing a video via an app, name the app in the \mlafield{addendum} field. The app's name ought to be italicized in MLA style, but this should not be a concern: when using \mycode{style=mla} and following the app's unstyled name with the word ``app,'' as with \emph{Amazon Prime Video} in \bibref{NewNormal:2016:vi}, italics will automatically be applied.
\end{optionslistNOT}
-Additionally, \biblatexmla supports the \sty{author}, \sty{editor}, \sty{namea}, \sty{nameb}, and \sty{namec} fields, modified with the \sty{authortype}, \sty{editortype}, \sty{nameatype}, \sty{namebtype}, and \sty{namectype} fields, attuned to the following localization keys:
+Additionally, \biblatexmla supports the \mlafield{author}, \mlafield{editor}, \mlafield{namea}, \mlafield{nameb}, and \mlafield{namec} fields, modified with the \mlafield{authortype}, \mlafield{editortype}, \mlafield{nameatype}, \mlafield{namebtype}, and \mlafield{namectype} fields, attuned to the following localization keys:
\begin{optionslistNOT}
- \optionitem{$<$x$>$type}
+ \optionitem{\mlafield{$<$x$>$type}}
\begin{description}
- \item[director] director of a work
- \item[screenplay] author of the screenplay
- \item[performer] list of crucial performers
- \item[composer] composer of a soundtrack
- \item[producer] producer of a work
+ \item[\sty{director}] director of a work
+ \item[\sty{screenplay}] author of the screenplay
+ \item[\sty{performer}] list of crucial performers
+ \item[\sty{composer}] composer of a soundtrack
+ \item[\sty{producer}] producer of a work
\end{description}
-Note that \biblatexmla will print the \sty{author} field before the \sty{title} (styled using the appropriate \sty{authortype} key) unless the field is empty or the \mycode{useauthor} option is false---at which point it will cascade to the \sty{editor} field, unless \emph{it} is undefined or the \mycode{useeditor} option is false. No other name fields will be printed before the title. Except for any printed before the title, these fields will be printed after the title in the following order: \sty{author}, \sty{editor}, \sty{namea}, \sty{nameb}, \sty{namec}.
+Note that \biblatexmla will print the \mlafield{author} field before the \mlafield{title} (styled using the appropriate \mlafield{authortype} key) unless the field is empty or the \mycode{useauthor} option is false---at which point it will cascade to the \mlafield{editor} field, unless \emph{it} is undefined or the \mycode{useeditor} option is false. No other name fields will be printed before the title. Except for any printed before the title, these fields will be printed after the title in the following order: \mlafield{author}, \mlafield{editor}, \mlafield{namea}, \mlafield{nameb}, \mlafield{namec}.
\end{optionslistNOT}
%%%%%%%
\subsection{MLA-Style Containers}
-\subsubsection*{@mlasource}
-\newthis In addition to these typical \biblatex-supported entry types, \biblatexmla 2.0 introduces support for defining entries using the containerized explanations of sources first described in the 8\superscript{th} edition of the \emph{MLA Handbook}. Because the non-author fields are defined to handle information literally, this kind of entry is in many ways inferior to the above semantically-defined entry types, which should handle punctuation in lists of editor names, strings like ``vol.'' and ``by,'', subtitle punctuation, and other matters. The user will need to keep output in mind as they define the metadata of an \sty{@mlasource} entry. All of these fields are optional, and they should only include information set out in the \emph{MLA Handbook}.
+\subsubsection*{\mlatype{@mlasource}}
+\newthis In addition to these typical \biblatex-supported entry types, \biblatexmla 2.0 introduces support for defining entries using the containerized explanations of sources first described in the 8\superscript{th} edition of the \emph{MLA Handbook}. Because the non-author fields are defined to handle information literally, this kind of entry is in many ways inferior to the above semantically-defined entry types, which should handle punctuation in lists of editor names, strings like ``vol.'' and ``by,'', subtitle punctuation, and other matters. The user will need to keep output in mind as they define the metadata in the \bibtex file. \longerref{mlasource}{Benton:wd} All of these fields are optional, and they should only include information set out in the \emph{MLA Handbook}.
\begin{optionslistNOT}
- \optionitem{author} the name of the person(s) who should be used as the label for a work.
+ \optionitem{\mlafield{author}} the name of the person(s) who should be used as the label for a work.
- \optionitem{title} title of the piece; subtitles and any necessary colons should be included within the |title| field.
+ \optionitem{\mlafield{title}} title of the piece; subtitles and any necessary colons should be included within the \mlafield{title} field.
- \optionitem{titletype} a string like \textbf{|complete|}, \textbf{|part|}, or \textbf{|unstyled|} determining how the source's |title| gets printed. This field is typically unnecessary: \biblatexmla assumes |complete| if the source lacks a |titlea| field, and it assumes |part| if the |titlea| field is defined, styling the title in italics or in quotation marks, respectively. Setting this field overrides \biblatexmla{}'s logic.
+ \optionitem{\mlafield{titletype}} a string like \textbf{|complete|}, \textbf{|part|}, or \textbf{|unstyled|} determining how the source's \mlafield{title} gets printed. This field is typically unnecessary: \biblatexmla assumes |complete| if the source lacks a \mlafield{titlea} field, and it assumes |part| if the \mlafield{titlea} field is defined, styling the title in italics or in quotation marks, respectively. Setting this field overrides \biblatexmla{}'s logic.
- \optionitem{supplemental} any supplemental information for the source.
+ \optionitem{\mlafield{supplemental}} any supplemental information for the source.
- \optionitem{titlea} the title of the first container; \biblatexmla will style |titlea| in italics, but subtitles and any necessary colons should be included within the this field.
+ \optionitem{\mlafield{titlea}} the title of the first container; \biblatexmla will style \mlafield{titlea} in italics, but subtitles and any necessary colons should be included within the this field.
- \optionitem{contributora} any necessary contributors to the first container.
+ \optionitem{\mlafield{contributora}} any necessary contributors to the first container.
- \optionitem{versiona} the version or edition of the first container.
+ \optionitem{\mlafield{versiona}} the version or edition of the first container.
- \optionitem{numbera} the number of the first container.
+ \optionitem{\mlafield{numbera}} the number of the first container.
- \optionitem{publishera} the publisher of the first container.
+ \optionitem{\mlafield{publishera}} the publisher of the first container.
- \optionitem{datea} the date associated with the first container.
+ \optionitem{\mlafield{datea}} the date associated with the first container.
- \optionitem{locationa} the location of the first container.
+ \optionitem{\mlafield{locationa}} the location of the first container.
- \optionitem{supplementala} any supplemental information for the first container.
+ \optionitem{\mlafield{supplementala}} any supplemental information for the first container.
- \optionitem{titleb} the title of the second container; \biblatexmla will style |titleb| in italics, but subtitles and any necessary colons should be included within the this field.
+ \optionitem{\mlafield{titleb}} the title of the second container; \biblatexmla will style \mlafield{titleb} in italics, but subtitles and any necessary colons should be included within the this field.
- \optionitem{contributorb} any necessary contributors to the second container.
+ \optionitem{\mlafield{contributorb}} any necessary contributors to the second container.
- \optionitem{versionb} the version or edition of the second container.
+ \optionitem{\mlafield{versionb}} the version or edition of the second container.
- \optionitem{numberb} the number of the second container.
+ \optionitem{\mlafield{numberb}} the number of the second container.
- \optionitem{publisherb} the publisher of the second container.
+ \optionitem{\mlafield{publisherb}} the publisher of the second container.
- \optionitem{dateb} the date associated with the second container.
+ \optionitem{\mlafield{dateb}} the date associated with the second container.
- \optionitem{locationb} the location of the second container.
+ \optionitem{\mlafield{locationb}} the location of the second container.
- \optionitem{supplementalb} any supplemental information for the second container.
+ \optionitem{\mlafield{supplementalb}} any supplemental information for the second container.
@@ -1447,14 +1535,1536 @@ Note that \biblatexmla will print the \sty{author} field before the \sty{title}
%%%%%%%
-\section{Meta}
-\subsection{License}
+\section{Sample \bibtex Entries and Works-Cited-List Output} % (fold)
+\label{sec:sample_bibtex_entries_and_output}\label{mla:sec:samples}
+\noindent{}The examples below demonstrate one way to achieve the output of Appendix 2, ``Works-Cited-List Entries by Publication Format,'' found in the 9th edition of the \emph{MLA Handbook}, but there is room for flexibility. One example of such flexibility can be seen below in the ordering of names in the \mlafield{author} and \mlafield{editor} fields, which may reasonably be entered as \{\texttt{Last, First}\} or \{\texttt{First Last}\}.
+
+For presentation purposes, line breaks have been added and marked with an arrow (\textcolor{gray}{$\hookrightarrow$}). These line breaks and arrows should not be recreated in the \sty{.bib} file.
+\subsection{Books} % (fold)
+\label{sec:books}
+\index{books|(}
+\subsubsection{By One Author} % (fold)
+\label{ssub:by_one_author}
+\begin{refsection}
+ \bibcitem{Davis:1998we}
+ \bibcitem{Shen:Fu:2011vw}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection by_one_author (end)
+\subsubsection{By Two Authors} % (fold)
+\label{ssub:by_two_authors}
+\index{books!multiple authors}
+\begin{refsection}
+ \bibcitem{Dorris:1999wo}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection by_two_authors (end)
+\subsubsection{By More Than Two Authors} % (fold)
+\label{ssub:by_more_than_two_authors}
+\index{books!multiple authors}
+\begin{refsection}
+ \bibcitem{Charon:2017tw}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection by_more_than_two_authors (end)
+\subsubsection{By an Unknown Author (Anonymous)} % (fold)
+\label{ssub:by_an_unknown_author_anonymous}
+\index{books!by an unknown author}
+\begin{refsection}
+ \bibcitem{Beowulf:2004th}
+ \bibcitem{LazarillodeTormes:1554vl}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection by_an_unknown_author_anonymous (end)
+\subsubsection{By an Organization (Corporate Author), Published by a Different Entity} % (fold)
+\label{ssub:by_an_organization_corporate_author_published_by_a_different_entity}
+\index{books!by an organization}
+\begin{refsection}
+ \bibcitem{United:Nations:1991vc}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection by_an_organization_corporate_author_published_by_a_different_entity (end)
+\subsubsection{By an Organization That Wrote and Published the Work} % (fold)
+\label{ssub:by_an_organization_that_wrote_and_published_the_work}
+\index{books!by an organization}
+\begin{refsection}
+ \bibcitem{Adirondacks:1990tb}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection by_an_organization_that_wrote_and_published_the_work (end)
+\subsubsection{Edited} % (fold)
+\label{ssub:edited}
+\index{books!edited}
+\begin{refsection}
+ \bibcitem{Baron:etal:2007tj}
+ \bibcitem{Dunbar:2004tv}
+ \bibcitem{Milton:1998ty}
+ \bibcitem{Prado:2018vb}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection edited (end)
+\subsubsection{Translated} % (fold)
+\label{ssub:translated}
+\index{books!translated}\index{translation}
+\begin{refsection}
+ \bibcitem{Dostoevsky:1993wh}
+ \bibcitem{Stendhal:2002ty}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection translated (end)
+\subsubsection{Edited and Translated by the Same Person} % (fold)
+\label{ssub:edited_and_translated_by_the_same_person}
+\index{books!edited}\index{books!translated}\index{translation}
+\begin{refsection}
+ \bibcitem{Freud:2005wb}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection edited_and_translated_by_the_same_person (end)
+\subsubsection{In a Language Other Than English} % (fold)
+\label{ssub:in_a_language_other_than_english}
+\begin{refsection}
+This example's implementation of bidirectional text not ideal, and it may not be the recommended approach. Moreover, the fixed-width font used here is unable to display Arabic. Please see the \sty{.tex} file for definition of the \sty{textarabic} command, and consult the \sty{.bib} file for the full entry by Alexandra Chreiteh.
+ \bibcitem{Chreiteh:2009aa}
+ \bibcitem{Fallani:1971vv}
+ \printbibliography[heading=none]
+ % Full support for multiscript entries depends on \href{https://github.com/plk/biblatex/issues/416}{Biblatex issue 416}.
+\end{refsection}
+% subsection in_a_language_other_than_english (end)
+\subsubsection{With Illustrations} % (fold)
+\label{ssub:with_illustrations}
+\begin{refsection}
+ \bibcitem{Carroll:2006tm}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection with_illustrations (end)
+\subsubsection{Published in a Numbered or Named Edition} % (fold)
+\label{ssub:published_in_a_numbered_or_named_edition}
+\begin{refsection}
+ \bibcitem{Milkis:1994vv}
+ \bibcitem{Wollstonecraft:2009uf}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection published_in_a_numbered_or_named_edition (end)
+\subsubsection{In a Named Series} % (fold)
+\label{ssub:in_a_named_series}
+\begin{refsection}
+ \bibcitem{Neruda:1991wq}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection in_a_named_series (end)
+\subsubsection{With More Than One Publisher} % (fold)
+\label{ssub:with_more_than_one_publisher}
+\begin{refsection}
+ \bibcitem{Tomlinson:2002tc}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection with_more_than_one_publisher (end)
+\subsubsection{Self-Published} % (fold)
+\label{ssub:self_published}
+\begin{refsection}
+ \bibcitem{Hocking:2010tz}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection self_published (end)
+\subsubsection{Published before 1900} % (fold)
+\label{ssub:published_before_1900}
+\begin{refsection}
+ \bibcitem{Goethe:1875vw}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection published_before_1900 (end)
+\subsubsection{Republished, with Original Publication Date Given in Middle Supplemental Element} % (fold)
+\label{ssub:republished_with_original_publication_date_given_in_middle_supplemental_element}
+\begin{refsection}
+ \bibcitem{London:1990tn}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection republished_with_original_publication_date_given_in_middle_supplemental_element (end)
+\subsubsection{Comic Book or Graphic Narrative} % (fold)
+\label{ssub:comic_book_or_graphic_narrative}
+\begin{refsection}
+ \bibcitem{Clowes:1998wp}
+ \bibcitem{Waid:2005up}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection comic_book_or_graphic_narrative (end)
+\subsubsection{In a Multivolume Set} % (fold)
+\label{sub:in_a_multivolume_set}
+\myparagraph{Individually titled volume in an ongoing series} % (fold)
+\label{ssub:individually_titled_volume_in_an_ongoing_series}
+\begin{refsection}
+ \bibcitem{Caro:2012wy}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection individually_titled_volume_in_an_ongoing_series (end)
+\myparagraph{Individually titled and edited volume} % (fold)
+\label{ssub:individually_titled_and_edited_volume}
+\begin{refsection}
+ \bibcitem{Howells:1968wo}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection individually_titled_and_edited_volume (end)
+\myparagraph{All volumes of the multivolume set} % (fold)
+\label{ssub:all_volumes_of_the_multivolume_set}
+\begin{refsection}
+ \bibcitem{Rampersad:2002va}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection all_volumes_of_the_multivolume_set (end)
+\myparagraph{One volume without an individual title} % (fold)
+\label{ssub:one_volume_without_an_individual_title}
+\begin{refsection}
+ \bibcitem{Wellek:1992ws}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection one_volume_without_an_individual_title (end)
+% subsection in_a_multivolume_set (end)
+\subsubsection{From Conference Proceedings} % (fold)
+\label{sub:from_conference_proceedings}
+\begin{refsection}
+ \bibcitem{Chang:2000uv}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection from_conference_proceedings (end)
+\subsubsection{Published in an E-Book Version} % (fold)
+\label{sub:published_in_an_e_book_version}
+\begin{refsection}
+ \bibcitem{Handbook:2021aa}
+ \bibcitem{OConnor:2009un}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection published_in_an_e_book_version (end)
+\subsubsection{Published on a Website} % (fold)
+\label{sub:published_on_a_website}
+\begin{refsection}
+ \bibcitem{Gikandi:2000vz}
+ \bibcitem{Miller:2016vg}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection published_on_a_website (end)
+\subsubsection{Published in an App} % (fold)
+\label{sub:published_in_an_app_book}
+\begin{refsection}
+ \bibcitem{Bible:app:2016ab}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection published_in_an_app_book (end)
+\subsubsection{Published in Audiobook Format} % (fold)
+\label{sub:published_in_audiobook_format}
+\begin{refsection}
+ \bibcitem{Lee:2014vk}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection published_in_audiobook_format (end)
+\index{books|)}
+% section books (end)
+
+\subsection{Contributions to Books} % (fold)
+\label{sec:contributions_to_books}
+\index{books, contributions to|(}
+\subsubsection{Play} % (fold)
+\label{sub:play}\index{books, contributions to!play}\index{plays}
+\begin{refsection}
+ \bibcitem{Euripides:1998tx}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection play (end)
+\subsubsection{Translation} % (fold)
+\label{sub:translation}\index{translation}
+\begin{refsection}
+ \bibcitem{Fagih:2003uj}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection translation (end)
+\subsubsection{Poem} % (fold)
+\label{sub:poem}
+\begin{refsection}
+ \bibcitem{Marvell:1979tp}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection poem (end)
+\subsubsection{Short Story} % (fold)
+\label{sub:short_story}
+\begin{refsection}
+ \bibcitem{Poe:1902wd}
+ \bibcitem{Hopi:1986wu}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection short_story (end)
+\subsubsection{Introduction, Preface, Foreword, or Afterword} % (fold)
+\label{sub:introduction_preface_foreword_or_afterword}
+\myparagraph{With a generic label in place of title} % (fold)
+\label{ssub:with_a_generic_label_in_place_of_title}
+\begin{refsection}
+ \bibcitem{Felstiner:2001aa}
+ \bibcitem{Gere:2021aa}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection with_a_generic_label_in_place_of_title (end)
+\myparagraph{With a unique title} % (fold)
+\label{ssub:with_a_unique_title}
+\begin{refsection}
+ \bibcitem{Seyhan:2008wz}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection with_a_unique_title (end)
+\myparagraph{With a unique title and a generic label given as a supplemental element} % (fold)
+\label{ssub:with_a_unique_title_and_a_generic_label_given_as_a_supplemental_element}
+\begin{refsection}
+ \bibcitem{Wallach:2000we}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection with_a_unique_title_and_a_generic_label_given_as_a_supplemental_element (end)
+% subsection introduction_preface_foreword_or_afterword (end)
+\subsubsection{Essay} % (fold)
+\label{sub:essay}
+\begin{refsection}
+ \bibcitem{Dewar:2007wn}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection essay (end)
+\subsubsection{Republished Essay, with Original Publication Information} % (fold)
+\label{sub:republished_essay_with_original_publication_information}
+\begin{refsection}
+ \bibcitem{Johnson:2014ty}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection republished_essay_with_original_publication_information (end)
+\subsubsection{Republished Work, with Original Publication Date} % (fold)
+\label{sub:republished_work_with_original_publication_date}
+\begin{refsection}
+ \bibcitem{Franklin:1992vl}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection republished_work_with_original_publication_date (end)
+\index{books, contributions to|)}
+% section contributions_to_books (end)
+
+\subsection{Contributions to Scholarly Journals} % (fold)
+\label{sec:contributions_to_scholarly_journals}
+\subsubsection{With a Volume Number and Issue Number} % (fold)
+\label{sub:with_a_volume_number_and_issue_number}
+\begin{refsection}
+ \bibcitem{Boggs:2016tp}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection with_a_volume_number_and_issue_number (end)
+\subsubsection{With an Issue Number} % (fold)
+\label{sub:with_an_issue_number}
+\begin{refsection}
+ \bibcitem{Kafka:2007tm}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection with_an_issue_number (end)
+\subsubsection{With a Season} % (fold)
+\label{sub:with_a_season}
+\begin{refsection}
+ \bibcitem{Belton:2008uo}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection with_a_season (end)
+\subsubsection{By an Organization (Corporate Author)} % (fold)
+\label{sub:by_an_organization_corporate_author}
+\begin{refsection}
+ \bibcitem{MLA:Ad:Hoc:2007tc}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection by_an_organization_corporate_author (end)
+\subsubsection{With a Translator} % (fold)
+\label{sub:with_a_translator}\index{translation}
+\begin{refsection}
+ \bibcitem{Tibullus:2002ub}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection with_a_translator (end)
+\subsubsection{In a Language Other Than English} % (fold)
+\label{sub:in_a_language_other_than_english}
+\begin{refsection}
+ \bibcitem{Litvak:2006vi}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection in_a_language_other_than_english (end)
+\subsubsection{In a Journal with More Than One Series} % (fold)
+\label{sub:in_a_journal_with_more_than_one_series}
+\begin{refsection}
+ \bibcitem{Helmling:2006ug}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection in_a_journal_with_more_than_one_series (end)
+\subsubsection{In a Special Issue of a Journal} % (fold)
+\label{sub:in_a_special_issue_of_a_journal}
+\begin{refsection}
+ \bibcitem{Charney:2011wk}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection in_a_special_issue_of_a_journal (end)
+\subsubsection{In a Database, with a DOI} % (fold)
+\label{sub:in_a_database_with_a_doi}
+\begin{refsection}
+ \bibcitem{Bockelman:uu}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection in_a_database_with_a_doi (end)
+\subsubsection{In a Database, with a Permalink} % (fold)
+\label{sub:in_a_database_with_a_permalink}
+\begin{refsection}
+ \bibcitem{Goldman:2010wd}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection in_a_database_with_a_permalink (end)
+\subsubsection{From an Online Journal} % (fold)
+\label{sub:from_an_online_journal}\index{online!scholarly article}
+\begin{refsection}
+ \bibcitem{Alpert:Abrams:2016wb}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection from_an_online_journal (end)
+\subsubsection{PDF of an Online Journal Article} % (fold)
+\label{sub:pdf_of_an_online_journal_article}\index{online!scholarly article}
+\begin{refsection}
+ \bibcitem{Fisher:vu}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection pdf_of_an_online_journal_article (end)
+\subsubsection{Supplementary Data for an Online Journal Article} % (fold)
+\label{sub:supplementary_data_for_an_online_journal_article}\index{online!supplementary data}
+\begin{refsection}
+ \bibcitem{Moskowitz:2021uw}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection supplementary_data_for_an_online_journal_article (end)
+\subsubsection{Published Online ahead of Print} % (fold)
+\label{sub:published_online_ahead_of_print}\index{online!preprint}
+\begin{refsection}
+ \bibcitem{Erhardt:2020wl}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection published_online_ahead_of_print (end)
+\subsubsection{Entire Special Issues of Journals} % (fold)
+\label{sub:entire_special_issues_of_journals}
+\begin{refsection}
+ \bibcitem{AppiahGates:1992uw}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection entire_special_issues_of_journals (end)
+% section contributions_to_scholarly_journals (end)
+
+\subsection{Contributions to News Publications} % (fold)
+\label{sec:contributions_to_news_publications}
+\subsubsection{Opinion or Editorial} % (fold)
+\label{sub:opinion_or_editorial}
+\begin{refsection}
+ \bibcitem{Editorial:Board:vc}
+ \bibcitem{Gergen:un}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection opinion_or_editorial (end)
+\subsubsection{Reported by a News Service} % (fold)
+\label{sub:reported_by_a_news_service}
+\begin{refsection}
+ \bibcitem{Evacuation:wj}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection reported_by_a_news_service (end)
+\subsubsection{One-Page Article} % (fold)
+\label{sub:one_page_article}
+\begin{refsection}
+ \bibcitem{Magra:ws}
+ \bibcitem{Perrier:vv}
+ \bibcitem{Soloski:wi}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection one_page_article (end)
+\subsubsection{Consecutively Paginated Article} % (fold)
+\label{sub:consecutively_paginated_article}
+\begin{refsection}
+ \bibcitem{Sharpe:wa}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection consecutively_paginated_article (end)
+\subsubsection{Nonconsecutively Paginated Article} % (fold)
+\label{sub:nonconsecutively_paginated_article}
+\begin{refsection}
+ \bibcitem{Haughney:ty}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection nonconsecutively_paginated_article (end)
+\subsubsection{Published Online, without Page Numbers} % (fold)
+\label{sub:published_online_without_page_numbers}\index{online!without page numbers}
+\begin{refsection}
+ \bibcitem{Parker:Pope:wm}
+ \bibcitem{Tribble:tc}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection published_online_without_page_numbers (end)
+\subsubsection{With City of Publication Given} % (fold)
+\label{sub:with_city_of_publication_given}
+\begin{refsection}
+ \bibcitem{Alaton:tc}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection with_city_of_publication_given (end)
+\subsubsection{In a Series} % (fold)
+\label{sub:in_a_series}
+\begin{refsection}
+ \bibcitem{Glatter:wx}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection in_a_series (end)
+% section contributions_to_news_publications (end)
+
+\subsection{Contributions to Magazines} % (fold)
+\label{sec:contributions_to_magazines}
+\subsubsection{With No Season, Volume Number, or Issue Number} % (fold)
+\label{sub:with_no_season_volume_number_or_issue_number}
+\begin{refsection}
+ \bibcitem{Deresiewicz:un}
+ \bibcitem{Giant:ta}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection with_no_season_volume_number_or_issue_number (end)
+\subsubsection{With Season, Volume Number, and Issue Number} % (fold)
+\label{sub:with_season_volume_number_and_issue_number}
+\begin{refsection}
+ \bibcitem{Riis:2017vi}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection with_season_volume_number_and_issue_number (end)
+% section contributions_to_magazines (end)
+
+\subsection{Reviews} % (fold)
+\label{sec:reviews}
+\subsubsection{Titled and Signed (by an Author)} % (fold)
+\label{sub:titled_and_signed_by_an_author}
+\begin{refsection}
+ \bibcitem{Tommasini:tm}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection titled_and_signed_by_an_author (end)
+\subsubsection{Untitled and Signed (by an Author)} % (fold)
+\label{sub:untitled_and_signed_by_an_author}
+\begin{refsection}
+ \bibcitem{Rohrbaugh:aa}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection untitled_and_signed_by_an_author (end)
+\subsubsection{Titled and Unsigned (Anonymous)} % (fold)
+\label{sub:titled_and_unsigned_anonymous}
+\begin{refsection}
+ \bibcitem{Racial:vh}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection titled_and_unsigned_anonymous (end)
+\subsubsection{Untitled and Unsigned (Anonymous)} % (fold)
+\label{sub:untitled_and_unsigned_anonymous}
+\begin{refsection}
+ \bibcitem{YouWill:aa}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection untitled_and_unsigned_anonymous (end)
+% section reviews (end)
+
+\subsection{Websites} % (fold)
+\label{sec:websites}
+\subsubsection{Digital Monograph with Author and Publisher} % (fold)
+\label{sub:digital_monograph_with_author_and_publisher}
+\begin{refsection}
+ \bibcitem{Bauch:tb}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection digital_monograph_with_author_and_publisher (end)
+\subsubsection{Site with Editors and No Publisher} % (fold)
+\label{sub:site_with_editors_and_no_publisher}
+\begin{refsection}
+ \bibcitem{BlakeArchive:uh}
+ \bibcitem{VisualizingEmancipation:uf}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection site_with_editors_and_no_publisher (end)
+\subsubsection{Site with Editors and a Publisher} % (fold)
+\label{sub:site_with_editors_and_a_publisher}
+\begin{refsection}
+ \bibcitem{PiersPEA:aa}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection site_with_editors_and_a_publisher (end)
+\subsubsection{Site Written and Published by an Organization} % (fold)
+\label{sub:site_written_and_published_by_an_organization}
+\begin{refsection}
+ \bibcitem{Folgerpedia:aa}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection site_written_and_published_by_an_organization (end)
+\subsubsection{Jointly Published Site} % (fold)
+\label{sub:jointly_published_site}
+\begin{refsection}
+ \bibcitem{Manifold:aa}
+ Here's the citation to it \autocite{Manifold:aa}.
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection jointly_published_site (end)
+% section websites (end)
+
+\subsection{Works Contained on a Website} % (fold)
+\label{sec:works_contained_on_a_website}
+\subsubsection{From a Book} % (fold)
+\label{sub:from_a_book}
+\begin{refsection}
+ \bibcitem{Poe:1902aa}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection from_a_book (end)
+\subsubsection{From a Book, Contained in a Database} % (fold)
+\label{sub:from_a_book_contained_in_a_database}
+\begin{refsection}
+ \bibcitem{Toorn:2017ti}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection from_a_book_contained_in_a_database (end)
+\subsubsection{From a Scholarly Journal, Published Online} % (fold)
+\label{sub:from_a_scholarly_journal_published_online}\index{online!scholarly article}
+\begin{refsection}
+ \bibcitem{Fisek:te}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection from_a_scholarly_journal_published_online (end)
+\subsubsection{From a Scholarly Journal, Published in a Database} % (fold)
+\label{sub:from_a_scholarly_journal_published_in_a_database}
+\myparagraph{Originally published online} % (fold)
+\label{ssub:originally_published_online}\index{online!scholarly article}
+\begin{refsection}
+ \bibcitem{Chan:uj}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection originally_published_online (end)
+\myparagraph{Originally published in print} % (fold)
+\label{ssub:originally_published_in_print}
+\begin{refsection}
+ \bibcitem{Goldman:2010uv}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection originally_published_in_print (end)
+% subsection from_a_scholarly_journal_published_in_a_database (end)
+\subsubsection{With Supplementary Material or Data Set} % (fold)
+\label{sub:with_supplementary_material_or_data_set}
+\myparagraph{Published separately} % (fold)
+\label{ssub:published_separately}
+\begin{refsection}
+ \bibcitem{ReplicationNonDemocratic:ws}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection published_separately (end)
+\myparagraph{Published alongside the work} % (fold)
+\label{ssub:published_alongside_the_work}
+\begin{refsection}
+ \bibcitem{Moskowitz:2021uw}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection published_alongside_the_work (end)
+% subsection with_supplementary_material_or_data_set (end)
+\subsubsection{From a News Publication} % (fold)
+\label{sub:from_a_news_publication}
+\begin{refsection}
+ \bibcitem{Parker:Pope:aa}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection from_a_news_publication (end)
+\subsubsection{From a Magazine} % (fold)
+\label{sub:from_a_magazine}
+\begin{refsection}
+ \bibcitem{Chou:vq}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection from_a_magazine (end)
+\subsubsection{From a Blog} % (fold)
+\label{sub:from_a_blog}
+\begin{refsection}
+ \bibcitem{Hayes:vy}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection from_a_blog (end)
+\subsubsection{From the Comment Section} % (fold)
+\label{sub:from_the_comment_section}
+\begin{refsection}
+ \bibcitem{Max:the:Pen:ve}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection from_the_comment_section (end)
+\subsubsection{From a Discussion List} % (fold)
+\label{sub:from_a_discussion_list}
+\begin{refsection}
+ \bibcitem{Grooms:tx}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection from_a_discussion_list (end)
+\subsubsection{On Social Media} % (fold)
+\label{sub:on_social_media}
+\begin{refsection}
+ \bibcitem{Chaucer:Doth:Tweet:tx}
+ \bibcitem{Lilly:ui}
+ \bibcitem{MacLeod:wm}
+ \bibcitem{Modern:Language:Association:ub}
+ \bibcitem{Ng:wg}
+ \bibcitem{Thomas:vq}
+ \bibcitem{World:Wildlife:Fund:vz}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection on_social_media (end)
+\subsubsection{On a Repository or Preprint Server} % (fold)
+\label{sub:on_a_repository_or_preprint_server}
+\begin{refsection}
+ \bibcitem{Wang:wj}
+ \bibcitem{Werner:vh}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection on_a_repository_or_preprint_server (end)
+\subsubsection{Work with No Publication Date} % (fold)
+\label{sub:work_with_no_publication_date}
+\begin{refsection}
+ \bibcitem{Beaton:vx}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection work_with_no_publication_date (end)
+% section works_contained_on_a_website (end)
+
+\subsection{Entries in Reference Works} % (fold)
+\label{sec:entries_in_reference_works}
+\subsubsection{Unsigned (Anonymous)} % (fold)
+\label{sub:unsigned_anonymous}
+\begin{refsection}
+ \bibcitem{Patanjali:1996wu}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection unsigned_anonymous (end)
+\subsubsection{Signed (by an Author)} % (fold)
+\label{sub:signed_by_an_author}
+\begin{refsection}
+ \bibcitem{Botterill:2004tx}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection signed_by_an_author (end)
+\subsubsection{From a Dictionary} % (fold)
+\label{sub:from_a_dictionary}
+\begin{refsection}
+ \bibcitem{Content:2020tl}
+ \bibcitem{Content:2003ug}
+ \bibcitem{Emoticon:2003ur}
+ \bibcitem{Emoticon:2018ws}
+ \bibcitem{Heavy:2018ty}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection from_a_dictionary (end)
+% section entries_in_reference_works (end)
+
+\subsection{Films and Videos} % (fold)
+\label{sec:films_and_videos}
+\subsubsection{With One Publisher} % (fold)
+\label{sub:with_one_publisher}
+\begin{refsection}
+ \bibcitem{OpeningNight:tf}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection with_one_publisher (end)
+\subsubsection{With Copublishers} % (fold)
+\label{sub:with_copublishers}
+\begin{refsection}
+ \bibcitem{Sairat:vz}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection with_copublishers (end)
+\subsubsection{Foreign Language Film with Original Title Given Optionally} % (fold)
+\label{sub:foreign_language_film_with_original_title_given_optionally}
+\begin{refsection}
+ \bibcitem{LikeWater:1993:og}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection foreign_language_film_with_original_title_given_optionally (end)
+\subsubsection{With Original Release Date Given as Supplemental Element} % (fold)
+\label{sub:with_original_release_date_given_as_supplemental_element}
+\begin{refsection}
+ \bibcitem{BladeRunner::1992tx}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection with_original_release_date_given_as_supplemental_element (end)
+\subsubsection{Viewed through an App} % (fold)
+\label{sub:film_viewed_through_an_app}
+\begin{refsection}
+ \bibcitem{ET:1982:vj}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection film_viewed_through_an_app (end)
+\subsubsection{Uploaded to a Sharing Site} % (fold)
+\label{sub:uploaded_to_a_sharing_site}
+\begin{refsection}
+ \bibcitem{WhatIsMLA:2016:wq}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection uploaded_to_a_sharing_site (end)
+% section films_and_videos (end)
+\subsection{Television Episodes} % (fold)
+\label{sec:television_episodes}
+\subsubsection{Viewed as a Television Broadcast} % (fold)
+\label{sub:viewed_as_a_television_broadcast}
+\begin{refsection}
+ \bibcitem{Hush:1999:vi}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection viewed_as_a_television_broadcast (end)
+\subsubsection{Viewed on a Website} % (fold)
+\label{sub:tv_viewed_on_a_website}
+\begin{refsection}
+ \bibcitem{IBorg:1992:wz}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection tv_viewed_on_a_website (end)
+\subsubsection{Viewed on Physical Media} % (fold)
+\label{sub:tv_viewed_on_physical_media}
+\begin{refsection}
+ \bibcitem{Hush:1999:vg}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection tv_viewed_on_physical_media (end)
+\subsubsection{Viewed through an App} % (fold)
+\label{sub:tv_viewed_through_an_app}
+\begin{refsection}
+ \bibcitem{NewNormal:2016:vi}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection tv_viewed_through_an_app (end)
+\subsubsection{Without an Episode Title} % (fold)
+\label{sub:without_an_episode_title}
+\begin{refsection}
+ \bibcitem{Fleabag:2019:tq}
+ \bibcitem{Jeopardy:2019:td}
+ \bibcitem{SaturdayNight:2019:vu}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection without_an_episode_title (end)
+% section television_episodes (end)
+
+\subsection{Audiovisual Works} % (fold)
+\label{sec:audiovisual_works}
+\subsubsection{Audiobook} % (fold)
+\label{sub:audiobook}
+\begin{refsection}
+ \bibcitem{Lee:2014aa}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection audiobook (end)
+\subsubsection{Musical Recording} % (fold)
+\label{sub:musical_recording}
+\myparagraph{Album} % (fold)
+\label{ssub:album}
+Either set a |booktitle| with no |title|, or set |title| with |entrysubtype={album}|.
+\begin{refsection}
+ \bibcitem{Beatles:aa}
+ \bibcitem{SigurRos:vq}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection album (end)
+\myparagraph{Song} % (fold)
+\label{ssub:song}
+\begin{refsection}
+ \bibcitem{Beyonce:ta}
+ \bibcitem{Lopez:tu}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection song (end)
+\myparagraph{With medium of publication given in final supplemental element} % (fold)
+\label{ssub:with_medium_of_publication_given_in_final_supplemental_element}
+\begin{refsection}
+ \bibcitem{Schubert:wm}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection with_medium_of_publication_given_in_final_supplemental_element (end)
+\myparagraph{With original recording date given in middle supplemental element} % (fold)
+\label{ssub:with_original_recording_date_given_in_middle_supplemental_element}
+\begin{refsection}
+ \bibcitem{Beethoven:ui}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection with_original_recording_date_given_in_middle_supplemental_element (end)
+% subsection musical_recording (end)
+\subsubsection{Literary Reading, Spoken-Word Recording, or Podcast} % (fold)
+\label{sub:literary_reading_spoken_word_recording_or_podcast}
+\myparagraph{With the same author and narrator} % (fold)
+\label{ssub:with_the_same_author_and_narrator}
+\begin{refsection}
+ \bibcitem{Li:ty}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection with_the_same_author_and_narrator (end)
+\myparagraph{With a different author and narrator} % (fold)
+\label{ssub:with_a_different_author_and_narrator}
+\begin{refsection}
+ \bibcitem{Chaucer:uf}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection with_a_different_author_and_narrator (end)
+\myparagraph{With podcast specified as the version} % (fold)
+\label{ssub:with_podcast_specified_as_the_version}
+% subsubsection with_podcast_specified_as_the_version (end)
+\begin{refsection}
+ \bibcitem{YiyunLiReads:ub}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection literary_reading_spoken_word_recording_or_podcast (end)
+\subsubsection{Live Radio Broadcast} % (fold)
+\label{sub:live_radio_broadcast}
+\begin{refsection}
+ \bibcitem{PoeMusic:wi}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection live_radio_broadcast (end)
+\subsubsection{Art Exhibition} % (fold)
+\label{sub:art_exhibition}
+\begin{refsection}
+ \bibcitem{Cave:wf}
+ \bibcitem{Unbound:wy}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection art_exhibition (end)
+\subsubsection{Sculpture or Other Object} % (fold)
+\label{sub:sculpture_or_other_object}
+\myparagraph{With format given in final supplemental element} % (fold)
+\label{ssub:with_format_given_in_final_supplemental_element}
+\begin{refsection}
+ \bibcitem{Rodin:uj}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection with_format_given_in_final_supplemental_element (end)
+\myparagraph{Untitled} % (fold)
+\label{ssub:untitled_sculpture}
+\begin{refsection}
+ \bibcitem{JarWithSerpent:xv}
+ \bibcitem{Mackintosh:wj}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection untitled_sculpture (end)
+% subsection sculpture_or_other_object (end)
+\subsubsection{Painting} % (fold)
+\label{sub:painting}
+\myparagraph{Viewed firsthand} % (fold)
+\label{ssub:painting_viewed_firsthand}
+\begin{refsection}
+ \bibcitem{Bearden:vp}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection painting_viewed_firsthand (end)
+\myparagraph{Viewed online} % (fold)
+\label{ssub:painting_viewed_online}\index{online!artwork}
+\begin{refsection}\citereset
+ \bibcitem{Bearden:aa}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection painting_viewed_online (end)
+\myparagraph{Viewed in a book} % (fold)
+\label{ssub:painting_viewed_in_a_book}
+\begin{refsection}\citereset
+ \bibcitem{Velazquez:2016ud}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection painting_viewed_in_a_book (end)
+% subsection painting (end)
+\subsubsection{Photograph} % (fold)
+\label{sub:photograph}
+\myparagraph{Viewed firsthand} % (fold)
+\label{ssub:photo_viewed_firsthand}
+\begin{refsection}
+ \bibcitem{Cameron:wo}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection photo_viewed_firsthand (end)
+\myparagraph{Viewed online} % (fold)
+\label{ssub:photo_viewed_online}\index{online!artwork}
+\begin{refsection}
+ \bibcitem{Sheldon:tr}
+ \bibinclude{sheldon2014}% platypus - Something's messed up with this entry
+ \bibcitem{Silver:tj}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection photo_viewed_online (end)
+% subsection photograph (end)
+\subsubsection{Illustrated Work or Cartoon} % (fold)
+\label{sub:illustrated_work_or_cartoon}
+\begin{refsection}
+ \bibcitem{Beaton:vx}
+ \bibcitem{Karasik:vt}
+ \bibcitem{Trudeau:tx}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection illustrated_work_or_cartoon (end)
+\subsubsection{Slides} % (fold)
+\label{sub:slides}
+\begin{refsection}
+ \bibcitem{Benton:wd}
+ \bibcitem{Monet:ug}
+ \bibcitem{SlideLinus:wh}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection slides (end)
+% section audiovisual_works (end)
+
+\subsection{Text Accompanying Audio and Visual Works} % (fold)
+\label{sec:text_accompanying_audio_and_visual_works}
+\subsubsection{ Accompanying Audio Works (Including Liner Notes)} % (fold)
+\label{sub:_accompanying_audio_works_including_liner_notes}
+\begin{refsection}
+ \bibcitem{Beyonce:2013ta}
+ \printbibliography[heading=none]
+\end{refsection}
+\myparagraph{Titled, with format given in final supplemental element} % (fold)
+\label{ssub:titled_with_format_given_in_final_supplemental_element}
+\begin{refsection}
+ \bibcitem{Clapton:1990va}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection titled_with_format_given_in_final_supplemental_element (end)
+\myparagraph{Untitled} % (fold)
+\label{ssub:untitled}
+\begin{refsection}
+ \bibcitem{Race:1959aa}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection untitled (end)
+\myparagraph{Undated} % (fold)
+\label{ssub:undated}
+\begin{refsection}
+ \bibcitem{Lewiston:aa}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection undated (end)
+\myparagraph{Unsigned (anonymous)} % (fold)
+\label{ssub:unsigned_anonymous}
+\begin{refsection}
+ \bibcitem{anon:1994ti}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection unsigned_anonymous (end)
+% subsection _accompanying_audio_works_including_liner_notes (end)
+\subsubsection{Museum Wall Text} % (fold)
+\label{sub:museum_wall_text}
+\begin{refsection}
+ \bibcitem{textWarrior:2016wb}
+ \bibcitem{textJarSerpent:tm}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection museum_wall_text (end)
+% section text_accompanying_audio_and_visual_works (end)
+
+\subsection{Librettos and Musical Scores} % (fold)
+\label{sec:librettos_and_musical_scores}
+\begin{refsection}
+ \bibcitem{Clyne:2012td}
+ \bibcitem{Oakes:2004wa}
+ \printbibliography[heading=none]
+\end{refsection}
+% section librettos_and_musical_scores (end)
+
+\subsection{Performances} % (fold)
+\label{sec:performances}
+\subsubsection{Play} % (fold)
+\label{sub:play_performance}
+\begin{refsection}
+ \bibcitem{Shaw:2006vz}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection play_performance (end)
+\subsubsection{Concert} % (fold)
+\label{sub:concert}
+\begin{refsection}
+ \bibcitem{Beyonce:2016vj}
+ \bibcitem{Lynn:2016wu}
+ \bibcitem{SingMe:2019vl}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection concert (end)
+\subsubsection{Dance} % (fold)
+\label{sub:dance}
+\begin{refsection}
+ \bibcitem{Brown:2019uj}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection dance (end)
+\subsubsection{Performance Art} % (fold)
+\label{sub:performance_art}
+\begin{refsection}
+ \bibcitem{Alys:2002un}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection performance_art (end)
+
+% section performances (end)
+
+\subsection{Live Presentations (Lectures, Talks, Conference Presentations, and Speeches)} % (fold)
+\label{sec:live_presentations_lectures_talks_conference_presentations_and_speeches}
+\begin{refsection}
+ \bibcitem{Atwood:1993tp}
+ \bibcitem{Ford:2016vm}
+ \printbibliography[heading=none]
+\end{refsection}
+\subsubsection{Video Recording of Live Presentation} % (fold)
+\label{sub:video_recording_of_live_presentation}
+\begin{refsection}
+ \bibcitem{Allende:2007vc}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection video_recording_of_live_presentation (end)
+\subsubsection{Transcript or Captioning of Live Presentation Accompanying Video Recording} % (fold)
+\label{sub:transcript_or_captioning_of_live_presentation_accompanying_video_recording}
+\citereset
+\begin{refsection}
+ \bibcitem{Allende:2007bw}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection transcript_or_captioning_of_live_presentation_accompanying_video_recording (end)
+\subsubsection{Transcript of Live Presentation Published without Accompanying Audio or Video} % (fold)
+\label{sub:transcript_of_live_presentation_published_without_accompanying_audio_or_video}
+\begin{refsection}
+ \bibcitem{Scholes:2005uk}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection transcript_of_live_presentation_published_without_accompanying_audio_or_video (end)
+% section live_presentations_lectures_talks_conference_presentations_and_speeches (end)
+
+\subsection{Interviews} % (fold)
+\label{sec:interviews}\index{interview|(}
+\subsubsection{Interviewer’s Name Not Given} % (fold)
+\label{sub:interviewer_s_name_not_given}
+\begin{refsection}
+ \bibcitem{Nguyen:un}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection interviewer_s_name_not_given (end)
+\subsubsection{Interviewer’s Name Given} % (fold)
+\label{sub:interviewer_s_name_given}
+\begin{refsection}
+ \bibcitem{Bacon:2016aa}
+ \bibcitem{SaroWiwa:2001wt}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection interviewer_s_name_given (end)
+\subsubsection{Unpublished} % (fold)
+\label{sub:unpublished_interview}\index{unpublished}
+\begin{refsection}
+ \bibcitem{Salter:uc}
+ \bibcitem{Wexler:wj}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection unpublished_interview (end)
+\index{interview|)}
+% section interviews (end)
+
+\subsection{Personal Communications} % (fold)
+\label{sec:personal_communications}
+\begin{refsection}
+ \bibcitem{Santiago:to}
+ \printbibliography[heading=none]
+\end{refsection}
+% section personal_communications (end)
+
+\subsection{Letters} % (fold)
+\label{sec:letters}
+\subsubsection{Published} % (fold)
+\label{sub:published}
+\myparagraph{In a book} % (fold)
+\label{ssub:in_a_book}
+\begin{refsection}
+ \bibcitem{Woolf:1976wl}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection in_a_book (end)
+\myparagraph{To the editor, published in a news publication} % (fold)
+\label{ssub:to_the_editor_published_in_a_news_publication}
+\begin{refsection}
+ \bibcitem{Malone:vp}
+ \bibcitem{Schlesinger:wm}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection to_the_editor_published_in_a_news_publication (end)
+% subsection published (end)
+\subsubsection{Unpublished} % (fold)
+\label{sub:unpublished_news}
+\myparagraph{In a personal collection} % (fold)
+\label{ssub:in_a_personal_collection}
+\begin{refsection}
+ \bibcitem{Apfelbaum:un}
+ \bibcitem{Murrow:vv}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection in_a_personal_collection (end)
+\myparagraph{In an archive} % (fold)
+\label{ssub:in_an_archive}
+\begin{refsection}
+ \bibcitem{Benton:ve}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection in_an_archive (end)
+% subsection unpublished_news (end)
+% section letters (end)
+
+\subsection{E-mails and Text Messages} % (fold)
+\label{sec:e_mails_and_text_messages}
+\begin{refsection}
+ \bibcitem{Elahi:vi}
+ \bibcitem{Lemuelson:uu}
+ \bibcitem{Pierson:vf}
+ \bibcitem{Zamora:ui}
+ \printbibliography[heading=none]
+\end{refsection}
+% section e_mails_and_text_messages (end)
+
+\subsection{E-mail Newsletters} % (fold)
+\label{sec:e_mail_newsletters}
+\begin{refsection}
+ \bibcitem{MemberSuccess:ws}
+ \printbibliography[heading=none]
+\end{refsection}
+% section e_mail_newsletters (end)
+
+\subsection{Press Releases} % (fold)
+\label{sec:press_releases}
+\begin{refsection}
+ \bibcitem{splcJoins:ws}
+ \printbibliography[heading=none]
+\end{refsection}
+% section press_releases (end)
+
+\subsection{Advertisements} % (fold)
+\label{sec:advertisements}
+\subsubsection{Filmed Commercial} % (fold)
+\label{sub:filmed_commercial}
+\begin{refsection}
+ \bibcitem{AirCanada:us}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection filmed_commercial (end)
+\subsubsection{Print Advertisement} % (fold)
+\label{sub:print_advertisement}
+\begin{refsection}
+ \bibcitem{AdUpton:vl}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection print_advertisement (end)
+\subsubsection{Billboard} % (fold)
+\label{sub:billboard}
+\begin{refsection}
+ \bibcitem{AdSchool:tv}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection billboard (end)
+\subsubsection{Digital Advertisement} % (fold)
+\label{sub:digital_advertisement}
+\begin{refsection}
+ \bibcitem{AdNewYorker:ty}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection digital_advertisement (end)
+% section advertisements (end)
+
+\subsection{Reports} % (fold)
+\label{sec:reports}
+\subsubsection{Written and Published by the Same Organization} % (fold)
+\label{sub:written_and_published_by_the_same_organization}
+\begin{refsection}
+ \bibcitem{ReadingRisk:vu}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection written_and_published_by_the_same_organization (end)
+\subsubsection{With a Different Author and Publisher} % (fold)
+\label{sub:with_a_different_author_and_publisher}
+\begin{refsection}
+ \bibcitem{Powell:wl}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection with_a_different_author_and_publisher (end)
+\subsubsection{Executive Summary} % (fold)
+\label{sub:executive_summary}
+\begin{refsection}
+ \bibcitem{ExecutiveSummary:we}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection executive_summary (end)
+% section reports (end)
+
+\subsection{Scripture} % (fold)
+\label{sec:scripture}
+\subsubsection{With a General Editor} % (fold)
+\label{sub:with_a_general_editor}
+\begin{refsection}
+ \bibcitem{NJBible:1985va}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection with_a_general_editor (end)
+\subsubsection{With a Translator Specified} % (fold)
+\label{sub:with_a_translator_specified}
+\begin{refsection}
+ \bibcitem{Quran:2015uz}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection with_a_translator_specified (end)
+\subsubsection{In a Named Version} % (fold)
+\label{sub:in_a_named_version}
+\begin{refsection}
+ \bibcitem{KJVBible:1998wf}
+ \bibcitem{DRABible:1899wf}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection in_a_named_version (end)
+\subsubsection{Published in an App} % (fold)
+\label{sub:published_in_an_app_script}
+\begin{refsection}
+ \bibcitem{TecartaBible:wf}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection published_in_an_app_script (end)
+% section scripture (end)
+
+\subsection{Dissertations and Theses} % (fold)
+\label{sec:dissertations_and_theses}
+\begin{refsection}
+ \AtNextBibliography{\renewbibmacro*{bbx:savehash}{}}
+ \bibcitem{Njus:2010vc}
+ \bibcitem{Njus:2010aa}
+ \printbibliography[heading=none]
+\end{refsection}
+% \AtNextBibliography{\renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}}
+% section dissertations_and_theses (end)
+
+\subsection{Brochures and Pamphlets} % (fold)
+\label{sec:brochures_and_pamphlets}
+\begin{refsection}
+ \bibcitem{Language:vu}
+ \bibcitem{WashingtonDC:2000ti}
+ \printbibliography[heading=none]
+\end{refsection}
+% section brochures_and_pamphlets (end)
+
+\subsection{Maps, Charts, and Tables} % (fold)
+\label{sec:maps_charts_and_tables}
+\begin{refsection}
+ \bibcitem{JapaneseFundamentals:wy}
+ \bibcitem{Michigan:wk}
+ \bibcitem{TableCCCXI:vi}
+ \bibcitem{WesternBoundaries:vc}
+ \printbibliography[heading=none]
+\end{refsection}
+% section maps_charts_and_tables (end)
+
+\subsection{Unpublished Works} % (fold)
+\label{sec:unpublished_works}
+\subsubsection{Letter, Memo, or Other Written Communication} % (fold)
+\label{sub:letter_memo_or_other_written_communication}
+\begin{refsection}
+ \bibcitem{Benton:ve}
+ \bibcitem{Cahill:wq}
+ \bibcitem{Murrow:vv}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection letter_memo_or_other_written_communication (end)
+\subsubsection{Interview} % (fold)
+\label{sub:interview}
+\begin{refsection}
+ \bibcitem{Sternberg:ta}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection interview (end)
+\subsubsection{Forthcoming Work} % (fold)
+\label{sub:forthcoming_work}
+\begin{refsection}
+ \bibcitem{Jespersen:wd}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection forthcoming_work (end)
+\subsubsection{Essay Manuscript} % (fold)
+\label{sub:essay_manuscript}
+\begin{refsection}
+ \bibcitem{Moskowitz:wb}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection essay_manuscript (end)
+\subsubsection{Book Manuscript} % (fold)
+\label{sub:book_manuscript}
+\begin{refsection}
+ \bibcitem{Jones:vh}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection book_manuscript (end)
+\subsubsection{Manuscript in an Archive} % (fold)
+\label{sub:manuscript_in_an_archive}
+\begin{refsection}
+ \bibcitem{Auden:wg}
+ \bibcitem{Benton:ve}
+ \bibcitem{Dickinson:aa}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection manuscript_in_an_archive (end)
+\subsubsection{Classroom Materials} % (fold)
+\label{sub:classroom_materials}
+\subsubsection{Syllabus} % (fold)
+\label{sub:syllabus}
+\begin{refsection}
+ \bibcitem{SocialNetworking:vj}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection syllabus (end)
+\myparagraph{On a learning management system} % (fold)
+\label{ssub:on_a_learning_management_system}
+\begin{refsection}
+ \bibcitem{DigitalMediaTheory:uo}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection on_a_learning_management_system (end)
+\myparagraph{In a printed course pack} % (fold)
+\label{ssub:in_a_printed_course_pack}
+\begin{refsection}
+ \bibcitem{Jackson:uh}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection in_a_printed_course_pack (end)
+% subsection classroom_materials (end)
+
+% section unpublished_works (end)
+
+\subsection{Works Published Informally in a Repository or Preprint Server} % (fold)
+\label{sec:works_published_informally_in_a_repository_or_preprint_server}
+\begin{refsection}
+ \bibcitem{Glass:2018wx}
+ \bibcitem{Lawson:tw}
+ \bibcitem{Wang:wj}
+ \printbibliography[heading=none]
+\end{refsection}
+% section works_published_informally_in_a_repository_or_preprint_server (end)
+
+\subsection{Digital Media} % (fold)
+\label{sec:digital_media}
+\subsubsection{Video Game} % (fold)
+\label{sub:video_game}
+\begin{refsection}
+ \bibcitem{AngryBirds:2016vs}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection video_game (end)
+\subsubsection{Virtual Reality Experience} % (fold)
+\label{sub:virtual_reality_experience}
+\begin{refsection}
+ \bibcitem{VidaSystems:2020ua}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection virtual_reality_experience (end)
+% section digital_media (end)
+
+\subsection{Works Missing Publication Information} % (fold)
+\label{sec:works_missing_publication_information}
+\subsubsection{Without an Author} % (fold)
+\label{sub:without_an_author}
+\begin{refsection}
+ \bibcitem{Beowulf:2004th}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection without_an_author (end)
+\subsubsection{Untitled} % (fold)
+\label{sub:untitled}
+\myparagraph{Description in Title of Source element} % (fold)
+\label{ssub:description_in_title_of_source_element}
+\begin{refsection}
+ \bibcitem{Boyd:1992aa}
+ \bibcitem{YouWill:aa}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection description_in_title_of_source_element (end)
+\myparagraph{Poem with first line used as title} % (fold)
+\label{ssub:poem_with_first_line_used_as_title}
+\begin{refsection}
+ \bibcitem{Dickinson:1999uv}
+ \printbibliography[heading=none]
+\end{refsection}
+
+% subsubsection poem_with_first_line_used_as_title (end)
+% subsection untitled (end)
+\subsubsection{Without a Publisher} % (fold)
+\label{sub:without_a_publisher}
+\begin{refsection}
+ \bibcitem{Hocking:2010tz}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection without_a_publisher (end)
+\subsubsection{Without a Date of Publication} % (fold)
+\label{sub:without_a_date_of_publication}
+\begin{refsection}
+ \AtNextBibliography{\renewbibmacro*{bbx:savehash}{}}
+ \bibcitem{Bauer:ui}
+ \bibcitem{Bauer:1971ui}
+ \bibcitem{Language:vu}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection without_a_date_of_publication (end)
+\subsubsection{Without Page Numbers} % (fold)
+\label{sub:without_page_numbers}
+\begin{refsection}
+ \bibcitem{UnitedNationsGeneralAssembly:1948uv}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsection without_page_numbers (end)
+
+% section works_missing_publication_information (end)
+
+
+\subsection{Unfinished Entries from the \emph{Handbook}} % (fold)
+\label{sec:remaining_sections}
+
+This documentation is yet incomplete, when compared to the entries in Appendix 2 of the \emph{MLA Handbook}. Although not shown above, some source types below may already be supported in \texttt{biblatex-mla} by modifying existing example entries.
+
+\begin{multicols}{2}
+\begin{enumerate}
+
+ \setcounter{enumi}{32}
+ \item Government Publications
+ \begin{itemize}
+ \item With Government Name as It Appears on Source
+ \item With Government Name Standardized to Consolidate Entries
+ \end{itemize}
+
+ \item Legal Works
+ \begin{itemize}
+ \item United States Supreme Court
+ \begin{itemize}
+ \item Decisions
+ \item Dissenting opinions
+ \end{itemize}
+ \item Federal Statutes (United States Code)
+ \item Public Laws
+ \item Federal Appeals Court Decisions
+ \item Federal Bills
+ \item Hearings
+ \item Executive Orders
+ \item State Court of Appeals, Unpublished Decisions
+ \item State Senate Bills
+ \item Constitutions
+ \item Treaties
+ \item Resolutions of International Governing Bodies
+ \end{itemize}
+
+\end{enumerate}
+\end{multicols}
+% subsection unfinished_entries (end)
+
+\subsection{Undocumented in the \emph{Handbook}} % (fold)
+\label{sub:undocumented_in_the_emph_handbook}
+\subsubsection{Patents} % (fold)
+\label{ssub:patents}
+\begin{refsection}
+ \bibcitem{almendro:1998fg}
+ \bibcitem{kowalik:1995qw}
+ \bibcitem{laufenberg:2006py}
+ \bibcitem{sorace:1997gh}
+ \printbibliography[heading=none]
+\end{refsection}
+% subsubsection patents (end)
+% subsection undocumented_in_the_emph_handbook (end)
+
+% section sample_bibtex_entries_and_output (end)
-\biblatexmla is copyrighted \textcopyright\ 2007--2021, by James Clawson. Permission is granted to copy, distribute, and modify this software under the terms of the \lppl, version 1.3: \mylink{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt}.
-
-\subsection[Feedback]{Feedback}
-\label{int:feb}
-
-If you have any questions, requests, or other feedback please email me or reach out on GitHub. If you end up improving the code to be more accurate to the \mla{} standard, please be kind to the rest of us and share; I'm very happy to incorporate improvements! If anything works differently than you feel it ought to work, please let me know. Apart from time and my willingness to write documentation, I'm limited only by the problems of which I'm unaware.
+%%%%%%%
\end{document}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/bibtex_documentation.sty b/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/bibtex_documentation.sty
new file mode 100644
index 0000000000..1e9f8d1d99
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/bibtex_documentation.sty
@@ -0,0 +1,79 @@
+\usepackage{listings}
+\usepackage[usenames,dvipsnames]{xcolor}
+
+\let\oldaddbibresource\addbibresource
+\renewcommand{\addbibresource}[1]{%
+ \oldaddbibresource{#1}%
+ \expandafter\newcommand\csname thebibfile\endcsname{#1}%
+}
+
+% \makeatletter
+% \patchcmd{\lst@Init}{\par\penalty -50\relax}{\relax}
+% \makeatother
+
+% from the impressive biblatex-sbl package
+\lstdefinelanguage{BibTeX}{%
+ % keywordsprefix={@}%
+ keywords={%
+ @artwork,@audio,@book,@bookinbook,@booklet,@collection,@dataset,@image,%
+ @incollection,@inproceedings,@letter,@manual,@misc,@mlasource,@movie,@music,%
+ @mvbook,@online,@patent,@performance,@periodical,@phdthesis,@proceedings,%
+ @reference,@report,@software,@suppbook,@thesis,@unpublished,@video,@article,%
+ @inbook,@inreference,@mvcollection,@review%
+ },
+ emph={%
+ nameb,supplementala,addendum,address,author,authortype,bookauthor,bookeditor,%
+ booksubtitle,booktitle,chapter,crossref,date,datea,doi,edition,editor,%
+ editora,editoratype,editorb,editorbtype,editorc,editorctype,editortype,%
+ entrysubtype,eprint,eprintclass,eprintdate,eprinttype,eventdate,eventtitle,%
+ file,holder,indextitle,institution,issue,issuetitle,journal,journaltitle,%
+ langid,langidopts,library,location,locationa,maineditor,mainsubtitle,%
+ maintitle,maintitleaddon,namea,nameaddon,nameatype,namebtype,namec,namectype,%
+ note,number,options,organization,origdate,origlanguage,origlocation,%
+ origpublisher,origyear,pages,part,preface,publisher,publishera,pubstate,%
+ related,relatedoptions,relatedtype,revdauthor,revdeditor,revdtitle,school,%
+ season,series,seriesseries,shortauthor,shorthand,shortjournal,shortmaintitle,%
+ shortseries,shorttitle,sorttitle,subtitle,supplemental,supplementalb,title,%
+ titlea,titleaddon,titletype,translator,type,type,url,urldate,venue,version,%
+ versiona,versionb,volume,volumes,xref,year%
+ },
+ sensitive=false,
+ breaklines=true,
+ breakatwhitespace=false,
+ morecomment=[l][basicstyle]{=\ \{}
+}
+
+\definecolor{faint}{RGB}{240,240,240}
+
+\lstset{%
+ language=BibTeX,
+ frame=single,
+ % backgroundcolor=\color{faint},
+ % backgroundcolor=\color{gray!5},
+ % backgroundcolor=\color{white},
+ % basicstyle=\ttfamily\small,
+ basicstyle=\ttfamily,
+ keywordstyle=\color{orange},
+ emphstyle=\color{teal}
+}
+
+\lstset{rangeprefix=\%\[\[\ ,% percent + double left square brace + space
+ rangesuffix=\ \]\]}% space + double right square bracket
+
+\newcommand{\mylabel}[1]{
+ \ifcsname c@#1\endcsname%
+ \else%
+ \newcounter{#1}\label{#1}%
+ \fi%
+}
+
+\newcommand{\bibinclude}[1]{%
+ \mylabel{#1}%
+ \lstinputlisting[%
+ linerange=#1-end,%
+ emptylines=0,%
+ includerangemarker=false,%
+ breaklines=true,%
+ postbreak=\mbox{\textcolor{gray}{$\hookrightarrow$}\space}]%
+ {\thebibfile}}
+\newcommand{\bibcitem}[1]{\bibinclude{#1}\nocite{#1}}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/examples.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/examples.pdf
index 5309046352..b925da87c2 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/examples.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/examples.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/handbook9.bib b/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/handbook9.bib
new file mode 100644
index 0000000000..9fbea36891
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/handbook9.bib
@@ -0,0 +1,2003 @@
+@article{Alaton:tc,
+ author = {Alaton, Salem},
+ title = {So, Did They Live Happily Ever After?},
+ date = {1997-12-27},
+ journal = {The Globe and Mail},
+ location = {Toronto},
+ pages = {pp. D1+},
+ entrysubtype = {newspaper}}
+
+@article{Alpert:Abrams:2016wb,
+ author = {Hannah Alpert-Abrams},
+ title = {Machine Reading the \mkbibemph{Primeros Libros}},
+ date = {2016},
+ journal = {Digital Humanities Quarterly},
+ number = {4},
+ url = {www.digitalhumanities.org/dhq/vol/10/4/000268/000268.html},
+ volume = {10},
+ entrysubtype = {online}}
+
+@article{AppiahGates:1992uw,
+ editor = {Appiah, Kwame Anthony and Gates, Jr., Henry Louis},
+ date = {1992},
+ issuetitle = {Identities},
+ journal = {Critical Inquiry},
+ number = {4},
+ volume = {18},
+ entrysubtype = {specissue}}
+
+@article{Belton:2008uo,
+ author = {Belton, John},
+ title = {Painting by the Numbers},
+ subtitle = {The Digital Intermediate},
+ date = {2008},
+ issue = {spring},
+ journal = {Film Quarterly},
+ number = {3},
+ pages = {58--65},
+ volume = {61}}
+
+@article{Bockelman:uu,
+ author = {Brian Bockelman},
+ title = {Buenos Aires \mkbibemph{Boh{\`e}me}: Argentina and the Transatlantic Bohemian Renaissance, 1890--1910},
+ date = {2016-01},
+ doi = {10.1353/mod.2016.0011},
+ eprinttype = {Project Muse},
+ journal = {Modernism/Modernity},
+ number = {1},
+ pages = {37--63},
+ volume = {23}}
+
+@article{Boggs:2016tp,
+ author = {Boggs, Colleen Glenney},
+ title = {Public Reading and the Civil War Draft Lottery},
+ date = {2016},
+ journal = {American Periodicals},
+ number = {2},
+ pages = {149--166},
+ volume = {26}}
+
+@article{Chan:uj,
+ author = {Chan, Evans},
+ title = {Postmodernism and Hong Kong Cinema},
+ date = {2000-05},
+ doi = {10.1353/pmc.2000.0021},
+ eprinttype = {Project Muse},
+ journal = {Postmodern Culture},
+ number = {3},
+ volume = {10}}
+
+@article{Charney:2011wk,
+ author = {Charney, Michael W},
+ title = {Literary Culture on the Burma-Manipur Frontier in the Eighteenth and Nineteenth Centuries},
+ editor = {Sumit Guha},
+ date = {2011},
+ issuetitle = {Literary Cultures at the Frontiers: Literature and Identity in the Early Modern World},
+ journal = {The Medieval History Journal},
+ number = {2},
+ pages = {159--181},
+ volume = {14},
+ entrysubtype = {specissue}}
+
+@article{Chou:vq,
+ author = {Chou, Elaine Hsieh},
+ title = {Carrot Legs},
+ date = {2019-09-12},
+ journal = {Guernica},
+ url = {www.guernicamag.com/carrot-legs/},
+ entrysubtype = {magazine}}
+
+@article{Deresiewicz:un,
+ author = {William Deresiewicz},
+ title = {The Death of the Artist---and the Birth of the Creative Entrepreneur},
+ date = {2015-01/2015-02},
+ journal = {The Atlantic},
+ pages = {92--97},
+ entrysubtype = {magazine}}
+
+@article{Editorial:Board:vc,
+ author = {{Editorial Board}},
+ title = {How to Tell Truth from Fiction in the Age of Fake News},
+ date = {2016-11-21},
+ journal = {Chicago Tribune},
+ url = {www.chicagotribune.com/news/opinion/editorials/ct-fake-news-facebook-edit-1120-md-20161118-story.html},
+ entrysubtype = {newspaper}}
+
+@article{Erhardt:2020wl,
+ author = {Julian Erhardt and Steffen Wamsler and Markus Freitag},
+ title = {National Identity between Democracy and Autocracy},
+ subtitle = {A Comparative Analysis of Twenty-Four Countries},
+ date = {2020},
+ doi = {10.1017/S1755773920000351},
+ eprinttype = {Cambridge Core},
+ journal = {European Political Science Review}}
+
+@article{Evacuation:wj,
+ title = {Evacuation Order Lifted at Nice Airport},
+ date = {2016-07-15},
+ journal = {The Boston Globe},
+ url = {www.bostonglobe.com/news/world/2016/07/15/evacuation-progress-nice-airport/KO4BytWK4wFUOxjEkSpKTN/story.html},
+ entrysubtype = {newspaper}}
+
+@article{Fisek:te,
+ author = {Fi{\c s}ek, Emine},
+ title = {Palimpsests of Violence},
+ subtitle = {Urban Dispossession and Political Theatre in Istanbul},
+ journal = {Comparative Drama},
+ number = {3},
+ url = {scholarworks.wmich.edu/compdr/vol52/iss3/7},
+ volume = {52}}
+
+@article{Fisher:vu,
+ author = {Margaret Fisher},
+ title = {The Music of Ezra Pound},
+ date = {2006-04},
+ journal = {Yale University Library Gazette},
+ number = {3-4},
+ pages = {139--160},
+ url = {www.jstor.org/stable/40859548},
+ volume = {80},
+ addendum = {PDF download}}
+
+@article{Gergen:un,
+ author = {Gergen, David},
+ title = {A Question of Values},
+ date = {2002-02-11},
+ journal = {US News and World Report},
+ pages = {72},
+ addendum = {Op-ed.}}
+
+@article{Giant:ta,
+ title = {Giant of France},
+ subtitle = {The Frenchman Who Changed Literature},
+ date = {2017-01-19},
+ journal = {The Economist},
+ url = {www.economist.com/news/books-and-arts/21714971-frenchman-who-changed-literature-giant-france},
+ entrysubtype = {magazine}}
+
+@article{Glatter:wx,
+ author = {Hayley Glatter and Emily DeRuy and Alia Wong},
+ title = {Reimagining the Modern Classroom},
+ date = {2016-09-02},
+ journal = {The Atlantic},
+ url = {www.theatlantic.com/education/archive/2016/09/reimagining-the-modern-classroom/498224/},
+ entrysubtype = {newspaper},
+ addendum = {Educational Eden: Imagining the Ideal School System}}
+
+@article{Goldman:2010uv,
+ author = {Anne Goldman},
+ title = {Questions of Transport},
+ subtitle = {Reading Primo Levi Reading Dante},
+ date = {2010},
+ issue = {spring},
+ journal = {The Georgia Review},
+ number = {1},
+ pages = {69--88},
+ url = {www.jstor.org/stable/41403188},
+ volume = {64}}
+
+@article{Goldman:2010wd,
+ author = {Anne Goldman},
+ title = {Questions of Transport},
+ subtitle = {Reading Primo Levi Reading Dante},
+ date = {2010},
+ issue = {spring},
+ journal = {The Georgia Review},
+ number = {1},
+ pages = {69--88},
+ url = {www.jstor.org/stable/41403188},
+ volume = {64}}
+
+@article{Grooms:tx,
+ author = {Grooms, Russell W.},
+ title = {Comment on \mkbibquote{FW: Chicago Style Citation Question} thread},
+ date = {2016-09-06T20:02:16},
+ journal = {Infolit},
+ url = {lists.ala.org/sympa/arc/infolit/2016-09/msg00005.html},
+ entrysubtype = {comment}}
+
+@article{Haughney:ty,
+ author = {Christine Haughney},
+ title = {Women Unafraid of Condo Commitment},
+ date = {2006-12-10},
+ chapter = {11},
+ journal = {The New York Times},
+ pages = {1+},
+ version = {late ed.},
+ entrysubtype = {newspaper}}
+
+@article{Hayes:vy,
+ author = {Terrence Hayes},
+ title = {The Wicked Candor of Wanda Coleman},
+ date = {2020-06-12},
+ journal = {The Paris Review},
+ url = {www.theparisreview.org/blog/2020/06/12/the-wicked-candor-of-wanda-coleman/},
+ entrysubtype = {blog},
+ addendum = {The Daily}}
+
+@article{Helmling:2006ug,
+ author = {Steven Helmling},
+ title = {A Martyr to Happiness},
+ subtitle = {Why Adorno Matters},
+ date = {2006},
+ journal = {Kenyon Review},
+ number = {4},
+ pages = {156--172},
+ series = {newseries},
+ volume = {28}}
+
+@article{Kafka:2007tm,
+ author = {Ben Kafka},
+ title = {The Demon of Writing},
+ subtitle = {Paperwork, Public Safety, and the Reign of Terror},
+ date = {2007},
+ journal = {Representations},
+ number = {98},
+ pages = {1--24}}
+
+@article{Karasik:vt,
+ author = {Karasik, Paul},
+ title = {Cartoon},
+ date = {2008-04-14},
+ journal = {The New Yorker},
+ pages = {49},
+ entrysubtype = {untitled}}
+
+@article{Litvak:2006vi,
+ author = {Lily Litvak},
+ title = {La buena nueva},
+ subtitle = {Cultura y prensa anarquista (1880--1913)},
+ date = {2006},
+ journal = {Revista de occidente},
+ pages = {5--18},
+ volume = {304}}
+
+@article{Magra:ws,
+ author = {Iliana Magra and Andrea Zaratemay},
+ title = {Hikers' Love of a Rarity in the Andes Takes a Toll},
+ date = {2018-05-03},
+ journal = {The New York Times},
+ pages = {p. A7},
+ entrysubtype = {newspaper}}
+
+@article{Malone:vp,
+ author = {Ruth Malone},
+ title = {Bonds That Bind},
+ journal = {East Bay Express},
+ origdate = {2013-04-24},
+ url = {www.eastbayexpress.com/oakland/letters-for-the-week-of-april-24-30-2012/Content?oid=3530171}}
+
+@article{Max:the:Pen:ve,
+ author = {{Max the Pen}},
+ title = {Comment on \mkbibquote{Why They're Wrong}},
+ date = {2016-09-29T18:06:00},
+ journal = {The Economist},
+ url = {www.economist.com/node/21707926/comments},
+ entrysubtype = {comment},
+ options = {dateusetime=true}}
+
+@article{MLA:Ad:Hoc:2007tc,
+ author = {{MLA Ad Hoc Committee on Foreign Languages}},
+ title = {Foreign Languages and Higher Education},
+ subtitle = {New Structures for a Changed World},
+ date = {2007},
+ journal = {Profession},
+ pages = {234--245}}
+
+@article{Nguyen:un,
+ author = {Nguyen, Viet Thanh},
+ title = {Viet Thanh Nguyen},
+ subtitle = {By the Book},
+ date = {2017-01-30},
+ journal = {The New York Times},
+ url = {www.nytimes.com/2017/01/30/books/review/viet-thanh-nguyen-by-the-book.html},
+ addendum = {Interview}}
+
+@article{Parker:Pope:aa,
+ author = {Parker-Pope, Tara},
+ title = {How to Age Well},
+ date = {2017-11-02},
+ journal = {The New York Times},
+ url = {www.nytimes.com/guides/well/how-to-age-well},
+ entrysubtype = {newspaper}}
+
+@article{Parker:Pope:wm,
+ author = {Tara Parker-Pope},
+ title = {How to Age Well},
+ date = {2017-11-02},
+ journal = {The New York Times},
+ url = {www.nytimes.com/guides/well/how-to-age-well},
+ entrysubtype = {newspaper}}
+
+@article{Perrier:vv,
+ author = {Perrier, Jean-Louis},
+ title = {La vie artistique de Budapest perturb{\'e}e par la loi du march{\'e}},
+ date = {1997-02-26},
+ journal = {Le monde},
+ pages = {28},
+ entrysubtype = {newspaper}}
+
+@article{Riis:2017vi,
+ author = {Riis, Jacob},
+ title = {Huddled Masses},
+ date = {2017},
+ issue = {winter},
+ journal = {Lapham's Quarterly},
+ number = {1},
+ origdate = {1890},
+ url = {www.laphamsquarterly.org/home/huddled-masses},
+ volume = {10},
+ entrysubtype = {magazine}}
+
+@article{Scholes:2005uk,
+ author = {Robert Scholes},
+ title = {Presidential Address 2004},
+ subtitle = {The Humanities in a Posthumanist World},
+ date = {2005-05},
+ journal = {PMLA},
+ number = {3},
+ pages = {724-733},
+ volume = {120}}
+
+@article{Sharpe:wa,
+ author = {Rochelle Sharpe},
+ title = {Those Hidden Fees},
+ date = {2016-11-06},
+ journal = {The New York Times Education Life},
+ pages = {18--19},
+ entrysubtype = {newspaper}}
+
+@article{Soloski:wi,
+ author = {Soloski, Alexis},
+ title = {The Time Has Come to Play Othello},
+ date = {2016-11-20},
+ chapter = {Arts and Leisure},
+ journal = {The New York Times},
+ pages = {5},
+ entrysubtype = {newspaper}}
+
+@article{Tibullus:2002ub,
+ author = {Tibullus},
+ title = {How to Be Tibullus},
+ date = {2002/2003},
+ journal = {Chicago Review},
+ number = {4},
+ pages = {102--106},
+ translator = {David Wray},
+ volume = {48}}
+
+@article{Tribble:tc,
+ author = {Ivan Tribble},
+ title = {Bloggers Need Not Apply},
+ date = {2005-07-08},
+ journal = {The Chronicle of Higher Education},
+ url = {chronicle.com/article/Bloggers-Need-Not-Apply/45022},
+ entrysubtype = {newspaper}}
+
+@article{Trudeau:tx,
+ author = {Trudeau, Garry},
+ title = {Doonesbury},
+ date = {2002-05-04},
+ journal = {The Star-Ledger},
+ location = {Newark},
+ pages = {26},
+ entrysubtype = {newspaper}}
+
+@artwork{Bearden:aa,
+ author = {Bearden, Romare},
+ title = {The Train},
+ date = {1975},
+ eprinttype = {MOMA},
+ url = {www.moma.org/collection/works/65232?locale=en}}
+
+@artwork{Bearden:vp,
+ author = {Bearden, Romare},
+ title = {The Train},
+ date = {1975},
+ institution = {Museum of Modern Art},
+ location = {New York City}}
+
+@artwork{Cameron:wo,
+ author = {Cameron, Julia Margaret},
+ title = {Alfred, Lord Tennyson},
+ date = {1866},
+ institution = {Metropolitan Museum of Art},
+ location = {New York City}}
+
+@artwork{Cave:wf,
+ author = {Nick Cave},
+ title = {Until},
+ date = {2016-10-15/2017-09-04},
+ institution = {Mass MOCA},
+ location = {North Adams}}
+
+@artwork{JarWithSerpent:xv,
+ title = {Jar with feathered serpent design},
+ institution = {National Museum of the American Indian},
+ location = {New York City},
+ entrysubtype = {untitled}}
+
+@artwork{Mackintosh:wj,
+ author = {Mackintosh, Charles Rennie},
+ title = {Chair of stained oak},
+ date = {1897/1900},
+ institution = {{Victoria and Albert Museum}},
+ location = {London},
+ entrysubtype = {untitled}}
+
+@artwork{Monet:ug,
+ author = {Monet, Claude},
+ title = {Bridge over a Pond of Water Lilies},
+ date = {1899},
+ addendum = {Introduction to the History of Art, taught by Jane Ford, 4 Apr. 2016, Bates College. Slide 2.}}
+
+@artwork{Rodin:uj,
+ author = {Rodin, Auguste},
+ title = {Christ and Mary Magdalene},
+ date = {1908},
+ institution = {J. Paul Getty Museum},
+ location = {Los Angeles},
+ addendum = {Marble sculpture}}
+
+@artwork{Silver:tj,
+ author = {Silver, Walter},
+ title = {Factory},
+ date = {1986},
+ eprinttype = {New York Public Library Digital Collections},
+ url = {digitalcollections.nypl.org/items/51fd9310-ea71-0131-8221-58d385a7bbd0}}
+
+@artwork{textJarSerpent:tm,
+ title = {Wall text for jar with feathered serpent design},
+ institution = {National Museum of the American Indian},
+ location = {New York City},
+ entrysubtype = {untitled}}
+
+@artwork{textWarrior:2016wb,
+ title = {Wall text for \mkbibemph{A Warrior's Story, Honoring Grandpa Blue Bird}, by Lauren Good Day Giago},
+ eventdate = {2016-03-12/2016-12-04},
+ eventtitle = {Unbound: Narrative Art of the Plains},
+ institution = {National Museum of the American Indian},
+ location = {New York City},
+ entrysubtype = {untitled}}
+
+@artwork{Unbound:wy,
+ title = {Unbound},
+ subtitle = {Narrative Art of the Plains},
+ date = {2016-03-12/2016-12-04},
+ institution = {National Museum of the American Indian},
+ location = {New York City}}
+
+@audio{Chaucer:uf,
+ author = {Geoffrey Chaucer},
+ title = {The Former Age},
+ eprinttype = {Baragona's Literary Resources},
+ namea = {Susan Yager},
+ nameatype = {narrator},
+ url = {alanbaragona.wordpress.com/the-criyng-and-the-soun/the-former-age/},
+ urldate = {2017-03-08},
+ addendum = {MP3 format}}
+
+@audio{Li:ty,
+ author = {Li, Yiyun},
+ title = {On the Street Where You Live},
+ editor = {Deborah Treisman},
+ date = {2017-01-03},
+ booktitle = {The Writer's Voice},
+ booksubtitle = {Fiction from the Magazine},
+ editortype = {host},
+ eprinttype = {The New Yorker},
+ namea = {Li, Yiyun},
+ nameatype = {narrator},
+ url = {www.newyorker.com/podcast/the-authors-voice/yiyun-li-reads-on-the-street-where-you-live},
+ options = {uniquenamea=true}}
+
+@audio{PoeMusic:wi,
+ title = {The Music of Edgar Allan Poe--Inspired Films on his 197th Birthday},
+ publisher = {WFMU},
+ date = {2016-01-19},
+ booktitle = {Morricone Island},
+ namea = {Devon E. Levins},
+ nameatype = {host}}
+
+@audio{YiyunLiReads:ub,
+ title = {Yiyun Li Reads \mkbibquote{On the Street Where You Live}},
+ publisher = {\mkbibemph{The New Yorker} and WNYC},
+ date = {2017-01-03},
+ booktitle = {The Writer's Voice: New Fiction from \mkbibemph{The New Yorker}},
+ edition = {podcast edition},
+ namea = {Deborah Treisman},
+ nameatype = {host},
+ addendum = {iTunes app}}
+
+@book{Adirondacks:1990tb,
+ title = {The Adirondack Park in the Twenty-First Century},
+ publisher = {Commission on the Adirondacks in the Twenty-First Century},
+ date = {1990},
+ location = {New York State},
+ options = {showlocation=true}}
+
+@book{Baron:etal:2007tj,
+ title = {Agent of Change},
+ subtitle = {Print Culture Studies after Elizabeth L. Eisenstein},
+ editor = {Sabrina Baron and Eric Lindquist and Eleanor Shevlin and Sabrina Alcorn Baron and Eric N. Lindquist and Eleanor F. Shevlin},
+ publisher = {University of Massachusetts Press and {Library of Congress, Center for the Book}},
+ date = {2007}}
+
+@book{Bauch:tb,
+ author = {Nicholas Bauch},
+ title = {Enchanting the Desert},
+ subtitle = {A Pattern Language for the Production of Space},
+ publisher = {Stanford University Press},
+ date = {2016},
+ url = {www.enchantingthedesert.com/home/}}
+
+@book{Bauer:1971ui,
+ author = {Bauer, Johann},
+ title = {Kafka und Prag},
+ publisher = {Belser},
+ date = {1971?},
+ options = {datebrackets=true}}
+
+@book{Bauer:ui,
+ author = {Johann Bauer},
+ title = {Kafka und Prag},
+ publisher = {Belser}}
+
+@book{Beowulf:2004th,
+ title = {Beowulf},
+ editor = {Sarah Anderson},
+ publisher = {Pearson},
+ date = {2004},
+ translator = {Alan Sullivan and Timothy Murphy},
+ options = {useeditor=false}}
+
+@book{Caro:2012wy,
+ author = {Caro, Robert A.},
+ title = {The Passage of Power},
+ publisher = {Vintage Books},
+ date = {2012},
+ maintitle = {The Years of Lyndon Johnson},
+ volume = {4}}
+
+@book{Carroll:2006tm,
+ author = {Lewis Carroll},
+ title = {\mkbibemph{Alice's Adventures in Wonderland} and \mkbibemph{Through the Looking-Glass}},
+ editor = {John Tenniel},
+ publisher = {Bantam Books},
+ date = {2006},
+ editortype = {Illustrated by}}
+
+@book{Charon:2017tw,
+ author = {Rita Charon and Sayantani DasGupta and Nellie Hermann and Craig Irvine and Eric R. Marcus and Edgar Rivera Colsn and Danielle Spencer and Maura Spiegel},
+ title = {The Principles and Practice of Narrative Medicine},
+ publisher = {Oxford University Press},
+ date = {2017}}
+
+@book{Chreiteh:2009aa,
+ author = {Alexandra Chreiteh},
+ title = {\textarabic{الروسية} \textarabic{وأمه} \textarabic{علي}},
+ publisher = {Al-D{\=a}r al-ʻArab{\=\i}yah lil-ʻUl{\=u}m N{\=a}shir{\=u}n},
+ date = {2009},
+ nameaddon = {Shuraytih., Aliksandr{\=a}},
+ titleaddon = {\mkbibbrackets{\mkbibemph{ʻAl{\=\i} wa-ummuhu al-R{\=u}s{\=\i}yah; Ali and His Russian Mother}}}}
+
+@book{Clyne:2012td,
+ author = {Clyne, Anna},
+ title = {Night Ferry},
+ publisher = {{Boosey and Hawkes}},
+ date = {2012}}
+
+@book{Davis:1998we,
+ author = {Davis, Angela Y},
+ title = {Blues Legacies and Black Feminism},
+ subtitle = {Gertrude ``Ma'' Rainey, Bessie Smith, and Billie Holiday},
+ publisher = {Pantheon},
+ date = {1998}}
+
+@book{Dorris:1999wo,
+ author = {Michael Dorris and Louise Erdrich},
+ title = {The Crown of Columbus},
+ publisher = {HarperCollins Publishers},
+ date = {1999}}
+
+@book{Dostoevsky:1993wh,
+ author = {Fyodor Dostoevsky},
+ title = {Crime and Punishment},
+ publisher = {Vintage Books},
+ date = {1993},
+ edition = {\autocap{e}-book edition},
+ translator = {Richard Pevear and Larissa Volokhonsky},
+ options = {usetranslator=true,useauthor=false}}
+
+@book{DRABible:1899wf,
+ title = {The Bible},
+ date = {1899},
+ edition = {Douay-Rheims American edition},
+ eprinttype = {Bible Gateway},
+ url = {www.biblegateway.com},
+ urldate = {2017-01-13}}
+
+@book{Dunbar:2004tv,
+ author = {William Dunbar},
+ title = {The Complete Works},
+ editor = {John Conlee},
+ publisher = {Medieval Institute Publications},
+ date = {2004},
+ eprinttype = {TEAMS Middle English Texts\mkbibemph{, U of Rochester}},
+ url = {d.lib.rochester.edu/teams/publication/conlee-dunbar-complete-works}}
+
+@book{Fallani:1971vv,
+ author = {Giovanni Fallani},
+ title = {Dante e la cultura figurativa medievale},
+ publisher = {Minerva Italica},
+ date = {1971}}
+
+@book{Freud:2005wb,
+ author = {Sigmund Freud},
+ title = {Civilization and Its Discontents},
+ editor = {James Strachey},
+ publisher = {W. W. Norton},
+ date = {2005},
+ translator = {James Strachey}}
+
+@book{frye91aa,
+ author = {Northrop Frye},
+ title = {The Double Vision},
+ subtitle = {Language and Meaning in Religion},
+ publisher = {U of Toronto P},
+ date = {1991},
+ booktitle = {The Double Vision},
+ location = {Toronto},
+ shorttitle = {Double Vision},
+ sorttitle = {Double Vision}}
+
+@book{Gikandi:2000vz,
+ author = {Simon Gikandi},
+ title = {Ngugi wa Thiong'o},
+ publisher = {Cambridge UP},
+ date = {2000},
+ eprinttype = {ACLS Humanities E-Book},
+ url = {hdl.handle.net/2027/heb.07588.0001.001}}
+
+@book{Goethe:1875vw,
+ author = {Goethe, Johann Wolfgang von},
+ title = {Conversations of Goethe with Eckermann and Soret},
+ date = {1875},
+ edition = {new edition},
+ location = {London},
+ translator = {John Oxenford},
+ options = {showlocation=true}}
+
+@book{Handbook:2021aa,
+ title = {MLA Handbook},
+ publisher = {Modern Language Association of America},
+ date = {2021},
+ edition = {9th edition, e-book edition}}
+
+@book{Hocking:2010tz,
+ author = {Hocking, Amanda},
+ title = {Fate},
+ date = {2010}}
+
+@book{Howells:1968wo,
+ author = {Howells, W. D.},
+ title = {Their Wedding Journey},
+ editor = {John K. Reeves},
+ publisher = {Indiana University Press},
+ date = {1968},
+ editora = {Edwin H. Cady},
+ editoratype = {generaleditor},
+ eventdate = {1968/1983},
+ maintitle = {A Selected Edition of W. D. Howells},
+ volume = {5},
+ entrysubtype = {newspaper},
+ options = {containerized=true}}
+
+@book{KJVBible:1998wf,
+ title = {The Bible},
+ publisher = {Oxford University Press},
+ date = {1998},
+ edition = {Authorized King James Version}}
+
+@book{LazarillodeTormes:1554vl,
+ title = {Lazarillo de Tormes},
+ date = {1554},
+ location = {Medina del Campo},
+ options = {showlocation=true}}
+
+@book{Lee:2014aa,
+ author = {Harper Lee},
+ title = {To Kill a Mockingbird},
+ editor = {Sissy Spacek},
+ publisher = {HarperAudio},
+ date = {2014-07-08},
+ edition = {audiobook edition, unabridged edition},
+ editortype = {narrator}}
+
+@book{Lee:2014vk,
+ author = {Harper Lee},
+ title = {To Kill a Mockingbird},
+ editor = {Sissy Spacek},
+ publisher = {HarperAudio},
+ date = {2014},
+ edition = {audiobook edition, unabridged edition},
+ editortype = {narrator}}
+
+@book{London:1990tn,
+ author = {Jack London},
+ title = {Call of the Wild},
+ publisher = {Dover},
+ date = {1990},
+ origdate = {1903}}
+
+@book{Milkis:1994vv,
+ author = {Sidney M. Milkis and Michael Nelson},
+ title = {The American Presidency},
+ subtitle = {Origins and Development, 1776--1993},
+ publisher = {CQ P{}ress},
+ date = {1994},
+ edition = {2}}
+
+@book{Miller:2016vg,
+ author = {Daniel Miller and Elisabetta Costa and Nell Haynes and Tom McDonald and Razvan Nicolescu and Jolynna Sinanan and Juliano Spyer and Shriram Venkatraman and Xinyuan Wang},
+ title = {How the World Changed Social Media},
+ publisher = {UCL P{}ress},
+ date = {2016},
+ doi = {10.2307/j.ctt1g69z35}}
+
+@book{Milton:1998ty,
+ author = {John Milton},
+ title = {The Riverside Milton},
+ editor = {Roy Flannagan},
+ publisher = {Houghton Mifflin},
+ date = {1998}}
+
+@book{morrison02aa,
+ author = {Toni Morrison},
+ title = {Sula},
+ publisher = {Plume-Penguin},
+ date = {2002},
+ booktitle = {Sula},
+ location = {New York},
+ origdate = {1973}}
+
+@book{Neruda:1991wq,
+ author = {Pablo Neruda},
+ title = {Canto general},
+ publisher = {University of California Press},
+ date = {1991},
+ number = {7},
+ series = {Latin American Literature and Culture},
+ translator = {Jack Schmitt}}
+
+@book{NJBible:1985va,
+ title = {The New Jerusalem Bible},
+ editor = {Henry Wansbrough},
+ publisher = {Doubleday},
+ date = {1985},
+ editortype = {generaleditor},
+ options = {useeditor=false}}
+
+@book{Oakes:2004wa,
+ author = {Meredith Oakes},
+ title = {The Tempest},
+ subtitle = {An Opera in Three Acts},
+ editor = {Thomas Ad{\`e}s},
+ publisher = {Faber Music},
+ date = {2004},
+ authortype = {librettist},
+ editortype = {composer}}
+
+@book{OConnor:2009un,
+ author = {Patricia O'Connor},
+ title = {Woe Is I},
+ subtitle = {The Grammarphobe's Guide to Better English in Plain English},
+ publisher = {Riverhead Books},
+ date = {2009},
+ edition = {\autocap{e}-book edition}}
+
+@book{Prado:2018vb,
+ title = {Mexican Literature in Theory},
+ editor = {S{\'a}nchez Prado, Ignacio M.},
+ publisher = {Bloomsbury Academic},
+ date = {2018}}
+
+@book{Quran:2015uz,
+ title = {The Qu'ran},
+ publisher = {Oxford University Press},
+ date = {2015},
+ translator = {M. A. S. Abdel Haleem}}
+
+@book{Rampersad:2002va,
+ author = {Arnold Rampersad},
+ title = {The Life of Langston Hughes},
+ publisher = {Oxford University Press},
+ date = {2002},
+ edition = {2},
+ volumes = {2}}
+
+@book{Shen:Fu:2011vw,
+ author = {{Shen Fu}},
+ title = {Six Records of a Life Adrift},
+ publisher = {Hackett Publishing},
+ date = {2011},
+ translator = {Graham Sanders}}
+
+@book{Stendhal:2002ty,
+ author = {Stendhal},
+ title = {The Red and the Black},
+ publisher = {Penguin Books},
+ date = {2002},
+ translator = {Roger Gard}}
+
+@book{Tomlinson:2002tc,
+ title = {Goya},
+ subtitle = {Images of Women},
+ editor = {Tomlinson, Janis A.},
+ publisher = {National Gallery of Art and Yale University Press},
+ date = {2002}}
+
+@book{United:Nations:1991vc,
+ author = {{United Nations}},
+ title = {Consequences of Rapid Population Growth in Developing Countries},
+ publisher = {{Taylor and Francis}},
+ date = {1991}}
+
+@book{Waid:2005up,
+ author = {Marc Waid},
+ title = {Superman},
+ subtitle = {Birthright},
+ publisher = {DC Comics},
+ date = {2005},
+ editora = {Leinil Francis Yu},
+ editoratype = {illustrated by},
+ editorb = {Gerry Alanguilan},
+ editorbtype = {inked by},
+ editorc = {Dave McCaig},
+ editorctype = {colored by},
+ options = {useauthor=false,useeditor=false}}
+
+@book{Wellek:1992ws,
+ author = {Ren{\'e} Wellek},
+ title = {A History of Modern Criticism, 1750--1950},
+ publisher = {Yale University Press},
+ date = {1992},
+ volume = {8}}
+
+@book{Wollstonecraft:2009uf,
+ author = {Mary Wollstonecraft},
+ title = {A Vindication of the Rights of Woman},
+ editor = {Deidre Shauna Lynch},
+ publisher = {W. W. Norton},
+ date = {2009},
+ edition = {Norton Critical Edition, 3rd edition}}
+
+@booklet{JapaneseFundamentals:wy,
+ title = {Japanese Fundamentals},
+ publisher = {Barron},
+ date = {1992},
+ addendum = {Chart}}
+
+@booklet{Language:vu,
+ title = {Language Study in the Age of Globalization},
+ subtitle = {The College-Level Experience},
+ publisher = {Modern Language Association of America},
+ addendum = {Pamphlet}}
+
+@booklet{Michigan:wk,
+ title = {Michigan},
+ publisher = {Rand},
+ date = {2000},
+ addendum = {Map}}
+
+@booklet{WashingtonDC:2000ti,
+ title = {Washington, DC},
+ publisher = {Trip Builder},
+ date = {2000},
+ addendum = {Brochure}}
+
+@collection{Bacon:2016aa,
+ author = {Bacon, Francis},
+ editor = {David Sylvester},
+ publisher = {{Thames and Hudson}},
+ date = {2016},
+ booktitle = {Interviews with Francis Bacon},
+ editortype = {conductor}}
+
+@collection{frye57ab,
+ title = {Sound and Poetry},
+ editor = {Northrop Frye},
+ publisher = {Columbia UP},
+ date = {1957},
+ booktitle = {Sound and Poetry},
+ location = {New York}}
+
+@dataset{Moskowitz:2021uw,
+ author = {Daniel J. Moskowitz},
+ title = {Local News, Information, and the Nationalization of U.S. Elections},
+ date = {2021-02},
+ doi = {10.1017/S0003055420000829},
+ eprinttype = {Cambridge Core},
+ journal = {American Political Science Review},
+ number = {1},
+ pages = {114--129},
+ volume = {115},
+ addendum = {Moskowitz supplementary material}}
+
+@dataset{ReplicationNonDemocratic:ws,
+ title = {Replication Data for: \mkbibquote{The Non-Democratic Roots of Mass Education: Evidence from 200 Years.}},
+ doi = {10.7910/DVN/X2VJJX},
+ eprinttype = {Harvard Dataverse}}
+
+@image{Sheldon:tr,
+ author = {Natasha Sheldon},
+ title = {Photograph of \mkbibemph{The Muleteer}},
+ related = {sheldon2014}}
+
+@inbook{Velazquez:2016ud,
+ author = {Diego Vel{\'a}zquez},
+ title = {An Old Woman Cooking Eggs},
+ publisher = {Scribner},
+ date = {2016},
+ bookauthor = {Laura Cumming},
+ booktitle = {The Vanishing Vel{\'a}zquez},
+ booksubtitle = {A Nineteenth-Century Bookseller's Obsession with a Lost Masterpiece},
+ institution = {Scottish National Gallery},
+ origdate = {1618~},
+ pages = {27},
+ entrysubtype = {artwork}}
+
+@inbook{WesternBoundaries:vc,
+ author = {Earl E. Fitz},
+ title = {Western Boundaries of Brazil, 1600, 1780, and the Present},
+ publisher = {Modern Language Association of America},
+ date = {2005},
+ booktitle = {Brazilian Narrative Traditions in a Comparative Context},
+ pages = {43},
+ options = {useauthor=false}}
+
+@incollection{Beyonce:2013ta,
+ author = {Beyonc{\'e}},
+ title = {Pretty Hurts},
+ publisher = {Parkwood Entertainment},
+ date = {2013},
+ maintitle = {Beyonc{\'e}},
+ url = {www.beyonce.com/album/beyonce/?media_view=songs},
+ addendum = {Transcript of lyrics}}
+
+@incollection{Clapton:1990va,
+ author = {Eric Clapton},
+ title = {Discovering Robert Johnson},
+ publisher = {Columbia},
+ date = {1990},
+ booktitle = {Robert Johnson},
+ booksubtitle = {The Complete Recordings},
+ pages = {22--23},
+ addendum = {Booklet accompanying CD}}
+
+@incollection{Dewar:2007wn,
+ author = {James A. Dewar and Peng Hwa Ang},
+ title = {The Cultural Consequences of Printing and the Internet},
+ editor = {Sabrina Alcorn Baron and Eric N. Lindquist and Eleanor F. Shevlin},
+ publisher = {University of Massachusetts Press and {Library of Congress, Center for the Book}},
+ date = {2007},
+ booktitle = {Agent of Change},
+ booksubtitle = {Print Culture Studies after Elizabeth L. Eisenstein},
+ pages = {365--377}}
+
+@incollection{Dickinson:1999uv,
+ author = {Dickinson, Emily},
+ title = {I heard a Fly buzz---when I died---},
+ editor = {R. W. Franklin},
+ publisher = {Harvard University Press},
+ date = {1999},
+ booktitle = {The Poems of Emily Dickinson},
+ pages = {265-266}}
+
+@incollection{Euripides:1998tx,
+ author = {Euripides},
+ title = {The Trojan Women},
+ publisher = {New American Library},
+ date = {1998},
+ booktitle = {Ten Plays},
+ pages = {457--512},
+ translator = {Paul Roche},
+ entrysubtype = {play}}
+
+@incollection{Fagih:2003uj,
+ author = {Fagih, Ahmed Ibrahim al-},
+ title = {The Singing of the Stars},
+ editor = {Salma Khadra Jayyusi},
+ publisher = {Interlink Books},
+ date = {2003},
+ booktitle = {Short Arabic Plays},
+ booksubtitle = {An Anthology},
+ pages = {140--157},
+ translator = {Leila El Khalidi and Christopher Tingley},
+ entrysubtype = {play},
+ options = {uniquetranslator=true}}
+
+@incollection{Franklin:1992vl,
+ author = {Benjamin Franklin},
+ title = {Emigration to America},
+ editor = {Christopher Ricks and William L. Vance},
+ publisher = {{Faber and Faber}},
+ date = {1992},
+ booktitle = {The Faber Book of America},
+ origdate = {1782},
+ pages = {24--26}}
+
+@incollection{Hopi:1986wu,
+ title = {A Witchcraft Story},
+ editor = {Mando Sevillano},
+ publisher = {Northland},
+ date = {1986},
+ booktitle = {The Hopi Way},
+ booksubtitle = {Tales from a Vanishing Culture},
+ editortype = {compiler},
+ pages = {33--42},
+ sorttitle = {Witchcraft Story},
+ options = {useeditor=false}}
+
+@incollection{Jackson:uh,
+ author = {Shirley Jackson},
+ title = {The Lottery},
+ note = {Course pack for English 285: American Short Story Writers, compiled by Anne Smith, spring 2015, Iowa State U}}
+
+@incollection{Jespersen:wd,
+ author = {T. Christine Jespersen and David J. Plante},
+ title = {Critical Globalization and Political Economy in \mkbibemph{Tropic of Orange}},
+ editor = {Ruth Y. Hsu and Pamela Thoma},
+ publisher = {Modern Language Association of America},
+ booktitle = {Approaches to Teaching the Works of Karen Tei Yamashita},
+ pages = {forthcoming}}
+
+@incollection{Johnson:2014ty,
+ author = {Johnson, Barbara},
+ title = {My Monster / My Self},
+ editor = {Melissa Feuerstein and Bill Johnson Gonz{\'a}lez and Lili Porten and Keja L. Valens},
+ publisher = {Duke UP},
+ date = {2014},
+ booktitle = {The Barbara Johnson Reader},
+ booksubtitle = {The Surprise of Otherness},
+ pages = {179--190},
+ addendum = {Originally published in \mkbibemph{Diacritics}, 1982}}
+
+@incollection{Marvell:1979tp,
+ author = {Marvell, Andrew},
+ title = {The Mower's Song},
+ editor = {M. H. Abrams},
+ publisher = {W. W. Norton},
+ date = {1979},
+ booktitle = {The Norton Anthology of English Literature},
+ edition = {4},
+ editortype = {generaleditor},
+ pages = {1368},
+ volume = {1}}
+
+@incollection{Poe:1902aa,
+ author = {Poe, Edgar Allan},
+ title = {The Masque of the Red Death},
+ editor = {James A. Harrison},
+ publisher = {Thomas Y. Crowell},
+ date = {1902},
+ booktitle = {The Complete Works of Edgar Allan Poe},
+ eprinttype = {HathiTrust Digital Library},
+ pages = {250--258},
+ url = {hdl.handle.net/2027/coo.31924079574368},
+ volume = {4}}
+
+@incollection{Poe:1902wd,
+ author = {Poe, Edgar Allan},
+ title = {The Masque of the Red Death},
+ editor = {James A. Harrison},
+ publisher = {Thomas Y. Crowell},
+ date = {1902},
+ booktitle = {The Complete Works of Edgar Allan Poe},
+ pages = {250--258},
+ volume = {4}}
+
+@incollection{SaroWiwa:2001wt,
+ author = {Ken Saro-Wiwa},
+ title = {English Is the Hero},
+ editor = {Holger Ehling and Claus-Peter Holste-von Mutius},
+ publisher = {Rodopi},
+ date = {2001},
+ booktitle = {No Condition Is Permanent},
+ booksubtitle = {Nigerian Writing and the Struggle for Democracy},
+ namea = {Diri I. Teilanyo},
+ nameatype = {interviewer},
+ pages = {13--19},
+ options = {uniquenamea=true}}
+
+@incollection{Toorn:2017ti,
+ author = {Toorn, Penny van and Justice, Daniel},
+ title = {Aboriginal Writing},
+ editor = {Eva-Marie Kr{\"o}ller},
+ publisher = {Cambridge UP},
+ date = {2017},
+ booktitle = {The Cambridge Companion to Canadian Literature},
+ doi = {10.1017/9781316671764.004},
+ eprinttype = {Cambridge Core},
+ location = {Cambridge},
+ pages = {26--58}}
+
+@incollection{Woolf:1976wl,
+ author = {Virginia Woolf},
+ title = {To T. S. Eliot},
+ editor = {Nigel Nicolson and Joanne Trautmann},
+ publisher = {Harvest Books and Harcourt Brace Jovanovich},
+ date = {1976},
+ booktitle = {The Letters of Virginia Woolf},
+ origdate = {1920-07-28},
+ pages = {437-438},
+ volume = {2}}
+
+@inproceedings{Werner:vh,
+ author = {Sarah Werner},
+ title = {When Is a Source Not a Source?},
+ doi = {10.17613/M6PG6F},
+ eprinttype = {CORE},
+ eventdate = {2015-11-14},
+ eventtitle = {Stanford Primary Source Symposium: The Phenomenology of the Source},
+ institution = {Stanford University}}
+
+@inreference{Botterill:2004tx,
+ author = {Botterill, Steven N.},
+ title = {Angela Da Foligno, Saint},
+ editor = {Christopher Kleinhenz and John W. Barker and Gail Geiger and Richard Lansing},
+ publisher = {Routledge},
+ date = {2004},
+ booktitle = {Medieval Italy},
+ booksubtitle = {An Encyclopedia},
+ eprint = {E2CTAgAAQBAJ},
+ eprinttype = {Google Books},
+ pages = {35--36},
+ volume = {1}}
+
+@inreference{Content:2003ug,
+ title = {Content, \mkbibemph{N}. (4)},
+ publisher = {Merriam-Webster},
+ date = {2003},
+ booktitle = {Merriam-Webster's Collegiate Dictionary},
+ edition = {11},
+ pages = {269}}
+
+@inreference{Content:2020tl,
+ title = {Content, \mkbibemph{N}. (1)},
+ date = {2020},
+ booktitle = {Merriam-Webster},
+ url = {www.merriam-webster.com/dictionary/content}}
+
+@inreference{Emoticon:2003ur,
+ title = {Emoticon, \mkbibemph{N}.},
+ publisher = {Merriam-Webster},
+ date = {2003},
+ booktitle = {Merriam-Webster's Collegiate Dictionary},
+ edition = {11},
+ pages = {408}}
+
+@inreference{Emoticon:2018ws,
+ title = {Emoticon, \mkbibemph{N}.},
+ publisher = {Oxford University Press},
+ date = {2018},
+ booktitle = {Oxford English Dictionary},
+ url = {www.oed.com/view/Entry/249618}}
+
+@inreference{Heavy:2018ty,
+ title = {Heavy, \mkbibemph{Adj.} (1) and \mkbibemph{N.}},
+ publisher = {Oxford UP},
+ date = {2018},
+ booktitle = {Oxford English Dictionary},
+ url = {www.oed.com/view/Entry/85246}}
+
+@inreference{Patanjali:1996wu,
+ title = {Patanjali},
+ editor = {Bruce Murphy},
+ publisher = {HarperCollins Publishers},
+ date = {1996},
+ booktitle = {Ben{\'e}t's Reader's Encyclopedia},
+ edition = {4},
+ pages = {782}}
+
+@letter{Apfelbaum:un,
+ author = {Apfelbaum, D. S},
+ title = {Letter to Vincent Marist},
+ date = {1946-03-11},
+ addendum = {Manuscript}}
+
+@letter{Benton:ve,
+ author = {Benton, Thomas Hart},
+ title = {Letter to Charles Fremont},
+ library = {John Charles Fremont Papers, Southwest Museum Library},
+ location = {Los Angeles},
+ origdate = {1847-06-22},
+ addendum = {Manuscript}}
+
+@letter{Murrow:vv,
+ author = {Murrow, Irena},
+ title = {Letter to the author},
+ date = {2016-04-05},
+ addendum = {Typescript}}
+
+@letter{Schlesinger:wm,
+ author = {Schlesinger, Jr, Arthur},
+ title = {Letter},
+ date = {2004-04-08},
+ journal = {The New York Review of Books},
+ pages = {84}}
+
+@misc{AdSchool:tv,
+ title = {Advertisement for \mkbibemph{School of Rock: The Musical}},
+ date = {2017-01-29},
+ note = {Times Square, New York City},
+ addendum = {Billboard}}
+
+@misc{AdUpton:vl,
+ title = {Advertisement for Upton Tea Imports},
+ date = {2018-10},
+ journal = {Smithsonian},
+ pages = {84}}
+
+@misc{Elahi:vi,
+ author = {Elahi, Nareen},
+ title = {E-mail to Standards Committee},
+ date = {2019-01-15}}
+
+@misc{Lemuelson:uu,
+ author = {Erik Lemuelson},
+ title = {Text message to the author},
+ date = {2018-05-03}}
+
+@misc{Pierson:vf,
+ author = {Collette Pierson},
+ title = {E-mail to the author},
+ date = {2019-06-01}}
+
+@misc{Salter:uc,
+ author = {Margaret Salter},
+ title = {Interview},
+ editor = {Susan Lang},
+ date = {2002-10-22},
+ editortype = {conductor}}
+
+@misc{Santiago:to,
+ author = {Robert Santiago},
+ title = {Personal communication with author},
+ date = {2017-02-11}}
+
+@misc{Sternberg:ta,
+ author = {Rachel Sternberg},
+ title = {E-mail interview with the author},
+ date = {2021-01-07}}
+
+@misc{UnitedNationsGeneralAssembly:1948uv,
+ author = {{United Nations, General Assembly}},
+ title = {Universal Declaration of Human Rights},
+ date = {1948-12-10},
+ eprinttype = {United Nations},
+ titleaddon = {Resolution 217 A},
+ url = {www.un.org/en/universal-declaration-human-rights/},
+ addendum = {PDF download}}
+
+@misc{Wexler:wj,
+ author = {Jojo Wexler},
+ title = {Telephone interview with the author},
+ date = {2019-11-03}}
+
+@misc{Zamora:ui,
+ author = {Estelle Zamora},
+ title = {E-mail to Penny Kinkaid},
+ date = {2018-05-03}}
+
+@mlasource{Benton:wd,
+ author = {Benton, Thomas Hart},
+ title = {Instruments of Power \mkbibemph{from} America Today},
+ date = {1930/1931},
+ datea = {2012},
+ locationa = {Metropolitan Museum of Art},
+ supplemental = {1930--31},
+ supplementala = {www.metmuseum.org/blogs/now-at-the-met/from-the-director/2012/benton/slideshow},
+ supplementalb = {Slide 1},
+ titlea = {The Met},
+ titletype = {complete}}
+
+@mlasource{Bible:app:2016ab,
+ title = {The Bible},
+ datea = {2016},
+ publishera = {Bible Gateway / Zondervan},
+ supplemental = {King James Version},
+ titlea = {Bible Gateway},
+ titletype = {complete},
+ versiona = {version 42},
+ versionb = {App}}
+
+@mlasource{Cahill:wq,
+ author = {Cahill, Daniel J},
+ title = {Memo to English department faculty},
+ datea = {1 June 2000},
+ publishera = {Brooklyn Technical High School, New York City},
+ titletype = {unstyled},
+ versionb = {PDF}}
+
+@mlasource{DigitalMediaTheory:uo,
+ title = {Slides 040720},
+ datea = {7 Apr. 2020},
+ locationa = {d2l.msu.edu/d2l/le/content/909183/viewContent/8746820/View},
+ publishera = {Michigan State U},
+ supplemental = {Introduction to Digital Media Theory, taught by Kathleen Fitzpatrick},
+ titlea = {D2L},
+ titletype = {part}}
+
+@mlasource{SlideLinus:wh,
+ title = {Slide of Linus, Lucy, and Snoopy},
+ supplemental = {English 204: Animals in Graphic Art, 4 Apr. 2016, Evergreen State College. Slide 2.},
+ titletype = {unstyled}}
+
+@mlasource{SocialNetworking:vj,
+ title = {Syllabus for Social Networking in the Scriptorium},
+ institution = {University of Massachusetts},
+ location = {Boston},
+ supplemental = {Taught by Alex Mueller, spring 2014, U of Massachusetts, Boston},
+ titletype = {unstyled}}
+
+@mlasource{TecartaBible:wf,
+ title = {The Bible},
+ datea = {6 Sept. 2016},
+ publishera = {Tecarta},
+ supplemental = {King James Version},
+ titlea = {Tecarta Bible},
+ titletype = {book},
+ versiona = {app version 7.10}}
+
+@movie{BladeRunner::1992tx,
+ title = {Blade Runner},
+ publisher = {Warner Bros.},
+ date = {1992},
+ namea = {Ridley Scott},
+ nameatype = {director},
+ origdate = {1982},
+ version = {director's cut}}
+
+@movie{ET:1982:vj,
+ title = {E.T. the Extra-Terrestial},
+ publisher = {Universal Studios},
+ date = {1982},
+ addendum = {Netflix app}}
+
+@movie{LikeWater:1993:og,
+ title = {Like Water for Chocolate},
+ publisher = {Miramax},
+ date = {1993},
+ namea = {Alfonso Arau},
+ nameatype = {director},
+ nameb = {Laura Esquivel},
+ namebtype = {screenplay},
+ titleaddon = {Como agua para chocolate}}
+
+@movie{OpeningNight:tf,
+ title = {Opening Night},
+ editor = {John Cassavetes},
+ publisher = {Faces Distribution},
+ date = {1977},
+ editortype = {director},
+ options = {useeditor=false}}
+
+@movie{Sairat:vz,
+ title = {Sairat},
+ editor = {Nagraj Manjule},
+ publisher = {Zee Studios and Aatpat Production},
+ date = {2016},
+ editortype = {director},
+ options = {useeditor=false}}
+
+@music{Beatles:aa,
+ author = {Beatles},
+ publisher = {EMI Records},
+ date = {1968},
+ booktitle = {The Beatles}}
+
+@music{Beethoven:ui,
+ author = {Beethoven, Ludwig van},
+ title = {Symphony No. 9 in D Minor \mkbibquote{Choral}},
+ editor = {Wilhelm Furtw{\"a}ngler},
+ publisher = {EMI},
+ date = {1998},
+ editortype = {conductor},
+ origdate = {1951-07-29},
+ entrysubtype = {album}}
+
+@music{Beyonce:ta,
+ author = {Beyonc{\'e}},
+ title = {Pretty Hurts},
+ publisher = {Parkwood Entertainment},
+ date = {2013},
+ booktitle = {Beyonc{\'e}},
+ url = {www.beyonce.com/album/beyonce/?media_view=songs}}
+
+@music{Lopez:tu,
+ author = {Jennifer Lopez},
+ title = {Vivir mi vida},
+ publisher = {Sony Music Latin},
+ date = {2017},
+ addendum = {Spotify app}}
+
+@music{Schubert:wm,
+ author = {Schubert, Franz},
+ title = {Piano Trio in E-flat Major D 929},
+ editor = {{Wiener Mozart-Trio}},
+ publisher = {Preiser Records},
+ date = {2011},
+ edition = {unabridged version},
+ editortype = {Performance by},
+ entrysubtype = {album},
+ addendum = {Vinyl LP}}
+
+@music{SigurRos:vq,
+ author = {{Sigur R{\'o}s}},
+ title = {Takk{\ldots}},
+ publisher = {Geffen Records},
+ date = {2005},
+ entrysubtype = {album}}
+
+@online{AdNewYorker:ty,
+ title = {Get the Best of \mkbibemph{The New Yorker}},
+ date = {2017-01-10},
+ journal = {The New Yorker},
+ url = {www.newyorker.com},
+ addendum = {Pop-up advertisement}}
+
+@online{Beaton:vx,
+ author = {Beaton, Kate},
+ title = {The Secret Garden},
+ maintitle = {Hark! A Vagrant},
+ url = {www.harkavagrant.com/index.php?id=350},
+ urldate = {2017-01-17}}
+
+@online{BlakeArchive:uh,
+ title = {The William Blake Archive},
+ editor = {Morris Eaves and Robert Essick and Joseph Viscomi},
+ date = {1996/2014},
+ url = {www.blakearchive.org},
+ entrysubtype = {website}}
+
+@online{Chaucer:Doth:Tweet:tx,
+ author = {{Chaucer Doth Tweet}},
+ title = {A daye wythout anachronism ys lyke Emily Dickinson wythout her lightsaber},
+ date = {2018-04-07},
+ maintitle = {Twitter},
+ nameaddon = {{@LeVostreGC}},
+ url = {twitter.com/LeVostreGC/status/982829987286827009}}
+
+@online{Folgerpedia:aa,
+ title = {Folgerpedia},
+ publisher = {Folger Shakespeare Library},
+ date = {2018-07-17},
+ sorttitle = {Folgerpedia},
+ url = {folgerpedia.folger.edu/Main_Page},
+ entrysubtype = {website}}
+
+@online{Glass:2018wx,
+ author = {Erin Rose Glass and Micah Vandegrift},
+ title = {Public Scholarship in Practice and Philosophy},
+ date = {2018},
+ doi = {10.17613/g64d-gd16},
+ eprinttype = {CORE},
+ addendum = {PDF download, draft of working paper}}
+
+@online{Lawson:tw,
+ author = {Stuart Lawson},
+ title = {Public Libraries and Knowledge Politics},
+ date = {2018-02-08},
+ eprinttype = {E-LIS},
+ url = {eprints.rclis.org/32361/}}
+
+@online{Lilly:ui,
+ author = {Lilly},
+ title = {[I]f u like dark academia there's a good chance you've seen my tumblr \#darkacademia.},
+ date = {2020},
+ maintitle = {TikTok},
+ nameaddon = {{@uvisaa}},
+ url = {www.tiktok.com/@uvisaa/video/6815708894900391173}}
+
+@online{MacLeod:wm,
+ author = {Michael MacLeod},
+ title = {Cover of \mkbibemph{Space Cat and the Kittens}, by Ruthven Todd},
+ date = {2020},
+ maintitle = {Pinterest},
+ url = {www.pinterest.com/pin/565412928193207246/},
+ entrysubtype = {untitled}}
+
+@online{Manifold:aa,
+ title = {Manifold Greatness},
+ subtitle = {The Creation and Afterlife of the King James Bible},
+ publisher = {{University of Texas, Austin, Harry Ransom Center} and {University of Oxford, Bodleian Libraries} and {Folger Shakespeare Library}},
+ date = {2016},
+ sorttitle = {Manifold Greatness},
+ url = {manifoldgreatness.org},
+ entrysubtype = {website}}
+
+@online{MemberSuccess:ws,
+ title = {Member Success Stories},
+ publisher = {Modern Language Association of America},
+ date = {2016-09-07},
+ journal = {The MLA Commons Newsletter},
+ addendum = {E-mail}}
+
+@online{Modern:Language:Association:ub,
+ author = {{Modern Language Association}},
+ title = {Business leaders say college graduates are not effectively prepared with either soft or technical skills for today's workforce. . . .},
+ date = {2020},
+ maintitle = {LinkedIn},
+ url = {www.linkedin.com/posts/modern-language-association_are-colleges-finally-going-to-start-training-activity-6683424396222193664-y29x}}
+
+@online{Ng:wg,
+ author = {Celeste Ng},
+ title = {Photo of a letter from Shirley Jackson},
+ date = {2018-01-22},
+ maintitle = {Twitter},
+ nameaddon = {{@pronounced\_ing}},
+ url = {twitter.com/pronounced_ing/status/955528799357231104},
+ entrysubtype = {untitled}}
+
+@online{PiersPEA:aa,
+ title = {\mkbibemph{Piers Plowman} Electronic Archive},
+ editor = {Robert Adams and Patricia R. Bart and John A. Burrow and Michael A. Calabrese and Eric Eliason and Hanna, Ralph, III and Katherine Heinrichs Rehyansky and Judith Jefferson and Eugene Lyman and Stephen Shepherd and M{\'\i}{\.c}e{\'a}l Vaughan},
+ publisher = {{Society for Early English and Norse Electronic Texts}},
+ date = {2018-06-07},
+ sorttitle = {Piers Plowman Electronic Archive},
+ url = {piers.chass.ncsu.edu/},
+ entrysubtype = {website},
+ options = {useeditor=false}}
+
+@online{sheldon2014,
+ author = {Natasha Sheldon},
+ title = {Human Remains in Pompeii},
+ subtitle = {The Body Casts},
+ date = {2014-03-23},
+ eprinttype = {Decoded Past},
+ url = {decodedpast.com/human-remains-pompeii-body-casts/7532/}}
+
+@online{splcJoins:ws,
+ title = {SPLC Joins National Day of Mourning},
+ date = {2020-06-04},
+ journal = {SPLC: Southern Poverty Law Center},
+ url = {www.splcenter.org/presscenter/splc-joins-national-day-mourning},
+ addendum = {Press release}}
+
+@online{TableCCCXI:vi,
+ title = {Table 311.80},
+ subtitle = {Number and Percentage Distribution of Course Enrollments in Languages Other Than English at Degree-Granting Postsecondary Institutions, by Language and Enrollment Level: Selected Years, 2002 through 2013},
+ publisher = {National Center for Education Statistics},
+ date = {2015},
+ maintitle = {Digest of Education Statistics},
+ url = {nces.ed.gov/programs/digest/d15/tables/dt15_311.80.asp}}
+
+@online{Thomas:vq,
+ author = {Thomas, Angie},
+ title = {Photo of \mkbibemph{The Hate U Give} cover},
+ date = {2018-12-04},
+ maintitle = {Instagram},
+ url = {www.instagram.com/p/Bq_PaXKgqPw/},
+ entrysubtype = {untitled}}
+
+@online{VisualizingEmancipation:uf,
+ title = {Visualizing Emancipation},
+ editor = {Scott Nesbit and Edward L. Ayers},
+ editortype = {director},
+ sorttitle = {Visualizing},
+ url = {dsl.richmond.edu/emancipation/},
+ entrysubtype = {website},
+ options = {useeditor=false}}
+
+@online{Wang:wj,
+ author = {Lijing Wang and Xue Ben and Aniruddha Adiga and Adam Sadilek and Ashish Tendulkar and Srinivasan Venkatramanan and Anil Vullikanti and Gaurav Aggarwal and Alok Talekar and Jiangzhuo Chen and Bryan Lewis and Samarth Swarup and Amol Kapoor and Milind Tambe and Madhav Marathe},
+ title = {Using Mobility Data to Understand and Forecast COVID19 Dynamics},
+ date = {2020-12-15},
+ doi = {10.1101/2020.12.13.20248129},
+ eprinttype = {MedRxiv: The Preprint Server for Health Sciences},
+ addendum = {Preprint}}
+
+@online{World:Wildlife:Fund:vz,
+ author = {{World Wildlife Fund}},
+ title = {Five Things to Know on Shark Awareness Day},
+ date = {2020-07-14},
+ maintitle = {Facebook},
+ url = {www.facebook.com/worldwildlifefund/videos/745925785979440/}}
+
+@patent{almendro:1998fg,
+ author = {Almendro, Jos{\'e} L. and Mart{\'\i}n, Jacinto and S{\'a}nchez, Alberto and Nozal, Fernando},
+ title = {Elektromagnetisches Signalhorn},
+ date = 1998,
+ langid = {german},
+ location = {countryfr and countryuk and countryde},
+ number = {EU-29702195U}}
+
+@patent{kowalik:1995qw,
+ author = {Kowalik, F. and Isard, M.},
+ title = {Estimateur d'un d{\'e}faut de fonctionnement d'un modulateur en quadrature et {\'e}tage de modulation l'utilisant},
+ date = {1995-01-11},
+ indextitle = {Estimateur d'un d{\'e}faut de fonctionnement},
+ langid = {french},
+ number = 9500261,
+ type = {patreqfr}}
+
+@patent{laufenberg:2006py,
+ author = {Laufenberg, Xaver and Eynius, Dominique and Suelzle, Helmut and Usbeck, Stephan and Spaeth, Matthias and Neuser-Hoffmann, Miriam and Myrzik, Christian and Schmid, Manfred and Nietfeld, Franz and Thiel, Alexander and Braun, Harald and Ebner, Norbert},
+ title = {Elektrische Einrichtung und Betriebsverfahren},
+ date = {2006-09-13},
+ file = {http://v3.espacenet.com/textdoc?IDX=EP1700367},
+ holder = {{Robert Bosch GmbH} and {Daimler Chrysler AG} and {Bayerische Motoren Werke AG}},
+ langid = {german},
+ number = 1700367,
+ type = {patenteu}}
+
+@patent{sorace:1997gh,
+ author = {Sorace, Ronald E. and Reinhardt, Victor S. and Vaughn, Steven A.},
+ title = {High-Speed Digital-to-{RF} Converter},
+ date = {1997-09-16},
+ holder = {{Hughes Aircraft Company}},
+ langid = {english},
+ langidopts = {variant=american},
+ number = 5668842,
+ type = {patentus}}
+
+@performance{Alys:2002un,
+ author = {Al{\"y}s, Francis},
+ title = {Cuando la fe mueve monta{\~n}as},
+ eventdate = {2002-04-11},
+ location = {Lima, Peru}}
+
+@performance{Beyonce:2016vj,
+ author = {Beyonc{\'e}},
+ title = {The Formation World Tour},
+ eventdate = {2016-05-14},
+ location = {Los Angeles},
+ venue = {Rose Bowl}}
+
+@performance{Brown:2019uj,
+ author = {Brown, Trisha},
+ title = {Foray For{\^e}t},
+ organization = {Performance by Trisha Brown Dance Company},
+ eventdate = {2019-09-28},
+ location = {Philadelphia},
+ venue = {Fairmount Park}}
+
+@performance{Lynn:2016wu,
+ author = {Lynn, Loretta},
+ title = {Concert},
+ organization = {South by Southwest},
+ eventdate = {2016-03-17},
+ location = {Austin},
+ venue = {Stubb's},
+ entrysubtype = {untitled}}
+
+@performance{Shaw:2006vz,
+ author = {Shaw, George Bernard},
+ title = {Heartbreak House},
+ editor = {Robin Lefevre},
+ organization = {Roundabout Theatre Company},
+ editortype = {director},
+ eventdate = {2006-10-11},
+ location = {New York City},
+ venue = {American Airlines Theatre}}
+
+@performance{SingMe:2019vl,
+ title = {Sing Me the Universal},
+ subtitle = {A Walt Whitman Bicentennial},
+ eventdate = {2019-03-02},
+ location = {New York City},
+ namea = {Mark Shapiro},
+ nameatype = {conductor},
+ nameb = {{Cecilia Chorus of New York}},
+ namebtype = {performer},
+ venue = {Church of Saint Francis Xavier}}
+
+@periodical{Clowes:1998wp,
+ author = {Daniel Clowes},
+ title = {Eightball},
+ publisher = {Fantagraphics},
+ date = {1998},
+ issuetitle = {David Boring},
+ number = {19}}
+
+@proceedings{Chang:2000uv,
+ editor = {Steve S. Chang and Lily Liaw and Joseph Ruppenhofer},
+ publisher = {Berkeley Linguistics Society},
+ date = {2000},
+ booktitle = {Proceedings of the Twenty-Fifth Annual Meeting of the Berkeley Linguistics Society, February 12--15, 1999},
+ booksubtitle = {General Session and Parasession on Loan Word Phenomena}}
+
+@report{ExecutiveSummary:we,
+ author = {{Executive summary}},
+ title = {Report of the Task Force on Doctoral Study in Modern Language and Literature},
+ date = {2014},
+ institution = {Modern Language Association of America},
+ url = {www.mla.org/content/download/25438/1164362/execsumtaskforcedocstudy.pdf}}
+
+@report{Powell:wl,
+ author = {Catherine Powell and Ann Mei Chang},
+ title = {Women in Tech as a Driver for Growth in Emerging Economies},
+ date = {2016-07},
+ institution = {Council on Foreign Relations Press},
+ url = {cdn.cfr.org/sites/default/files/pdf/2016/06/Discussion_Paper_Powell_Chang_Women_ICT_OR.pdf}}
+
+@report{ReadingRisk:vu,
+ title = {Reading at Risk},
+ subtitle = {A Survey of Literary Reading in America},
+ date = {2004-06},
+ institution = {National Endowment for the Arts}}
+
+@review{Racial:vh,
+ title = {Racial Stereotype Busters},
+ subtitle = {Black Scientists Who Made a Difference},
+ date = {1999},
+ journal = {Journal of Blacks in Higher Education},
+ pages = {133--34},
+ volume = {25}}
+
+@review{Rohrbaugh:aa,
+ author = {Lisa Rohrbaugh},
+ date = {2020-07-01},
+ bookauthor = {Scott O'Connor},
+ booktitle = {Zero Zone},
+ journal = {Library Journal},
+ url = {www.libraryjournal.com/?reviewDetail=zero-zone}}
+
+@review{Tommasini:tm,
+ author = {Tommasini, Anthony},
+ title = {A Feminist Look at Sophocles},
+ date = {1998-06-11},
+ journal = {The New York Times},
+ pages = {p. E5},
+ version = {late ed.},
+ entrysubtype = {newspaper}}
+
+@review{YouWill:aa,
+ date = {2016-05-05},
+ bookauthor = {Megan Abbott},
+ booktitle = {You Will Know Me},
+ journal = {Kirkus Reviews},
+ url = {www.kirkusreviews.com/book-reviews/megan-abbott/you-will-know-me/}}
+
+@software{AngryBirds:2016vs,
+ title = {Angry Birds},
+ publisher = {Rovio Entertainment},
+ date = {2016-12-10},
+ version = {7.0.0}}
+
+@software{VidaSystems:2020ua,
+ author = {VidaSystems},
+ title = {Aurora Borealis},
+ eventdate = {2020-01-03},
+ maintitle = {Google Expeditions app}}
+
+@suppbook{anon:1994ti,
+ title = {Appendix C},
+ subtitle = {Resuscitation from Apparent Death by Electric Shock},
+ publisher = {{Touch and Go Records}},
+ date = {1994},
+ bookauthor = {Shellac},
+ booktitle = {At Action Park}}
+
+@suppbook{Boyd:1992aa,
+ author = {Malcolm Boyd},
+ publisher = {Deutsche Grammophon},
+ date = {1992},
+ booktitle = {The Bach Album},
+ entrysubtype = {Booklet}}
+
+@suppbook{Felstiner:2001aa,
+ author = {John Felstiner},
+ publisher = {W. W. Norton},
+ date = {2001},
+ booktitle = {Selected Poems and Prose of Paul Celan},
+ pages = {xix--xxxvi},
+ translator = {Felstiner, John},
+ entrysubtype = {Preface}}
+
+@suppbook{Gere:2021aa,
+ author = {Gere, Anne Ruggles},
+ editor = {Diane Kelly-Riley and Norbert Elliot},
+ publisher = {Modern Language Association of America},
+ date = {2021},
+ booktitle = {Improving Outcomes},
+ booksubtitle = {Disciplinary Writing, Local Assessment, and the Aim of Fairness},
+ pages = {vii--viii},
+ entrysubtype = {Foreword}}
+
+@suppbook{Lewiston:aa,
+ author = {David Lewiston},
+ publisher = {Nonesuch},
+ booktitle = {The Balinese Gamelan},
+ booksubtitle = {Music from the Morning of the World},
+ entrysubtype = {Liner notes}}
+
+@suppbook{Race:1959aa,
+ author = {Steve Race},
+ publisher = {Columbia Records},
+ date = {1959},
+ bookauthor = {Dave Brubeck Quartet},
+ booktitle = {Time Out},
+ entrysubtype = {Liner notes}}
+
+@suppbook{Seyhan:2008wz,
+ author = {Seyhan, Azade},
+ title = {Novel Moves},
+ publisher = {Modern Language Association of America},
+ date = {2008},
+ bookauthor = {Seyhan, Azade},
+ booktitle = {Tales of Crossed Destinies},
+ booksubtitle = {The Modern Turkish Novel in a Comparative Context},
+ pages = {1--22}}
+
+@suppbook{Wallach:2000we,
+ author = {Rick Wallach},
+ title = {Cormac McCarthy's Canon as Accidental Artifact},
+ editor = {Wallach, Rick},
+ publisher = {Manchester University Press},
+ date = {2000},
+ booktitle = {Myth, Legend, Dust},
+ booksubtitle = {Critical Responses to Cormac McCarthy},
+ pages = {xiv--xvi},
+ entrysubtype = {Introduction}}
+
+@thesis{Njus:2010aa,
+ author = {Jesse Njus},
+ title = {Performing the Passion},
+ subtitle = {A Study on the Nature of Medieval Acting},
+ date = {2010},
+ eprinttype = {ProQuest},
+ school = {Northwestern University},
+ type = {phd},
+ url = {search.proquest.com/docview/305212264}}
+
+@thesis{Njus:2010vc,
+ author = {Jesse Njus},
+ title = {Performing the Passion},
+ subtitle = {A Study on the Nature of Medieval Acting},
+ date = {2010},
+ school = {Northwestern University},
+ type = {phd}}
+
+@unpublished{Atwood:1993tp,
+ author = {Margaret Atwood},
+ title = {Silencing the Scream},
+ organization = {MLA Annual Convention},
+ eventdate = {1993-12-29},
+ location = {Toronto},
+ titleaddon = {Boundaries of the Imagination Forum},
+ venue = {Royal York Hotel}}
+
+@unpublished{Auden:wg,
+ author = {W. H. Auden and Klaus Mann},
+ title = {Prospectus},
+ library = {\mkbibemph{Decision} magazine papers, Yale U Library, Manuscripts and Archives},
+ number = {MS 176, box 1, folder 20},
+ entrysubtype = {untitled}}
+
+@unpublished{Dickinson:aa,
+ author = {Dickinson, Emily},
+ title = {Distance Is Not the Realm of Fox},
+ library = {Pierpont Morgan Library},
+ location = {New York City},
+ origdate = {1870?},
+ addendum = {Manuscript}}
+
+@unpublished{Ford:2016vm,
+ author = {Jane Ford},
+ title = {Lecture},
+ eventdate = {2016-04-04},
+ note = {Introduction to the History of Art},
+ venue = {Bates College},
+ entrysubtype = {untitled}}
+
+@unpublished{Jones:vh,
+ author = {Celia Jones},
+ title = {Shakespeare's Dark Lady Illuminated},
+ date = {1988}}
+
+@unpublished{Moskowitz:wb,
+ author = {Julie Moskowitz},
+ title = {Service Learning and Online Courses},
+ date = {2017-02-20}}
+
+@video{AirCanada:us,
+ title = {Air Canada},
+ subtitle = {We're in the Business of You},
+ date = {2019-04-08},
+ maintitle = {YouTube},
+ maintitleaddon = {uploaded by Air Canada},
+ url = {www.youtube.com/watch?v=GE9AFpsg7H8}}
+
+@video{Allende:2007bw,
+ author = {Isabel Allende},
+ title = {Tales of Passion},
+ date = {2007-03},
+ maintitle = {TED},
+ url = {www.ted.com/talks/isabel_allende_tells_tales_of_passion?language=en},
+ addendum = {Transcript}}
+
+@video{Allende:2007vc,
+ author = {Isabel Allende},
+ title = {Tales of Passion},
+ date = {2007-03},
+ maintitle = {TED},
+ url = {www.ted.com/talks/isabel_allende_tells_tales_of_passion?language=en}}
+
+@video{Fleabag:2019:tq,
+ title = {Fleabag},
+ publisher = {BBC},
+ date = {2019-03-18},
+ namea = {Phoebe Waller-Bridge},
+ nameatype = {creator},
+ number = {3},
+ season = {2}}
+
+@video{Hush:1999:vg,
+ title = {Hush},
+ publisher = {Mutant Enemy and Twentieth Century Fox},
+ date = {2003},
+ maintitle = {Buffy the Vampire Slayer},
+ mainsubtitle = {The Complete Fourth Season},
+ namea = {Joss Whedon},
+ nameatype = {creator},
+ note = {disc 3},
+ number = {10},
+ origdate = {1999},
+ addendum = {DVD}}
+
+@video{Hush:1999:vi,
+ title = {Hush},
+ publisher = {Mutant Enemy and WB Television Network},
+ date = {1999-12-14},
+ maintitle = {Buffy the Vampire Slayer},
+ namea = {Joss Whedon},
+ nameatype = {creator},
+ number = {10},
+ season = {4}}
+
+@video{IBorg:1992:wz,
+ title = {I, Borg},
+ publisher = {Paramount Pictures},
+ date = {1992},
+ eprinttype = {Netflix},
+ maintitle = {Star Trek},
+ mainsubtitle = {The Next Generation},
+ number = {23},
+ season = {5},
+ url = {www.netflix.com}}
+
+@video{Jeopardy:2019:td,
+ title = {Jeopardy!},
+ publisher = {ABC},
+ date = {2019-11-07}}
+
+@video{NewNormal:2016:vi,
+ title = {New Normal},
+ publisher = {Showtime},
+ date = {2016-07-24},
+ maintitle = {Homeland},
+ namea = {Dan Attias},
+ nameatype = {director},
+ number = {10},
+ season = {5},
+ options = {uniquenamea=true},
+ addendum = {Amazon Prime Video app}}
+
+@video{SaturdayNight:2019:vu,
+ title = {Saturday Night Live},
+ publisher = {NBC},
+ date = {2019-03-30},
+ namea = {Sandra Oh},
+ nameatype = {hosted by},
+ number = {16},
+ season = {44}}
+
+@video{WhatIsMLA:2016:wq,
+ title = {What Is the MLA International Bibliography?},
+ date = {2016-10-14},
+ maintitle = {Vimeo},
+ namea = {{MLA International Bibliography}},
+ nameatype = {uploaded by},
+ url = {vimeo.com/187399565}} \ No newline at end of file
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/handbook9_messy.bib b/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/handbook9_messy.bib
new file mode 100644
index 0000000000..b5e0cac5ea
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-mla/doc/handbook9_messy.bib
@@ -0,0 +1,2249 @@
+%[[ Alaton:tc ]]
+@article{Alaton:tc,
+ author = {Alaton, Salem},
+ title = {So, Did They Live Happily Ever After?},
+ date = {1997-12-27},
+ journal = {The Globe and Mail},
+ location = {Toronto},
+ pages = {pp. D1+},
+ entrysubtype = {newspaper}}
+%[[ end ]]
+%[[ Alpert:Abrams:2016wb ]]
+@article{Alpert:Abrams:2016wb,
+ author = {Hannah Alpert-Abrams},
+ title = {Machine Reading the \mkbibemph{Primeros Libros}},
+ date = {2016},
+ journal = {Digital Humanities Quarterly},
+ number = {4},
+ url = {www.digitalhumanities.org/dhq/vol/10/4/000268/000268.html},
+ volume = {10},
+ entrysubtype = {online}}
+%[[ end ]]
+%[[ AppiahGates:1992uw ]]
+@article{AppiahGates:1992uw,
+ editor = {Appiah, Kwame Anthony and Gates, Jr., Henry Louis},
+ date = {1992},
+ issuetitle = {Identities},
+ journal = {Critical Inquiry},
+ number = {4},
+ volume = {18},
+ entrysubtype = {specissue}}
+%[[ end ]]
+%[[ Belton:2008uo ]]
+@article{Belton:2008uo,
+ author = {Belton, John},
+ title = {Painting by the Numbers},
+ subtitle = {The Digital Intermediate},
+ date = {2008},
+ issue = {spring},
+ journal = {Film Quarterly},
+ number = {3},
+ pages = {58--65},
+ volume = {61}}
+%[[ end ]]
+%[[ Bockelman:uu ]]
+@article{Bockelman:uu,
+ author = {Brian Bockelman},
+ title = {Buenos Aires \mkbibemph{Boh{\`e}me}: Argentina and the Transatlantic Bohemian Renaissance, 1890--1910},
+ date = {2016-01},
+ doi = {10.1353/mod.2016.0011},
+ eprinttype = {Project Muse},
+ journal = {Modernism/Modernity},
+ number = {1},
+ pages = {37--63},
+ volume = {23}}
+%[[ end ]]
+%[[ Boggs:2016tp ]]
+@article{Boggs:2016tp,
+ author = {Boggs, Colleen Glenney},
+ title = {Public Reading and the Civil War Draft Lottery},
+ date = {2016},
+ journal = {American Periodicals},
+ number = {2},
+ pages = {149--166},
+ volume = {26}}
+%[[ end ]]
+%[[ Chan:uj ]]
+@article{Chan:uj,
+ author = {Chan, Evans},
+ title = {Postmodernism and Hong Kong Cinema},
+ date = {2000-05},
+ doi = {10.1353/pmc.2000.0021},
+ eprinttype = {Project Muse},
+ journal = {Postmodern Culture},
+ number = {3},
+ volume = {10}}
+%[[ end ]]
+%[[ Charney:2011wk ]]
+@article{Charney:2011wk,
+ author = {Charney, Michael W},
+ title = {Literary Culture on the Burma-Manipur Frontier in the Eighteenth and Nineteenth Centuries},
+ editor = {Sumit Guha},
+ date = {2011},
+ issuetitle = {Literary Cultures at the Frontiers: Literature and Identity in the Early Modern World},
+ journal = {The Medieval History Journal},
+ number = {2},
+ pages = {159--181},
+ volume = {14},
+ entrysubtype = {specissue}}
+%[[ end ]]
+%[[ Chou:vq ]]
+@article{Chou:vq,
+ author = {Chou, Elaine Hsieh},
+ title = {Carrot Legs},
+ date = {2019-09-12},
+ journal = {Guernica},
+ url = {www.guernicamag.com/carrot-legs/},
+ entrysubtype = {magazine}}
+%[[ end ]]
+%[[ Deresiewicz:un ]]
+@article{Deresiewicz:un,
+ author = {William Deresiewicz},
+ title = {The Death of the Artist---and the Birth of the Creative Entrepreneur},
+ date = {2015-01/2015-02},
+ journal = {The Atlantic},
+ pages = {92--97},
+ entrysubtype = {magazine}}
+%[[ end ]]
+%[[ Editorial:Board:vc ]]
+@article{Editorial:Board:vc,
+ author = {{Editorial Board}},
+ title = {How to Tell Truth from Fiction in the Age of Fake News},
+ date = {2016-11-21},
+ journal = {Chicago Tribune},
+ url = {www.chicagotribune.com/news/opinion/editorials/ct-fake-news-facebook-edit-1120-md-20161118-story.html},
+ entrysubtype = {newspaper}}
+%[[ end ]]
+%[[ Erhardt:2020wl ]]
+@article{Erhardt:2020wl,
+ author = {Julian Erhardt and Steffen Wamsler and Markus Freitag},
+ title = {National Identity between Democracy and Autocracy},
+ subtitle = {A Comparative Analysis of Twenty-Four Countries},
+ date = {2020},
+ doi = {10.1017/S1755773920000351},
+ eprinttype = {Cambridge Core},
+ journal = {European Political Science Review}}
+%[[ end ]]
+%[[ Evacuation:wj ]]
+@article{Evacuation:wj,
+ title = {Evacuation Order Lifted at Nice Airport},
+ date = {2016-07-15},
+ journal = {The Boston Globe},
+ url = {www.bostonglobe.com/news/world/2016/07/15/evacuation-progress-nice-airport/KO4BytWK4wFUOxjEkSpKTN/story.html},
+ entrysubtype = {newspaper}}
+%[[ end ]]
+%[[ Fisek:te ]]
+@article{Fisek:te,
+ author = {Fi{\c s}ek, Emine},
+ title = {Palimpsests of Violence},
+ subtitle = {Urban Dispossession and Political Theatre in Istanbul},
+ journal = {Comparative Drama},
+ number = {3},
+ url = {scholarworks.wmich.edu/compdr/vol52/iss3/7},
+ volume = {52}}
+%[[ end ]]
+%[[ Fisher:vu ]]
+@article{Fisher:vu,
+ author = {Margaret Fisher},
+ title = {The Music of Ezra Pound},
+ date = {2006-04},
+ journal = {Yale University Library Gazette},
+ number = {3-4},
+ pages = {139--160},
+ eprint = {40859548},
+ eprinttype = {jstor},
+ volume = {80},
+ addendum = {PDF download}}
+%[[ end ]]
+%[[ Gergen:un ]]
+@article{Gergen:un,
+ author = {Gergen, David},
+ title = {A Question of Values},
+ date = {2002-02-11},
+ journal = {US News and World Report},
+ pages = {72},
+ addendum = {Op-ed.}}
+%[[ end ]]
+%[[ Giant:ta ]]
+@article{Giant:ta,
+ title = {Giant of France},
+ subtitle = {The Frenchman Who Changed Literature},
+ date = {2017-01-19},
+ journal = {The Economist},
+ url = {www.economist.com/news/books-and-arts/21714971-frenchman-who-changed-literature-giant-france},
+ entrysubtype = {magazine}}
+%[[ end ]]
+%[[ Glatter:wx ]]
+@article{Glatter:wx,
+ author = {Hayley Glatter and Emily DeRuy and Alia Wong},
+ title = {Reimagining the Modern Classroom},
+ date = {2016-09-02},
+ journal = {The Atlantic},
+ url = {www.theatlantic.com/education/archive/2016/09/reimagining-the-modern-classroom/498224/},
+ entrysubtype = {newspaper},
+ addendum = {Educational Eden: Imagining the Ideal School System}}
+%[[ end ]]
+%[[ Goldman:2010uv ]]
+@article{Goldman:2010uv,
+ author = {Anne Goldman},
+ title = {Questions of Transport},
+ subtitle = {Reading Primo Levi Reading Dante},
+ date = {2010},
+ issue = {spring},
+ journal = {The Georgia Review},
+ number = {1},
+ pages = {69--88},
+ url = {https://www.jstor.org/stable/41403188},
+ volume = {64}}
+%[[ end ]]
+%[[ Goldman:2010wd ]]
+@article{Goldman:2010wd,
+ author = {Anne Goldman},
+ title = {Questions of Transport},
+ subtitle = {Reading Primo Levi Reading Dante},
+ date = {2010},
+ issue = {spring},
+ journal = {The Georgia Review},
+ number = {1},
+ pages = {69--88},
+ url = {https://www.jstor.org/stable/41403188},
+ volume = {64}}
+%[[ end ]]
+%[[ Grooms:tx ]]
+@article{Grooms:tx,
+ author = {Grooms, Russell W.},
+ title = {Comment on \mkbibquote{FW: Chicago Style Citation Question} thread},
+ date = {2016-09-06T20:02:16},
+ journal = {Infolit},
+ url = {lists.ala.org/sympa/arc/infolit/2016-09/msg00005.html},
+ entrysubtype = {comment}}
+%[[ end ]]
+%[[ Haughney:ty ]]
+@article{Haughney:ty,
+ author = {Christine Haughney},
+ title = {Women Unafraid of Condo Commitment},
+ date = {2006-12-10},
+ chapter = {11},
+ journal = {The New York Times},
+ pages = {1+},
+ version = {late ed.},
+ entrysubtype = {newspaper}}
+%[[ end ]]
+%[[ Hayes:vy ]]
+@article{Hayes:vy,
+ author = {Terrence Hayes},
+ title = {The Wicked Candor of Wanda Coleman},
+ date = {2020-06-12},
+ journal = {The Paris Review},
+ url = {www.theparisreview.org/blog/2020/06/12/the-wicked-candor-of-wanda-coleman/},
+ entrysubtype = {blog},
+ addendum = {The Daily}}
+%[[ end ]]
+%[[ Helmling:2006ug ]]
+@article{Helmling:2006ug,
+ author = {Steven Helmling},
+ title = {A Martyr to Happiness},
+ subtitle = {Why Adorno Matters},
+ date = {2006},
+ journal = {Kenyon Review},
+ number = {4},
+ pages = {156--172},
+ series = {newseries},
+ volume = {28}}
+%[[ end ]]
+%[[ Kafka:2007tm ]]
+@article{Kafka:2007tm,
+ author = {Ben Kafka},
+ title = {The Demon of Writing},
+ subtitle = {Paperwork, Public Safety, and the Reign of Terror},
+ date = {2007},
+ journal = {Representations},
+ number = {98},
+ pages = {1--24}}
+%[[ end ]]
+%[[ Karasik:vt ]]
+@article{Karasik:vt,
+ author = {Karasik, Paul},
+ title = {Cartoon},
+ date = {2008-04-14},
+ journal = {The New Yorker},
+ pages = {49},
+ entrysubtype = {untitled}}
+%[[ end ]]
+%[[ Litvak:2006vi ]]
+@article{Litvak:2006vi,
+ author = {Lily Litvak},
+ title = {La buena nueva},
+ subtitle = {Cultura y prensa anarquista (1880--1913)},
+ date = {2006},
+ journal = {Revista de occidente},
+ pages = {5--18},
+ volume = {304}}
+%[[ end ]]
+%[[ Magra:ws ]]
+@article{Magra:ws,
+ author = {Iliana Magra and Andrea Zaratemay},
+ title = {Hikers' Love of a Rarity in the Andes Takes a Toll},
+ date = {2018-05-03},
+ journal = {The New York Times},
+ pages = {p. A7},
+ entrysubtype = {newspaper}}
+%[[ end ]]
+%[[ Malone:vp ]]
+@article{Malone:vp,
+ author = {Ruth Malone},
+ title = {Bonds That Bind},
+ journal = {East Bay Express},
+ origdate = {2013-04-24},
+ url = {www.eastbayexpress.com/oakland/letters-for-the-week-of-april-24-30-2012/Content?oid=3530171}}
+%[[ end ]]
+%[[ Max:the:Pen:ve ]]
+@article{Max:the:Pen:ve,
+ author = {{Max the Pen}},
+ title = {Comment on \mkbibquote{Why They're Wrong}},
+ date = {2016-09-29T18:06:00},
+ journal = {The Economist},
+ url = {www.economist.com/node/21707926/comments},
+ entrysubtype = {comment},
+ options = {dateusetime=true}}
+%[[ end ]]
+%[[ MLA:Ad:Hoc:2007tc ]]
+@article{MLA:Ad:Hoc:2007tc,
+ author = {{MLA Ad Hoc Committee on Foreign Languages}},
+ title = {Foreign Languages and Higher Education},
+ subtitle = {New Structures for a Changed World},
+ date = {2007},
+ journal = {Profession},
+ pages = {234--245}}
+%[[ end ]]
+%[[ Nguyen:un ]]
+@article{Nguyen:un,
+ author = {Nguyen, Viet Thanh},
+ title = {Viet Thanh Nguyen},
+ subtitle = {By the Book},
+ date = {2017-01-30},
+ journal = {The New York Times},
+ url = {www.nytimes.com/2017/01/30/books/review/viet-thanh-nguyen-by-the-book.html},
+ addendum = {Interview}}
+%[[ end ]]
+%[[ Parker:Pope:aa ]]
+@article{Parker:Pope:aa,
+ author = {Parker-Pope, Tara},
+ title = {How to Age Well},
+ date = {2017-11-02},
+ journal = {The New York Times},
+ url = {www.nytimes.com/guides/well/how-to-age-well},
+ entrysubtype = {newspaper}}
+%[[ end ]]
+%[[ Parker:Pope:wm ]]
+@article{Parker:Pope:wm,
+ author = {Tara Parker-Pope},
+ title = {How to Age Well},
+ date = {2017-11-02},
+ journal = {The New York Times},
+ url = {www.nytimes.com/guides/well/how-to-age-well},
+ entrysubtype = {newspaper}}
+%[[ end ]]
+%[[ Perrier:vv ]]
+@article{Perrier:vv,
+ author = {Perrier, Jean-Louis},
+ title = {La vie artistique de Budapest perturb{\'e}e par la loi du march{\'e}},
+ date = {1997-02-26},
+ journal = {Le monde},
+ pages = {28},
+ entrysubtype = {newspaper}}
+%[[ end ]]
+%[[ Riis:2017vi ]]
+@article{Riis:2017vi,
+ author = {Riis, Jacob},
+ title = {Huddled Masses},
+ date = {2017},
+ issue = {winter},
+ journal = {Lapham's Quarterly},
+ number = {1},
+ origdate = {1890},
+ url = {www.laphamsquarterly.org/home/huddled-masses},
+ volume = {10},
+ entrysubtype = {magazine}}
+%[[ end ]]
+%[[ Scholes:2005uk ]]
+@article{Scholes:2005uk,
+ author = {Robert Scholes},
+ title = {Presidential Address 2004},
+ subtitle = {The Humanities in a Posthumanist World},
+ date = {2005-05},
+ journal = {PMLA},
+ number = {3},
+ pages = {724-733},
+ volume = {120}}
+%[[ end ]]
+%[[ Sharpe:wa ]]
+@article{Sharpe:wa,
+ author = {Rochelle Sharpe},
+ title = {Those Hidden Fees},
+ date = {2016-11-06},
+ journal = {The New York Times Education Life},
+ pages = {18--19},
+ entrysubtype = {newspaper}}
+%[[ end ]]
+%[[ Soloski:wi ]]
+@article{Soloski:wi,
+ author = {Soloski, Alexis},
+ title = {The Time Has Come to Play Othello},
+ date = {2016-11-20},
+ chapter = {Arts and Leisure},
+ journal = {The New York Times},
+ pages = {5},
+ entrysubtype = {newspaper}}
+%[[ end ]]
+%[[ Tibullus:2002ub ]]
+@article{Tibullus:2002ub,
+ author = {Tibullus},
+ title = {How to Be Tibullus},
+ date = {2002/2003},
+ journal = {Chicago Review},
+ number = {4},
+ pages = {102--106},
+ translator = {David Wray},
+ volume = {48}}
+%[[ end ]]
+%[[ Tribble:tc ]]
+@article{Tribble:tc,
+ author = {Ivan Tribble},
+ title = {Bloggers Need Not Apply},
+ date = {2005-07-08},
+ journal = {The Chronicle of Higher Education},
+ url = {chronicle.com/article/Bloggers-Need-Not-Apply/45022},
+ entrysubtype = {newspaper}}
+%[[ end ]]
+%[[ Trudeau:tx ]]
+@article{Trudeau:tx,
+ author = {Trudeau, Garry},
+ title = {Doonesbury},
+ date = {2002-05-04},
+ journal = {The Star-Ledger},
+ location = {Newark},
+ pages = {26},
+ entrysubtype = {newspaper}}
+%[[ end ]]
+%[[ Bearden:aa ]]
+@artwork{Bearden:aa,
+ author = {Bearden, Romare},
+ title = {The Train},
+ date = {1975},
+ eprinttype = {MOMA},
+ url = {www.moma.org/collection/works/65232?locale=en}}
+%[[ end ]]
+%[[ Bearden:vp ]]
+@artwork{Bearden:vp,
+ author = {Bearden, Romare},
+ title = {The Train},
+ date = {1975},
+ institution = {Museum of Modern Art},
+ location = {New York City}}
+%[[ end ]]
+%[[ Cameron:wo ]]
+@artwork{Cameron:wo,
+ author = {Cameron, Julia Margaret},
+ title = {Alfred, Lord Tennyson},
+ date = {1866},
+ institution = {Metropolitan Museum of Art},
+ location = {New York City}}
+%[[ end ]]
+%[[ Cave:wf ]]
+@artwork{Cave:wf,
+ author = {Nick Cave},
+ title = {Until},
+ date = {2016-10-15/2017-09-04},
+ institution = {Mass MOCA},
+ location = {North Adams}}
+%[[ end ]]
+%[[ JarWithSerpent:xv ]]
+@artwork{JarWithSerpent:xv,
+ title = {Jar with feathered serpent design},
+ institution = {National Museum of the American Indian},
+ location = {New York City},
+ entrysubtype = {untitled}}
+%[[ end ]]
+%[[ Mackintosh:wj ]]
+@artwork{Mackintosh:wj,
+ author = {Mackintosh, Charles Rennie},
+ title = {Chair of stained oak},
+ date = {1897/1900},
+ institution = {{Victoria and Albert Museum}},
+ location = {London},
+ entrysubtype = {untitled}}
+%[[ end ]]
+%[[ Monet:ug ]]
+@artwork{Monet:ug,
+ author = {Monet, Claude},
+ title = {Bridge over a Pond of Water Lilies},
+ date = {1899},
+ addendum = {Introduction to the History of Art, taught by Jane Ford, 4 Apr. 2016, Bates College. Slide 2.}}
+%[[ end ]]
+%[[ Rodin:uj ]]
+@artwork{Rodin:uj,
+ author = {Rodin, Auguste},
+ title = {Christ and Mary Magdalene},
+ date = {1908},
+ institution = {J. Paul Getty Museum},
+ location = {Los Angeles},
+ addendum = {Marble sculpture}}
+%[[ end ]]
+%[[ Silver:tj ]]
+@artwork{Silver:tj,
+ author = {Silver, Walter},
+ title = {Factory},
+ date = {1986},
+ eprinttype = {New York Public Library Digital Collections},
+ url = {digitalcollections.nypl.org/items/51fd9310-ea71-0131-8221-58d385a7bbd0}}
+%[[ end ]]
+%[[ textJarSerpent:tm ]]
+@artwork{textJarSerpent:tm,
+ title = {Wall text for jar with feathered serpent design},
+ institution = {National Museum of the American Indian},
+ location = {New York City},
+ entrysubtype = {untitled}}
+%[[ end ]]
+%[[ textWarrior:2016wb ]]
+@artwork{textWarrior:2016wb,
+ title = {Wall text for \mkbibemph{A Warrior's Story, Honoring Grandpa Blue Bird}, by Lauren Good Day Giago},
+ eventdate = {2016-03-12/2016-12-04},
+ eventtitle = {Unbound: Narrative Art of the Plains},
+ institution = {National Museum of the American Indian},
+ location = {New York City},
+ entrysubtype = {untitled}}
+%[[ end ]]
+%[[ Unbound:wy ]]
+@artwork{Unbound:wy,
+ title = {Unbound},
+ subtitle = {Narrative Art of the Plains},
+ date = {2016-03-12/2016-12-04},
+ institution = {National Museum of the American Indian},
+ location = {New York City}}
+%[[ end ]]
+%[[ Chaucer:uf ]]
+@audio{Chaucer:uf,
+ author = {Geoffrey Chaucer},
+ title = {The Former Age},
+ eprinttype = {Baragona's Literary Resources},
+ namea = {Susan Yager},
+ nameatype = {narrator},
+ url = {alanbaragona.wordpress.com/the-criyng-and-the-soun/the-former-age/},
+ urldate = {2017-03-08},
+ addendum = {MP3 format}}
+%[[ end ]]
+%[[ Li:ty ]]
+@audio{Li:ty,
+ author = {Li, Yiyun},
+ title = {On the Street Where You Live},
+ editor = {Deborah Treisman},
+ date = {2017-01-03},
+ booktitle = {The Writer's Voice},
+ booksubtitle = {Fiction from the Magazine},
+ editortype = {host},
+ eprinttype = {The New Yorker},
+ namea = {Li, Yiyun},
+ nameatype = {narrator},
+ url = {www.newyorker.com/podcast/the-authors-voice/yiyun-li-reads-on-the-street-where-you-live},
+ options = {uniquenamea=true}}
+%[[ end ]]
+%[[ PoeMusic:wi ]]
+@audio{PoeMusic:wi,
+ title = {The Music of Edgar Allan Poe--Inspired Films on his 197th Birthday},
+ publisher = {WFMU},
+ date = {2016-01-19},
+ booktitle = {Morricone Island},
+ namea = {Devon E. Levins},
+ nameatype = {host}}
+%[[ end ]]
+%[[ YiyunLiReads:ub ]]
+@audio{YiyunLiReads:ub,
+ title = {Yiyun Li Reads \mkbibquote{On the Street Where You Live}},
+ publisher = {\mkbibemph{The New Yorker} and WNYC},
+ date = {2017-01-03},
+ booktitle = {The Writer's Voice: New Fiction from \mkbibemph{The New Yorker}},
+ edition = {podcast edition},
+ namea = {Deborah Treisman},
+ nameatype = {host},
+ addendum = {iTunes app}}
+%[[ end ]]
+%[[ Adirondacks:1990tb ]]
+@book{Adirondacks:1990tb,
+ title = {The Adirondack Park in the Twenty-First Century},
+ publisher = {Commission on the Adirondacks in the Twenty-First Century},
+ date = {1990},
+ location = {New York State},
+ options = {showlocation=true}}
+%[[ end ]]
+%[[ Baron:etal:2007tj ]]
+@book{Baron:etal:2007tj,
+ title = {Agent of Change},
+ subtitle = {Print Culture Studies after Elizabeth L. Eisenstein},
+ editor = {Sabrina Baron and Eric Lindquist and Eleanor Shevlin and Sabrina Alcorn Baron and Eric N. Lindquist and Eleanor F. Shevlin},
+ publisher = {University of Massachusetts Press and {Library of Congress, Center for the Book}},
+ date = {2007}}
+%[[ end ]]
+%[[ Bauch:tb ]]
+@book{Bauch:tb,
+ author = {Nicholas Bauch},
+ title = {Enchanting the Desert},
+ subtitle = {A Pattern Language for the Production of Space},
+ publisher = {Stanford University Press},
+ date = {2016},
+ url = {www.enchantingthedesert.com/home/}}
+%[[ end ]]
+%[[ Bauer:1971ui ]]
+@book{Bauer:1971ui,
+ author = {Bauer, Johann},
+ title = {Kafka und Prag},
+ publisher = {Belser},
+ date = {1971?},
+ options = {datebrackets=true}}
+%[[ end ]]
+%[[ Bauer:ui ]]
+@book{Bauer:ui,
+ author = {Johann Bauer},
+ title = {Kafka und Prag},
+ publisher = {Belser}}
+%[[ end ]]
+%[[ Beowulf:2004th ]]
+@book{Beowulf:2004th,
+ title = {Beowulf},
+ editor = {Sarah Anderson},
+ publisher = {Pearson},
+ date = {2004},
+ translator = {Alan Sullivan and Timothy Murphy},
+ options = {useeditor=false}}
+%[[ end ]]
+%[[ Caro:2012wy ]]
+@book{Caro:2012wy,
+ author = {Caro, Robert A.},
+ title = {The Passage of Power},
+ publisher = {Vintage Books},
+ date = {2012},
+ maintitle = {The Years of Lyndon Johnson},
+ volume = {4}}
+%[[ end ]]
+%[[ Carroll:2006tm ]]
+@book{Carroll:2006tm,
+ author = {Lewis Carroll},
+ title = {\mkbibemph{Alice's Adventures in Wonderland} and \mkbibemph{Through the Looking-Glass}},
+ editor = {John Tenniel},
+ publisher = {Bantam Books},
+ date = {2006},
+ editortype = {Illustrated by}}
+%[[ end ]]
+%[[ Charon:2017tw ]]
+@book{Charon:2017tw,
+ author = {Rita Charon and Sayantani DasGupta and Nellie Hermann and Craig Irvine and Eric R. Marcus and Edgar Rivera Colsn and Danielle Spencer and Maura Spiegel},
+ title = {The Principles and Practice of Narrative Medicine},
+ publisher = {Oxford University Press},
+ date = {2017}}
+%[[ end ]]
+%[[ Chreiteh:2009aa ]]
+@book{Chreiteh:2009aa,
+ author = {Alexandra Chreiteh},
+ title = {\textarabic{الروسية} \textarabic{وأمه} \textarabic{علي}},
+ publisher = {Al-D{\=a}r al-ʻArab{\=\i}yah lil-ʻUl{\=u}m N{\=a}shir{\=u}n},
+ date = {2009},
+ nameaddon = {Shuraytih., Aliksandr{\=a}},
+ titleaddon = {\mkbibbrackets{\mkbibemph{ʻAl{\=\i} wa-ummuhu al-R{\=u}s{\=\i}yah; Ali and His Russian Mother}}}}
+%[[ end ]]
+%[[ Clyne:2012td ]]
+@book{Clyne:2012td,
+ author = {Clyne, Anna},
+ title = {Night Ferry},
+ publisher = {{Boosey and Hawkes}},
+ date = {2012}}
+%[[ end ]]
+%[[ Davis:1998we ]]
+@book{Davis:1998we,
+ author = {Davis, Angela Y},
+ title = {Blues Legacies and Black Feminism},
+ subtitle = {Gertrude ``Ma'' Rainey, Bessie Smith, and Billie Holiday},
+ publisher = {Pantheon},
+ afterword = {John Smith},
+ date = {1998}}
+%[[ end ]]
+%[[ Dorris:1999wo ]]
+@book{Dorris:1999wo,
+ author = {Michael Dorris and Louise Erdrich},
+ title = {The Crown of Columbus},
+ publisher = {HarperCollins Publishers},
+ date = {1999}}
+%[[ end ]]
+%[[ Dostoevsky:1993wh ]]
+@book{Dostoevsky:1993wh,
+ author = {Fyodor Dostoevsky},
+ title = {Crime and Punishment},
+ publisher = {Vintage Books},
+ date = {1993},
+ edition = {\autocap{e}-book edition},
+ translator = {Richard Pevear and Larissa Volokhonsky},
+ options = {usetranslator=true,useauthor=false}}
+%[[ end ]]
+%[[ DRABible:1899wf ]]
+@book{DRABible:1899wf,
+ title = {The Bible},
+ date = {1899},
+ edition = {Douay-Rheims American edition},
+ eprinttype = {Bible Gateway},
+ url = {www.biblegateway.com},
+ urldate = {2017-01-13}}
+%[[ end ]]
+%[[ Dunbar:2004tv ]]
+@book{Dunbar:2004tv,
+ author = {William Dunbar},
+ title = {The Complete Works},
+ editor = {John Conlee},
+ publisher = {Medieval Institute Publications},
+ date = {2004},
+ eprinttype = {TEAMS Middle English Texts\mkbibemph{, U of Rochester}},
+ url = {d.lib.rochester.edu/teams/publication/conlee-dunbar-complete-works}}
+%[[ end ]]
+%[[ Fallani:1971vv ]]
+@book{Fallani:1971vv,
+ author = {Giovanni Fallani},
+ title = {Dante e la cultura figurativa medievale},
+ publisher = {Minerva Italica},
+ date = {1971}}
+%[[ end ]]
+%[[ Freud:2005wb ]]
+@book{Freud:2005wb,
+ author = {Sigmund Freud},
+ title = {Civilization and Its Discontents},
+ editor = {James Strachey},
+ publisher = {W. W. Norton},
+ date = {2005},
+ translator = {James Strachey}}
+%[[ end ]]
+%[[ frye91aa ]]
+@book{frye91aa,
+ author = {Northrop Frye},
+ title = {The Double Vision},
+ subtitle = {Language and Meaning in Religion},
+ publisher = {U of Toronto P},
+ date = {1991},
+ booktitle = {The Double Vision},
+ location = {Toronto},
+ shorttitle = {Double Vision},
+ sorttitle = {Double Vision}}
+%[[ end ]]
+%[[ Gikandi:2000vz ]]
+@book{Gikandi:2000vz,
+ author = {Simon Gikandi},
+ title = {Ngugi wa Thiong'o},
+ publisher = {Cambridge UP},
+ date = {2000},
+ eprinttype = {ACLS Humanities E-Book},
+ url = {hdl.handle.net/2027/heb.07588.0001.001}}
+%[[ end ]]
+%[[ Goethe:1875vw ]]
+@book{Goethe:1875vw,
+ author = {Goethe, Johann Wolfgang von},
+ title = {Conversations of Goethe with Eckermann and Soret},
+ date = {1875},
+ edition = {new edition},
+ location = {London},
+ translator = {John Oxenford},
+ options = {showlocation=true}}
+%[[ end ]]
+%[[ Handbook:2021aa ]]
+@book{Handbook:2021aa,
+ title = {MLA Handbook},
+ publisher = {Modern Language Association of America},
+ date = {2021},
+ edition = {9th edition, e-book edition}}
+%[[ end ]]
+%[[ Hocking:2010tz ]]
+@book{Hocking:2010tz,
+ author = {Hocking, Amanda},
+ title = {Fate},
+ date = {2010}}
+%[[ end ]]
+%[[ Howells:1968wo ]]
+@book{Howells:1968wo,
+ author = {Howells, W. D.},
+ title = {Their Wedding Journey},
+ editor = {John K. Reeves},
+ publisher = {Indiana University Press},
+ date = {1968},
+ editora = {Edwin H. Cady},
+ editoratype = {generaleditor},
+ eventdate = {1968/1983},
+ maintitle = {A Selected Edition of W. D. Howells},
+ volume = {5},
+ entrysubtype = {newspaper},
+ options = {containerized=true}}
+%[[ end ]]
+%[[ KJVBible:1998wf ]]
+@book{KJVBible:1998wf,
+ title = {The Bible},
+ publisher = {Oxford University Press},
+ date = {1998},
+ edition = {Authorized King James Version}}
+%[[ end ]]
+%[[ LazarillodeTormes:1554vl ]]
+@book{LazarillodeTormes:1554vl,
+ title = {Lazarillo de Tormes},
+ date = {1554},
+ location = {Medina del Campo},
+ options = {showlocation=true}}
+%[[ end ]]
+%[[ Lee:2014aa ]]
+@book{Lee:2014aa,
+ author = {Harper Lee},
+ title = {To Kill a Mockingbird},
+ editor = {Sissy Spacek},
+ publisher = {HarperAudio},
+ date = {2014-07-08},
+ edition = {audiobook edition, unabridged edition},
+ editortype = {narrator}}
+%[[ end ]]
+%[[ Lee:2014vk ]]
+@book{Lee:2014vk,
+ author = {Harper Lee},
+ title = {To Kill a Mockingbird},
+ editor = {Sissy Spacek},
+ publisher = {HarperAudio},
+ date = {2014},
+ edition = {audiobook edition, unabridged edition},
+ editortype = {narrator}}
+%[[ end ]]
+%[[ London:1990tn ]]
+@book{London:1990tn,
+ author = {Jack London},
+ title = {Call of the Wild},
+ publisher = {Dover},
+ date = {1990},
+ origdate = {1903}}
+%[[ end ]]
+%[[ Milkis:1994vv ]]
+@book{Milkis:1994vv,
+ author = {Sidney M. Milkis and Michael Nelson},
+ title = {The American Presidency},
+ subtitle = {Origins and Development, 1776--1993},
+ publisher = {CQ P{}ress},
+ date = {1994},
+ edition = {2}}
+%[[ end ]]
+%[[ Miller:2016vg ]]
+@book{Miller:2016vg,
+ author = {Daniel Miller and Elisabetta Costa and Nell Haynes and Tom McDonald and Razvan Nicolescu and Jolynna Sinanan and Juliano Spyer and Shriram Venkatraman and Xinyuan Wang},
+ title = {How the World Changed Social Media},
+ publisher = {UCL P{}ress},
+ date = {2016},
+ doi = {10.2307/j.ctt1g69z35}}
+%[[ end ]]
+%[[ Milton:1998ty ]]
+@book{Milton:1998ty,
+ author = {John Milton},
+ title = {The Riverside Milton},
+ editor = {Roy Flannagan},
+ publisher = {Houghton Mifflin},
+ date = {1998}}
+%[[ end ]]
+%[[ morrison02aa ]]
+@book{morrison02aa,
+ author = {Toni Morrison},
+ title = {Sula},
+ publisher = {Plume-Penguin},
+ date = {2002},
+ booktitle = {Sula},
+ location = {New York},
+ origdate = {1973}}
+%[[ end ]]
+%[[ Neruda:1991wq ]]
+@book{Neruda:1991wq,
+ author = {Pablo Neruda},
+ title = {Canto general},
+ publisher = {University of California Press},
+ date = {1991},
+ number = {7},
+ series = {Latin American Literature and Culture},
+ translator = {Jack Schmitt}}
+%[[ end ]]
+%[[ NJBible:1985va ]]
+@book{NJBible:1985va,
+ title = {The New Jerusalem Bible},
+ editor = {Henry Wansbrough},
+ publisher = {Doubleday},
+ date = {1985},
+ editortype = {generaleditor},
+ options = {useeditor=false}}
+%[[ end ]]
+%[[ Oakes:2004wa ]]
+@book{Oakes:2004wa,
+ author = {Meredith Oakes},
+ title = {The Tempest},
+ subtitle = {An Opera in Three Acts},
+ editor = {Thomas Ad{\`e}s},
+ publisher = {Faber Music},
+ date = {2004},
+ authortype = {librettist},
+ editortype = {composer}}
+%[[ end ]]
+%[[ OConnor:2009un ]]
+@book{OConnor:2009un,
+ author = {Patricia O'Connor},
+ title = {Woe Is I},
+ subtitle = {The Grammarphobe's Guide to Better English in Plain English},
+ publisher = {Riverhead Books},
+ date = {2009},
+ edition = {\autocap{e}-book edition}}
+%[[ end ]]
+%[[ Prado:2018vb ]]
+@book{Prado:2018vb,
+ title = {Mexican Literature in Theory},
+ editor = {S{\'a}nchez Prado, Ignacio M.},
+ publisher = {Bloomsbury Academic},
+ date = {2018}}
+%[[ end ]]
+%[[ Quran:2015uz ]]
+@book{Quran:2015uz,
+ title = {The Qu'ran},
+ publisher = {Oxford University Press},
+ date = {2015},
+ translator = {M. A. S. Abdel Haleem}}
+%[[ end ]]
+%[[ Rampersad:2002va ]]
+@book{Rampersad:2002va,
+ author = {Arnold Rampersad},
+ title = {The Life of Langston Hughes},
+ publisher = {Oxford University Press},
+ date = {2002},
+ edition = {2},
+ volumes = {2}}
+%[[ end ]]
+%[[ Shen:Fu:2011vw ]]
+@book{Shen:Fu:2011vw,
+ author = {{Shen Fu}},
+ title = {Six Records of a Life Adrift},
+ publisher = {Hackett Publishing},
+ date = {2011},
+ translator = {Graham Sanders}}
+%[[ end ]]
+%[[ Stendhal:2002ty ]]
+@book{Stendhal:2002ty,
+ author = {Stendhal},
+ title = {The Red and the Black},
+ publisher = {Penguin Books},
+ date = {2002},
+ translator = {Roger Gard}}
+%[[ end ]]
+%[[ Tomlinson:2002tc ]]
+@book{Tomlinson:2002tc,
+ title = {Goya},
+ subtitle = {Images of Women},
+ editor = {Tomlinson, Janis A.},
+ publisher = {National Gallery of Art and Yale University Press},
+ date = {2002}}
+%[[ end ]]
+%[[ United:Nations:1991vc ]]
+@book{United:Nations:1991vc,
+ author = {{United Nations}},
+ title = {Consequences of Rapid Population Growth in Developing Countries},
+ publisher = {{Taylor and Francis}},
+ date = {1991}}
+%[[ end ]]
+%[[ Waid:2005up ]]
+@book{Waid:2005up,
+ author = {Marc Waid},
+ title = {Superman},
+ subtitle = {Birthright},
+ publisher = {DC Comics},
+ date = {2005},
+ editora = {Leinil Francis Yu},
+ editoratype = {illustrated by},
+ editorb = {Gerry Alanguilan},
+ editorbtype = {inked by},
+ editorc = {Dave McCaig},
+ editorctype = {colored by},
+ options = {useauthor=false,useeditor=false}}
+%[[ end ]]
+%[[ Wellek:1992ws ]]
+@book{Wellek:1992ws,
+ author = {Ren{\'e} Wellek},
+ title = {A History of Modern Criticism, 1750--1950},
+ publisher = {Yale University Press},
+ date = {1992},
+ volume = {8}}
+%[[ end ]]
+%[[ Wollstonecraft:2009uf ]]
+@book{Wollstonecraft:2009uf,
+ author = {Mary Wollstonecraft},
+ title = {A Vindication of the Rights of Woman},
+ editor = {Deidre Shauna Lynch},
+ publisher = {W. W. Norton},
+ date = {2009},
+ edition = {Norton Critical Edition, 3rd edition}}
+%[[ end ]]
+%[[ JapaneseFundamentals:wy ]]
+@booklet{JapaneseFundamentals:wy,
+ title = {Japanese Fundamentals},
+ publisher = {Barron},
+ date = {1992},
+ addendum = {Chart}}
+%[[ end ]]
+%[[ Language:vu ]]
+@booklet{Language:vu,
+ title = {Language Study in the Age of Globalization},
+ subtitle = {The College-Level Experience},
+ publisher = {Modern Language Association of America},
+ addendum = {Pamphlet}}
+%[[ end ]]
+%[[ Michigan:wk ]]
+@booklet{Michigan:wk,
+ title = {Michigan},
+ publisher = {Rand},
+ date = {2000},
+ addendum = {Map}}
+%[[ end ]]
+%[[ WashingtonDC:2000ti ]]
+@booklet{WashingtonDC:2000ti,
+ title = {Washington, DC},
+ publisher = {Trip Builder},
+ date = {2000},
+ addendum = {Brochure}}
+%[[ end ]]
+%[[ Bacon:2016aa ]]
+@collection{Bacon:2016aa,
+ author = {Bacon, Francis},
+ editor = {David Sylvester},
+ publisher = {{Thames and Hudson}},
+ date = {2016},
+ booktitle = {Interviews with Francis Bacon},
+ editortype = {conductor}}
+%[[ end ]]
+%[[ frye57ab ]]
+@collection{frye57ab,
+ title = {Sound and Poetry},
+ editor = {Northrop Frye},
+ publisher = {Columbia UP},
+ date = {1957},
+ booktitle = {Sound and Poetry},
+ location = {New York}}
+%[[ end ]]
+%[[ Moskowitz:2021uw ]]
+@dataset{Moskowitz:2021uw,
+ author = {Daniel J. Moskowitz},
+ title = {Local News, Information, and the Nationalization of U.S. Elections},
+ date = {2021-02},
+ doi = {10.1017/S0003055420000829},
+ eprinttype = {Cambridge Core},
+ journal = {American Political Science Review},
+ number = {1},
+ pages = {114--129},
+ volume = {115},
+ addendum = {Moskowitz supplementary material}}
+%[[ end ]]
+%[[ ReplicationNonDemocratic:ws ]]
+@dataset{ReplicationNonDemocratic:ws,
+ title = {Replication Data for: \mkbibquote{The Non-Democratic Roots of Mass Education: Evidence from 200 Years.}},
+ doi = {10.7910/DVN/X2VJJX},
+ eprinttype = {Harvard Dataverse}}
+%[[ end ]]
+%[[ Sheldon:tr ]]
+@image{Sheldon:tr,
+ author = {Natasha Sheldon},
+ title = {Photograph of \mkbibemph{The Muleteer}},
+ related = {sheldon2014}}
+%[[ end ]]
+%[[ Velazquez:2016ud ]]
+@inbook{Velazquez:2016ud,
+ author = {Diego Vel{\'a}zquez},
+ title = {An Old Woman Cooking Eggs},
+ publisher = {Scribner},
+ date = {2016},
+ bookauthor = {Laura Cumming},
+ booktitle = {The Vanishing Vel{\'a}zquez},
+ booksubtitle = {A Nineteenth-Century Bookseller's Obsession with a Lost Masterpiece},
+ institution = {Scottish National Gallery},
+ origdate = {1618~},
+ pages = {27},
+ entrysubtype = {artwork}}
+%[[ end ]]
+%[[ WesternBoundaries:vc ]]
+@inbook{WesternBoundaries:vc,
+ author = {Earl E. Fitz},
+ title = {Western Boundaries of Brazil, 1600, 1780, and the Present},
+ publisher = {Modern Language Association of America},
+ date = {2005},
+ booktitle = {Brazilian Narrative Traditions in a Comparative Context},
+ pages = {43},
+ options = {useauthor=false}}
+%[[ end ]]
+%[[ Beyonce:2013ta ]]
+@incollection{Beyonce:2013ta,
+ author = {Beyonc{\'e}},
+ title = {Pretty Hurts},
+ publisher = {Parkwood Entertainment},
+ date = {2013},
+ maintitle = {Beyonc{\'e}},
+ url = {www.beyonce.com/album/beyonce/?media_view=songs},
+ addendum = {Transcript of lyrics}}
+%[[ end ]]
+%[[ Clapton:1990va ]]
+@incollection{Clapton:1990va,
+ author = {Eric Clapton},
+ title = {Discovering Robert Johnson},
+ publisher = {Columbia},
+ date = {1990},
+ booktitle = {Robert Johnson},
+ booksubtitle = {The Complete Recordings},
+ pages = {22--23},
+ addendum = {Booklet accompanying CD}}
+%[[ end ]]
+%[[ Dewar:2007wn ]]
+@incollection{Dewar:2007wn,
+ author = {James A. Dewar and Peng Hwa Ang},
+ title = {The Cultural Consequences of Printing and the Internet},
+ editor = {Sabrina Alcorn Baron and Eric N. Lindquist and Eleanor F. Shevlin},
+ publisher = {University of Massachusetts Press and {Library of Congress, Center for the Book}},
+ date = {2007},
+ booktitle = {Agent of Change},
+ booksubtitle = {Print Culture Studies after Elizabeth L. Eisenstein},
+ pages = {365--377}}
+%[[ end ]]
+%[[ Dickinson:1999uv ]]
+@incollection{Dickinson:1999uv,
+ author = {Dickinson, Emily},
+ title = {I heard a Fly buzz---when I died---},
+ editor = {R. W. Franklin},
+ publisher = {Harvard University Press},
+ date = {1999},
+ booktitle = {The Poems of Emily Dickinson},
+ pages = {265-266}}
+%[[ end ]]
+%[[ Euripides:1998tx ]]
+@incollection{Euripides:1998tx,
+ author = {Euripides},
+ title = {The Trojan Women},
+ publisher = {New American Library},
+ date = {1998},
+ booktitle = {Ten Plays},
+ pages = {457--512},
+ translator = {Paul Roche},
+ entrysubtype = {play}}
+%[[ end ]]
+%[[ Fagih:2003uj ]]
+@incollection{Fagih:2003uj,
+ author = {Fagih, Ahmed Ibrahim al-},
+ title = {The Singing of the Stars},
+ editor = {Salma Khadra Jayyusi},
+ publisher = {Interlink Books},
+ date = {2003},
+ booktitle = {Short Arabic Plays},
+ booksubtitle = {An Anthology},
+ pages = {140--157},
+ translator = {Leila El Khalidi and Christopher Tingley},
+ entrysubtype = {play},
+ options = {uniquetranslator=true}}
+%[[ end ]]
+%[[ Franklin:1992vl ]]
+@incollection{Franklin:1992vl,
+ author = {Benjamin Franklin},
+ title = {Emigration to America},
+ editor = {Christopher Ricks and William L. Vance},
+ publisher = {{Faber and Faber}},
+ date = {1992},
+ booktitle = {The Faber Book of America},
+ origdate = {1782},
+ pages = {24--26}}
+%[[ end ]]
+%[[ Hopi:1986wu ]]
+@incollection{Hopi:1986wu,
+ title = {A Witchcraft Story},
+ editor = {Mando Sevillano},
+ publisher = {Northland},
+ date = {1986},
+ booktitle = {The Hopi Way},
+ booksubtitle = {Tales from a Vanishing Culture},
+ editortype = {compiler},
+ pages = {33--42},
+ sorttitle = {Witchcraft Story},
+ options = {useeditor=false}}
+%[[ end ]]
+%[[ Jackson:uh ]]
+@incollection{Jackson:uh,
+ author = {Shirley Jackson},
+ title = {The Lottery},
+ note = {Course pack for English 285: American Short Story Writers, compiled by Anne Smith, spring 2015, Iowa State U}}
+%[[ end ]]
+%[[ Jespersen:wd ]]
+@incollection{Jespersen:wd,
+ author = {T. Christine Jespersen and David J. Plante},
+ title = {Critical Globalization and Political Economy in \mkbibemph{Tropic of Orange}},
+ editor = {Ruth Y. Hsu and Pamela Thoma},
+ publisher = {Modern Language Association of America},
+ booktitle = {Approaches to Teaching the Works of Karen Tei Yamashita},
+ pages = {forthcoming}}
+%[[ end ]]
+%[[ Johnson:2014ty ]]
+@incollection{Johnson:2014ty,
+ author = {Johnson, Barbara},
+ title = {My Monster / My Self},
+ editor = {Melissa Feuerstein and Bill Johnson Gonz{\'a}lez and Lili Porten and Keja L. Valens},
+ publisher = {Duke UP},
+ date = {2014},
+ booktitle = {The Barbara Johnson Reader},
+ booksubtitle = {The Surprise of Otherness},
+ pages = {179--190},
+ addendum = {Originally published in \mkbibemph{Diacritics}, 1982}}
+%[[ end ]]
+%[[ Marvell:1979tp ]]
+@incollection{Marvell:1979tp,
+ author = {Marvell, Andrew},
+ title = {The Mower's Song},
+ editor = {M. H. Abrams},
+ publisher = {W. W. Norton},
+ date = {1979},
+ booktitle = {The Norton Anthology of English Literature},
+ edition = {4},
+ editortype = {generaleditor},
+ pages = {1368},
+ volume = {1}}
+%[[ end ]]
+%[[ Poe:1902aa ]]
+@incollection{Poe:1902aa,
+ author = {Poe, Edgar Allan},
+ title = {The Masque of the Red Death},
+ editor = {James A. Harrison},
+ publisher = {Thomas Y. Crowell},
+ date = {1902},
+ booktitle = {The Complete Works of Edgar Allan Poe},
+ eprinttype = {HathiTrust Digital Library},
+ pages = {250--258},
+ url = {hdl.handle.net/2027/coo.31924079574368},
+ volume = {4}}
+%[[ end ]]
+%[[ Poe:1902wd ]]
+@incollection{Poe:1902wd,
+ author = {Poe, Edgar Allan},
+ title = {The Masque of the Red Death},
+ editor = {James A. Harrison},
+ publisher = {Thomas Y. Crowell},
+ date = {1902},
+ booktitle = {The Complete Works of Edgar Allan Poe},
+ pages = {250--258},
+ volume = {4}}
+%[[ end ]]
+%[[ SaroWiwa:2001wt ]]
+@incollection{SaroWiwa:2001wt,
+ author = {Ken Saro-Wiwa},
+ title = {English Is the Hero},
+ editor = {Holger Ehling and Claus-Peter Holste-von Mutius},
+ publisher = {Rodopi},
+ date = {2001},
+ booktitle = {No Condition Is Permanent},
+ booksubtitle = {Nigerian Writing and the Struggle for Democracy},
+ namea = {Diri I. Teilanyo},
+ nameatype = {interviewer},
+ pages = {13--19},
+ options = {uniquenamea=true}}
+%[[ end ]]
+%[[ Toorn:2017ti ]]
+@incollection{Toorn:2017ti,
+ author = {Toorn, Penny van and Justice, Daniel},
+ title = {Aboriginal Writing},
+ editor = {Eva-Marie Kr{\"o}ller},
+ publisher = {Cambridge UP},
+ date = {2017},
+ booktitle = {The Cambridge Companion to Canadian Literature},
+ doi = {10.1017/9781316671764.004},
+ eprinttype = {Cambridge Core},
+ location = {Cambridge},
+ pages = {26--58}}
+%[[ end ]]
+%[[ Woolf:1976wl ]]
+@incollection{Woolf:1976wl,
+ author = {Virginia Woolf},
+ title = {To T. S. Eliot},
+ editor = {Nigel Nicolson and Joanne Trautmann},
+ publisher = {Harvest Books and Harcourt Brace Jovanovich},
+ date = {1976},
+ booktitle = {The Letters of Virginia Woolf},
+ origdate = {1920-07-28},
+ pages = {437-438},
+ volume = {2}}
+%[[ end ]]
+%[[ Werner:vh ]]
+@inproceedings{Werner:vh,
+ author = {Sarah Werner},
+ title = {When Is a Source Not a Source?},
+ doi = {10.17613/M6PG6F},
+ eprinttype = {CORE},
+ eventdate = {2015-11-14},
+ eventtitle = {Stanford Primary Source Symposium: The Phenomenology of the Source},
+ institution = {Stanford University}}
+%[[ end ]]
+%[[ Botterill:2004tx ]]
+@inreference{Botterill:2004tx,
+ author = {Botterill, Steven N.},
+ title = {Angela Da Foligno, Saint},
+ editor = {Christopher Kleinhenz and John W. Barker and Gail Geiger and Richard Lansing},
+ publisher = {Routledge},
+ date = {2004},
+ booktitle = {Medieval Italy},
+ booksubtitle = {An Encyclopedia},
+ eprint = {E2CTAgAAQBAJ},
+ eprinttype = {Google Books},
+ pages = {35--36},
+ volume = {1}}
+%[[ end ]]
+%[[ Content:2003ug ]]
+@inreference{Content:2003ug,
+ title = {Content, \mkbibemph{N}. (4)},
+ publisher = {Merriam-Webster},
+ date = {2003},
+ booktitle = {Merriam-Webster's Collegiate Dictionary},
+ edition = {11},
+ pages = {269}}
+%[[ end ]]
+%[[ Content:2020tl ]]
+@inreference{Content:2020tl,
+ title = {Content, \mkbibemph{N}. (1)},
+ date = {2020},
+ booktitle = {Merriam-Webster},
+ url = {www.merriam-webster.com/dictionary/content}}
+%[[ end ]]
+%[[ Emoticon:2003ur ]]
+@inreference{Emoticon:2003ur,
+ title = {Emoticon, \mkbibemph{N}.},
+ publisher = {Merriam-Webster},
+ date = {2003},
+ booktitle = {Merriam-Webster's Collegiate Dictionary},
+ edition = {11},
+ pages = {408}}
+%[[ end ]]
+%[[ Emoticon:2018ws ]]
+@inreference{Emoticon:2018ws,
+ title = {Emoticon, \mkbibemph{N}.},
+ publisher = {Oxford University Press},
+ date = {2018},
+ booktitle = {Oxford English Dictionary},
+ url = {www.oed.com/view/Entry/249618}}
+%[[ end ]]
+%[[ Heavy:2018ty ]]
+@inreference{Heavy:2018ty,
+ title = {Heavy, \mkbibemph{Adj.} (1) and \mkbibemph{N.}},
+ publisher = {Oxford UP},
+ date = {2018},
+ booktitle = {Oxford English Dictionary},
+ url = {www.oed.com/view/Entry/85246}}
+%[[ end ]]
+%[[ Patanjali:1996wu ]]
+@inreference{Patanjali:1996wu,
+ title = {Patanjali},
+ editor = {Bruce Murphy},
+ publisher = {HarperCollins Publishers},
+ date = {1996},
+ booktitle = {Ben{\'e}t's Reader's Encyclopedia},
+ edition = {4},
+ pages = {782}}
+%[[ end ]]
+%[[ Apfelbaum:un ]]
+@letter{Apfelbaum:un,
+ author = {Apfelbaum, D. S},
+ title = {Letter to Vincent Marist},
+ date = {1946-03-11},
+ addendum = {Manuscript}}
+%[[ end ]]
+%[[ Benton:ve ]]
+@letter{Benton:ve,
+ author = {Benton, Thomas Hart},
+ title = {Letter to Charles Fremont},
+ library = {John Charles Fremont Papers, Southwest Museum Library},
+ location = {Los Angeles},
+ origdate = {1847-06-22},
+ addendum = {Manuscript}}
+%[[ end ]]
+%[[ Murrow:vv ]]
+@letter{Murrow:vv,
+ author = {Murrow, Irena},
+ title = {Letter to the author},
+ date = {2016-04-05},
+ addendum = {Typescript}}
+%[[ end ]]
+%[[ Schlesinger:wm ]]
+@letter{Schlesinger:wm,
+ author = {Schlesinger, Jr, Arthur},
+ title = {Letter},
+ date = {2004-04-08},
+ journal = {The New York Review of Books},
+ pages = {84}}
+%[[ end ]]
+%[[ AdSchool:tv ]]
+@misc{AdSchool:tv,
+ title = {Advertisement for \mkbibemph{School of Rock: The Musical}},
+ date = {2017-01-29},
+ note = {Times Square, New York City},
+ addendum = {Billboard}}
+%[[ end ]]
+%[[ AdUpton:vl ]]
+@misc{AdUpton:vl,
+ title = {Advertisement for Upton Tea Imports},
+ date = {2018-10},
+ journal = {Smithsonian},
+ pages = {84}}
+%[[ end ]]
+%[[ Elahi:vi ]]
+@misc{Elahi:vi,
+ author = {Elahi, Nareen},
+ title = {E-mail to Standards Committee},
+ date = {2019-01-15}}
+%[[ end ]]
+%[[ Lemuelson:uu ]]
+@misc{Lemuelson:uu,
+ author = {Erik Lemuelson},
+ title = {Text message to the author},
+ date = {2018-05-03}}
+%[[ end ]]
+%[[ Pierson:vf ]]
+@misc{Pierson:vf,
+ author = {Collette Pierson},
+ title = {E-mail to the author},
+ date = {2019-06-01}}
+%[[ end ]]
+%[[ Salter:uc ]]
+@misc{Salter:uc,
+ author = {Margaret Salter},
+ title = {Interview},
+ editor = {Susan Lang},
+ date = {2002-10-22},
+ editortype = {conductor}}
+%[[ end ]]
+%[[ Santiago:to ]]
+@misc{Santiago:to,
+ author = {Robert Santiago},
+ title = {Personal communication with author},
+ date = {2017-02-11}}
+%[[ end ]]
+%[[ Sternberg:ta ]]
+@misc{Sternberg:ta,
+ author = {Rachel Sternberg},
+ title = {E-mail interview with the author},
+ date = {2021-01-07}}
+%[[ end ]]
+%[[ UnitedNationsGeneralAssembly:1948uv ]]
+@misc{UnitedNationsGeneralAssembly:1948uv,
+ author = {{United Nations, General Assembly}},
+ title = {Universal Declaration of Human Rights},
+ date = {1948-12-10},
+ eprinttype = {United Nations},
+ titleaddon = {Resolution 217 A},
+ url = {www.un.org/en/universal-declaration-human-rights/},
+ addendum = {PDF download}}
+%[[ end ]]
+%[[ Wexler:wj ]]
+@misc{Wexler:wj,
+ author = {Jojo Wexler},
+ title = {Telephone interview with the author},
+ date = {2019-11-03}}
+%[[ end ]]
+%[[ Zamora:ui ]]
+@misc{Zamora:ui,
+ author = {Estelle Zamora},
+ title = {E-mail to Penny Kinkaid},
+ date = {2018-05-03}}
+%[[ end ]]
+%[[ Benton:wd ]]
+@mlasource{Benton:wd,
+ author = {Benton, Thomas Hart},
+ title = {Instruments of Power \mkbibemph{from} America Today},
+ date = {1930/1931},
+ datea = {2012},
+ locationa = {Metropolitan Museum of Art},
+ supplemental = {1930--31},
+ supplementala = {www.metmuseum.org/blogs/now-at-the-met/from-the-director/2012/benton/slideshow},
+ supplementalb = {Slide 1},
+ titlea = {The Met},
+ titletype = {complete}}
+%[[ end ]]
+%[[ Bible:app:2016ab ]]
+@mlasource{Bible:app:2016ab,
+ title = {The Bible},
+ datea = {2016},
+ publishera = {Bible Gateway / Zondervan},
+ supplemental = {King James Version},
+ titlea = {Bible Gateway},
+ titletype = {complete},
+ versiona = {version 42},
+ versionb = {App}}
+%[[ end ]]
+%[[ Cahill:wq ]]
+@mlasource{Cahill:wq,
+ author = {Cahill, Daniel J},
+ title = {Memo to English department faculty},
+ datea = {1 June 2000},
+ publishera = {Brooklyn Technical High School, New York City},
+ titletype = {unstyled},
+ versionb = {PDF}}
+%[[ end ]]
+%[[ DigitalMediaTheory:uo ]]
+@mlasource{DigitalMediaTheory:uo,
+ title = {Slides 040720},
+ datea = {7 Apr. 2020},
+ locationa = {d2l.msu.edu/d2l/le/content/909183/viewContent/8746820/View},
+ publishera = {Michigan State U},
+ supplemental = {Introduction to Digital Media Theory, taught by Kathleen Fitzpatrick},
+ titlea = {D2L},
+ titletype = {part}}
+%[[ end ]]
+%[[ SlideLinus:wh ]]
+@mlasource{SlideLinus:wh,
+ title = {Slide of Linus, Lucy, and Snoopy},
+ supplemental = {English 204: Animals in Graphic Art, 4 Apr. 2016, Evergreen State College. Slide 2.},
+ titletype = {unstyled}}
+%[[ end ]]
+%[[ SocialNetworking:vj ]]
+@mlasource{SocialNetworking:vj,
+ title = {Syllabus for Social Networking in the Scriptorium},
+ institution = {University of Massachusetts},
+ location = {Boston},
+ supplemental = {Taught by Alex Mueller, spring 2014, U of Massachusetts, Boston},
+ titletype = {unstyled}}
+%[[ end ]]
+%[[ TecartaBible:wf ]]
+@mlasource{TecartaBible:wf,
+ title = {The Bible},
+ datea = {6 Sept. 2016},
+ publishera = {Tecarta},
+ supplemental = {King James Version},
+ titlea = {Tecarta Bible},
+ titletype = {book},
+ versiona = {app version 7.10}}
+%[[ end ]]
+%[[ BladeRunner::1992tx ]]
+@movie{BladeRunner::1992tx,
+ title = {Blade Runner},
+ publisher = {Warner Bros.},
+ date = {1992},
+ namea = {Ridley Scott},
+ nameatype = {director},
+ origdate = {1982},
+ version = {director's cut}}
+%[[ end ]]
+%[[ ET:1982:vj ]]
+@movie{ET:1982:vj,
+ title = {E.T. the Extra-Terrestial},
+ publisher = {Universal Studios},
+ date = {1982},
+ addendum = {Netflix app}}
+%[[ end ]]
+%[[ LikeWater:1993:og ]]
+@movie{LikeWater:1993:og,
+ title = {Like Water for Chocolate},
+ publisher = {Miramax},
+ date = {1993},
+ namea = {Alfonso Arau},
+ nameatype = {director},
+ nameb = {Laura Esquivel},
+ namebtype = {screenplay},
+ titleaddon = {Como agua para chocolate}}
+%[[ end ]]
+%[[ OpeningNight:tf ]]
+@movie{OpeningNight:tf,
+ title = {Opening Night},
+ editor = {John Cassavetes},
+ publisher = {Faces Distribution},
+ date = {1977},
+ editortype = {director},
+ options = {useeditor=false}}
+%[[ end ]]
+%[[ Sairat:vz ]]
+@movie{Sairat:vz,
+ title = {Sairat},
+ editor = {Nagraj Manjule},
+ publisher = {Zee Studios and Aatpat Production},
+ date = {2016},
+ editortype = {director},
+ options = {useeditor=false}}
+%[[ end ]]
+%[[ Beatles:aa ]]
+@music{Beatles:aa,
+ author = {Beatles},
+ publisher = {EMI Records},
+ date = {1968},
+ booktitle = {The Beatles}}
+%[[ end ]]
+%[[ Beethoven:ui ]]
+@music{Beethoven:ui,
+ author = {Beethoven, Ludwig van},
+ title = {Symphony No. 9 in D Minor \mkbibquote{Choral}},
+ editor = {Wilhelm Furtw{\"a}ngler},
+ publisher = {EMI},
+ date = {1998},
+ editortype = {conductor},
+ origdate = {1951-07-29},
+ entrysubtype = {album}}
+%[[ end ]]
+%[[ Beyonce:ta ]]
+@music{Beyonce:ta,
+ author = {Beyonc{\'e}},
+ title = {Pretty Hurts},
+ publisher = {Parkwood Entertainment},
+ date = {2013},
+ booktitle = {Beyonc{\'e}},
+ url = {www.beyonce.com/album/beyonce/?media_view=songs}}
+%[[ end ]]
+%[[ Lopez:tu ]]
+@music{Lopez:tu,
+ author = {Jennifer Lopez},
+ title = {Vivir mi vida},
+ publisher = {Sony Music Latin},
+ date = {2017},
+ addendum = {Spotify app}}
+%[[ end ]]
+%[[ Schubert:wm ]]
+@music{Schubert:wm,
+ author = {Schubert, Franz},
+ title = {Piano Trio in E-flat Major D 929},
+ editor = {{Wiener Mozart-Trio}},
+ publisher = {Preiser Records},
+ date = {2011},
+ edition = {unabridged version},
+ editortype = {Performance by},
+ entrysubtype = {album},
+ addendum = {Vinyl LP}}
+%[[ end ]]
+%[[ SigurRos:vq ]]
+@music{SigurRos:vq,
+ author = {{Sigur R{\'o}s}},
+ title = {Takk{\ldots}},
+ publisher = {Geffen Records},
+ date = {2005},
+ entrysubtype = {album}}
+%[[ end ]]
+%[[ AdNewYorker:ty ]]
+@online{AdNewYorker:ty,
+ title = {Get the Best of \mkbibemph{The New Yorker}},
+ date = {2017-01-10},
+ journal = {The New Yorker},
+ url = {www.newyorker.com},
+ addendum = {Pop-up advertisement}}
+%[[ end ]]
+%[[ Beaton:vx ]]
+@online{Beaton:vx,
+ author = {Beaton, Kate},
+ title = {The Secret Garden},
+ maintitle = {Hark! A Vagrant},
+ url = {www.harkavagrant.com/index.php?id=350},
+ urldate = {2017-01-17}}
+%[[ end ]]
+%[[ BlakeArchive:uh ]]
+@online{BlakeArchive:uh,
+ title = {The William Blake Archive},
+ editor = {Morris Eaves and Robert Essick and Joseph Viscomi},
+ date = {1996/2014},
+ url = {www.blakearchive.org},
+ entrysubtype = {website}}
+%[[ end ]]
+%[[ Chaucer:Doth:Tweet:tx ]]
+@online{Chaucer:Doth:Tweet:tx,
+ author = {{Chaucer Doth Tweet}},
+ title = {A daye wythout anachronism ys lyke Emily Dickinson wythout her lightsaber},
+ date = {2018-04-07},
+ maintitle = {Twitter},
+ nameaddon = {{@LeVostreGC}},
+ url = {twitter.com/LeVostreGC/status/982829987286827009}}
+%[[ end ]]
+%[[ Folgerpedia:aa ]]
+@online{Folgerpedia:aa,
+ title = {Folgerpedia},
+ publisher = {Folger Shakespeare Library},
+ date = {2018-07-17},
+ sorttitle = {Folgerpedia},
+ url = {folgerpedia.folger.edu/Main_Page},
+ entrysubtype = {website}}
+%[[ end ]]
+%[[ Glass:2018wx ]]
+@online{Glass:2018wx,
+ author = {Erin Rose Glass and Micah Vandegrift},
+ title = {Public Scholarship in Practice and Philosophy},
+ date = {2018},
+ doi = {10.17613/g64d-gd16},
+ eprinttype = {CORE},
+ addendum = {PDF download, draft of working paper}}
+%[[ end ]]
+%[[ Lawson:tw ]]
+@online{Lawson:tw,
+ author = {Stuart Lawson},
+ title = {Public Libraries and Knowledge Politics},
+ date = {2018-02-08},
+ eprinttype = {E-LIS},
+ url = {eprints.rclis.org/32361/}}
+%[[ end ]]
+%[[ Lilly:ui ]]
+@online{Lilly:ui,
+ author = {Lilly},
+ title = {[I]f u like dark academia there's a good chance you've seen my tumblr \#darkacademia.},
+ date = {2020},
+ maintitle = {TikTok},
+ nameaddon = {{@uvisaa}},
+ url = {www.tiktok.com/@uvisaa/video/6815708894900391173}}
+%[[ end ]]
+%[[ MacLeod:wm ]]
+@online{MacLeod:wm,
+ author = {Michael MacLeod},
+ title = {Cover of \mkbibemph{Space Cat and the Kittens}, by Ruthven Todd},
+ date = {2020},
+ maintitle = {Pinterest},
+ url = {www.pinterest.com/pin/565412928193207246/},
+ entrysubtype = {untitled}}
+%[[ end ]]
+%[[ Manifold:aa ]]
+@online{Manifold:aa,
+ title = {Manifold Greatness},
+ subtitle = {The Creation and Afterlife of the King James Bible},
+ publisher = {{University of Texas, Austin, Harry Ransom Center} and {University of Oxford, Bodleian Libraries} and {Folger Shakespeare Library}},
+ date = {2016},
+ sorttitle = {Manifold Greatness},
+ url = {manifoldgreatness.org},
+ entrysubtype = {website}}
+%[[ end ]]
+%[[ MemberSuccess:ws ]]
+@online{MemberSuccess:ws,
+ title = {Member Success Stories},
+ publisher = {Modern Language Association of America},
+ date = {2016-09-07},
+ journal = {The MLA Commons Newsletter},
+ addendum = {E-mail}}
+%[[ end ]]
+%[[ Modern:Language:Association:ub ]]
+@online{Modern:Language:Association:ub,
+ author = {{Modern Language Association}},
+ title = {Business leaders say college graduates are not effectively prepared with either soft or technical skills for today's workforce. . . .},
+ date = {2020},
+ maintitle = {LinkedIn},
+ url = {www.linkedin.com/posts/modern-language-association_are-colleges-finally-going-to-start-training-activity-6683424396222193664-y29x}}
+%[[ end ]]
+%[[ Ng:wg ]]
+@online{Ng:wg,
+ author = {Celeste Ng},
+ title = {Photo of a letter from Shirley Jackson},
+ date = {2018-01-22},
+ maintitle = {Twitter},
+ nameaddon = {{@pronounced\_ing}},
+ url = {twitter.com/pronounced_ing/status/955528799357231104},
+ entrysubtype = {untitled}}
+%[[ end ]]
+%[[ PiersPEA:aa ]]
+@online{PiersPEA:aa,
+ title = {\mkbibemph{Piers Plowman} Electronic Archive},
+ editor = {Robert Adams and Patricia R. Bart and John A. Burrow and Michael A. Calabrese and Eric Eliason and Hanna, Ralph, III and Katherine Heinrichs Rehyansky and Judith Jefferson and Eugene Lyman and Stephen Shepherd and M{\'\i}{\.c}e{\'a}l Vaughan},
+ publisher = {{Society for Early English and Norse Electronic Texts}},
+ date = {2018-06-07},
+ sorttitle = {Piers Plowman Electronic Archive},
+ url = {piers.chass.ncsu.edu/},
+ entrysubtype = {website},
+ options = {useeditor=false}}
+%[[ end ]]
+%[[ sheldon2014 ]]
+@online{sheldon2014,
+ author = {Natasha Sheldon},
+ title = {Human Remains in Pompeii},
+ subtitle = {The Body Casts},
+ date = {2014-03-23},
+ eprinttype = {Decoded Past},
+ url = {decodedpast.com/human-remains-pompeii-body-casts/7532/}}
+%[[ end ]]
+%[[ splcJoins:ws ]]
+@online{splcJoins:ws,
+ title = {SPLC Joins National Day of Mourning},
+ date = {2020-06-04},
+ journal = {SPLC: Southern Poverty Law Center},
+ url = {www.splcenter.org/presscenter/splc-joins-national-day-mourning},
+ addendum = {Press release}}
+%[[ end ]]
+%[[ TableCCCXI:vi ]]
+@online{TableCCCXI:vi,
+ title = {Table 311.80},
+ subtitle = {Number and Percentage Distribution of Course Enrollments in Languages Other Than English at Degree-Granting Postsecondary Institutions, by Language and Enrollment Level: Selected Years, 2002 through 2013},
+ publisher = {National Center for Education Statistics},
+ date = {2015},
+ maintitle = {Digest of Education Statistics},
+ url = {nces.ed.gov/programs/digest/d15/tables/dt15_311.80.asp}}
+%[[ end ]]
+%[[ Thomas:vq ]]
+@online{Thomas:vq,
+ author = {Thomas, Angie},
+ title = {Photo of \mkbibemph{The Hate U Give} cover},
+ date = {2018-12-04},
+ maintitle = {Instagram},
+ url = {www.instagram.com/p/Bq_PaXKgqPw/},
+ entrysubtype = {untitled}}
+%[[ end ]]
+%[[ VisualizingEmancipation:uf ]]
+@online{VisualizingEmancipation:uf,
+ title = {Visualizing Emancipation},
+ editor = {Scott Nesbit and Edward L. Ayers},
+ editortype = {director},
+ sorttitle = {Visualizing},
+ url = {dsl.richmond.edu/emancipation/},
+ entrysubtype = {website},
+ options = {useeditor=false}}
+%[[ end ]]
+%[[ Wang:wj ]]
+@online{Wang:wj,
+ author = {Lijing Wang and Xue Ben and Aniruddha Adiga and Adam Sadilek and Ashish Tendulkar and Srinivasan Venkatramanan and Anil Vullikanti and Gaurav Aggarwal and Alok Talekar and Jiangzhuo Chen and Bryan Lewis and Samarth Swarup and Amol Kapoor and Milind Tambe and Madhav Marathe},
+ title = {Using Mobility Data to Understand and Forecast COVID19 Dynamics},
+ date = {2020-12-15},
+ doi = {10.1101/2020.12.13.20248129},
+ eprinttype = {MedRxiv: The Preprint Server for Health Sciences},
+ addendum = {Preprint}}
+%[[ end ]]
+%[[ World:Wildlife:Fund:vz ]]
+@online{World:Wildlife:Fund:vz,
+ author = {{World Wildlife Fund}},
+ title = {Five Things to Know on Shark Awareness Day},
+ date = {2020-07-14},
+ maintitle = {Facebook},
+ url = {www.facebook.com/worldwildlifefund/videos/745925785979440/}}
+%[[ end ]]
+%[[ almendro:1998fg ]]
+@patent{almendro:1998fg,
+ author = {Almendro, Jos{\'e} L. and Mart{\'\i}n, Jacinto and S{\'a}nchez, Alberto and Nozal, Fernando},
+ title = {Elektromagnetisches Signalhorn},
+ date = 1998,
+ langid = {german},
+ location = {countryfr and countryuk and countryde},
+ number = {EU-29702195U}}
+%[[ end ]]
+%[[ kowalik:1995qw ]]
+@patent{kowalik:1995qw,
+ author = {Kowalik, F. and Isard, M.},
+ title = {Estimateur d'un d{\'e}faut de fonctionnement d'un modulateur en quadrature et {\'e}tage de modulation l'utilisant},
+ date = {1995-01-11},
+ indextitle = {Estimateur d'un d{\'e}faut de fonctionnement},
+ langid = {french},
+ number = 9500261,
+ type = {patreqfr}}
+%[[ end ]]
+%[[ laufenberg:2006py ]]
+@patent{laufenberg:2006py,
+ author = {Laufenberg, Xaver and Eynius, Dominique and Suelzle, Helmut and Usbeck, Stephan and Spaeth, Matthias and Neuser-Hoffmann, Miriam and Myrzik, Christian and Schmid, Manfred and Nietfeld, Franz and Thiel, Alexander and Braun, Harald and Ebner, Norbert},
+ title = {Elektrische Einrichtung und Betriebsverfahren},
+ date = {2006-09-13},
+ file = {http://v3.espacenet.com/textdoc?IDX=EP1700367},
+ holder = {{Robert Bosch GmbH} and {Daimler Chrysler AG} and {Bayerische Motoren Werke AG}},
+ langid = {german},
+ number = 1700367,
+ type = {patenteu}}
+%[[ end ]]
+%[[ sorace:1997gh ]]
+@patent{sorace:1997gh,
+ author = {Sorace, Ronald E. and Reinhardt, Victor S. and Vaughn, Steven A.},
+ title = {High-Speed Digital-to-{RF} Converter},
+ date = {1997-09-16},
+ holder = {{Hughes Aircraft Company}},
+ langid = {english},
+ langidopts = {variant=american},
+ number = 5668842,
+ type = {patentus}}
+%[[ end ]]
+%[[ Alys:2002un ]]
+@performance{Alys:2002un,
+ author = {Al{\"y}s, Francis},
+ title = {Cuando la fe mueve monta{\~n}as},
+ eventdate = {2002-04-11},
+ location = {Lima, Peru}}
+%[[ end ]]
+%[[ Beyonce:2016vj ]]
+@performance{Beyonce:2016vj,
+ author = {Beyonc{\'e}},
+ title = {The Formation World Tour},
+ eventdate = {2016-05-14},
+ location = {Los Angeles},
+ venue = {Rose Bowl}}
+%[[ end ]]
+%[[ Brown:2019uj ]]
+@performance{Brown:2019uj,
+ author = {Brown, Trisha},
+ title = {Foray For{\^e}t},
+ organization = {Performance by Trisha Brown Dance Company},
+ eventdate = {2019-09-28},
+ location = {Philadelphia},
+ venue = {Fairmount Park}}
+%[[ end ]]
+%[[ Lynn:2016wu ]]
+@performance{Lynn:2016wu,
+ author = {Lynn, Loretta},
+ title = {Concert},
+ organization = {South by Southwest},
+ eventdate = {2016-03-17},
+ location = {Austin},
+ venue = {Stubb's},
+ entrysubtype = {untitled}}
+%[[ end ]]
+%[[ Shaw:2006vz ]]
+@performance{Shaw:2006vz,
+ author = {Shaw, George Bernard},
+ title = {Heartbreak House},
+ editor = {Robin Lefevre},
+ organization = {Roundabout Theatre Company},
+ editortype = {director},
+ eventdate = {2006-10-11},
+ location = {New York City},
+ venue = {American Airlines Theatre}}
+%[[ end ]]
+%[[ SingMe:2019vl ]]
+@performance{SingMe:2019vl,
+ title = {Sing Me the Universal},
+ subtitle = {A Walt Whitman Bicentennial},
+ eventdate = {2019-03-02},
+ location = {New York City},
+ namea = {Mark Shapiro},
+ nameatype = {conductor},
+ nameb = {{Cecilia Chorus of New York}},
+ namebtype = {performer},
+ venue = {Church of Saint Francis Xavier}}
+%[[ end ]]
+%[[ Clowes:1998wp ]]
+@periodical{Clowes:1998wp,
+ author = {Daniel Clowes},
+ title = {Eightball},
+ publisher = {Fantagraphics},
+ date = {1998},
+ issuetitle = {David Boring},
+ number = {19}}
+%[[ end ]]
+%[[ Chang:2000uv ]]
+@proceedings{Chang:2000uv,
+ editor = {Steve S. Chang and Lily Liaw and Joseph Ruppenhofer},
+ publisher = {Berkeley Linguistics Society},
+ date = {2000},
+ booktitle = {Proceedings of the Twenty-Fifth Annual Meeting of the Berkeley Linguistics Society, February 12--15, 1999},
+ booksubtitle = {General Session and Parasession on Loan Word Phenomena}}
+%[[ end ]]
+%[[ ExecutiveSummary:we ]]
+@report{ExecutiveSummary:we,
+ author = {{Executive summary}},
+ title = {Report of the Task Force on Doctoral Study in Modern Language and Literature},
+ date = {2014},
+ institution = {Modern Language Association of America},
+ url = {www.mla.org/content/download/25438/1164362/execsumtaskforcedocstudy.pdf}}
+%[[ end ]]
+%[[ Powell:wl ]]
+@report{Powell:wl,
+ author = {Catherine Powell and Ann Mei Chang},
+ title = {Women in Tech as a Driver for Growth in Emerging Economies},
+ date = {2016-07},
+ institution = {Council on Foreign Relations Press},
+ url = {cdn.cfr.org/sites/default/files/pdf/2016/06/Discussion_Paper_Powell_Chang_Women_ICT_OR.pdf}}
+%[[ end ]]
+%[[ ReadingRisk:vu ]]
+@report{ReadingRisk:vu,
+ title = {Reading at Risk},
+ subtitle = {A Survey of Literary Reading in America},
+ date = {2004-06},
+ institution = {National Endowment for the Arts}}
+%[[ end ]]
+%[[ Racial:vh ]]
+@review{Racial:vh,
+ title = {Racial Stereotype Busters},
+ subtitle = {Black Scientists Who Made a Difference},
+ date = {1999},
+ journal = {Journal of Blacks in Higher Education},
+ pages = {133--34},
+ volume = {25}}
+%[[ end ]]
+%[[ Rohrbaugh:aa ]]
+@review{Rohrbaugh:aa,
+ author = {Lisa Rohrbaugh},
+ date = {2020-07-01},
+ bookauthor = {Scott O'Connor},
+ booktitle = {Zero Zone},
+ journal = {Library Journal},
+ url = {www.libraryjournal.com/?reviewDetail=zero-zone}}
+%[[ end ]]
+%[[ Tommasini:tm ]]
+@review{Tommasini:tm,
+ author = {Tommasini, Anthony},
+ title = {A Feminist Look at Sophocles},
+ date = {1998-06-11},
+ journal = {The New York Times},
+ pages = {p. E5},
+ version = {late ed.},
+ entrysubtype = {newspaper}}
+%[[ end ]]
+%[[ YouWill:aa ]]
+@review{YouWill:aa,
+ date = {2016-05-05},
+ bookauthor = {Megan Abbott},
+ booktitle = {You Will Know Me},
+ journal = {Kirkus Reviews},
+ url = {www.kirkusreviews.com/book-reviews/megan-abbott/you-will-know-me/}}
+%[[ end ]]
+%[[ AngryBirds:2016vs ]]
+@software{AngryBirds:2016vs,
+ title = {Angry Birds},
+ publisher = {Rovio Entertainment},
+ date = {2016-12-10},
+ version = {7.0.0}}
+%[[ end ]]
+%[[ VidaSystems:2020ua ]]
+@software{VidaSystems:2020ua,
+ author = {VidaSystems},
+ title = {Aurora Borealis},
+ eventdate = {2020-01-03},
+ maintitle = {Google Expeditions app}}
+%[[ end ]]
+%[[ anon:1994ti ]]
+@suppbook{anon:1994ti,
+ title = {Appendix C},
+ subtitle = {Resuscitation from Apparent Death by Electric Shock},
+ publisher = {{Touch and Go Records}},
+ date = {1994},
+ bookauthor = {Shellac},
+ booktitle = {At Action Park}}
+%[[ end ]]
+%[[ Boyd:1992aa ]]
+@suppbook{Boyd:1992aa,
+ author = {Malcolm Boyd},
+ publisher = {Deutsche Grammophon},
+ date = {1992},
+ booktitle = {The Bach Album},
+ entrysubtype = {Booklet}}
+%[[ end ]]
+%[[ Felstiner:2001aa ]]
+@suppbook{Felstiner:2001aa,
+ author = {John Felstiner},
+ publisher = {W. W. Norton},
+ date = {2001},
+ booktitle = {Selected Poems and Prose of Paul Celan},
+ pages = {xix--xxxvi},
+ translator = {Felstiner, John},
+ entrysubtype = {Preface}}
+%[[ end ]]
+%[[ Gere:2021aa ]]
+@suppbook{Gere:2021aa,
+ author = {Gere, Anne Ruggles},
+ editor = {Diane Kelly-Riley and Norbert Elliot},
+ publisher = {Modern Language Association of America},
+ date = {2021},
+ booktitle = {Improving Outcomes},
+ booksubtitle = {Disciplinary Writing, Local Assessment, and the Aim of Fairness},
+ pages = {vii--viii},
+ entrysubtype = {Foreword}}
+%[[ end ]]
+%[[ Lewiston:aa ]]
+@suppbook{Lewiston:aa,
+ author = {David Lewiston},
+ publisher = {Nonesuch},
+ booktitle = {The Balinese Gamelan},
+ booksubtitle = {Music from the Morning of the World},
+ entrysubtype = {Liner notes}}
+%[[ end ]]
+%[[ Race:1959aa ]]
+@suppbook{Race:1959aa,
+ author = {Steve Race},
+ publisher = {Columbia Records},
+ date = {1959},
+ bookauthor = {Dave Brubeck Quartet},
+ booktitle = {Time Out},
+ entrysubtype = {Liner notes}}
+%[[ end ]]
+%[[ Seyhan:2008wz ]]
+@suppbook{Seyhan:2008wz,
+ author = {Seyhan, Azade},
+ title = {Novel Moves},
+ publisher = {Modern Language Association of America},
+ date = {2008},
+ bookauthor = {Seyhan, Azade},
+ booktitle = {Tales of Crossed Destinies},
+ booksubtitle = {The Modern Turkish Novel in a Comparative Context},
+ pages = {1--22}}
+%[[ end ]]
+%[[ Wallach:2000we ]]
+@suppbook{Wallach:2000we,
+ author = {Rick Wallach},
+ title = {Cormac McCarthy's Canon as Accidental Artifact},
+ editor = {Wallach, Rick},
+ publisher = {Manchester University Press},
+ date = {2000},
+ booktitle = {Myth, Legend, Dust},
+ booksubtitle = {Critical Responses to Cormac McCarthy},
+ pages = {xiv--xvi},
+ entrysubtype = {Introduction}}
+%[[ end ]]
+%[[ Njus:2010aa ]]
+@thesis{Njus:2010aa,
+ author = {Jesse Njus},
+ title = {Performing the Passion},
+ subtitle = {A Study on the Nature of Medieval Acting},
+ date = {2010},
+ eprinttype = {ProQuest},
+ school = {Northwestern University},
+ type = {phd},
+ url = {search.proquest.com/docview/305212264}}
+%[[ end ]]
+%[[ Njus:2010vc ]]
+@thesis{Njus:2010vc,
+ author = {Jesse Njus},
+ title = {Performing the Passion},
+ subtitle = {A Study on the Nature of Medieval Acting},
+ date = {2010},
+ school = {Northwestern University},
+ type = {phd}}
+%[[ end ]]
+%[[ Atwood:1993tp ]]
+@unpublished{Atwood:1993tp,
+ author = {Margaret Atwood},
+ title = {Silencing the Scream},
+ organization = {MLA Annual Convention},
+ eventdate = {1993-12-29},
+ location = {Toronto},
+ titleaddon = {Boundaries of the Imagination Forum},
+ venue = {Royal York Hotel}}
+%[[ end ]]
+%[[ Auden:wg ]]
+@unpublished{Auden:wg,
+ author = {W. H. Auden and Klaus Mann},
+ title = {Prospectus},
+ library = {\mkbibemph{Decision} magazine papers, Yale U Library, Manuscripts and Archives},
+ number = {MS 176, box 1, folder 20},
+ entrysubtype = {untitled}}
+%[[ end ]]
+%[[ Dickinson:aa ]]
+@unpublished{Dickinson:aa,
+ author = {Dickinson, Emily},
+ title = {Distance Is Not the Realm of Fox},
+ library = {Pierpont Morgan Library},
+ location = {New York City},
+ origdate = {1870?},
+ addendum = {Manuscript}}
+%[[ end ]]
+%[[ Ford:2016vm ]]
+@unpublished{Ford:2016vm,
+ author = {Jane Ford},
+ title = {Lecture},
+ eventdate = {2016-04-04},
+ note = {Introduction to the History of Art},
+ venue = {Bates College},
+ entrysubtype = {untitled}}
+%[[ end ]]
+%[[ Jones:vh ]]
+@unpublished{Jones:vh,
+ author = {Celia Jones},
+ title = {Shakespeare's Dark Lady Illuminated},
+ date = {1988}}
+%[[ end ]]
+%[[ Moskowitz:wb ]]
+@unpublished{Moskowitz:wb,
+ author = {Julie Moskowitz},
+ title = {Service Learning and Online Courses},
+ date = {2017-02-20}}
+%[[ end ]]
+%[[ AirCanada:us ]]
+@video{AirCanada:us,
+ title = {Air Canada},
+ subtitle = {We're in the Business of You},
+ date = {2019-04-08},
+ maintitle = {YouTube},
+ maintitleaddon = {uploaded by Air Canada},
+ url = {www.youtube.com/watch?v=GE9AFpsg7H8}}
+%[[ end ]]
+%[[ Allende:2007bw ]]
+@video{Allende:2007bw,
+ author = {Isabel Allende},
+ title = {Tales of Passion},
+ date = {2007-03},
+ maintitle = {TED},
+ url = {www.ted.com/talks/isabel_allende_tells_tales_of_passion?language=en},
+ addendum = {Transcript}}
+%[[ end ]]
+%[[ Allende:2007vc ]]
+@video{Allende:2007vc,
+ author = {Isabel Allende},
+ title = {Tales of Passion},
+ date = {2007-03},
+ maintitle = {TED},
+ url = {www.ted.com/talks/isabel_allende_tells_tales_of_passion?language=en}}
+%[[ end ]]
+%[[ Fleabag:2019:tq ]]
+@video{Fleabag:2019:tq,
+ title = {Fleabag},
+ publisher = {BBC},
+ date = {2019-03-18},
+ namea = {Phoebe Waller-Bridge},
+ nameatype = {creator},
+ number = {3},
+ season = {2}}
+%[[ end ]]
+%[[ Hush:1999:vg ]]
+@video{Hush:1999:vg,
+ title = {Hush},
+ publisher = {Mutant Enemy and Twentieth Century Fox},
+ date = {2003},
+ maintitle = {Buffy the Vampire Slayer},
+ mainsubtitle = {The Complete Fourth Season},
+ namea = {Joss Whedon},
+ nameatype = {creator},
+ note = {disc 3},
+ number = {10},
+ origdate = {1999},
+ addendum = {DVD}}
+%[[ end ]]
+%[[ Hush:1999:vi ]]
+@video{Hush:1999:vi,
+ title = {Hush},
+ publisher = {Mutant Enemy and WB Television Network},
+ date = {1999-12-14},
+ maintitle = {Buffy the Vampire Slayer},
+ namea = {Joss Whedon},
+ nameatype = {creator},
+ number = {10},
+ season = {4}}
+%[[ end ]]
+%[[ IBorg:1992:wz ]]
+@video{IBorg:1992:wz,
+ title = {I, Borg},
+ publisher = {Paramount Pictures},
+ date = {1992},
+ eprinttype = {Netflix},
+ maintitle = {Star Trek},
+ mainsubtitle = {The Next Generation},
+ number = {23},
+ season = {5},
+ url = {www.netflix.com}}
+%[[ end ]]
+%[[ Jeopardy:2019:td ]]
+@video{Jeopardy:2019:td,
+ title = {Jeopardy!},
+ publisher = {ABC},
+ date = {2019-11-07}}
+%[[ end ]]
+%[[ NewNormal:2016:vi ]]
+@video{NewNormal:2016:vi,
+ title = {New Normal},
+ publisher = {Showtime},
+ date = {2016-07-24},
+ maintitle = {Homeland},
+ namea = {Dan Attias},
+ nameatype = {director},
+ number = {10},
+ season = {5},
+ options = {uniquenamea=true},
+ addendum = {Amazon Prime Video app}}
+%[[ end ]]
+%[[ SaturdayNight:2019:vu ]]
+@video{SaturdayNight:2019:vu,
+ title = {Saturday Night Live},
+ publisher = {NBC},
+ date = {2019-03-30},
+ namea = {Sandra Oh},
+ nameatype = {host},
+ number = {16},
+ season = {44}}
+%[[ end ]]
+%[[ WhatIsMLA:2016:wq ]]
+@video{WhatIsMLA:2016:wq,
+ title = {What Is the MLA International Bibliography?},
+ date = {2016-10-14},
+ maintitle = {Vimeo},
+ namea = {{MLA International Bibliography}},
+ nameatype = {uploaded by},
+ url = {vimeo.com/187399565}}
+%[[ end ]] \ No newline at end of file
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-mla/english-mla.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-mla/english-mla.lbx
index 9246682fc5..bbca9beedb 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-mla/english-mla.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-mla/english-mla.lbx
@@ -1,9 +1,17 @@
-% english-mla.lbx v2.0 2021/05/12
+% english-mla.lbx v2.1 2022/02/21
-\ProvidesFile{english-mla.lbx}[2021/05/12 v2.0 biblatex style localization]
+\ProvidesFile{english-mla.lbx}[2022/02/21 v2.1 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/macros/latex/contrib/biblatex-contrib/biblatex-mla/italian-mla.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-mla/italian-mla.lbx
index 20aee0c0ec..4e3a972908 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-mla/italian-mla.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-mla/italian-mla.lbx
@@ -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/macros/latex/contrib/biblatex-contrib/biblatex-mla/mla-new.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-mla/mla-new.cbx
index 6f5d00babf..f90e4f1aa9 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-mla/mla-new.cbx
+++ b/macros/latex/contrib/biblatex-contrib/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/21 v2.1 biblatex citation style]
\RequireCitationStyle{mla}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-mla/mla-strict.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-mla/mla-strict.bbx
index ce97a2b3a0..71c8e6fcdb 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-mla/mla-strict.bbx
+++ b/macros/latex/contrib/biblatex-contrib/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.1 2022/02/21 * 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/21 v2.1 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/macros/latex/contrib/biblatex-contrib/biblatex-mla/mla-strict.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-mla/mla-strict.cbx
index e95302f1ad..b76c2fa0fb 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-mla/mla-strict.cbx
+++ b/macros/latex/contrib/biblatex-contrib/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/21 v2.1 biblatex citation style]
\RequireCitationStyle{mla}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-mla/mla.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-mla/mla.bbx
index 2ee9431d57..c226d81cf7 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-mla/mla.bbx
+++ b/macros/latex/contrib/biblatex-contrib/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/21 v2.1 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/macros/latex/contrib/biblatex-contrib/biblatex-mla/mla.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-mla/mla.cbx
index 1085fb5623..1e2ef627a0 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-mla/mla.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-mla/mla.cbx
@@ -1,11 +1,11 @@
-% mla.cbx, v2.0 2021/06/07 * compatible with biblatex 3.16
+% mla.cbx, v2.1 2022/02/21 * 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}[2021/10/31 v2.1 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/macros/latex/contrib/biblatex-contrib/biblatex-mla/portuguese-mla.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-mla/portuguese-mla.lbx
index c9300b8a3a..e2ca0a13b3 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-mla/portuguese-mla.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-mla/portuguese-mla.lbx
@@ -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/macros/latex/contrib/biblatex-contrib/biblatex-mla/spanish-mla.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-mla/spanish-mla.lbx
index 3414eb8ac9..b614fe3f72 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-mla/spanish-mla.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-mla/spanish-mla.lbx
@@ -8,6 +8,112 @@
\InheritBibliographyExtras{spanish}
+\DeclareBibliographyStrings{%
+ inherit = {spanish},
+ % andothers = {{et~al\adddot}{et~al\adddot}},
+ % byeditor = {{ed\adddot}{ed\adddot}},% FIXME "ed. by" in first instance
+ % 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
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 0903ac961b..1b31a3d6a3 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2022/02/16}{1.629}
+\ProvidesExplClass{easybook}{2022/02/21}{1.63}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -303,7 +303,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2022/02/16}{1.629}
+\ProvidesExplPackage{easybase}{2022/02/21}{1.63}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -572,7 +572,7 @@
vmargin = 2.54cm,
hmargin = 3.17cm,
columnsep = 2em,
- headheight = 2.04cm,
+ headheight = 2.14cm,
headsep = 0.4cm,
footnotesep = 0.4cm,
footskip = 0.79cm,
@@ -652,6 +652,7 @@
{
{ all } { \text_uppercase:n }
{ first } { \text_titlecase_first:n }
+ { none* } { \text_lowercase:n }
}
}
\ctex_define:nn { hdrset }
@@ -2237,8 +2238,8 @@
\labelformat{table}{\tablename~#1}
\tl_if_eq:NnTF \l__ctex_scheme_tl { chinese }
{
- \labelformat{section}{节 #1}
- \labelformat{subsection}{小节 #1}
+ \labelformat{section}{节#1}
+ \labelformat{subsection}{小节#1}
}
{
\labelformat{section}{Section~#1}
@@ -2271,7 +2272,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2022/02/16}{1.629}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/02/21}{1.63}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 5080515171..8e30a93e09 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex
index 3b5358c2e0..70d9788dfc 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -20,16 +20,16 @@
{
name = easybook,
color-scheme = blue,
- title = EASYBOOK 使用手册,
- version = v1.629,
- date = 2022/02/16,
+ title = EASYBOOK使用手册,
+ version = v1.63,
+ date = 2022/02/21,
authors = 瞿毅,
info = 排版简体中文学位论文和书籍,
email = q1jx@foxmail.com,
url = https://gitee.com/texl3/easybook,
abstract =
{
- \cls*{easybook} 是基于 \cls*{ctexbook} 书籍文档类创建的纯净学术模板,同时兼具 \cls*{book} 与 \cls*{article} 文档类的功能。结合中国许多高校学位论文的通用框架设计,提供多个命令和接口可以使用户简便地定制论文模板。它的基础宏包 \pkg*{easybase} 还可以搭配 C\TeX 和标准文档类使用。
+ \cls*{easybook} 是基于 \cls*{ctexbook} 书籍文档类创建的纯净学术模板,同时兼具 \cls*{book} 与 \cls*{article} 文档类的功能。结合中国许多高校学位论文的通用框架设计,提供多个命令和接口可以使用户简便地定制论文模板。它的基础宏包 \pkg*{easybase} 还可以搭配 \CTeX 和标准文档类使用。
},
arg-format = \normalfont\small\itshape,
abstract-format = \small,
@@ -159,10 +159,10 @@
}
}
\makeatother\ExplSyntaxOff
-\labelformat{section}{节 #1}
-\labelformat{subsection}{小节 #1}
-\labelformat{subsubsection}{小节 #1}
-\labelformat{ctexexam}{例 #1}
+\labelformat{section}{节#1}
+\labelformat{subsection}{小节#1}
+\labelformat{subsubsection}{小节#1}
+\labelformat{ctexexam}{例#1}
\begin{document}
@@ -170,7 +170,7 @@
您在使用 \cls*{easybook} 文档类编写文档前可能需要具备以下的条件:
\begin{itemize}
\item 使用 \hologo{XeLaTeX}(推荐)或 \hologo{LuaLaTeX} 两种编译方式。
- \item 由于文档类用到了一些 \LaTeX 和依赖宏包较新的功能,需要版本至少在 2020/10/01 以后的 \LaTeX 内核支持,建议您安装最新的 \TeX 发行版。
+ \item 由于文档类用到了一些 \LaTeX 和依赖宏包较新的功能,需要版本至少在2020/10/01以后的 \LaTeX 内核支持,建议您安装最新的 \TeX 发行版。
\item 虽然手册对基本用法做了介绍,但这并不是入门教程,所涉及到宏包的用法与命令也需要有了解。您应当具有一定的 \LaTeX 使用基础,可以在 \TeX 综合网站 \href{https://www.ctan.org/}{CTAN} 查看相关资源。
\end{itemize}
@@ -241,14 +241,14 @@
\section{文档类选项}
\label{sec:document class options}
-文档类选项应当在使用 \cls*{easybook} 文档类或 \pkg*{easybase} 宏包(部分支持)时载入,可见\ref{subsec:basic usage} 的例子。选项前带有 \ding{73} 符号表示只可用于文档类,否则文档类与宏包都适用。除了下面列举的选项以外,还支持标准和 C\TeX 文档类的选项。
+文档类选项应当在使用 \cls*{easybook} 文档类或 \pkg*{easybase} 宏包(部分支持)时载入,可见\ref{subsec:basic usage} 的例子。选项前带有 \ding{73} 符号表示只可用于文档类,否则文档类与宏包都适用。除了下面列举的选项以外,还支持标准和 \CTeX 文档类的选项。
\begin{options}
\opt{draft}
开启草稿模式会加快编译速度,表现有显示页面边框、行溢出的地方显示黑色方块、图片变成占位方框、显示当前日期和关闭超链接渲染。不使用绘图宏包及依赖于 \pkg*{tcolorbox} 宏包的盒子环境也会增快编译速度,详情见\ref{subsec:box}。
\opt{newline}\dtag
部分和章标题的样式为另起一行,符合一般英文书籍的习惯。
\keychoice{scheme}{chinese,plain}\dtag\Default{chinese}
- 文档主题方案选项 \option{scheme} 扩展了 C\TeX 文档类中同名选项原有的作用范围,选项值 \code{plain} 可使各类标题变为英文形式。包括章节标题、图表标题和定理名等。
+ 文档主题方案选项 \option{scheme} 扩展了 \CTeX 文档类中同名选项原有的作用范围,选项值 \code{plain} 可使各类标题变为英文形式。包括章节标题、图表标题和定理名等。
\opt{enmode}\dtag
同时开启 \option{newline} 和 \keyis{scheme}{plain} 选项以符合英文原生风格。
\keychoice{paper}{a4paper,b5paper,c5paper,letterpaper,other paper}\Default{a4paper}
@@ -264,7 +264,7 @@
\subsection{中文字体}
\begin{options}
\keychoice{cjkfont}{adobe,fandol,founder,mac,macnew,macold,ubuntu,windows,none}\dtag
- 中文字体采用 C\TeX 宏集包含的字库并与其一致,具体配置方案可以查看 C\TeX 使用手册。它与 \option*{fontset} 选项是等效的,如果没有指定 \option{cjkfont} 的值,将会自动检测操作系统并选择相应的字体。
+ 中文字体采用 \CTeX 宏集包含的字库并与其一致,具体配置方案可以查看 \CTeX 使用手册。它与 \option*{fontset} 选项是等效的,如果没有指定 \option{cjkfont} 的值,将会自动检测操作系统并选择相应的字体。
如果需要使用其它中文字体,可以在启用选项 \keyis{cjkfont}{none} 后,再使用 \pkg*{xeCJK} 宏包的相关命令设置字体以及声明字体族:
\begin{ctexexam}
@@ -320,7 +320,7 @@
\command{frontmatter}[\sarg\oarg{编号格式}]\Default{Roman}
前言区命令。使部分和章标题不编号,带有星号的变体命令不使用 \cs{cleardoublepage} 命令。页码 \meta{编号格式} 可设置为例如 \code{roman} 或 \code{Alph} 等形式。
\command{mainmatter}[\sarg]
- 主文区命令。章标题正常编号且页码为从 1 开始计数的阿拉伯数字,带有星号的变体命令不使用 \cs{cleardoublepage} 清双页命令。
+ 主文区命令。章标题正常编号且页码为从1开始计数的阿拉伯数字,带有星号的变体命令不使用 \cs{cleardoublepage} 清双页命令。
\command{backmatter}
后记区命令。页码格式与编号保持不变,章标题不编号。
\command{cleardoublepage}[\oarg{页面风格}]\Default{empty}
@@ -360,7 +360,7 @@
\keyval{aftertitle}{标题后代码}
目录标题文本之后插入的代码,生效情形同上。
\keyval{pagestyle}{页面风格}\Default{empty}
- 目录标题所在页的页面格式,仅当目录以 \code{chapter} 级别输出时有效。除了上述选项还支持 C\TeX 键值列表路径 \module*{chapter} 或 \module*{section} 所有的章节标题样式选项。
+ 目录标题所在页的页面格式,仅当目录以 \code{chapter} 级别输出时有效。除了上述选项还支持 \CTeX 键值列表路径 \module*{chapter} 或 \module*{section} 所有的章节标题样式选项。
\end{options}
\subsection{双语标题}
@@ -377,9 +377,9 @@
它们的星号变体命令使文中标题不编号,但是仍然加入双语目录,若英文标题参数空置那么仅加入中文目录而不加入英文目录,这一特点与 \cs*{chapter}\sarg{} 等命令的行为不太一样,在一些情况下会用到。可选参数是目录中的中文标题,默认与中文标题一致,正文标题过长时可用它设置在目录中显示的标题。默认情况下双语目录的格式是一致的,共享使用 \module*{tocset} 模块的设置,英文目录的章级别标题名及编号的修改方式如下:
\begin{options}
\kvsplit{biname}{英文目录前名字,英文目录后名字}\Module{chapter}\Default{Chapter\cs*{space}}
- 更改英文目录 \code{chapter} 级别的标题编号前后名字,类似于 C\TeX 的 \option*{name} 选项。
+ 更改英文目录 \code{chapter} 级别的标题编号前后名字,类似于 \CTeX 的 \option*{name} 选项。
\keyval{binmuber}{英文目录数字输出命令}\Default{\cs*{arabic}\Marg{chapter}}
- 更改英文目录 \code{chapter} 级别的标题编号输出格式,类似于 C\TeX 的 \option*{number} 选项。
+ 更改英文目录 \code{chapter} 级别的标题编号输出格式,类似于 \CTeX 的 \option*{number} 选项。
\end{options}
\begin{commands}
@@ -422,7 +422,7 @@
\label{sec:interface options}
\begin{commands}
\command*{ctexset}[\marg{键值列表}]
- \cls*{easybook} 扩展了 C\TeX 宏集 \hologo{LaTeX3} 风格键值的通用控制命令 \cs*{ctexset},接口选项同样可用它设置,原有的 \meta{键值列表} 仍然可用。本文档类目前有 9 个模块用于实现常规的排版功能,如下表所示。模块名也是统一接口 \cs*{ctexset} 的路径,不同模块单独接口的命令名\textbf{加上前缀} \code{eb}:
+ \cls*{easybook} 扩展了 \CTeX 宏集 \hologo{LaTeX3} 风格键值的通用控制命令 \cs*{ctexset},接口选项同样可用它设置,原有的 \meta{键值列表} 仍然可用。本文档类目前有9个模块用于实现常规的排版功能,如下表所示。模块名也是统一接口 \cs*{ctexset} 的路径,不同模块单独接口的命令名\textbf{加上前缀} \code{eb}:
\insertblr
{
colspec = @{}*{5}{c}@{},
@@ -463,22 +463,22 @@
声明新的颜色主题命令。它的参数以英文逗号分隔,第一部分为颜色风格名称,后面三部分为 \code{HTML} 颜色代码,构成主题颜色列表。类似地更改超链接颜色见\ref{subsec:hyperlinks}。
\end{commands}
\keyval{color-every}{HTML颜色代码}
- 统一设置主题的各部分颜色。参数是 6 个十六进制数字组成的 \code{HTML} 颜色代码,任意颜色的代码可以在常见的图片处理工具拾色器中查看。
+ 统一设置主题的各部分颜色。参数是6个十六进制数字组成的 \code{HTML} 颜色代码,任意颜色的代码可以在常见的图片处理工具拾色器中查看。
\keyval{multoc}{整数}\Default{2}
使目录多栏排版,与\ref{sec:document command} 中目录命令的同名选项有相同效果。
\keybool{withpart}\Default{false}
- 使章标题跟随部分计数器编号,当开启新的一部分时章编号从 1 开始。
+ 使章标题跟随部分计数器编号,当开启新的一部分时章编号从1开始。
\keychoice{fntnumwith}{part,chapter,page}\Default{chapter}
- 使脚注跟随编号的计数器名。默认跟随章计数器,即开启新的一章时脚注编号从 1 开始。
- \keychoice{uppercase}{all,first,none}\Default{all}
- 使用 \cs*{rightmark} 和 \cs*{leftmark} 等标题标记命令获取标题内容用于页眉页脚时其中英文的大小写类型。\code{all} 为标题标记中的英文字母全部大写,\code{first} 为标记以英文起始时仅第一个字母大写,\code{none} 则不改变标记中英文字母的大小写形式。
+ 使脚注跟随编号的计数器名。默认跟随章计数器,即开启新的一章时脚注编号从1开始。
+ \keychoice{uppercase}{all,first,none,none*}\Default{all}
+ 使用 \cs*{rightmark} 和 \cs*{leftmark} 等标题标记命令获取标题内容用于页眉页脚时其中英文的大小写类型。\code{all} 为标题标记中的英文字母全部大写。\code{first} 为标记以英文起始时仅第一个字母大写。\code{none} 不改变标记中英文字母的大小写形式,变体 \code{none*} 则强制标记的字母均为小写形式。
\kvsplit{brackets}{左括号,右括号}\Default{\Marg{(,)}}
设置行间公式编号标签的括号及格式,以英文逗号分隔,分别代表左右括号。\meta{左括号} 可以是带有一个参数的命令,用于接受编号和 \meta{右括号}。将标签括号设置为方括号,并使用无衬线字体:
\begin{ctexexam}
\newcommand{\bracketsf}[1]{\textsf{[#1}}
\ebstyle{brackets = {\bracketsf,]}}
\end{ctexexam}
- \kvsplit-{figurepath}{\marg{路径名1}\marg{路径名2}}
+ \kvsplit-{figurepath}{\marg{路径名1}\marg{路径名2}\marg{路径名n}}
设置插入图片的文件夹路径名。可以有多个路径名,每个路径包含在花括号内分隔,只有一个路径时需要包含在两层括号内。
\end{options}
@@ -538,7 +538,7 @@
声明新的超链接颜色样式命令。它的参数以英文逗号分隔,第一部分为颜色风格名称,后面三部分为 \code{HTML} 颜色代码,构成超链接颜色列表。
\end{commands}
\keyval{linkcolor-every}{HTML颜色代码}
- 统一设置超链接的各部分颜色。参数是 6 个十六进制数字组成的 \code{HTML} 颜色代码,任意颜色的代码可以在常见的图片处理工具拾色器中查看。
+ 统一设置超链接的各部分颜色。参数是6个十六进制数字组成的 \code{HTML} 颜色代码,任意颜色的代码可以在常见的图片处理工具拾色器中查看。
\keychoice{linktoc}{none,section,page,all}\Default{all}
将目录中的超链接取消、置于标题上、置于页码上或置于标题和页码上。
\end{options}
@@ -548,7 +548,7 @@
行距因子用于设置各种行距倍数,\meta{数值} 是不带有长度单位的浮点数。各类行距既可以在导言区全局设置,也可以在正文中设置对后面生效。
\begin{options}
\keyval{line}{数值}\Module{spread}\Default{1.354}
- 正文行距因子,注意 C\TeX 宏集原有的行距选项 \option*{linespread} 失效。
+ 正文行距因子,注意 \CTeX 宏集原有的行距选项 \option*{linespread} 失效。
\keyval{table}{数值}\Default{1.354}
表格内容行距因子。对传统表格 \env*{tabular} 和 \env*{tabularx} 等环境以及 \pkg*{tabularray} 宏包的 \env{tblr} 环境生效,同时 \env{tblr} 也自带有 \option*{stretch} 选项设置行距系数。
\keyval{math}{数值}\Default{1.354}
@@ -603,7 +603,7 @@
\keychoice{backend}{bibtex,biblatex}\Module{bibset}\Default{bibtex}
参考文献处理后端。默认用传统的 \hologo{BibTeX} 处理参考文献\footnote{使用 \hologo{BibTeX} 引擎时加载 \pkg*{natbib} 宏包,使用 \hologo{biber} 时将加载 \pkg*{biblatex} 宏包。}。
\keychoice{bibstyle}{numerical,authoryear,other sty}\Default{numerical}
- 参考文献格式使用中国参考文献推荐标准 GB/T 7714-2015,对应顺序编码制和著者—出版年制两种风格。若使用其它格式,使用 \hologo{BibTeX} 处理时需确保正确的 \code{bst} 文件,使用 \hologo{biber} 处理可使用 \pkg*{biblatex} 宏包支持的参考文献风格名称。
+ 参考文献格式使用中国参考文献推荐标准GB/T 7714-2015,对应顺序编码制和著者—出版年制两种风格。若使用其它格式,使用 \hologo{BibTeX} 处理时需确保正确的 \code{bst} 文件,使用 \hologo{biber} 处理可使用 \pkg*{biblatex} 宏包支持的参考文献风格名称。
\keyval{citestyle}{标注风格}
标注参考文献的风格。选项 \keyis{backend}{bibtex} 下可使用 \option{super}(数字上标标注,默认)或 \option{numbers}(数字标注)等 \pkg*{natbib} 宏包带有的标注风格,选项 \keyis{backend}{biblatex} 下可使用 \pkg*{biblatex} 宏包支持的标注风格名称。
\keyval{datafile}{参考文献数据库列表}
@@ -621,7 +621,7 @@
\keyval*{prenote}{参考文献前注}
该选项选择由 \cs*{defbibnote} 所定义的前注,缺省状态下不打印任何前注。
\keyval*{section}{整数}\Default{0}
- 只打印在指定文节中引用的条目。该参考文献节从 1 开始编号,所有在 \env*{refsection} 环境外给出的引用标记为第零节。
+ 只打印在指定文节中引用的条目。该参考文献节从1开始编号,所有在 \env*{refsection} 环境外给出的引用标记为第零节。
\keyval*{type}{条目类型}
指定条目的打印类型。
\keyval*{filter}{过滤器名}
@@ -763,7 +763,7 @@
\begin{commands}\noitemsep
\command{fancyhead}[\oarg{位置}\marg{内容}]\default{}
\command{fancyfoot}[\oarg{位置}\marg{内容}]
- 使用 \cs{fancyhead} 和 \cs{fancyfoot} 等命令设置页眉页脚时为了显示正确的页面,在导言区时需要在页面边距的命令之后。默认设置的是一个名为 \code{fancy} 的页面风格。\pkg*{fancyhdr} 将页眉页脚分成了左中右和奇数页(odd)、偶数页(even)共 12 个部分,可选参数中 \code{E} 和 \code{O} 代表偶数和奇数,\code{L}、\code{C} 和 \code{R} 代表左、中和右部分。单面打印时,含有偶数位置的命令无效。
+ 使用 \cs{fancyhead} 和 \cs{fancyfoot} 等命令设置页眉页脚时为了显示正确的页面,在导言区时需要在页面边距的命令之后。默认设置的是一个名为 \code{fancy} 的页面风格。\pkg*{fancyhdr} 将页眉页脚分成了左中右和奇数页(odd)、偶数页(even)共12个部分,可选参数中 \code{E} 和 \code{O} 代表偶数和奇数,\code{L}、\code{C} 和 \code{R} 代表左、中和右部分。单面打印时,含有偶数位置的命令无效。
\end{commands}
\begin{commands}\noitemsep
@@ -802,7 +802,7 @@
\keychoice{fntext-pos}{normal,super}\Default{super}
设置脚注内容标记的位置,正常文本或是上标形式。
\keychoice{fnmark-num}{plain,pifont,pifont*,pisans,pisans*,short num}\Default{plain}
- 脚注正文标记编号的类型。默认为原生样式 \code{plain},还可以改为 \code{pifont} 的各个版本,从左往右依次为普通版、阴文衬线版、阳文无衬线版和阴文无衬线版,缺点是它们的编号仅包括 1-10。
+ 脚注正文标记编号的类型。默认为原生样式 \code{plain},还可以改为 \code{pifont} 的各个版本,从左往右依次为普通版、阴文衬线版、阳文无衬线版和阴文无衬线版,缺点是它们的编号仅包括1-10。
短编号的形式与列表环境类似,不过增加了中文数字 \code{c} 和符号 \code{s} 格式参数。原生样式 \code{plain} 等同于单独使用数字 \code{1} 参数。这个选项可以用在正文中改变其后脚注编号类型。
\begin{commands}
@@ -907,7 +907,7 @@
\ctexset
{
figure/tocline = \listnumberline{figure}#2,
- lstlisting/tocline = \protect\numberline{代码 #1\hspace{1em}}#2
+ lstlisting/tocline = \protect\numberline{代码#1\hspace{1em}}#2
}
\end{ctexexam}
\end{options}
@@ -935,7 +935,7 @@
\keybool{hang}\Default{true}
悬挂缩进选项 \option{hang} 使目录条目为悬挂缩进形式。缩进距离为条目编号及其与标题间距的长度和。这个选项对所有条目级别有效。
\keyval{lolskip}{弹性长度}\Default{10pt}
- 代码目录中每章第一个条目上方增加的垂直距离。与 C\TeX 的表格和图片目录中每章间的条目距离选项 \option*{lotskip} 和 \option*{lofskip} 类似,在 \cls*{article} 模式中此选项失效。
+ 代码目录中每章第一个条目上方增加的垂直距离。与 \CTeX 的表格和图片目录中每章间的条目距离选项 \option*{lotskip} 和 \option*{lofskip} 类似,在 \cls*{article} 模式中此选项失效。
\keyval{between}{代码钩子}
目录标题与内容间的钩子(作用于标题下方间距之后),一般插入负的垂直距离代码用于抵消目录首行额外的垂直间距。一级路径此选项对应文档主目录的钩子,二级路径为 \module*{figure}、\module*{table} 和 \module*{lstlisting},或者用位于 \module*{list} 路径的此选项统一设置相应类型目录的钩子。
\keybool{dotalign}\Default{true}
@@ -1054,12 +1054,12 @@
\begin{options}\noitemsep
\keyval{lstlistlistingname}{代码目录标题名}\default{}
\keyval{lstlistingname}{代码题注标题名}
- 代码目录名与代码环境题注名选项 \option*{lstlistlistingname} 和 \option*{lstlistingname} 用法与 C\TeX 使用手册标题汉化一节类似,可以看作对这节的扩展。
+ 代码目录名与代码环境题注名选项 \option*{lstlistlistingname} 和 \option*{lstlistingname} 用法与 \CTeX 使用手册标题汉化一节类似,可以看作对这节的扩展。
\end{options}
\subsection{盒子}
\label{subsec:box}
-文档类预置了两个行间盒子环境和两个行内盒子命令,需要在导言区\textbf{手动载入} \pkg*{tcolorbox} 宏包提供支持。它们 \meta{配置选项} 的键值列表可见宏包文档的 Option Keys 一节,可以进行边距、字体及背景颜色等各种个性化设置。如果 \meta{配置选项} 较长且希望在原有基础上改为全局固定的样式,可以使用 \cs{addtotcbstyle} 命令设置,第一个参数为 \code{tc-}\meta{环境或命令名}。
+文档类预置了两个行间盒子环境和两个行内盒子命令,需要在导言区\textbf{手动载入} \pkg*{tcolorbox} 宏包提供支持。它们 \meta{配置选项} 的键值列表可见宏包文档的Option Keys一节,可以进行边距、字体及背景颜色等各种个性化设置。如果 \meta{配置选项} 较长且希望在原有基础上改为全局固定的样式,可以使用 \cs{addtotcbstyle} 命令设置,第一个参数为 \code{tc-}\meta{环境或命令名}。
\begin{commands}
\command{deftcbstyle}[\marg{盒子风格}\marg{键值列表}]
新建或重置一个名称为 \meta{盒子风格} 的 \pkg*{tcolorbox} 宏包盒子风格,可以与 \cs{addtotcbstyle} 命令联用。
@@ -1129,12 +1129,12 @@
\begin{commands}\noitemsep
\command{newcounter}[\marg{计数器}\oarg{父计数器}]\default{}
\command{counteruse}[\sarg\oarg{父计数器}\darg{编号}\marg{计数器}\oarg{分隔符}\darg{整数}]
- 命令 \cs{newcounter} 是 \LaTeX 自带的创建计数器命令,计数器值输出命令 \cs{counteruse} 以一定的格式使用由它创建的计数器,将会以 \cs*{the}\meta{父计数器}\meta{分隔符}\cs*{the}\meta{计数器} 输出这种计数器的值。命令 \cs{counteruse} 仅具有\textbf{输出功能},并不会改变计数器原有的绑定关系。默认每使用一次命令 \meta{计数器} 的值增加 1,带有星号的命令使 \meta{计数器} 值保持不变,\meta{计数器} 的值也可以设为指定的 \meta{整数}。计数器的 \meta{编号} 为 \code{arabic} 或 \code{alph} 等计数形式。
+ 命令 \cs{newcounter} 是 \LaTeX 自带的创建计数器命令,计数器值输出命令 \cs{counteruse} 以一定的格式使用由它创建的计数器,将会以 \cs*{the}\meta{父计数器}\meta{分隔符}\cs*{the}\meta{计数器} 输出这种计数器的值。命令 \cs{counteruse} 仅具有\textbf{输出功能},并不会改变计数器原有的绑定关系。默认每使用一次命令 \meta{计数器} 的值增加1,带有星号的命令使 \meta{计数器} 值保持不变,\meta{计数器} 的值也可以设为指定的 \meta{整数}。计数器的 \meta{编号} 为 \code{arabic} 或 \code{alph} 等计数形式。
在一定的场合下可能用到 \cs{counteruse} 命令,比如通过新建快捷命令在一些位置使用定理环境的计数器,使用 \cs{labelformat} 设置计数器的标签引用需添加 \code{eb@}:
\begin{ctexexam}
- \labelformat{eb@theorem}{定理 #1}
- \newcommand{\theoremhead}[1]{定理 \counteruse[chapter]{theorem}\hspace{1em}#1}
+ \labelformat{eb@theorem}{定理#1}
+ \newcommand{\theoremhead}[1]{定理\counteruse[chapter]{theorem}\hspace{1em}#1}
\theoremhead{定理内容}\label{thm:theorem}
\end{ctexexam}
@@ -1155,8 +1155,8 @@
\command{AtEndPreamble}[\marg{钩子代码}]
导言区末尾的钩子命令。为了保证兼容性 \pkg*{hyperref} 宏包被设计在导言区末尾载入,一些情况下需要合适的钩子在 \pkg*{hyperref} 后方执行 \meta{钩子代码},例如载入 \pkg*{cleveref} 宏包。
\begin{ctexexam}
- \labelformat{chapter}{第 #1 章}
- \labelformat{chapter}{第 \thechapter 章}
+ \labelformat{chapter}{第#1章}
+ \labelformat{chapter}{第\thechapter 章}
\AtEndPreamble{\usepackage{cleveref}}
\end{ctexexam}
\end{commands}
@@ -1278,7 +1278,7 @@
\item 文档类移除预置的定理环境,改为由用户自行定义环境。
\item 考虑到功能性和实用性不强弃用摘要环境 \env*{outline} 和习题环境 \env*{exercise}。
\end{version}
- \begin{version}[v = 1.626,date = 2022/02/14]
+ \begin{version}[v = 1.62,date = 2022/02/16]
\added
\item 增加目录条目下方执行的代码选项 \option{tocbelow}。
\changed
diff --git a/macros/latex/contrib/l3kernel/CHANGELOG.md b/macros/latex/contrib/l3kernel/CHANGELOG.md
index fe785d6886..2597f8eccf 100644
--- a/macros/latex/contrib/l3kernel/CHANGELOG.md
+++ b/macros/latex/contrib/l3kernel/CHANGELOG.md
@@ -7,6 +7,11 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2022-02-21]
+
+### Fixed
+- Use of `\@uclclist` for case changing
+
## [2022-02-05]
### Added
@@ -15,7 +20,7 @@ this project uses date-based 'snapshot' version identifiers.
command in LaTeX2e
### Changed
-- Documentation for horizontal coffin poles (see issue #1041)
+- Documentation for horizontal coffin poles (see issue \#1041)
- Update primitive requirements to enable loading with Prote/HINT
## [2022-01-21]
@@ -68,12 +73,12 @@ this project uses date-based 'snapshot' version identifiers.
- DeviceN colorspace conversions with alternative model RGB
### Added
-- `.str_set:N`, etc., key properties (issue #1007)
-- `\bool_to_str:n` (issue #1010)
+- `.str_set:N`, etc., key properties (issue \#1007)
+- `\bool_to_str:n` (issue \#1010)
### Changed
- `\prop_..._from_keyval:Nn` functions now support active comma or
- equal sign (pull #1012)
+ equal sign (pull \#1012)
## [2021-10-18]
@@ -96,13 +101,13 @@ this project uses date-based 'snapshot' version identifiers.
## [2021-08-27]
### Changed
-- Formatting of expandable errors (issue #931)
+- Formatting of expandable errors (issue \#931)
- Internal code for kernel messages
## [2021-07-12]
### Fixed
-- Handling of multiple color models (issue #962)
+- Handling of multiple color models (issue \#962)
### Removed
- Functions marked for removal end-2020
@@ -111,10 +116,10 @@ this project uses date-based 'snapshot' version identifiers.
### Fixed
- Local assignment to `\g__sys_backend_tl`
-- Incorrect internal function name (issue #939)
-- Case-changing exceptions for (u)pTeX (issue #939)
+- Incorrect internal function name (issue \#939)
+- Case-changing exceptions for (u)pTeX (issue \#939)
- Low-level error if accent commands are not followed by
- letter when case changing (see #946)
+ letter when case changing (see \#946)
## [2021-06-01]
@@ -129,24 +134,24 @@ this project uses date-based 'snapshot' version identifiers.
## [2021-05-25]
### Added
-- `\msg_note:nnnnnn` (issue #911)
-- `\str_compare:nNnTF` (issue #927)
+- `\msg_note:nnnnnn` (issue \#911)
+- `\str_compare:nNnTF` (issue \#927)
- `\sys_timer:`
-- `\prop_concat:NNN`, `\prop_put_from_keyval:Nn` (issue #924)
-- Functions to show and log various datatypes (issue #241):
+- `\prop_concat:NNN`, `\prop_put_from_keyval:Nn` (issue \#924)
+- Functions to show and log various datatypes (issue \#241):
`\coffin_show:Nnn`, `\coffin_show:N`, `\coffin_log:Nnn`, `\coffin_log:N`,
`\color_log:n`, `\group_show_list:`, `\group_log_list:`,
`\ior_show:N`, `\ior_log:N`, `\iow_show:N`, `\iow_log:N`,
`\tl_log_analysis:N`, `\tl_log_analysis:n`
- `\legacy_if_set_true:n`, `\legacy_if_set_false:n`, `\legacy_if_set:nn`
-- Matching multiple regex at the same time (issue #433):
+- Matching multiple regex at the same time (issue \#433):
`\regex_case_match:nn(TF)`,
`\regex_case_replace_once:nN(TF)`,
`\regex_case_replace_all:nN(TF)`
### Fixed
-- Checking brace balance in all regex functions (issue #377)
-- Removing duplicates in clists when items contain commas (issue #917)
+- Checking brace balance in all regex functions (issue \#377)
+- Removing duplicates in clists when items contain commas (issue \#917)
### Changed
- Slight speed up in some elementary int/dim/skip/muskip operations and
@@ -156,48 +161,48 @@ this project uses date-based 'snapshot' version identifiers.
## [2021-05-11]
### Added
-- `\cctab_item:Nn` (issue #880)
-- `\clist_use:nnnn` and `\clist_use:nn` (issue #561)
+- `\cctab_item:Nn` (issue \#880)
+- `\clist_use:nnnn` and `\clist_use:nn` (issue \#561)
### Fixed
-- Loading of backend in generic DVI mode (issue #905)
-- Make `\keyval_parse:nnn` alignment-safe (issue #896)
-- Control sequences and category codes in regex replacements (issue #909)
+- Loading of backend in generic DVI mode (issue \#905)
+- Make `\keyval_parse:nnn` alignment-safe (issue \#896)
+- Control sequences and category codes in regex replacements (issue \#909)
### Changed
-- Speed up `\group_align_safe_begin:` (pull #906)
+- Speed up `\group_align_safe_begin:` (pull \#906)
## [2021-05-07]
### Added
- Color export in comma-separated format
- `\ur{...}` escape in `l3regex` to compose regexes
-- `\seq_set_split_keep_spaces:Nnn` (see #784)
+- `\seq_set_split_keep_spaces:Nnn` (see \#784)
- `\seq_set_item:Nnn(TF)` and `\seq_pop_item:NnN(TF)`
-- `\box_ht_plus_dp:N` (issue #899)
+- `\box_ht_plus_dp:N` (issue \#899)
- `\clist_map_tokens:nn`, `\clist_map_tokens:Nn`,
`\str_map_tokens:nn`, `\str_map_tokens:Nn`
### Changed
-- Use prevailing catcodes instead of string in regex replacement (issue #621)
+- Use prevailing catcodes instead of string in regex replacement (issue \#621)
(*Breaking change*)
- `\__kernel_file_name_sanitize:n` now uses a faster `\csname`-based
approach to expand the file name
- Improved performance for basic conditionals
- `\pdf_version_gset:n` support for `dvips`
-- Improve handling of `\exp_not:n` in `\text_expand:n` (issue #875)
+- Improve handling of `\exp_not:n` in `\text_expand:n` (issue \#875)
- `\file_full_name:n` now avoids calling `\pdffilesize` primitive multiple times
on the same file
- Show printable characters explicitly in `\regex_show:n`
- Regex replacement now errors when using a submatch (`\1` etc) for which
the regex has too few groups
-- Showing complex datatypes now validates their internal structure (issue #884)
+- Showing complex datatypes now validates their internal structure (issue \#884)
- Indexing in l3doc: all page references before codeline references,
improve target placement, solve pdfTeX and makeindex warnings
### Fixed
-- Evalutate integer constants only once (issue #861)
-- Detect `\ior_map_inline:Nn` calls on undefined streams (issue #194)
+- Evalutate integer constants only once (issue \#861)
+- Detect `\ior_map_inline:Nn` calls on undefined streams (issue \#194)
### Deprecated
- `l3docstrip` converted to a stub which simply loads DocStrip: use
@@ -261,12 +266,12 @@ this project uses date-based 'snapshot' version identifiers.
## [2020-10-27]
### Added
-- `\token_if_font_selection:N(TF)` (see #806)
+- `\token_if_font_selection:N(TF)` (see \#806)
### Fixed
- Avoid relying on braced `\input` primitive syntax
- Correct expansion of environments in `\text_purify:n`
-- Some aspects of `cctab` setup with 8-bit engines(issue #814)
+- Some aspects of `cctab` setup with 8-bit engines(issue \#814)
### Changed
- Improved performance for `tl` functions
@@ -277,7 +282,7 @@ this project uses date-based 'snapshot' version identifiers.
### Fixed
- Correctly detect LaTeX when pre-loading expl3 and setting up
case changer
-- Lua emulation of \strcmp (issue #813)
+- Lua emulation of \strcmp (issue \#813)
## [2020-09-24]
@@ -288,7 +293,7 @@ this project uses date-based 'snapshot' version identifiers.
## [2020-09-06]
### Fixed
-- Loading in generic mode (issue #800)
+- Loading in generic mode (issue \#800)
## [2020-09-03]
@@ -308,7 +313,7 @@ this project uses date-based 'snapshot' version identifiers.
- Backend setting `pdfmode`
### Fixed
-- `\file_compare_timestamp:nNn(TF)` in LuaTeX (issue #792)
+- `\file_compare_timestamp:nNn(TF)` in LuaTeX (issue \#792)
- Text case changing and expansion where an excluded command is equivalent
to `\use:n`
@@ -319,7 +324,7 @@ this project uses date-based 'snapshot' version identifiers.
- Performance enhancements for `\keys_set:nn`
### Fixed
-- Loading generically on ConTeXt (issue #783)
+- Loading generically on ConTeXt (issue \#783)
## [2020-07-17]
@@ -383,7 +388,7 @@ this project uses date-based 'snapshot' version identifiers.
- Recognize the exponent marker `E` (same as `e`) in floating point numbers
### Fixed
-- Leave active characters untouched when case-changing (see #715)
+- Leave active characters untouched when case-changing (see \#715)
## [2020-04-06]
@@ -391,7 +396,7 @@ this project uses date-based 'snapshot' version identifiers.
- Control for start-of-titlecasing: see `\l_text_titlecase_check_letter_bool`
### Fixed
-- Nesting of `\seq_shuffle:N` in another sequence mapping (issue #687)
+- Nesting of `\seq_shuffle:N` in another sequence mapping (issue \#687)
- `\ior_shell_open:Nn` in engines other than LuaTeX - shell commands didn't
execute, plus the command call would be left in the input stream.
@@ -427,7 +432,7 @@ this project uses date-based 'snapshot' version identifiers.
`l3backend`)
### Changed
-- Allow `dvisvgm` driver with XeTeX (issue #677)
+- Allow `dvisvgm` driver with XeTeX (issue \#677)
### Fixed
- `undo-recent-deprecations` would not reload the deprecation code
@@ -452,7 +457,7 @@ this project uses date-based 'snapshot' version identifiers.
- Support `\@uclclist` entries when case-changing
### Fixed
-- Allow for full range of encodings when expanding text (issue #671)
+- Allow for full range of encodings when expanding text (issue \#671)
- Support `\begin`/`\end` in text expansion
## [2020-02-08]
@@ -486,7 +491,7 @@ this project uses date-based 'snapshot' version identifiers.
- Support for command replacement in text expansion
### Changed
-- Require key values for numerical key types (dim, int, etc.) (see #661)
+- Require key values for numerical key types (dim, int, etc.) (see \#661)
### Fixed
- Issue with keys where some leading spaces could be left in key names
@@ -506,8 +511,8 @@ this project uses date-based 'snapshot' version identifiers.
- Documentation improvements
### Fixed
-- Inherit key required/forbidden properties (see #653)
-- Set backend at the beginning of `\document` (see #657)
+- Inherit key required/forbidden properties (see \#653)
+- Set backend at the beginning of `\document` (see \#657)
### Deprecated
- `\str_<type>_case:n` replaced by `\str_<type>case:n`
@@ -518,13 +523,13 @@ this project uses date-based 'snapshot' version identifiers.
## [2019-11-07]
### Fixed
-- Handling of repeated loading of a backend (issue #646)
+- Handling of repeated loading of a backend (issue \#646)
- Handling of repeated loading of deprecated functions
## [2019-10-28]
### Fixed
-- File searching when `\(pdf)filesize` is not available (fixes #644)
+- File searching when `\(pdf)filesize` is not available (fixes \#644)
## [2019-10-27]
@@ -539,7 +544,7 @@ this project uses date-based 'snapshot' version identifiers.
### Fixed
- `\file_if_exist:n(TF)`, etc., when dealing with file names containing
- spaces (see #642)
+ spaces (see \#642)
## [2019-10-21]
@@ -577,12 +582,12 @@ this project uses date-based 'snapshot' version identifiers.
## [2019-10-02]
### Fixed
-- Variants using `\exp_args` functions with more than 9 arguments (see #636)
+- Variants using `\exp_args` functions with more than 9 arguments (see \#636)
## [2019-09-30]
### Fixed
-- File searching using `\file_full_name:n` (see #634)
+- File searching using `\file_full_name:n` (see \#634)
## [2019-09-28]
@@ -614,17 +619,17 @@ this project uses date-based 'snapshot' version identifiers.
- Shell access functions
### Fixed
-- Key `.initial:n` property when combined with inherited keys (see #631)
+- Key `.initial:n` property when combined with inherited keys (see \#631)
## [2019-09-19]
### Fixed
-- Loading Unicode data when some chars may be active (see #627)
+- Loading Unicode data when some chars may be active (see \#627)
## [2019-09-08]
### Fixed
-- Missing internal variant (fixes #624)
+- Missing internal variant (fixes \#624)
## [2019-09-05]
@@ -647,10 +652,10 @@ this project uses date-based 'snapshot' version identifiers.
### Fixed
- `\tl_rescan:nn` and `\tl_(g)set_rescan:Nnn` when single-line input
- contains a comment character (see #607)
+ contains a comment character (see \#607)
- Final value of the variable in `\tl_map_variable:NNn` and
`\clist_map_variable:NNn`.
-- Remove duplicate keys in `\prop_set_from_keyval:Nn` (see #572)
+- Remove duplicate keys in `\prop_set_from_keyval:Nn` (see \#572)
## [2019-08-14]
@@ -658,7 +663,7 @@ this project uses date-based 'snapshot' version identifiers.
- `\c_term_ior`
### Fixed
-- Coffin pole intersection in some cases (see #605)
+- Coffin pole intersection in some cases (see \#605)
## [2019-07-25]
@@ -672,11 +677,11 @@ this project uses date-based 'snapshot' version identifiers.
### Changed
- Ensure `\msg_fatal:nn` ends the TeX run if used inside an
- hbox (see #587)
+ hbox (see \#587)
- Moved backend code to a separate release schedule
### Fixed
-- Handling of control sequences in key names (see #594)
+- Handling of control sequences in key names (see \#594)
## [2019-05-28]
@@ -712,7 +717,7 @@ this project uses date-based 'snapshot' version identifiers.
### Fixed
- Infinite loop in some cases in DVI mode due to link-breaking code
- (see #570)
+ (see \#570)
- Category code of output from `\char_<target>_case:N`, and
same issue in `\str_<target>_case:n`
@@ -746,7 +751,7 @@ this project uses date-based 'snapshot' version identifiers.
## [2019-03-26]
### Fixed
-- Loading when pre-TL'18 XeTeX is in use (see #555)
+- Loading when pre-TL'18 XeTeX is in use (see \#555)
## [2019-03-05]
@@ -774,7 +779,7 @@ this project uses date-based 'snapshot' version identifiers.
`\cs_argument_spec:N`, `\cs_replacement_spec:N`, respectively
### Fixed
-- Treatment of inherited keys when setting only known keys (see #548)
+- Treatment of inherited keys when setting only known keys (see \#548)
### Removed
- Experimental `\skip_split_finite_else_action:nnNN`
@@ -786,7 +791,7 @@ this project uses date-based 'snapshot' version identifiers.
- Defensive code for redefinition of `\time`, `\day`, `\month` and `\year`
### Fixed
-- Resetting of key inheritance (see #535)
+- Resetting of key inheritance (see \#535)
- Issue in deprecated command `\tl_set_from_file:Nnn`
(see https://tex.stackexchange.com/q/474813/)
@@ -794,12 +799,12 @@ this project uses date-based 'snapshot' version identifiers.
### Added
- Support for return of whole path by `\keys_set_known:nnN`-like
- function `\keys_set_known:nnnN` (see #508)
-- `.prop_(g)put:N` key property (see #444)
+ function `\keys_set_known:nnnN` (see \#508)
+- `.prop_(g)put:N` key property (see \#444)
### Fixed
-- Handling of nested key setting when filtering, _etc._ (see #526)
-- Inheritance of default values (see #504)
+- Handling of nested key setting when filtering, _etc._ (see \#526)
+- Inheritance of default values (see \#504)
## [2019-01-28]
@@ -845,7 +850,7 @@ this project uses date-based 'snapshot' version identifiers.
### Fixed
- Handling of accented characters under mixed case changing in 8-bit engines
- (see #514)
+ (see \#514)
## [2019-01-01]
@@ -853,8 +858,8 @@ this project uses date-based 'snapshot' version identifiers.
- `\iow_allow_break:`
### Fixed
-- Correct fp randint with zero argument (see #507)
-- Handling of `\current@color` with `(x)dvipdfmx` (see #510)
+- Correct fp randint with zero argument (see \#507)
+- Handling of `\current@color` with `(x)dvipdfmx` (see \#510)
### Removed
- Support for stand-alone `l3regex`, `l3sort`, `l3srt`, `l3tl-analysis`,
@@ -891,7 +896,7 @@ this project uses date-based 'snapshot' version identifiers.
- Move `\<var>_rand_item:N` to stable
### Fixed
-- Typo in `\lua_shipout_e:n` (see #503)
+- Typo in `\lua_shipout_e:n` (see \#503)
## [2018-11-19]
@@ -902,12 +907,12 @@ this project uses date-based 'snapshot' version identifiers.
## [2018-10-19]
### Fixed
-- Wrapping of text in messages, etc., for some line lengths (fixes #491)
+- Wrapping of text in messages, etc., for some line lengths (fixes \#491)
## [2018-10-17]
### Added
-- `\g_msg_module_documentation_prop` (see #471)
+- `\g_msg_module_documentation_prop` (see \#471)
- `\peek_remove_spaces:n`
### Changed
@@ -917,7 +922,7 @@ this project uses date-based 'snapshot' version identifiers.
- `\msg_interrupt:nn`, `\msg_log:n` and `\msg_term:n`
### Fixed
-- Handling of inheritance for choice keys (fixes #483)
+- Handling of inheritance for choice keys (fixes \#483)
## [2018-09-24]
@@ -927,7 +932,7 @@ this project uses date-based 'snapshot' version identifiers.
`\peek_meaning_collect_inline:Nn`
### Fixed
-- Handling of unknown keys when inheritance is active (fixes #481)
+- Handling of unknown keys when inheritance is active (fixes \#481)
## [2018-08-23]
@@ -949,11 +954,11 @@ this project uses date-based 'snapshot' version identifiers.
## [2018-06-01]
### Added
-- `CHANGELOG.md` (fixes #460)
+- `CHANGELOG.md` (fixes \#460)
### Fixed
- Loading `expl3` with LuaTeX/XeTeX and certain letter tokens set
- to be active (see #462)
+ to be active (see \#462)
### Changed
- Alter `\char_codepoint_from_bytes:n` to produce four groups in all
@@ -987,7 +992,7 @@ this project uses date-based 'snapshot' version identifiers.
- Several internal optimisations
### Fixed
-- Expand boolean expression before calling `\chardef` (fixes #461)
+- Expand boolean expression before calling `\chardef` (fixes \#461)
### Removed
- Remove undocumented `\fp_function:Nw` and `\fp_new_function:Npn`
@@ -1016,15 +1021,15 @@ this project uses date-based 'snapshot' version identifiers.
the RNG
- Make prg break functions public
- Make scan marks mechanism public
-- Make `\prg_do_nothing:` long rather than nopar (fixes #455)
+- Make `\prg_do_nothing:` long rather than nopar (fixes \#455)
- Several performance improvements
- Documentation improvements
### Fixed
- Only index TF, T, F functions together if they are `expl3`
- functions (fixes #453)
+ functions (fixes \#453)
- Make `\infty` and `\pi` into errors in fp expressions
- (fixes #357)
+ (fixes \#357)
### Removed
- Deprecated functions expiring at end of 2017
@@ -1043,7 +1048,8 @@ this project uses date-based 'snapshot' version identifiers.
- Step functions have been added for dim variables,
e.g. `\dim_step_inline:nnnn`
-[Unreleased]: https://github.com/latex3/latex3/compare/2022-02-05...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2022-02-21...HEAD
+[2022-02-21]: https://github.com/latex3/latex3/compare/2022-02-05...2022-02-21
[2022-02-05]: https://github.com/latex3/latex3/compare/2022-01-21...2022-02-05
[2022-01-21]: https://github.com/latex3/latex3/compare/2022-01-12...2022-01-21
[2022-01-12]: https://github.com/latex3/latex3/compare/2021-11-22...2022-01-12
diff --git a/macros/latex/contrib/l3kernel/README.md b/macros/latex/contrib/l3kernel/README.md
index aa111a2d92..cbfdd98c3a 100644
--- a/macros/latex/contrib/l3kernel/README.md
+++ b/macros/latex/contrib/l3kernel/README.md
@@ -1,24 +1,25 @@
LaTeX3 Programming Conventions
==============================
-Release 2022-02-05
+Release 2022-02-21
Overview
--------
-The files of the `l3kernel` bundle provide a low-level API for TeX programmers
-with special syntax conventions, completely separating it from document level
+The files of the `l3kernel` bundle provide an API for TeX programmers
+with defined syntax conventions, completely separating it from document level
syntax. Hence, the commands provided are not intended for use at the document
level nor for use in describing design layouts in document class files.
-This API provides the foundation on which the LaTeX3 kernel and other advanced
-extensions are built. Special care has been taken so that they can be used
-within a LaTeX2e context as regular packages.
+This API provides the foundation on which new additions to the LaTeX kernel and
+other advanced extensions are built. The programming layer is designed to be
+loaded as part of LaTeX2e format building or as a loaded package with plain TeX
+or other formats.
-While `l3kernel` is still experimental, the bundle is now regarded as broadly
-stable. The syntax conventions and functions provided are now ready for wider
-use. There may still be changes to some functions, but these will be minor when
-compared to the scope of `l3kernel`.
+The syntax and functionality provided by `l3kernel` is regarded by the LaTeX
+team as stable. There may still be changes to some functions, but these will be
+very minor when compared to the scope of `l3kernel`. In particular, no functions
+will be removed, although some may be deprecated.
Programmers making use of `l3kernel` are *strongly* encouraged to subscribe to
the LaTeX-L mailing list (see below): announcements concerning the deprecation
@@ -27,22 +28,54 @@ or modification of functions are made on the list.
Requirements
------------
-The `l3kernel` bundle requires the e-TeX extensions and additional functionality
-to support string comparisons, expandable character generation with arbitrary
-category codes (for Unicode engines) and PDF support primitives (where direct
-PDF generation is used). The bundle only works with the following engines:
-* pdfTeX v1.40 or later
-* XeTeX v0.99992 or later
-* LuaTeX v1.10 or later
-* e-(u)pTeX from mid-2012 onward
-
-pdfTeX v1.40 was released in 2007, and so any recent TeX distribution
-supports `l3kernel`. Both XeTeX and LuaTeX have developed more
-actively over the past few years, and for this reason only recent
-releases of these engines are supported.
-
-(Engine developers should contact the team for detailed discussion about
-primitive requirements.)
+The `l3kernel` bundle requires the e-TeX extensions and a number of additional
+'utility' primitives, almost all of which were first added to pdfTeX. In
+particular, the functionality equivalent to the following pdfTeX primitives must
+be available
+
+- `\ifpdfprimitive`
+- `\pdfcreationdate`
+- `\pdfelapsedtime`
+- `\pdffiledump`
+- `\pdffilemoddate`
+- `\pdffilesize`
+- `\pdflastxpos`
+- `\pdflastypos`
+- `\pdfmdfivesum`
+- `\pdfnormaldeviate`
+- `\pdfpageheight`
+- `\pdfpagewidth`
+- `\pdfprimitive`
+- `\pdfrandomseed`
+- `\pdfresettimer`
+- `\pdfsavepos`
+- `\pdfsetrandomseed`
+- `\pdfshellescape`
+- `\pdfstrcmp`
+- `\pdfuniformdeviate`
+
+For ease of reference, these primitives will be referred to as the 'pdfTeX
+utilities'. With the exception of `\expanded`, these have been present in pdfTeX
+since the release of version 1.40.0 in 2007; `\expanded` was added for TeX Live
+2019. Similarly, the full set of these utility primitives has been available in
+XeTeX from the 2019 TeX Live release, and has always been available in LuaTeX
+(some by Lua emulation). The Japanese pTeX and upTeX gained all of the above
+(except `\ifincsname`) for TeX Live 2019 `\ifincsname` for TeX Live 2020.
+
+At present, the `\expanded` primitive is emulated if unavailable. This code is
+slow and imposes some coding restrictions. As such, it will be *removed* for TeX
+Live 2022.
+
+In addition to the above, engines which are fully Unicode-compatible
+must provde the functionality of the following primitives, documented in the
+LuaTeX manual
+
+- `\Uchar`
+- `\Ucharcat`
+- `\Umathcode`
+
+The existence of the primitive `\Umathcode` is used as the marker for Unicode
+support.
Discussion
----------
diff --git a/macros/latex/contrib/l3kernel/expl3.dtx b/macros/latex/contrib/l3kernel/expl3.dtx
index 88f0cd1e3d..3363776126 100644
--- a/macros/latex/contrib/l3kernel/expl3.dtx
+++ b/macros/latex/contrib/l3kernel/expl3.dtx
@@ -24,7 +24,7 @@
%
%<*driver|generic|package|2ekernel>
%</driver|generic|package|2ekernel>
-\def\ExplFileDate{2022-02-05}%
+\def\ExplFileDate{2022-02-21}%
%<*driver>
\documentclass[full]{l3doc}
\usepackage{graphicx}
@@ -51,7 +51,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/expl3.pdf b/macros/latex/contrib/l3kernel/expl3.pdf
index ebadc4ab04..84ccdd85a6 100644
--- a/macros/latex/contrib/l3kernel/expl3.pdf
+++ b/macros/latex/contrib/l3kernel/expl3.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/interface3.pdf b/macros/latex/contrib/l3kernel/interface3.pdf
index c20da20c97..a757c70bc2 100644
--- a/macros/latex/contrib/l3kernel/interface3.pdf
+++ b/macros/latex/contrib/l3kernel/interface3.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/interface3.tex b/macros/latex/contrib/l3kernel/interface3.tex
index d71eb5eda7..23be90e3ab 100644
--- a/macros/latex/contrib/l3kernel/interface3.tex
+++ b/macros/latex/contrib/l3kernel/interface3.tex
@@ -54,7 +54,7 @@ for those people who are interested.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2022-02-05}
+\date{Released 2022-02-21}
\pagenumbering{roman}
\maketitle
diff --git a/macros/latex/contrib/l3kernel/l3basics.dtx b/macros/latex/contrib/l3kernel/l3basics.dtx
index d5d95dc5c4..43c8f0ea7b 100644
--- a/macros/latex/contrib/l3kernel/l3basics.dtx
+++ b/macros/latex/contrib/l3kernel/l3basics.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
@@ -238,7 +238,8 @@
% Creates \meta{function} to expand to \meta{code} as replacement text.
% Within the \meta{code}, the \meta{parameters} (|#1|, |#2|,
% \emph{etc.}) will be replaced by those absorbed by the function.
-% The \meta{function} will not expand within an \texttt{x}-type
+% The \meta{function} will not expand within an \texttt{x}-type or
+% or \texttt{e}-type
% argument. The definition is global and an error results if the
% \meta{function} is already defined.
% \end{function}
@@ -383,7 +384,7 @@
% cannot contain \cs{par} tokens. The assignment of a meaning to the
% \meta{function} is \emph{not} restricted to the current \TeX{}
% group level: the assignment is global. The \meta{function} will
-% not expand within an \texttt{x}-type argument.
+% not expand within an \texttt{x}-type or \texttt{e}-type argument.
% \end{function}
%
% \subsection{Defining new functions using the signature}
@@ -435,7 +436,7 @@
% automatically from the function signature. These \meta{parameters}
% (|#1|, |#2|, \emph{etc.}) will be replaced by those absorbed by the
% function. The \meta{function} will not expand within an \texttt{x}-type
-% argument. The definition is global and
+% or \texttt{e}-type argument. The definition is global and
% an error results if the \meta{function} is already defined.
% \end{function}
%
@@ -505,7 +506,7 @@
% automatically from the function signature. These \meta{parameters}
% (|#1|, |#2|, \emph{etc.}) will be replaced by those absorbed by the
% function. The \meta{function} will not expand within an \texttt{x}-type
-% argument.
+% or \texttt{e}-type argument.
% The assignment of a meaning to the \meta{function} is restricted to
% the current \TeX{} group level.
% \end{function}
@@ -575,7 +576,7 @@
% automatically from the function signature. These \meta{parameters}
% (|#1|, |#2|, \emph{etc.}) will be replaced by those absorbed by the
% function. The \meta{function} will not expand within an \texttt{x}-type
-% argument.
+% or \texttt{e}-type argument.
% The assignment of a meaning to the \meta{function} is global.
% \end{function}
%
diff --git a/macros/latex/contrib/l3kernel/l3bootstrap.dtx b/macros/latex/contrib/l3kernel/l3bootstrap.dtx
index 153ff61c76..e7ca9de026 100644
--- a/macros/latex/contrib/l3kernel/l3bootstrap.dtx
+++ b/macros/latex/contrib/l3kernel/l3bootstrap.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
@@ -194,7 +194,11 @@
\expandafter\ifx\csname newcatcodetable\endcsname\relax
\input{ltluatex}%
\fi
- \ifdefined\newluabytecode\newluabytecode\@expl@luadata@bytecode\fi
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname newluabytecode\endcsname\relax
+ \else
+ \newluabytecode\@expl@luadata@bytecode
+ \fi
\directlua{require("expl3")}%
% \end{macrocode}
% As the user might be making a custom format, no assumption is made about
@@ -231,19 +235,20 @@
\def\LongText%
{%
The L3 programming layer requires the e-TeX primitives and additional
- functionality as described in the README file.
+ \LineBreak functionality as described in the README file.
\LineBreak
These are available in the engines\LineBreak
- pdfTeX v1.40.0\LineBreak
- XeTeX v0.99992\LineBreak
- LuaTeX v1.10\LineBreak
- e-(u)pTeX mid-2012\LineBreak
+ - Prote (2021)\LineBreak
or later.\LineBreak
\LineBreak
}%
\ifnum0%
\expandafter\ifx\csname expanded\endcsname\relax
- \ifx\csname pdfstrcmp\endcsname\relax\else 1\fi
+ \expandafter\ifx\csname pdfstrcmp\endcsname\relax\else 1\fi
\else
\expandafter\ifx\csname luatexversion\endcsname\relax
1%
@@ -256,11 +261,15 @@
\def\LineBreak{\noexpand\MessageBreak}%
\expandafter\ifx\csname PackageError\endcsname\relax
\def\LineBreak{^^J}%
- \def\PackageError#1#2#3%
- {%
- \errhelp{#3}%
- \errmessage{#1 Error: #2}%
- }%
+ \begingroup
+ \lccode`\~=`\ \lccode`\}=`\ %
+ \lccode`\T=`\T\lccode`\H=`\H%
+ \catcode`\ =11 %
+\lowercase{\endgroup\def\PackageError#1#2#3{%
+\begingroup\errorcontextlines-1\immediate\write0{}\errhelp{#3}\def%
+\ {#1 Error: #2.^^J^^J
+Type H <return> for immediate help}\def~{\errmessage{%
+\ }}~\endgroup}}%
\fi
\edef\next
{%
diff --git a/macros/latex/contrib/l3kernel/l3box.dtx b/macros/latex/contrib/l3kernel/l3box.dtx
index cca2b82313..9b674c29c7 100644
--- a/macros/latex/contrib/l3kernel/l3box.dtx
+++ b/macros/latex/contrib/l3kernel/l3box.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3candidates.dtx b/macros/latex/contrib/l3kernel/l3candidates.dtx
index 5040b47e3c..b6fc78141d 100644
--- a/macros/latex/contrib/l3kernel/l3candidates.dtx
+++ b/macros/latex/contrib/l3kernel/l3candidates.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
@@ -357,7 +357,7 @@
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{value}
% does not expand further when appearing in an \texttt{x}-type
-% argument expansion.
+% or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
@@ -547,7 +547,7 @@
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{item}
% does not expand further when appearing in an \texttt{x}-type
-% argument expansion.
+% or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
diff --git a/macros/latex/contrib/l3kernel/l3cctab.dtx b/macros/latex/contrib/l3kernel/l3cctab.dtx
index 39fbca7b74..13ac02ce36 100644
--- a/macros/latex/contrib/l3kernel/l3cctab.dtx
+++ b/macros/latex/contrib/l3kernel/l3cctab.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3clist.dtx b/macros/latex/contrib/l3kernel/l3clist.dtx
index 0ad3565b34..7ec52dbb6f 100644
--- a/macros/latex/contrib/l3kernel/l3clist.dtx
+++ b/macros/latex/contrib/l3kernel/l3clist.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
@@ -579,7 +579,7 @@
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{items}
% do not expand further when appearing in an \texttt{x}-type
-% argument expansion.
+% or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
@@ -604,7 +604,7 @@
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{items}
% do not expand further when appearing in an \texttt{x}-type
-% argument expansion.
+% or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
@@ -620,6 +620,12 @@
% resulting space-trimmed item is braced. The \meta{separators} are
% then inserted in the same way as for \cs{clist_use:Nnnn} and
% \cs{clist_use:Nn}, respectively.
+% \begin{texnote}
+% The result is returned within the \tn{unexpanded}
+% primitive (\cs{exp_not:n}), which means that the \meta{items}
+% do not expand further when appearing in an \texttt{x}-type
+% or \texttt{e}-type argument expansion.
+% \end{texnote}
% \end{function}
%
% \section{Comma lists as stacks}
@@ -724,7 +730,7 @@
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{item}
% does not expand further when appearing in an \texttt{x}-type
-% argument expansion.
+% or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
@@ -740,7 +746,7 @@
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{item}
% does not expand further when appearing in an \texttt{x}-type
-% argument expansion.
+% or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
diff --git a/macros/latex/contrib/l3kernel/l3coffins.dtx b/macros/latex/contrib/l3kernel/l3coffins.dtx
index bdd3ea852f..384dd662a0 100644
--- a/macros/latex/contrib/l3kernel/l3coffins.dtx
+++ b/macros/latex/contrib/l3kernel/l3coffins.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3color.dtx b/macros/latex/contrib/l3kernel/l3color.dtx
index afef4571cd..2613974097 100644
--- a/macros/latex/contrib/l3kernel/l3color.dtx
+++ b/macros/latex/contrib/l3kernel/l3color.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3debug.dtx b/macros/latex/contrib/l3kernel/l3debug.dtx
index 9598ee8174..df93b6a70d 100644
--- a/macros/latex/contrib/l3kernel/l3debug.dtx
+++ b/macros/latex/contrib/l3kernel/l3debug.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3deprecation.dtx b/macros/latex/contrib/l3kernel/l3deprecation.dtx
index 942b560c30..0dd2c89ce1 100644
--- a/macros/latex/contrib/l3kernel/l3deprecation.dtx
+++ b/macros/latex/contrib/l3kernel/l3deprecation.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3doc.dtx b/macros/latex/contrib/l3kernel/l3doc.dtx
index fc0eed68da..1abe3c44e0 100644
--- a/macros/latex/contrib/l3kernel/l3doc.dtx
+++ b/macros/latex/contrib/l3kernel/l3doc.dtx
@@ -85,7 +85,7 @@ and all files in that bundle must be distributed together.
% require you to do updates, if the class changes.}}
%
% \author{\Team}
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
% \maketitle
% \tableofcontents
%
diff --git a/macros/latex/contrib/l3kernel/l3doc.pdf b/macros/latex/contrib/l3kernel/l3doc.pdf
index 0e685da1b6..844c0e2cff 100644
--- a/macros/latex/contrib/l3kernel/l3doc.pdf
+++ b/macros/latex/contrib/l3kernel/l3doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3docstrip.dtx b/macros/latex/contrib/l3kernel/l3docstrip.dtx
index 0c878d7a72..baca3921d8 100644
--- a/macros/latex/contrib/l3kernel/l3docstrip.dtx
+++ b/macros/latex/contrib/l3kernel/l3docstrip.dtx
@@ -63,7 +63,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3docstrip.pdf b/macros/latex/contrib/l3kernel/l3docstrip.pdf
index 2df1b47ec8..06bff6f7ee 100644
--- a/macros/latex/contrib/l3kernel/l3docstrip.pdf
+++ b/macros/latex/contrib/l3kernel/l3docstrip.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3expan.dtx b/macros/latex/contrib/l3kernel/l3expan.dtx
index c989a2b98c..7415de8ce4 100644
--- a/macros/latex/contrib/l3kernel/l3expan.dtx
+++ b/macros/latex/contrib/l3kernel/l3expan.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
@@ -775,7 +775,7 @@
% and all of \meta{tokens} are expandable \cs{exp_stop_f:}
% terminates the expansion of tokens even if \meta{more tokens}
% are also expandable. The function itself is an implicit space
-% token. Inside an \texttt{x}-type expansion, it retains its
+% token. Inside an \texttt{x}-type or \texttt{e}-type expansion, it retains its
% form, but when typeset it produces the underlying space (\verb*| |).
% \end{function}
%
diff --git a/macros/latex/contrib/l3kernel/l3file.dtx b/macros/latex/contrib/l3kernel/l3file.dtx
index 89535d1622..aaadad7386 100644
--- a/macros/latex/contrib/l3kernel/l3file.dtx
+++ b/macros/latex/contrib/l3kernel/l3file.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3flag.dtx b/macros/latex/contrib/l3kernel/l3flag.dtx
index ab8a80f5e8..7effab50aa 100644
--- a/macros/latex/contrib/l3kernel/l3flag.dtx
+++ b/macros/latex/contrib/l3kernel/l3flag.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-assign.dtx b/macros/latex/contrib/l3kernel/l3fp-assign.dtx
index d966dfe94d..2a1cf315b0 100644
--- a/macros/latex/contrib/l3kernel/l3fp-assign.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-assign.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
% \maketitle
%
% \begin{documentation}
diff --git a/macros/latex/contrib/l3kernel/l3fp-aux.dtx b/macros/latex/contrib/l3kernel/l3fp-aux.dtx
index 677a4c7fa4..cdd4ede0df 100644
--- a/macros/latex/contrib/l3kernel/l3fp-aux.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-aux.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-basics.dtx b/macros/latex/contrib/l3kernel/l3fp-basics.dtx
index f0f9e0e10b..973588f870 100644
--- a/macros/latex/contrib/l3kernel/l3fp-basics.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-basics.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-convert.dtx b/macros/latex/contrib/l3kernel/l3fp-convert.dtx
index 77dcf71818..f31c850baf 100644
--- a/macros/latex/contrib/l3kernel/l3fp-convert.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-convert.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-expo.dtx b/macros/latex/contrib/l3kernel/l3fp-expo.dtx
index 5c43094885..1c8d0a22d4 100644
--- a/macros/latex/contrib/l3kernel/l3fp-expo.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-expo.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-extended.dtx b/macros/latex/contrib/l3kernel/l3fp-extended.dtx
index 7624b6f9cc..48d5efe31a 100644
--- a/macros/latex/contrib/l3kernel/l3fp-extended.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-extended.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-logic.dtx b/macros/latex/contrib/l3kernel/l3fp-logic.dtx
index 47dddb3502..c804716ef2 100644
--- a/macros/latex/contrib/l3kernel/l3fp-logic.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-logic.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-parse.dtx b/macros/latex/contrib/l3kernel/l3fp-parse.dtx
index 9441b64759..176147a8b9 100644
--- a/macros/latex/contrib/l3kernel/l3fp-parse.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-parse.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-random.dtx b/macros/latex/contrib/l3kernel/l3fp-random.dtx
index 55ef17d2df..013366c38c 100644
--- a/macros/latex/contrib/l3kernel/l3fp-random.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-random.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-round.dtx b/macros/latex/contrib/l3kernel/l3fp-round.dtx
index e7899c9831..4a677424d3 100644
--- a/macros/latex/contrib/l3kernel/l3fp-round.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-round.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp-traps.dtx b/macros/latex/contrib/l3kernel/l3fp-traps.dtx
index fbf00f5083..a5d6cdad22 100644
--- a/macros/latex/contrib/l3kernel/l3fp-traps.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-traps.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
% \maketitle
%
% \begin{documentation}
diff --git a/macros/latex/contrib/l3kernel/l3fp-trig.dtx b/macros/latex/contrib/l3kernel/l3fp-trig.dtx
index 1492ef2346..a6acbf63c5 100644
--- a/macros/latex/contrib/l3kernel/l3fp-trig.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-trig.dtx
@@ -40,7 +40,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fp.dtx b/macros/latex/contrib/l3kernel/l3fp.dtx
index 8419fcfeef..1abdbddf93 100644
--- a/macros/latex/contrib/l3kernel/l3fp.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp.dtx
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3fparray.dtx b/macros/latex/contrib/l3kernel/l3fparray.dtx
index da6ada982b..949a0c8d30 100644
--- a/macros/latex/contrib/l3kernel/l3fparray.dtx
+++ b/macros/latex/contrib/l3kernel/l3fparray.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3int.dtx b/macros/latex/contrib/l3kernel/l3int.dtx
index 3a2a08bff9..a8e15875fc 100644
--- a/macros/latex/contrib/l3kernel/l3int.dtx
+++ b/macros/latex/contrib/l3kernel/l3int.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3intarray.dtx b/macros/latex/contrib/l3kernel/l3intarray.dtx
index 4ee8d967e8..1e52ef5aac 100644
--- a/macros/latex/contrib/l3kernel/l3intarray.dtx
+++ b/macros/latex/contrib/l3kernel/l3intarray.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx
index 9147f69bcc..f67983ae09 100644
--- a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx
+++ b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3keys.dtx b/macros/latex/contrib/l3kernel/l3keys.dtx
index 087bbf411d..6c8d1ff55f 100644
--- a/macros/latex/contrib/l3kernel/l3keys.dtx
+++ b/macros/latex/contrib/l3kernel/l3keys.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
@@ -87,6 +87,10 @@
% key-two = value two
% }
% \end{verbatim}
+% As illustrated, keys are created inside a \meta{module}: a set of related
+% keys, typically those for a single module/\LaTeXe{} package. See
+% Section~\label{sec:l3keys:subdivision} for suggestions on how to divide
+% large numbers of keys for a single module.
%
% At a document level, \cs{keys_set:nn} is used within a
% document function, for example
@@ -321,7 +325,8 @@
% \meta{key} .inherit:n = \Arg{parents}
% \end{syntax}
% Specifies that the \meta{key} path should inherit the keys listed
-% as \meta{parents}. For example, after setting
+% as any of the \meta{parents} (a comma list), which can be a module
+% or a subgroup. For example, after setting
% \begin{verbatim}
% \keys_define:nn { foo } { test .code:n = \tl_show:n {#1} }
% \keys_define:nn { } { bar .inherit:n = foo }
@@ -334,6 +339,12 @@
% \begin{verbatim}
% \keys_set:nn { foo } { test = a }
% \end{verbatim}
+% Inheritance applies at point of use, not at definition, thus keys may
+% be added to the \meta{parent} after the use of \texttt{.inherit:n}
+% and will be active.
+% If more than one \meta{parent} is specified, the presence of the
+% \meta{key} will be tested for each in turn, with the first successful
+% hit taking priority.
% \end{function}
%
% \begin{function}[updated = 2013-07-09]
diff --git a/macros/latex/contrib/l3kernel/l3legacy.dtx b/macros/latex/contrib/l3kernel/l3legacy.dtx
index eadf0fcfa6..3fe875c8fd 100644
--- a/macros/latex/contrib/l3kernel/l3legacy.dtx
+++ b/macros/latex/contrib/l3kernel/l3legacy.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3luatex.dtx b/macros/latex/contrib/l3kernel/l3luatex.dtx
index 4f5da9de7c..9c33e12362 100644
--- a/macros/latex/contrib/l3kernel/l3luatex.dtx
+++ b/macros/latex/contrib/l3kernel/l3luatex.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3msg.dtx b/macros/latex/contrib/l3kernel/l3msg.dtx
index 83a42fc50a..af6bc4f485 100644
--- a/macros/latex/contrib/l3kernel/l3msg.dtx
+++ b/macros/latex/contrib/l3kernel/l3msg.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3names.dtx b/macros/latex/contrib/l3kernel/l3names.dtx
index 585463685d..27305b7f1e 100644
--- a/macros/latex/contrib/l3kernel/l3names.dtx
+++ b/macros/latex/contrib/l3kernel/l3names.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3news.pdf b/macros/latex/contrib/l3kernel/l3news.pdf
index 892b9dcc82..f318675fbe 100644
--- a/macros/latex/contrib/l3kernel/l3news.pdf
+++ b/macros/latex/contrib/l3kernel/l3news.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news01.pdf b/macros/latex/contrib/l3kernel/l3news01.pdf
index 136af9b8cc..3a0af2b433 100644
--- a/macros/latex/contrib/l3kernel/l3news01.pdf
+++ b/macros/latex/contrib/l3kernel/l3news01.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news02.pdf b/macros/latex/contrib/l3kernel/l3news02.pdf
index b607faebf2..d716f4f509 100644
--- a/macros/latex/contrib/l3kernel/l3news02.pdf
+++ b/macros/latex/contrib/l3kernel/l3news02.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news03.pdf b/macros/latex/contrib/l3kernel/l3news03.pdf
index 9473d75a63..c2c2c9a6bc 100644
--- a/macros/latex/contrib/l3kernel/l3news03.pdf
+++ b/macros/latex/contrib/l3kernel/l3news03.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news04.pdf b/macros/latex/contrib/l3kernel/l3news04.pdf
index 1166dc6c23..345ccf8e8c 100644
--- a/macros/latex/contrib/l3kernel/l3news04.pdf
+++ b/macros/latex/contrib/l3kernel/l3news04.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news05.pdf b/macros/latex/contrib/l3kernel/l3news05.pdf
index 4b9a8cf717..c758e25094 100644
--- a/macros/latex/contrib/l3kernel/l3news05.pdf
+++ b/macros/latex/contrib/l3kernel/l3news05.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news06.pdf b/macros/latex/contrib/l3kernel/l3news06.pdf
index e849790458..1b54cf91e8 100644
--- a/macros/latex/contrib/l3kernel/l3news06.pdf
+++ b/macros/latex/contrib/l3kernel/l3news06.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news07.pdf b/macros/latex/contrib/l3kernel/l3news07.pdf
index 466a632903..02f018a5e0 100644
--- a/macros/latex/contrib/l3kernel/l3news07.pdf
+++ b/macros/latex/contrib/l3kernel/l3news07.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news08.pdf b/macros/latex/contrib/l3kernel/l3news08.pdf
index b5179f4935..75979df752 100644
--- a/macros/latex/contrib/l3kernel/l3news08.pdf
+++ b/macros/latex/contrib/l3kernel/l3news08.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news09.pdf b/macros/latex/contrib/l3kernel/l3news09.pdf
index eda7edc267..786b5df2d4 100644
--- a/macros/latex/contrib/l3kernel/l3news09.pdf
+++ b/macros/latex/contrib/l3kernel/l3news09.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news10.pdf b/macros/latex/contrib/l3kernel/l3news10.pdf
index d1dfbe40c1..e4c5017394 100644
--- a/macros/latex/contrib/l3kernel/l3news10.pdf
+++ b/macros/latex/contrib/l3kernel/l3news10.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news11.pdf b/macros/latex/contrib/l3kernel/l3news11.pdf
index 37be98d2ee..c98f596ccc 100644
--- a/macros/latex/contrib/l3kernel/l3news11.pdf
+++ b/macros/latex/contrib/l3kernel/l3news11.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3news12.pdf b/macros/latex/contrib/l3kernel/l3news12.pdf
index 8d6816802b..d779c718a8 100644
--- a/macros/latex/contrib/l3kernel/l3news12.pdf
+++ b/macros/latex/contrib/l3kernel/l3news12.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3pdf.dtx b/macros/latex/contrib/l3kernel/l3pdf.dtx
index 1ad30361e3..d42f7c9865 100644
--- a/macros/latex/contrib/l3kernel/l3pdf.dtx
+++ b/macros/latex/contrib/l3kernel/l3pdf.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3prefixes.pdf b/macros/latex/contrib/l3kernel/l3prefixes.pdf
index 3e89ae150c..9dde53ac9c 100644
--- a/macros/latex/contrib/l3kernel/l3prefixes.pdf
+++ b/macros/latex/contrib/l3kernel/l3prefixes.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3prg.dtx b/macros/latex/contrib/l3kernel/l3prg.dtx
index efca65e23b..1fcefca69c 100644
--- a/macros/latex/contrib/l3kernel/l3prg.dtx
+++ b/macros/latex/contrib/l3kernel/l3prg.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3prop.dtx b/macros/latex/contrib/l3kernel/l3prop.dtx
index 6033b875c3..55f0a02ff9 100644
--- a/macros/latex/contrib/l3kernel/l3prop.dtx
+++ b/macros/latex/contrib/l3kernel/l3prop.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
@@ -133,6 +133,10 @@
% signs. The \meta{key} is then processed by \cs{tl_to_str:n}.
% This function correctly detects the |=| and |,| signs provided they
% have the standard category code~$12$ or they are active.
+%
+% Notice that in contrast to most keyval lists (\emph{e.g.}~those in
+% \pkg{l3keys}), each key here \emph{must} be followed with an \texttt{=}
+% sign.
% \end{function}
%
% \begin{function}[added = 2017-11-28, updated = 2021-11-07]
@@ -151,6 +155,10 @@
% keys appear only the last of the values is kept.
% This function correctly detects the |=| and |,| signs provided they
% have the standard category code~$12$ or they are active.
+%
+% Notice that in contrast to most keyval lists (\emph{e.g.}~those in
+% \pkg{l3keys}), each key here \emph{must} be followed with an \texttt{=}
+% sign.
% \end{function}
%
% \section{Adding and updating property list entries}
@@ -299,7 +307,7 @@
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{value}
% does not expand further when appearing in an \texttt{x}-type
-% argument expansion.
+% or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
@@ -321,7 +329,7 @@
% \begin{texnote}
% The result is returned within the \tn{unexpanded} primitive
% (\cs{exp_not:n}), which means that the key--value list does not expand
-% further when appearing in an \texttt{x}-type argument expansion.
+% further when appearing in an \texttt{x}-type or \texttt{e}-type argument expansion.
% It also needs exactly two steps of expansion.
% \end{texnote}
% \end{function}
diff --git a/macros/latex/contrib/l3kernel/l3quark.dtx b/macros/latex/contrib/l3kernel/l3quark.dtx
index 7b8cc3bb79..56b32e32d1 100644
--- a/macros/latex/contrib/l3kernel/l3quark.dtx
+++ b/macros/latex/contrib/l3kernel/l3quark.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3regex.dtx b/macros/latex/contrib/l3kernel/l3regex.dtx
index 515b438dbd..589f03f088 100644
--- a/macros/latex/contrib/l3kernel/l3regex.dtx
+++ b/macros/latex/contrib/l3kernel/l3regex.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3seq.dtx b/macros/latex/contrib/l3kernel/l3seq.dtx
index 1eff1219f8..115c74b74c 100644
--- a/macros/latex/contrib/l3kernel/l3seq.dtx
+++ b/macros/latex/contrib/l3kernel/l3seq.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
@@ -320,7 +320,7 @@
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{item}
% does not expand further when appearing in an \texttt{x}-type
-% argument expansion.
+% or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
@@ -335,7 +335,7 @@
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{item}
% does not expand further when appearing in an \texttt{x}-type
-% argument expansion.
+% or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
@@ -749,7 +749,7 @@
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{items}
% do not expand further when appearing in an \texttt{x}-type
-% argument expansion.
+% or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
@@ -774,7 +774,7 @@
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{items}
% do not expand further when appearing in an \texttt{x}-type
-% argument expansion.
+% or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
diff --git a/macros/latex/contrib/l3kernel/l3skip.dtx b/macros/latex/contrib/l3kernel/l3skip.dtx
index dddc1f55ee..6260ff0e9f 100644
--- a/macros/latex/contrib/l3kernel/l3skip.dtx
+++ b/macros/latex/contrib/l3kernel/l3skip.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3sort.dtx b/macros/latex/contrib/l3kernel/l3sort.dtx
index 6671036d98..99b1aef0dd 100644
--- a/macros/latex/contrib/l3kernel/l3sort.dtx
+++ b/macros/latex/contrib/l3kernel/l3sort.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3str-convert.dtx b/macros/latex/contrib/l3kernel/l3str-convert.dtx
index 786ae30716..da7ccf0758 100644
--- a/macros/latex/contrib/l3kernel/l3str-convert.dtx
+++ b/macros/latex/contrib/l3kernel/l3str-convert.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3str.dtx b/macros/latex/contrib/l3kernel/l3str.dtx
index eee1f00462..a53cc9a73f 100644
--- a/macros/latex/contrib/l3kernel/l3str.dtx
+++ b/macros/latex/contrib/l3kernel/l3str.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3styleguide.pdf b/macros/latex/contrib/l3kernel/l3styleguide.pdf
index 369ac8314a..1abc983a20 100644
--- a/macros/latex/contrib/l3kernel/l3styleguide.pdf
+++ b/macros/latex/contrib/l3kernel/l3styleguide.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3styleguide.tex b/macros/latex/contrib/l3kernel/l3styleguide.tex
index 473fceded0..9edeb73c2e 100644
--- a/macros/latex/contrib/l3kernel/l3styleguide.tex
+++ b/macros/latex/contrib/l3kernel/l3styleguide.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2022-02-05}
+\date{Released 2022-02-21}
\begin{document}
diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf
index aab5aa619e..35c30a35a6 100644
--- a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf
+++ b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.tex b/macros/latex/contrib/l3kernel/l3syntax-changes.tex
index 2924255bae..1a51125933 100644
--- a/macros/latex/contrib/l3kernel/l3syntax-changes.tex
+++ b/macros/latex/contrib/l3kernel/l3syntax-changes.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2022-02-05}
+\date{Released 2022-02-21}
\newcommand{\TF}{\textit{(TF)}}
diff --git a/macros/latex/contrib/l3kernel/l3sys.dtx b/macros/latex/contrib/l3kernel/l3sys.dtx
index 09758921dc..f032ab07af 100644
--- a/macros/latex/contrib/l3kernel/l3sys.dtx
+++ b/macros/latex/contrib/l3kernel/l3sys.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.pdf b/macros/latex/contrib/l3kernel/l3term-glossary.pdf
index 97a38b670d..05a679b5c7 100644
--- a/macros/latex/contrib/l3kernel/l3term-glossary.pdf
+++ b/macros/latex/contrib/l3kernel/l3term-glossary.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.tex b/macros/latex/contrib/l3kernel/l3term-glossary.tex
index b7149761b1..eada45b713 100644
--- a/macros/latex/contrib/l3kernel/l3term-glossary.tex
+++ b/macros/latex/contrib/l3kernel/l3term-glossary.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2022-02-05}
+\date{Released 2022-02-21}
\newcommand{\TF}{\textit{(TF)}}
diff --git a/macros/latex/contrib/l3kernel/l3text-case.dtx b/macros/latex/contrib/l3kernel/l3text-case.dtx
index d93fad4624..b6c263c22d 100644
--- a/macros/latex/contrib/l3kernel/l3text-case.dtx
+++ b/macros/latex/contrib/l3kernel/l3text-case.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
@@ -2082,37 +2082,40 @@
% we check at the end of the preamble. This will therefore only apply
% to \LaTeXe{} package mode.
% \begin{macrocode}
-\cs_if_exist:cT { @uclclist }
+\tl_if_exist:NT \@expl@finalise@setup@@@@
{
- \AtBeginDocument
+ \tl_gput_right:Nn \@expl@finalise@setup@@@@
{
- \group_begin:
- \cs_set_protected:Npn \@@_change_case_setup:Nn #1#2
- {
- \quark_if_recursion_tail_stop:N #1
- \tl_if_single_token:nT {#2}
+ \AtBeginDocument
+ {
+ \group_begin:
+ \cs_set_protected:Npn \@@_change_case_setup:Nn #1#2
{
- \cs_if_exist:cF
- { c_@@_uppercase_ \token_to_str:N #1 _tl }
+ \quark_if_recursion_tail_stop:N #1
+ \tl_if_single_token:nT {#2}
{
- \tl_const:cn
+ \cs_if_exist:cF
{ c_@@_uppercase_ \token_to_str:N #1 _tl }
- { #2 }
- }
- \cs_if_exist:cF
- { c_@@_lowercase_ \token_to_str:N #2 _tl }
- {
- \tl_const:cn
+ {
+ \tl_const:cn
+ { c_@@_uppercase_ \token_to_str:N #1 _tl }
+ { #2 }
+ }
+ \cs_if_exist:cF
{ c_@@_lowercase_ \token_to_str:N #2 _tl }
- { #1 }
+ {
+ \tl_const:cn
+ { c_@@_lowercase_ \token_to_str:N #2 _tl }
+ { #1 }
+ }
}
+ \@@_change_case_setup:Nn
}
- \@@_change_case_setup:Nn
- }
- \exp_after:wN \@@_change_case_setup:Nn \@uclclist
- \q_recursion_tail ?
- \q_recursion_stop
- \group_end:
+ \exp_after:wN \@@_change_case_setup:Nn \@uclclist
+ \q_recursion_tail ?
+ \q_recursion_stop
+ \group_end:
+ }
}
}
% \end{macrocode}
diff --git a/macros/latex/contrib/l3kernel/l3text-purify.dtx b/macros/latex/contrib/l3kernel/l3text-purify.dtx
index 7211fdcf05..4ad1520adc 100644
--- a/macros/latex/contrib/l3kernel/l3text-purify.dtx
+++ b/macros/latex/contrib/l3kernel/l3text-purify.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3text.dtx b/macros/latex/contrib/l3kernel/l3text.dtx
index ad984ab079..c230ab9f27 100644
--- a/macros/latex/contrib/l3kernel/l3text.dtx
+++ b/macros/latex/contrib/l3kernel/l3text.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx
index 80007bfa7f..228c14ba54 100644
--- a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx
+++ b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3tl.dtx b/macros/latex/contrib/l3kernel/l3tl.dtx
index 3637096e73..50612ce0c0 100644
--- a/macros/latex/contrib/l3kernel/l3tl.dtx
+++ b/macros/latex/contrib/l3kernel/l3tl.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
@@ -576,7 +576,7 @@
% \begin{texnote}
% The result is returned within \tn{unexpanded}, which means that the token
% list does not expand further when appearing in an \texttt{x}-type
-% argument expansion.
+% or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
@@ -613,7 +613,7 @@
% \begin{texnote}
% The result is returned within \tn{unexpanded}, which means that the token
% list does not expand further when appearing in an \texttt{x}-type
-% argument expansion.
+% or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
@@ -629,7 +629,7 @@
% \begin{texnote}
% The result is returned within \tn{unexpanded}, which means that the token
% list does not expand further when appearing in an \texttt{x}-type
-% argument expansion.
+% or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
@@ -878,7 +878,7 @@
% \begin{texnote}
% The result is returned within \cs{exp_not:n}, which means that the token
% list does not expand further when appearing in an \texttt{x}-type
-% argument expansion.
+% or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
@@ -923,7 +923,7 @@
% \begin{texnote}
% The result is returned within \cs{exp_not:n}, which means that the
% token list does not expand further when appearing in an \texttt{x}-type
-% argument expansion.
+% or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
@@ -944,7 +944,7 @@
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{item}
% does not expand further when appearing in an \texttt{x}-type
-% argument expansion.
+% or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
@@ -961,7 +961,7 @@
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{item}
% does not expand further when appearing in an \texttt{x}-type
-% argument expansion.
+% or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
@@ -1034,7 +1034,7 @@
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{item}
% does not expand further when appearing in an \texttt{x}-type
-% argument expansion.
+% or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
diff --git a/macros/latex/contrib/l3kernel/l3token.dtx b/macros/latex/contrib/l3kernel/l3token.dtx
index a233413aab..06c1989df1 100644
--- a/macros/latex/contrib/l3kernel/l3token.dtx
+++ b/macros/latex/contrib/l3kernel/l3token.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/l3unicode.dtx b/macros/latex/contrib/l3kernel/l3unicode.dtx
index 7a1babeca5..a173612e87 100644
--- a/macros/latex/contrib/l3kernel/l3unicode.dtx
+++ b/macros/latex/contrib/l3kernel/l3unicode.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2022-02-05}
+% \date{Released 2022-02-21}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3kernel/source3.pdf b/macros/latex/contrib/l3kernel/source3.pdf
index c16928e861..ebf0336b0e 100644
--- a/macros/latex/contrib/l3kernel/source3.pdf
+++ b/macros/latex/contrib/l3kernel/source3.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3kernel/source3.tex b/macros/latex/contrib/l3kernel/source3.tex
index 0e798c099b..91e6c3995a 100644
--- a/macros/latex/contrib/l3kernel/source3.tex
+++ b/macros/latex/contrib/l3kernel/source3.tex
@@ -53,7 +53,7 @@ for those people who are interested.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2022-02-05}
+\date{Released 2022-02-21}
\pagenumbering{roman}
\maketitle
diff --git a/macros/latex/contrib/moderncv/CHANGELOG b/macros/latex/contrib/moderncv/CHANGELOG
index 325e2b7f35..245eda72b7 100644
--- a/macros/latex/contrib/moderncv/CHANGELOG
+++ b/macros/latex/contrib/moderncv/CHANGELOG
@@ -1,3 +1,8 @@
+version 2.3.1 (2022-02-21)
+- Fix duplicate GitLab icon (#105)
+- Revert using detokenize in social links (#97)
+- Fix broken compilation in classic style (#96)
+
version 2.3.0 (2021-12-16)
- Remove font loading from class (#87)
- Add Matrix and Signal icon (#84)
diff --git a/macros/latex/contrib/moderncv/README.md b/macros/latex/contrib/moderncv/README.md
index 53adf48fad..1eb439d16b 100644
--- a/macros/latex/contrib/moderncv/README.md
+++ b/macros/latex/contrib/moderncv/README.md
@@ -10,6 +10,14 @@ Until a decent manual is written, one can always look in the `template.tex` file
If using [`academicons`](https://ctan.org/tex-archive/fonts/academicons) in the template, you need to use a Xe(La)TeX or Lua(La)TeX engine for them to render. Otherwise an alternative will be used automatically.
+## Development
+
+[![Build template](https://github.com/moderncv/moderncv/actions/workflows/build-pdf.yml/badge.svg)](https://github.com/moderncv/moderncv/actions/workflows/build-pdf.yml)
+[![CTAN](https://img.shields.io/ctan/v/moderncv.svg)](https://www.ctan.org/pkg/moderncv)
+[![Matrix](https://img.shields.io/matrix/moderncv:matrix.org)](https://matrix.to/#/#moderncv:matrix.org)
+
+As the main goal is to keep this package alive, it is maintained in a loosely structured team. You can contact us in our matrix room [moderncv:matrix.org](https://matrix.to/#/#moderncv:matrix.org), feel free to join if you have questions or want to contribute. Development takes places at [github.com/moderncv/moderncv](https://github.com/moderncv/moderncv).
+
## Licence
moderncv is licensed under the [LPPL-1.3c](https://spdx.org/licenses/LPPL-1.3c.html).
diff --git a/macros/latex/contrib/moderncv/moderncv.cls b/macros/latex/contrib/moderncv/moderncv.cls
index 2c1f9a0ef0..44b9e35914 100644
--- a/macros/latex/contrib/moderncv/moderncv.cls
+++ b/macros/latex/contrib/moderncv/moderncv.cls
@@ -1,5 +1,5 @@
%% start of file `moderncv.cls'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{moderncv}[2021-12-16 v2.3.0 modern curriculum vitae and letter document class]
+\ProvidesClass{moderncv}[2022-02-21 v2.3.1 modern curriculum vitae and letter document class]
%-------------------------------------------------------------------------------
@@ -513,14 +513,14 @@
\newcommand*{\link}[2][]{%
\ifthenelse{\equal{#1}{}}%
{\href{#2}{#2}}%
- {\href{#2}{\detokenize{#1}}}}
+ {\href{#2}{#1}}}
% makes a http hyperlink
% usage: \httplink[optional text]{link}
\newcommand*{\httplink}[2][]{%
\ifthenelse{\equal{#1}{}}%
{\href{http://#2}{#2}}%
- {\href{http://#2}{\detokenize{#1}}}}
+ {\href{http://#2}{#1}}}
% makes an https hyperlink
@@ -528,14 +528,14 @@
\newcommand*{\httpslink}[2][]{%
\ifthenelse{\equal{#1}{}}%
{\href{https://#2}{#2}}%
- {\href{https://#2}{\detokenize{#1}}}}
+ {\href{https://#2}{#1}}}
% makes an email hyperlink
% usage: \emaillink[optional text]{link}
\newcommand*{\emaillink}[2][]{%
\ifthenelse{\equal{#1}{}}%
{\href{mailto:#2}{#2}}%
- {\href{mailto:#2}{\detokenize{#1}}}}
+ {\href{mailto:#2}{#1}}}
% makes a tel hyperlink
% usage: \tellink[optional text]{link}
diff --git a/macros/latex/contrib/moderncv/moderncvbodyi.sty b/macros/latex/contrib/moderncv/moderncvbodyi.sty
index c83b7da6b7..02ac2e3aa5 100644
--- a/macros/latex/contrib/moderncv/moderncvbodyi.sty
+++ b/macros/latex/contrib/moderncv/moderncvbodyi.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvbodyi.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvbodyi}[2021-12-16 v2.3.0 modern curriculum vitae and letter body variant: 1]
+\ProvidesPackage{moderncvbodyi}[2022-02-21 v2.3.1 modern curriculum vitae and letter body variant: 1]
%-------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/moderncv/moderncvbodyiii.sty b/macros/latex/contrib/moderncv/moderncvbodyiii.sty
index 4f542b779e..003f9f3e1b 100644
--- a/macros/latex/contrib/moderncv/moderncvbodyiii.sty
+++ b/macros/latex/contrib/moderncv/moderncvbodyiii.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvbodyiii.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvbodyiii}[2021-12-16 v2.3.0 modern curriculum vitae and letter body variant: 3]
+\ProvidesPackage{moderncvbodyiii}[2022-02-21 v2.3.1 modern curriculum vitae and letter body variant: 3]
% rules type options: "fullrules", "shortrules", "mixedrules" (default) or "norules"
\@initializeif{\if@fullrules}\@fullrulesfalse
diff --git a/macros/latex/contrib/moderncv/moderncvbodyiv.sty b/macros/latex/contrib/moderncv/moderncvbodyiv.sty
index b3c03a158d..9127af18e8 100644
--- a/macros/latex/contrib/moderncv/moderncvbodyiv.sty
+++ b/macros/latex/contrib/moderncv/moderncvbodyiv.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvbodyiv.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvbodyiv}[2021-12-16 v2.3.0 modern curriculum vitae and letter body variant: 4]
+\ProvidesPackage{moderncvbodyiv}[2022-02-21 v2.3.1 modern curriculum vitae and letter body variant: 4]
%-------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/moderncv/moderncvbodyv.sty b/macros/latex/contrib/moderncv/moderncvbodyv.sty
index fd6f760299..1f49692984 100644
--- a/macros/latex/contrib/moderncv/moderncvbodyv.sty
+++ b/macros/latex/contrib/moderncv/moderncvbodyv.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvbodyv.sty'.
-%% Copyright 2015-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2015-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvbodyv}[2021-12-16 v2.3.0 modern curriculum vitae and letter body variant: 5]
+\ProvidesPackage{moderncvbodyv}[2022-02-21 v2.3.1 modern curriculum vitae and letter body variant: 5]
%-------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/moderncv/moderncvcollection.sty b/macros/latex/contrib/moderncv/moderncvcollection.sty
index 3c5ee25358..5d3432e661 100644
--- a/macros/latex/contrib/moderncv/moderncvcollection.sty
+++ b/macros/latex/contrib/moderncv/moderncvcollection.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcollection.sty'.
-%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcollection}[2021-12-16 v2.3.0 moderncv collections]
+\ProvidesPackage{moderncvcollection}[2022-02-21 v2.3.1 moderncv collections]
%-------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/moderncv/moderncvcolorblack.sty b/macros/latex/contrib/moderncv/moderncvcolorblack.sty
index d594d184af..ea3653eace 100644
--- a/macros/latex/contrib/moderncv/moderncvcolorblack.sty
+++ b/macros/latex/contrib/moderncv/moderncvcolorblack.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcolorblack.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorblack}[2021-12-16 v2.3.0 modern curriculum vitae and letter color scheme: black]
+\ProvidesPackage{moderncvcolorblack}[2022-02-21 v2.3.1 modern curriculum vitae and letter color scheme: black]
%-------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/moderncv/moderncvcolorblue.sty b/macros/latex/contrib/moderncv/moderncvcolorblue.sty
index 35229cff33..b02992e1b3 100644
--- a/macros/latex/contrib/moderncv/moderncvcolorblue.sty
+++ b/macros/latex/contrib/moderncv/moderncvcolorblue.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcolorblue.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorblue}[2021-12-16 v2.3.0 modern curriculum vitae and letter color scheme: blue]
+\ProvidesPackage{moderncvcolorblue}[2022-02-21 v2.3.1 modern curriculum vitae and letter color scheme: blue]
%-------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/moderncv/moderncvcolorburgundy.sty b/macros/latex/contrib/moderncv/moderncvcolorburgundy.sty
index 454658b1c5..775f033f23 100644
--- a/macros/latex/contrib/moderncv/moderncvcolorburgundy.sty
+++ b/macros/latex/contrib/moderncv/moderncvcolorburgundy.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcolorburgundy.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorburgundy}[2021-12-16 v2.3.0 modern curriculum vitae and letter color scheme: burgundy]
+\ProvidesPackage{moderncvcolorburgundy}[2022-02-21 v2.3.1 modern curriculum vitae and letter color scheme: burgundy]
%-------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/moderncv/moderncvcolorgreen.sty b/macros/latex/contrib/moderncv/moderncvcolorgreen.sty
index 36bdf64a09..891c3290b5 100644
--- a/macros/latex/contrib/moderncv/moderncvcolorgreen.sty
+++ b/macros/latex/contrib/moderncv/moderncvcolorgreen.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcolorgreen.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorgreen}[2021-12-16 v2.3.0 modern curriculum vitae and letter color scheme: green]
+\ProvidesPackage{moderncvcolorgreen}[2022-02-21 v2.3.1 modern curriculum vitae and letter color scheme: green]
%-------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/moderncv/moderncvcolorgrey.sty b/macros/latex/contrib/moderncv/moderncvcolorgrey.sty
index 0a9a80528c..37d2b57749 100644
--- a/macros/latex/contrib/moderncv/moderncvcolorgrey.sty
+++ b/macros/latex/contrib/moderncv/moderncvcolorgrey.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcolorgrey.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorgrey}[2021-12-16 v2.3.0 modern curriculum vitae and letter color scheme: grey]
+\ProvidesPackage{moderncvcolorgrey}[2022-02-21 v2.3.1 modern curriculum vitae and letter color scheme: grey]
%-------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/moderncv/moderncvcolororange.sty b/macros/latex/contrib/moderncv/moderncvcolororange.sty
index 5d4cae58cb..f249fd7de9 100644
--- a/macros/latex/contrib/moderncv/moderncvcolororange.sty
+++ b/macros/latex/contrib/moderncv/moderncvcolororange.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcolororange.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolororange}[2021-12-16 v2.3.0 modern curriculum vitae and letter color scheme: orange]
+\ProvidesPackage{moderncvcolororange}[2022-02-21 v2.3.1 modern curriculum vitae and letter color scheme: orange]
%-------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/moderncv/moderncvcolorpurple.sty b/macros/latex/contrib/moderncv/moderncvcolorpurple.sty
index f67530ed08..22053d7849 100644
--- a/macros/latex/contrib/moderncv/moderncvcolorpurple.sty
+++ b/macros/latex/contrib/moderncv/moderncvcolorpurple.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcolorpurple.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorpurple}[2021-12-16 v2.3.0 modern curriculum vitae and letter color scheme: purple]
+\ProvidesPackage{moderncvcolorpurple}[2022-02-21 v2.3.1 modern curriculum vitae and letter color scheme: purple]
%-------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/moderncv/moderncvcolorred.sty b/macros/latex/contrib/moderncv/moderncvcolorred.sty
index 6a6445e66e..68b1335c84 100644
--- a/macros/latex/contrib/moderncv/moderncvcolorred.sty
+++ b/macros/latex/contrib/moderncv/moderncvcolorred.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcolorred.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorred}[2021-12-16 v2.3.0 modern curriculum vitae and letter color scheme: red]
+\ProvidesPackage{moderncvcolorred}[2022-02-21 v2.3.1 modern curriculum vitae and letter color scheme: red]
%-------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/moderncv/moderncvcompatibility.sty b/macros/latex/contrib/moderncv/moderncvcompatibility.sty
index f9155f6245..fb9a8c4363 100644
--- a/macros/latex/contrib/moderncv/moderncvcompatibility.sty
+++ b/macros/latex/contrib/moderncv/moderncvcompatibility.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvcompatibility.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcompatibility}[2021-12-16 v2.3.0 modern curriculum vitae and letter compatibility patches]
+\ProvidesPackage{moderncvcompatibility}[2022-02-21 v2.3.1 modern curriculum vitae and letter compatibility patches]
%-------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/moderncv/moderncvdebugtools.sty b/macros/latex/contrib/moderncv/moderncvdebugtools.sty
index 577406130e..b28e409b54 100644
--- a/macros/latex/contrib/moderncv/moderncvdebugtools.sty
+++ b/macros/latex/contrib/moderncv/moderncvdebugtools.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvdebugtools.sty'.
-%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvdebugtools}[2021-12-16 v2.3.0 modern curriculum vitae and letter debug tools]
+\ProvidesPackage{moderncvdebugtools}[2022-02-21 v2.3.1 modern curriculum vitae and letter debug tools]
%-------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/moderncv/moderncvfooti.sty b/macros/latex/contrib/moderncv/moderncvfooti.sty
index 45ca74e66b..370365848f 100644
--- a/macros/latex/contrib/moderncv/moderncvfooti.sty
+++ b/macros/latex/contrib/moderncv/moderncvfooti.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvfooti.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvfooti}[2021-12-16 v2.3.0 modern curriculum vitae and letter footer variant: 1]
+\ProvidesPackage{moderncvfooti}[2022-02-21 v2.3.1 modern curriculum vitae and letter footer variant: 1]
%-------------------------------------------------------------------------------
@@ -27,7 +27,7 @@
% symbols
% footer symbol used to separate footer elements
\newcommand*{\footsymbol}{%
- {~~~{\rmfamily\textbullet}~~~}}% the \rmfamily is required to force Latin Modern fonts when using sans serif, as OMS/lmss/m/n is not defined and gets substituted by OMS/cmsy/m/n
+ {\hspace{1em}{\rmfamily\textbullet}\hspace{1em}}}% the \rmfamily is required to force Latin Modern fonts when using sans serif, as OMS/lmss/m/n is not defined and gets substituted by OMS/cmsy/m/n
% lengths
\@initializelength{\footwidth}%
diff --git a/macros/latex/contrib/moderncv/moderncvheadi.sty b/macros/latex/contrib/moderncv/moderncvheadi.sty
index 86a0e54c67..087cf776e2 100644
--- a/macros/latex/contrib/moderncv/moderncvheadi.sty
+++ b/macros/latex/contrib/moderncv/moderncvheadi.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvheadi.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvheadi}[2021-12-16 v2.3.0 modern curriculum vitae and letter header variant: 1]
+\ProvidesPackage{moderncvheadi}[2022-02-21 v2.3.1 modern curriculum vitae and letter header variant: 1]
% details options: "details" (default) or "nodetails"
\@initializeif{\if@details}\@detailsfalse
diff --git a/macros/latex/contrib/moderncv/moderncvheadii.sty b/macros/latex/contrib/moderncv/moderncvheadii.sty
index 1444b39c1f..b699242ed4 100644
--- a/macros/latex/contrib/moderncv/moderncvheadii.sty
+++ b/macros/latex/contrib/moderncv/moderncvheadii.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvheadii.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvheadii}[2021-12-16 v2.3.0 modern curriculum vitae and letter header variant: 2]
+\ProvidesPackage{moderncvheadii}[2022-02-21 v2.3.1 modern curriculum vitae and letter header variant: 2]
% details options: "details" or "nodetails" (default)
\@initializeif{\if@details}\@detailsfalse
@@ -54,7 +54,7 @@
% commands
\@initializecommand{\makeheaddetailssymbol}{%
- {~~~{\rmfamily\textbullet}~~~}}% the \rmfamily is required to force Latin Modern fonts when using sans serif, as OMS/lmss/m/n is not defined and gets substituted by OMS/cmsy/m/n
+ {\hspace{1em}{\rmfamily\textbullet}\hspace{1em}}}% the \rmfamily is required to force Latin Modern fonts when using sans serif, as OMS/lmss/m/n is not defined and gets substituted by OMS/cmsy/m/n
% internal command to add an element to the footer
% it collects the elements in a temporary box, and checks when to flush the box
\@initializebox{\makeheaddetailsbox}%
diff --git a/macros/latex/contrib/moderncv/moderncvheadiii.sty b/macros/latex/contrib/moderncv/moderncvheadiii.sty
index 0a022de802..e4dbafd5ae 100644
--- a/macros/latex/contrib/moderncv/moderncvheadiii.sty
+++ b/macros/latex/contrib/moderncv/moderncvheadiii.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvheadiii.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvheadiii}[2021-12-16 v2.3.0 modern curriculum vitae and letter header variant: 3]
+\ProvidesPackage{moderncvheadiii}[2022-02-21 v2.3.1 modern curriculum vitae and letter header variant: 3]
% details options: "details" (default) or "nodetails"
\@initializeif{\if@details}\@detailsfalse
@@ -43,7 +43,7 @@
% commands
\@initializecommand{\makeheaddetailssymbol}{%
- {~~~{\rmfamily\textbullet}~~~}}% the \rmfamily is required to force Latin Modern fonts when using sans serif, as OMS/lmss/m/n is not defined and gets substituted by OMS/cmsy/m/n
+ {\hspace{1em}{\rmfamily\textbullet}\hspace{1em}}}% the \rmfamily is required to force Latin Modern fonts when using sans serif, as OMS/lmss/m/n is not defined and gets substituted by OMS/cmsy/m/n
% internal command to add an element to the footer
% it collects the elements in a temporary box, and checks when to flush the box
\@initializebox{\makeheaddetailsbox}%
diff --git a/macros/latex/contrib/moderncv/moderncvheadiv.sty b/macros/latex/contrib/moderncv/moderncvheadiv.sty
index f5a534e25a..9b59dacb9b 100644
--- a/macros/latex/contrib/moderncv/moderncvheadiv.sty
+++ b/macros/latex/contrib/moderncv/moderncvheadiv.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvheadiv.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvheadiv}[2021-12-16 v2.3.0 modern curriculum vitae and letter header variant: 4]
+\ProvidesPackage{moderncvheadiv}[2022-02-21 v2.3.1 modern curriculum vitae and letter header variant: 4]
% details options: "details" (default) or "nodetails"
\@initializeif{\if@details}\@detailsfalse
diff --git a/macros/latex/contrib/moderncv/moderncvheadv.sty b/macros/latex/contrib/moderncv/moderncvheadv.sty
index 1a5d9391db..c4d4084324 100644
--- a/macros/latex/contrib/moderncv/moderncvheadv.sty
+++ b/macros/latex/contrib/moderncv/moderncvheadv.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvheadv.sty'.
-%% Copyright 2015-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2015-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvheadv}[2021-12-16 v2.3.0 modern curriculum vitae and letter header variant: 5]
+\ProvidesPackage{moderncvheadv}[2022-02-21 v2.3.1 modern curriculum vitae and letter header variant: 5]
% details options: "details" (default) or "nodetails"
\@initializeif{\if@details}\@detailsfalse
diff --git a/macros/latex/contrib/moderncv/moderncvheadvi.sty b/macros/latex/contrib/moderncv/moderncvheadvi.sty
index 1169e21dc5..8595901901 100644
--- a/macros/latex/contrib/moderncv/moderncvheadvi.sty
+++ b/macros/latex/contrib/moderncv/moderncvheadvi.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvheadvi.sty'.
-%% Copyright 2015-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2015-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvheadvi}[2021-12-16 v2.3.0 modern curriculum vitae and letter header: 6]
+\ProvidesPackage{moderncvheadvi}[2022-02-21 v2.3.1 modern curriculum vitae and letter header: 6]
% details options: "details" (default) or "nodetails"
\@initializeif{\if@details}\@detailsfalse
@@ -68,7 +68,7 @@
% commands
\@initializecommand{\makeheaddetailssymbol}{%
- {~~~{\rmfamily\textbullet}~~~}}% the \rmfamily is required to force Latin Modern fonts when using sans serif, as OMS/lmss/m/n is not defined and gets substituted by OMS/cmsy/m/n
+ {\hspace{1em}{\rmfamily\textbullet}\hspace{1em}}}% the \rmfamily is required to force Latin Modern fonts when using sans serif, as OMS/lmss/m/n is not defined and gets substituted by OMS/cmsy/m/n
% internal command to add an element to the footer
% it collects the elements in a temporary box, and checks when to flush the box
\@initializebox{\makeheaddetailsbox}%
diff --git a/macros/latex/contrib/moderncv/moderncviconsacademic.sty b/macros/latex/contrib/moderncv/moderncviconsacademic.sty
index 280eb9b70d..e1eae589aa 100644
--- a/macros/latex/contrib/moderncv/moderncviconsacademic.sty
+++ b/macros/latex/contrib/moderncv/moderncviconsacademic.sty
@@ -1,5 +1,5 @@
%% start of file `moderncviconsacademic.sty'.
-%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncviconsacademic}[2021-12-16 v2.3.0 modern curriculum vitae icons: academicons]
+\ProvidesPackage{moderncviconsacademic}[2022-02-21 v2.3.1 modern curriculum vitae icons: academicons]
%-------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/moderncv/moderncviconsawesome.sty b/macros/latex/contrib/moderncv/moderncviconsawesome.sty
index bef20b362c..2a0ea3a23c 100644
--- a/macros/latex/contrib/moderncv/moderncviconsawesome.sty
+++ b/macros/latex/contrib/moderncv/moderncviconsawesome.sty
@@ -1,5 +1,5 @@
%% start of file `moderncviconsawesome.sty'.
-%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncviconsawesome}[2021-12-16 v2.3.0 modern curriculum vitae icons: awesome]
+\ProvidesPackage{moderncviconsawesome}[2022-02-21 v2.3.1 modern curriculum vitae icons: awesome]
%-------------------------------------------------------------------------------
% required packages
diff --git a/macros/latex/contrib/moderncv/moderncviconsletters.sty b/macros/latex/contrib/moderncv/moderncviconsletters.sty
index edce723d15..832e21035a 100644
--- a/macros/latex/contrib/moderncv/moderncviconsletters.sty
+++ b/macros/latex/contrib/moderncv/moderncviconsletters.sty
@@ -1,5 +1,5 @@
%% start of file `moderncviconsletters.sty'.
-%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncviconsletters}[2021-12-16 v2.3.0 modern curriculum vitae icons: letter]
+\ProvidesPackage{moderncviconsletters}[2022-02-21 v2.3.1 modern curriculum vitae icons: letter]
%-------------------------------------------------------------------------------
% symbols definition
diff --git a/macros/latex/contrib/moderncv/moderncviconsmarvosym.sty b/macros/latex/contrib/moderncv/moderncviconsmarvosym.sty
index ea2dddfa70..0a1d8f107d 100644
--- a/macros/latex/contrib/moderncv/moderncviconsmarvosym.sty
+++ b/macros/latex/contrib/moderncv/moderncviconsmarvosym.sty
@@ -1,5 +1,5 @@
%% start of file `moderncviconsmarvosym.sty'.
-%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncviconsmarvosym}[2021-12-16 v2.3.0 modern curriculum vitae icons: marvosym]
+\ProvidesPackage{moderncviconsmarvosym}[2022-02-21 v2.3.1 modern curriculum vitae icons: marvosym]
%-------------------------------------------------------------------------------
% all symbols described in moderncv.cls
diff --git a/macros/latex/contrib/moderncv/moderncviconssymbols.sty b/macros/latex/contrib/moderncv/moderncviconssymbols.sty
index b728536357..256304380e 100644
--- a/macros/latex/contrib/moderncv/moderncviconssymbols.sty
+++ b/macros/latex/contrib/moderncv/moderncviconssymbols.sty
@@ -1,5 +1,5 @@
%% start of file `moderncviconssymbols.sty'.
-%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -30,4 +30,4 @@
\endinput
-%% end of file `moderncviconssymbols.sty'. \ No newline at end of file
+%% end of file `moderncviconssymbols.sty'.
diff --git a/macros/latex/contrib/moderncv/moderncviconstikz.sty b/macros/latex/contrib/moderncv/moderncviconstikz.sty
index 078a0e99f7..c3e9f40b0d 100644
--- a/macros/latex/contrib/moderncv/moderncviconstikz.sty
+++ b/macros/latex/contrib/moderncv/moderncviconstikz.sty
@@ -1,5 +1,5 @@
%% start of file `moderncviconstikz.sty'.
-%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2013-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncviconstikz}[2021-12-16 v2.3.0 modern curriculum vitae and letter icons: tickz]
+\ProvidesPackage{moderncviconstikz}[2022-02-21 v2.3.1 modern curriculum vitae and letter icons: tickz]
%-------------------------------------------------------------------------------
@@ -217,7 +217,7 @@
\protect\raisebox{-0.12em}{
\protect\begin{tikzpicture}[x=0.11em, y=0.11em, xscale=0.015, yscale=-0.015, inner sep=0pt, outer sep=0pt]
\protect\begin{scope}[shift={(507,387)}]
- \path[fill=color2,line width=0.057pt]
+ \protect\path[fill=color2,line width=0.057pt]
(105.2000,24.9000) .. controls (102.1000,16.0000) and (89.5000,16.0000) ..
(86.3000,24.9000) -- (29.8000,199.7000) -- (161.7000,199.7000) .. controls
(161.7000,199.7000) and (105.2000,24.9000) .. (105.2000,24.9000) -- cycle
@@ -269,33 +269,12 @@
~}
}{}\par
-\ifdefempty{\gitlabsocialsymbol} {
- \renewcommand*{\gitlabsocialsymbol} {
- \protect\raisebox{-0.12em}{
- \protect\begin{tikzpicture}[x=0.11em, y=0.11em, xscale=0.015, yscale=-0.015, inner sep=0pt, outer sep=0pt]
- \protect\begin{scope}[shift={(507,387)}]
- \path[fill=color2,line width=0.057pt]
- (105.2000,24.9000) .. controls (102.1000,16.0000) and (89.5000,16.0000) ..
- (86.3000,24.9000) -- (29.8000,199.7000) -- (161.7000,199.7000) .. controls
- (161.7000,199.7000) and (105.2000,24.9000) .. (105.2000,24.9000) -- cycle
- (0.9000,287.7000) .. controls (-1.7000,295.7000) and (1.2000,304.6000) ..
- (8.0000,309.7000) -- (255.9000,493.7000) -- (29.7000,199.7000) -- cycle
- (161.7000,199.7000) -- (161.7000,199.7000) -- (256.0000,493.7000) -- (350.3000,199.7000) -- cycle
- (511.1000,287.7000) -- (482.3000,199.7000) -- (256.0000,493.7000) --
- (503.9000,309.7000) .. controls (510.8000,304.6000) and (513.6000,295.7000) ..
- (511.1000,287.7000) -- cycle(425.7000,24.9000) .. controls (422.6000,16.0000)
- and (410.0000,16.0000) .. (406.8000,24.9000) -- (350.2000,199.7000) -- (482.2000,199.7000) -- cycle;
- \protect\end{scope}
- \protect\end{tikzpicture}}
- ~}
-}{}\par
-
\ifdefempty{\googlescholarsocialsymbol} {
\renewcommand*{\googlescholarsocialsymbol} {
\protect\raisebox{-0.12em}{
\protect\begin{tikzpicture}[y=2.0pt, x=2.0pt, yscale=-0.1, xscale=0.1, inner sep=0pt, outer sep=0pt]
\protect\begin{scope}[shift={(507,387)}]
- \path[fill=color2] (25.0000,2.0000) .. controls (12.3095,2.0000) and (2.0000,12.3095)
+ \protect\path[fill=color2] (25.0000,2.0000) .. controls (12.3095,2.0000) and (2.0000,12.3095)
.. (2.0000,25.0000) .. controls (2.0000,37.6905) and (12.3095,48.0000) ..
(25.0000,48.0000) .. controls (37.6905,48.0000) and (48.0000,37.6905) ..
(48.0000,25.0000) .. controls (48.0000,12.3095) and (37.6905,2.0000) ..
@@ -348,7 +327,7 @@
\protect\raisebox{-0.12em}{
\protect\begin{tikzpicture}[y=1.8pt, x=1.8pt, yscale=-0.15, xscale=0.15, inner sep=0pt, outer sep=0pt]
\protect\begin{scope}[shift={(507,387)}]
- \path[fill=color2]
+ \protect\path[fill=color2]
(0.9360,0.7320) .. controls (0.9360,10.9053) and (0.9360,21.0787) ..
(0.9360,31.2520) .. controls (1.6673,31.2520) and (2.3987,31.2520) ..
(3.1300,31.2520) .. controls (3.3452,32.0075) and (2.8778,32.0803) ..
@@ -395,7 +374,7 @@
\protect\raisebox{-0.12em}{
\protect\begin{tikzpicture}[y=0.1pt, x=0.1pt, yscale=-0.13, xscale=0.13, inner sep=0pt, outer sep=0pt]
\protect\begin{scope}[shift={(507,387)}]
- \path[fill=color2]
+ \protect\path[fill=color2]
(430.1000,180.9000) -- (437.8000,211.9000) .. controls (407.6000,219.3000)
and (378.7000,231.3000) .. (352.1000,247.3000) -- (335.7000,220.0000) ..
controls (365.0000,202.3000) and (396.9000,189.1000) .. (430.1000,180.9000) --
diff --git a/macros/latex/contrib/moderncv/moderncvskillmatrix.sty b/macros/latex/contrib/moderncv/moderncvskillmatrix.sty
index 696448a2db..68b8db9a0a 100644
--- a/macros/latex/contrib/moderncv/moderncvskillmatrix.sty
+++ b/macros/latex/contrib/moderncv/moderncvskillmatrix.sty
@@ -203,7 +203,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvskillmatrix}[2021-12-16 v2.3.0 modern curriculum vitae and letter skill matrix]
+\ProvidesPackage{moderncvskillmatrix}[2022-02-21 v2.3.1 modern curriculum vitae and letter skill matrix]
% The definitions need to be adjusted depending on which moderncvbody<i-v>.sty style is usde.
% body type options: "moderncvbodyi" (default), "moderncvbodyii", "moderncvbodyiii", "moderncvbodyiv" or "moderncvbodyv"
diff --git a/macros/latex/contrib/moderncv/moderncvstylebanking.sty b/macros/latex/contrib/moderncv/moderncvstylebanking.sty
index 756d4be1ee..afc20e5399 100644
--- a/macros/latex/contrib/moderncv/moderncvstylebanking.sty
+++ b/macros/latex/contrib/moderncv/moderncvstylebanking.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvstylebanking.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstylebanking}[2021-12-16 v2.3.0 modern curriculum vitae and letter style scheme: banking]
+\ProvidesPackage{moderncvstylebanking}[2022-02-21 v2.3.1 modern curriculum vitae and letter style scheme: banking]
% body rules type options: "fullrules", "shortrules", "mixedrules" (default) or "norules"
\@initializecommand{\moderncvstylebodyoptions}{}
diff --git a/macros/latex/contrib/moderncv/moderncvstylecasual.sty b/macros/latex/contrib/moderncv/moderncvstylecasual.sty
index 3f8cb8c78e..eba5df696e 100644
--- a/macros/latex/contrib/moderncv/moderncvstylecasual.sty
+++ b/macros/latex/contrib/moderncv/moderncvstylecasual.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvstylecasual.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstylecasual}[2021-12-16 v2.3.0 modern curriculum vitae and letter style scheme: casual]
+\ProvidesPackage{moderncvstylecasual}[2022-02-21 v2.3.1 modern curriculum vitae and letter style scheme: casual]
% head section alignment options: "left" (default) or "right"
\@initializecommand{\moderncvstyleheadoptions}{}
diff --git a/macros/latex/contrib/moderncv/moderncvstyleclassic.sty b/macros/latex/contrib/moderncv/moderncvstyleclassic.sty
index 2c119e6d81..3018cc67a7 100644
--- a/macros/latex/contrib/moderncv/moderncvstyleclassic.sty
+++ b/macros/latex/contrib/moderncv/moderncvstyleclassic.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvstyleclassic.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstyleclassic}[2021-12-16 v2.3.0 modern curriculum vitae and letter style scheme: classic]
+\ProvidesPackage{moderncvstyleclassic}[2022-02-21 v2.3.1 modern curriculum vitae and letter style scheme: classic]
% head section alignment options: "left" (default) or "right"
\@initializecommand{\moderncvstyleheadoptions}{}
diff --git a/macros/latex/contrib/moderncv/moderncvstyleempty.sty b/macros/latex/contrib/moderncv/moderncvstyleempty.sty
index c19c132114..a86560524c 100644
--- a/macros/latex/contrib/moderncv/moderncvstyleempty.sty
+++ b/macros/latex/contrib/moderncv/moderncvstyleempty.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvstyleempty.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstyleempty}[2021-12-16 v2.3.0 modern curriculum vitae scheme: empty]
+\ProvidesPackage{moderncvstyleempty}[2022-02-21 v2.3.1 modern curriculum vitae scheme: empty]
%-------------------------------------------------------------------------------
% required packages
diff --git a/macros/latex/contrib/moderncv/moderncvstylefancy.sty b/macros/latex/contrib/moderncv/moderncvstylefancy.sty
index b23e530ae7..56de636100 100644
--- a/macros/latex/contrib/moderncv/moderncvstylefancy.sty
+++ b/macros/latex/contrib/moderncv/moderncvstylefancy.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvstylefancy.sty'.
-%% Copyright 2015-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2015-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstylefancy}[2021-12-16 v2.3.0 modern curriculum vitae and letter style scheme: fancy]
+\ProvidesPackage{moderncvstylefancy}[2022-02-21 v2.3.1 modern curriculum vitae and letter style scheme: fancy]
% toggle use of symbol fonts.
\@initializeif{\if@symbols}\@symbolsfalse
diff --git a/macros/latex/contrib/moderncv/moderncvstyleoldstyle.sty b/macros/latex/contrib/moderncv/moderncvstyleoldstyle.sty
index c4a29281e6..78225e0a58 100644
--- a/macros/latex/contrib/moderncv/moderncvstyleoldstyle.sty
+++ b/macros/latex/contrib/moderncv/moderncvstyleoldstyle.sty
@@ -1,5 +1,5 @@
%% start of file `moderncvstyleoldstyle.sty'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstyleoldstyle}[2021-12-16 v2.3.0 modern curriculum vitae and letter style scheme: oldstyle]
+\ProvidesPackage{moderncvstyleoldstyle}[2022-02-21 v2.3.1 modern curriculum vitae and letter style scheme: oldstyle]
% toggle use of symbol fonts.
\@initializeif{\if@symbols}\@symbolsfalse
diff --git a/macros/latex/contrib/moderncv/template.tex b/macros/latex/contrib/moderncv/template.tex
index 34abd843f3..38d313b383 100644
--- a/macros/latex/contrib/moderncv/template.tex
+++ b/macros/latex/contrib/moderncv/template.tex
@@ -1,5 +1,5 @@
%% start of file `template.tex'.
-%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Copyright 2006-2015 Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License version 1.3c,
@@ -14,10 +14,6 @@
%\renewcommand{\familydefault}{\sfdefault} % to set the default font; use '\sfdefault' for the default sans serif font, '\rmdefault' for the default roman one, or any tex font name
%\nopagenumbers{} % uncomment to suppress automatic page numbering for CVs longer than one page
-% character encoding
-%\usepackage[utf8]{inputenc} % if you are not using xelatex ou lualatex, replace by the encoding you are using
-%\usepackage{CJKutf8} % if you need to use CJK to typeset your resume in Chinese, Japanese or Korean
-
% adjust the page margins
\usepackage[scale=0.75]{geometry}
\setlength{\footskip}{136.00005pt} % depending on the amount of information in the footer, you need to change this value. comment this line out and set it to the size given in the warning
@@ -41,6 +37,9 @@
\usepackage{lmodern}
\fi
+% document language
+\usepackage[english]{babel} % FIXME: using spanish breaks moderncv
+
% personal data
\name{John}{Doe}
\title{Résumé title} % optional, remove / comment the line if not wanted
@@ -54,8 +53,8 @@
% Social icons
\social[linkedin]{john.doe} % optional, remove / comment the line if not wanted
-\social[xing]{john_doe} % optional, remove / comment the line if not wanted
-\social[twitter]{jdoe} % optional, remove / comment the line if not wanted
+\social[xing]{john\_doe} % optional, remove / comment the line if not wanted
+\social[twitter]{ji\_doe} % optional, remove / comment the line if not wanted
\social[github]{jdoe} % optional, remove / comment the line if not wanted
\social[gitlab]{jdoe} % optional, remove / comment the line if not wanted
\social[stackoverflow]{0000000/johndoe} % optional, remove / comment the line if not wanted
diff --git a/macros/latex/contrib/moderncv/tweaklist.sty b/macros/latex/contrib/moderncv/tweaklist.sty
index 8e369d9cbe..3739c95f92 100644
--- a/macros/latex/contrib/moderncv/tweaklist.sty
+++ b/macros/latex/contrib/moderncv/tweaklist.sty
@@ -1,6 +1,6 @@
%% start of file `tweaklist.sty'.
%% Original by Jakob Schiotz, downloaded from http://dcwww.camd.dtu.dk/~schiotz/comp/LatexTips/tweaklist.sty; not found on ctan.
-%% Modified by Xavier Danaux (xdanaux@gmail.com), 2020-2021 moderncv maintainers (github.com/moderncv).
+%% Modified by Xavier Danaux (xdanaux@gmail.com), 2020-2022 moderncv maintainers (github.com/moderncv).
%
% The tweaklist.sty package redefines the itemize, enumerate and description packages, so that all parameters can be adjusted.
% This was done by copying the original definitions, and adding "hook commands" that are executed when entering the environment.
diff --git a/macros/latex/contrib/nwejm/README.md b/macros/latex/contrib/nwejm/README.md
index 742ad35196..6c30fc79fe 100644
--- a/macros/latex/contrib/nwejm/README.md
+++ b/macros/latex/contrib/nwejm/README.md
@@ -8,7 +8,7 @@ new journal "North-Western European Journal of Mathematics".
Release
-------
-2022-02-04 v1.0.3
+2022-02-21 v1.0.4
Development
-----------
diff --git a/macros/latex/contrib/nwejm/doc/french/nwejm-fr.pdf b/macros/latex/contrib/nwejm/doc/french/nwejm-fr.pdf
index 7b8c6b4f57..c281c02bc0 100644
--- a/macros/latex/contrib/nwejm/doc/french/nwejm-fr.pdf
+++ b/macros/latex/contrib/nwejm/doc/french/nwejm-fr.pdf
Binary files differ
diff --git a/macros/latex/contrib/nwejm/doc/french/nwejm-fr.tex b/macros/latex/contrib/nwejm/doc/french/nwejm-fr.tex
index 87f7985d39..376a98cf2e 100644
--- a/macros/latex/contrib/nwejm/doc/french/nwejm-fr.tex
+++ b/macros/latex/contrib/nwejm/doc/french/nwejm-fr.tex
@@ -9,8 +9,8 @@
%
\documentclass[french,nolocaltoc]{nwejmart}
%
-\DTMsavedate{release-date}{2022-02-04}
-\newcommand{\releaseversion}{1.0.3}
+\DTMsavedate{release-date}{2022-02-21}
+\newcommand{\releaseversion}{1.0.4}
%
\usepackage[nwejm]{denisbdoc}
\usepackage{tabulary}
@@ -1845,8 +1845,8 @@ attaché au fichier \file{PDF} de la présente documentation\footnote{Pour
samples,
fontupper=\scriptsize\ttfamily,
listing only,
- listing file=../../examples/\attachfilename,
- title={\attachfiletextlink\ \attachfile{../../examples/\attachfilename}},%
+ listing file=../examples/\attachfilename,
+ title={\attachfiletextlink\ \attachfile{../examples/\attachfilename}},%
listing options={alsolanguage={[biblatex]TeX},deletekeywords={[2]title,author,keywords},deletekeywords={[5]keywords}}
}
diff --git a/macros/latex/contrib/nwejm/source/nwejm.dtx b/macros/latex/contrib/nwejm/source/nwejm.dtx
index 3228fa2384..f81c144879 100644
--- a/macros/latex/contrib/nwejm/source/nwejm.dtx
+++ b/macros/latex/contrib/nwejm/source/nwejm.dtx
@@ -27,7 +27,7 @@
% This field contains the version of the package.
% The value is optional.
% The value is restricted to 32 characters.
-\version{1.0.3 2022-02-04}
+\version{1.0.4 2022-02-21}
% -------------------------------------------------------------------------
% This field contains the name of the author(s).
% The value is optional.
@@ -143,7 +143,12 @@ Mathematics”](http://math.univ-lille1.fr/~nwejm/):
% \end{macrocode}
# [Unreleased]
-# [1.0.3] - 2022-02-04
+# [1.0.4] - 2022-02-21
+
+## Changed
+Logo file renamed for consistency.
+
+# [1.0.3] - 2022-02-02
## Added
- Add the ability to fit the TOC on a reduced number of pages.
@@ -275,7 +280,7 @@ new journal "North-Western European Journal of Mathematics".
Release
-------
-2022-02-04 v1.0.3
+2022-02-21 v1.0.4
Development
-----------
@@ -306,7 +311,7 @@ https://github.com/dbitouze/nwejm.
\input l3docstrip.tex
\Msg{********************************************************}
\Msg{* Installation}
-\Msg{* Class: nwejm 2022-02-04 v1.0.3}
+\Msg{* Class: nwejm 2022-02-21 v1.0.4}
\Msg{* for the journal}
\Msg{* "North-Western European Journal of Mathematics" (DB)}
\Msg{********************************************************}
@@ -590,8 +595,8 @@ Running "make install" installs the files in the local TeX tree.
\ProvidesExplClass
%<class> {nwejm}
%<class-article> {nwejmart}
- {2022-02-04}
- {1.0.3}
+ {2022-02-21}
+ {1.0.4}
{
Class for the journal "North-Western European Journal of Mathematics".
}
@@ -3014,10 +3019,10 @@ Running "make install" installs the files in the local TeX tree.
rectangle (current~page.south~east);
% laboratory logo
\node[anchor=south~east] at ([xshift=-10mm]current~page~text~area.south~east)
- {\includegraphics[height=.5\c_@@_logos_rectangle_height_dim]{logo-painleve}} ;
+ {\includegraphics[height=.5\c_@@_logos_rectangle_height_dim]{nwejm-logo-painleve}} ;
% university logo
\node[anchor=south~west] at (current~page~text~area.south~west)
- {\includegraphics[height=.5\c_@@_logos_rectangle_height_dim]{ul-fst-math}} ;
+ {\includegraphics[height=.5\c_@@_logos_rectangle_height_dim]{nwejm-ul-fst-math}} ;
% crop marks
\draw [white]
([xshift=2.5mm]current~page~text~area.north~east) --
diff --git a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
index 09ebf25b67..44f495b110 100644
--- a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
+++ b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
index 9e58664e9d..9ba28f0b31 100644
--- a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
+++ b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
@@ -8,7 +8,7 @@
\usepackage[scaled=0.875]{helvet}
\renewcommand\ttdefault{lmtt}
\usepackage[scaled=0.875]{cabin}
-\usepackage{ProfLycee}
+\usepackage[build]{ProfLycee}
\usetikzlibrary{hobby}
\usepackage{siunitx}
\usepackage{graphics}
@@ -20,7 +20,6 @@
\usepackage{hyperref}
\hypersetup{pdfborder=0 0 0}
-\usepackage{minted}
\sisetup{locale=FR}
\usepackage{geometry}
\geometry{margin=1.5cm}
@@ -37,7 +36,6 @@
\tcbset{vignettes/.style={%
nobeforeafter,box align=base,boxsep=0pt,enhanced,sharp corners=all,rounded corners=southeast,%
boxrule=0.75pt,left=7pt,right=1pt,top=0pt,bottom=0.25pt,%
- %before upper={{\normalsize \vphantom{pf}}}
}
}
\tcbset{vignettelatex/.style={%
@@ -49,6 +47,23 @@
\end{tcbclipinterior}}
}
}
+
+\newtcblisting{codetex}[1][]{%
+ colback=white,colframe=red!75!black,title={\small \faCode} Code \LaTeX,fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
+
+\newtcolorbox{codesortie}[1][]{%
+ colback=white,colframe=red!75!black,title={\small \faArrowAltCircleRight[regular]} Sortie \LaTeX,fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
+
+\newtcolorbox{codeidee}[1][]{%
+ colback=white,colframe=PeachPuff!75!black,title={\small \faLightbulb[regular]} Idée(s),fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
+
+\newtcolorbox{codeinfo}[1][]{%
+ colback=white,colframe=SteelBlue,title={\small \faPuzzlePiece} Information(s),fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
+
+\newtcolorbox{codecles}[1][]{%
+ colback=white,colframe=ForestGreen!75,title={\small \faPaperclip} Clés et options,fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
+
+%petite vignette tex
\newcommand\ctex[1]{\tcbox[vignettelatex]{#1}}
%gestion de la fenêtre v2 directement dans le tikzpicture
@@ -137,7 +152,7 @@
{\ttfamily c pierquet -- at -- outlook . fr}
\end{tabular}
}
-\date{Version 1.0.6 -- 18 Février 2022}
+\date{Version 1.0.7 -- 21 Février 2022}
\newcommand\Cle[1]{{\bfseries\sffamily\textlangle #1\textrangle}}
@@ -168,7 +183,7 @@ Quelques environnements (\textsf{tcbox}) pour présenter des commandes dans un t
\medskip
-\begin{tblr}{width=\linewidth,colspec={X[c]X[c]X[c]X[c]X[c]X[c]}}
+\begin{tblr}{width=\linewidth,colspec={X[c]X[c]X[c]X[c]X[c]X[c]},cells={font=\sffamily}}
{\huge \LaTeX} & & & & &\\
& {\huge \pdfLaTeX} & & & & \\
& & {\huge \LuaLaTeX} & & & \\
@@ -181,8 +196,6 @@ Quelques environnements (\textsf{tcbox}) pour présenter des commandes dans un t
\hrule
-
-
\vfill
~
@@ -197,36 +210,94 @@ Quelques environnements (\textsf{tcbox}) pour présenter des commandes dans un t
\subsection{\og Philosophie \fg{} du package}
+\begin{codeidee}
Ce \ctex{package}, très largement inspiré (et beaucoup moins abouti !) de l'excellent \ctex{ProfCollege} de C. Poulain et des excellents \ctex{tkz-*} d'A. Matthes, va définir quelques outils pour des situations particulières qui ne sont pas encore dans \ctex{ProfCollege}.
On peut le voir comme un (maigre) complément à \ctex{ProfCollege}, et je précise que la syntaxe est très proche (car pertinente de base) et donc pas de raison de changer une équipe qui gagne !
\medskip
-Il se charge, dans le préambule, par \ctex{\textbackslash usepackage\{ProfLycee\}}.
+Il se charge, dans le préambule, par \ctex{\textbackslash usepackage\{ProfLycee\}}. Il charge quelques \textsf{packages} utiles, mais j'ai fait le choix de laisser l'utilisateur gérer ses autres \textsf{packages}, comment notamment \ctex{amssymb} qui peut poser souci en fonction de la \textit{position} de son chargement.
+
+L'utlisateur est libre de charger ses autres \textsf{packages} utiles et habituels, ainsi que ses \textsf{polices} et \textsf{encodages} habituels.
+\end{codeidee}
+
+\smallskip
+
+\begin{codeinfo}
+Le \textsf{package} \ctex{ProfLycee} charge les \textsf{packages} :
+
+\begin{itemize}
+ \item \ctex{xcolor} avec les options \textsf{[table,svgnames]} ;
+ \item \ctex{tikz}, \ctex{pgf}, \ctex{xfp} ;
+ \item \ctex{xparse}, \ctex{xkeyval}, \ctex{xstring}, \ctex{simplekv} ;
+ \item \ctex{listofitems}, \ctex{xintexpr} ;
+ \item \ctex{tabularray}, \ctex{fontawesome5}, \ctex{tcolorbox}.
+\end{itemize}
+\end{codeinfo}
+
+\smallskip
+
+\begin{codeidee}
+J'ai utilisé les \ctex{packages} du phénoménal C. Tellechea, je vous conseille d'aller jeter un œil sur ce qu'il est possible de faire en \LaTeX{} avec \ctex{listofitems}, \ctex{randomlist}, \ctex{simplekv} et \ctex{xstring} !
+\end{codeidee}
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=2]{tex}
+\smallskip
+
+\begin{codetex}[listing only]
\documentclass{article}
\usepackage[french]{babel}
\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
\usepackage{ProfLycee}
...
-\end{minted}
+\end{codetex}
-\medskip
+\subsection{Options du package}
-Par défaut, \ctex{minted} est chargé est donc la compilation nécessite d'utiliser \textsf{shell-escape}. Cependant, si vous ne souhaitez pas utiliser les commandes nécessitant \ctex{minted} vous pouvez charger le package \ctex{ProfLycee} avec l'option \Cle{nominted}.
+\begin{codeinfo}
+Par défaut, \ctex{minted} est chargé et donc la compilation nécessite d'utiliser \textsf{shell-escape}. Cependant, si vous ne souhaitez pas utiliser les commandes nécessitant \ctex{minted} vous pouvez charger le package \ctex{ProfLycee} avec l'option \Cle{nominted}.
+\end{codeinfo}
+
+\smallskip
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=2]{tex}
+\begin{codetex}[listing only]
...
\usepackage[nominted]{ProfLycee}
...
-\end{minted}
+\end{codetex}
+
+\medskip
+
+\begin{codeinfo}
+En compilant (notamment avec les packages \ctex{minted} et \ctex{pythontex}) on peut spécifier des répertoires particuliers pour les (ou des) fichiers auxiliaires.
+
+Avec l'option \Cle{build}, l'utilisateur a la possibilité de placer les fichiers temporaires de \ctex{minted} et \ctex{pythontex} dans un répertoire \textsf{build} du répertoire courant.
+\end{codeinfo}
+
+\smallskip
+
+\begin{codetex}[listing only]
+...
+\usepackage[build]{ProfLycee}
+...
+\end{codetex}
+
+\smallskip
+
+\begin{codeinfo}
+Les options précédentes sont cumulables, et, pour info, elles conditionnent le chargement des \textsf{packages} avec les options :
+
+\begin{itemize}
+ \item \ctex{\textbackslash setpythontexoutputdir\{./build/pythontex-files-\textbackslash jobname\}}
+ \item \ctex{\textbackslash RequirePackage[outputdir=build]\{minted\}}
+\end{itemize}
+\end{codeinfo}
\subsection{Le système de \og clés/options \fg}
-L'idée est de conserver l'idée de \Cle{Clés} qui sont :
+\begin{codeidee}
+L'idée est de conserver -- autant que faire se peut -- l'idée de \Cle{Clés} qui sont :
%
\begin{itemize}
\item modifiables ;
@@ -234,13 +305,25 @@ L'idée est de conserver l'idée de \Cle{Clés} qui sont :
\end{itemize}
Pour certaines commandes, le système de \Cle{Clés} pose quelques soucis, de ce fait le fonctionnement est plus \textit{basique} avec un système d'\textsf{arguments} optionnels (entre \textsf{[\ldots]}) ou mandataires (entre \textsf{\{\ldots\}}).
+\end{codeidee}
-\medskip
+\smallskip
+
+\begin{codeinfo}
+Les \textsf{commandes} et \textsf{environnements} présentés seront explicités via leur \textsf{syntaxe} avec les \textsf{options} ou \textsf{arguments}.
+
+Autant que faire se peut, des exemples/illustrations/remarques seront proposés à chaque fois.
+
+\smallskip
+
+Les \textsf{codes} seront présentés dans des \textsf{boîtes} \textcolor{red!75!black}{{\small \faCode} Code \LaTeX}, si possible avec la \textsf{sortie} dans la même boîte, et sinon la \textsf{sortie} sera visible dans des \textsf{boîtes} \textcolor{red!75!black}{{\small \faArrowAltCircleRight[regular]} Sortie \LaTeX}.
-J'ai utilisé également les \ctex{packages} du phénoménal C. Tellechea, je vous conseille d'aller jeter un œil sur ce qu'il est possible de faire en \LaTeX{} avec \ctex{listofitems}, \ctex{randomlist}, \ctex{simplekv} et \ctex{xstring} !
+Les \textsf{clés} ou \textsf{options} seront présentées dans des \textsf{boîtes} \textcolor{ForestGreen}{{\small \faPaperclip} Clés}.
+\end{codeinfo}
\subsection{Outils disponibles}
+\begin{codeidee}
Le \ctex{package}, qui s'enrichira peut-être au fil du temps permet -- pour le moment -- de :
\begin{itemize}
@@ -250,14 +333,18 @@ Le \ctex{package}, qui s'enrichira peut-être au fil du temps permet -- pour le
\item mettre en forme du code \textsf{python} ou \textsf{pseudocode} ;
\item simuler une fenêtre de terminal (win/unix/osx).
\end{itemize}
+\end{codeidee}
-\medskip
+\smallskip
+\begin{codeinfo}
À noter que certaines commandes disponibles sont liées à un environnement \ctex{tikzpicture}, elles ne sont pas autonomes mais permettent de conserver -- en parallèle -- toute commande liée à \TikZ{} !
+\end{codeinfo}
\subsection{Compilateur(s)}
-Le package\ctex{ProfLycee} est compatible avec les compilateurs classiques : \textsf{latex}, \textsf{pdflatex} ou encore \textsf{lualatex}.
+\begin{codeinfo}
+Le package \ctex{ProfLycee} est compatible avec les compilateurs classiques : \textsf{latex}, \textsf{pdflatex} ou encore \textsf{lualatex}.
\smallskip
@@ -267,43 +354,9 @@ En ce qui concerne les codes \textsf{python} et/ou \textsf{pseudocode}, il faudr
\item compiler en chaîne \textsf{pdflatex + pythontex + pdflatex} pour les environnements avec \ctex{pythontex} ;
\item compiler avec \textsf{shell-escape} (ou \textsf{write18}) pour les environnements avec \ctex{minted}.
\end{itemize}
+\end{codeinfo}
+
-%\bigskip
-%
-%\begin{center}
-% \begin{tikzpicture}[x=0.9cm,y=0.9cm,xmin=-1,xmax=11,xgrille=1,xgrilles=0.5,ymin=-1,ymax=5,ygrille=1,ygrilles=0.5]
-% %axes et grilles
-% \draw[xstep=\xgrilles,ystep=\ygrilles,line width=0.3pt,lightgray!50] (\xmin,\ymin) grid (\xmax,\ymax);
-% \draw[xstep=\xgrilles,ystep=\ygrilles,line width=0.6pt,lightgray!50] (\xmin,\ymin) grid (\xmax,\ymax);
-% \draw[line width=1.5pt,->,gray] (\xmin,0)--(\xmax,0) ;
-% \draw[line width=1.5pt,->,gray] (0,\ymin)--(0,\ymax) ;
-% \foreach \x in {0,1,...,10} {\draw[gray,line width=1.5pt] (\x,4pt) -- (\x,-4pt) ;}
-% \foreach \y in {0,1,...,4} {\draw[gray,line width=1.5pt] (4pt,\y) -- (-4pt,\y) ;}
-% \draw[darkgray] (1,-4pt) node[below,font=\sffamily] {1} ;
-% \draw[darkgray] (-4pt,1) node[left,font=\sffamily] {1} ;
-% %splines
-% \def\LISTE{0/1/0§4/3.667/-0.333§7.5/1.75/0§9/2/-0.333§10/0/-10}
-% \splinetikz[liste=\LISTE,affpoints=true,coeffs=3,couleur=red]
-% %tangentes
-% \tangentetikz[liste=\LISTE,xl=0,xr=1,couleur=ForestGreen,style=dashed]
-% \tangentetikz[liste=\LISTE,xl=1,xr=1,couleur=ForestGreen,style=dashed,point=2]
-% \tangentetikz[liste=\LISTE,xl=1,xr=1,couleur=ForestGreen,style=dashed,point=3]
-% \tangentetikz[liste=\LISTE,xl=1,xr=1,couleur=ForestGreen,style=dashed,point=4]
-% \tangentetikz[liste=\LISTE,xl=0.5,xr=0,couleur=ForestGreen,style=dashed,point=5]
-%
-% \end{tikzpicture}
-%\end{center}
-%
-%\medskip
-%
-%\begin{center}
-% \begin{tikzpicture}[x=1cm,y=1cm,line width=1pt]
-% \paramCF[titre=true]
-% \ligneCF{\textsf{(x+1)\CFchap2}}{$\mathsf{x^2+2x+1}$}
-% \ligneCF{\texttt{(x+1)\CFchap2}}{$\mathtt{x^2+2x+1}$}
-% \ligneCF{\textsf{Dérivée[(x+5)*exp(-0.1*x)]}}{$\mathsf{\rightarrow (0.5-0.1*x)*exp(-0.1*x)}$}
-% \end{tikzpicture}
-%\end{center}
\newpage
@@ -311,12 +364,13 @@ En ce qui concerne les codes \textsf{python} et/ou \textsf{pseudocode}, il faudr
\subsection{Courbe d'interpolation}
+\begin{codeinfo}
On va utiliser les notions suivantes pour paramétrer le tracé \og automatique \fg{} grâce à \ctex{..controls} :
%
\begin{itemize}
\item il faut rentrer les \textcolor{purple}{\textsf{points de contrôle}} ;
\item il faut préciser les \textcolor{ForestGreen}{\textsf{pentes des tangentes}} (pour le moment on travaille avec les mêmes à gauche et à droite\ldots) ;
- \item on peut paramétrer les \textcolor{Aquamarine}{\textsf{coefficients}} pour \og affiner \fg{} les portions.
+ \item on peut paramétrer les \textcolor{CadetBlue}{\textsf{coefficients}} pour \og affiner \fg{} les portions.
\end{itemize}
\medskip
@@ -337,74 +391,80 @@ Pour déclarer les paramètres :
\item on peut mixer avec \averb|coeffs=C1§C2G/C2D§...|.
\end{itemize}
\end{itemize}
+\end{codeinfo}
-\subsection{Clés et options}
-
-La commande \ctex{\textbackslash splinetikz} se présente sous la forme :
+\subsection{Code, clés et options}
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=2]{tex}
+\begin{codetex}[listing only]
\begin{tikzpicture}
...
- \splinetikz[liste=...,coeffs=...,affpoints=...,couleur=...,epaisseur=...,taillepoints=...,couleurpoints=...,style=...]
+ \splinetikz[liste=...,coeffs=...,affpoints=...,couleur=...,epaisseur=...,%
+ taillepoints=...,couleurpoints=...,style=...]
...
\end{tikzpicture}
-\end{minted}
+\end{codetex}
-Certains paramètres peuvent être gérés directement dans la commande \ctex{\textbackslash splinetikz} :
+\smallskip
+\begin{codecles}
+Certains paramètres peuvent être gérés directement dans la commande \ctex{\textbackslash splinetikz} :
+%
\begin{itemize}
- \item la couleur de la courbe est \textcolor{red}{rouge}, gérée par la \textsf{clé} \Cle{couleur=...} ;
- \item l'épaisseur de la courbe est de \textcolor{red}{1.25pt}, gérée par la \textsf{clé} \Cle{epaisseur=...} ;
- \item du style supplémentaire pour la courbe peut être rajouté, grâce à la \textsf{clé} \Cle{style=...} ;
- \item les coefficients de \textit{compensation} sont par défaut à 3, gérés par la \textsf{clé} \Cle{coeffs=...}
- \item les points de contrôle ne sont pas affichés par défaut, mais \textsf{clé booléenne} \Cle{affpoints=true} permet de les afficher ;
- \item la taille des points de contrôle est géré par la \textsf{clé} \Cle{taillepoints=...}.
+ \item la couleur de la courbe par la \textsf{clé} \Cle{couleur} ;\hfill{}défaut \Cle{red}
+ \item l'épaisseur de la courbe par la \textsf{clé} \Cle{epaisseur} ;\hfill{}défaut \Cle{1.25pt}
+ \item du style supplémentaire pour la courbe peut être rajouté, grâce à la \textsf{clé} \Cle{style=} ;\hfill{}défaut \Cle{vide}
+ \item les coefficients de \textit{compensation} gérés par la \textsf{clé} \Cle{coeffs} ;\hfill{}défaut \Cle{3}
+ \item les points de contrôle ne sont pas affichés par défaut, mais \textsf{clé booléenne} \Cle{affpoints} permet de les afficher ;\hfill{}défaut \Cle{true}
+ \item la taille des points de contrôle est géré par la \textsf{clé} \Cle{taillepoints}.\hfill{}défaut \Cle{2pt}
\end{itemize}
+\end{codecles}
-\newpage
+\subsection{Compléments sur les coefficients de \og compensation \fg}
-\subsection{Exemples}
+\begin{codeidee}
+Le choix a été fait ici, pour \textit{simplifier} le code, le travailler sur des courbes de Bézier.
-La commande :
+Pour \textit{simplifier} la gestion des nombres dérivés, les points de contrôle sont gérés par leurs coordonnées \textit{polaires}, les \textsf{coefficients de compensation} servent donc -- grosso modo -- à gérer la position radiale.
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=2]{tex}
-\begin{center}
- \begin{tikzpicture}[x=0.9cm,y=0.9cm,xmin=-1,xmax=11,xgrille=1,xgrilles=0.5,ymin=-1,ymax=5,ygrille=1,ygrilles=0.5]
- %axes et grilles
- \draw[xstep=\xgrilles,ystep=\ygrilles,line width=0.3pt,lightgray!50] (\xmin,\ymin) grid (\xmax,\ymax);
- \draw[xstep=\xgrilles,ystep=\ygrilles,line width=0.6pt,lightgray!50] (\xmin,\ymin) grid (\xmax,\ymax);
- \draw[line width=1.5pt,->,gray] (\xmin,0)--(\xmax,0) ;
- \draw[line width=1.5pt,->,gray] (0,\ymin)--(0,\ymax) ;
- \foreach \x in {0,1,...,10} {\draw[gray,line width=1.5pt] (\x,4pt) -- (\x,-4pt) ;}
- \foreach \y in {0,1,...,4} {\draw[gray,line width=1.5pt] (4pt,\y) -- (-4pt,\y) ;}
- \draw[darkgray] (1,-4pt) node[below,font=\sffamily] {1} ;
- \draw[darkgray] (-4pt,1) node[left,font=\sffamily] {1} ;
- %splines
- \def\LISTE{0/1/0§4/3.667/-0.333§7.5/1.75/0§9/2/-0.333§10/0/-10}
- \splinetikz[liste=\LISTE,affpoints=true,coeffs=3,couleur=red]
- \end{tikzpicture}
-\end{center}
-\end{minted}
+\smallskip
-produit la figure suivante :
+Le coefficient \Cle{3} signifie que, pour une courbe de Bézier entre $x=a$ et $x=b$, les points de contrôles seront situés à une distance radiale de $\frac{b-a}{3}$.
-\begin{center}
- \begin{tikzpicture}[x=0.9cm,y=0.9cm,xmin=-1,xmax=11,xgrille=1,xgrilles=0.5,ymin=-1,ymax=5,ygrille=1,ygrilles=0.5]
- %axes et grilles
- \draw[xstep=\xgrilles,ystep=\ygrilles,line width=0.3pt,lightgray!50] (\xmin,\ymin) grid (\xmax,\ymax);
- \draw[xstep=\xgrilles,ystep=\ygrilles,line width=0.6pt,lightgray!50] (\xmin,\ymin) grid (\xmax,\ymax);
- \draw[line width=1.5pt,->,gray] (\xmin,0)--(\xmax,0) ;
- \draw[line width=1.5pt,->,gray] (0,\ymin)--(0,\ymax) ;
- \foreach \x in {0,1,...,10} {\draw[gray,line width=1.5pt] (\x,4pt) -- (\x,-4pt) ;}
- \foreach \y in {0,1,...,4} {\draw[gray,line width=1.5pt] (4pt,\y) -- (-4pt,\y) ;}
- \draw[darkgray] (1,-4pt) node[below,font=\sffamily] {1} ;
- \draw[darkgray] (-4pt,1) node[left,font=\sffamily] {1} ;
- %splines
- \def\LISTE{0/1/0§4/3.667/-0.333§7.5/1.75/0§9/2/-0.333§10/0/-10}
- \splinetikz[liste=\LISTE,affpoints=true]
- \end{tikzpicture}
-\end{center}
+Pour \textit{écarter} les points de contrôle, on peut du coup \textsf{réduire} le coefficient de compensation !
+\medskip
+
+Pour des intervalles \textit{étroits}, la \textit{pente} peut paraître abrupte, et donc le(s) coefficient(s) peuvent être modifiés, de manière fine.
+
+\medskip
+
+Si jamais il existe ou ou des points \textit{anguleux}, le plus simple est de créer les splines en plusieurs fois.
+\end{codeidee}
+
+\subsection{Exemples}
+
+\begin{codetex}[tikz lower]
+%code tikz
+\def\x{0.9cm}\def\y{0.9cm}
+\def\xmin{-1}\def\xmax{11}\def\xgrille{1}\def\xgrilles{0.5}
+\def\ymin{-1}\def\ymax{5}\def\ygrille{1}\def\ygrilles{0.5}
+%axes et grilles
+\draw[xstep=\xgrilles,ystep=\ygrilles,line width=0.3pt,lightgray!50] (\xmin,\ymin) grid (\xmax,\ymax);
+\draw[xstep=\xgrilles,ystep=\ygrilles,line width=0.6pt,lightgray!50] (\xmin,\ymin) grid (\xmax,\ymax);
+\draw[line width=1.5pt,->,gray] (\xmin,0)--(\xmax,0) ;
+\draw[line width=1.5pt,->,gray] (0,\ymin)--(0,\ymax) ;
+\foreach \x in {0,1,...,10} {\draw[gray,line width=1.5pt] (\x,4pt) -- (\x,-4pt) ;}
+\foreach \y in {0,1,...,4} {\draw[gray,line width=1.5pt] (4pt,\y) -- (-4pt,\y) ;}
+\draw[darkgray] (1,-4pt) node[below,font=\sffamily] {1} ;
+\draw[darkgray] (-4pt,1) node[left,font=\sffamily] {1} ;
+%splines
+\def\LISTE{0/1/0§4/3.667/-0.333§7.5/1.75/0§9/2/-0.333§10/0/-10}
+\splinetikz[liste=\LISTE,affpoints=true,coeffs=3,couleur=red]
+\end{codetex}
+
+\smallskip
+
+\begin{codeinfo}
Avec des explications utiles à la compréhension :
\begin{center}
@@ -416,23 +476,24 @@ Avec des explications utiles à la compréhension :
\listecoeffs{3}{3}{3}{3}
\end{tikzpicture}
\end{center}
+\end{codeinfo}
\newpage
\subsection{Avec une gestion plus fine des \og coefficients \fg}
+\begin{codeinfo}
Dans la majorité des cas, le \textit{coefficient} \textcircled{3} permet d'obtenir une courbe (ou une portion) très satisfaisante !
-Dans certains cas, notamment si l'une des pentes est relativement \og forte \fg{} et/ou si l'intervalle horizontal de la portion est relativement \og étroit \fg, il se peut que la portion paraisse un peu trop \og abrupte \fg{}.
+Dans certains cas, il se peut que la portion paraisse un peu trop \og abrupte \fg{}.
-On peut dans ce cas \textit{jouer} sur les coefficients de cette portion pour \textit{arrondir} un peu tout cela !
+On peut dans ce cas \textit{jouer} sur les coefficients de cette portion pour \textit{arrondir} un peu tout cela (\textit{ie} diminuer le \textsf{coeff}\ldots)!
-Ces fameux \textit{coefficients} peuvent :
-\begin{itemize}
- \item être donnés (pour utiliser le même partout) sous la forme \Cle{coeffs=C} ;
- \item être donnés portion par portion, sous la forme \Cle{coeffs=C1§C2§...} ;
- \item être donné de manière très fine, portion par portion et côté par côté, sous la forme \Cle{coeffs=C1G/C1D§C2G/C2D§...}.
-\end{itemize}
+%\begin{itemize}
+% \item être donnés (pour utiliser le même partout) sous la forme \Cle{coeffs=C} ;
+% \item être donnés portion par portion, sous la forme \Cle{coeffs=C1§C2§...} ;
+% \item être donné de manière très fine, portion par portion et côté par côté, sous la forme \Cle{coeffs=C1G/C1D§C2G/C2D§...}.
+%\end{itemize}
\begin{center}
\begin{tikzpicture}[x=0.9cm,y=0.9cm,xmin=-1,xmax=11,xgrille=1,xgrilles=0.5,ymin=-1,ymax=7,ygrille=1,ygrilles=0.5]
@@ -445,17 +506,19 @@ Ces fameux \textit{coefficients} peuvent :
\listecoeffs{3/3}{3/3}{3/3}{2/1}
\end{tikzpicture}
\end{center}
+\end{codeinfo}
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=2]{tex}
-\begin{center}
+\smallskip
+
+\begin{codetex}[listing only]
...
%splines
\def\LISTE{0/1/0§4/3.667/-0.333§7.5/1.75/0§9/2/-0.333§10/0/-10}
\splinetikz[liste=\LISTE,affpoints=true,coeffs=3§3§3§2/1]
...
-\end{center}
-\end{minted}
+\end{codetex}
+\begin{codesortie}
\begin{center}
\begin{tikzpicture}[x=0.9cm,y=0.9cm,xmin=-1,xmax=11,xgrille=1,xgrilles=0.5,ymin=-1,ymax=5,ygrille=1,ygrilles=0.5]
%axes et grilles
@@ -467,15 +530,17 @@ Ces fameux \textit{coefficients} peuvent :
\foreach \y in {0,1,...,4} {\draw[gray,line width=1.5pt] (4pt,\y) -- (-4pt,\y) ;}
\draw[darkgray] (1,-4pt) node[below,font=\sffamily] {1} ;
\draw[darkgray] (-4pt,1) node[left,font=\sffamily] {1} ;
- \draw (1,-4pt) node[below,font=\sffamily] {1} ;
- \draw (-4pt,1) node[left,font=\sffamily] {1} ;
+% \draw (1,-4pt) node[below,font=\sffamily] {1} ;
+% \draw (-4pt,1) node[left,font=\sffamily] {1} ;
\def\LISTE{0/1/0§4/3.667/-0.333§7.5/1.75/0§9/2/-0.333§10/0/-10}
\splinetikz[liste=\LISTE,affpoints=true,coeffs=3§3§3§2/1]
\end{tikzpicture}
\end{center}
+\end{codesortie}
\subsection{Conclusion}
+\begin{codeinfo}
Le plus \og simple \fg{} est donc:
%
\begin{itemize}
@@ -483,10 +548,7 @@ Le plus \og simple \fg{} est donc:
\item de saisir la commande \ctex{\textbackslash splinetikz[liste=\textbackslash LISTE]} ;
\item d'ajuster les options et coefficients en fonction du rendu !
\end{itemize}
-
-\medskip
-
-Si jamais il existe ou ou des points \textit{anguleux}, le plus simple est de créer les splines en plusieurs fois.
+\end{codeinfo}
\newpage
@@ -494,24 +556,27 @@ Si jamais il existe ou ou des points \textit{anguleux}, le plus simple est de cr
\subsection{Définitions}
+\begin{codeidee}
En parallèle de l'outil \ctex{\textbackslash splinetikz}, il existe l'outil \ctex{\textbackslash tangentetikz} qui va permettre de tracer des tangentes à l'aide de la liste de points précédemment définie pour l'outil \ctex{\textbackslash splinetikz}.
\smallskip
NB : il peut fonctionner indépendamment de l'outil \ctex{\textbackslash splinetikz} puisque la liste des points de travail est gérée de manière autonome !
+\end{codeidee}
-\medskip
-
-La commande \ctex{\textbackslash tangentetikz} se présente sous la forme :
+\smallskip
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=2]{tex}
+\begin{codetex}[listing only]
\begin{tikzpicture}
...
\tangentetikz[liste=...,couleur=...,epaisseur=...,xl=...,xr=...,style=...,point=...]
...
\end{tikzpicture}
-\end{minted}
+\end{codetex}
+
+\smallskip
+\begin{codecles}
Cela permet de tracer la tangente :
%
\begin{itemize}
@@ -519,11 +584,29 @@ Cela permet de tracer la tangente :
\item avec une épaisseur de \Cle{epaisseur}, une couleur \Cle{couleur} et un style additionnel \Cle{style} ;
\item en la traçant à partir de \Cle{xl} avant \textsf{xi} et jusqu'à \Cle{xr} après \textsf{xi}.
\end{itemize}
+\end{codecles}
\subsection{Exemple et illustration}
+\begin{codetex}[listing only]
+\begin{tikzpicture}
+ ...
+ \def\LISTE{0/1.5/0§1/2/-0.333§2/0/-5}
+ %spline
+ \splinetikz[liste=\LISTE,affpoints=true,coeffs=3§2,couleur=red]
+ %tangente
+ \tangentetikz[liste=\LISTE,xl=0,xr=0.5,couleur=ForestGreen,style=dashed]
+ \tangentetikz[liste=\LISTE,xl=0.5,xr=0.75,couleur=orange,style=dotted,point=2]
+ \tangentetikz[liste=\LISTE,xl=0.33,xr=0,couleur=blue,style=densely dashed,point=3]
+ ...
+\end{tikzpicture}
+\end{codetex}
+
+\begin{codesortie}
+On obtient le résultat suivant (avec les éléments rajoutés utiles à la compréhension) :
+
\begin{center}
- \begin{tikzpicture}[x=3cm,y=3cm,xmin=0,xmax=2,xgrilles=0.25,ymin=0,ymax=2.25,ygrilles=0.25]
+ \begin{tikzpicture}[x=3cm,y=2cm,xmin=0,xmax=2,xgrilles=0.25,ymin=0,ymax=2.25,ygrilles=0.25]
\tikzset{noeudexpl/.style={purple,font=\sffamily\small}}
\tgrilles
\draw[line width=1.5pt,->,darkgray] (\xmin,0)--(\xmax,0) ;
@@ -540,47 +623,15 @@ Cela permet de tracer la tangente :
%explications
\draw[<->,very thick,darkgray] (0.5,2.2)--(1,2.2) node[midway,above,font=\sffamily] {xl} ;
\draw[<->,very thick,darkgray] (1,2.2)--(1.75,2.2) node[midway,above,font=\sffamily] {xr};
+ \draw[thick,darkgray] (1,4pt)--(1,-4pt) node[below,font=\sffamily] {1} ;
+ \draw[thick,darkgray] (4pt,1)--(-4pt,1) node[left,font=\sffamily] {1} ;
\end{tikzpicture}
\end{center}
-
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=2]{tex}
-\begin{tikzpicture}
- ...
- \def\LISTE{0/1.5/0§1/2/-0.333§2/0/-5}
- %spline
- \splinetikz[liste=\LISTE,affpoints=true,coeffs=3§2,couleur=red]
- %tangente
- \tangentetikz[liste=\LISTE,xl=0,xr=0.5,couleur=ForestGreen,style=dashed]
- \tangentetikz[liste=\LISTE,xl=0.5,xr=0.75,couleur=orange,style=dotted,point=2]
- \tangentetikz[liste=\LISTE,xl=0.33,xr=0,couleur=blue,style=densely dashed,point=3]
- ...
-\end{tikzpicture}
-\end{minted}
+\end{codesortie}
\subsection{Exemple avec les deux outils, et \og personnalisation \fg}
-\begin{center}
-\begin{tikzpicture}[x=0.5cm,y=0.5cm,xmin=0,xmax=16,xgrilles=1,ymin=0,ymax=16,ygrilles=1]
- \draw[xstep=\xgrilles,ystep=\ygrilles,line width=0.3pt,lightgray] (\xmin,\ymin) grid (\xmax,\ymax) ;
- \draw[line width=1.5pt,->,darkgray] (\xmin,0)--(\xmax,0) ;
- \draw[line width=1.5pt,->,darkgray] (0,\ymin)--(0,\ymax) ;
- \foreach \x in {0,2,...,14} {\draw[gray,line width=1.5pt] (\x,4pt) -- (\x,-4pt) ;}
- \foreach \y in {0,2,...,14} {\draw[gray,line width=1.5pt] (4pt,\y) -- (-4pt,\y) ;}
- \draw[darkgray] (1,-4pt) node[below,font=\sffamily] {1} ;
- \draw[darkgray] (-4pt,1) node[left,font=\sffamily] {1} ;
- %la liste pour la courbe d'interpolation
- \def\liste{0/6/3§3/11/0§7/3/0§10/0/0§14/14/6}
- %les tangentes "stylisées"
- \tangentetikz[liste=\liste,xl=0,xr=1,couleur=blue,style=dashed]
- \tangentetikz[liste=\liste,xl=2,xr=2,couleur=purple,style=dotted,point=2]
- \tangentetikz[liste=\liste,xl=2,xr=2,couleur=orange,style=<->,point=3]
- \tangentetikz[liste=\liste,xl=2,xr=0,couleur=ForestGreen,point=5]
- %la courbe en elle-même
- \splinetikz[liste=\liste,affpoints=true,coeffs=3,couleur=cyan,style=densely dotted]
- \end{tikzpicture}
-\end{center}
-
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=4,breaklines]{tex}
+\begin{codetex}[listing only]
\tikzset{%
xmin/.store in=\xmin,xmin/.default=-5,xmin=-5,
xmax/.store in=\xmax,xmax/.default=5,xmax=5,
@@ -598,8 +649,8 @@ Cela permet de tracer la tangente :
\draw[xstep=\xgrilles,ystep=\ygrilles,line width=0.3pt,lightgray] (\xmin,\ymin) grid (\xmax,\ymax) ;
\draw[line width=1.5pt,->,darkgray] (\xmin,0)--(\xmax,0) ;
\draw[line width=1.5pt,->,darkgray] (0,\ymin)--(0,\ymax) ;
- \foreach \x in {0,2,...,14} {\draw[gray,line width=1.5pt] (\x,4pt) -- (\x,-4pt) ;}
- \foreach \y in {0,2,...,14} {\draw[gray,line width=1.5pt] (4pt,\y) -- (-4pt,\y) ;}
+ \foreach \x in {0,2,...,14} {\draw[darkgray,line width=1.5pt] (\x,4pt) -- (\x,-4pt) ;}
+ \foreach \y in {0,2,...,14} {\draw[darkgray,line width=1.5pt] (4pt,\y) -- (-4pt,\y) ;}
%la liste pour la courbe d'interpolation
\def\liste{0/6/3§3/11/0§7/3/0§10/0/0§14/14/6}
%les tangentes "stylisées"
@@ -610,7 +661,30 @@ Cela permet de tracer la tangente :
%la courbe en elle-même
\splinetikz[liste=\liste,affpoints=true,coeffs=3,couleur=cyan,style=densely dotted]
\end{tikzpicture}
-\end{minted}
+\end{codetex}
+
+\begin{codesortie}
+\begin{center}
+\begin{tikzpicture}[x=0.5cm,y=0.5cm,xmin=0,xmax=16,xgrilles=1,ymin=0,ymax=16,ygrilles=1]
+ \draw[xstep=\xgrilles,ystep=\ygrilles,line width=0.3pt,lightgray] (\xmin,\ymin) grid (\xmax,\ymax) ;
+ \draw[line width=1.5pt,->,darkgray] (\xmin,0)--(\xmax,0) ;
+ \draw[line width=1.5pt,->,darkgray] (0,\ymin)--(0,\ymax) ;
+ \foreach \x in {0,2,...,14} {\draw[darkgray,line width=1.5pt] (\x,4pt) -- (\x,-4pt) ;}
+ \foreach \y in {0,2,...,14} {\draw[darkgray,line width=1.5pt] (4pt,\y) -- (-4pt,\y) ;}
+ \draw[darkgray] (2,-4pt) node[below,font=\sffamily] {2} ;
+ \draw[darkgray] (-4pt,2) node[left,font=\sffamily] {2} ;
+ %la liste pour la courbe d'interpolation
+ \def\liste{0/6/3§3/11/0§7/3/0§10/0/0§14/14/6}
+ %les tangentes "stylisées"
+ \tangentetikz[liste=\liste,xl=0,xr=1,couleur=blue,style=dashed]
+ \tangentetikz[liste=\liste,xl=2,xr=2,couleur=purple,style=dotted,point=2]
+ \tangentetikz[liste=\liste,xl=2,xr=2,couleur=orange,style=<->,point=3]
+ \tangentetikz[liste=\liste,xl=2,xr=0,couleur=ForestGreen,point=5]
+ %la courbe en elle-même
+ \splinetikz[liste=\liste,affpoints=true,coeffs=3,couleur=cyan,style=densely dotted]
+ \end{tikzpicture}
+\end{center}
+\end{codesortie}
\newpage
@@ -618,6 +692,7 @@ Cela permet de tracer la tangente :
\subsection{Introduction}
+\begin{codeidee}
L'idée des commandes suivantes est de définir, dans un environnement \TikZ, une présentation proche de celle d'un logiciel de calcul formel comme \textsf{XCas} ou \textsf{Geogebra}.
\smallskip
@@ -627,18 +702,32 @@ Les sujets d'examens, depuis quelques années, peuvent comporter des \textit{cap
\smallskip
À la manière du \textsf{package} \ctex{tkz-tab}, l'environnement de référence est un environnement \TikZ, dans lequel les lignes dont créées petit à petit, à l'aide de nœuds qui peuvent être réutilisés à loisir ultérieurement.
+\end{codeidee}
\subsection{La commande \og paramCF \fg}
+\begin{codeinfo}
La première chose à définir est l'ensemble des paramètres \textit{globaux} de la fenêtre de calcul formel, à l'aide de \Cle{Clés}.
+\end{codeinfo}
-C'est la commande \ctex{\textbackslash paramCF} qui s'y colle, avec :
+\smallskip
+\begin{codetex}[listing only]
+...
+\begin{tikzpicture}[...]
+ \paramCF[.......]
+ ...
+\end{tikzpicture}
+\end{codetex}
+
+\smallskip
+
+\begin{codecles}
+Les \Cle{Clés} disponibles sont :
\begin{itemize}
\item \Cle{larg} : largeur de l'environnement ; \hfill{}défaut \Cle{16}
\item \Cle{esplg} : espacement vertical entre les lignes ;\hfill{}défaut \Cle{2pt}
- \item \Cle{premcol} : largeur de la case du \textit{petit numéro} ;\hfill{}défaut \Cle{0.3}
- \item \Cle{hpremcol} : hauteur de la case du \textit{petit numéro} ;\hfill{}défaut \Cle{0.4}
+ \item \Cle{premcol} \& \Cle{hpremcol} : largeur et hauteur de la case du \textit{petit numéro} ;\hfill{}défaut \Cle{0.3} \& \Cle{0.4}
\item \Cle{taille} : taille du texte ;\hfill{}défaut \Cle{\textbackslash normalsize}
\item \Cle{couleur} : couleur des traits de l'environnement ;\hfill{}défaut \Cle{darkgray}
\item \Cle{titre} : booléen pour l'affichage d'un bandeau de titre ;\hfill{}défaut \Cle{false}
@@ -651,47 +740,52 @@ C'est la commande \ctex{\textbackslash paramCF} qui s'y colle, avec :
\item \Cle{menu} : booléen pour l'affichage du \textit{bouton} MENU ;\hfill{}défaut \Cle{true}
\item \Cle{labeltitre} : libellé du titre.\hfill{}défaut \Cle{Résultats obtenus avec un logiciel de Calcul Formel}
\end{itemize}
+\end{codecles}
\subsection{La commande \og ligneCF \fg}
-Une fois les paramètres déclarés, il faut créer les différentes lignes, grâce à la \ctex{\textbackslash ligneCF} :
+\begin{codeinfo}
+Une fois les paramètres déclarés, il faut créer les différentes lignes, grâce à la \ctex{\textbackslash ligneCF}.
+\end{codeinfo}
+
+\smallskip
+
+\begin{codetex}[listing only]
+\begin{tikzpicture}[...]
+ \paramCF[.......]
+ \ligneCF[...]
+ ...
+\end{tikzpicture}
+\end{codetex}
+
+\smallskip
+
+\begin{codecles}
+Les (quelques) \Cle{Clés} disponibles sont :
\begin{itemize}
\item \Cle{hc} : hauteur de la ligne de commande d'entrée ;\hfill{}défaut \Cle{0.75}
\item \Cle{hr} : hauteur de la ligne de commande de sortie ;\hfill{}défaut \Cle{0.75}
\item deux \textsf{arguments}, celui de la commande d'entrée et celui de la commande de sortie.
\end{itemize}
+%
+Chaque argument \textsf{COMMANDE} \& \textsf{RÉSULTAT} peut être formaté (niveau police) de manière indépendante.
+\end{codecles}
-\medskip
-
-Ainsi, le code :
-
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=4,breaklines]{tex}
-\begin{tikzpicture}[x=1cm,y=1cm,line width=1pt]
- \paramCF[titre=true,couleurcmd=olive,couleurres=orange]
- \ligneCF{COMMANDE 1}{RÉSULTAT 1}
- \ligneCF[hc=1,hr=1.25]{\texttt{(x+1)\CFchap2}}{$\mathtt{x^2+2x+1}$}
-\end{tikzpicture}
-\end{minted}
-
-produira le résultat suivant :
-
-\begin{center}
- \begin{tikzpicture}[x=1cm,y=1cm,line width=1pt]
- \paramCF[titre=true,couleurcmd=olive,couleurres=orange]
- \ligneCF{COMMANDE 1}{RÉSULTAT 1}
- \ligneCF[hc=1,hr=1.25]{\texttt{(x+1)\CFchap2}}{$\mathtt{x^2+2x+1}$}
- \end{tikzpicture}
-\end{center}
+\smallskip
-\newpage
+\begin{codetex}[tikz lower]
+%code tikz
+\paramCF[titre=true,couleurcmd=olive,couleurres=orange]
+\ligneCF{COMMANDE 1}{RÉSULTAT 1}
+\ligneCF[hc=0.75,hr=1]{\texttt{(x+1)\CFchap2}}{$\mathtt{x^2+2x+1}$} %\CFchap := ^ en mathtt
+\end{codetex}
\subsection{Visualisation des paramètres}
+\begin{codeinfo}
Pour \textit{illustrer} un peur les \Cle{clés}, un petit schéma, avec les différents nœuds crées par les \textsf{macros}.
-\medskip
-
\begin{center}
\begin{tikzpicture}[x=1cm,y=1cm,line width=1pt]
\paramCF[larg=12cm,couleur=lightgray,esplg=12pt,menu=false]
@@ -703,13 +797,11 @@ Pour \textit{illustrer} un peur les \Cle{clés}, un petit schéma, avec les diff
\end{tikzpicture}
\end{center}
-\medskip
-
\begin{center}
\begin{tikzpicture}[x=1cm,y=1cm,line width=1pt]
\paramCF[titre=true,larg=12cm,esplg=10pt,premcol=0.5,hpremcol=0.7,couleur=lightgray]
\ligneCF{COMMANDE 1}{RÉSULTAT 1}
- \ligneCF[hc=1.25,hr=1.5]{COMMANDE 2}{RÉSULTAT 2}
+ \ligneCF[hc=0.85,hr=1.05]{COMMANDE 2}{RÉSULTAT 2}
%explications
\draw[CadetBlue,<->] ($(A22) + (0,-12pt)$) -- ($(A52) + (0,-12pt)$) node[midway,below,font=\sffamily] {\Cle{larg}} ;
\draw[CadetBlue,<->] ($(A51) + (12pt,0)$) -- ($(A32) + (12pt,0)$) node[midway,right,font=\sffamily] {\Cle{esplg}} ;
@@ -725,8 +817,7 @@ Pour \textit{illustrer} un peur les \Cle{clés}, un petit schéma, avec les diff
\draw[CadetBlue,->] ($(A01) + (8pt,2pt) + (0,1em)$) to[bend left=10] ($(A01) + (8pt,2pt) + (0,1em) + (-18pt,12pt)$) node[inner sep=0pt,above=1pt,font=\sffamily] {\Cle{titre} \& \Cle{tailletitre} \& \Cle{labeltitre}} ;
\end{tikzpicture}
\end{center}
-
-Chaque argument COMMANDE \& RÉSULTAT peut être formaté (niveau police) de manière indépendante.
+\end{codeinfo}
\newpage
@@ -734,6 +825,7 @@ Chaque argument COMMANDE \& RÉSULTAT peut être formaté (niveau police) de man
\subsection{Introduction}
+\begin{codeidee}
Le \textsf{package} \ctex{pythontex} permet d'insérer et d'exécuter du code Python. On peut :
\begin{itemize}
@@ -741,23 +833,41 @@ Le \textsf{package} \ctex{pythontex} permet d'insérer et d'exécuter du code Py
\item exécuter du code python dans un environnement type \og console \fg{} ;
\item charger du code python, et éventuellement l'utiliser dans la console.
\end{itemize}
+\end{codeidee}
-\medskip
+\smallskip
-\textbf{Attention : }il faut dans ce cas une compilation en plusieurs parties, comme par exemple \textsf{pdflatex puis pythontex puis pdflatex} !
+\begin{codeinfo}
+\textbf{Attention : }il faut dans ce cas une compilation en plusieurs étapes, comme par exemple \textsf{pdflatex puis pythontex puis pdflatex} !
Voir par exemple \url{http://lesmathsduyeti.fr/fr/informatique/latex/pythontex/} !
+\end{codeinfo}
+
+\smallskip
+
+\begin{codeinfo}
+Compte tenu de la \textit{relative complexité} de gérer les options (par paramètres/clés\ldots) des \textit{tcbox} et des \textit{fancyvrb}, le style est \og fixé \fg{} tel quel, et seules la taille et la position de la \textit{tcbox} sont modifiables. Si toutefois vous souhaitez personnaliser davantage, il faudra prendre le code correspondant et appliquer vos modifications !
+
+Cela peut donner -- en tout cas -- des idées de personnalisation en ayant une base \textit{pré}existante !
+\end{codeinfo}
\subsection{Présentation de code Python via pythontex}
-L'environnement \ctex{\textbackslash envcodepythontex} (chargé par \ctex{ProfLycee}, avec l'option \textit{autogobble}) permet de présenter du code python, dans une \ctex{colorbox} avec un style particulier.
+\begin{codeidee}
+L'environnement \ctex{\textbackslash envcodepythontex} (chargé par \ctex{ProfLycee}, avec l'option \textit{autogobble}) permet de présenter du code python, dans une \ctex{colorbox} avec un style particulier.
+\end{codeidee}
+
+\smallskip
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=2]{tex}
+\begin{codetex}[listing only]
\begin{envcodepythontex}[largeur=...,centre=...,lignes=...]
...
\end{envcodepythontex}
-\end{minted}
+\end{codetex}
+\smallskip
+
+\begin{codecles}
Comme précédemment, des \Cle{Clés} qui permettent de \textit{légèrement} modifier le style :
\begin{itemize}
@@ -765,61 +875,73 @@ Comme précédemment, des \Cle{Clés} qui permettent de \textit{légèrement} mo
\item \Cle{centre} : booléen pour centrer ou non la \textit{tcbox} ;\hfill{}défaut \Cle{true}
\item \Cle{lignes} : booléen pour afficher ou non les numéros de ligne.\hfill{}défaut \Cle{true}
\end{itemize}
+\end{codecles}
-\medskip
-
-Ainsi, le code :
+\smallskip
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=4,breaklines]{tex}
+\begin{codetex}[listing only]
\begin{envcodepythontex}[largeur=12cm]
#environnement Python(tex) centré avec numéros de ligne
def f(x) :
return x**2
\end{envcodepythontex}
-\end{minted}
+\end{codetex}
-produira
+\smallskip
+\begin{codesortie}
\begin{envcodepythontex}[largeur=12cm]
#environnement Python(tex) centré avec numéros de ligne
def f(x) :
return x**2
\end{envcodepythontex}
+\end{codesortie}
-Le code :
+\medskip
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=4]{tex}
+\begin{codetex}[listing only]
\begin{envcodepythontex}[largeur=12cm,lignes=false,centre=false]
#environnement Python(tex) non centré sans numéro de ligne
def f(x) :
return x**2
\end{envcodepythontex}
-\end{minted}
+\end{codetex}
-produira :
+\smallskip
+\begin{codesortie}
\begin{envcodepythontex}[largeur=12cm,lignes=false,centre=false]
#environnement Python(tex) non centré sans numéro de ligne
def f(x) :
return x**2
\end{envcodepythontex}
+\end{codesortie}
\newpage
\subsection{Présentation de code Python via minted}
+\begin{codeinfo}
Pour celles et ceux qui ne sont pas à l'aise avec le \textsf{package} \ctex{pythontex} et notamment sa spécificité pour compiler, il existe le \textsf{package} \ctex{minted} qui permet de présenter du code, et notamment python (il nécessite quand même une compilation avec l'option \ctex{--shell-escape} ou \ctex{-write18}).
+\end{codeinfo}
-\medskip
+\smallskip
+\begin{codeidee}
L'environnement \ctex{\textbackslash envcodepythonminted} permet de présenter du code python, dans une \ctex{colorbox} avec un style (\textit{minted}) particulier.
+\end{codeidee}
+
+\smallskip
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=2]{tex}
+\begin{codetex}[listing only]
\begin{envcodepythonminted}(*)[largeur][options]
...
\end{envcodepythonminted}
-\end{minted}
+\end{codetex}
+
+\smallskip
+\begin{codecles}
Plusieurs \Cle{arguments} (optionnels) sont disponibles :
\begin{itemize}
@@ -827,61 +949,67 @@ Plusieurs \Cle{arguments} (optionnels) sont disponibles :
\item le premier argument optionnel concerne la \Cle{largeur} de la \ctex{tcbox} ;\hfill{}défaut \Cle{12cm}
\item le second argument optionnel concerne les \Cle{options} de la \ctex{tcbox} en \textit{langage tcolorbox}.\hfill{}défaut \Cle{vide}
\end{itemize}
+\end{codecles}
\medskip
-Ainsi le code :
-
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=lightgray!5,fontsize=\footnotesize,tabsize=4]{tex}
+\begin{codetex}[listing only]
\begin{envcodepythonminted}[12cm][center]
#environnement Python(minted) centré avec numéros, de largeur 12cm
def f(x) :
return x**2
\end{envcodepythonminted}
-\end{minted}
+\end{codetex}
-produira :
+\smallskip
+\begin{codesortie}
\begin{envcodepythonminted}[12cm][center]
#environnement Python(minted) centré avec numéros
def f(x) :
return x**2
\end{envcodepythonminted}
+\end{codesortie}
\medskip
-Et le code :
-
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=lightgray!5,fontsize=\footnotesize,tabsize=4]{tex}
+\begin{codetex}[listing only]
\begin{envcodepythonminted}*[0.8\linewidth][]
#environnement Python(minted) sans numéro, de largeur 0.8\linewidth
def f(x) :
return x**2
\end{envcodepythonminted}
-\end{minted}
+\end{codetex}
-produira :
+\smallskip
+\begin{codesortie}
\begin{envcodepythonminted}*[0.8\linewidth][]
#environnement Python(minted) sans numéro, de largeur 0.8\linewidth
def f(x) :
return x**2
\end{envcodepythonminted}
-
-\newpage
+\end{codesortie}
\subsection{Console d'exécution Python}
+\begin{codeidee}
\ctex{pythontex} permet également de \textit{simuler} (en exécutant également !) du code python dans une \textit{console}.
C'est l'environnement \ctex{\textbackslash envconsolepythontex} qui permet de le faire.
+\end{codeidee}
+
+\smallskip
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=2]{tex}
+\begin{codetex}[listing only]
\begin{envconsolepythontex}[largeur=...,centre=...,label=...]
...
\end{envconsolepythontex}
-\end{minted}
+\end{codetex}
+\smallskip
+
+\begin{codecles}
Les \Cle{Clés} disponibles sont :
\begin{itemize}
@@ -889,54 +1017,51 @@ Les \Cle{Clés} disponibles sont :
\item \Cle{centre} : booléen pour centrer ou non la \textit{console} ;\hfill{}défaut \Cle{true}
\item \Cle{label} : booléen pour afficher ou non le titre.\hfill{}défaut \Cle{true}
\end{itemize}
+\end{codecles}
\medskip
-Ainsi, le code :
-
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=4,breaklines]{tex}
+\begin{codetex}[listing only]
\begin{envconsolepythontex}[largeur=14cm,centre=false]
#console Python(tex) non centrée avec label
from math import sqrt
1+1
sqrt(12)
\end{envconsolepythontex}
-\end{minted}
+\end{codetex}
-produira
+\smallskip
+\begin{codesortie}
+\smallskip
\begin{envconsolepythontex}[largeur=14cm,centre=false]
#console Python(tex) non centrée avec label
from math import sqrt
1+1
sqrt(12)
\end{envconsolepythontex}
+\end{codesortie}
-Le code :
+\medskip
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=lightgray!5,fontsize=\footnotesize,tabsize=4]{tex}
+\begin{codetex}[listing only]
\begin{envconsolepythontex}[largeur=14cm,label=false]
#console Python(tex) centrée sans label
table = [[1,2],[3,4]]
table[0][0]
\end{envconsolepythontex}
-\end{minted}
+\end{codetex}
-produira :
+\smallskip
+\begin{codesortie}
+\smallskip
\begin{envconsolepythontex}[largeur=14cm,label=false]
#console Python(tex) centrée sans label
table = [[1,2],[3,4]]
table[0][0]
\end{envconsolepythontex}
-
-\subsection{Personnalisation}
-
-\textbf{NB : } compte tenu de la \textit{relative complexité} de gérer les options (par paramètres\ldots) des \textit{tcbox} et des \textit{fancyvrb}, le style est \og fixé \fg{} tel quel, et seules la taille et la position de la \textit{tcbox} sont modifiables. Si toutefois vous souhaitez personnaliser davantage, il faudra prendre le code correspondant et appliquer vos modifications !
-
-\medskip
-
-Cela peut donner -- en tout cas -- des idées de personnalisation en ayant une base \textit{pré}existante !
+\end{codesortie}
\newpage
@@ -944,24 +1069,34 @@ Cela peut donner -- en tout cas -- des idées de personnalisation en ayant une b
\subsection{Introduction}
-Le \textsf{package} \ctex{listings} permet d'insérer et de présenter du code, et avec \ctex{tclorobx} on peut obtenir une présentation similaire à celle du code Python. Pour le moment la \textit{philosophie} de la commande est un peu différente de celle du code python, avec son système de \Cle{Clés}, car l'environnement \ctex{tcblisting} est un peu différente\ldots
+\begin{codeinfo}
+Le \textsf{package} \ctex{listings} permet d'insérer et de présenter du code, et avec \ctex{tclorobox} on peut obtenir une présentation similaire à celle du code Python. Pour le moment la \textit{philosophie} de la commande est un peu différente de celle du code python, avec son système de \Cle{Clés}, car l'environnement \ctex{tcblisting} est un peu différent\ldots
+\end{codeinfo}
\subsection{Présentation de Pseudo-Code}
-L'environnement \ctex{\textbackslash envpseudocode} (chargé par \ctex{ProfLycee} permet de présenter du (pseudo-code) dans une \ctex{tcolorbox}.
+\begin{codeidee}
+L'environnement \ctex{\textbackslash envpseudocode} permet de présenter du (pseudo-code) dans une \ctex{tcolorbox}.
+\end{codeidee}
\smallskip
+\begin{codeinfo}
De plus, le package \ctex{listings} avec \ctex{tcolorbox} ne permet pas de gérer le paramètre \textit{autogobble}, donc il faudra être vigilant quant à la position du code (pas de tabulation en fait\ldots)
+\end{codeinfo}
+\smallskip
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=2]{tex}
+\begin{codetex}[listing only]
\begin{envpseudocode}(*)[largeur][options]
%attention à l'indentation, gobble ne fonctionne pas...
...
\end{envpseudocode}
-\end{minted}
+\end{codetex}
+
+\smallskip
+\begin{codecles}
Plusieurs \Cle{arguments} (optionnels) sont disponibles :
\begin{itemize}
@@ -969,24 +1104,23 @@ Plusieurs \Cle{arguments} (optionnels) sont disponibles :
\item le premier argument optionnel concerne la \Cle{largeur} de la \ctex{tcbox} ;\hfill{}défaut \Cle{12cm}
\item le second argument optionnel concerne les \Cle{options} de la \ctex{tcbox} en \textit{langage tcolorbox}.\hfill{}défaut \Cle{vide}
\end{itemize}
+\end{codecles}
\medskip
-Ainsi le code :
-
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=lightgray!5,fontsize=\footnotesize,tabsize=4]{tex}
-\begin{envpseudocode}
-%non centré, de largeur par défaut (12cm) avec lignes
+\begin{codetex}[listing only]
+\begin{envpseudocode} %non centré, de largeur par défaut (12cm) avec lignes
List = [...] # à déclarer au préalable
n = longueur(List)
Pour i allant de 0 à n-1 Faire
Afficher(List[i])
FinPour
\end{envpseudocode}
-\end{minted}
+\end{codetex}
-produira :
+\smallskip
+\begin{codesortie}
\begin{envpseudocode}
List = [...] # à déclarer au préalable
n = longueur(List)
@@ -994,24 +1128,23 @@ Pour i allant de 0 à n-1 Faire
Afficher(List[i])
FinPour
\end{envpseudocode}
+\end{codesortie}
\medskip
-Et le code :
-
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=lightgray!5,fontsize=\footnotesize,tabsize=4]{tex}
-\begin{envpseudocode}*[15cm][center]
-%centré, de largeur 15cm sans ligne
+\begin{codetex}[listing only]
+\begin{envpseudocode}*[15cm][center] %centré, de largeur 15cm sans ligne
List = [...] # à déclarer au préalable
n = longueur(List)
Pour i allant de 0 à n-1 Faire
Afficher(List[i])
FinPour
\end{envpseudocode}
-\end{minted}
+\end{codetex}
-produira :
+\smallskip
+\begin{codesortie}
\begin{envpseudocode}*[15cm][center]
List = [...] # à déclarer au préalable
n = longueur(List)
@@ -1019,6 +1152,27 @@ Pour i allant de 0 à n-1 Faire
Afficher(List[i])
FinPour
\end{envpseudocode}
+\end{codesortie}
+
+\subsection{Compléments}
+
+\begin{codeinfo}
+À l'instar de \textsf{packages} existants, la \textit{philosophie} ici est de laisser l'utilisateur gérer \textit{son} langage pseudo-code.
+
+J'ai fait le choix de ne pas définir des \textsf{mots clés} à mettre en valeur car cela reviendrait à \textit{imposer} des choix ! Donc ici, pas de coloration syntaxique ou de mise en évidence de mots clés, uniquement un formatage libre de code pseudo-code.
+\end{codeinfo}
+
+\smallskip
+
+\begin{codeidee}
+Évidemment, le code source est récupérable et adaptable à volonté, en utilisant les possibilités du package \ctex{listings}.
+
+\smallskip
+
+Celles et ceux qui sont déjà à l'aise avec les \textsf{packages} \ctex{listings} ou \ctex{minted} doivent déj avoir leur environnement personnel prêt !
+
+Il s'agit ici de présenter une version \og clé en main \fg{}.
+\end{codeidee}
\newpage
@@ -1026,31 +1180,39 @@ FinPour
\subsection{Introduction}
+\begin{codeidee}
L'idée des \textsf{commandes} suivantes est de permettre de simuler des fenêtres de \textsf{Terminal}, que ce soit pour Windows, Ubuntu ou OSX.
\smallskip
+L'idée de base vient du \textsf{package} \ctex{termsim}, mais ici la gestion du \textsf{code} et des \textsf{fenêtres} est légèrement différente.
+
+\smallskip
+
Le \textsf{contenu} est géré par le package \ctex{listings}, sans langage particulier, et donc sans coloration syntaxique particulière.
\smallskip
Comme pour le pseudo-code, pas d'\textsf{autogobble}, donc commandes à aligner à gauche !
+\end{codeidee}
\subsection{Commandes}
-Les (trois) environnements disponibles sont :
-
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=lightgray!5,fontsize=\footnotesize,tabsize=4]{tex}
+\begin{codetex}[listing only]
\begin{PLtermwin}[largeur]{titre=...}[options]
...
+\end{PLtermwin}
\begin{PLtermunix}[largeur]{titre=...}[options]
...
+\end{PLtermunix}
\begin{PLtermosx}[largeur]{titre=...}[options]
...
-\end{minted}
+\end{PLtermosx}
+\end{codetex}
+\begin{codecles}
Peu d'options pour ces commandes :
\begin{itemize}
@@ -1058,16 +1220,14 @@ Peu d'options pour ces commandes :
\item le deuxième, mandataire, permet de spécifier le titre par la clé \Cle{titre}.\hfill{}défaut \Cle{Terminal Windows/UNiX/OSX}
\item le troisième, optionnel, concerne les \Cle{options} de la \ctex{tcbox} en \textit{langage tcolorbox}.\hfill{}défaut \Cle{vide}
\end{itemize}
+\end{codecles}
\medskip
-Ainsi le code :
-
-\begin{minted}[frame=lines,framesep=2mm,bgcolor=lightgray!5,fontsize=\footnotesize,tabsize=4]{tex}
+\begin{codetex}[listing only]
\begin{PLtermwin}[15cm]{} %largeur 15cm avec titre par défaut
Microsoft Windows [version 10.0.22000.493]
(c) Microsoft Corporation. Tous droits réservés.
-
C:\Users\test>ping -c 2ctan.org
Envoi d'une requête 'ping' sur ctan.org [5.35.249.60] avec 32 octets de données :
\end{PLtermwin}
@@ -1081,14 +1241,12 @@ PING ctan.org (5.35.249.60) 56(84) bytes of data.
[test@server]$ ping -c 2 ctan.org
PING ctan.org (5.35.249.60) 56(84) bytes of data.
\end{PLtermosx}
-\end{minted}
-
-produira :
+\end{codetex}
+\begin{codesortie}
\begin{PLtermwin}[15cm]{}
Microsoft Windows [version 10.0.22000.493]
(c) Microsoft Corporation. Tous droits réservés.
-
C:\Users\test>ping -c 2ctan.org
Envoi d'une requête 'ping' sur ctan.org [5.35.249.60] avec 32 octets de données :
\end{PLtermwin}
@@ -1102,23 +1260,26 @@ PING ctan.org (5.35.249.60) 56(84) bytes of data.
[test@server]$ ping -c 2 ctan.org
PING ctan.org (5.35.249.60) 56(84) bytes of data.
\end{PLtermosx}
+\end{codesortie}
\newpage
\section{Historique}
-{\small \bverb|v1.0.6| : Ajout d'une option \textsf{nominted} pour ne pas charger \ctex{minted} (pas besoin de compiler avec \textsf{shell-escape})
+{\small \bverb|v1.0.7| :~~~~Ajout d'une option \textsf{build} pour placer certains fichiers auxiliaires dans un répertoire \textsf{./build}
+
+{\small \bverb|v1.0.6| :~~~~Ajout d'une option \textsf{nominted} pour ne pas charger \ctex{minted} (pas besoin de compiler avec \textsf{shell-escape})
-{\small \bverb|v1.0.5| : Ajout d'un environnement pour Python (minted)
+{\small \bverb|v1.0.5| :~~~~Ajout d'un environnement pour Python (minted)
-{\small \bverb|v1.0.4| : Ajout des environnements pour Terminal (win, osx, unix)
+{\small \bverb|v1.0.4| :~~~~Ajout des environnements pour Terminal (win, osx, unix)
-{\small \bverb|v1.0.3| : Ajout des environnements pour PseudoCode
+{\small \bverb|v1.0.3| :~~~~Ajout des environnements pour PseudoCode
-{\small \bverb|v1.0.2| : Ajout des environnements pour Python (pythontex)
+{\small \bverb|v1.0.2| :~~~~Ajout des environnements pour Python (pythontex)
-{\small \bverb|v1.0.1| : Modification mineure liée au chargement de \ctex{xcolor}
+{\small \bverb|v1.0.1| :~~~~Modification mineure liée au chargement de \ctex{xcolor}
-{\small \bverb|v1.0 | : Version initiale}
+{\small \bverb|v1.0 | :~~~~Version initiale}
\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/proflycee/tex/ProfLycee.sty b/macros/latex/contrib/proflycee/tex/ProfLycee.sty
index a8316dddf8..682868f62f 100644
--- a/macros/latex/contrib/proflycee/tex/ProfLycee.sty
+++ b/macros/latex/contrib/proflycee/tex/ProfLycee.sty
@@ -3,10 +3,11 @@
% or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ProfLycee}[2022/02/18 - v1.0.6 - Aide pour l'utilisation de LaTeX en lycée]
-% 1.0.6 Option [nominted] pour éviter de charger minted & nettoyage amssymb (pour éviter bug de chargement...)
-% 1.0.5 Environnement code python avec minted
-% 1.0.4 Environnement pour simuler terminal windows & linux
+\ProvidesPackage{ProfLycee}[2022/02/21 - v1.0.7 - Aide pour l'utilisation de LaTeX en lycée]
+% 1.0.7 Option [build] pour placer les fichiers temporaires dans un répertoire build (désactivée par défaut)
+% 1.0.6 Option [nominted] pour éviter de charger minted & nettoyage amssymb
+% 1.0.5 Environnement code python avec minted
+% 1.0.4 Environnement pour simuler terminal windows & linux
% 1.0.3 Environnement pour présenter du pseudocode
% 1.0.2 Environnement pour présenter du code python (avec pythontex)
% 1.0.1 Modif mineure du chargement de xcolor (compatibilité avec d'autres packages notamment...)
@@ -15,16 +16,16 @@
%------Option(s)
\newif\if@nominted \@nomintedfalse
\DeclareOption{nominted}{\@nomintedtrue}
+\newif\if@build \@buildfalse
+\DeclareOption{build}{\@buildtrue}
\DeclareOption*{}
\ProcessOptions\relax
%------Packages utiles
\RequirePackage[table,svgnames]{xcolor}%Gestion des couleurs
-%\RequirePackage{amssymb}
\RequirePackage{tikz}
\RequirePackage{pgf,pgffor}
\RequirePackage{ifthen}
-\RequirePackage{environ}
\RequirePackage{xparse}
\RequirePackage{xkeyval}
\RequirePackage{xfp}
@@ -46,7 +47,10 @@
%python
\RequirePackage{fancyvrb}
\RequirePackage[gobble=auto]{pythontex}
-\setpythontexlistingenv{pythont}
+\setpythontexlistingenv{pythont} %pour ne pas télescoper lstlistings (?)
+\if@build
+ \setpythontexoutputdir{./build/pythontex-files-\jobname} %essai de modif pythontex répertoire build
+\fi
%---------------SPLINES----------------------
%------commande utile pour extraire des infos d'une liste
@@ -375,7 +379,11 @@
\if@nominted
%on ne charge pas minted et la librairie tcbox
\else
- %on charge minted et la librairie tcbox
+ \if@build
+ %on charge minted avec le répertoire build
+ \RequirePackage[outputdir=build]{minted}
+ \fi
+ %on charge minted via la librairie tcbox
\tcbuselibrary{minted}
\fi