PdfCraft: An open-source PDF reader and editor written by scratch in pure Rust
Merge upstream/main
jonathanwxh-cellfc65c6572e48
diff --cc crates/render/src/text/layout.rsindex b36a595c9,00b45e266..99afc0f8a--- a/crates/render/src/text/layout.rs+++ b/crates/render/src/text/layout.rs@@@ -1,6 -1,6 +1,6 @@@use super::device::{DIRECTION_TOLERANCE, Drawn, WORD_GAP};-use super::order::{NONE, REDRAW_CANDIDATES, Run, Scratch, Seg, fingerprint, place_glyphs, redraws, restarts_run, reverse_rtl};+use super::order::{NONE, REDRAW_CANDIDATES, Run, Scratch, Seg, fingerprint, is_script_on, place_glyphs, redraws, restarts_run, reverse_rtl};- use super::*;+ use super::{HashMap, PageText, TextGlyph};/// Glyphs in reading order, as indices into the page's glyphs, with their lines and word gaps.pub(super) struct Flow {diff --cc crates/render/src/text/order.rsindex 4480747cb,d8cb65f32..efcabb5f1--- a/crates/render/src/text/order.rs+++ b/crates/render/src/text/order.rs@@@ -1,5 -1,5 +1,5 @@@+ use super::TextGlyph;-use super::layout::{is_rtl, union};+use super::layout::is_rtl;- use super::*;/// Glyphs `start..end` of the glyph list [`arrange`] lays out, drawn one after another.#[derive(Clone, Copy, Debug, PartialEq, Eq)]