Use ascent and descent insead of x-height for shift in tb writing mode.

linebender · Apr 12, 2024 · f4289f7 · f4289f7
1 parent b908baf
commit f4289f7
Show file tree

Hide file tree

Showing 21 changed files with 7 additions and 3 deletions.
diff --git a/crates/resvg/tests/integration/main.rs b/crates/resvg/tests/integration/main.rs
@@ -1,5 +1,6 @@
 use once_cell::sync::Lazy;
 use rgb::{FromSlice, RGBA8};
+use std::process::Command;
 use usvg::fontdb;
 
 #[rustfmt::skip]
@@ -55,6 +56,9 @@ pub fn render(name: &str) -> usize {
     resvg::render(&tree, render_ts, &mut pixmap.as_mut());
 
     // pixmap.save_png(&format!("tests/{}.png", name)).unwrap();
+    // Command::new("oxipng")
+    //     .args(["-o".to_owned(), "6".to_owned(), "-Z".to_owned(), format!("tests/{}.png", name)])
+    //     .output().unwrap();
 
     let mut rgba = pixmap.take();
     demultiply_alpha(rgba.as_mut_slice().as_rgba_mut());

diff --git a/crates/resvg/tests/tests/text/alignment-baseline/hanging-on-vertical.png b/crates/resvg/tests/tests/text/alignment-baseline/hanging-on-vertical.png
diff --git a/crates/resvg/tests/tests/text/direction/rtl-with-vertical-writing-mode.png b/crates/resvg/tests/tests/text/direction/rtl-with-vertical-writing-mode.png
diff --git a/crates/resvg/tests/tests/text/glyph-orientation-vertical/simple-case.png b/crates/resvg/tests/tests/text/glyph-orientation-vertical/simple-case.png
diff --git a/crates/resvg/tests/tests/text/lengthAdjust/vertical.png b/crates/resvg/tests/tests/text/lengthAdjust/vertical.png
diff --git a/crates/resvg/tests/tests/text/textPath/complex.png b/crates/resvg/tests/tests/text/textPath/complex.png
diff --git a/crates/resvg/tests/tests/text/writing-mode/inheritance.png b/crates/resvg/tests/tests/text/writing-mode/inheritance.png
diff --git a/...s/resvg/tests/tests/text/writing-mode/mixed-languages-with-tb-and-underline.png b/...s/resvg/tests/tests/text/writing-mode/mixed-languages-with-tb-and-underline.png
diff --git a/crates/resvg/tests/tests/text/writing-mode/mixed-languages-with-tb.png b/crates/resvg/tests/tests/text/writing-mode/mixed-languages-with-tb.png
diff --git a/crates/resvg/tests/tests/text/writing-mode/tb-and-punctuation.png b/crates/resvg/tests/tests/text/writing-mode/tb-and-punctuation.png
diff --git a/crates/resvg/tests/tests/text/writing-mode/tb-rl.png b/crates/resvg/tests/tests/text/writing-mode/tb-rl.png
diff --git a/crates/resvg/tests/tests/text/writing-mode/tb-with-alignment.png b/crates/resvg/tests/tests/text/writing-mode/tb-with-alignment.png
diff --git a/crates/resvg/tests/tests/text/writing-mode/tb-with-dx-on-second-tspan.png b/crates/resvg/tests/tests/text/writing-mode/tb-with-dx-on-second-tspan.png
diff --git a/crates/resvg/tests/tests/text/writing-mode/tb-with-dx-on-tspan.png b/crates/resvg/tests/tests/text/writing-mode/tb-with-dx-on-tspan.png
diff --git a/crates/resvg/tests/tests/text/writing-mode/tb-with-dy-on-second-tspan.png b/crates/resvg/tests/tests/text/writing-mode/tb-with-dy-on-second-tspan.png
diff --git a/crates/resvg/tests/tests/text/writing-mode/tb-with-rotate-and-underline.png b/crates/resvg/tests/tests/text/writing-mode/tb-with-rotate-and-underline.png
diff --git a/crates/resvg/tests/tests/text/writing-mode/tb-with-rotate.png b/crates/resvg/tests/tests/text/writing-mode/tb-with-rotate.png
diff --git a/crates/resvg/tests/tests/text/writing-mode/tb.png b/crates/resvg/tests/tests/text/writing-mode/tb.png
diff --git a/crates/resvg/tests/tests/text/writing-mode/vertical-lr.png b/crates/resvg/tests/tests/text/writing-mode/vertical-lr.png
diff --git a/crates/resvg/tests/tests/text/writing-mode/vertical-rl.png b/crates/resvg/tests/tests/text/writing-mode/vertical-rl.png
diff --git a/crates/usvg/src/text/layout.rs b/crates/usvg/src/text/layout.rs
@@ -75,7 +75,6 @@ struct GlyphCluster {
     advance: f32,
     ascent: f32,
     descent: f32,
-    x_height: f32,
     has_relative_shift: bool,
     glyphs: Vec<PositionedGlyph>,
     transform: Transform,
@@ -939,7 +938,9 @@ fn apply_writing_mode(writing_mode: WritingMode, clusters: &mut [GlyphCluster])
             // Could not find a spec that explains this,
             // but this is how other applications are shifting the "rotated" characters
             // in the top-to-bottom mode.
-            cluster.transform = cluster.transform.pre_translate(0.0, cluster.x_height / 2.0);
+            cluster.transform = cluster
+                .transform
+                .pre_translate(0.0, (cluster.ascent + cluster.descent) / 2.0);
         }
     }
 }
@@ -1060,7 +1061,6 @@ fn form_glyph_clusters(glyphs: &[Glyph], text: &str, font_size: f32) -> GlyphClu
         advance: width,
         ascent: font.ascent(font_size),
         descent: font.descent(font_size),
-        x_height: font.x_height(font_size),
         has_relative_shift: false,
         transform: Transform::default(),
         path_transform: Transform::default(),