Merge pull request tectonic-typesetting#259 from burrbull/xete_consts_other

Xetex consts, functions & Option for pointers

Author: burrbull

Cargo.lock

@@ -17,6 +17,7 @@ rand = "0.7.2"
 chrono = "0.4.9"
 euclid = "0.20"
 indexmap = "1.3.0"
+png = "0.16"
 
 [features]
 default = ['libz-sys']

dpx/Cargo.toml

@@ -354,7 +354,7 @@ fn p_dtoa(mut value: f64, prec: i32, buf: &mut [u8]) -> usize {
             if !(fresh4 != 0) {
                 break;
             }
-            buf[n + 1 + j as usize] = (g % 10) as u8 + b'0';
+            buf[n + 1 + j as usize] = ((g % 10) as u8).wrapping_add(b'0'); // TODO: check
             g /= 10
         }
         n += 1 + prec as usize;

dpx/src/dpx_pdfdev.rs

@@ -33,6 +33,8 @@ chrono = "0.4.9"
 harfbuzz-sys = {version = "^0.3", default-features = false}
 freetype-rs = "0.23.0"
 euclid = "0.20"
+enumn = "0.1.2"
+derive_more = "0.99.7"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = "0.7.0"

engine/Cargo.toml

@@ -1,5 +1,5 @@
 #![feature(extern_types)]
-#![feature(ptr_wrapping_offset_from)]
+#![feature(ptr_offset_from)]
 #![allow(
     dead_code,
     mutable_transmutes,
@@ -653,3 +653,49 @@ pub(crate) mod cf_prelude {
         return rval;
     }
 }
+
+#[macro_export]
+macro_rules! help(
+    () => {
+        crate::xetex_ini::help_ptr = 0;
+    };
+    ($s0: expr) => {
+        crate::xetex_ini::help_ptr = 1;
+        crate::xetex_ini::help_line[0] = $s0;
+    };
+    ($s1: expr, $s0: expr) => {
+        crate::xetex_ini::help_ptr = 2;
+        crate::xetex_ini::help_line[1] = $s1;
+        crate::xetex_ini::help_line[0] = $s0;
+    };
+    ($s2: expr, $s1: expr, $s0: expr) => {
+        crate::xetex_ini::help_ptr = 3;
+        crate::xetex_ini::help_line[2] = $s2;
+        crate::xetex_ini::help_line[1] = $s1;
+        crate::xetex_ini::help_line[0] = $s0;
+    };
+    ($s3: expr, $s2: expr, $s1: expr, $s0: expr) => {
+        crate::xetex_ini::help_ptr = 4;
+        crate::xetex_ini::help_line[3] = $s3;
+        crate::xetex_ini::help_line[2] = $s2;
+        crate::xetex_ini::help_line[1] = $s1;
+        crate::xetex_ini::help_line[0] = $s0;
+    };
+    ($s4: expr, $s3: expr, $s2: expr, $s1: expr, $s0: expr) => {
+        crate::xetex_ini::help_ptr = 5;
+        crate::xetex_ini::help_line[4] = $s4;
+        crate::xetex_ini::help_line[3] = $s3;
+        crate::xetex_ini::help_line[2] = $s2;
+        crate::xetex_ini::help_line[1] = $s1;
+        crate::xetex_ini::help_line[0] = $s0;
+    };
+    ($s5: expr, $s4: expr, $s3: expr, $s2: expr, $s1: expr, $s0: expr) => {
+        crate::xetex_ini::help_ptr = 6;
+        crate::xetex_ini::help_line[5] = $s5;
+        crate::xetex_ini::help_line[4] = $s4;
+        crate::xetex_ini::help_line[3] = $s3;
+        crate::xetex_ini::help_line[2] = $s2;
+        crate::xetex_ini::help_line[1] = $s1;
+        crate::xetex_ini::help_line[0] = $s0;
+    };
+);