mirror of
https://github.com/storytold/wordcraft.git
synced 2026-11-04 01:38:35 +00:00
* #1740: triple borders draw as three lines on screen and in PDF Triple borders (tables, paragraphs, the ### AutoFormat line) were drawn as double lines. Layout now emits a Triple stroke; the renderer and the PDF exporter draw three thin lines across the line's direction, so vertical table borders get three side-by-side lines too. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * #1740: rebase onto main — triple border strokes use the line's f64 ends Main now converts the line ends to f64 once and draws through a shared offset-line closure; the triple stroke uses both instead of dereferencing the shadowed values. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_012WEhZXSxzS8orX7f9J3qpr * #1740: review — PDF triple-border test checks the three strokes are distinct and 3 widths apart Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_012WEhZXSxzS8orX7f9J3qpr --------- Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: aiongg <aiongtaigi@gmail.com>
84 lines
3.4 KiB
Rust
84 lines
3.4 KiB
Rust
//! Decoded-media cache: hits need the same allocation, and the byte budget bounds what is kept.
|
|
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn media_cache_only_hits_the_same_allocation() {
|
|
let mut c: MediaCache<u32> = MediaCache { map: HashMap::new(), bytes: 0 };
|
|
let a = Arc::new(vec![1u8, 2, 3]);
|
|
let b = Arc::new(vec![1u8, 2, 3]);
|
|
c.insert("pic", &a, 7, 3);
|
|
assert_eq!(c.get("pic", &a), Some(7));
|
|
assert_eq!(c.get("pic", &b), None, "equal bytes in another allocation are another picture");
|
|
}
|
|
|
|
#[test]
|
|
fn media_cache_is_bounded_by_bytes() {
|
|
let mut c: MediaCache<u32> = MediaCache { map: HashMap::new(), bytes: 0 };
|
|
let src = Arc::new(vec![0u8]);
|
|
let big = CACHE_BYTES / 2 + 1;
|
|
c.insert("a", &src, 1, big);
|
|
c.insert("b", &src, 2, big);
|
|
assert_eq!(c.get("a", &src), None, "the first entry is evicted to make room");
|
|
assert_eq!(c.get("b", &src), Some(2));
|
|
assert!(c.bytes <= CACHE_BYTES);
|
|
c.insert("huge", &src, 3, CACHE_BYTES + 1);
|
|
assert_eq!(c.get("huge", &src), None, "a value over the whole budget is not kept");
|
|
}
|
|
|
|
#[test]
|
|
fn media_cache_counts_the_source_bytes_it_holds() {
|
|
let mut c: MediaCache<Option<u32>> = MediaCache { map: HashMap::new(), bytes: 0 };
|
|
let src = Arc::new(vec![0u8; 1000]);
|
|
c.insert("broken", &src, None, 0);
|
|
assert_eq!(c.bytes, 1000, "an entry that decoded to nothing still holds its source");
|
|
c.insert("pic", &src, Some(1), 24);
|
|
assert_eq!(c.bytes, 2024);
|
|
// A source over the whole budget is not kept, whatever it decoded to (calloc'd, so cheap).
|
|
let huge = Arc::new(vec![0u8; CACHE_BYTES + 1]);
|
|
c.insert("huge", &huge, None, 0);
|
|
assert!(!c.map.contains_key("huge"));
|
|
assert_eq!(CACHE_BYTES * 2, 256 * 1024 * 1024, "the image and vector caches share about 256 MB");
|
|
}
|
|
|
|
/// A wave stroke starting around 1e20 never advanced (`x + step == x`), pushing curves until memory ran out.
|
|
#[test]
|
|
fn wave_stroke_at_a_huge_coordinate_ends() {
|
|
assert!(wave_path(1e20, 0.0, 2e20, 0.0, 1.0).elements().len() < 3);
|
|
assert!(wave_path(0.0, 0.0, 1e20, 0.0, 1.0).elements().len() < 20_100);
|
|
assert!(wave_path(0.0, 0.0, 100.0, 0.0, 1.0).elements().len() > 10);
|
|
assert!(wave_path(0.0, 0.0, 0.0, 100.0, 1.0).elements().len() > 10, "vertical wave strokes produce elements");
|
|
}
|
|
|
|
/// #1740: a triple stroke is three lines across its direction, horizontal or vertical.
|
|
#[test]
|
|
fn triple_strokes_draw_three_lines() {
|
|
let line = |x0: f32, y0: f32, x1: f32, y1: f32, stroke: Stroke| Draw::Line {
|
|
x0,
|
|
y0,
|
|
x1,
|
|
y1,
|
|
width: 1.0,
|
|
color: Rgb::BLACK,
|
|
stroke,
|
|
alpha: 1.0,
|
|
text_bg: None,
|
|
};
|
|
// Dark runs met walking across the line at its middle.
|
|
let runs = |it: Draw, vertical: bool| {
|
|
let r = render_items(&Document::new(), &[it], 0.0, 0.0, 20.0, 20.0, 8.0, &RenderOptions::default());
|
|
let mut n = 0;
|
|
let mut inside = false;
|
|
for i in 0..r.width.min(r.height) {
|
|
let px = if vertical { r.pixel(i, 80) } else { r.pixel(80, i) };
|
|
let dark = px[3] > 128;
|
|
n += usize::from(dark && !inside);
|
|
inside = dark;
|
|
}
|
|
n
|
|
};
|
|
assert_eq!(runs(line(2.0, 10.0, 18.0, 10.0, Stroke::Triple), false), 3, "horizontal triple");
|
|
assert_eq!(runs(line(10.0, 2.0, 10.0, 18.0, Stroke::Triple), true), 3, "vertical triple");
|
|
assert_eq!(runs(line(2.0, 10.0, 18.0, 10.0, Stroke::Double), false), 2, "horizontal double");
|
|
}
|