Skip to content

Fix pica unit parsing in spacing width conversion #755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
moritz-gross wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −1
Open

Fix pica unit parsing in spacing width conversion #755

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/xpath_functions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1408,9 +1408,10 @@ pub struct FontSizeGuess;
/// ""
// returns original node match isn't found
impl FontSizeGuess {
/// Returns an estimated width in em units, using an assumed 12-point font for conversions.
pub fn em_from_value(value_with_unit: &str) -> f64 {
// match one or more digits followed by a unit -- there are many more units, but they tend to be large and rarer(?)
static FONT_VALUE: LazyLock<Regex> = LazyLock::new(|| { Regex::new(r"(-?[0-9]*\.?[0-9]*)(px|cm|mm|Q|in|ppc|pt|ex|em|rem)").unwrap() });
static FONT_VALUE: LazyLock<Regex> = LazyLock::new(|| { Regex::new(r"(-?[0-9]*\.?[0-9]*)(px|cm|mm|Q|in|pc|pt|ex|em|rem)").unwrap() });
let cap = FONT_VALUE.captures(value_with_unit);
if let Some(cap) = cap {
if cap.len() == 3 {
Expand Down Expand Up @@ -1784,6 +1785,16 @@ mod tests {
return Ok( () );
}

// Pica widths must use the existing 12pt font estimate: 1pc, 12pt, and 1em are equivalent.
#[test]
fn font_size_guess_pica_widths() {
assert_eq!(FontSizeGuess::em_from_value("1pc"), 1.0);
assert_eq!(FontSizeGuess::em_from_value("0.5pc"), 0.5);
assert_eq!(FontSizeGuess::em_from_value("-1pc"), -1.0);
assert_eq!(FontSizeGuess::em_from_value("12pt"), 1.0);
assert_eq!(FontSizeGuess::em_from_value("1em"), 1.0);
}

#[test]
fn ordinal_one_digit() -> Result<()> {
return xpath_test(|| {
Expand Down