asciidoctor-ldl 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d37e7971f951167055c3491ecfeb5490b04b57871428bedb4cdd9e1184ddda18
-  data.tar.gz: 66950750f09e748e71f498678f0d305beb92ce31b04e8aa5cb2a47bc0f344069
+  metadata.gz: 20802d92a457bdb984de019c20d9d44f26a325c0c511704c2d574e5f201fa4c3
+  data.tar.gz: 2572f3ff4960d43f228854f35005877f5cd28e6f6f57c621746b8fa3750f905d
 SHA512:
-  metadata.gz: 5bb1d501146cece951dbc5268ec36d73b058af6aceaaf3124bef4c870594fbc7cac86041f5b6fa342b18b3ba4037e3cc07ccb21f3d7ec52f9c23bc34eb623dd3
-  data.tar.gz: a07923b23d094eabfff664acf3d95b4451802e5c3263616eba076cbd11b86b71d32baedbec57fdf5f552f7a897f677431431e7145eefe0e515953fd555cbd674
+  metadata.gz: 0cb60bae5692c098502337f8cc4aaec5c69ada73b6df5b9d5a614a32b3a0a4653e39b60e78ca03101f68bf45778c0a322aa4eb9299fa1726d943b43c34a8a5c8
+  data.tar.gz: a4b1228d7ce234a33fd7b18b48a54739791de5d2089736d70d5b84e184b8ccd355f7e9b34195824d1e177fdc4a353e49d6cc24254721df6a4b6a1c5ec2162020

data/CHANGELOG.md

@@ -6,6 +6,29 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.1.2] - 2026-07-23
+
+### Added
+
+- `font-family` / `ldl-font-family` attribute controlling the font used for
+  diagram text, and a cross-platform default
+  (`DejaVu Sans, Bitstream Vera Sans, Liberation Sans, Arial, sans-serif`).
+
+### Fixed
+
+- Gate/comparator glyphs `−` (U+2212) and `≥` (U+2265) no longer disappear in
+  asciidoctor-pdf. The renderer's generic `sans-serif` was mapped by prawn-svg
+  to the built-in Helvetica, which lacks those glyphs; the new default names
+  real fonts first (register one — e.g. DejaVu Sans — in your PDF theme).
+
+## [0.1.1] - 2026-07-23
+
+### Added
+
+- Pass the `pdfwidth` and `scaledwidth` image attributes through to the
+  generated image, so diagram size can be controlled in asciidoctor-pdf (and
+  `scaledwidth`/`width` elsewhere). Also forwards `window`, `opts` and `fit`.
+
 ## [0.1.0] - 2026-07-23
 
 ### Added
@@ -23,5 +46,7 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - Content-addressed caching with a digest sidecar so unchanged diagrams are not
   re-rendered.
 
-[Unreleased]: https://github.com/OpenPowerShift/asciidoctor-ldl/compare/v0.1.0...HEAD
+[Unreleased]: https://github.com/OpenPowerShift/asciidoctor-ldl/compare/v0.1.2...HEAD
+[0.1.2]: https://github.com/OpenPowerShift/asciidoctor-ldl/compare/v0.1.1...v0.1.2
+[0.1.1]: https://github.com/OpenPowerShift/asciidoctor-ldl/compare/v0.1.0...v0.1.1
 [0.1.0]: https://github.com/OpenPowerShift/asciidoctor-ldl/releases/tag/v0.1.0

data/README.adoc

@@ -181,6 +181,13 @@ header or on the command line (`-a ldl-format=png`).
 | `true`
 | Draw `.Name`/`.Description` labels.
 
+| font-family
+| ldl-font-family
+| _(see below)_
+| Font family for diagram text. Defaults to a cross-platform stack
+  (`DejaVu Sans, Bitstream Vera Sans, Liberation Sans, Arial, sans-serif`). Set
+  to `sans-serif` (or `none`) to keep the renderer's plain generic family.
+
 | target
 | —
 | _(hash)_
@@ -204,8 +211,18 @@ header or on the command line (`-a ldl-format=png`).
 | Set to `false` to always re-render, ignoring the cache.
 |===
 
-Standard image attributes — `alt`, `title`, `width`, `height`, `align`,
-`float`, `id`, `link`, `role` — pass straight through to the generated image.
+Standard image attributes — `alt`, `title`, `width`, `height`, `pdfwidth`,
+`scaledwidth`, `align`, `float`, `id`, `link`, `role` — pass straight through to
+the generated image. To control the rendered size, use `width` for HTML and
+`pdfwidth` (or `scaledwidth`) for `asciidoctor-pdf`, e.g.:
+
+[source]
+----
+ldl::diagrams/trip.ldl[pdfwidth=80%]
+----
+
+Without a sizing attribute, a diagram renders at its intrinsic size and
+`asciidoctor-pdf` scales an over-wide one down to the content width.
 
 TIP: Most *diagram* styling (inversion bubbles vs NOT gates, input bars,
 compactness, stroke width, margins, …) is authored in the LDL source itself with
@@ -251,6 +268,29 @@ For `asciidoctor-pdf`, prefer `svg`: it keeps PDFs small and crisp. If you must
 raster for PDF, `png` with `scale=2` or higher gives good print quality at the
 cost of size.
 
