summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/citation-style-language
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-09-07 20:13:57 +0000
committerKarl Berry <karl@freefriends.org>2023-09-07 20:13:57 +0000
commit15825d7d05828a72144e3c51280381b12bdaeece (patch)
treedc0cb253497d7070e0c2f2ec6771e48b4b750597 /Master/texmf-dist/tex/latex/citation-style-language
parent3663b7f5d373ed845a0735f9d0f9e347ac628b3f (diff)
citation-style-language (7sep23)
git-svn-id: svn://tug.org/texlive/trunk@68197 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/citation-style-language')
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-bib.sty3
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-cite.sty33
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty87
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-init.sty27
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty7
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-af-ZA.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-af-ZA.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-ar.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-ar.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-bg-BG.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-bg-BG.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-ca-AD.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-ca-AD.xml)4
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-cs-CZ.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-cs-CZ.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-cy-GB.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-cy-GB.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-da-DK.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-da-DK.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-AT.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-de-AT.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-CH.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-de-CH.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-DE.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-de-DE.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-el-GR.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-el-GR.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-en-GB.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-en-GB.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-en-US.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-en-US.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-es-CL.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-es-CL.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-es-ES.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-es-ES.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-es-MX.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-es-MX.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-et-EE.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-et-EE.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-eu.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-eu.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-fa-IR.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-fa-IR.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-fi-FI.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-fi-FI.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-fr-CA.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-fr-CA.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-fr-FR.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-fr-FR.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-he-IL.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-he-IL.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-hi-IN.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-hi-IN.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-hr-HR.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-hr-HR.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-hu-HU.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-hu-HU.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-id-ID.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-id-ID.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-is-IS.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-is-IS.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-it-IT.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-it-IT.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-ja-JP.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-ja-JP.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-km-KH.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-km-KH.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-ko-KR.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-ko-KR.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-la.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-la.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-lt-LT.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-lt-LT.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-lv-LV.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-lv-LV.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-mn-MN.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-mn-MN.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-nb-NO.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-nb-NO.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-nl-NL.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-nl-NL.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-nn-NO.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-nn-NO.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-pl-PL.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-pl-PL.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-pt-BR.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-pt-BR.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-pt-PT.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-pt-PT.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-ro-RO.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-ro-RO.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-ru-RU.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-ru-RU.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-sk-SK.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-sk-SK.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-sl-SI.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-sl-SI.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-sr-RS.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-sr-RS.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-sv-SE.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-sv-SE.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-th-TH.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-th-TH.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-tr-TR.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-tr-TR.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-uk-UA.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-uk-UA.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-vi-VN.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-vi-VN.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-zh-CN.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-zh-CN.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-zh-TW.xml (renamed from Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-zh-TW.xml)0
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/styles/american-sociological-association.csl8
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/styles/apa.csl519
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/styles/modern-language-association.csl20
62 files changed, 294 insertions, 414 deletions
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-bib.sty b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-bib.sty
index ee8f33d5046..4f450ff8dc8 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-bib.sty
+++ b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-bib.sty
@@ -285,7 +285,8 @@
}
% Hook
-\cs_new:Npn \backref #1 {#1}
+\cs_if_free:NT \backref
+ { \cs_new:Npn \backref #1 {#1} }
% For author-date bibliography
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-cite.sty b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-cite.sty
index 9ac52d7df0f..bbfb9c63368 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-cite.sty
+++ b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-cite.sty
@@ -56,15 +56,24 @@
\cs_new:Npn \__csl_text_cite:nnn #1#2#3
{
- \seq_clear:N \l__csl_cite_keys_seq
- \seq_clear:N \l__csl_citation_items_seq
- \prop_clear:N \l__csl_citation_properties_prop
- \__csl_process_cite_input:nnn {#1} {#2} {#3}
- \__csl_process_citation_info:NN \l__csl_cite_keys_seq \l__csl_citation_items_seq
- \prop_put:Nnn \l__csl_citation_properties_prop { noteIndex } { 0 }
- \prop_put:Nnn \l__csl_citation_properties_prop { mode } { composite }
- % \bool_set_false:N \l__csl_note_bool
- \__csl_make_citation:N \l__csl_citation_info_prop
+ \bool_if:NTF \l__csl_note_bool
+ {
+ % In note styles, the authors are printed in-text followed by a note.
+ \bool_set_false:N \l__csl_note_bool
+ \__csl_cite_author:nnn {#1} {#2} {#3}
+ \bool_set_true:N \l__csl_note_bool
+ \__csl_cite:nnn {#1} {#2} {#3}
+ }
+ {
+ \seq_clear:N \l__csl_cite_keys_seq
+ \seq_clear:N \l__csl_citation_items_seq
+ \prop_clear:N \l__csl_citation_properties_prop
+ \__csl_process_cite_input:nnn {#1} {#2} {#3}
+ \__csl_process_citation_info:NN \l__csl_cite_keys_seq \l__csl_citation_items_seq
+ \prop_put:Nnn \l__csl_citation_properties_prop { noteIndex } { 0 }
+ \prop_put:Nnn \l__csl_citation_properties_prop { mode } { composite }
+ \__csl_make_citation:N \l__csl_citation_info_prop
+ }
}
@@ -457,7 +466,9 @@
\bool_if:NT \l__csl_regression_test_bool
{ \tl_show:N \l__csl_citation_tl }
\group_begin:
- \reset@font \l__csl_citation_tl
+ \bool_if:NTF \l__csl_note_bool
+ { \footnote { \reset@font \l__csl_citation_tl } }
+ { \reset@font \l__csl_citation_tl }
\group_end:
}
@@ -509,7 +520,7 @@
{
\__csl_if_preamble:TF
{
- \AtBeginDocument
+ \hook_gput_code:nnn { begindocument } { . }
{ \exp_args:Nx \__csl_write_aux_citation:n { #1 } }
}
{ \exp_args:Nx \__csl_write_aux_citation:n { #1 } }
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty
index db70f54c1ce..eedc5dc4a1e 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty
+++ b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty
@@ -9,7 +9,7 @@
% ### `babel`
% This should be disabled.
-\AtEndOfPackageFile* { babel }
+\hook_gput_code:nnn { package / babel / after } { . }
{
\RenewDocumentCommand \nocite { m }
{
@@ -24,6 +24,54 @@
}
+% ### `backref`
+
+\hook_gput_code:nnn { package / backref / after } { . }
+ {
+ \cs_set:Npn \__csl_add_back_ref_info:
+ { \seq_map_inline:Nn \l__csl_cite_keys_seq { \Hy@backout {##1} } }
+ }
+
+
+% ### `beamer`
+
+% `beamer` passes `implicit=false` to `hyperref` to skip its patch to LaTeX2e
+% internal bibliographic commands. Instead `beamer` refines those commands
+% in its own way.
+
+\cs_new:Npn \__csl_beamer_cite_item:nn #1#2
+ { \hyperlink { beamerbib #1 } { #2 } }
+
+\cs_new:Npn \__csl_beamer_lbibitem:nn [#1]#2
+ {
+ \exp_after:wN \item \beamer@bibstore [ \@biblabel {#1} \hfill ]
+ \cs_if_exist:cF { beamerbib@ #2 @ \int_use:N \c@framenumber }
+ {
+ \cs_gset:cpn { beamerbib@ #2 @ \int_use:N \c@framenumber } { \relax }
+ \hypertarget { beamerbib #2 } { }
+ }
+ \hbox { }
+ \ignorespaces
+ }
+
+\cs_new:Npn \__csl_beamer_lbibitem:n #1
+ {
+ \exp_after:wN \item \beamer@bibstore
+ \cs_if_exist:cF { beamerbib@ #1 @ \int_use:N \c@framenumber }
+ {
+ \cs_gset:cpn { beamerbib@ #1 @ \int_use:N \c@framenumber } { \relax }
+ \hypertarget { beamerbib #1 } { }
+ }
+ }
+
+\hook_gput_code:nnn { class / beamer / after } { . }
+ {
+ \cs_gset_eq:NN \@lbibitem \__csl_beamer_lbibitem:nn
+ \cs_gset_eq:NN \@bibitem \__csl_beamer_bibitem:n
+ \cs_gset_eq:NN \cslcite \__csl_beamer_cite_item:nn
+ }
+
+
% ### `biblatex`
% The following doesn't really make `csl` compatible with `biblatex`.
% It just provides commands to make it accepting `biblatex`'s database.
@@ -37,7 +85,7 @@
% ### `csquotes`
-\AtEndOfPackageFile* { csquotes }
+\hook_gput_code:nnn { package / csquotes / after } { . }
{
\BlockquoteDisable
{
@@ -49,21 +97,6 @@
% ### `hyperref`
-% The hyperref package also patches \bibcite but it cannot provide hyperlinks
-% when used with csl.
-\bool_new:N \l__csl_hyperref_loaded_bool
-\AtEndOfPackageFile* { hyperref }
- {
- \bool_set_true:N \l__csl_hyperref_loaded_bool
- % Pakcage "hyperref" redefines \@lbibitem and \bibitem and we need to
- % recover them.
- \cs_gset_eq:NN \@lbibitem \__csl_lbibitem:
- \cs_gset_eq:NN \@bibitem \__csl_bibitem:
- \cs_gset_eq:NN \__csl_lbibitem_plain:nn \__csl_hyperref_lbibitem:nn
- \cs_gset_eq:NN \__csl_bibitem_plain:n \__csl_hyperref_bibitem:n
- \cs_gset_eq:NN \cslcite \__csl_hyperref_cite_item:nn
- }
-
\cs_set:Npn \__csl_hyperref_cite_item:nn #1#2
{ \hyper@@link [ cite ] { } { cite. #1 \@extra@b@citeb } { #2 } }
@@ -100,3 +133,23 @@
}
\ignorespaces
}
+
+% The hyperref package also patches \bibcite but it cannot provide hyperlinks
+% when used with csl.
+\bool_new:N \l__csl_hyperref_loaded_bool
+\hook_gput_code:nnn { package / hyperref / after } { . }
+ {
+ \bool_set_true:N \l__csl_hyperref_loaded_bool
+ % Pakcage "hyperref" redefines \@lbibitem and \bibitem and we need to
+ % recover them.
+ % In non-implicit mode (e.g., loaded by `beamer`), hyperref stops early
+ % (`\MaybeStopEarly`) and it doesn't redefine the cite internal commands.
+ \cs_if_exist:NT \@extra@b@citeb
+ {
+ \cs_gset_eq:NN \@lbibitem \__csl_lbibitem:
+ \cs_gset_eq:NN \@bibitem \__csl_bibitem:
+ \cs_gset_eq:NN \__csl_lbibitem_plain:nn \__csl_hyperref_lbibitem:nn
+ \cs_gset_eq:NN \__csl_bibitem_plain:n \__csl_hyperref_bibitem:n
+ \cs_gset_eq:NN \cslcite \__csl_hyperref_cite_item:nn
+ }
+ }
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-init.sty b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-init.sty
index ff35eed14e8..db7dc0111aa 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-init.sty
+++ b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-init.sty
@@ -6,7 +6,7 @@
% ## Initialization at `\begin{document}`
-\AtBeginDocument { \__csl_at_begin_document_hook: }
+\hook_gput_code:nnn { begindocument } { . } { \__csl_at_begin_document_hook: }
\cs_new:Npn \__csl_at_begin_document_hook:
@@ -14,7 +14,10 @@
\__csl_write_aux_info:
\sys_if_engine_luatex:TF
{ \__csl_initialize_lua_module: }
- { \__csl_load_bbl: }
+ {
+ \__csl_load_bbl:
+ \__csl_read_style_class:
+ }
}
@@ -316,5 +319,25 @@
\group_end:
}
+
+% The `\textcite` bahaves differently with note styles.
+% Thus we read the style class from the `.csl` file with non-LuaTeX engines.
+\ior_new:N \l__csl_style_ior
+\cs_new:Npn \__csl_read_style_class:
+ {
+ \exp_args:NNx \ior_open:Nn \l__csl_style_ior { \l__csl_style_tl .csl }
+ \ior_map_inline:Nn \l__csl_style_ior
+ {
+ % \tl_show:n {##1}
+ \tl_if_in:nnT {##1} { class="note" }
+ {
+ \tl_set:Nn \l__csl_class_tl { note }
+ \bool_set_true:N \l__csl_note_bool
+ \ior_map_break:
+ }
+ }
+ \ior_close:N \l__csl_style_ior
+ }
+
% \msg_new:nnn { citation-style-language } { file / non-exist }
% { No~ file~ #1. }
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty
index 974b918c8de..c7c54fb4d9b 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty
+++ b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty
@@ -9,11 +9,10 @@
\RequirePackage{expl3}
\RequirePackage{xparse}
-\ProvidesExplPackage {citation-style-language} {2023-07-04} {0.4.2}
+\ProvidesExplPackage {citation-style-language} {2023-09-07} {0.4.3}
{Citation Style Language for LaTeX}
\RequirePackage { l3keys2e }
-\RequirePackage { filehook }
\RequirePackage { url }
@@ -23,12 +22,12 @@
\clist_map_inline:nn
{
- babelbib , backref , biblatex , bibtopic , bibunits , chapterbib ,
+ babelbib , biblatex , bibtopic , bibunits , chapterbib ,
cite , citeref , inlinebib , jurabib , mcite , mciteplus ,
multibib , natbib , splitbib
}
{
- \AtBeginOfPackageFile* {#1}
+ \hook_gput_code:nnn { package / #1 / before } { . }
{ \msg_error:nnn { citation-style-language } { incompatible-package } {#1} }
}
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-af-ZA.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-af-ZA.xml
index 142df6d499a..142df6d499a 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-af-ZA.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-af-ZA.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-ar.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-ar.xml
index 38268b64990..38268b64990 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-ar.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-ar.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-bg-BG.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-bg-BG.xml
index 83b889d6ebb..83b889d6ebb 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-bg-BG.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-bg-BG.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-ca-AD.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-ca-AD.xml
index ca5d908ece6..6b1bd713866 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-ca-AD.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-ca-AD.xml
@@ -8,7 +8,7 @@
<name>javimat</name>
</translator>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
- <updated>2022-10-12T15:53:27-04:00</updated>
+ <updated>2023-07-31T10:30:14-04:00</updated>
</info>
<style-options punctuation-in-quote="false"/>
<date form="text">
@@ -541,7 +541,7 @@
<term name="editor" form="verb">editat per</term>
<term name="editorial-director" form="verb">editat per</term>
<term name="illustrator" form="verb">il·lustrat per</term>
- <term name="interviewer" form="verb">entrevistat per</term>
+ <term name="interviewer" form="verb">entrevista feta per</term>
<term name="recipient" form="verb">a</term>
<term name="reviewed-author" form="verb">per</term>
<term name="translator" form="verb">traduït per</term>
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-cs-CZ.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-cs-CZ.xml
index bbab6310f00..bbab6310f00 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-cs-CZ.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-cs-CZ.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-cy-GB.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-cy-GB.xml
index b88b20d7ac2..b88b20d7ac2 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-cy-GB.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-cy-GB.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-da-DK.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-da-DK.xml
index c830255cb5c..c830255cb5c 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-da-DK.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-da-DK.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-de-AT.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-AT.xml
index edfbdbd67df..edfbdbd67df 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-de-AT.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-AT.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-de-CH.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-CH.xml
index 90b4bc7de43..90b4bc7de43 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-de-CH.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-CH.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-de-DE.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-DE.xml
index d12c62e72d9..d12c62e72d9 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-de-DE.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-de-DE.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-el-GR.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-el-GR.xml
index 4a0da272c6a..4a0da272c6a 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-el-GR.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-el-GR.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-en-GB.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-en-GB.xml
index dd7cfc47a5b..dd7cfc47a5b 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-en-GB.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-en-GB.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-en-US.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-en-US.xml
index a12fb4373d5..a12fb4373d5 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-en-US.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-en-US.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-es-CL.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-es-CL.xml
index f2ba229849c..f2ba229849c 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-es-CL.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-es-CL.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-es-ES.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-es-ES.xml
index 9d27be4ddb9..9d27be4ddb9 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-es-ES.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-es-ES.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-es-MX.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-es-MX.xml
index 62b97fb1683..62b97fb1683 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-es-MX.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-es-MX.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-et-EE.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-et-EE.xml
index 6937eeba9d9..6937eeba9d9 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-et-EE.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-et-EE.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-eu.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-eu.xml
index 41b3600d7bf..41b3600d7bf 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-eu.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-eu.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-fa-IR.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-fa-IR.xml
index 2fe4be6aad0..2fe4be6aad0 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-fa-IR.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-fa-IR.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-fi-FI.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-fi-FI.xml
index 248111a8923..248111a8923 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-fi-FI.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-fi-FI.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-fr-CA.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-fr-CA.xml
index eba7d7a571d..eba7d7a571d 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-fr-CA.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-fr-CA.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-fr-FR.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-fr-FR.xml
index 8fa95335812..8fa95335812 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-fr-FR.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-fr-FR.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-he-IL.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-he-IL.xml
index 660a28239f0..660a28239f0 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-he-IL.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-he-IL.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-hi-IN.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-hi-IN.xml
index 48f6a04d17b..48f6a04d17b 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-hi-IN.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-hi-IN.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-hr-HR.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-hr-HR.xml
index bf5cac29edf..bf5cac29edf 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-hr-HR.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-hr-HR.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-hu-HU.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-hu-HU.xml
index 12a2beb3161..12a2beb3161 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-hu-HU.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-hu-HU.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-id-ID.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-id-ID.xml
index baf46f9d27b..baf46f9d27b 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-id-ID.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-id-ID.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-is-IS.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-is-IS.xml
index c2dd5ee8ec7..c2dd5ee8ec7 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-is-IS.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-is-IS.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-it-IT.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-it-IT.xml
index fba5d88ed84..fba5d88ed84 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-it-IT.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-it-IT.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-ja-JP.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-ja-JP.xml
index 0057e9b48aa..0057e9b48aa 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-ja-JP.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-ja-JP.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-km-KH.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-km-KH.xml
index 5f458cab49b..5f458cab49b 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-km-KH.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-km-KH.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-ko-KR.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-ko-KR.xml
index 6fc1e38de8c..6fc1e38de8c 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-ko-KR.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-ko-KR.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-la.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-la.xml
index 2b64708a813..2b64708a813 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-la.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-la.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-lt-LT.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-lt-LT.xml
index f9d635bbc71..f9d635bbc71 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-lt-LT.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-lt-LT.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-lv-LV.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-lv-LV.xml
index d6ed3fce736..d6ed3fce736 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-lv-LV.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-lv-LV.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-mn-MN.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-mn-MN.xml
index b90556d40e1..b90556d40e1 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-mn-MN.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-mn-MN.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-nb-NO.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-nb-NO.xml
index 7f37414295e..7f37414295e 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-nb-NO.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-nb-NO.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-nl-NL.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-nl-NL.xml
index edbccdd5e49..edbccdd5e49 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-nl-NL.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-nl-NL.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-nn-NO.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-nn-NO.xml
index d51b1222cc3..d51b1222cc3 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-nn-NO.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-nn-NO.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-pl-PL.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-pl-PL.xml
index 2297f69a8f1..2297f69a8f1 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-pl-PL.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-pl-PL.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-pt-BR.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-pt-BR.xml
index 06b8232fb36..06b8232fb36 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-pt-BR.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-pt-BR.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-pt-PT.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-pt-PT.xml
index 544c9499949..544c9499949 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-pt-PT.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-pt-PT.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-ro-RO.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-ro-RO.xml
index a3fdb5d26b6..a3fdb5d26b6 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-ro-RO.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-ro-RO.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-ru-RU.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-ru-RU.xml
index f9edc463c58..f9edc463c58 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-ru-RU.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-ru-RU.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-sk-SK.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-sk-SK.xml
index 3a367c3028a..3a367c3028a 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-sk-SK.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-sk-SK.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-sl-SI.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-sl-SI.xml
index 3f56e06d242..3f56e06d242 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-sl-SI.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-sl-SI.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-sr-RS.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-sr-RS.xml
index 6ac610956aa..6ac610956aa 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-sr-RS.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-sr-RS.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-sv-SE.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-sv-SE.xml
index 8c20b480475..8c20b480475 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-sv-SE.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-sv-SE.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-th-TH.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-th-TH.xml
index 902a3d9ad8a..902a3d9ad8a 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-th-TH.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-th-TH.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-tr-TR.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-tr-TR.xml
index f0d92b99082..f0d92b99082 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-tr-TR.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-tr-TR.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-uk-UA.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-uk-UA.xml
index daa24df5083..daa24df5083 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-uk-UA.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-uk-UA.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-vi-VN.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-vi-VN.xml
index 18ad8d33e6c..18ad8d33e6c 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-vi-VN.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-vi-VN.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-zh-CN.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-zh-CN.xml
index 764377939fc..764377939fc 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-zh-CN.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-zh-CN.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-zh-TW.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-zh-TW.xml
index 7a72d170862..7a72d170862 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/submodules/locales/csl-locales-zh-TW.xml
+++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-zh-TW.xml
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/styles/american-sociological-association.csl b/Master/texmf-dist/tex/latex/citation-style-language/styles/american-sociological-association.csl
index f58f73cfb19..4f212f8e7d7 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/styles/american-sociological-association.csl
+++ b/Master/texmf-dist/tex/latex/citation-style-language/styles/american-sociological-association.csl
@@ -16,7 +16,7 @@
<category citation-format="author-date"/>
<category field="sociology"/>
<summary>The ASA style following the 6th edition of the Style Guide</summary>
- <updated>2023-02-19T22:16:47-05:00</updated>
+ <updated>2023-07-16T16:48:31-04:00</updated>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
</info>
<locale xml:lang="en">
@@ -38,8 +38,7 @@
<name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always" initialize="false" initialize-with=". "/>
<label form="short" prefix=", "/>
<substitute>
- <names variable="editor"/>
- <names variable="translator"/>
+ <names variable="editor translator director"/>
<choose>
<if type="report">
<text variable="publisher"/>
@@ -53,8 +52,7 @@
<names variable="author">
<name form="short" and="text" delimiter=", " initialize-with=". "/>
<substitute>
- <names variable="editor"/>
- <names variable="translator"/>
+ <names variable="editor director translator"/>
<choose>
<if type="report">
<text variable="publisher"/>
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/styles/apa.csl b/Master/texmf-dist/tex/latex/citation-style-language/styles/apa.csl
index a71a9926895..3734d8d76e1 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/styles/apa.csl
+++ b/Master/texmf-dist/tex/latex/citation-style-language/styles/apa.csl
@@ -14,7 +14,7 @@
<category citation-format="author-date"/>
<category field="psychology"/>
<category field="generic-base"/>
- <updated>2023-05-13T12:14:52-04:00</updated>
+ <updated>2023-07-16T18:56:49-04:00</updated>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
</info>
<locale xml:lang="en">
@@ -35,298 +35,88 @@
<term name="circa" form="short">ca.</term>
<term name="bc"> B.C.E.</term>
<term name="ad"> C.E.</term>
- <term name="letter">personal communication</term>
- <term name="letter" form="short">letter</term>
<term name="issue" form="long">
<single>issue</single>
<multiple>issues</multiple>
</term>
- </terms>
- </locale>
- <locale xml:lang="af">
- <terms>
- <term name="letter">persoonlike kommunikasie</term>
- <term name="letter" form="short">brief</term>
- </terms>
- </locale>
- <locale xml:lang="ar">
- <terms>
- <term name="letter">اتصال شخصي</term>
- <term name="letter" form="short">خطاب</term>
- </terms>
- </locale>
- <locale xml:lang="bg">
- <terms>
- <term name="letter">лична комуникация</term>
- <term name="letter" form="short">писмо</term>
- </terms>
- </locale>
- <locale xml:lang="ca">
- <terms>
- <term name="letter">comunicació personal</term>
- <term name="letter" form="short">carta</term>
- </terms>
- </locale>
- <locale xml:lang="cs">
- <terms>
- <term name="letter">osobní komunikace</term>
- <term name="letter" form="short">dopis</term>
- </terms>
- </locale>
- <locale xml:lang="cy">
- <terms>
- <term name="letter">cyfathrebu personol</term>
- <term name="letter" form="short">llythyr</term>
+ <term name="software">computer software</term>
</terms>
</locale>
<locale xml:lang="da">
<terms>
<term name="et-al">et al.</term>
- <term name="letter">personlig kommunikation</term>
- <term name="letter" form="short">brev</term>
</terms>
</locale>
<locale xml:lang="de">
<terms>
<term name="et-al">et al.</term>
- <term name="letter">persönliche Kommunikation</term>
- <term name="letter" form="short">Brief</term>
- </terms>
- </locale>
- <locale xml:lang="el">
- <terms>
- <term name="letter">προσωπική επικοινωνία</term>
- <term name="letter" form="short">επιστολή</term>
</terms>
</locale>
<locale xml:lang="es">
<terms>
<term name="from">de</term>
- <term name="letter">comunicación personal</term>
- <term name="letter" form="short">carta</term>
- </terms>
- </locale>
- <locale xml:lang="et">
- <terms>
- <term name="letter">isiklik suhtlus</term>
- <term name="letter" form="short">kiri</term>
- </terms>
- </locale>
- <locale xml:lang="eu">
- <terms>
- <term name="letter">komunikazio pertsonala</term>
- <term name="letter" form="short">gutuna</term>
- </terms>
- </locale>
- <locale xml:lang="fa">
- <terms>
- <term name="letter">ارتباط شخصی</term>
- <term name="letter" form="short">نامه</term>
- </terms>
- </locale>
- <locale xml:lang="fi">
- <terms>
- <term name="letter">henkilökohtainen viestintä</term>
- <term name="letter" form="short">kirje</term>
</terms>
</locale>
<locale xml:lang="fr">
<terms>
- <term name="letter">communication personnelle</term>
- <term name="letter" form="short">lettre</term>
<term name="editor" form="short">
<single>éd.</single>
<multiple>éds.</multiple>
</term>
</terms>
</locale>
- <locale xml:lang="he">
- <terms>
- <term name="letter">תקשורת אישית</term>
- <term name="letter" form="short">מכתב</term>
- </terms>
- </locale>
- <locale xml:lang="hr">
- <terms>
- <term name="letter">osobna komunikacija</term>
- <term name="letter" form="short">pismo</term>
- </terms>
- </locale>
- <locale xml:lang="hu">
- <terms>
- <term name="letter">személyes kommunikáció</term>
- <term name="letter" form="short">levél</term>
- </terms>
- </locale>
- <locale xml:lang="id">
- <terms>
- <term name="letter">komunikasi pribadi</term>
- <term name="letter" form="short">surat</term>
- </terms>
- </locale>
- <locale xml:lang="is">
- <terms>
- <term name="letter">persónuleg samskipti</term>
- <term name="letter" form="short">bréf</term>
- </terms>
- </locale>
- <locale xml:lang="it">
- <terms>
- <term name="letter">comunicazione personale</term>
- <term name="letter" form="short">lettera</term>
- </terms>
- </locale>
- <locale xml:lang="ja">
- <terms>
- <term name="letter">個人的なやり取り</term>
- <term name="letter" form="short">手紙</term>
- </terms>
- </locale>
- <locale xml:lang="ko">
- <terms>
- <term name="letter">개인 서신</term>
- <term name="letter" form="short">편지</term>
- </terms>
- </locale>
- <locale xml:lang="la">
- <terms>
- <term name="letter"/>
- <term name="letter" form="short">epistula</term>
- </terms>
- </locale>
- <locale xml:lang="lt">
- <terms>
- <term name="letter">communicationis personalis</term>
- <term name="letter" form="short"/>
- </terms>
- </locale>
- <locale xml:lang="lv">
- <terms>
- <term name="letter">personīga komunikācija</term>
- <term name="letter" form="short">vēstule</term>
- </terms>
- </locale>
- <locale xml:lang="mn">
- <terms>
- <term name="letter">хувийн харилцаа холбоо</term>
- <term name="letter" form="short">захиа</term>
- </terms>
- </locale>
<locale xml:lang="nb">
<terms>
<term name="et-al">et al.</term>
- <term name="letter">personlig kommunikasjon</term>
- <term name="letter" form="short">brev</term>
</terms>
</locale>
<locale xml:lang="nl">
<terms>
<term name="et-al">et al.</term>
- <term name="letter">persoonlijke communicatie</term>
- <term name="letter" form="short">brief</term>
</terms>
</locale>
<locale xml:lang="nn">
<terms>
<term name="et-al">et al.</term>
- <term name="letter">personlig kommunikasjon</term>
- <term name="letter" form="short">brev</term>
- </terms>
- </locale>
- <locale xml:lang="pl">
- <terms>
- <term name="letter">osobista komunikacja</term>
- <term name="letter" form="short">list</term>
- </terms>
- </locale>
- <locale xml:lang="pt">
- <terms>
- <term name="letter">comunicação pessoal</term>
- <term name="letter" form="short">carta</term>
- </terms>
- </locale>
- <locale xml:lang="ro">
- <terms>
- <term name="letter">comunicare personală</term>
- <term name="letter" form="short">scrisoare</term>
- </terms>
- </locale>
- <locale xml:lang="ru">
- <terms>
- <term name="letter">личная переписка</term>
- <term name="letter" form="short">письмо</term>
- </terms>
- </locale>
- <locale xml:lang="sk">
- <terms>
- <term name="letter">osobná komunikácia</term>
- <term name="letter" form="short">list</term>
- </terms>
- </locale>
- <locale xml:lang="sl">
- <terms>
- <term name="letter">osebna komunikacija</term>
- <term name="letter" form="short">pismo</term>
- </terms>
- </locale>
- <locale xml:lang="sr">
- <terms>
- <term name="letter">лична комуникација</term>
- <term name="letter" form="short">писмо</term>
- </terms>
- </locale>
- <locale xml:lang="sv">
- <terms>
- <term name="letter">personlig kommunikation</term>
- <term name="letter" form="short">brev</term>
- </terms>
- </locale>
- <locale xml:lang="th">
- <terms>
- <term name="letter">การสื่อสารส่วนบุคคล</term>
- <term name="letter" form="short">จดหมาย</term>
- </terms>
- </locale>
- <locale xml:lang="tr">
- <terms>
- <term name="letter">kişisel iletişim</term>
- <term name="letter" form="short">mektup</term>
- </terms>
- </locale>
- <locale xml:lang="uk">
- <terms>
- <term name="letter">особисте спілкування</term>
- <term name="letter" form="short">лист</term>
- </terms>
- </locale>
- <locale xml:lang="vi">
- <terms>
- <term name="letter">giao tiếp cá nhân</term>
- <term name="letter" form="short">thư</term>
- </terms>
- </locale>
- <locale xml:lang="zh-CN">
- <terms>
- <term name="letter">的私人交流</term>
- <term name="letter" form="short">信函</term>
- </terms>
- </locale>
- <locale xml:lang="zh-TW">
- <terms>
- <term name="letter">私人通訊</term>
- <term name="letter" form="short">信函</term>
</terms>
</locale>
+ <!-- TODO: New types: classic collection document event hearing performance periodical regulation -software- standard -->
+ <!-- TODO: New creator roles: chair compiler contributor curator executive-producer guest host narrator organizer performer producer script-writer series-creator -->
+ <!-- TODO: New variables:
+ available-date submitted
+ part-number printing-number supplement-number
+ part-title volume-title
+ archive_collection
+ division jurisdiction
+ event-title
+ language
+ license
+ reviewed-genre
+ -->
+ <!-- TODO: New terms:
+ advance-online-publication
+ album on audio-recording
+ original-work-published
+ personal-communication
+ preprint
+ review-of
+ item types
+ -->
+ <!-- TODO: Check Indigeneous Knowledge format -->
<!-- General categories of item types:
Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
Periodical or Booklike: paper-conference
- Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+ Booklike: article book broadcast chapter classic collection dataset document
+ entry entry-dictionary entry-encyclopedia event figure
graphic interview manuscript map motion_picture musical_score pamphlet patent
- personal_communication report song speech thesis post webpage
- Legal: bill legal_case legislation treaty
+ performance periodical personal_communication post report
+ software song speech standard thesis webpage
+ Legal: bill hearing legal_case legislation regulation treaty
-->
<!-- APA references contain four parts: author, date, title, source -->
<macro name="author-bib">
+ <!-- TODO: New creator roles (media, contributor) -->
+ <!-- TODO: Add new item types -->
<names variable="composer" delimiter=", ">
<name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
<substitute>
@@ -355,7 +145,7 @@
</choose>
</if>
</choose>
- <!-- Test for editortranslator and put that first as that becomes available -->
+ <!-- TODO: Test for editortranslator and put that first as that becomes available -->
<names variable="editor" delimiter=", ">
<name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
<label form="short" prefix=" (" suffix=")" text-case="title"/>
@@ -383,6 +173,8 @@
</names>
</macro>
<macro name="author-intext">
+ <!-- TODO: New creator roles -->
+ <!-- TODO: Add new item types -->
<choose>
<if type="bill legal_case legislation treaty" match="any">
<text macro="title-intext"/>
@@ -399,8 +191,7 @@
<text macro="title-intext"/>
</substitute>
</names>
- <!-- Replace with term="personal-communication" if that becomes available -->
- <text term="letter"/>
+ <text term="personal-communication"/>
</group>
</if>
<else>
@@ -438,6 +229,7 @@
</choose>
</macro>
<macro name="date-bib">
+ <!-- TODO: Add new item types -->
<group delimiter=" " prefix="(" suffix=")">
<choose>
<if is-uncertain-date="issued">
@@ -476,6 +268,7 @@
</if>
<else-if variable="status">
<group>
+ <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
<text variable="status" text-case="lowercase"/>
<text variable="year-suffix" prefix="-"/>
</group>
@@ -503,6 +296,7 @@
</choose>
</macro>
<macro name="date-intext">
+ <!-- TODO: Add new item types -->
<choose>
<if variable="issued">
<group delimiter="/">
@@ -550,6 +344,7 @@
</group>
</if>
<else-if variable="status">
+ <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
<text variable="status" text-case="lowercase"/>
<text variable="year-suffix" prefix="-"/>
</else-if>
@@ -579,6 +374,7 @@
</choose>
</macro>
<macro name="title">
+ <!-- TODO: Add new item types -->
<choose>
<if type="post webpage" match="any">
<!-- Webpages are always italicized -->
@@ -600,7 +396,7 @@
<if variable="collection-editor editor editorial-director" match="any">
<group delimiter=": " font-style="italic">
<text variable="title"/>
- <!-- Replace with volume-title as that becomes available -->
+ <!-- TODO: Replace with volume-title -->
<choose>
<if is-numeric="volume" match="none">
<group delimiter=" ">
@@ -619,7 +415,7 @@
<else>
<group delimiter=": " font-style="italic">
<text variable="title"/>
- <!-- Replace with volume-title as that becomes available -->
+ <!-- TODO: Replace with volume-title -->
<choose>
<if is-numeric="volume" match="none">
<group delimiter=" ">
@@ -635,27 +431,28 @@
</choose>
</macro>
<macro name="title-intext">
+ <!-- TODO: Add new item types -->
<choose>
<if variable="title" match="none">
<text macro="bracketed-intext" prefix="[" suffix="]"/>
</if>
+ <else-if type="hearing">
+ <!-- Hearings are italicized -->
+ <text variable="title" form="short" font-style="italic" text-case="title"/>
+ </else-if>
<else-if type="bill">
- <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+ <!-- Bills are not italicized and substitute bill number if no title. -->
<choose>
- <if variable="number container-title" match="none">
- <text variable="title" form="short" font-style="italic" text-case="title"/>
- </if>
- <else-if variable="title">
+ <if variable="title">
<text variable="title" form="short" text-case="title"/>
- </else-if>
+ </if>
<else>
<group delimiter=" ">
<text variable="genre"/>
<group delimiter=" ">
<choose>
<if variable="chapter-number container-title" match="none">
- <!-- Replace with label variable="number" as that becomes available -->
- <text term="issue" form="short"/>
+ <label variable="number" form="short"/>
</if>
</choose>
<text variable="number"/>
@@ -686,6 +483,7 @@
</choose>
</macro>
<macro name="parenthetical">
+ <!-- TODO: Add new item types -->
<!-- (Secondary contributors; Database location; Genre no. 123; Report Series 123, Version, Edition, Volume, Page) -->
<group prefix="(" suffix=")">
<choose>
@@ -698,13 +496,11 @@
<text variable="genre" text-case="capitalize-first"/>
</if>
<else>
- <!-- This should be localized -->
- <text value="patent" text-case="capitalize-first"/>
+ <text term="patent" text-case="capitalize-first"/>
</else>
</choose>
<group delimiter=" ">
- <!-- Replace with label variable="number" if that becomes available -->
- <text term="issue" form="short" text-case="capitalize-first"/>
+ <label variable="number" form="short" text-case="capitalize-first"/>
<text variable="number"/>
</group>
</group>
@@ -741,6 +537,7 @@
</group>
</macro>
<macro name="parenthetical-container">
+ <!-- TODO: Add new item types -->
<choose>
<if variable="container-title" match="any">
<group prefix="(" suffix=")">
@@ -759,6 +556,7 @@
</choose>
</macro>
<macro name="bracketed">
+ <!-- TODO: Add new item types -->
<!-- [Descriptive information] -->
<!-- If there is a number, genre is already printed in macro="number" -->
<group prefix="[" suffix="]">
@@ -779,7 +577,9 @@
<text variable="medium" text-case="capitalize-first"/>
</else-if>
<else>
- <!-- Replace with term="review" as that becomes available -->
+ <!-- TODO: Replace with term="review" -->
+ <!-- TODO: Handle review vs review-of depending on presence of reviewed-title -->
+ <!-- TODO: Add reviewed-genre -->
<text value="Review of"/>
</else>
</choose>
@@ -790,7 +590,9 @@
<text variable="medium" text-case="capitalize-first"/>
</if>
<else>
- <!-- Replace with term="review" as that becomes available -->
+ <!-- TODO: Replace with term="review" -->
+ <!-- TODO: Handle review vs review-of depending on presence of reviewed-title -->
+ <!-- TODO: Add reviewed-genre -->
<text value="Review of"/>
</else>
</choose>
@@ -882,7 +684,7 @@
<text variable="medium" text-case="capitalize-first"/>
</else-if>
<else>
- <text term="letter" form="short" text-case="capitalize-first"/>
+ <text term="letter" text-case="capitalize-first"/>
</else>
</choose>
</if>
@@ -892,7 +694,7 @@
<text variable="medium" text-case="capitalize-first"/>
</if>
<else>
- <text term="letter" form="short" text-case="capitalize-first"/>
+ <text term="letter" text-case="capitalize-first"/>
</else>
</choose>
</else>
@@ -927,20 +729,20 @@
<choose>
<if variable="genre">
<text variable="genre" text-case="capitalize-first"/>
- <!-- Replace prefix with performer label as that becomes available -->
+ <!-- TODO: Replace prefix with performer label -->
<names variable="author" prefix="recorded by ">
<name and="symbol" initialize-with=". " delimiter=", "/>
</names>
</if>
<else-if variable="medium">
<text variable="medium" text-case="capitalize-first"/>
- <!-- Replace prefix with performer label as that becomes available -->
+ <!-- TODO: Replace prefix with performer label -->
<names variable="author" prefix="recorded by ">
<name and="symbol" initialize-with=". " delimiter=", "/>
</names>
</else-if>
<else>
- <!-- Replace prefix with performer label as that becomes available -->
+ <!-- TODO: Replace prefix with performer label -->
<names variable="author" prefix="Recorded by ">
<name and="symbol" initialize-with=". " delimiter=", "/>
</names>
@@ -953,13 +755,13 @@
<choose>
<if variable="medium">
<text variable="medium" text-case="capitalize-first"/>
- <!-- Replace prefix with performer label as that becomes available -->
+ <!-- TODO: Replace prefix with performer label -->
<names variable="author" prefix="recorded by ">
<name and="symbol" initialize-with=". " delimiter=", "/>
</names>
</if>
<else>
- <!-- Replace prefix with performer label as that becomes available -->
+ <!-- TODO: Replace prefix with performer label -->
<names variable="author" prefix="Recorded by ">
<name and="symbol" initialize-with=". " delimiter=", "/>
</names>
@@ -993,14 +795,7 @@
</if>
</choose>
</if>
- <else-if type="book">
- <choose>
- <if variable="version" match="none">
- <text macro="format"/>
- </if>
- </choose>
- </else-if>
- <else-if type="report" match="none">
+ <else-if type="report software" match="none">
<text macro="format"/>
</else-if>
</choose>
@@ -1009,11 +804,14 @@
</group>
</macro>
<macro name="bracketed-intext">
+ <!-- TODO: Add new item types -->
<group prefix="[" suffix="]">
<choose>
<if variable="reviewed-author reviewed-title" type="review review-book" match="any">
- <!-- This should be localized -->
- <text macro="reviewed-title-intext" prefix="Review of "/>
+ <group delimiter=" ">
+ <text term="review-of" text-case="capitalize-first"/>
+ <text macro="reviewed-title-intext"/>
+ </group>
</if>
<else-if variable="interviewer" type="interview" match="any">
<names variable="interviewer">
@@ -1034,7 +832,7 @@
<text variable="genre" text-case="capitalize-first"/>
</if>
<else>
- <text term="letter" form="short" text-case="capitalize-first"/>
+ <text term="letter" text-case="capitalize-first"/>
</else>
</choose>
<names variable="recipient" delimiter=", ">
@@ -1055,6 +853,7 @@
</group>
</macro>
<macro name="bracketed-container">
+ <!-- TODO: Add new item types -->
<group prefix="[" suffix="]">
<choose>
<if type="paper-conference speech" match="any">
@@ -1065,7 +864,7 @@
</if>
</choose>
</if>
- <else-if type="book" variable="version" match="all">
+ <else-if type="software" match="all">
<!-- For entries in mobile app reference works, place bracketed after the container-title -->
<text macro="format"/>
</else-if>
@@ -1077,6 +876,8 @@
</group>
</macro>
<macro name="secondary-contributors">
+ <!-- TODO: Add new item types -->
+ <!-- TODO: Add new creator roles -->
<choose>
<if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
<text macro="secondary-contributors-periodical"/>
@@ -1113,6 +914,7 @@
</group>
</macro>
<macro name="secondary-contributors-booklike">
+ <!-- TODO: Add new item types -->
<group delimiter="; ">
<choose>
<if variable="title">
@@ -1122,7 +924,7 @@
</names>
</if>
</choose>
- <!-- When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
+ <!-- TODO: When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
<choose>
<if type="post webpage" match="none">
<!-- Webpages treat container-title like publisher -->
@@ -1160,12 +962,13 @@
<choose>
<if variable="archive-place" match="none">
<!-- With `archive-place`: physical archives. Without: online archives. -->
- <!-- Add archive_collection as that becomes available -->
+ <!-- TODO: Add archive_collection -->
<text variable="archive_location"/>
</if>
</choose>
</macro>
<macro name="number">
+ <!-- TODO: Add new item types -->
<choose>
<if variable="number">
<group delimiter=", ">
@@ -1173,8 +976,7 @@
<text variable="genre" text-case="title"/>
<choose>
<if is-numeric="number">
- <!-- Replace with label variable="number" if that becomes available -->
- <text term="issue" form="short" text-case="capitalize-first"/>
+ <label variable="number" form="short" text-case="capitalize-first"/>
<text variable="number"/>
</if>
<else>
@@ -1197,6 +999,7 @@
</choose>
</macro>
<macro name="locators-booklike">
+ <!-- TODO: Add new item types -->
<choose>
<if type="article-journal article-magazine article-newspaper broadcast interview patent post post-weblog review review-book speech webpage" match="any"/>
<else-if type="paper-conference">
@@ -1223,8 +1026,7 @@
<choose>
<if is-numeric="version">
<group delimiter=" ">
- <!-- replace with label variable="version" if that becomes available -->
- <text term="version" text-case="capitalize-first"/>
+ <label variable="version" text-case="capitalize-first"/>
<text variable="version"/>
</group>
</if>
@@ -1247,6 +1049,7 @@
</choose>
</macro>
<macro name="volume-booklike">
+ <!-- TODO: Add new item types -->
<group delimiter=", ">
<!-- Report series [ex. 52] -->
<choose>
@@ -1259,6 +1062,7 @@
</choose>
<choose>
<if variable="volume" match="any">
+ <!-- TODO: Update using volume-title -->
<choose>
<!-- Non-numeric volumes are already printed as part of the book title -->
<if is-numeric="volume" match="none"/>
@@ -1272,8 +1076,7 @@
</if>
<else>
<group>
- <!-- Replace with label variable="number-of-volumes" if that becomes available -->
- <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+ <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
<text term="page-range-delimiter" prefix="1"/>
<number variable="number-of-volumes" form="numeric"/>
</group>
@@ -1315,6 +1118,7 @@
</choose>
</macro>
<macro name="format">
+ <!-- TODO: Add new item types -->
<choose>
<if variable="genre medium" match="any">
<group delimiter="; ">
@@ -1327,18 +1131,17 @@
</group>
</if>
<!-- Generic labels for specific types -->
- <!-- These should be localized when possible -->
+ <!-- TODO: Add terms for other types? -->
<else-if type="dataset">
- <text value="Data set"/>
+ <text term="dataset"/>
</else-if>
- <else-if type="book" variable="version" match="all">
- <!-- Replace with type="software" and term="software" as that becomes available -->
- <text value="Computer software"/>
+ <else-if type="software">
+ <text term="software" text-case="capitalize-first"/>
</else-if>
<else-if type="interview personal_communication" match="any">
<choose>
<if variable="archive container-title DOI publisher URL" match="none">
- <text term="letter" text-case="capitalize-first"/>
+ <text term="personal-communication" text-case="capitalize-first"/>
</if>
<else-if type="interview">
<text term="interview" text-case="capitalize-first"/>
@@ -1346,11 +1149,12 @@
</choose>
</else-if>
<else-if type="map">
- <text value="Map"/>
+ <text term="map" text-case="capitalize-first"/>
</else-if>
</choose>
</macro>
<macro name="format-intext">
+ <!-- TODO: Add new item types -->
<choose>
<if variable="genre" match="any">
<text variable="genre" text-case="capitalize-first"/>
@@ -1359,18 +1163,17 @@
<text variable="medium" text-case="capitalize-first"/>
</else-if>
<!-- Generic labels for specific types -->
- <!-- These should be localized when possible -->
+ <!-- TODO: Add terms for other types? -->
<else-if type="dataset">
- <text value="Data set"/>
+ <text term="dataset"/>
</else-if>
- <else-if type="book" variable="version" match="all">
- <!-- Replace with type="software" and term="software" as that becomes available -->
- <text value="Computer software"/>
+ <else-if type="software">
+ <text term="software" text-case="capitalize-first"/>
</else-if>
<else-if type="interview personal_communication" match="any">
<choose>
<if variable="archive container-title DOI publisher URL" match="none">
- <text term="letter" text-case="capitalize-first"/>
+ <text term="personal-communication" text-case="capitalize-first"/>
</if>
<else-if type="interview">
<text term="interview" text-case="capitalize-first"/>
@@ -1378,13 +1181,14 @@
</choose>
</else-if>
<else-if type="map">
- <text value="Map"/>
+ <text term="map"/>
</else-if>
</choose>
</macro>
<!-- APA 'source' element contains four parts:
container, event, publisher, access -->
<macro name="container">
+ <!-- TODO: Add new item types -->
<choose>
<if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
<!-- Periodical items -->
@@ -1440,6 +1244,7 @@
<if variable="issued">
<choose>
<if variable="issue page volume" match="none">
+ <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
<text variable="status" text-case="capitalize-first"/>
</if>
</choose>
@@ -1448,13 +1253,14 @@
</group>
</macro>
<macro name="container-booklike">
+ <!-- TODO: Add new item types -->
<choose>
<if variable="container-title" match="any">
<group delimiter=" ">
<text term="in" text-case="capitalize-first"/>
<group delimiter=", ">
<names variable="editor translator" delimiter=", &amp; ">
- <!-- Change to editortranslator and move editor to substitute as that becomes available -->
+ <!-- TODO: Change to editortranslator and move editor to substitute -->
<name and="symbol" initialize-with=". " delimiter=", "/>
<label form="short" text-case="title" prefix=" (" suffix=")"/>
<substitute>
@@ -1465,7 +1271,7 @@
</names>
<group delimiter=": " font-style="italic">
<text variable="container-title"/>
- <!-- Replace with volume-title as that becomes available -->
+ <!-- TODO: Replace with volume-title -->
<choose>
<if is-numeric="volume" match="none">
<group delimiter=" ">
@@ -1483,6 +1289,7 @@
</choose>
</macro>
<macro name="publisher">
+ <!-- TODO: Add new item types -->
<group delimiter="; ">
<choose>
<if type="thesis">
@@ -1517,7 +1324,7 @@
<!-- With `archive-place`: physical archives. Without: online archives. -->
<!-- For physical archives, print the location before the archive name.
For electronic archives, these are printed in macro="description". -->
- <!-- Split "archive_location" into "archive_collection" and "archive_location" as that becomes available -->
+ <!-- TODO: Split "archive_location" into "archive_collection" and "archive_location" -->
<!-- Must test for archive_collection:
With collection: archive_collection (archive_location), archive, archive-place
No collection: archive (archive_location), archive-place
@@ -1552,6 +1359,7 @@
</choose>
</macro>
<macro name="event">
+ <!-- TODO: Add new item types (e.g., event, collection, performance) -->
<choose>
<if variable="event event-title" match="any">
<!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
@@ -1584,6 +1392,7 @@
</macro>
<!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
<macro name="publication-history">
+ <!-- TODO: Add new item types -->
<choose>
<if type="patent" match="none">
<group prefix="(" suffix=")">
@@ -1595,6 +1404,7 @@
<text variable="references"/>
</if>
<else>
+ <!-- TODO: Replace these with terms -->
<group delimiter=" ">
<text term="original-work-published" text-case="capitalize-first"/>
<choose>
@@ -1617,86 +1427,60 @@
</macro>
<!-- Legal citations have their own rules -->
<macro name="legal-cites">
+ <!-- TODO: Add new item types -->
<choose>
- <if type="legal_case">
- <group delimiter=". ">
- <group delimiter=", ">
- <text variable="title"/>
- <group delimiter=" ">
- <text macro="container-legal"/>
- <text macro="date-legal"/>
- </group>
- <text variable="references"/>
- </group>
+ <if type="treaty">
+ <!-- APA generally defers to Bluebook for legal citations, but diverges without
+ explanation for treaty items. The Bluebook format that was used in APA 6th
+ ed. is used here. -->
+ <group delimiter=", ">
+ <text variable="title" text-case="title"/>
+ <names variable="author">
+ <name initialize-with="." form="short" delimiter="-"/>
+ </names>
+ <text macro="date-legal"/>
+ <text macro="container-legal"/>
<text macro="access"/>
</group>
</if>
- <else-if type="bill">
- <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+ <else>
+ <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+ <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
<group delimiter=". ">
<group delimiter=", ">
<choose>
- <if variable="number container-title" match="none">
- <!-- If no number or container-title, then assume it is a hearing -->
- <text variable="title" font-style="italic"/>
- </if>
- <else>
+ <if type="bill legal_case legislation" match="any">
<text variable="title"/>
- </else>
+ </if>
+ <else-if type="hearing">
+ <text variable="title" font-style="italic"/>
+ </else-if>
</choose>
<group delimiter=" ">
<text macro="container-legal"/>
<text macro="date-legal"/>
<choose>
- <if variable="number container-title" match="none">
- <!-- If no number or container-title, then assume it is a hearing -->
+ <if type="hearing">
<names variable="author" prefix="(testimony of " suffix=")">
+ <!-- TODO: Localize this with the hearing term. -->
<name and="symbol" delimiter=", "/>
</names>
</if>
- <else>
+ <else-if type="bill legislation" match="any">
+ <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
<text variable="status" prefix="(" suffix=")"/>
- </else>
+ </else-if>
</choose>
</group>
<text variable="references"/>
</group>
<text macro="access"/>
</group>
- </else-if>
- <else-if type="legislation">
- <!-- Currently designed to handle statutes, codified regulations, executive orders.
- For uncodified regulations, assume future code section is in status. -->
- <group delimiter=". ">
- <group delimiter=", ">
- <text variable="title"/>
- <group delimiter=" ">
- <text macro="container-legal"/>
- <text macro="date-legal"/>
- <text variable="status" prefix="(" suffix=")"/>
- </group>
- <text variable="references"/>
- </group>
- <text macro="access"/>
- </group>
- </else-if>
- <else-if type="treaty">
- <!-- APA generally defers to Bluebook for legal citations, but diverges without
- explanation for treaty items. The Bluebook format that was used in APA 6th
- ed. is used here. -->
- <group delimiter=", ">
- <text variable="title" text-case="title"/>
- <names variable="author">
- <name initialize-with="." form="short" delimiter="-"/>
- </names>
- <text macro="date-legal"/>
- <text macro="container-legal"/>
- <text macro="access"/>
- </group>
- </else-if>
+ </else>
</choose>
</macro>
<macro name="date-legal">
+ <!-- TODO: Add new item types -->
<choose>
<if type="legal_case">
<group prefix="(" suffix=")" delimiter=" ">
@@ -1712,7 +1496,7 @@
</choose>
</group>
</if>
- <else-if type="bill legislation" match="any">
+ <else-if type="bill legislation hearing" match="any">
<group prefix="(" suffix=")" delimiter=" ">
<group delimiter=" ">
<date variable="original-date">
@@ -1731,6 +1515,7 @@
</choose>
</macro>
<macro name="container-legal">
+ <!-- TODO: Add new item types -->
<!-- Expect legal item container-titles to be stored in short form -->
<choose>
<if type="legal_case">
@@ -1741,8 +1526,7 @@
<text variable="volume"/>
<text variable="container-title"/>
<group delimiter=" ">
- <!-- Change to label variable="section" as that becomes available -->
- <text term="section" form="symbol"/>
+ <label variable="section" form="symbol"/>
<text variable="section"/>
</group>
<choose>
@@ -1759,8 +1543,7 @@
<group delimiter=" ">
<choose>
<if is-numeric="number">
- <!-- Replace with label variable="number" if that becomes available -->
- <text term="issue" form="short" text-case="capitalize-first"/>
+ <label variable="number" form="short" text-case="capitalize-first"/>
</if>
</choose>
<text variable="number"/>
@@ -1776,8 +1559,7 @@
<group delimiter=" ">
<choose>
<if variable="chapter-number container-title" match="none">
- <!-- Replace with label variable="number" as that becomes available -->
- <text term="issue" form="short"/>
+ <label variable="number" form="short"/>
</if>
</choose>
<text variable="number"/>
@@ -1812,7 +1594,7 @@
<choose>
<if variable="section">
<group delimiter=" ">
- <!-- Change to label variable="section" as that becomes available -->
+ <!-- TODO: Change to label variable="section" -->
<text term="section" form="symbol"/>
<text variable="section"/>
</group>
@@ -1835,8 +1617,7 @@
</if>
<else>
<group delimiter=" ">
- <!-- Replace with label variable="number" if that becomes available -->
- <text term="issue" form="short" text-case="capitalize-first"/>
+ <label variable="number" form="short" text-case="capitalize-first"/>
<text variable="number"/>
</group>
</else>
@@ -1846,6 +1627,7 @@
</choose>
</macro>
<macro name="citation-locator">
+ <!-- TODO: Add new locator types? -->
<group delimiter=" ">
<choose>
<if locator="chapter">
@@ -1883,6 +1665,7 @@
</sort>
<layout>
<choose>
+ <!-- TODO: Add new item types -->
<if type="bill legal_case legislation treaty" match="any">
<!-- Legal items have different orders and delimiters -->
<choose>
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/styles/modern-language-association.csl b/Master/texmf-dist/tex/latex/citation-style-language/styles/modern-language-association.csl
index fcb9845c4c0..8fe62060ec9 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/styles/modern-language-association.csl
+++ b/Master/texmf-dist/tex/latex/citation-style-language/styles/modern-language-association.csl
@@ -9,10 +9,13 @@
<author>
<name>Sebastian Karcher</name>
</author>
+ <contributor>
+ <name>Patrick O'Brien</name>
+ </contributor>
<category citation-format="author"/>
<category field="generic-base"/>
<summary>This style adheres to the MLA 9th edition handbook. Follows the structure of references as outlined in the MLA Manual closely</summary>
- <updated>2022-04-24T09:59:40-04:00</updated>
+ <updated>2023-07-24T10:57:53+02:00</updated>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
</info>
<locale xml:lang="en">
@@ -195,9 +198,18 @@
</macro>
<macro name="publisher">
<choose>
- <if type="article-magazine article-newspaper article-journal" match="none">
- <text variable="publisher"/>
+ <if type="thesis" match="any">
+ <group delimiter=". ">
+ <date variable="issued" form="numeric" date-parts="year"/>
+ <group delimiter=", ">
+ <text variable="publisher"/>
+ <text variable="genre"/>
+ </group>
+ </group>
</if>
+ <else-if type="article-magazine article-newspaper article-journal" match="none">
+ <text variable="publisher"/>
+ </else-if>
</choose>
</macro>
<macro name="publication-date">
@@ -208,7 +220,7 @@
<else-if type="article-journal" match="any">
<date variable="issued" form="text" date-parts="year-month"/>
</else-if>
- <else-if type="speech" match="none">
+ <else-if type="speech thesis" match="none">
<date variable="issued" form="text"/>
</else-if>
</choose>