Skip to content

Commit fc67e32

Browse files
committed
revert to TL25 release plus one-line fix "is_new_mathfont(g)" from Khaled answer to https://tex.stackexchange.com/questions/738724
git-svn-id: svn://tug.org/texlive/branches/branch2025/Build/source@74657 c570f23f-e606-0410-a88d-b1316a301751
1 parent 2c79ef8 commit fc67e32

File tree

8 files changed

+96
-139
lines changed

8 files changed

+96
-139
lines changed

texk/web2c/luatexdir/ChangeLog

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
2025-03-15 Luigi Scarso <luigi.scarso@gmail.com>
2-
* : italicsmode fix for eight bit fonts (H.Hagen)
3-
4-
2025-03-13 Luigi Scarso <luigi.scarso@gmail.com>
5-
* extra italicsmode (large operator italic spacing) (H.Hagen)
6-
7-
81
2025-02-28 Akira Kakuto <kakuto@jcom.zaq.ne.jp>
92
* luatex.c: Remove problematic lines for windows
103

texk/web2c/luatexdir/luatex.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
stick to "0" upto "9" so users can expect a number represented as string.
3333
*/
3434

35-
int luatex_version = 122;
35+
int luatex_version = 121;
3636
int luatex_revision = '0';
37-
const char *luatex_version_string = "1.22.0";
37+
const char *luatex_version_string = "1.21.0";
3838
const char *engine_name = my_name;
3939

4040
#include <kpathsea/c-ctype.h>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#ifndef luatex_svn_revision_h
22
#define luatex_svn_revision_h
3-
#define luatex_svn_revision 7672
3+
#define luatex_svn_revision 7667
44
#endif

texk/web2c/luatexdir/tex/commands.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ void initialize_commands(void)
746746
primitive_luatex("pdfextension", extension_cmd, pdf_extension_code, 0);
747747
primitive_luatex("pdffeedback", feedback_cmd, pdf_feedback_code, 0);
748748
primitive_luatex("pdfvariable", variable_cmd, pdf_variable_code, 0);
749-
primitive_luatex("mathoption", option_cmd, 0, 0);
749+
primitive_luatex("mathoption", option_cmd, math_option_code, 0);
750750

751751
primitive_luatex("luacopyinputnodes", assign_int_cmd, int_base + copy_lua_input_nodes_code, int_base);
752752

texk/web2c/luatexdir/tex/dumpdata.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
3232
3333
*/
3434

35-
#define FORMAT_ID (907+60)
35+
#define FORMAT_ID (907+59)
3636
#if ((FORMAT_ID>=0) && (FORMAT_ID<=256))
3737
#error Wrong value for FORMAT_ID.
3838
#endif

texk/web2c/luatexdir/tex/equivalents.h

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,14 +315,25 @@ the |number_regs| \.{\\dimen} registers.
315315
# define show_stream_code 122
316316
# define math_eq_dir_mode_code 123
317317
# define var_fam_code 124
318+
318319
# define ignore_primitive_error_code 125 /*ignore some primitive/engine errors*/
320+
319321
# define math_empty_display_mode_code 126
320322

321-
# define backend_int_base_code (math_empty_display_mode_code+1)
323+
# define math_option_code 127
324+
325+
326+
# define mathoption_int_base_code (math_option_code+1) /* one reserve */
327+
# define mathoption_int_last_code (mathoption_int_base_code+8)
328+
329+
# define backend_int_base_code (mathoption_int_last_code+1)
322330
# define backend_int_last_code (backend_int_base_code+32) /* we need some 25 but take some slack */
323331

324332
# define tex_int_pars (backend_int_last_code+1) /* total number of integer parameters */
325333

334+
# define mathoption_int_base (int_base+mathoption_int_base_code)
335+
# define mathoption_int_last (int_base+mathoption_int_last_code)
336+
326337
# define backend_int_base (int_base+backend_int_base_code)
327338
# define backend_int_last (int_base+backend_int_last_code)
328339

@@ -460,6 +471,15 @@ extern void print_save_stack(void);
460471
# define loc_par(A) equiv(local_base+(A))
461472
# define glue_par(A) equiv(glue_base+(A))
462473

474+
typedef enum {
475+
c_mathoption_old_code = 0, /* this one is stable */
476+
/*
477+
c_mathoption_umathcode_meaning_code,
478+
*/
479+
} math_option_codes ;
480+
481+
# define mathoption_int_par(A) eqtb[mathoption_int_base+(A)].cint
482+
463483
/* if nonzero, this magnification should be used henceforth */
464484

465485
extern int mag_set;
@@ -763,6 +783,12 @@ extern halfword last_cs_name;
763783
#define error_context_lines_par int_par(error_context_lines_code)
764784
#define copy_lua_input_nodes_par int_par(copy_lua_input_nodes_code)
765785

786+
#define math_old_par mathoption_int_par(c_mathoption_old_code)
787+
788+
/*
789+
#define math_umathcode_meaning_par mathoption_int_par(c_mathoption_umathcode_meaning_code)
790+
*/
791+
766792
#define math_pre_display_gap_factor_par int_par(math_pre_display_gap_factor_code)
767793

768794
#define time_par int_par(time_code)

texk/web2c/luatexdir/tex/maincontrol.c

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -706,13 +706,32 @@ static void run_normal (void) {
706706
/*tex
707707
708708
This is experimental and not used for production, only for testing and writing
709-
macros (some options stay). It's now obsolete. We keep the cmd_code because it
710-
looks like hard coded numbers are used in macro packages.
709+
macros (some options stay).
711710
712711
*/
713712

713+
#define mathoption_set_int(A) \
714+
scan_int(); \
715+
word_define(mathoption_int_base+A, cur_val);
716+
714717
static void run_option(void) {
715-
normal_error("mathoption", "obsolete command");
718+
int a = 0 ;
719+
switch (cur_chr) {
720+
case math_option_code:
721+
if (scan_keyword("old")) {
722+
mathoption_set_int(c_mathoption_old_code);
723+
/*
724+
} else if (scan_keyword("umathcodemeaning")) {
725+
mathoption_set_int(c_mathoption_umathcode_meaning_code);
726+
*/
727+
} else {
728+
normal_warning("mathoption","unknown key");
729+
}
730+
break;
731+
default:
732+
/* harmless */
733+
break;
734+
}
716735
}
717736

718737
static void lua_function_call(void) {

0 commit comments

Comments
 (0)