Browse Source

remove deprecated expl3 constants

master
Jonathan Spratte 8 months ago
parent
commit
61a8ad01b4
4 changed files with 16 additions and 17 deletions
  1. BIN
      Doc/doc_MRTbundle.pdf
  2. 4
    4
      Doc/preamble/doc_macros.tex
  3. 7
    6
      MRTtab/MRTtab.sty
  4. 5
    7
      MRTthesis/MRTthesis.cls

BIN
Doc/doc_MRTbundle.pdf View File


+ 4
- 4
Doc/preamble/doc_macros.tex View File

@@ -49,7 +49,7 @@
49 49
 \ExplSyntaxOn
50 50
 \int_new:N \g_docMRTbundle_dsctable_lines_int
51 51
 \int_new:N \l_docMRTbundle_fakeit_level_int
52
-\int_set:Nn \l_docMRTbundle_fakeit_level_int { -\c_one }
52
+\int_set:Nn \l_docMRTbundle_fakeit_level_int { -\c_one_int }
53 53
 \dim_new:N \l_docMRTbundle_dscmac_widest_dim
54 54
 \dim_new:N \l_docMRTbundle_dscmac_indent_dim
55 55
 \dim_new:N \l_docMRTbundle_fakeit_indent_dim
@@ -464,7 +464,7 @@
464 464
   {% begin >>=
465 465
     \dim_set:Nn \l_docMRTbundle_fakeit_indent_dim { 2em }
466 466
     \int_incr:N \l_docMRTbundle_fakeit_level_int
467
-    \int_compare:nNnT { \l_docMRTbundle_fakeit_level_int } = { \c_zero }
467
+    \int_compare:nNnT { \l_docMRTbundle_fakeit_level_int } = { \c_zero_int }
468 468
       { \null\\[\dimexpr.9ex-\baselineskip\relax] }
469 469
     \cs_set_protected:Npn \item
470 470
       {
@@ -474,12 +474,12 @@
474 474
         \makebox[2em][c]
475 475
           {
476 476
             \clist_item:Nn \l_docMRTbundle_fakeit_symbols_clist
477
-              { \l_docMRTbundle_fakeit_level_int + \c_one }
477
+              { \l_docMRTbundle_fakeit_level_int + \c_one_int }
478 478
           }
479 479
       }
480 480
   }%=<<
481 481
   {% end >>=
482
-    \int_compare:nNnTF { \l_docMRTbundle_fakeit_level_int } = { \c_zero }
482
+    \int_compare:nNnTF { \l_docMRTbundle_fakeit_level_int } = { \c_zero_int }
483 483
       { \null\\[1ex] }
484 484
       { \null\\[\dimexpr.1ex-\baselineskip\relax] }
485 485
   }%=<<

+ 7
- 6
MRTtab/MRTtab.sty View File

@@ -330,7 +330,7 @@
330 330
   }% =<<
331 331
 \cs_new_protected:Npn \MRTtab@@arraystarthook% >>=
332 332
   {
333
-    \int_gset:Nn \g__MRTtab_current_row_int { \c_zero }
333
+    \int_gzero:N \g__MRTtab_current_row_int
334 334
   }% =<<
335 335
 \cs_new_protected:Npn \MRTtab_step_row:% >>=
336 336
   {
@@ -420,7 +420,7 @@
420 420
   }% =<<
421 421
 \cs_new:Npn \MRTtab_head_start_inner:% >>=
422 422
   {
423
-    \int_compare:nNnF \g__MRTtab_current_row_int = \c_one
423
+    \int_compare:nNnF \g__MRTtab_current_row_int = \c_one_int
424 424
       { \MRTtab_surround_lines: }
425 425
     \headR
426 426
   }% =<<
@@ -432,7 +432,7 @@
432 432
         \noalign
