RomanNum3ral
/
gstack
mirror of https://github.com/garrytan/gstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(make-pdf): correct CJK rendering — URL sentinel leak, JP-first fonts, CJK quotes 

Three defects surfaced rendering Simplified-Chinese documents; refined after
an independent two-model code audit (which caught a regression in the first
pass of the quote fix).

1. Bare URLs leaked internal `SMARTPANTS_PRESERVED_N` sentinels into output
   AND left <a>/<p> unclosed (everything after became one hyperlink).
   URL_RE's `\S+` (NUL is non-whitespace) swallowed the adjacent tag
   placeholders; single-pass restore could not un-nest them.
   Fix: stop the URL match at the NUL boundary; additionally strip any
   stray NUL from input at smartypants() entry so text cannot forge a
   placeholder or create NUL-adjacency nesting.

2. The CJK font stack listed Hiragino (Japanese) before any Chinese font,
   so Simplified-Chinese text rendered in Japanese glyph variants
   (直/骨/角/没). Fix: PingFang SC / Noto Sans CJK SC / Source Han Sans SC
   / Microsoft YaHei first; JP fonts demoted to last resort. (Trade-off:
   true Japanese documents now prefer SC glyphs for shared Han; acceptable
   for an SC-primary tool. A lang-attribute-based selector would be the
   fuller fix.)

3. A quote directly after a CJK colon or opening bracket (：（【「『〈《)
   is now treated as opening. Sentence/clause-ending punctuation
   (，。、；！？) is deliberately excluded — a quote after those is usually
   a CLOSING quote (Chinese puts the period inside: 。"), and including
   them flipped closing quotes to opening.

Verified: pdffonts PingFang-only; pdftotext no sentinel leak, correct
opening AND closing quotes (他说："你好。" closes correctly); visual render
no anchor bleed. make-pdf/test: 91 pass / 0 fail.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
rssprivacy-commits 2026-06-15 12:03:44 +08:00
parent a5833c413f
commit 40a9fdd2f1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make-pdf/src/print-css.ts
View File

@ -35,8 +35,8 @@
// Metric-compatible sans stack: Helvetica (macOS), Liberation Sans (Linux,
// ships via fonts-liberation), Arial (Windows). Shared by every text surface.
const SANS_STACK = `Helvetica, "Liberation Sans", Arial`;
// CJK fallback families, appended to the body stack only.
const CJK_STACK = `"Hiragino Kaku Gothic ProN", "Noto Sans CJK JP", "Microsoft YaHei"`;
// CJK fallback families (Simplified-Chinese first), appended to the body stack only.
const CJK_STACK = `"PingFang SC", "Heiti SC", "Noto Sans CJK SC", "Source Han Sans SC", "Microsoft YaHei", "Hiragino Kaku Gothic ProN", "Noto Sans CJK JP"`;
// Color-emoji families: Apple (macOS), Segoe (Windows), Noto (Linux).
const EMOJI_FAMILIES = `"Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji"`;

8
make-pdf/src/smartypants.ts
View File

@ -20,7 +20,7 @@
const CODE_ZONE_RE = /<(pre|code|script|style)\b[^>]*>[\s\S]*?<\/\1>/gi;
const TAG_RE = /<[^>]+>/g;
const URL_RE = /\bhttps?:\/\/\S+/g;
const URL_RE = /\bhttps?:\/\/[^\s\u0000]+/g;
/**
* Apply smartypants to an HTML string. Zones that should not be touched:
@ -44,7 +44,7 @@ export function smartypants(html: string): string {
});
};
let s = html;
let s = html.replace(/\u0000/g, ""); // drop stray input NUL (can't forge a placeholder)
s = carve(s, CODE_ZONE_RE);
s = carve(s, TAG_RE);
s = carve(s, URL_RE);
@ -89,11 +89,11 @@ function transformText(text: string): string {
// Double quotes: open if preceded by whitespace/bol, close if preceded
// by word char or punctuation.
s = s.replace(/(^|[\s\(\[\{\-])"/g, "$1\u201c"); // opening "
s = s.replace(/(^|[\s\(\[\{\-：（【「『〈《])"/g, "$1\u201c"); // opening "
s = s.replace(/"/g, "\u201d"); // remaining " are closing
// Single quotes (after apostrophe pass):
s = s.replace(/(^|[\s\(\[\{\-])'/g, "$1\u2018"); // opening '
s = s.replace(/(^|[\s\(\[\{\-：（【「『〈《])'/g, "$1\u2018"); // opening '
s = s.replace(/'/g, "\u2019"); // remaining ' are closing
return s;