backup

Author: chearon

build.zig

@@ -11,7 +11,7 @@ pub fn build(b: *std.Build) void {
         .use_glib = false,
         .use_dwrite = false,
         .use_fontconfig = false,
-        .use_freetype = false,
+        .use_freetype = true,
         .use_quartz = false,
         .target = target,
         .optimize = optimize,
@@ -31,6 +31,34 @@ pub fn build(b: *std.Build) void {
         .target = target,
         .optimize = optimize,
     }).artifact("png");
+    
+    const sheenbidi = b.dependency("sheenbidi", .{
+        .target = target,
+        .optimize = optimize,
+    }).artifact("sheenbidi");
+
+    const zg = b.dependency("zg", .{
+        .target = target,
+        .optimize = optimize,
+    });
+
+    const harfbuzz = b.dependency("harfbuzz", .{
+        .target = target,
+        .optimize = optimize,
+    }).artifact("harfbuzz");
+
+    const unicode = b.addLibrary(.{
+        .name = "unicode",
+        .linkage = .static,
+        .root_module = b.createModule(.{
+            .target = target,
+            .optimize = optimize,
+            .root_source_file = b.path("src/unicode.zig"),
+        })
+    });
+
+    unicode.root_module.addImport("Scripts", zg.module("Scripts"));
+    unicode.root_module.addImport("Graphemes", zg.module("Graphemes"));
 
     const canvas = b.addLibrary(.{
       .name = "canvas",
@@ -58,11 +86,18 @@ pub fn build(b: *std.Build) void {
             "src/Image.cc",
             "src/ImageData.cc",
             "src/init.cc",
-            "src/FontParser.cc"
+            "src/itemize.cc",
+            "src/FontManager.cc",
+            "src/FontManagerMacos.cc",
+            "src/FontFace.cc",
+            "src/FontFaceSet.cc",
+            "src/FontParser.cc",
+            "src/FontLayout.cc"
         } ,
         .flags = &.{
             "-DNAPI_DISABLE_CPP_EXCEPTIONS",
             "-DNODE_ADDON_API_ENABLE_MAYBE",
+            "-std=c++20",
             if (target.result.os.tag == .windows) "-DCAIRO_WIN32_STATIC_BUILD" else "",
         }
     });
@@ -80,6 +115,9 @@ pub fn build(b: *std.Build) void {
     canvas.linkLibrary(libjpeg_turbo);
     canvas.linkLibrary(libpng);
     canvas.linkLibrary(giflib);
+    canvas.linkLibrary(sheenbidi);
+    canvas.linkLibrary(unicode);
+    canvas.linkLibrary(harfbuzz);
 
     const move = b.addInstallFile(canvas.getEmittedBin(), "../bin/canvas.node");
     move.step.dependOn(&canvas.step);

build.zig.zon

@@ -10,9 +10,10 @@
             .hash = "node_api-0.0.0-AAAAAAQgAAB-W9HyzJg5Vhja3uNMMcDiFaCJvBLt41GD",
         },
         .cairo = .{
-            .url = "https://github.com/chearon/cairo.zig/archive/6b4c3e269483200576b17c160d2511e1e75e0c26.tar.gz",
-            .hash = "cairo_zig-1.18.4-GbxI8fJhAQD27f7GkMyojP0v6K8DlNxetysEyAcu1qDD",
+            .url = "https://github.com/chearon/cairo.zig/archive/9e251c4de5b9cc327043c2b7bc970f2909df6b47.tar.gz",
+            .hash = "cairo_zig-1.18.4-GbxI8cBhAQBTj4mtJt12p34Tyxcdh-r3qnmkXqQRkCNq",
         },
+        // TODO: this needs to be kept in sync with freetype's build.zig.zon
         .libpng = .{
             .url = "https://github.com/allyourcodebase/libpng/archive/d512607515687aa60b975d6a191aef9a692dac87.zip",
             .hash = "libpng-1.6.50-oiaFGt4qAAB_vzrtvz9hA7_UiBW4arSaMVGc7ekKMCZ2",
@@ -25,5 +26,17 @@
             .url = "https://github.com/chearon/giflib/archive/986b2816254c3cebf7f9f735eb32564e4600cc66.tar.gz",
             .hash = "giflib-5.2.2-TakyOnIKIwCYvNoi8kEaGj5KYEc9hZ900YBld700u-PM",
         },
