Port mag_set variable

Author: CraftSpider

crates/engine_xetex/src/c_api/engine.rs

@@ -190,7 +190,9 @@ pub const INTER_CHAR_TEXT: u16 = 17;
 pub const WRITE_TEXT: u16 = 18;
 pub const TECTONIC_CODA_TEXT: u16 = 19;
 
+pub const EOP: u8 = 140;
 pub const POP: u8 = 142;
+pub const POST: u8 = 248;
 
 pub const TOKEN_LIST: u16 = 0;
 
@@ -239,6 +241,7 @@ pub struct EngineCtx {
     pub(crate) use_err_help: bool,
     pub(crate) help_ptr: usize,
     pub(crate) help_line: [*const libc::c_char; 6],
+    pub(crate) mag_set: i32,
 
     pub(crate) eqtb: Vec<MemoryWord>,
     pub(crate) prim: Box<[B32x2; PRIM_SIZE + 1]>,
@@ -355,6 +358,7 @@ impl EngineCtx {
             use_err_help: false,
             help_ptr: 0,
             help_line: [ptr::null(); 6],
+            mag_set: 0,
 
             eqtb: Vec::new(),
             prim: Box::new([B32x2 { s0: 0, s1: 0 }; PRIM_SIZE + 1]),
@@ -897,6 +901,16 @@ pub extern "C" fn set_help_line(idx: usize, ptr: *const libc::c_char) {
     ENGINE_CTX.with_borrow_mut(|engine| engine.help_line[idx] = ptr)
 }
 
+#[no_mangle]
+pub extern "C" fn mag_set() -> i32 {
+    ENGINE_CTX.with_borrow(|engine| engine.mag_set)
+}
+
+#[no_mangle]
+pub extern "C" fn set_mag_set(val: i32) {
+    ENGINE_CTX.with_borrow_mut(|engine| engine.mag_set = val)
+}
+
 #[no_mangle]
 pub extern "C" fn eqtb(idx: usize) -> MemoryWord {
     ENGINE_CTX.with_borrow(|engine| engine.eqtb[idx])

crates/engine_xetex/xetex/xetex-ini.c

@@ -83,7 +83,6 @@ int32_t max_save_stack;
 uint16_t cur_level;
 group_code cur_group;
 int32_t cur_boundary;
-int32_t mag_set;
 eight_bits cur_cmd;
 int32_t cur_chr;
 int32_t cur_cs;
@@ -3066,7 +3065,7 @@ initialize_more_variables(void)
     cur_group = BOTTOM_LEVEL;
     cur_boundary = 0;
     max_save_stack = 0;
-    mag_set = 0;
+    set_mag_set(0);
     expand_depth_count = 0;
     is_in_csname = false;
     cur_mark[TOP_MARK_CODE] = TEX_NULL;

crates/engine_xetex/xetex/xetex-xetex0.c

@@ -4449,22 +4449,22 @@ void unsave(void)
 void prepare_mag(void)
 {
 
-    if (mag_set > 0 && INTPAR(mag) != mag_set) {
+    if (mag_set() > 0 && INTPAR(mag) != mag_set()) {
         ttbc_diagnostic_t *errmsg = error_here_with_diagnostic("Incompatible magnification (");
         print_int(INTPAR(mag));
         print_cstr(");");
         print_nl_cstr(" the previous value will be retained");
 
-        ttstub_diag_printf(errmsg, " (%d)", mag_set);
+        ttstub_diag_printf(errmsg, " (%d)", mag_set());
         capture_to_diagnostic(NULL);
 
         {
             set_help_ptr(2);
             set_help_line(1, "I can handle only one magnification ratio per job. So I've");
             set_help_line(0, "reverted to the magnification you used earlier on this run.");
         }
-        int_error(mag_set);
-        geq_word_define(INT_BASE + INT_PAR__mag, mag_set);
+        int_error(mag_set());
+        geq_word_define(INT_BASE + INT_PAR__mag, mag_set());
     }
     if ((INTPAR(mag) <= 0) || (INTPAR(mag) > 32768L)) {
         ttbc_diagnostic_t *errmsg = error_here_with_diagnostic("Illegal magnification has been changed to 1000");
@@ -4478,7 +4478,7 @@ void prepare_mag(void)
         int_error(INTPAR(mag));
         geq_word_define(INT_BASE + INT_PAR__mag, 1000);
     }
-    mag_set = INTPAR(mag);
+    set_mag_set(INTPAR(mag));
 }
 
 void print_meaning(void)

crates/engine_xetex/xetex/xetex-xetexd.h

@@ -443,7 +443,6 @@ extern int32_t max_save_stack;
 extern uint16_t cur_level;
 extern group_code cur_group;
 extern int32_t cur_boundary;
-extern int32_t mag_set;
 extern eight_bits cur_cmd;
 extern int32_t cur_chr;
 extern int32_t cur_cs;

crates/engine_xetex/xetex/xetex_bindings.h

@@ -359,8 +359,12 @@
 
 #define TECTONIC_CODA_TEXT 19
 
+#define EOP 140
+
 #define POP 142
 
+#define POST 248
+
 #define TOKEN_LIST 0
 
 #define MAX_CHAR_VAL 2097152
@@ -696,6 +700,10 @@ const char *help_line(uintptr_t idx);
 
 void set_help_line(uintptr_t idx, const char *ptr);
 
+int32_t mag_set(void);
+
+void set_mag_set(int32_t val);
+
 MemoryWord eqtb(uintptr_t idx);
 
 void set_eqtb(uintptr_t idx, MemoryWord val);
@@ -764,7 +772,7 @@ void error(void);
 
 void post_error_message(int32_t need_to_print_it);
 
-void fatal_error(void);
+void fatal_error(const char *s);
 
 extern void close_files_and_terminate(void);