temp

Author: chearon

examples/small-pdf.js

@@ -8,6 +8,7 @@ let y = 80
 let x = 50
 
 ctx.font = '22px Helvetica'
+ctx.textDrawingMode = 'glyph'
 ctx.fillText('node-canvas pdf', x, y)
 
 ctx.font = '10px Arial'

index.js

@@ -5,11 +5,11 @@ const CanvasPattern = require('./lib/pattern')
 const parseFont = require('./lib/parse-font')
 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')
 const { DOMPoint, DOMMatrix } = require('./lib/DOMMatrix')
+const registeredFonts = require('./lib/registeredFonts')
 
 bindings.setDOMMatrix(DOMMatrix)
 bindings.setParseFont(parseFont)
@@ -38,26 +38,6 @@ 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
@@ -71,8 +51,7 @@ exports.JPEGStream = JPEGStream
 exports.DOMMatrix = DOMMatrix
 exports.DOMPoint = DOMPoint
 
-exports.registerFont = registerFont
-exports.deregisterAllFonts = deregisterAllFonts
+exports.fonts = registeredFonts
 exports.parseFont = parseFont
 
 exports.createCanvas = createCanvas

package.json

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

src/Canvas.cc

@@ -13,7 +13,6 @@
 #include <ctime>
 #include <glib.h>
 #include "PNG.h"
-#include "register_font.h"
 #include <sstream>
 #include <stdlib.h>
 #include <string>

src/CanvasRenderingContext2d.cc

@@ -2568,8 +2568,7 @@ Context2d::GetFont(const Napi::CallbackInfo& info) {
  * Set font:
  *   - weight
  *   - style
- *   - size
- *   - unit
+ *   - size (px)
  *   - family
  */
 
@@ -2591,37 +2590,12 @@ Context2d::SetFont(const Napi::CallbackInfo& info, const Napi::Value& value) {
   Napi::String empty = Napi::String::New(env, "");
   Napi::Number zero = Napi::Number::New(env, 0);
 
-  std::string weight = font.Get("weight").UnwrapOr(empty).ToString().UnwrapOr(empty).Utf8Value();
-  std::string style = font.Get("style").UnwrapOr(empty).ToString().UnwrapOr(empty).Utf8Value();
-  double size = font.Get("size").UnwrapOr(zero).ToNumber().UnwrapOr(zero).DoubleValue();
-  std::string unit = font.Get("unit").UnwrapOr(empty).ToString().UnwrapOr(empty).Utf8Value();
+  uint32_t weight = font.Get("weight").UnwrapOr(zero).ToNumber().UnwrapOr(empty).Uint32Value();
+  FontDescription::Style = font.Get("style").UnwrapOr(zero).ToNumber().UnwrapOr(empty).Uint32Value();
+  float size = font.Get("size").UnwrapOr(zero).ToNumber().UnwrapOr(zero).FloatValue();
   std::string family = font.Get("family").UnwrapOr(empty).ToString().UnwrapOr(empty).Utf8Value();
 
-  PangoFontDescription *desc = pango_font_description_copy(state->fontDescription);
-  pango_font_description_free(state->fontDescription);
-
-  pango_font_description_set_style(desc, Canvas::GetStyleFromCSSString(style.c_str()));
-  pango_font_description_set_weight(desc, Canvas::GetWeightFromCSSString(weight.c_str()));
-
-  if (family.length() > 0) {
-    // See #1643 - Pango understands "sans" whereas CSS uses "sans-serif"
-    std::string s1(family);
-    std::string s2("sans-serif");
-    if (streq_casein(s1, s2)) {
-      pango_font_description_set_family(desc, "sans");
-    } else {
-      pango_font_description_set_family(desc, family.c_str());
-    }
-  }
-
-  PangoFontDescription *sys_desc = Canvas::ResolveFontDescription(desc);
-  pango_font_description_free(desc);
-
-  if (size > 0) pango_font_description_set_absolute_size(sys_desc, size * PANGO_SCALE);
-
-  state->fontDescription = sys_desc;
-  pango_layout_set_font_description(_layout, sys_desc);
-
+  state->fontDescription = FontDescription(family, weight, style, size);
   state->font = value.As<Napi::String>().Utf8Value().c_str();
 }
 

src/CanvasRenderingContext2d.h

@@ -4,9 +4,9 @@
 
 #include "cairo.h"
 #include "Canvas.h"
+#include "FontDescription.h"
 #include "color.h"
 #include "napi.h"
-#include <pango/pangocairo.h>
 #include <stack>
 
 /*
@@ -26,7 +26,7 @@ struct canvas_state_t {
   cairo_pattern_t* strokePattern = nullptr;
   cairo_pattern_t* fillGradient = nullptr;
   cairo_pattern_t* strokeGradient = nullptr;
-  PangoFontDescription* fontDescription = nullptr;
+  FontDescription fontDescription;
   std::string font = "10px sans-serif";
   cairo_filter_t patternQuality = CAIRO_FILTER_GOOD;
   float globalAlpha = 1.f;
@@ -36,11 +36,6 @@ struct canvas_state_t {
   canvas_draw_mode_t textDrawingMode = TEXT_DRAW_PATHS;
   bool imageSmoothingEnabled = true;
 
-  canvas_state_t() {
-    fontDescription = pango_font_description_from_string("sans");
-    pango_font_description_set_absolute_size(fontDescription, 10 * PANGO_SCALE);
-  }
-
   canvas_state_t(const canvas_state_t& other) {
     fill = other.fill;
     stroke = other.stroke;
@@ -57,14 +52,10 @@ struct canvas_state_t {
     shadowOffsetX = other.shadowOffsetX;
     shadowOffsetY = other.shadowOffsetY;
     textDrawingMode = other.textDrawingMode;
-    fontDescription = pango_font_description_copy(other.fontDescription);
+    fontDescription = other.fontDescription;
     font = other.font;
     imageSmoothingEnabled = other.imageSmoothingEnabled;
   }
-
-  ~canvas_state_t() {
-    pango_font_description_free(fontDescription);
-  }
 };
 
 /*