@simonklee/opentui-tex-native-source 0.2.0 → 0.3.1

package/native/vendor/microtex/lib/wrapper/cwrapper.cpp

@@ -3,6 +3,7 @@
 #include "wrapper/cwrapper.h"
 
 #include "microtex.h"
+#include "core/parse_limits.h"
 #include "utils/log.h"
 #include "wrapper/graphic_wrapper.h"
 
@@ -136,16 +137,22 @@ MICROTEX_CAPI RenderPtr microtex_parseRender(
 #ifdef HAVE_LOG
   logv("parse: %s\n", tex);
 #endif
-  auto r = MicroTeX::parse(
-    tex,
-    width,
-    textSize,
-    lineSpace,
-    color,
-    fillWidth,
-    {enableOverrideTeXStyle, static_cast<TexStyle>(texStyle)}
-  );
-  return reinterpret_cast<RenderPtr>(r);
+  try {
+    parse_limits = {};
+    auto r = MicroTeX::parse(
+      tex,
+      width,
+      textSize,
+      lineSpace,
+      color,
+      fillWidth,
+      {enableOverrideTeXStyle, static_cast<TexStyle>(texStyle)}
+    );
+    return reinterpret_cast<RenderPtr>(r);
+  } catch (...) {
+    // C++ exceptions cannot unwind through the Zig/C ABI.
+    return nullptr;
+  }
 }
 
 MICROTEX_CAPI void microtex_deleteRender(RenderPtr render) {
@@ -154,10 +161,14 @@ MICROTEX_CAPI void microtex_deleteRender(RenderPtr render) {
 }
 
 MICROTEX_CAPI DrawingData microtex_getDrawingData(RenderPtr render, int x, int y) {
-  auto r = reinterpret_cast<Render*>(render);
-  Graphics2D_wrapper g2;
-  r->draw(g2, x, y);
-  return g2.getDrawingData();
+  try {
+    auto r = reinterpret_cast<Render*>(render);
+    Graphics2D_wrapper g2;
+    r->draw(g2, x, y);
+    return g2.getDrawingData();
+  } catch (...) {
+    return nullptr;
+  }
 }
 
 MICROTEX_CAPI void microtex_freeDrawingData(DrawingData data) {

package/native/vendor/zigtex/src/root.zig

@@ -9,7 +9,7 @@ pub const TexSvgRender = struct {
         font_data: []const u8 = DEFAULT_FONT,
     };
 
-    context: microtex.FontContext,
+    context: *microtex.FontContext,
     mtex: microtex.MicroTeX,
 
     pub fn init(
@@ -17,13 +17,15 @@ pub const TexSvgRender = struct {
         opts: Options,
     ) !TexSvgRender {
         microtex.setRenderGlyphUsePath(true);
-        var context = microtex.FontContext.init(allocator);
-        errdefer context.deinit();
+        // MicroTeX retains this address in its C callbacks.
+        const context = try allocator.create(microtex.FontContext);
+        errdefer allocator.destroy(context);
+        context.* = .{};
 
         const mtex = try microtex.MicroTeX.init(
             allocator,
             opts.font_data,
-            &context,
+            context,
         );
         errdefer mtex.deinit();
         return .{
@@ -33,8 +35,9 @@ pub const TexSvgRender = struct {
     }
 
     pub fn deinit(self: *TexSvgRender) void {
+        const allocator = self.mtex.allocator;
         self.mtex.deinit();
-        self.context.deinit();
+        allocator.destroy(self.context);
         self.* = undefined;
     }
 
@@ -62,23 +65,25 @@ pub const TexSvgRender = struct {
         const style: u32 = b: {
             if (opts.style) |s| {
                 break :b switch (s) {
-                    .display => 1,
-                    .in_line => 0,
+                    .display => 0,
+                    .in_line => 2,
                 };
             }
             break :b 0;
         };
 
+        self.context.unsupported_text = false;
         var r = try self.mtex.parseRender(null_term, .{
             .text_size = @floatFromInt(opts.size),
             .line_space = @floatFromInt(opts.spacing),
-            .override_syle = opts.style == null,
+            .override_syle = opts.style != null,
             .style = style,
             .color = 0,
         });
         defer r.deinit();
+        if (self.context.unsupported_text) return error.UnsupportedGlyph;
 
-        var data = r.getDrawingData(opts.x_pad, opts.y_pad);
+        var data = try r.getDrawingData(opts.x_pad, opts.y_pad);
 
         var s = svg.Svg.init(allocator);
         defer s.deinit();
@@ -107,9 +112,7 @@ pub const TexSvgRender = struct {
                 .fill_path => try s.fillPath(),
                 .draw_line => |i| try s.drawLine(i.x1, i.y1, i.x2, i.y2),
                 .set_stroke => |i| try s.setStroke(i.width),
-                else => {
-                    std.log.default.warn("Unhandled opcopde: {any}", .{cmd});
-                },
+                else => return error.UnsupportedDrawingCommand,
             }
         }
         var buf_writer: std.Io.Writer.Allocating = .init(allocator);

package/native/vendor/zigtex/src/tex.zig

@@ -125,6 +125,7 @@ pub const MicroTeX = struct {
     }
 
     pub fn deinit(self: *Self) void {
+        c.microtex_releaseFontMeta(self.font_meta);
         c.microtex_release();
         self.allocator.free(self.clm_data);
         self.* = undefined;
@@ -309,13 +310,14 @@ pub const Render = struct {
         self.* = undefined;
     }
 
-    pub fn getDrawingData(self: *Render, x: u32, y: u32) DrawingData {
+    pub fn getDrawingData(self: *Render, x: u32, y: u32) !DrawingData {
         return self.drawing_data orelse {
             const ptr = c.microtex_getDrawingData(
                 self.ptr,
                 @intCast(x),
                 @intCast(y),
             );
+            if (ptr == null) return error.FailedToRender;
             self.drawing_data = DrawingData.init(ptr);
             return self.drawing_data.?;
         };
@@ -323,25 +325,18 @@ pub const Render = struct {
 };
 
 pub const FontContext = struct {
-    const FontText = struct {
-        font: FontDescription,
-        text: []const u8,
-    };
-    const FontMap = std.AutoHashMap(usize, FontText);
-
-    id: usize = 0,
-    fontmap: FontMap,
+    unsupported_text: bool = false,
 
     fn createTextLayout(
         self: *FontContext,
         text: []const u8,
         font: FontDescription,
     ) !usize {
-        const id = self.id;
-        self.id += 1;
-
-        try self.fontmap.put(id, .{ .text = text, .font = font });
-        return id;
+        _ = text;
+        _ = font;
+        // SVG output only supports glyph paths, not platform text layouts.
+        self.unsupported_text = true;
+        return 0;
     }
 
     fn getTextLayoutBounds(
@@ -349,16 +344,14 @@ pub const FontContext = struct {
         id: usize,
         bounds: TextLayoutBounds,
     ) !void {
-        const value = self.fontmap.get(id).?;
-        _ = value;
-        // TODO: would need a way of measuring how big this is going to be
-        bounds.setBounds(200, 100, 10);
+        _ = self;
+        _ = id;
+        bounds.setBounds(0, 0, 0);
     }
 
     fn releaseTextLayout(self: *FontContext, id: usize) void {
-        if (!self.fontmap.remove(id)) {
-            std.log.default.debug("Failed to remove text layout: {d}", .{id});
-        }
+        _ = self;
+        _ = id;
     }
 
     fn isPathExists(self: *FontContext, id: usize) bool {
@@ -366,16 +359,6 @@ pub const FontContext = struct {
         _ = id;
         return false;
     }
-
-    pub fn init(allocator: std.mem.Allocator) FontContext {
-        const map = FontMap.init(allocator);
-        return .{ .fontmap = map };
-    }
-
-    pub fn deinit(self: *FontContext) void {
-        self.fontmap.deinit();
-        self.* = undefined;
-    }
 };
 
 pub fn setRenderGlyphUsePath(use: bool) void {

package/native/zigtex-0.16.patch

@@ -1,21 +1,94 @@
-diff --git a/src/svg.zig b/src/svg.zig
---- a/src/svg.zig
-+++ b/src/svg.zig
-@@ -45,6 +45,7 @@ pub const Svg = struct {
-                 try self.path.append(allocator, ' ');
-             }
--            var path_writer = self.path.writer(allocator).adaptToNewApi(&.{});
--            try path_writer.new_interface.print(fmt, args);
-+            var path_writer = std.Io.Writer.Allocating.fromArrayList(allocator, &self.path);
-+            defer self.path = path_writer.toArrayList();
-+            try path_writer.writer.print(fmt, args);
-         }
-     };
-diff --git a/src/root.zig b/src/root.zig
+--- a/build.zig.zon
++++ b/build.zig.zon
+@@ -4,8 +4,7 @@
+     .version = "0.1.0",
+     .dependencies = .{
+         .microtex = .{
+-            .url = "https://github.com/fjebaker/MicroTeX/archive/openmath.tar.gz",
+-            .hash = "N-V-__8AADt0yQCpAsFGWBTOCyfdUkjnlLJF_V-FBo08cjK0",
++            .path = "../microtex",
+         },
+     },
+     .paths = .{
 --- a/src/root.zig
 +++ b/src/root.zig
-@@ -112,14 +112,13 @@ pub const TexSvgRender = struct {
-                 },
+@@ -9,7 +9,7 @@
+         font_data: []const u8 = DEFAULT_FONT,
+     };
+ 
+-    context: microtex.FontContext,
++    context: *microtex.FontContext,
+     mtex: microtex.MicroTeX,
+ 
+     pub fn init(
+@@ -17,13 +17,15 @@
+         opts: Options,
+     ) !TexSvgRender {
+         microtex.setRenderGlyphUsePath(true);
+-        var context = microtex.FontContext.init(allocator);
+-        errdefer context.deinit();
++        // MicroTeX retains this address in its C callbacks.
++        const context = try allocator.create(microtex.FontContext);
++        errdefer allocator.destroy(context);
++        context.* = .{};
+ 
+         const mtex = try microtex.MicroTeX.init(
+             allocator,
+             opts.font_data,
+-            &context,
++            context,
+         );
+         errdefer mtex.deinit();
+         return .{
+@@ -33,8 +35,9 @@
+     }
+ 
+     pub fn deinit(self: *TexSvgRender) void {
++        const allocator = self.mtex.allocator;
+         self.mtex.deinit();
+-        self.context.deinit();
++        allocator.destroy(self.context);
+         self.* = undefined;
+     }
+ 
+@@ -62,23 +65,25 @@
+         const style: u32 = b: {
+             if (opts.style) |s| {
+                 break :b switch (s) {
+-                    .display => 1,
+-                    .in_line => 0,
++                    .display => 0,
++                    .in_line => 2,
+                 };
+             }
+             break :b 0;
+         };
+ 
++        self.context.unsupported_text = false;
+         var r = try self.mtex.parseRender(null_term, .{
+             .text_size = @floatFromInt(opts.size),
+             .line_space = @floatFromInt(opts.spacing),
+-            .override_syle = opts.style == null,
++            .override_syle = opts.style != null,
+             .style = style,
+             .color = 0,
+         });
+         defer r.deinit();
++        if (self.context.unsupported_text) return error.UnsupportedGlyph;
+ 
+-        var data = r.getDrawingData(opts.x_pad, opts.y_pad);
++        var data = try r.getDrawingData(opts.x_pad, opts.y_pad);
+ 
+         var s = svg.Svg.init(allocator);
+         defer s.deinit();
+@@ -107,19 +112,16 @@
+                 .fill_path => try s.fillPath(),
+                 .draw_line => |i| try s.drawLine(i.x1, i.y1, i.x2, i.y2),
+                 .set_stroke => |i| try s.setStroke(i.width),
+-                else => {
+-                    std.log.default.warn("Unhandled opcopde: {any}", .{cmd});
+-                },
++                else => return error.UnsupportedDrawingCommand,
              }
          }
 -        var buf = std.ArrayList(u8).empty;
@@ -33,3 +106,123 @@ diff --git a/src/root.zig b/src/root.zig
 +        return buf_writer.toOwnedSlice();
      }
  };
+--- a/src/svg.zig
++++ b/src/svg.zig
+@@ -45,8 +45,9 @@
+             if (self.path.items.len > 0) {
+                 try self.path.append(allocator, ' ');
+             }
+-            var path_writer = self.path.writer(allocator).adaptToNewApi(&.{});
+-            try path_writer.new_interface.print(fmt, args);
++            var path_writer = std.Io.Writer.Allocating.fromArrayList(allocator, &self.path);
++            defer self.path = path_writer.toArrayList();
++            try path_writer.writer.print(fmt, args);
+         }
+     };
+ 
+--- a/src/tex.zig
++++ b/src/tex.zig
+@@ -111,7 +111,7 @@
+         );
+ 
+         const content = try allocator.dupe(u8, clm_data);
+-        const font_meta = c.microtex_init(content.len, content.ptr);
++        const font_meta = c.microtex_init(@intCast(content.len), content.ptr);
+ 
+         const name = c.microtex_getFontName(font_meta);
+         c.microtex_setDefaultMainFont(name);
+@@ -125,6 +125,7 @@
+     }
+ 
+     pub fn deinit(self: *Self) void {
++        c.microtex_releaseFontMeta(self.font_meta);
+         c.microtex_release();
+         self.allocator.free(self.clm_data);
+         self.* = undefined;
+@@ -309,13 +310,14 @@
+         self.* = undefined;
+     }
+ 
+-    pub fn getDrawingData(self: *Render, x: u32, y: u32) DrawingData {
++    pub fn getDrawingData(self: *Render, x: u32, y: u32) !DrawingData {
+         return self.drawing_data orelse {
+             const ptr = c.microtex_getDrawingData(
+                 self.ptr,
+                 @intCast(x),
+                 @intCast(y),
+             );
++            if (ptr == null) return error.FailedToRender;
+             self.drawing_data = DrawingData.init(ptr);
+             return self.drawing_data.?;
+         };
+@@ -323,25 +325,18 @@
+ };
+ 
+ pub const FontContext = struct {
+-    const FontText = struct {
+-        font: FontDescription,
+-        text: []const u8,
+-    };
+-    const FontMap = std.AutoHashMap(usize, FontText);
+-
+-    id: usize = 0,
+-    fontmap: FontMap,
++    unsupported_text: bool = false,
+ 
+     fn createTextLayout(
+         self: *FontContext,
+         text: []const u8,
+         font: FontDescription,
+     ) !usize {
+-        const id = self.id;
+-        self.id += 1;
+-
+-        try self.fontmap.put(id, .{ .text = text, .font = font });
+-        return id;
++        _ = text;
++        _ = font;
++        // SVG output only supports glyph paths, not platform text layouts.
++        self.unsupported_text = true;
++        return 0;
+     }
+ 
+     fn getTextLayoutBounds(
+@@ -349,16 +344,14 @@
+         id: usize,
+         bounds: TextLayoutBounds,
+     ) !void {
+-        const value = self.fontmap.get(id).?;
+-        _ = value;
+-        // TODO: would need a way of measuring how big this is going to be
+-        bounds.setBounds(200, 100, 10);
++        _ = self;
++        _ = id;
++        bounds.setBounds(0, 0, 0);
+     }
+ 
+     fn releaseTextLayout(self: *FontContext, id: usize) void {
+-        if (!self.fontmap.remove(id)) {
+-            std.log.default.debug("Failed to remove text layout: {d}", .{id});
+-        }
++        _ = self;
++        _ = id;
+     }
+ 
+     fn isPathExists(self: *FontContext, id: usize) bool {
+@@ -366,16 +359,6 @@
+         _ = id;
+         return false;
+     }
+-
+-    pub fn init(allocator: std.mem.Allocator) FontContext {
+-        const map = FontMap.init(allocator);
+-        return .{ .fontmap = map };
+-    }
+-
+-    pub fn deinit(self: *FontContext) void {
+-        self.fontmap.deinit();
+-        self.* = undefined;
+-    }
+ };
+ 
+ pub fn setRenderGlyphUsePath(use: bool) void {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonklee/opentui-tex-native-source",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/simonklee/opentui-tex.git"

package/scripts/bootstrap-native

@@ -4,8 +4,8 @@ set -euo pipefail
 cd "$(dirname "$0")/.."
 
 readonly vendor=native/vendor
-readonly stamp="$vendor/.bootstrap-v5"
-readonly stamp_value='zigtex=fda2819e45f57ca2071810c47249a46bfc782cdf microtex=74e8fee9e47edc3a777e64fb2eff9a85a01defac nanosvg=239e102ec2c691f2902e20ace2ed36ee4a35cfe6 zig=0.16-v5'
+readonly stamp="$vendor/.bootstrap-v8"
+readonly stamp_value='zigtex=fda2819e45f57ca2071810c47249a46bfc782cdf microtex=74e8fee9e47edc3a777e64fb2eff9a85a01defac nanosvg=239e102ec2c691f2902e20ace2ed36ee4a35cfe6 zig=0.16-v8'
 mkdir -p "$vendor"
 
 download() {
@@ -14,15 +14,25 @@ download() {
     --connect-timeout 20 --max-time 180 "$url" --output "$output"
 }
 
+verify_checksum() {
+  local expected=$1 path=$2 actual
+  if command -v sha256sum >/dev/null 2>&1; then
+    actual=$(sha256sum "$path") || return
+  else
+    actual=$(shasum -a 256 "$path") || return
+  fi
+  [[ "${actual%% *}" == "$expected" ]]
+}
+
 fetch_file() {
   local name=$1 url=$2 expected=$3 path="$vendor/$1" temporary
-  if [[ -f "$path" ]] && echo "$expected  $path" | sha256sum --check --status; then
+  if [[ -f "$path" ]] && verify_checksum "$expected" "$path"; then
     return
   fi
   temporary=$(mktemp "$vendor/.download.XXXXXX")
   trap 'rm -f "$temporary"' RETURN
   download "$url" "$temporary"
-  echo "$expected  $temporary" | sha256sum --check --status
+  verify_checksum "$expected" "$temporary"
   mv "$temporary" "$path"
   trap - RETURN
 }
@@ -33,7 +43,7 @@ fetch_archive() {
   temporary=$(mktemp -d "$vendor/.extract.XXXXXX")
   trap 'rm -rf "$archive" "$temporary"' RETURN
   download "$url" "$archive"
-  echo "$expected  $archive" | sha256sum --check --status
+  verify_checksum "$expected" "$archive"
   tar --extract --gzip --file "$archive" --directory "$temporary" --strip-components=1
   rm -rf "$vendor/$name"
   mv "$temporary" "$vendor/$name"
@@ -59,25 +69,8 @@ if [[ ! -f "$stamp" ]] || [[ "$(<"$stamp")" != "$stamp_value" ]]; then
     https://github.com/fjebaker/MicroTeX/archive/74e8fee9e47edc3a777e64fb2eff9a85a01defac.tar.gz \
     8da1600f75a674d465715b1d3e0c2bfd84adab128b45e91253ecfa46f856a963
 
-  sed -i \
-    -e 's#            .url = .*#            .path = "../microtex",#' \
-    -e '/            .hash = /d' \
-    "$vendor/zigtex/build.zig.zon"
-  sed -i \
-    -e 's/conf_header.getOutput()/conf_header.getOutputFile()/' \
-    -e 's/lib.linkLibCpp();/lib.root_module.link_libcpp = true;/' \
-    -e 's/lib.addConfigHeader/lib.root_module.addConfigHeader/g' \
-    -e 's/lib.addIncludePath/lib.root_module.addIncludePath/g' \
-    -e 's/lib.addCSourceFiles/lib.root_module.addCSourceFiles/g' \
-    -e 's/exe.addIncludePath/exe.root_module.addIncludePath/g' \
-    -e 's/exe.addCSourceFiles/exe.root_module.addCSourceFiles/g' \
-    -e 's/exe.linkLibrary/exe.root_module.linkLibrary/g' \
-    -e '/            .optimize = optimize,/a\            .pic = true,' \
-    "$vendor/microtex/build.zig"
-  patch --directory "$vendor/zigtex" --strip 1 < native/zigtex-0.16.patch
-  sed -i \
-    's/c.microtex_init(content.len, content.ptr)/c.microtex_init(@intCast(content.len), content.ptr)/' \
-    "$vendor/zigtex/src/tex.zig"
+  patch -d "$vendor/zigtex" -p1 < native/zigtex-0.16.patch
+  patch -d "$vendor/microtex" -p1 < native/microtex.patch
   printf '%s\n' "$stamp_value" > "$stamp"
 fi