Fixup warning

zepinglee · Jul 25, 2024 · dffd1ec · dffd1ec
1 parent fba4aa9
commit dffd1ec
Show file tree

Hide file tree

Showing 16 changed files with 70 additions and 68 deletions.
diff --git a/latex/citation-style-language-init.sty b/latex/citation-style-language-init.sty
@@ -28,13 +28,15 @@
   {
     \tl_if_empty:NT \l__csl_style_tl
       { \tl_set_eq:NN \l__csl_style_tl \g__csl_aux_bibstyle_tl }
-    \tl_if_empty:NT \l__csl_style_tl
+    \tl_if_empty:NTF \l__csl_style_tl
       {
         \msg_warning:nn { citation-style-language } { missing-style-name }
         \tl_set:Nn \l__csl_style_tl { apa }
       }
+      {
+        \exp_args:NV \__csl_write_aux_bibstyle:n \l__csl_style_tl
+      }
     \tl_set_eq:NN \csl@style \l__csl_style_tl
-    \exp_args:NV \__csl_write_aux_bibstyle:n \l__csl_style_tl
     \clist_if_empty:NT \l__csl_bib_resources_clist
       { \clist_set_eq:NN \l__csl_bib_resources_clist \g__csl_aux_bib_files_clist }
     \exp_args:Nx \__csl_write_aux_bibdata:n

diff --git a/tests/latex/pdftex-1/annotated-bibliography.tlg b/tests/latex/pdftex-1/annotated-bibliography.tlg
@@ -3,7 +3,7 @@ Don't change this file in any respect.
 ============================================================
 TEST 1: Citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={barber2016work-life,carlson2019double@1},citationItems={{id={barber2016work-life}},{id={carlson2019double}}},properties={noteIndex={1}}.
+> \l__csl_citation_info_tl=citationID={barber2016work-life,carlson2019double@1},citationItems={{id={barber2016work-life}},{id={carlson2019double}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `barber2016work-life' on page 1 undefined on input line ....

diff --git a/tests/latex/pdftex-1/bib-filter.tlg b/tests/latex/pdftex-1/bib-filter.tlg
@@ -3,7 +3,7 @@ Don't change this file in any respect.
 ============================================================
 TEST 1: Citations
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2,ITEM-3,ITEM-4@1},citationItems={{id={ITEM-1}},{id={ITEM-2}},{id={ITEM-3}},{id={ITEM-4}}},properties={noteIndex={1}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2,ITEM-3,ITEM-4@1},citationItems={{id={ITEM-1}},{id={ITEM-2}},{id={ITEM-3}},{id={ITEM-4}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....

diff --git a/tests/latex/pdftex-1/bibstyle-in-preamble.tlg b/tests/latex/pdftex-1/bibstyle-in-preamble.tlg
@@ -20,7 +20,7 @@ No file bibstyle-in-preamble.bbl.
 ============================================================
 TEST 1: Single cite item in a citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={1}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -31,7 +31,7 @@ l. ...}
 ============================================================
 TEST 2: Multiple cite items in a citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@1},citationItems={{id={ITEM-1}},{id={ITEM-2}}},properties={noteIndex={2}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@1},citationItems={{id={ITEM-1}},{id={ITEM-2}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -43,7 +43,7 @@ l. ...}
 ============================================================
 TEST 3: Citation with page locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@2},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={3}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@2},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -54,7 +54,7 @@ l. ...}
 ============================================================
 TEST 4: Citation with section locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@3},citationItems={{id={ITEM-1},label={section},locator={2.3}}},properties={noteIndex={4}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@3},citationItems={{id={ITEM-1},label={section},locator={2.3}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -65,7 +65,7 @@ l. ...}
 ============================================================
 TEST 5: Citation with implicit page locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@4},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={5}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@4},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -76,7 +76,7 @@ l. ...}
 ============================================================
 TEST 6: Citation with prefix and suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@5},citationItems={{id={ITEM-1},prefix={prefix },suffix={ suffix}}},properties={noteIndex={6}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@5},citationItems={{id={ITEM-1},prefix={prefix },suffix={ suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -87,7 +87,7 @@ l. ...}
 ============================================================
 TEST 7: Citation with implicit prefix and suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@6},citationItems={{id={ITEM-1},prefix={prefix },suffix={, suffix}}},properties={noteIndex={7}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@6},citationItems={{id={ITEM-1},prefix={prefix },suffix={, suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -98,7 +98,7 @@ l. ...}
 ============================================================
 TEST 8: Citation with implicit suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@7},citationItems={{id={ITEM-1},suffix={, suffix}}},properties={noteIndex={8}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@7},citationItems={{id={ITEM-1},suffix={, suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -109,7 +109,7 @@ l. ...}
 ============================================================
 TEST 9: Citation with implicit prefix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@8},citationItems={{id={ITEM-1},prefix={prefix }}},properties={noteIndex={9}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@8},citationItems={{id={ITEM-1},prefix={prefix }}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -142,7 +142,7 @@ l. ...}
 ============================================================
 TEST 12: Multiple cite items with options
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@2},citationItems={{id={ITEM-1},prefix={See },label={page},locator={6}},{id={ITEM-2},label={figure},locator={2}}},properties={noteIndex={12}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@2},citationItems={{id={ITEM-1},prefix={See },label={page},locator={6}},{id={ITEM-2},label={figure},locator={2}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....

diff --git a/tests/latex/pdftex-1/bibstyle.tlg b/tests/latex/pdftex-1/bibstyle.tlg
@@ -4,7 +4,7 @@ Don't change this file in any respect.
 ============================================================
 TEST 1: Single cite item in a citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={1}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -15,7 +15,7 @@ l. ...}
 ============================================================
 TEST 2: Multiple cite items in a citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@1},citationItems={{id={ITEM-1}},{id={ITEM-2}}},properties={noteIndex={2}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@1},citationItems={{id={ITEM-1}},{id={ITEM-2}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -27,7 +27,7 @@ l. ...}
 ============================================================
 TEST 3: Citation with page locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@2},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={3}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@2},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -38,7 +38,7 @@ l. ...}
 ============================================================
 TEST 4: Citation with section locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@3},citationItems={{id={ITEM-1},label={section},locator={2.3}}},properties={noteIndex={4}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@3},citationItems={{id={ITEM-1},label={section},locator={2.3}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -49,7 +49,7 @@ l. ...}
 ============================================================
 TEST 5: Citation with implicit page locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@4},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={5}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@4},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -60,7 +60,7 @@ l. ...}
 ============================================================
 TEST 6: Citation with prefix and suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@5},citationItems={{id={ITEM-1},prefix={prefix },suffix={ suffix}}},properties={noteIndex={6}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@5},citationItems={{id={ITEM-1},prefix={prefix },suffix={ suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -71,7 +71,7 @@ l. ...}
 ============================================================
 TEST 7: Citation with implicit prefix and suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@6},citationItems={{id={ITEM-1},prefix={prefix },suffix={, suffix}}},properties={noteIndex={7}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@6},citationItems={{id={ITEM-1},prefix={prefix },suffix={, suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -82,7 +82,7 @@ l. ...}
 ============================================================
 TEST 8: Citation with implicit suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@7},citationItems={{id={ITEM-1},suffix={, suffix}}},properties={noteIndex={8}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@7},citationItems={{id={ITEM-1},suffix={, suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -93,7 +93,7 @@ l. ...}
 ============================================================
 TEST 9: Citation with implicit prefix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@8},citationItems={{id={ITEM-1},prefix={prefix }}},properties={noteIndex={9}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@8},citationItems={{id={ITEM-1},prefix={prefix }}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -126,7 +126,7 @@ l. ...}
 ============================================================
 TEST 12: Multiple cite items with options
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@2},citationItems={{id={ITEM-1},prefix={See },label={page},locator={6}},{id={ITEM-2},label={figure},locator={2}}},properties={noteIndex={12}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@2},citationItems={{id={ITEM-1},prefix={See },label={page},locator={6}},{id={ITEM-2},label={figure},locator={2}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....

diff --git a/tests/latex/pdftex-1/data-yaml.tlg b/tests/latex/pdftex-1/data-yaml.tlg
@@ -4,7 +4,7 @@ Don't change this file in any respect.
 ============================================================
 TEST 1: Single cite item in a citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={1}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@1},citationItems={{id={ITEM-1}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -15,7 +15,7 @@ l. ...}
 ============================================================
 TEST 2: Multiple cite items in a citation
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@1},citationItems={{id={ITEM-1}},{id={ITEM-2}}},properties={noteIndex={2}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@1},citationItems={{id={ITEM-1}},{id={ITEM-2}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -27,7 +27,7 @@ l. ...}
 ============================================================
 TEST 3: Citation with page locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@2},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={3}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@2},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -38,7 +38,7 @@ l. ...}
 ============================================================
 TEST 4: Citation with section locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@3},citationItems={{id={ITEM-1},label={section},locator={2.3}}},properties={noteIndex={4}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@3},citationItems={{id={ITEM-1},label={section},locator={2.3}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -49,7 +49,7 @@ l. ...}
 ============================================================
 TEST 5: Citation with implicit page locator
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@4},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={5}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@4},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -60,7 +60,7 @@ l. ...}
 ============================================================
 TEST 6: Citation with prefix and suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@5},citationItems={{id={ITEM-1},prefix={prefix },suffix={ suffix}}},properties={noteIndex={6}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@5},citationItems={{id={ITEM-1},prefix={prefix },suffix={ suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -71,7 +71,7 @@ l. ...}
 ============================================================
 TEST 7: Citation with implicit prefix and suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@6},citationItems={{id={ITEM-1},prefix={prefix },suffix={, suffix}}},properties={noteIndex={7}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@6},citationItems={{id={ITEM-1},prefix={prefix },suffix={, suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -82,7 +82,7 @@ l. ...}
 ============================================================
 TEST 8: Citation with implicit suffix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@7},citationItems={{id={ITEM-1},suffix={, suffix}}},properties={noteIndex={8}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@7},citationItems={{id={ITEM-1},suffix={, suffix}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -93,7 +93,7 @@ l. ...}
 ============================================================
 TEST 9: Citation with implicit prefix
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1@8},citationItems={{id={ITEM-1},prefix={prefix }}},properties={noteIndex={9}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1@8},citationItems={{id={ITEM-1},prefix={prefix }}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....
@@ -126,7 +126,7 @@ l. ...}
 ============================================================
 TEST 12: Multiple cite items with options
 ============================================================
-> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@2},citationItems={{id={ITEM-1},prefix={See },label={page},locator={6}},{id={ITEM-2},label={figure},locator={2}}},properties={noteIndex={12}}.
+> \l__csl_citation_info_tl=citationID={ITEM-1,ITEM-2@2},citationItems={{id={ITEM-1},prefix={See },label={page},locator={6}},{id={ITEM-2},label={figure},locator={2}}},properties={noteIndex={0}}.
 <recently read> }
 l. ...}
 LaTeX Warning: Citation `ITEM-1' on page 1 undefined on input line ....