Skip to content

Commit 6544d9c

Browse files
committed
Fix deps
1 parent de585e4 commit 6544d9c

2 files changed

Lines changed: 19 additions & 13 deletions

File tree

.github/workflows/test.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,18 @@ jobs:
5757
uses: actions/checkout@v6
5858

5959
- name: Set up TeX Live ${{ matrix.version }}
60+
if: ${{ matrix.version >= 2021 }}
6061
uses: TeX-Live/setup-texlive-action@v3
6162
with:
6263
version: ${{ matrix.version }}
63-
# package-file: .github/tl_packages_${{ matrix.version }}
6464
package-file: .github/tl_packages
65+
66+
- name: Set up TeX Live ${{ matrix.version }}
67+
if: ${{ matrix.version < 2021 }}
68+
uses: TeX-Live/setup-texlive-action@v3
69+
with:
70+
version: ${{ matrix.version }}
71+
package-file: .github/tl_packages_${{ matrix.version }}
6572
# uses: zauguin/install-texlive@v4
6673
# with:
6774
# texlive_version: ${{ matrix.version }}

ustcthesis.cls

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,21 +113,20 @@
113113
degree .choices:nn =
114114
{ doctor , master , bachelor }
115115
{
116-
% To be compatible with TeX Live 2017 (2018-08-23):
117-
% \str_set:NV -> \str_set:NV
118-
\str_set:NV \l__ustc_degree_str \l_keys_value_tl
116+
% Make compatible with TeX Live 2017 (2017/05/13):
117+
\exp_args:NNV \str_set:Nn \l__ustc_degree_str \l_keys_choice_tl
119118
\str_if_eq:VnTF \l__ustc_degree_str { bachelor }
120119
{ \bool_set_false:N \l__ustc_degree_graduate_bool }
121120
{ \bool_set_true:N \l__ustc_degree_graduate_bool }
122121
\l__ustc_degree_hook_tl
123122
} ,
124123
degree-type .choices:nn =
125124
{ academic , professional , engineering }
126-
{ \str_set:NV \l__ustc_degree_type_str \l_keys_value_tl } ,
125+
{ \exp_args:NNV \str_set:Nn \l__ustc_degree_type_str \l_keys_choice_tl } ,
127126
language .choices:nn =
128127
{ chinese , english }
129128
{
130-
\str_set:NV \l__ustc_language_str \l_keys_value_tl
129+
\exp_args:NNV \str_set:Nn \l__ustc_language_str \l_keys_choice_tl
131130
\str_if_eq:VnTF \l__ustc_language_str { chinese }
132131
{ \bool_set_true:N \l__ustc_language_chinese_bool }
133132
{ \bool_set_false:N \l__ustc_language_chinese_bool }
@@ -137,29 +136,29 @@
137136
reviewer .bool_set:N = \l__ustc_reviewer_bool ,
138137
fontset .choices:nn =
139138
{ auto , windows , mac , ubuntu , fandol , none }
140-
{ \str_set:NV \l__ustc_fontset_str \l_keys_value_tl } ,
139+
{ \exp_args:NNV \str_set:Nn \l__ustc_fontset_str \l_keys_choice_tl } ,
141140
font .choices:nn =
142141
{ auto , times , termes , stix , xits , libertinus , newcm , lm , newtx , cm , none }
143142
{
144-
\str_set:NV \l__ustc_font_str \l_keys_value_tl
143+
\exp_args:NNV \str_set:Nn \l__ustc_font_str \l_keys_choice_tl
145144
\l__ustc_font_hook_tl
146145
} ,
147146
cjk-font .choices:nn =
148147
{ auto , windows , mac , noto , fandol , none }
149148
{
150-
\str_set:NV \l__ustc_cjk_font_str \l_keys_value_tl
149+
\exp_args:NNV \str_set:Nn \l__ustc_cjk_font_str \l_keys_choice_tl
151150
\l__ustc_cjk_font_hook_tl
152151
} ,
153152
math-font .choices:nn =
154153
{ auto , stix , xits , libertinus , newcm , cm , lm , newtx , none }
155154
{
156-
\str_set:NV \l__ustc_math_font_str \l_keys_value_tl
155+
\exp_args:NNV \str_set:Nn \l__ustc_math_font_str \l_keys_choice_tl
157156
\l__ustc_math_font_hook_tl
158157
} ,
159158
math-style .choices:nn =
160159
{ TeX, ISO , GB }
161160
{
162-
\str_set:NV \l__ustc_math_style_str \l_keys_value_tl
161+
\exp_args:NNV \str_set:Nn \l__ustc_math_style_str \l_keys_choice_tl
163162
\l__ustc_math_style_hook_tl
164163
} ,
165164
uppercase-greek .choice: ,
@@ -185,7 +184,7 @@
185184
{ \bool_set_false:N \l__ustc_partial_upright_bool } ,
186185
math-ellipsis .choices:nn =
187186
{ centered , lower , AMS }
188-
{ \str_set:NV \l__ustc_math_ellipsis_str \l_keys_value_tl } ,
187+
{ \exp_args:NNV \str_set:Nn \l__ustc_math_ellipsis_str \l_keys_choice_tl } ,
189188
real-part .choice: ,
190189
real-part / roman .code:n =
191190
{ \bool_set_true:N \l__ustc_real_part_roman_bool } ,
@@ -194,7 +193,7 @@
194193
cite-style .choices:nn =
195194
{ super , inline , authoryear }
196195
{
197-
\str_set:NV \l__ustc_cite_style_str \l_keys_value_tl
196+
\exp_args:NNV \str_set:Nn \l__ustc_cite_style_str \l_keys_choice_tl
198197
\l__ustc_cite_style_hook_tl
199198
} ,
200199
output .choice: ,

0 commit comments

Comments
 (0)