ntk 7.7.0 → 8.0.0

package/README.md

@@ -53,18 +53,17 @@ rasterizer and cached server-side as XRender glyphs, so drawing a line of
 text costs about a byte per glyph on the wire. Font names resolve through
 fontconfig (`fc-match`). Very large and continuously animated sizes render
 as server-side trapezoids instead of cached bitmaps. A `TextLayout` engine
-wraps styled text to a target width, a `MarkdownView` widget renders
-markdown (with syntax-highlighted code fences and KaTeX math via
-`TexView`) on top of it — see [docs/text.md](docs/text.md) and
-[docs/tex.md](docs/tex.md).
+wraps styled text to a target width — see [docs/text.md](docs/text.md).
 
 PNG/JPEG images decode client-side (`loadImage`) and composite server-side
-via `ctx.drawImage` ([docs/images.md](docs/images.md)). An `HtmlView`
-widget renders a static HTML + CSS subset — block flow and flexbox laid
-out by yoga-layout, no scripts, no network — with app-controlled link
-navigation ([docs/html.md](docs/html.md)). An `SvgView` widget renders
-static SVG (shapes, gradients, transforms, `use`) through the same 2d
-pipeline ([docs/svg.md](docs/svg.md)).
+via `ctx.drawImage` ([docs/images.md](docs/images.md)). An `SvgView` widget
+renders static SVG (shapes, gradients, transforms, `use`) through the same
+2d pipeline ([docs/svg.md](docs/svg.md)).
+
+Rendering documents — markdown, formulas, rich text — is not ntk's job:
+it draws, and a document is a tree of layout decisions on top of that.
+[`@react-x11/components`](https://github.com/sidorares/react-x11-components)
+is where those live, over the react-x11 renderer.
 
 ```js
 import { createClient } from 'ntk';

package/lib/index.js

@@ -16,7 +16,6 @@ import {
   encodeXEmbedInfo,
   readXEmbedInfo
 } from './xembed.js';
-import { loadLayout } from './yoga.js';
 import { decodeKey, groupForState } from './keyboard.js';
 import Pixmap from './pixmap.js';
 import Picture from './picture.js';
@@ -50,13 +49,8 @@ import {
 import { DEFAULT_MASK_POLICY } from './maskcluster.js';
 import { DEFAULT_SHAPE_POLICY } from './shapeglyphs.js';
 import { TextLayout } from './text/layout.js';
-import HtmlView from './widgets/htmlview.js';
 import SvgView from './widgets/svgview.js';
-import MarkdownView from './widgets/markdownview.js';
-import TexView, { configureTex, layoutTex, TexBox } from './widgets/tex.js';
-import { tokenize as highlightCode } from './widgets/highlight.js';
-import { cssColorStraight, premultiply } from './color.js';
-import { cssColor, cssLength } from './widgets/css.js';
+import { cssColor, cssColorStraight, premultiply } from './color.js';
 
 // rendering context modules register themselves on Drawable. The direct one
 // comes last on purpose: it wraps the 'opengl' factory the indirect one just
@@ -116,11 +110,7 @@ export function createClient(options, callback) {
   const x11Options = { ...(options || {}) };
   if (x11Options.bufferRequests === undefined) x11Options.bufferRequests = DEFAULT_BUFFER_REQUESTS;
 
-  // the layout engine's WASM loads alongside the connection, so widgets are
-  // usable synchronously by the time the App exists (see lib/yoga.js)
-  const layout = loadLayout();
-
-  const connecting = new Promise((resolve, reject) => {
+  const promise = new Promise((resolve, reject) => {
     // Resolve the font spec here rather than lazily in `app.fonts`, so a
     // missing directory is a rejected connect instead of a surprise inside
     // the first paint. Inside the executor so it rejects rather than throws
@@ -206,8 +196,6 @@ export function createClient(options, callback) {
     });
   });
 
-  const promise = Promise.all([connecting, layout]).then(([app]) => app);
-
   if (callback) {
     promise.then(
       (app) => callback(null, app),
@@ -268,18 +256,10 @@ export {
   DEFAULT_MASK_POLICY,
   DEFAULT_SHAPE_POLICY,
   TextLayout,
-  HtmlView,
   SvgView,
-  MarkdownView,
-  TexView,
-  TexBox,
-  layoutTex,
-  configureTex,
-  highlightCode,
   cssColor,
   cssColorStraight,
   premultiply,
-  cssLength,
   decodeKey,
   groupForState,
   // the `code` on a failed GL setup: branch on it rather than on the message
@@ -289,11 +269,4 @@ export {
   GL_MODES,
   DEFAULT_GL_POLICY
 };
-// The layout engine ntk lays HtmlView out with — downstream layout consumers
-// (e.g. the react-x11 renderer) must import it from here rather than from
-// `yoga-layout`, or they get a second WASM instance whose Nodes cannot be
-// mixed with ntk's. Its enum constants are readable as soon as ntk is
-// imported; `Node`/`Config` need the WASM, which `createClient()` loads —
-// `loadLayout()` is there for widgets used without an App.
-export { default as Yoga, loadLayout, layoutLoaded } from './yoga.js';
 export default { createClient };

package/lib/text/layout.js

@@ -51,10 +51,10 @@ export class TextLayout {
     const maxWidth = options.maxWidth ?? Infinity;
 
     // ---- normalize spans, resolve fonts eagerly ----
-    // unknown span fields ride along untouched (widgets attach markers like
-    // MarkdownView's _deco/_href and read them back from line runs)
-    // An empty span list is a legitimate thing to lay out — MarkdownView
-    // reaches it for a blank paragraph while a document is being typed —
+    // unknown span fields ride along untouched, so a caller can attach its
+    // own markers to a span and read them back off the line runs
+    // An empty span list is a legitimate thing to lay out — a document view
+    // reaches it for a blank paragraph while one is being typed —
     // and every line still needs a style to take its metrics from, so
     // stand one in rather than crashing on the first empty line.
     const given = typeof content === 'string' ? [{ text: content }] : content;

package/lib/widgets/svgview.js

@@ -9,7 +9,7 @@
 //   view.setSvg('<svg viewBox="0 0 24 24">…</svg>');
 //   wnd.map();
 //
-// Standalone (windowless) use mirrors HtmlView/MarkdownView:
+// Standalone (windowless) use, which is how a document renderer drives it:
 //   const view = new SvgView(null);
 //   view.setSvg(svgText);
 //   view.draw(ctx, x, y, width, height);
@@ -59,7 +59,7 @@ const STYLE_ATTRS = {
 const NUMERIC = new Set(['strokeWidth', 'miterLimit', 'fillOpacity', 'strokeOpacity', 'fontSize']);
 
 // documents may come from an XML parse (setSvg: exact case) or from an HTML
-// parse (HtmlView inline <svg>: tag/attribute names lowercased) — compare
+// parse (inline <svg>: tag/attribute names lowercased) — compare
 // names lowercased and look attributes up by their lowercase form too
 const tag = (node) => (node.name || '').toLowerCase();
 
@@ -342,8 +342,9 @@ export default class SvgView {
   }
 
   /**
-   * Adopt an already-parsed `<svg>` element (htmlparser2 DOM node) — used
-   * by HtmlView for inline SVG. HTML-mode parses (lowercased tag/attribute
+   * Adopt an already-parsed `<svg>` element (htmlparser2 DOM node) — how a
+   * host document hands over its inline SVG, and how react-x11's `<svg>`
+   * element passes JSX children. HTML-mode parses (lowercased tag/attribute
    * names) are handled.
    */
   setSvgDom(element) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ntk",
-  "version": "7.7.0",
+  "version": "8.0.0",
   "description": "Desktop UI toolkit for X11 with canvas-like 2d and OpenGL rendering",
   "author": "Andrey Sidorov <sidorares@yandex.ru>",
   "license": "MIT",
@@ -36,21 +36,15 @@
   "dependencies": {
     "bidi-js": "^1.0.3",
     "canvas-fontstyle": "^1.0.1",
-    "css-select": "^7.0.0",
     "domutils": "^4.0.2",
     "extrude-polyline": "^1.0.6",
     "fontkit": "^2.0.4",
-    "highlight.js": "^11.11.1",
     "htmlparser2": "^12.0.0",
     "jpeg-js": "^0.4.4",
-    "katex": "^0.18.1",
     "linebreak": "^1.1.0",
-    "marked": "^18.0.7",
     "parse-color": "^1.0.0",
     "pngjs": "^7.0.0",
-    "postcss": "^8.5.23",
-    "x11": "^3.9.0",
-    "yoga-layout": "^3.2.1"
+    "x11": "^3.9.0"
   },
   "optionalDependencies": {
     "x11-dri": ">=0.2.0 <1"
@@ -60,6 +54,7 @@
     "check-release-message": "node scripts/check-release-message.mjs"
   },
   "devDependencies": {
-    "@conventional-commits/parser": "^0.4.1"
+    "@conventional-commits/parser": "^0.4.1",
+    "katex": "^0.18.1"
   }
 }