mirror of
https://github.com/storytold/pdfcraft.git
synced 2026-11-10 13:01:29 +00:00
mtlcl410andClaude Opus 5.5
b8436dce5a
The stand-in fitting of hayro-interpret patch (67) also applies to Symbol and ZapfDingbats (ISO 32000-2 9.6.2.2, Annex D.5 and D.6). Tests show that their glyphs, and the check mark a check box draws for its /MK /CA caption 4, keep the standard advance: - symbol_dingbats_width (pdfcraft-render tests/it): Symbol alpha, beta, pi, Sigma, Omega, Delta, infinity, bullet and plus, and ZapfDingbats a20, a19, a23, a24, a71, a73, a77 and a28, drawn with no /Encoding: each glyph's ink lies within its standard advance and fills most of it, and the next glyph starts one standard advance on. - dingbat_check_box (pdfcraft-engine tests/it): a check box with no /AP, /DA (/ZaDb 60 Tf 0 g) and /MK /CA (4) draws its check centred in the box, within its 846-unit advance and not squeezed. The patch is renumbered (67), next after main's highest (66), and the Tests column lists the new tests. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0175FWj4xFhMhSH3UpMU8DSC
76 lines
3.4 KiB
Rust
76 lines
3.4 KiB
Rust
//! Symbol and ZapfDingbats named without `/Widths` or `/Encoding` draw each glyph within the
|
|
//! advance their standard metrics give (ISO 32000-2 §9.6.2.2, Annex D.5 and D.6), through their
|
|
//! bundled stand-ins as the text fonts do: the next glyph starts one standard advance on, and the
|
|
//! glyph's ink stays inside that advance. ZapfDingbats `4` (a20, the check mark) is what a check
|
|
//! box's `/MK /CA` caption draws.
|
|
|
|
use crate::euro_width::{SIZE, ink_runs_in};
|
|
use pdfcraft_fonts::Std14;
|
|
|
|
/// The page's left margin, where the text starts, in pixels.
|
|
const ORIGIN: f64 = 20.0;
|
|
|
|
/// `codes` as a PDF literal string body, every byte octal-escaped.
|
|
fn literal(codes: &[u8]) -> String {
|
|
codes.iter().map(|c| format!("\\{c:03o}")).collect()
|
|
}
|
|
|
|
/// For each `(code, glyph)` of `font` (`name`): drawn alone, the glyph's ink lies within its
|
|
/// standard advance (one pixel of rounding either side, as for the Euro), and drawn before
|
|
/// `follower`, the follower's ink starts one standard advance later than when drawn alone.
|
|
fn fits(name: &str, font: Std14, follower: u8, glyphs: &[(u8, &str)]) {
|
|
let [(follower_alone, _), ..] = ink_runs_in(name, None, &literal(&[follower]))[..] else { panic!("{name}: the follower draws") };
|
|
for &(code, glyph) in glyphs {
|
|
let advance = font.advance(code, SIZE);
|
|
assert!(advance > 0.0, "{name} {glyph}: a standard width");
|
|
let alone = ink_runs_in(name, None, &literal(&[code]));
|
|
let (Some(&(start, _)), Some(&(_, end))) = (alone.first(), alone.last()) else { panic!("{name} {glyph}: no ink") };
|
|
assert!(f64::from(start) >= ORIGIN - 1.0, "{name} {glyph}: ink starts at its origin or after: {alone:?}");
|
|
assert!(f64::from(end) + 1.0 <= ORIGIN + advance + 1.0, "{name} {glyph}: ink ends within {advance} px: {alone:?}");
|
|
// The glyph is fitted, not squeezed: its ink fills most of the advance, as each of these does.
|
|
assert!(f64::from(end - start + 1) >= 0.7 * advance, "{name} {glyph}: ink spans most of {advance} px: {alone:?}");
|
|
|
|
let pair = ink_runs_in(name, None, &literal(&[code, follower]));
|
|
let Some(&(next, _)) = pair.last() else { panic!("{name} {glyph}: no ink") };
|
|
assert!(pair.len() > alone.len(), "{name} {glyph}: the follower stands apart: {pair:?}");
|
|
assert!(
|
|
(f64::from(next) - f64::from(follower_alone) - advance).abs() <= 1.0,
|
|
"{name} {glyph}: the follower starts {advance} px on: {pair:?}"
|
|
);
|
|
}
|
|
}
|
|
|
|
/// Symbol's Greek letters and signs by their built-in codes (Annex D.5).
|
|
#[test]
|
|
fn symbol_glyphs_keep_their_standard_advances() {
|
|
let glyphs = [
|
|
(0x61, "alpha"),
|
|
(0x62, "beta"),
|
|
(0x70, "pi"),
|
|
(0x53, "Sigma"),
|
|
(0x57, "Omega"),
|
|
(0x44, "Delta"),
|
|
(0xA5, "infinity"),
|
|
(0xB7, "bullet"),
|
|
(0x2B, "plus"),
|
|
];
|
|
fits("Symbol", Std14::Symbol, 0x53, &glyphs);
|
|
}
|
|
|
|
/// ZapfDingbats' check marks, crosses, dot, square, diamond and star by their built-in codes
|
|
/// (Annex D.6), the check box caption `4` among them.
|
|
#[test]
|
|
fn zapf_dingbats_glyphs_keep_their_standard_advances() {
|
|
let glyphs = [
|
|
(0x34, "a20 check"),
|
|
(0x33, "a19 light check"),
|
|
(0x37, "a23 ballot x"),
|
|
(0x38, "a24 heavy ballot x"),
|
|
(0x6C, "a71 dot"),
|
|
(0x6E, "a73 square"),
|
|
(0x75, "a77 diamond"),
|
|
(0x48, "a28 star"),
|
|
];
|
|
fits("ZapfDingbats", Std14::ZapfDingbats, 0x6E, &glyphs);
|
|
}
|