+=== Fonts (asciidoctor-pdf)
+
+Gate and comparator symbols use `−` (U+2212) and `≥` (U+2265). In
+`asciidoctor-pdf`, `prawn-svg` maps the generic `sans-serif` family to the
+built-in Helvetica, which lacks those glyphs — so by default this extension
+names real fonts first (see `font-family` above). For them to take effect in a
+PDF, *register a matching font in your theme* and it will be used automatically:
+
+[source,yaml]
+----
+# in your -theme.yml (font files under a directory on :pdf-fontsdir:)
+font:
+  catalog:
+    merge: true
+    DejaVu Sans:
+      normal: DejaVuSans.ttf
+      bold: DejaVuSans-Bold.ttf
+      italic: DejaVuSans-Oblique.ttf
+      bold_italic: DejaVuSans-BoldOblique.ttf
+----
+
+HTML and PNG output already resolve the glyphs without any setup.
+
 == Styling with roles
 
 Every generated image is tagged with roles so it can be targeted from CSS or an

data/lib/asciidoctor/ldl/extension.rb

@@ -35,6 +35,7 @@ module Asciidoctor
           theme: attr(attrs, doc, 'theme', 'ldl-theme', 'light'),
           show_ids: attr(attrs, doc, 'show-ids', 'ldl-show-ids', nil),
           show_labels: attr(attrs, doc, 'show-labels', 'ldl-show-labels', nil),
+          font_family: attr(attrs, doc, 'font-family', 'ldl-font-family', nil),
           node: doc.attr('ldl-node', 'node'),
           package_dir: doc.attr('ldl-package-dir') || doc.attr('ldl-node-modules'),
           out_dir: image_output_dir(doc),
@@ -78,9 +79,17 @@ module Asciidoctor
         (images_dir && !images_dir.to_s.empty?) ? File.join(base, images_dir) : base
       end
 
+      # Image attributes passed straight through to the generated image block.
+      # Includes the sizing attributes for every backend: +width+ (HTML),
+      # +pdfwidth+/+scaledwidth+ (asciidoctor-pdf).
+      IMAGE_PASSTHROUGH = %w[
+        alt title width height pdfwidth scaledwidth align float id link
+        window opts fit
+      ].freeze
+
       def create_ldl_image(parent, attrs, filename, renderer, _doc)
         image_attrs = { 'target' => filename }
-        %w[alt title width height align float id link].each do |key|
+        IMAGE_PASSTHROUGH.each do |key|
           image_attrs[key] = attrs[key] if attrs.key?(key)
         end
         image_attrs['alt'] ||= (attrs['target'] || 'LDL logic diagram')

data/lib/asciidoctor/ldl/js/ldl_render.mjs

@@ -64,6 +64,7 @@ function parseArgs(argv) {
     showLabels: true,
     out: null,
     packageDir: null,
+    fontFamily: null,
   };
   for (let i = 0; i < argv.length; i++) {
     const arg = argv[i];
@@ -78,6 +79,7 @@ function parseArgs(argv) {
       case '--no-show-labels': opts.showLabels = false; break;
       case '--out': opts.out = next(); break;
       case '--package-dir': opts.packageDir = next(); break;
+      case '--font-family': opts.fontFamily = next(); break;
       default:
         throw new Error(`unknown argument: ${arg}`);
     }
@@ -150,6 +152,18 @@ function sizeFromViewBox(svg) {
   return { width: parseFloat(m[1]), height: parseFloat(m[2]) };
 }
 
+// The renderer tags diagram text with font-family="sans-serif". Some consumers
+// map that generic family to a glyph-poor built-in font (e.g. prawn-svg in
+// asciidoctor-pdf uses Helvetica, which lacks − U+2212 and ≥ U+2265). Rewriting
+// it to a named font that the consumer has registered fixes those glyphs.
+function applyFontFamily(svg, family) {
+  if (!family) return svg;
+  const q = family.replace(/"/g, '&quot;');
+  return svg
+    .replace(/font-family="sans-serif"/g, `font-family="${q}"`)
+    .replace(/font-family:\s*sans-serif/g, `font-family:${family}`);
+}
+
 function applySvgScale(svg, scale) {
   const size = sizeFromViewBox(svg);
   if (!size) return { svg, size };
@@ -184,7 +198,7 @@ async function main() {
   renderOptions.showLabels = opts.showLabels;
   const theme = opts.theme === 'dark' ? DARK_DIAGRAM : LIGHT_DIAGRAM;
 
-  let svg = renderDiagram(diagram, renderOptions, theme);
+  let svg = applyFontFamily(renderDiagram(diagram, renderOptions, theme), opts.fontFamily);
   const scaled = applySvgScale(svg, opts.scale);
   svg = scaled.svg;
   const size = scaled.size || { width: 0, height: 0 };
@@ -201,7 +215,7 @@ async function main() {
   const { Resvg } = await loadResvg(opts.packageDir);
   // Rasterise from the *unscaled* viewBox using resvg's own zoom, so the scale
   // multiplies device pixels crisply rather than baking a size into the SVG.
-  const base = renderDiagram(diagram, renderOptions, theme);
+  const base = applyFontFamily(renderDiagram(diagram, renderOptions, theme), opts.fontFamily);
   const resvg = new Resvg(base, {
     fitTo: { mode: 'zoom', value: opts.scale },
     background: 'white',

data/lib/asciidoctor/ldl/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module Ldl
-    VERSION = '0.1.0'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-ldl
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Daniel Mulholland