pdf-codec 1.8.0 → 1.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +10 -6
- package/dist/codec.d.cts +12 -0
- package/dist/codec.d.ts +12 -0
- package/dist/content-write.cjs +177 -5
- package/dist/content-write.d.cts +1 -1
- package/dist/content-write.d.ts +1 -1
- package/dist/content-write.js +178 -6
- package/dist/{embedded-font-CLedn-mT.d.cts → embedded-font-BU6Jgcof.d.cts} +7 -1
- package/dist/{embedded-font-CbqkKgBl.d.ts → embedded-font-fREdbxnr.d.ts} +7 -1
- package/dist/embedded-font-write.d.cts +1 -1
- package/dist/embedded-font-write.d.ts +1 -1
- package/dist/embedded-font.cjs +22 -5
- package/dist/embedded-font.d.cts +2 -2
- package/dist/embedded-font.d.ts +2 -2
- package/dist/embedded-font.js +22 -5
- package/dist/{font-registry-yby02snZ.d.cts → font-registry-B5qL0Vi0.d.cts} +1 -1
- package/dist/{font-registry-Cn7P9lAh.d.ts → font-registry-mgdbNP8_.d.ts} +1 -1
- package/dist/font-registry.d.cts +1 -1
- package/dist/font-registry.d.ts +1 -1
- package/dist/gpos-table.cjs +189 -0
- package/dist/gpos-table.d.cts +6 -0
- package/dist/gpos-table.d.ts +6 -0
- package/dist/gpos-table.js +188 -0
- package/dist/index.d.cts +2 -2
- package/dist/index.d.ts +2 -2
- package/dist/math-table.cjs +7 -21
- package/dist/math-table.js +7 -21
- package/dist/measure.d.cts +1 -1
- package/dist/measure.d.ts +1 -1
- package/dist/ot-layout-common.cjs +95 -0
- package/dist/ot-layout-common.d.cts +10 -0
- package/dist/ot-layout-common.d.ts +10 -0
- package/dist/ot-layout-common.js +93 -0
- package/dist/write.d.cts +2 -2
- package/dist/write.d.ts +2 -2
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -175,11 +175,11 @@ The package is layered from generic primitives outward to the codec itself:
|
|
|
175
175
|
- **`src/util/`** — two small, independently-duplicated copies of logic that lives elsewhere in the family for a reason narrow enough not to warrant a shared dependency: `base64.ts` (isomorphic base64 ⇄ `Uint8Array`, a verbatim copy of `odf.js`'s own `src/util/base64.ts`, replacing a dependency this codec used to have on `ooxml.js` purely for this one helper pair) and `abort.ts` (`throwIfAborted`, a four-line signal-check helper called at every page loop boundary in `write.ts`/`read.ts` — there is no `await` point in this package's synchronous reader/writer pipeline for cancellation to hook into implicitly, so every long-running loop checks explicitly instead; a duplicate of `documents.js`'s own `src/ports/abort.ts`, which stays there since other, non-PDF consumers still depend on it in that repository).
|
|
176
176
|
- **`src/crypto/`** — MD5, SHA-256/384/512, RC4, and AES-CBC, hand-written with zero local imports, exactly like `src/bytes/`. Not a preference: ISO 32000-1's own key-derivation algorithms name MD5 and RC4 directly, neither of which any platform crypto API this package could portably reach still offers, and `crypto.subtle` is asynchronous where this codec's read path is synchronous end to end. Reaching for `node:crypto` would put a Node builtin inside a `src/` tree that deliberately has none and is built with `platform: 'neutral'`, breaking the browser bundle its downstream consumer depends on. Each module cites the specification it implements (RFC 1321, FIPS 180-4, FIPS 197) and is tested against that specification's own published conformance vectors. MD5 and RC4 are cryptographically broken and are here solely to *read* files that already exist and whose format mandates them.
|
|
177
177
|
- **The codec itself, importing only `math-types`/`formula`/`bytes`/`image`/`crypto` (no OOXML or ODF knowledge at all):**
|
|
178
|
-
- **Write**: `objects.ts` (the `PdfObject` discriminated union), `afm-widths.ts`/`encoding.ts`/`winansi.ts`/`fonts.ts` (standard-14 metrics, WinAnsi encoding, family resolution), `font-registry.ts` (the source-document → caller-supplied → vendored-substitute → standard-14 resolution port sitting in front of `resolveStandardFont`, plus `resolveFaceWithRegistry`, the one step both the measurer and the writer resolve through so they can never disagree about which face a `LayoutFont` means), `measure.ts`/`text-layout.ts` (greedy line-wrapping, measured against either a standard-14 face's AFM widths plus a per-family correction or a resolved face's own real `hmtx` advances — never both, see [Fidelity](#fidelity)), `matrix.ts`, `content-write.ts` (`LayoutItem[]` → content-stream operators, with text branching on whether its font resolved to a standard-14 face shown as a WinAnsi byte string or an embedded one shown as Identity-H 2-byte CIDs), `write.ts` (the full object graph, classic cross-reference table, trailer, and — when `WritePdfOptions.formulas` is non-empty — one embedded math composite font group, plus one embedded text font group per face `WritePdfOptions.fonts` resolved, each allocated once in a fixed sorted order and shared across pages).
|
|
179
|
-
- **sfnt font tables**: `sfnt.ts` (a bounds-checked sfnt table-directory reader, big-endian primitive readers, and the `hasBytes` range check every table parser below pre-checks with), `cmap-table.ts` (Unicode → glyph ID, formats 4/12/6), `hmtx-table.ts` (per-glyph advance widths), `font-tables.ts` (`head`/`maxp`/`OS/2`/`post`/`name` — design grid, glyph count, vertical metrics and style bits, italic angle and underline geometry, PostScript and family names), `glyf.ts` (the `loca` offset index, per-glyph headers, a composite glyph's own component records — a composite refers to its base letter and combining marks by glyph ID, and those references nest, so subsetting one safely means taking the transitive closure over this walk — and `glyphInkBounds`, a glyph's own tight ink box, read straight out of a simple glyph's header where the format already states it and unioned from a composite's own transformed, placed components where it does not), and `math-table.ts` (the OpenType `MATH` table's constants, glyph-info, and variants subtables). Every one of these parsers degrades to `undefined` on a missing or truncated table rather than throwing: the vendored fonts are trusted, but a font extracted from an arbitrary source document is not.
|
|
180
|
-
- **sfnt subsetting**: `sfnt-subset.ts` (a TrueType-outline glyph subsetter: Unicode code points → glyph IDs through `cmap-table.ts`, the transitive closure over `glyf.ts`'s composite-component walk, then a rebuilt sfnt container carrying only those glyphs' outlines). **Glyph IDs are preserved, never renumbered** — an unused ID below the highest used one survives as an empty `loca` entry rather than being squeezed out — which keeps every composite's own component references correct inside bytes copied verbatim, keeps a caller's already-resolved glyph IDs valid against the subset, and makes CID == GID trivially true for the embedded program (a `/CIDFontType2` then needs only `/CIDToGIDMap /Identity`). The output rebuilds `head`/`hhea`/`maxp`/`loca`/`glyf`/`hmtx` (with `indexToLocFormat` forced long, one always-legal code path), copies the hinting programs (`cvt `/`fpgm`/`prep`) verbatim, stubs `post` as a version 3.0 "no glyph names" header, and omits `cmap`/`name`/`OS/2`/`GSUB`/`GPOS`/`kern` — none of which an embedded `CIDFontType2` program is read through (ISO 32000-1 9.9). The honest cost of preserving IDs: `loca` and `hmtx` stay proportional to the highest used glyph ID rather than to the number of glyphs kept, so for a document touching one glyph near the end of a large font's glyph order, most of the (already much smaller) output is those two index tables rather than outline data. Applies to `glyf`-flavoured fonts only; a CFF-flavoured one returns `undefined`, the same scope boundary [Fidelity](#fidelity) states for the embedded math font.
|
|
178
|
+
- **Write**: `objects.ts` (the `PdfObject` discriminated union), `afm-widths.ts`/`encoding.ts`/`winansi.ts`/`fonts.ts` (standard-14 metrics, WinAnsi encoding, family resolution), `font-registry.ts` (the source-document → caller-supplied → vendored-substitute → standard-14 resolution port sitting in front of `resolveStandardFont`, plus `resolveFaceWithRegistry`, the one step both the measurer and the writer resolve through so they can never disagree about which face a `LayoutFont` means), `measure.ts`/`text-layout.ts` (greedy line-wrapping, measured against either a standard-14 face's AFM widths plus a per-family correction or a resolved face's own real `hmtx` advances — never both, see [Fidelity](#fidelity)), `matrix.ts`, `content-write.ts` (`LayoutItem[]` → content-stream operators, with text branching on whether its font resolved to a standard-14 face shown as a WinAnsi byte string with `Tj` or an embedded one shown as Identity-H 2-byte CIDs, split at that face's own pair-kerning adjustments into a `TJ` array where it has any to apply and shown as a single unsplit `Tj` string where it does not, and with a stroked line's or path's own `style` becoming either a real dash-array/line-cap state pair around the paint operator or, for `double`, two perpendicular-offset copies of the geometry — see [Gotchas](#gotchas-and-quirks)), `write.ts` (the full object graph, classic cross-reference table, trailer, and — when `WritePdfOptions.formulas` is non-empty — one embedded math composite font group, plus one embedded text font group per face `WritePdfOptions.fonts` resolved, each allocated once in a fixed sorted order and shared across pages).
|
|
179
|
+
- **sfnt font tables**: `sfnt.ts` (a bounds-checked sfnt table-directory reader, big-endian primitive readers, and the `hasBytes` range check every table parser below pre-checks with), `cmap-table.ts` (Unicode → glyph ID, formats 4/12/6), `hmtx-table.ts` (per-glyph advance widths), `font-tables.ts` (`head`/`maxp`/`OS/2`/`post`/`name` — design grid, glyph count, vertical metrics and style bits, italic angle and underline geometry, PostScript and family names), `glyf.ts` (the `loca` offset index, per-glyph headers, a composite glyph's own component records — a composite refers to its base letter and combining marks by glyph ID, and those references nest, so subsetting one safely means taking the transitive closure over this walk — and `glyphInkBounds`, a glyph's own tight ink box, read straight out of a simple glyph's header where the format already states it and unioned from a composite's own transformed, placed components where it does not), and `math-table.ts` (the OpenType `MATH` table's constants, glyph-info, and variants subtables). `ot-layout-common.ts` holds the two Common Table Formats every OpenType Layout table indexes glyphs through — Coverage and ClassDef — stored as sorted glyph ranges and searched by bisection rather than expanded into a glyph-keyed map, since six bytes of a format 2 record can legitimately declare a 65536-glyph range and expanding every range of every subtable turns a small untrusted font into a large allocation. `gpos-table.ts` reads a face's own `GPOS` table for exactly one thing: how much the font wants the advance of glyph A adjusted when glyph B follows it. It resolves the `kern` feature through the ScriptList (rather than sweeping the FeatureList for every feature tagged `kern`, which is what would apply a font's Cyrillic or Greek kerning lookups to Latin text), handles both PairPos subtable formats and the LookupType 9 Extension indirection — all three are real code paths, since Carlito reaches its kerning only through Extension-wrapped format 2 subtables while Caladea uses LookupType 2 directly and mixes formats inside one lookup — and reads only the first glyph's XAdvance, the one field a horizontal left-to-right run's next glyph position can depend on. Mark attachment, cursive joining, and contextual positioning have no consumer in a codec that positions glyphs itself, so they are not parsed. Every one of these parsers degrades to `undefined` on a missing or truncated table rather than throwing: the vendored fonts are trusted, but a font extracted from an arbitrary source document is not.
|
|
180
|
+
- **sfnt subsetting**: `sfnt-subset.ts` (a TrueType-outline glyph subsetter: Unicode code points → glyph IDs through `cmap-table.ts`, the transitive closure over `glyf.ts`'s composite-component walk, then a rebuilt sfnt container carrying only those glyphs' outlines). **Glyph IDs are preserved, never renumbered** — an unused ID below the highest used one survives as an empty `loca` entry rather than being squeezed out — which keeps every composite's own component references correct inside bytes copied verbatim, keeps a caller's already-resolved glyph IDs valid against the subset, and makes CID == GID trivially true for the embedded program (a `/CIDFontType2` then needs only `/CIDToGIDMap /Identity`). The output rebuilds `head`/`hhea`/`maxp`/`loca`/`glyf`/`hmtx` (with `indexToLocFormat` forced long, one always-legal code path), copies the hinting programs (`cvt `/`fpgm`/`prep`) verbatim, stubs `post` as a version 3.0 "no glyph names" header, and omits `cmap`/`name`/`OS/2`/`GSUB`/`GPOS`/`kern` — none of which an embedded `CIDFontType2` program is read through (ISO 32000-1 9.9). Dropping `GPOS` costs the document no kerning even though its pairs are now genuinely applied: the adjustments are resolved at write time and written into the page's own `TJ` array, so a consumer reads them off the content stream rather than out of the font program. The honest cost of preserving IDs: `loca` and `hmtx` stay proportional to the highest used glyph ID rather than to the number of glyphs kept, so for a document touching one glyph near the end of a large font's glyph order, most of the (already much smaller) output is those two index tables rather than outline data. Applies to `glyf`-flavoured fonts only; a CFF-flavoured one returns `undefined`, the same scope boundary [Fidelity](#fidelity) states for the embedded math font.
|
|
181
181
|
- **Embedded math font**: `math-font.ts` (parses and caches the vendored STIX Two Math font once per process, exposing a size-specific `MathFontMetrics` implementation and a points-in/points-out stretchy-glyph entry point), `math-stretch.ts` (the OpenType MATH two-stage stretching model over that parsed `MathVariants` data: pick the smallest pre-built variant that reaches the target, else assemble from repeated parts with every seam overlapped inside both sides' own declared connector lengths -- unit-agnostic, so it works in design units or points alike), `math-font-write.ts` (builds the `/Type0`/`/CIDFontType0`/`/FontDescriptor`/`/FontFile3`/ToUnicode object group), `math-content-write.ts` (a `PositionedFormula[]` → PDF content-stream bytes, Identity-H 2-byte CIDs for text-showing, `re`/`m`/`l` operators for rules and the radical hook, and one glyph-ID-addressed text object per placement of a stretched construction, wrapped in an `/ActualText` marked-content span). See [Fidelity](#fidelity) for the CFF-full-embed (not glyph-subsetted) simplification this makes.
|
|
182
|
-
- **Embedded text faces**: `embedded-font.ts` (parses and caches one TrueType-outline face's `cmap`/`hmtx`/`hhea`/`head`/`OS/2`/`post`/`name` metrics, and `encodeForShowEmbedded`, the single code path both measurement and text-showing go through — the same reason `winansi.ts`'s `encodeForShow` exists, since encoding and measuring separately lets the two disagree about which characters resolved to which glyph and silently desyncs a computed wrap point from the drawn line). Every geometry field it exposes is converted into PDF's 1000-units-per-em glyph space (ISO 32000-1 9.8.1), which a font's own design grid frequently is not: STIX Two Math is drawn on a 1000-unit em so that factor is an identity for the math font, but Carlito is drawn on a 2048-unit em, where getting the conversion wrong is silent rather than loud — the font simply renders with roughly twice its intended metrics and nothing anywhere reports an error. The serif flag a `/FontDescriptor` needs is read off the face's own PANOSE classification rather than guessed from its family name. `embedded-font-write.ts` builds the `/Type0`/`/CIDFontType2`/`/FontDescriptor`/`/FontFile2`/ToUnicode object group, with `/CIDToGIDMap /Identity` written explicitly (stating outright the CID == GID invariant `sfnt-subset.ts`'s GID-preserving design guarantees) and `/Length1` set to the **uncompressed** subset length — the single most commonly mis-set key in TrueType embedding, since the obvious-looking value, the stream's own `/Length`, is silently accepted by lenient readers and rejected by strict ones. Its subset tag (`ABCDEF+Carlito-Regular`, six uppercase letters per 9.6.4) is a CRC32 over the face's PostScript name and its exact ascending glyph-ID list, so identical input yields byte-identical output and two subsets of one face carrying different glyphs can never be mistaken for one another.
|
|
182
|
+
- **Embedded text faces**: `embedded-font.ts` (parses and caches one TrueType-outline face's `cmap`/`hmtx`/`hhea`/`head`/`OS/2`/`post`/`name` metrics and its own `GPOS` pair kerning, and `encodeForShowEmbedded`, the single code path both measurement and text-showing go through — the same reason `winansi.ts`'s `encodeForShow` exists, since encoding and measuring separately lets the two disagree about which characters resolved to which glyph and silently desyncs a computed wrap point from the drawn line). Pair kerning is applied inside that same one path, for that same one reason: one pass over one glyph sequence produces both the run's width and the list of adjustments `content-write.ts` positions its glyphs by, so a measurement that included kerning while the page drew unkerned glyphs (or the reverse) is not a state this can reach. Kerning is looked up between the glyphs that will actually be shown, `.notdef` included, matching the same "measure what will be drawn, not what was asked for" rule the missing-glyph handling already follows. Every geometry field it exposes is converted into PDF's 1000-units-per-em glyph space (ISO 32000-1 9.8.1), which a font's own design grid frequently is not: STIX Two Math is drawn on a 1000-unit em so that factor is an identity for the math font, but Carlito is drawn on a 2048-unit em, where getting the conversion wrong is silent rather than loud — the font simply renders with roughly twice its intended metrics and nothing anywhere reports an error. The serif flag a `/FontDescriptor` needs is read off the face's own PANOSE classification rather than guessed from its family name. `embedded-font-write.ts` builds the `/Type0`/`/CIDFontType2`/`/FontDescriptor`/`/FontFile2`/ToUnicode object group, with `/CIDToGIDMap /Identity` written explicitly (stating outright the CID == GID invariant `sfnt-subset.ts`'s GID-preserving design guarantees) and `/Length1` set to the **uncompressed** subset length — the single most commonly mis-set key in TrueType embedding, since the obvious-looking value, the stream's own `/Length`, is silently accepted by lenient readers and rejected by strict ones. Its subset tag (`ABCDEF+Carlito-Regular`, six uppercase letters per 9.6.4) is a CRC32 over the face's PostScript name and its exact ascending glyph-ID list, so identical input yields byte-identical output and two subsets of one face carrying different glyphs can never be mistaken for one another.
|
|
183
183
|
- **ToUnicode CMaps**: `tounicode.ts`, shared by both embedded-font writers above rather than duplicated in each — a character code → Unicode code point mapping written as a bfchar CMap (9.10.3), with supplementary-plane code points encoded as genuine UTF-16BE surrogate pairs and entries emitted in blocks of at most 100, the limit the CMap syntax sets and one a subsetted text face routinely exceeds. A glyph with no code point to map back to (a stretchy construction's own unencoded pieces) is dropped from the CMap rather than mapped to a stand-in that would extract as the wrong character; the `/ActualText` span around such a construction carries its real text instead.
|
|
184
184
|
- **CFF reading**: `cff.ts` holds the two container structures every CFF program is built out of — the `INDEX` and the `DICT` — shared by the two readers built on it rather than hand-rolled twice. `cff-bounds.ts` is a Type 2 charstring interpreter that computes each glyph's own tight ink bounding box: a CFF glyph, unlike a TrueType one, stores no bounding box anywhere, so the only way to know what area it covers is to run its outline program. It is a path *walker*, not a rasteriser — it tracks the current point through every path-construction operator and solves each cubic's real extrema from the roots of its own derivative, so a bound it reports is genuinely tight rather than a control-point hull. Hint operators are decoded only far enough to know how many bytes a following `hintmask` consumes. Verified against the vendored STIX Two Math font's whole 5,543-glyph repertoire: every glyph matches fontTools' own `BoundsPen` to within 0.01 design units, and the union of all 5,543 computed boxes lands exactly on the font's own `head` table `FontBBox`. Out of scope, each reported as `undefined` rather than guessed at: a CID-keyed program (its local subroutines live per-FD behind `FDArray`/`FDSelect`), `endchar` in its four-argument seac-like form (which needs the charset and Standard Encoding to resolve into two other glyphs), and the arithmetic/storage/conditional escaped operators. `cff-probe.ts` reads a bare CFF program's header, Name INDEX, and just enough of its Top DICT to detect the `ROS` operator (the escaped `12 30` whose presence *is* the definition of a CID-keyed font, CFF 1.0 Appendix H). It exists to make the embedding path **refuse** such a font rather than mis-embed it: a CID-keyed CFF carries its own charset mapping CIDs onto glyph indices, so CID == GID does not hold, and showing text through Identity-H against one anyway produces no error anywhere — the file is structurally valid, every reader accepts it, and the page simply renders the wrong glyphs. Not wired into any write path yet; it is the guard a later source-embedded-font phase needs. It correctly reports the vendored STIX Two Math font's own `CFF ` table as *not* CID-keyed, which is what makes `math-font-write.ts`'s existing embedding sound.
|
|
185
185
|
- **Read**: `lexer.ts`/`parse.ts` (byte tokenizer and tokens → `PdfObject`), `filters.ts`/`predictors.ts` (Flate/LZW/ASCII85/ASCIIHex/RunLength/CCITTFax, TIFF/PNG predictors), `xref.ts`/`document.ts` (classic and cross-reference-stream resolution, object streams, `/Prev` chains, linear-scan recovery, the page tree with attribute inheritance), `encrypt.ts` (the standard security handler: `/Encrypt` parsing, empty-user-password key derivation and `/U` verification, per-object keys, and the string/stream decryption `document.ts` applies transparently as each indirect object is fetched — see [Gotchas](#gotchas-and-quirks)), `content-read.ts`/`interpret.ts` (the content-stream tokenizer and graphics/text state machine, including form-XObject recursion and general vector-path tracking — see [Gotchas](#gotchas-and-quirks)), `cmap.ts`/`font-style.ts`/`font-read.ts` (`/ToUnicode` CMaps, font-dictionary resolution), `images-read.ts` (Image XObjects → PNG/JPEG bytes), `read.ts` (`readPdf`, assembling all of the above into a `LayoutDocument`).
|
|
@@ -215,8 +215,12 @@ Dependency direction is strictly downward and checkable: `math-types`/`formula`/
|
|
|
215
215
|
- **Real per-glyph ink bounds are now measured from the outline, but `ascentPerEm`/`descentPerEm` still exist alongside them and a caller has to choose.** `MathGlyphMetrics.inkAscentPt`/`inkDescentPt` (and `MathFont.glyphInkBounds`, the same thing in design units) carry each glyph's own tight ink extent, computed by walking its Type 2 charstring — a full stop measures 0.12 em tall against the 1.0 em the font's nominal `hhea` metrics claim for every glyph alike. `ascentPerEm`/`descentPerEm` remain what they always were: one uniform figure for the whole face, still the right measure for anything sized against the font rather than against particular characters, and still the fallback for a glyph with no outline to measure (a space) or one `cff-bounds.ts` declines to walk, where both ink fields come back `undefined` together. The consumer that motivated this — `documents.js`'s own MathML `layoutToken` — now uses them: it takes the max ink ascent and max ink descent across a run's glyphs, falling back to the nominal metrics per glyph that carries no bounds.
|
|
216
216
|
- **An ink box is genuinely tight, which for a math font means it is often *larger* than the nominal metrics, not smaller.** The "ink is a fraction of the nominal extent" intuition holds for text-like glyphs (a full stop, a parenthesis, an `x`) and fails for the extension pieces, display-size operators, and pre-built large variants a math font is full of: over a tenth of STIX Two Math's repertoire draws above its own nominal ascent, and another tenth below its nominal descent, reaching 2.6 em up and 1.6 em down at the extremes. Sizing those from `ascentPerEm` under-reports them exactly as badly as it over-reports a full stop, which is the whole reason the per-glyph measurement exists.
|
|
217
217
|
- **A glyph's ink descent is negative where its lowest ink sits above the baseline.** `inkDescentPt` follows `descentPerEm`'s own sign convention (ink below the baseline is a positive descent), so a superscript-height glyph honestly reports a negative descent rather than a clamped zero. A consumer that needs a box which never crosses the baseline clamps at its own layer, where it can see what the box is for.
|
|
218
|
+
- **A `LayoutLine`/`LayoutPath` `style` of `dashed` or `dotted` becomes a real dash-array (`d`) operator scaled to that stroke's own width, and `double` becomes two genuinely separate offset strokes.** Dash lengths are multiples of the stroke width rather than fixed point lengths, so a hairline rule and a thick one both read as recognisably dashed: `dashed` emits `[3w 3w] 0 d`, `dotted` emits `[0 2w] 0 d` together with a `1 J` round cap. That zero on-length is deliberate and load-bearing — a zero-length dash under a round cap paints its two caps over the same point, i.e. one filled circle of diameter `w`, which is exactly a dot, whereas any non-zero on-length paints a capsule that reads as a short dash. Under PDF's DEFAULT butt cap the identical array paints nothing at all, which is why the `J` operator is not decoration here. Both are reset (`[] 0 d`, and `0 J` after a dotted stroke) immediately after the paint operator: the graphics state persists for the whole content stream, so a dashed table rule left un-reset would silently dash every later line, rect, ellipse, path, and text underline on the same page. `double` has no PDF operator at all and is drawn as geometry instead — the declared width `w` splits into three equal bands (ink, gap, ink), so each rule is `w/3` wide with its centreline `w/3` either side of the original, putting the pair's outer edges exactly where the single solid stroke's own edges would have been. A `LayoutPath`'s two offset copies move each ON-PATH point along the bisector of its two adjacent chord normals (a closed subpath's implicit `h` edge included, since that is real ink) and each cubic control point along its own segment's chord normal — a chord-based approximation of a true parallel curve, which for a cubic is not itself a cubic and cannot be written as one, but at an offset of a third of a stroke width the difference sits far below the width of the ink being drawn. A `double` path's fill, if it has one, paints once from the original un-offset geometry: doubling describes the rule drawn along the path, not the region it encloses. Two boundaries worth stating outright: a zero-length `double` line has no direction to be perpendicular to and falls back to a single stroke at its declared width, and `LayoutRect`/`LayoutEllipse` carry no `style` field at all in document-schema.js, so there is nothing to apply to them.
|
|
219
|
+
- **Nothing on the read side recovers a stroke style.** `interpret.ts` ignores `d` and `J` along with every other graphics-state operator outside its extraction scope, so a dashed line read back through `readPdf` comes back solid, and a `double` one comes back as the two separate strokes it genuinely is in the file. This is the same asymmetry the rest of the writer already has (see the general-vector-path gotcha below): PDF records what was painted, not the authoring intent behind it, and inferring "these two parallel strokes were one double rule" from geometry would be reconstruction guesswork of a kind nothing else in this parser does.
|
|
218
220
|
- **An embedded `CIDFontType2` program needs no `cmap` table of its own, and `sfnt-subset.ts`'s output doesn't carry one — this is a property of the spec, not an oversight this package works around.** `cmap` maps a character code to a glyph ID for a *simple* font; a `Type0` composite font never asks the embedded font program to do that lookup at all. Character code → CID goes through the `Type0` font's own `/Encoding` (Identity-H here, so CID == character code by construction for the 2-byte codes this package writes), and CID → GID goes through `/CIDToGIDMap` (`/Identity` here, matching `sfnt-subset.ts`'s own GID-preserving design). Both steps happen inside the PDF's own object graph, entirely before the embedded font program is ever consulted — ISO 32000-1 9.7.4.2. This is exactly why the subset output can safely omit `cmap` alongside `name`/`OS/2`/`GSUB`/`GPOS`/`kern` (see Architecture above): none of the five is on the code-path a `CIDFontType2` reader actually walks.
|
|
219
|
-
-
|
|
221
|
+
- **`GPOS` pair kerning is read and applied for an embedded face; no other OpenType layout feature is.** An embedded run's glyphs are placed at their own `hmtx` advances adjusted by the font's own pair kerning, written into the page as a real `TJ` array (see the gotcha below). `GSUB` is a different matter and is genuinely not supported: ligature substitution, contextual alternates, and small caps are never applied, so a face's `fi` ligature is drawn as two separate glyphs. The legacy `kern` table is not read either, and nothing is lost by that for the vendored families — neither Carlito nor Caladea ships one in any face; both carry all of their real pair kerning in `GPOS`.
|
|
222
|
+
- **A kerned run is shown with `TJ`, and the sign of a `TJ` number is the opposite of the adjustment it expresses.** ISO 32000-1 9.4.3 defines a number in a `TJ` array as being SUBTRACTED from the current horizontal coordinate, in thousandths of a unit of text space — so a positive number moves the next glyph closer, and a pair the font tightens by 43.457 glyph-space units is written as `+43.457`, not `-43.457`. `content-write.ts` negates the advance delta at exactly that one point, and `interpret.ts`'s own `TJ` handling is the reader half of the same convention, so a page written here and read back through this package's own parser recovers the positions it was written with (`write-embedded-font.test.ts` asserts that round trip specifically, since it is what settles the direction empirically rather than by argument from the specification alone). A run whose adjacent pairs the face kerns nothing about is still shown as one unsplit hex string with `Tj`, byte for byte what this package emitted before kerning existed — only a genuinely kerned run pays for an array.
|
|
223
|
+
- **Kerning applies to whole shown strings, so a wrap decision does not see a pair straddling the boundary between two separately-measured words.** `text-layout.ts` decides where a line breaks by summing separately-measured word and whitespace atoms, and a pair spanning one of those boundaries (Caladea kerns a comma or a full stop against a following space by -30 design units; Carlito kerns nothing against a space at all) is therefore not counted at that one decision point. Everything downstream of the decision is exact: a fragment's reported width and the glyphs actually drawn for it both come from measuring that whole fragment in one call, so the width a line reports is the width the page draws. Making the wrap decision itself exact would mean widening the `TextMeasurer` port with a cross-string pair-adjustment method — a public API change for a sub-point difference that, for both vendored families, only ever errs towards breaking a line early rather than overrunning a column.
|
|
220
224
|
- **`font-substitutes.ts` maps both `Calibri` and `Calibri Light` onto the same, ordinary-weight Carlito face.** Carlito ships only one weight per style axis (regular/bold/italic/bolditalic) — there is no distinct Light design to embed — so `Calibri Light` substitutes to standard Carlito rather than a genuinely lighter face. An honest, documented approximation (see that file's own top-of-file comment), not a faithful weight match: a caller relying on Calibri Light's visibly thinner strokes will not see them, only its width metrics.
|
|
221
225
|
- **`cff-probe.ts`'s CID-keyed CFF guard exists for a source-embedded-font phase this package hasn't built yet — it is not wired into any write path today, and today's embedding never needs it.** Every face this package currently embeds — the vendored Carlito/Caladea substitutes, and any caller-supplied face via `sourceFonts`/`fonts` — is `glyf`-flavoured TrueType, and `sfnt-subset.ts` already refuses (returns `undefined` for) anything that isn't before `cff-probe.ts` would ever run against it. The guard is what a future phase embedding a real, subsetted CFF program (rather than the whole-table CFF embed `math-font-write.ts` already does for STIX Two Math) will need before it can trust CID == GID against an arbitrary caller-supplied font: a CID-keyed CFF carries its own CID → glyph-index charset, so that identity does not hold for one, and nothing about the file signals the mismatch to a reader — it just renders the wrong glyphs.
|
|
222
226
|
|
|
@@ -252,7 +256,7 @@ Dependency direction is strictly downward and checkable: `math-types`/`formula`/
|
|
|
252
256
|
|
|
253
257
|
**Supply a `FontRegistry` (`createFontRegistry()`) and Calibri and Cambria stop being an approximation at all.** The vendored Carlito and Caladea faces are the real, metric-compatible TrueType families those two names substitute for, resolved automatically with no caller configuration needed. Aptos still has no vendored substitute — it falls back to the same width-corrected standard-14 approximation as any other unlisted family, registry or not. The mechanism: a resolved face is measured at its own real `hmtx` advances (never the width-correction table, which is not consulted at all on that path — applying both would silently draw text narrower than it was measured and overrun its column), underlined at its own `post` geometry, subsetted to the glyphs the document actually uses, and embedded as a real `/Type0` + `/CIDFontType2` + `/FontFile2` group. A caller's own `fonts`/`sourceFonts` extend the same resolution to any TrueType-outline face. The honest remaining limits: only TrueType (`glyf`) outlines can be embedded, since `sfnt-subset.ts` rebuilds outline tables rather than re-encoding CFF charstrings (a resolved face with no `glyf` throws rather than silently falling back to a different font than the caller asked for); a character the face has no glyph for is drawn as `.notdef` and reported through `onMissingGlyph` rather than substituted; and which of a font's three competing vertical-metric sets drives line height is a caller-chosen policy, not a settled fact (see `VerticalMetricPolicy` above).
|
|
254
258
|
|
|
255
|
-
**The acceptance bar for embedded-font fidelity is deliberately "no page-count drift on a real corpus", not "line-identical".**
|
|
259
|
+
**The acceptance bar for embedded-font fidelity is deliberately "no page-count drift on a real corpus", not "line-identical".** An embedded run is placed at the face's own `hmtx` advances adjusted by the face's own `GPOS` pair kerning — measured and drawn from one shared computation, so the two cannot disagree — which is a genuine step towards what the original authoring application would produce rather than an approximation of it. What still separates this from line-identical output is everything else an OpenType shaping engine does: `GSUB` ligatures and contextual alternates are never applied, and kerning is applied within each shown string rather than across the whitespace boundaries a wrap decision measures separately (see [Gotchas](#gotchas-and-quirks) for both). What the bar does guarantee: a real document measured and drawn through the same resolved face's own advances will not silently reflow onto a different number of pages the way a width-corrected standard-14 substitute occasionally can.
|
|
256
260
|
|
|
257
261
|
**The one exception is math-formula rendering (`WritePdfOptions.formulas`): this genuinely embeds a real, hand-parsed font.** Real box-model glyph runs are shown through the embedded STIX Two Math font with genuine per-glyph metrics (advance width, italic correction, top-accent attachment) and font-wide layout constants (axis height, fraction/radical rule thickness and gaps, script shift amounts) parsed directly from that font's own `MATH` table — not approximated or hand-tuned. Stretchy constructions are real too: a `MathVariants` variant or part assembly is resolved, measured against actual glyph outlines, and drawn by glyph ID. See [Gotchas](#gotchas-and-quirks) for the exact boundary of what this package's own font parsing does and doesn't cover (the CFF-full-embed simplification, and what a stretched construction costs in ToUnicode terms).
|
|
258
262
|
|
package/dist/codec.d.cts
CHANGED
|
@@ -83,6 +83,12 @@ declare const pdfCodec: z.ZodCodec<z.ZodCustom<Uint8Array<ArrayBuffer>, Uint8Arr
|
|
|
83
83
|
b: z.ZodNumber;
|
|
84
84
|
}, z.core.$strip>;
|
|
85
85
|
widthPt: z.ZodNumber;
|
|
86
|
+
style: z.ZodOptional<z.ZodEnum<{
|
|
87
|
+
solid: "solid";
|
|
88
|
+
dashed: "dashed";
|
|
89
|
+
dotted: "dotted";
|
|
90
|
+
double: "double";
|
|
91
|
+
}>>;
|
|
86
92
|
sourcePath: z.ZodOptional<z.ZodString>;
|
|
87
93
|
}, z.core.$strip>, z.ZodObject<{
|
|
88
94
|
kind: z.ZodLiteral<"ellipse">;
|
|
@@ -141,6 +147,12 @@ declare const pdfCodec: z.ZodCodec<z.ZodCustom<Uint8Array<ArrayBuffer>, Uint8Arr
|
|
|
141
147
|
}, z.core.$strip>;
|
|
142
148
|
widthPt: z.ZodNumber;
|
|
143
149
|
}, z.core.$strip>>;
|
|
150
|
+
style: z.ZodOptional<z.ZodEnum<{
|
|
151
|
+
solid: "solid";
|
|
152
|
+
dashed: "dashed";
|
|
153
|
+
dotted: "dotted";
|
|
154
|
+
double: "double";
|
|
155
|
+
}>>;
|
|
144
156
|
sourcePath: z.ZodOptional<z.ZodString>;
|
|
145
157
|
}, z.core.$strip>, z.ZodObject<{
|
|
146
158
|
kind: z.ZodLiteral<"link">;
|
package/dist/codec.d.ts
CHANGED
|
@@ -83,6 +83,12 @@ declare const pdfCodec: z.ZodCodec<z.ZodCustom<Uint8Array<ArrayBuffer>, Uint8Arr
|
|
|
83
83
|
b: z.ZodNumber;
|
|
84
84
|
}, z.core.$strip>;
|
|
85
85
|
widthPt: z.ZodNumber;
|
|
86
|
+
style: z.ZodOptional<z.ZodEnum<{
|
|
87
|
+
solid: "solid";
|
|
88
|
+
dashed: "dashed";
|
|
89
|
+
dotted: "dotted";
|
|
90
|
+
double: "double";
|
|
91
|
+
}>>;
|
|
86
92
|
sourcePath: z.ZodOptional<z.ZodString>;
|
|
87
93
|
}, z.core.$strip>, z.ZodObject<{
|
|
88
94
|
kind: z.ZodLiteral<"ellipse">;
|
|
@@ -141,6 +147,12 @@ declare const pdfCodec: z.ZodCodec<z.ZodCustom<Uint8Array<ArrayBuffer>, Uint8Arr
|
|
|
141
147
|
}, z.core.$strip>;
|
|
142
148
|
widthPt: z.ZodNumber;
|
|
143
149
|
}, z.core.$strip>>;
|
|
150
|
+
style: z.ZodOptional<z.ZodEnum<{
|
|
151
|
+
solid: "solid";
|
|
152
|
+
dashed: "dashed";
|
|
153
|
+
dotted: "dotted";
|
|
154
|
+
double: "double";
|
|
155
|
+
}>>;
|
|
144
156
|
sourcePath: z.ZodOptional<z.ZodString>;
|
|
145
157
|
}, z.core.$strip>, z.ZodObject<{
|
|
146
158
|
kind: z.ZodLiteral<"link">;
|
package/dist/content-write.cjs
CHANGED
|
@@ -33,27 +33,48 @@ function writeUnderline(writer, item, widthPt, underline) {
|
|
|
33
33
|
writer.writeAscii("f\n");
|
|
34
34
|
writer.writeAscii("Q\n");
|
|
35
35
|
}
|
|
36
|
-
function writeShowTextBlock(writer, item, resourceName, scalePercent,
|
|
36
|
+
function writeShowTextBlock(writer, item, resourceName, scalePercent, show) {
|
|
37
37
|
writer.writeAscii("BT\n");
|
|
38
38
|
writer.writeAscii(`/${resourceName} ${require_serialize.formatNumber(item.sizePt)} Tf\n`);
|
|
39
39
|
writer.writeAscii(`${require_serialize.formatNumber(scalePercent)} Tz\n`);
|
|
40
40
|
writeRgbOperator(writer, item.color, "rg");
|
|
41
41
|
writeMatrixOperator(writer, anchorMatrix(item.xPt, item.yPt, item.rotationDeg), "Tm");
|
|
42
|
-
require_serialize.writeObject(writer,
|
|
43
|
-
writer.writeAscii(
|
|
42
|
+
require_serialize.writeObject(writer, show.operand);
|
|
43
|
+
writer.writeAscii(` ${show.operator}\n`);
|
|
44
44
|
writer.writeAscii("ET\n");
|
|
45
45
|
}
|
|
46
46
|
function writeStandardText(writer, item, standardName, resourceName, measurer, substitutions) {
|
|
47
47
|
const encoded = require_afm_widths.encodeForShow(item.text, standardName);
|
|
48
48
|
substitutions.push(...encoded.substitutions);
|
|
49
49
|
const scale = measurer.horizontalScaleFor(item.font);
|
|
50
|
-
writeShowTextBlock(writer, item, resourceName, scale * 100,
|
|
50
|
+
writeShowTextBlock(writer, item, resourceName, scale * 100, {
|
|
51
|
+
operand: require_objects.pdfHexString(encoded.codes),
|
|
52
|
+
operator: "Tj"
|
|
53
|
+
});
|
|
51
54
|
if (item.underline === true) writeUnderline(writer, item, item.widthPt ?? encoded.width1000 / GLYPH_SPACE_UNITS_PER_EM * item.sizePt * scale, measurer.underlineAtSize(item.font, item.sizePt));
|
|
52
55
|
}
|
|
56
|
+
function embeddedShowOperand(encoded) {
|
|
57
|
+
if (encoded.kerns.length === 0) return {
|
|
58
|
+
operand: require_objects.pdfHexString(encoded.codes),
|
|
59
|
+
operator: "Tj"
|
|
60
|
+
};
|
|
61
|
+
const items = [];
|
|
62
|
+
let runStart = 0;
|
|
63
|
+
for (const kern of encoded.kerns) {
|
|
64
|
+
items.push(require_objects.pdfHexString(encoded.codes.subarray(runStart, kern.codeOffset)));
|
|
65
|
+
items.push(require_objects.pdfNum(-kern.adjustment1000));
|
|
66
|
+
runStart = kern.codeOffset;
|
|
67
|
+
}
|
|
68
|
+
items.push(require_objects.pdfHexString(encoded.codes.subarray(runStart)));
|
|
69
|
+
return {
|
|
70
|
+
operand: require_objects.pdfArray(items),
|
|
71
|
+
operator: "TJ"
|
|
72
|
+
};
|
|
73
|
+
}
|
|
53
74
|
function writeEmbeddedText(writer, item, face, resourceName, missingGlyphs) {
|
|
54
75
|
const encoded = require_embedded_font.encodeForShowEmbedded(item.text, face);
|
|
55
76
|
missingGlyphs.push(...encoded.substitutions);
|
|
56
|
-
writeShowTextBlock(writer, item, resourceName, EMBEDDED_HORIZONTAL_SCALE_PERCENT, encoded
|
|
77
|
+
writeShowTextBlock(writer, item, resourceName, EMBEDDED_HORIZONTAL_SCALE_PERCENT, embeddedShowOperand(encoded));
|
|
57
78
|
if (item.underline === true) writeUnderline(writer, item, item.widthPt ?? encoded.width1000 / GLYPH_SPACE_UNITS_PER_EM * item.sizePt, {
|
|
58
79
|
offsetPt: face.metrics.underlinePositionGlyphSpace / GLYPH_SPACE_UNITS_PER_EM * item.sizePt,
|
|
59
80
|
thicknessPt: face.metrics.underlineThicknessGlyphSpace / GLYPH_SPACE_UNITS_PER_EM * item.sizePt
|
|
@@ -76,6 +97,105 @@ function paintOperatorFor(fill, stroke, fillRule) {
|
|
|
76
97
|
function formatPoint(x, y) {
|
|
77
98
|
return `${require_serialize.formatNumber(x)} ${require_serialize.formatNumber(y)}`;
|
|
78
99
|
}
|
|
100
|
+
const DASHED_ON_WIDTH_MULTIPLE = 3;
|
|
101
|
+
const DASHED_GAP_WIDTH_MULTIPLE = 3;
|
|
102
|
+
const DOTTED_ON_LENGTH_PT = 0;
|
|
103
|
+
const DOTTED_GAP_WIDTH_MULTIPLE = 2;
|
|
104
|
+
const DASH_PHASE_PT = 0;
|
|
105
|
+
const LINE_CAP_BUTT = 0;
|
|
106
|
+
const LINE_CAP_ROUND = 1;
|
|
107
|
+
const DOUBLE_RULE_BANDS = 3;
|
|
108
|
+
const DOUBLE_RULE_SIGNS = [1, -1];
|
|
109
|
+
function writeStrokeStyleState(writer, style, strokeWidthPt) {
|
|
110
|
+
if (style === "dashed") {
|
|
111
|
+
writer.writeAscii(`[${require_serialize.formatNumber(strokeWidthPt * DASHED_ON_WIDTH_MULTIPLE)} ${require_serialize.formatNumber(strokeWidthPt * DASHED_GAP_WIDTH_MULTIPLE)}] ${require_serialize.formatNumber(DASH_PHASE_PT)} d\n`);
|
|
112
|
+
return true;
|
|
113
|
+
}
|
|
114
|
+
if (style === "dotted") {
|
|
115
|
+
writer.writeAscii(`[${require_serialize.formatNumber(DOTTED_ON_LENGTH_PT)} ${require_serialize.formatNumber(strokeWidthPt * DOTTED_GAP_WIDTH_MULTIPLE)}] ${require_serialize.formatNumber(DASH_PHASE_PT)} d\n`);
|
|
116
|
+
writer.writeAscii(`${require_serialize.formatNumber(LINE_CAP_ROUND)} J\n`);
|
|
117
|
+
return true;
|
|
118
|
+
}
|
|
119
|
+
return false;
|
|
120
|
+
}
|
|
121
|
+
function resetStrokeStyleState(writer, style) {
|
|
122
|
+
writer.writeAscii(`[] ${require_serialize.formatNumber(DASH_PHASE_PT)} d\n`);
|
|
123
|
+
if (style === "dotted") writer.writeAscii(`${require_serialize.formatNumber(LINE_CAP_BUTT)} J\n`);
|
|
124
|
+
}
|
|
125
|
+
function chordNormal(fromX, fromY, toX, toY) {
|
|
126
|
+
const dx = toX - fromX;
|
|
127
|
+
const dy = toY - fromY;
|
|
128
|
+
const length = Math.hypot(dx, dy);
|
|
129
|
+
if (length === 0) return;
|
|
130
|
+
return {
|
|
131
|
+
x: -dy / length,
|
|
132
|
+
y: dx / length
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
function averageNormal(a, b) {
|
|
136
|
+
if (a === void 0) return b;
|
|
137
|
+
if (b === void 0) return a;
|
|
138
|
+
const x = a.x + b.x;
|
|
139
|
+
const y = a.y + b.y;
|
|
140
|
+
const length = Math.hypot(x, y);
|
|
141
|
+
if (length === 0) return;
|
|
142
|
+
return {
|
|
143
|
+
x: x / length,
|
|
144
|
+
y: y / length
|
|
145
|
+
};
|
|
146
|
+
}
|
|
147
|
+
function offsetX(x, normal, offsetPt) {
|
|
148
|
+
return normal === void 0 ? x : x + normal.x * offsetPt;
|
|
149
|
+
}
|
|
150
|
+
function offsetY(y, normal, offsetPt) {
|
|
151
|
+
return normal === void 0 ? y : y + normal.y * offsetPt;
|
|
152
|
+
}
|
|
153
|
+
function offsetSubpath(subpath, offsetPt) {
|
|
154
|
+
const points = [{
|
|
155
|
+
x: subpath.startXPt,
|
|
156
|
+
y: subpath.startYPt
|
|
157
|
+
}, ...subpath.segments.map((segment) => ({
|
|
158
|
+
x: segment.xPt,
|
|
159
|
+
y: segment.yPt
|
|
160
|
+
}))];
|
|
161
|
+
const chords = [];
|
|
162
|
+
for (let i = 0; i + 1 < points.length; i += 1) {
|
|
163
|
+
const from = points[i];
|
|
164
|
+
const to = points[i + 1];
|
|
165
|
+
chords.push(chordNormal(from.x, from.y, to.x, to.y));
|
|
166
|
+
}
|
|
167
|
+
if (subpath.closed && points.length > 1) {
|
|
168
|
+
const from = points[points.length - 1];
|
|
169
|
+
const to = points[0];
|
|
170
|
+
chords.push(chordNormal(from.x, from.y, to.x, to.y));
|
|
171
|
+
}
|
|
172
|
+
const vertexNormals = points.map((_point, i) => {
|
|
173
|
+
return averageNormal(i === 0 ? subpath.closed ? chords[chords.length - 1] : void 0 : chords[i - 1], chords[i]);
|
|
174
|
+
});
|
|
175
|
+
return {
|
|
176
|
+
startXPt: offsetX(subpath.startXPt, vertexNormals[0], offsetPt),
|
|
177
|
+
startYPt: offsetY(subpath.startYPt, vertexNormals[0], offsetPt),
|
|
178
|
+
closed: subpath.closed,
|
|
179
|
+
segments: subpath.segments.map((segment, i) => {
|
|
180
|
+
const endNormal = vertexNormals[i + 1];
|
|
181
|
+
if (segment.kind === "line") return {
|
|
182
|
+
kind: "line",
|
|
183
|
+
xPt: offsetX(segment.xPt, endNormal, offsetPt),
|
|
184
|
+
yPt: offsetY(segment.yPt, endNormal, offsetPt)
|
|
185
|
+
};
|
|
186
|
+
const controlNormal = chords[i] ?? vertexNormals[i];
|
|
187
|
+
return {
|
|
188
|
+
kind: "cubic",
|
|
189
|
+
c1xPt: offsetX(segment.c1xPt, controlNormal, offsetPt),
|
|
190
|
+
c1yPt: offsetY(segment.c1yPt, controlNormal, offsetPt),
|
|
191
|
+
c2xPt: offsetX(segment.c2xPt, controlNormal, offsetPt),
|
|
192
|
+
c2yPt: offsetY(segment.c2yPt, controlNormal, offsetPt),
|
|
193
|
+
xPt: offsetX(segment.xPt, endNormal, offsetPt),
|
|
194
|
+
yPt: offsetY(segment.yPt, endNormal, offsetPt)
|
|
195
|
+
};
|
|
196
|
+
})
|
|
197
|
+
};
|
|
198
|
+
}
|
|
79
199
|
function writeFillAndStroke(writer, fill, stroke) {
|
|
80
200
|
if (fill !== void 0) writeRgbOperator(writer, fill, "rg");
|
|
81
201
|
if (stroke !== void 0) {
|
|
@@ -90,11 +210,36 @@ function writeRect(writer, item) {
|
|
|
90
210
|
writer.writeAscii(`${require_serialize.formatNumber(item.xPt)} ${require_serialize.formatNumber(item.yPt)} ${require_serialize.formatNumber(item.widthPt)} ${require_serialize.formatNumber(item.heightPt)} re\n`);
|
|
91
211
|
writer.writeAscii(`${paint}\n`);
|
|
92
212
|
}
|
|
213
|
+
function writeDoubleLine(writer, item) {
|
|
214
|
+
writeRgbOperator(writer, item.color, "RG");
|
|
215
|
+
const normal = chordNormal(item.x1Pt, item.y1Pt, item.x2Pt, item.y2Pt);
|
|
216
|
+
if (normal === void 0) {
|
|
217
|
+
writer.writeAscii(`${require_serialize.formatNumber(item.widthPt)} w\n`);
|
|
218
|
+
writer.writeAscii(`${require_serialize.formatNumber(item.x1Pt)} ${require_serialize.formatNumber(item.y1Pt)} m ${require_serialize.formatNumber(item.x2Pt)} ${require_serialize.formatNumber(item.y2Pt)} l\n`);
|
|
219
|
+
writer.writeAscii("S\n");
|
|
220
|
+
return;
|
|
221
|
+
}
|
|
222
|
+
const ruleWidthPt = item.widthPt / DOUBLE_RULE_BANDS;
|
|
223
|
+
const ruleOffsetPt = item.widthPt / DOUBLE_RULE_BANDS;
|
|
224
|
+
writer.writeAscii(`${require_serialize.formatNumber(ruleWidthPt)} w\n`);
|
|
225
|
+
for (const sign of DOUBLE_RULE_SIGNS) {
|
|
226
|
+
const dx = normal.x * ruleOffsetPt * sign;
|
|
227
|
+
const dy = normal.y * ruleOffsetPt * sign;
|
|
228
|
+
writer.writeAscii(`${formatPoint(item.x1Pt + dx, item.y1Pt + dy)} m ${formatPoint(item.x2Pt + dx, item.y2Pt + dy)} l\n`);
|
|
229
|
+
writer.writeAscii("S\n");
|
|
230
|
+
}
|
|
231
|
+
}
|
|
93
232
|
function writeLine(writer, item) {
|
|
233
|
+
if (item.style === "double") {
|
|
234
|
+
writeDoubleLine(writer, item);
|
|
235
|
+
return;
|
|
236
|
+
}
|
|
94
237
|
writeRgbOperator(writer, item.color, "RG");
|
|
95
238
|
writer.writeAscii(`${require_serialize.formatNumber(item.widthPt)} w\n`);
|
|
239
|
+
const styled = writeStrokeStyleState(writer, item.style, item.widthPt);
|
|
96
240
|
writer.writeAscii(`${require_serialize.formatNumber(item.x1Pt)} ${require_serialize.formatNumber(item.y1Pt)} m ${require_serialize.formatNumber(item.x2Pt)} ${require_serialize.formatNumber(item.y2Pt)} l\n`);
|
|
97
241
|
writer.writeAscii("S\n");
|
|
242
|
+
if (styled) resetStrokeStyleState(writer, item.style);
|
|
98
243
|
}
|
|
99
244
|
function writeEllipse(writer, item) {
|
|
100
245
|
const paint = paintOperatorFor(item.fill, item.stroke);
|
|
@@ -120,12 +265,39 @@ function writeSubpath(writer, subpath) {
|
|
|
120
265
|
else writer.writeAscii(`${formatPoint(segment.c1xPt, segment.c1yPt)} ${formatPoint(segment.c2xPt, segment.c2yPt)} ${formatPoint(segment.xPt, segment.yPt)} c\n`);
|
|
121
266
|
if (subpath.closed) writer.writeAscii("h\n");
|
|
122
267
|
}
|
|
268
|
+
function writeDoublePath(writer, item, stroke) {
|
|
269
|
+
if (item.fill !== void 0) {
|
|
270
|
+
writeRgbOperator(writer, item.fill, "rg");
|
|
271
|
+
for (const subpath of item.subpaths) writeSubpath(writer, subpath);
|
|
272
|
+
writer.writeAscii(`${item.fillRule === "evenodd" ? "f*" : "f"}\n`);
|
|
273
|
+
}
|
|
274
|
+
const ruleWidthPt = stroke.widthPt / DOUBLE_RULE_BANDS;
|
|
275
|
+
const ruleOffsetPt = stroke.widthPt / DOUBLE_RULE_BANDS;
|
|
276
|
+
writeRgbOperator(writer, stroke.color, "RG");
|
|
277
|
+
writer.writeAscii(`${require_serialize.formatNumber(ruleWidthPt)} w\n`);
|
|
278
|
+
for (const sign of DOUBLE_RULE_SIGNS) {
|
|
279
|
+
for (const subpath of item.subpaths) writeSubpath(writer, offsetSubpath(subpath, ruleOffsetPt * sign));
|
|
280
|
+
writer.writeAscii("S\n");
|
|
281
|
+
}
|
|
282
|
+
}
|
|
123
283
|
function writePath(writer, item) {
|
|
124
284
|
const paint = paintOperatorFor(item.fill, item.stroke, item.fillRule);
|
|
125
285
|
if (paint === void 0) return;
|
|
286
|
+
if (item.stroke === void 0) {
|
|
287
|
+
writeFillAndStroke(writer, item.fill, void 0);
|
|
288
|
+
for (const subpath of item.subpaths) writeSubpath(writer, subpath);
|
|
289
|
+
writer.writeAscii(`${paint}\n`);
|
|
290
|
+
return;
|
|
291
|
+
}
|
|
292
|
+
if (item.style === "double") {
|
|
293
|
+
writeDoublePath(writer, item, item.stroke);
|
|
294
|
+
return;
|
|
295
|
+
}
|
|
126
296
|
writeFillAndStroke(writer, item.fill, item.stroke);
|
|
297
|
+
const styled = writeStrokeStyleState(writer, item.style, item.stroke.widthPt);
|
|
127
298
|
for (const subpath of item.subpaths) writeSubpath(writer, subpath);
|
|
128
299
|
writer.writeAscii(`${paint}\n`);
|
|
300
|
+
if (styled) resetStrokeStyleState(writer, item.style);
|
|
129
301
|
}
|
|
130
302
|
function writeImage(writer, item, context) {
|
|
131
303
|
const image = context.resolveImage(item.imageId);
|
package/dist/content-write.d.cts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { r as StandardFontName } from "./afm-widths-DyDq56Ph.cjs";
|
|
2
|
-
import { r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-
|
|
2
|
+
import { r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-BU6Jgcof.cjs";
|
|
3
3
|
import { TextMeasurer } from "./measure.cjs";
|
|
4
4
|
import { WinAnsiSubstitution } from "./winansi.cjs";
|
|
5
5
|
import { LayoutFont, LayoutItem } from "document-schema.js";
|
package/dist/content-write.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { r as StandardFontName } from "./afm-widths-DyDq56Ph.js";
|
|
2
|
-
import { r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-
|
|
2
|
+
import { r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-fREdbxnr.js";
|
|
3
3
|
import { TextMeasurer } from "./measure.js";
|
|
4
4
|
import { WinAnsiSubstitution } from "./winansi.js";
|
|
5
5
|
import { LayoutFont, LayoutItem } from "document-schema.js";
|