+        .zg = .{
+            .url = "https://codeberg.org/atman/zg/archive/d9f596626e8ec05a9f3e47f7bc83aedd5bd2f989.tar.gz",
+            .hash = "zg-0.15.3-oGqU3P5ItAJHmwDLfzX6sg6Xc5MhSJU2TctHfWu_sKLv",
+        },
+        // TODO: this needs to be kept in sync with freetype's build.zig.zon
+        .zlib = .{
+          .url = "git+https://github.com/allyourcodebase/zlib#3599c16d41dbe749ae51b0ff7ab864c61adc779a",
+          .hash = "zlib-1.3.1-ZZQ7lc8NAABUbHzDe_cSWboCqMbrLkVwvFkKnojgeiT2",
+        },
+        .sheenbidi = .{ .path = "./pkg/sheenbidi" },
+        .harfbuzz = .{ .path = "./pkg/harfbuzz" },
+        .freetype = .{ .path = "./pkg/freetype" },
     },
 }

examples/font.js

@@ -1,6 +1,6 @@
 const fs = require('fs')
 const path = require('path')
-const Canvas = require('..')
+const {createCanvas, FontFace, fonts} = require('..')
 
 function fontFile (name) {
   return path.join(__dirname, '/pfennigFont/', name)
@@ -10,12 +10,12 @@ function fontFile (name) {
 // `registerFont`. When you set `ctx.font`, refer to the styles and the family
 // name as it is embedded in the TTF. If you aren't sure, open the font in
 // FontForge and visit Element -> Font Information and copy the Family Name
-Canvas.registerFont(fontFile('Pfennig.ttf'), { family: 'pfennigFont' })
-Canvas.registerFont(fontFile('PfennigBold.ttf'), { family: 'pfennigFont', weight: 'bold' })
-Canvas.registerFont(fontFile('PfennigItalic.ttf'), { family: 'pfennigFont', style: 'italic' })
-Canvas.registerFont(fontFile('PfennigBoldItalic.ttf'), { family: 'pfennigFont', weight: 'bold', style: 'italic' })
+fonts.add(new FontFace('pfennigFont', fontFile('Pfennig.ttf')));
+fonts.add(new FontFace('pfennigFont', fontFile('PfennigBold.ttf'), { weight: 'bold' }))
+fonts.add(new FontFace('pfennigFont', fontFile('PfennigItalic.ttf'), { style: 'italic' }))
+fonts.add(new FontFace('pfennigFont', fontFile('PfennigBoldItalic.ttf'), { weight: 'bold', style: 'italic' }))
 
-const canvas = Canvas.createCanvas(320, 320)
+const canvas = createCanvas(320, 320)
 const ctx = canvas.getContext('2d')
 
 ctx.font = 'normal normal 50px Helvetica'

index.d.ts

@@ -377,19 +377,35 @@ export function createImageData(width: number, height: number): ImageData
  */
 export function loadImage(src: string|Buffer, options?: any): Promise<Image>
 
-/**
- * Registers a font that is not installed as a system font. This must be used
- * before creating Canvas instances.
- * @param path Path to local font file.
- * @param fontFace Description of the font face, corresponding to CSS properties
- * used in `@font-face` rules.
- */
-export function registerFont(path: string, fontFace: {family: string, weight?: string, style?: string}): void
+interface FontFaceDescriptors {
+  weight?: number;
+  /** Currently italic, bold, and oblique are supported */
+  style?: string;
+}
 
-/**
- * Unloads all fonts
- */
-export function deregisterAllFonts(): void;
+export class FontFace {
+  constructor(
+    family: string,
+    url: string | ArrayBuffer | TypedArray,
+    descriptors?: FontFaceDescriptors
+  );
+
+  family: string;
+  style: string;
+  weight: number;
+  status: 'loaded' | 'unloaded' | 'error';
+}
+
+class FontFaceSet {
+  add(face: FontFace): void;
+  has(face: FontFace): boolean;
+  clear(): void;
+  delete(face: FontFace): boolean;
+  [Symbol.iterator](): Iterator<FontFace>;
+  size: number;
+}
+
+export const fonts: FontFaceSet;
 
 /** This class must not be constructed directly; use `canvas.createPNGStream()`. */
 export class PNGStream extends Readable {}

index.js

@@ -4,7 +4,6 @@ const CanvasRenderingContext2D = require('./lib/context2d')
 const CanvasPattern = require('./lib/pattern')
 const packageJson = require('./package.json')
 const bindings = require('./lib/bindings')
-const fs = require('fs')
 const PNGStream = require('./lib/pngstream')
 const PDFStream = require('./lib/pdfstream')
 const JPEGStream = require('./lib/jpegstream')
@@ -36,31 +35,12 @@ function loadImage (src) {
   })
 }
 