433 433
           {
434 434
             \int_gset:Nn \g__MRTtab_color_upto_int
435
-              { \g__MRTtab_current_row_int + ##1 - \c_one }
435
+              { \g__MRTtab_current_row_int + ##1 - \c_one_int }
436 436
           }
437 437
       }
438 438
     \MRTtab_declare_head_macrosSRE:
@@ -465,7 +465,8 @@
465 465
     \int_compare:nNnTF \g__MRTtab_current_row_int > \g__MRTtab_color_upto_int
466 466
       {
467 467
         \int_compare:nNnT
468
-          { \g__MRTtab_color_upto_int + \c_one } = \g__MRTtab_current_row_int
468
+          { \g__MRTtab_color_upto_int + \c_one_int }
469
+          = \g__MRTtab_current_row_int
469 470
           { \headE\hline }
470 471
       }
471 472
       {
@@ -1133,7 +1134,7 @@
1133 1134
           \g__MRTtab_current_row_int > \g__MRTtab_color_upto_int
1134 1135
           {
1135 1136
             \int_compare:nNnT
1136
-              { \g__MRTtab_color_upto_int + \c_one }
1137
+              { \g__MRTtab_color_upto_int + \c_one_int }
1137 1138
               = \g__MRTtab_current_row_int
1138 1139
               { \headE\MRTtab_endhead: }
1139 1140
           }
@@ -1201,7 +1202,7 @@
1201 1202
               \endfoot
1202 1203
               \__MRTtab_show_rowcolors:
1203 1204
             }
1204
-          \int_compare:nNnTF \g__MRTtab_color_upto_int > \c_zero
1205
+          \int_compare:nNnTF \g__MRTtab_color_upto_int > \c_zero_int
1205 1206
             {
1206 1207
               \noalign { \int_gset:Nn \g__MRTtab_current_row_int { 1 } }
1207 1208
               \bool_if:NT \l_MRTtab_table_striped_bool

+ 5
- 7
MRTthesis/MRTthesis.cls View File

@@ -1167,9 +1167,7 @@
1167 1167
                   {
1168 1168
                     \clist_set:NV \l_MRTthesis_tmpa_clist \l_MRTthesis_tmpa_tl
1169 1169
                     \tl_set:Nx \l_MRTthesis_tmpb_tl
1170
-                      {
1171
-                        \clist_item:Nn \l_MRTthesis_tmpa_clist { \c_two }
1172
-                      }
1170
+                      { \clist_item:Nn \l_MRTthesis_tmpa_clist { 2 } }
1173 1171
                     \seq_set_split:NnV \l_MRTthesis_tmpb_seq
1174 1172
                       { ~ } \l_MRTthesis_tmpb_tl
1175 1173
                     \bool_while_do:nn
@@ -1202,13 +1200,13 @@
1202 1200
                             \seq_if_empty:NTF \l_MRTthesis_tmpb_seq { ~ } { \, }
1203 1201
                           }
1204 1202
                       }
1205
-                    \clist_item:Nn \l_MRTthesis_tmpa_clist { \c_one }
1203
+                    \clist_item:Nn \l_MRTthesis_tmpa_clist { \c_one_int }
1206 1204
                   }
1207 1205
                   {
1208 1206
                     \seq_set_split:NnV \l_MRTthesis_tmpb_seq
1209 1207
                       { ~ } \l_MRTthesis_tmpa_tl
1210 1208
                     \int_step_inline:nn
1211
-                      { \seq_count:N \l_MRTthesis_tmpb_seq - \c_one }
1209
+                      { \seq_count:N \l_MRTthesis_tmpb_seq - \c_one_int }
1212 1210
                       {
1213 1211
                         \tl_set:Nx \l_MRTthesis_tmpb_tl
1214 1212
                           { \seq_item:Nn \l_MRTthesis_tmpb_seq { ##1 } }
@@ -1226,7 +1224,7 @@
1226 1224
                                 \seq_if_empty:NTF \l_MRTthesis_tmpc_seq
1227 1225
                                   {
1228 1226
                                     \int_compare:nNnTF
1229
-                                      { ##1 + \c_one } <
1227
+                                      { ##1 + \c_one_int } <
1230 1228
                                       { \seq_count:N \l_MRTthesis_tmpb_seq }
1231 1229
                                       { \, } { ~ }
1232 1230
                                   }
@@ -1237,7 +1235,7 @@
1237 1235
                             \exp_after:wN \MRTthesis_only_first_token:w
1238 1236
                               \l_MRTthesis_tmpb_tl \q_nil.\@
1239 1237
                             \int_compare:nNnTF
1240
-                              { ##1 + \c_one } <
1238
+                              { ##1 + \c_one_int } <
1241 1239
                               { \seq_count:N \l_MRTthesis_tmpb_seq }
1242 1240
                               { \, } { ~ }
1243 1241
                           }

Loading…
Cancel
Save