-/**
- * Resolve paths for registerFont. Must be called *before* creating a Canvas
- * instance.
- * @param src {string} Path to font file.
- * @param fontFace {{family: string, weight?: string, style?: string}} Object
- * specifying font information. `weight` and `style` default to `"normal"`.
- */
-function registerFont (src, fontFace) {
-  // TODO this doesn't need to be on Canvas; it should just be a static method
-  // of `bindings`.
-  return Canvas._registerFont(fs.realpathSync(src), fontFace)
-}
-
-/**
- * Unload all fonts from pango to free up memory
- */
-function deregisterAllFonts () {
-  return Canvas._deregisterAllFonts()
-}
-
 exports.Canvas = Canvas
 exports.Context2d = CanvasRenderingContext2D // Legacy/compat export
 exports.CanvasRenderingContext2D = CanvasRenderingContext2D
 exports.CanvasGradient = bindings.CanvasGradient
 exports.CanvasPattern = CanvasPattern
+exports.FontFace = bindings.FontFace
 exports.Image = Image
 exports.ImageData = bindings.ImageData
 exports.PNGStream = PNGStream
@@ -69,8 +49,7 @@ exports.JPEGStream = JPEGStream
 exports.DOMMatrix = DOMMatrix
 exports.DOMPoint = DOMPoint
 
-exports.registerFont = registerFont
-exports.deregisterAllFonts = deregisterAllFonts
+exports.fonts = bindings.fonts;
 
 exports.createCanvas = createCanvas
 exports.createImageData = createImageData

lib/bindings.js

@@ -41,3 +41,8 @@ Object.defineProperty(bindings.CanvasRenderingContext2d.prototype, Symbol.toStri
   value: 'CanvasRenderingContext2d',
   configurable: true
 })
+
+Object.defineProperty(bindings.FontFace.prototype, Symbol.toStringTag, {
+  value: 'FontFace',
+  configurable: true
+})

package.json

@@ -59,9 +59,6 @@
     "tsd": "^0.29.0",
     "typescript": "^4.2.2"
   },
-  "engines": {
-    "node": "^18.12.0 || >= 20.9.0"
-  },
   "binary": {
     "napi_versions": [
       7

src/Canvas.cc

@@ -654,24 +654,23 @@ Canvas::ParseFont(const Napi::CallbackInfo& info) {
   if (!ok) return env.Undefined();
 
   Napi::Object obj = Napi::Object::New(env);
-  obj.Set("size", Napi::Number::New(env, props.fontSize));
+  obj.Set("size", Napi::Number::New(env, props.size));
   Napi::Array families = Napi::Array::New(env);
   obj.Set("families", families);
 
   unsigned int index = 0;
 
-  for (auto& family : props.fontFamily) {
+  for (auto& family : props.families) {
     families[index++] = Napi::String::New(env, family);
   }
 
-  obj.Set("weight", Napi::Number::New(env, props.fontWeight));
-  obj.Set("variant", Napi::Number::New(env, static_cast<int>(props.fontVariant)));
-  obj.Set("style", Napi::Number::New(env, static_cast<int>(props.fontStyle)));
+  obj.Set("weight", Napi::Number::New(env, props.weight));
+  obj.Set("variant", Napi::Number::New(env, static_cast<int>(props.variant)));
+  obj.Set("style", Napi::Number::New(env, static_cast<int>(props.style)));
 
   return obj;
 }
 
-
 // This returns an approximate value only, suitable for
 // Napi::MemoryManagement:: AdjustExternalMemory.
 // The formats that don't map to intrinsic types (RGB30, A1) round up.

src/Canvas.h

@@ -24,6 +24,28 @@ typedef enum {
   CANVAS_TYPE_SVG
 } canvas_type_t;
 
+enum text_baseline_t : uint8_t {
+  TEXT_BASELINE_ALPHABETIC = 0,
+  TEXT_BASELINE_TOP = 1,
+  TEXT_BASELINE_BOTTOM = 2,
+  TEXT_BASELINE_MIDDLE = 3,
+  TEXT_BASELINE_IDEOGRAPHIC = 4,
+  TEXT_BASELINE_HANGING = 5
+};
+
+enum text_align_t : int8_t {
+  TEXT_ALIGNMENT_LEFT = -1,
+  TEXT_ALIGNMENT_CENTER = 0,
+  TEXT_ALIGNMENT_RIGHT = 1,
+  TEXT_ALIGNMENT_START = -2,
+  TEXT_ALIGNMENT_END = 2
+};
+
+enum canvas_draw_mode_t : uint8_t {
+  TEXT_DRAW_PATHS,
+  TEXT_DRAW_GLYPHS
+};
+
 /*
  * Canvas.
  */