Merge pull request #7863 from dotCooCoo/feat/diacritic-position

Type: Adjust Horizontal and Vertical Diacritic Position move marks off their letters
This commit is contained in:
BFlat
2026-11-16 01:34:36 +07:00
committed by GitHub
48 changed files with 612 additions and 40 deletions
+2 -2
View File
@@ -18,8 +18,8 @@ mod wrap;
pub use area::{AreaFit, AreaOptions, PathAlign, PathEffect, TextFlow, TextWrap, VerticalAlign, WrapShape};
use char_style::yes;
pub use char_style::{
CharAlign, CharPosition, CharStyle, Digits, FontHeightReference, GlyphChoice, GlyphForm, MAX_AKI, MAX_TSUME, MAX_WARICHU_GAP, ScriptMetrics,
WARICHU_LINES, WARICHU_SCALE, WarichuAlign,
CharAlign, CharPosition, CharStyle, Digits, FontHeightReference, GlyphChoice, GlyphForm, MAX_AKI, MAX_DIACRITIC_POSITION, MAX_TSUME,
MAX_WARICHU_GAP, ScriptMetrics, WARICHU_LINES, WARICHU_SCALE, WarichuAlign,
};
pub use composite::{
COMPOSITE_BASELINE, COMPOSITE_FONTS_MAX, COMPOSITE_NAME_MAX, COMPOSITE_SCALE, COMPOSITE_SIZE, CUSTOM_CHARS_MAX, CUSTOM_SETS_MAX, CharClass,
+23 -1
View File
@@ -180,6 +180,18 @@ pub struct CharStyle {
/// these characters are drawn in, whatever digits were typed.
#[serde(default, skip_serializing_if = "crate::skip::is_default")]
pub digits: Digits,
/// Adjust Horizontal Diacritic Position (Character panel, Middle Eastern options): the font's
/// mark glyphs among these characters (GDEF class 3, such as Arabic harakat and Hebrew points)
/// move right by a positive value and left by a negative one, relative to their letters, in
/// 1/1000 em of the size, from -[`MAX_DIACRITIC_POSITION`] to [`MAX_DIACRITIC_POSITION`].
/// Saved only when not 0.
/// <https://web.archive.org/web/20210601162814/https://helpx.adobe.com/pdf/illustrator_reference.pdf#page=549>
#[serde(default, rename = "diacriticHorizontal", skip_serializing_if = "crate::skip::is_default")]
pub diacritic_horizontal: f64,
/// Adjust Vertical Diacritic Position: the mark glyphs move up by a positive value and down by
/// a negative one, as [`Self::diacritic_horizontal`] moves them across.
#[serde(default, rename = "diacriticVertical", skip_serializing_if = "crate::skip::is_default")]
pub diacritic_vertical: f64,
/// Font height reference (Character panel menu › Show Font Height Options): the height of the
/// font that [`Self::size`] measures, the em box by default.
#[serde(default, rename = "fontHeightReference", skip_serializing_if = "crate::skip::is_default")]
@@ -553,6 +565,10 @@ pub const MAX_AKI: f64 = 1000.0;
/// The largest Tsume ([`CharStyle::tsume`]), in percent: all the blank space beside the ink.
pub const MAX_TSUME: f64 = 100.0;
/// The largest Adjust Horizontal or Vertical Diacritic Position either way
/// ([`CharStyle::diacritic_horizontal`]), in 1/1000 em: one em.
pub const MAX_DIACRITIC_POSITION: f64 = 1000.0;
/// The number of lines a warichu block may be stacked on ([`CharStyle::warichu_lines`]).
pub const WARICHU_LINES: std::ops::RangeInclusive<u8> = 1..=6;
@@ -684,6 +700,8 @@ impl Default for CharStyle {
warichu_align: WarichuAlign::Auto,
small_caps: None,
digits: Digits::Default,
diacritic_horizontal: 0.0,
diacritic_vertical: 0.0,
font_height_reference: FontHeightReference::EmBox,
no_break: false,
language: None,
@@ -707,7 +725,8 @@ impl CharStyle {
/// same way. The Warichu Settings Lines and Scale
/// are kept to [`WARICHU_LINES`] and [`WARICHU_SCALE`]; a gap or scale that is not a number becomes its default. The gap is kept to 0 to
/// [`crate::MAX_COORD`], as the baseline shift is, since a scaled type object holds it in its
/// own units.
/// own units. The Adjust Horizontal and Vertical Diacritic Positions are kept within
/// [`MAX_DIACRITIC_POSITION`] either way, and one that is not a number becomes 0.
pub fn keep_dimensions_in_range(&mut self) {
let default = Self::default();
let within = |v: f64, or: f64| if v > 0.0 { v.min(crate::MAX_COORD) } else { or };
@@ -723,6 +742,9 @@ impl CharStyle {
self.aki_left = aki(self.aki_left);
self.aki_right = aki(self.aki_right);
self.tsume = if self.tsume.is_nan() { 0.0 } else { self.tsume.clamp(0.0, MAX_TSUME) };
let diacritic = |v: f64| if v.is_nan() { 0.0 } else { v.clamp(-MAX_DIACRITIC_POSITION, MAX_DIACRITIC_POSITION) };
self.diacritic_horizontal = diacritic(self.diacritic_horizontal);
self.diacritic_vertical = diacritic(self.diacritic_vertical);
self.warichu_lines = self.warichu_lines.clamp(*WARICHU_LINES.start(), *WARICHU_LINES.end());
self.warichu_gap = if self.warichu_gap.is_nan() { default.warichu_gap } else { self.warichu_gap.clamp(0.0, crate::MAX_COORD) };
self.warichu_scale =
+4
View File
@@ -511,6 +511,8 @@ impl crate::Document {
st.aki_left = num("akiLeft").unwrap_or(st.aki_left);
st.aki_right = num("akiRight").unwrap_or(st.aki_right);
st.tsume = num("tsume").unwrap_or(st.tsume);
st.diacritic_horizontal = num("diacriticHorizontal").unwrap_or(st.diacritic_horizontal);
st.diacritic_vertical = num("diacriticVertical").unwrap_or(st.diacritic_vertical);
st.warichu_gap = num("warichuGap").unwrap_or(st.warichu_gap);
st.warichu_scale = num("warichuScale").unwrap_or(st.warichu_scale);
st.keep_dimensions_in_range();
@@ -537,6 +539,8 @@ impl crate::Document {
("akiLeft", Some(st.aki_left)),
("akiRight", Some(st.aki_right)),
("tsume", Some(st.tsume)),
("diacriticHorizontal", Some(st.diacritic_horizontal)),
("diacriticVertical", Some(st.diacritic_vertical)),
("leading", st.leading),
];
for (k, v) in kept {
+36
View File
@@ -129,6 +129,42 @@ fn insert_aki_is_saved_only_when_set() {
assert_eq!((d.char_styles[0].attrs["akiLeft"].as_f64(), d.char_styles[0].attrs["akiRight"].as_f64()), (Some(MAX_AKI), Some(0.0)));
}
/// Adjust Horizontal and Vertical Diacritic Position are 0 by default and saved only when not 0,
/// each on its own; styles written before them read as 0, and a value out of range from a file is
/// kept within one em either way.
#[test]
fn diacritic_positions_are_saved_only_when_set() {
let st = CharStyle::default();
assert_eq!((st.diacritic_horizontal, st.diacritic_vertical), (0.0, 0.0));
let saved = serde_json::to_value(&st).unwrap();
assert!(saved.get("diacriticHorizontal").is_none() && saved.get("diacriticVertical").is_none());
for set in [
CharStyle { diacritic_horizontal: -250.0, ..CharStyle::default() },
CharStyle { diacritic_vertical: 500.0, ..CharStyle::default() },
CharStyle { diacritic_horizontal: 12.5, diacritic_vertical: -1000.0, ..CharStyle::default() },
] {
let saved = serde_json::to_value(&set).unwrap();
assert_eq!(saved.get("diacriticHorizontal").and_then(serde_json::Value::as_f64).unwrap_or(0.0), set.diacritic_horizontal);
assert_eq!(saved.get("diacriticVertical").and_then(serde_json::Value::as_f64).unwrap_or(0.0), set.diacritic_vertical);
assert_eq!(saved.get("diacriticHorizontal").is_some(), set.diacritic_horizontal != 0.0);
assert_eq!(saved.get("diacriticVertical").is_some(), set.diacritic_vertical != 0.0);
assert_eq!(serde_json::from_value::<CharStyle>(saved).unwrap(), set);
}
let mut damaged = CharStyle { diacritic_horizontal: -4000.0, diacritic_vertical: 4000.0, ..CharStyle::default() };
damaged.keep_dimensions_in_range();
assert_eq!((damaged.diacritic_horizontal, damaged.diacritic_vertical), (-MAX_DIACRITIC_POSITION, MAX_DIACRITIC_POSITION));
let mut damaged = CharStyle { diacritic_horizontal: f64::NAN, diacritic_vertical: f64::NEG_INFINITY, ..CharStyle::default() };
damaged.keep_dimensions_in_range();
assert_eq!((damaged.diacritic_horizontal, damaged.diacritic_vertical), (0.0, -MAX_DIACRITIC_POSITION));
// A character style from a file is kept in range the same way.
let mut d = crate::Document::new(100.0, 100.0);
let attrs = serde_json::json!({"diacriticHorizontal": 5000, "diacriticVertical": -5000});
d.char_styles.push(TextStyleDef { name: "Moved".into(), attrs: attrs.as_object().cloned().unwrap_or_default() });
d.keep_type_values_in_range();
let kept = |key: &str| d.char_styles[0].attrs[key].as_f64();
assert_eq!((kept("diacriticHorizontal"), kept("diacriticVertical")), (Some(MAX_DIACRITIC_POSITION), Some(-MAX_DIACRITIC_POSITION)));
}
/// Tsume is 0 by default and saved only when not 0; styles written before it read as 0, and a
/// value out of range from a file, in a run or a character style, is kept from 0 to 100.
#[test]
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+13 -2
View File
@@ -223,6 +223,8 @@ pub fn char_attrs(v: &CharStyle) -> Map<String, Value> {
("akiLeft", json!(v.aki_left)),
("akiRight", json!(v.aki_right)),
("tsume", json!(v.tsume)),
("diacriticHorizontal", json!(v.diacritic_horizontal)),
("diacriticVertical", json!(v.diacritic_vertical)),
("standardVerticalRoman", json!(v.standard_vertical_roman)),
("noBreak", json!(v.no_break)),
("digits", json!(v.digits)),
@@ -584,6 +586,13 @@ fn attrs_param(d: &Document, p: &Value, kind: Kind, verb: &str, kept: Option<&Ma
if changed(key) && !(lo..=hi).contains(&st.tsume) {
return Err(bad(&c, format!("`{key}` must be from {lo} to {hi}")));
}
let hi = vectorcraft_doc::text::MAX_DIACRITIC_POSITION;
let lo = -hi;
for (key, value) in [("diacriticHorizontal", st.diacritic_horizontal), ("diacriticVertical", st.diacritic_vertical)] {
if changed(key) && !(lo..=hi).contains(&value) {
return Err(bad(&c, format!("`{key}` must be from {lo} to {hi}")));
}
}
let lines = vectorcraft_doc::text::WARICHU_LINES;
if changed("warichuLines") && !lines.contains(&st.warichu_lines) {
return Err(bad(&c, format!("`warichuLines` must be a whole number from {} to {}", lines.start(), lines.end())));
@@ -1081,12 +1090,12 @@ fn unused(s: &mut Session, kind: Kind) -> Result<Value> {
/// The styles of `kind` in `src` that load, with their source names so that art in the file keeps
/// referring to them: not the Normal style, and not one whose attributes don't read, whose sizes,
/// scales, leading, shifts, Insert Aki, Tsume, Warichu Settings or stroke width are out of the range `charStyle.new` takes, whose
/// scales, leading, shifts, Insert Aki, Tsume, diacritic positions, Warichu Settings or stroke width are out of the range `charStyle.new` takes, whose
/// indents, spacing, Hyphenation or Justification options or tab stops are out of the range
/// `paraStyle.new` takes, or whose name is empty, which are skipped. → (the styles, the names in
/// `src` of those skipped)
fn loadable(src: &Document, kind: Kind) -> (Vec<TextStyleDef>, Vec<String>) {
const RANGED: [&str; 22] = [
const RANGED: [&str; 24] = [
"size",
"h_scale",
"v_scale",
@@ -1095,6 +1104,8 @@ fn loadable(src: &Document, kind: Kind) -> (Vec<TextStyleDef>, Vec<String>) {
"akiLeft",
"akiRight",
"tsume",
"diacriticHorizontal",
"diacriticVertical",
"tcyUpDown",
"tcyLeftRight",
"warichuLines",
+4 -1
View File
@@ -399,6 +399,8 @@ fn character_style_dimensions_are_checked_before_a_definition_changes() {
json!({"akiRight": 1000.1}),
json!({"tsume": -0.1}),
json!({"tsume": 100.1}),
json!({"diacriticHorizontal": -1000.1}),
json!({"diacriticVertical": 1000.1}),
] {
let key = attrs.as_object().unwrap().keys().next().unwrap();
for cmd in ["charStyle.edit", "charStyle.setAttrs", "charStyle.new"] {
@@ -422,7 +424,8 @@ fn character_style_dimensions_are_checked_before_a_definition_changes() {
"baseline_shift": -1296.0,
"tcyUpDown": 1296.0, "tcyLeftRight": -1296.0,
"akiLeft": 0.0, "akiRight": 1000.0,
"tsume": 100.0
"tsume": 100.0,
"diacriticHorizontal": -1000.0, "diacriticVertical": 1000.0
}}),
)
.unwrap();
@@ -1921,6 +1921,66 @@ fn tsume_is_a_character_attribute() {
assert_eq!(s.doc().unwrap().history.undo.len(), undo, "no undo step for a refused call");
}
/// Adjust Horizontal and Vertical Diacritic Position (Character panel, Middle Eastern options):
/// character attributes in thousandths of an em, 0 by default and saved only when not 0. Both
/// commands set them in one undo step, setting one leaves the other, a call that gives the values
/// the text already has records none, and a value that is not a number or lies outside -1000 to
/// 1000 is refused, naming the key, before anything changes; the native file and a character style
/// captured from the characters carry them.
#[test]
fn diacritic_positions_are_character_attributes() {
let mut s = Session::new();
s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap();
let id = s.execute("text.create", &json!({"x": 10, "y": 50, "text": "بَب"})).unwrap()["id"].as_u64().unwrap();
let runs = |s: &Session| match &s.doc().unwrap().doc.node(NodeId(id)).unwrap().kind {
NodeKind::Text(t) => t.runs.clone(),
_ => panic!("text"),
};
let moved = |s: &Session| runs(s).iter().map(|r| (r.text.clone(), r.style.diacritic_horizontal, r.style.diacritic_vertical)).collect::<Vec<_>>();
let saved = serde_json::to_value(&runs(&s)[0].style).unwrap();
assert!(saved.get("diacriticHorizontal").is_none() && saved.get("diacriticVertical").is_none());
s.execute("select.set", &json!({"ids": [id]})).unwrap();
s.execute("text.setFormat", &json!({"diacriticHorizontal": -150})).unwrap();
s.execute("text.setFormat", &json!({"diacriticVertical": 250})).unwrap();
assert_eq!(moved(&s), [("بَب".to_string(), -150.0, 250.0)], "setting one leaves the other");
let undo = s.doc().unwrap().history.undo.len();
s.execute("text.setFormat", &json!({"diacriticHorizontal": -150, "diacriticVertical": 250})).unwrap();
assert_eq!(s.doc().unwrap().history.undo.len(), undo, "no undo step without a change");
s.execute("edit.undo", &json!({})).unwrap();
assert_eq!(moved(&s), [("بَب".to_string(), -150.0, 0.0)], "one undo step");
s.execute("edit.redo", &json!({})).unwrap();
let mark = "بَ".len();
s.execute("text.setRangeStyle", &json!({"id": id, "start": "ب".len(), "end": mark, "diacriticVertical": -1000})).unwrap();
assert_eq!(moved(&s), [("ب".to_string(), -150.0, 250.0), ("\u{064E}".to_string(), -150.0, -1000.0), ("ب".to_string(), -150.0, 250.0)]);
let saved = serde_json::to_value(&runs(&s)[1].style).unwrap();
assert_eq!((saved["diacriticHorizontal"].clone(), saved["diacriticVertical"].clone()), (json!(-150.0), json!(-1000.0)));
let back = vectorcraft_format::load(&vectorcraft_format::save(&s.doc().unwrap().doc, false)).unwrap();
let NodeKind::Text(t) = &back.node(NodeId(id)).unwrap().kind else { panic!("text") };
let reopened: Vec<_> = t.runs.iter().map(|r| (r.text.clone(), r.style.diacritic_horizontal, r.style.diacritic_vertical)).collect();
assert_eq!(reopened, moved(&s));
let attrs = super::super::textstyles::char_attrs(&runs(&s)[1].style);
assert_eq!((attrs["diacriticHorizontal"].clone(), attrs["diacriticVertical"].clone()), (json!(-150.0), json!(-1000.0)));
let before = moved(&s);
let undo = s.doc().unwrap().history.undo.len();
for (cmd, p, want) in [
("text.setFormat", json!({"diacriticHorizontal": "50"}), "`diacriticHorizontal` must be a number"),
("text.setFormat", json!({"diacriticVertical": 1000.5}), "`diacriticVertical` must be from -1000 to 1000"),
("text.setRangeStyle", json!({"id": id, "diacriticVertical": true}), "`diacriticVertical` must be a number"),
(
"text.setRangeStyle",
json!({"id": id, "start": 0, "end": mark, "diacriticHorizontal": -1001}),
"`diacriticHorizontal` must be from -1000 to 1000",
),
] {
let e = s.execute(cmd, &p).unwrap_err();
assert!(matches!(&e, EngineError::BadParams { msg, .. } if msg == want), "{cmd} {p}: {e}");
}
assert_eq!(moved(&s), before);
assert_eq!(s.doc().unwrap().history.undo.len(), undo, "no undo step for a refused call");
}
/// Standard Vertical Roman Alignment (Character panel menu, East Asian options): a character
/// attribute, off by default and saved only when on. Documents written before it read as off; a
/// character style captured from the characters carries it.
+5 -1
View File
@@ -86,11 +86,15 @@ impl Writer<'_> {
// type with warichu, whose stacked lines a reader's <text> can't place either. So are
// small capitals, superscript and subscript and tab leaders, which SVG text doesn't draw (#3869),
// and a glyph chosen for a character, which a reader's <text> draws with the default glyph. So
// is type in one of the document's composite fonts, which a reader can't find by its name.
// is type in one of the document's composite fonts, which a reader can't find by its name,
// and type with an Adjust Diacritic Position, whose marks a reader's <text> draws where the
// font puts them.
let unwritable = t.runs.iter().any(|r| {
r.style.small_caps.is_some()
|| r.style.position != vectorcraft_doc::CharPosition::Normal
|| r.style.glyph_alternate.is_some()
|| r.style.diacritic_horizontal != 0.0
|| r.style.diacritic_vertical != 0.0
|| vectorcraft_doc::CompositeFont::named(&doc.composite_fonts, &r.style.font_family).is_some()
}) || std::iter::once(&t.para).chain(&t.paras).any(|p| p.tabs.iter().any(|tab| !tab.leader.is_empty()));
let outlined = self.opts.outline_text
+13
View File
@@ -357,6 +357,19 @@ fn a_chosen_glyph_is_written_as_outlines() {
assert!(!svg.contains("<text") && svg.contains("<path"), "{svg}");
}
/// Type with an Adjust Diacritic Position is written as outlines: a reader's `<text>` would draw
/// the marks where the font puts them.
#[test]
fn moved_diacritics_are_written_as_outlines() {
let svg = export(&area_doc(vec![run("re\u{301}sume\u{301}", style(12.0))], 280.0, Justify::Left), &ExportOptions::default());
assert!(svg.contains("<text"), "without a moved mark the text stays live: {svg}");
for moved in [CharStyle { diacritic_horizontal: 100.0, ..style(12.0) }, CharStyle { diacritic_vertical: -100.0, ..style(12.0) }] {
let d = area_doc(vec![run("re\u{301}", style(12.0)), run("sume\u{301}", moved)], 280.0, Justify::Left);
let svg = export(&d, &ExportOptions::default());
assert!(!svg.contains("<text") && svg.contains("<path"), "{svg}");
}
}
/// A run whose font size measures the cap height is written at the em size it is drawn at: 14 pt
/// measuring a 0.7 em cap height is `font-size="20"`, after a 12 pt run measuring the em box,
/// which takes the `<text>` element's 12.
+37 -4
View File
@@ -13,6 +13,12 @@
//! a mark on a ligature (for example Geeza Pro's Allah ligature) painted as its letter. Renderers
//! and exporters read the glyph's run as they always did, so they need no change. The text itself
//! is never changed.
//!
//! The Adjust Horizontal and Vertical Diacritic Positions ([`CharStyle::diacritic_horizontal`])
//! move the face's mark glyphs (GDEF class 3) by the values of the glyph's run. Runs that differ
//! only in paint and those positions stay one shaping cluster at an Arabic harakat or a Hebrew
//! point ([`diacritic_mark_boundary`]), so a mark set apart from its letter takes its own values
//! the same way it takes its own paint.
use skrifa::raw::TableProvider;
use skrifa::raw::tables::layout::ClassDef;
@@ -36,11 +42,24 @@ pub(crate) fn is_harakat(c: char) -> bool {
)
}
/// Is `c` a Hebrew point or cantillation mark (U+0591–U+05BD, U+05BF, U+05C1–U+05C2,
/// U+05C4–U+05C5, U+05C7)?
fn is_hebrew_mark(c: char) -> bool {
matches!(c as u32, 0x0591..=0x05BD | 0x05BF | 0x05C1..=0x05C2 | 0x05C4..=0x05C5 | 0x05C7)
}
/// Is `c` a diacritical mark the Adjust Diacritic Position fields set apart from its letter: an
/// Arabic harakat ([`is_harakat`]) or a Hebrew point?
pub(crate) fn is_diacritic(c: char) -> bool {
is_harakat(c) || is_hebrew_mark(c)
}
/// Do character styles `a` and `b` differ, if at all, only in paint: fill, stroke and how the
/// stroke is drawn, overprint, and the character style name? OpenType feature differences are
/// ignored here: they already apply to their own character ranges during shaping. Nor is the
/// space before a line's first character read inside a cluster, which takes it from its first
/// character (#5111). Stricter than [`crate::shape`]'s `shapes_alike` (which also ignores baseline
/// character (#5111), nor the Adjust Diacritic Positions, which move a mark glyph by its own run's
/// values. Stricter than [`crate::shape`]'s `shapes_alike` (which also ignores baseline
/// shift, tracking, underline, …).
pub(crate) fn paint_only(a: &CharStyle, b: &CharStyle) -> bool {
// Exhaustive: a new attribute must explicitly keep or relax this boundary rule.
@@ -82,6 +101,8 @@ pub(crate) fn paint_only(a: &CharStyle, b: &CharStyle) -> bool {
warichu_scale,
warichu_align,
digits,
diacritic_horizontal: _,
diacritic_vertical: _,
font_height_reference,
no_break,
language,
@@ -150,6 +171,16 @@ pub(crate) fn paint_only_mark_boundary(text: &str, at: usize, before: &CharStyle
(next.is_some_and(is_harakat) || previous.is_some_and(is_harakat)) && paint_only(before, after)
}
/// Is the run boundary at byte `at` of `text`, between styles `before` and `after`, one where the
/// Adjust Diacritic Positions differ, nothing but paint differs besides, and an Arabic harakat or a
/// Hebrew point is on either side? It stays inside a shaping cluster as a paint-only one does.
pub(crate) fn diacritic_mark_boundary(text: &str, at: usize, before: &CharStyle, after: &CharStyle) -> bool {
let next = text.get(at..).and_then(|s| s.chars().next());
let previous = text.get(..at).and_then(|s| s.chars().next_back());
let moved = before.diacritic_horizontal != after.diacritic_horizontal || before.diacritic_vertical != after.diacritic_vertical;
moved && (next.is_some_and(is_diacritic) || previous.is_some_and(is_diacritic)) && paint_only(before, after)
}
/// The byte ranges of the harakat in `text[range]`, each run of consecutive harakat as one range.
/// The range is normalised as [`crate::edit::style_range`] takes one: its ends clamped to the
/// text, each moved back to the start of the character it falls in, and put in order.
@@ -194,7 +225,8 @@ pub(crate) fn mark_classes(face: &FontFace) -> Option<ClassDef<'_>> {
/// by glyph): repeated glyph ids alone could hide a changed correspondence. A glyph whose character
/// lies outside its own shaping cluster of `raw` (from its cluster value up to the next larger one,
/// else `end`) gets its cluster's first character instead. A later in-cluster character is kept
/// only when the glyph is a GDEF mark and that character is a harakat; otherwise the cluster start
/// only when the glyph is a GDEF mark and that character is a harakat or a Hebrew point
/// ([`is_diacritic`]); otherwise the cluster start
/// is kept (conservative: a mark may miss its colour; a base must never take a mark's). `raw`'s
/// clusters are never changed. These are HarfBuzz shaping clusters, which can span more than one
/// grapheme (a ligature).
@@ -224,8 +256,9 @@ pub(crate) fn own_chars(
if c.1 == r.1 {
return c.1;
}
// Later in-cluster character: only a positively identified mark glyph on a harakat.
let mark_char = text.get(c.1 as usize..).and_then(|s| s.chars().next()).is_some_and(is_harakat);
// Later in-cluster character: only a positively identified mark glyph on a harakat or
// a Hebrew point.
let mark_char = text.get(c.1 as usize..).and_then(|s| s.chars().next()).is_some_and(is_diacritic);
if is_gdef_mark(r.0) && mark_char { c.1 } else { r.1 }
})
.collect()
+37 -10
View File
@@ -1053,6 +1053,10 @@ fn drawn_alike(a: &CharStyle, b: &CharStyle, vertical: bool) -> bool {
warichu_scale: _,
warichu_align: _,
digits,
// A mark glyph moves by its own run's values ([`shape_segment`]), so a mark keeps its
// letter whatever they are.
diacritic_horizontal: _,
diacritic_vertical: _,
font_height_reference,
no_break,
language,
@@ -1127,7 +1131,8 @@ pub(crate) fn warichu_alike(a: &CharStyle, b: &CharStyle) -> bool {
/// character style's name, leading, baseline shift, rotation, Character Alignment, Character
/// Direction (text is shaped apart where its bidi level changes), Kashidas, the kerning (each glyph takes its
/// run's, see [`shape_segment`]), the space before a line's first character ([`space_before`]),
/// Insert Aki ([`aki`]), Tsume ([`tighten`]), the OpenType features and the East Asian glyph form (each run's apply to its own characters, as features
/// Insert Aki ([`aki`]), Tsume ([`tighten`]), the Adjust Diacritic Positions (each mark glyph takes
/// its run's), the OpenType features and the East Asian glyph form (each run's apply to its own characters, as features
/// over a range of the one buffer) and the tracking, as long as the tracking keeps or drops
/// standard ligatures alike ([`crate::features::ligatures_suppressed_by`]).
fn shapes_alike(a: &CharStyle, b: &CharStyle) -> bool {
@@ -1186,6 +1191,8 @@ fn shapes_alike(a: &CharStyle, b: &CharStyle) -> bool {
warichu_scale: _,
warichu_align: _,
digits,
diacritic_horizontal: _,
diacritic_vertical: _,
font_height_reference,
no_break,
language,
@@ -1464,11 +1471,21 @@ fn shape_segment(text: &str, context: &Range<usize>, seg: &Segment, feats: &OtFe
if !manual_ends.is_empty() {
return shape_apart(manual_ends, out);
}
// Harakat styled apart from their letters (paint only): shaped with them, each glyph then
// takes its own character's run ([`crate::harakat`]).
// Harakat styled apart from their letters (paint only), and harakat and Hebrew points with
// diacritic positions of their own: shaped with them, each glyph then takes its own
// character's run ([`crate::harakat`]).
let mark_boundaries: Vec<usize> = boundaries()
.filter(|&b| run_at(b - 1).1 != run_at(b).1 && crate::harakat::paint_only_mark_boundary(text, b, run_at(b - 1).1, run_at(b).1))
.filter(|&b| {
let (before, after) = (run_at(b - 1).1, run_at(b).1);
before != after
&& (crate::harakat::paint_only_mark_boundary(text, b, before, after)
|| crate::harakat::diacritic_mark_boundary(text, b, before, after))
})
.collect();
// The face's mark classes, read once when any of the segment's runs moves its marks.
let moves_marks =
runs.get(source_runs.clone()).unwrap_or_default().iter().any(|(_, s)| s.diacritic_horizontal != 0.0 || s.diacritic_vertical != 0.0);
let diacritic_classes = if moves_marks { crate::harakat::mark_classes(face) } else { None };
// Source run starts are sorted. Reuse their classification when checking cluster splits.
let styled_marks = !mark_boundaries.is_empty();
let char_level = std::cell::Cell::new(false);
@@ -1769,11 +1786,21 @@ fn shape_segment(text: &str, context: &Range<usize>, seg: &Segment, feats: &OtFe
for (gi, &(gid, cl, xa, xo, yo)) in raw.iter().enumerate() {
let cl = cl as usize;
let (run, gst) = run_at(cl);
// A glyph of a harakat styled apart takes its own character's run (paint only).
let run = match chars.get(gi).map(|&c| run_at(c as usize)) {
Some((own, own_st)) if crate::harakat::paint_only(gst, own_st) => own,
_ => run,
// A glyph of a harakat styled apart takes its own character's run (paint and diacritic
// positions only).
let (run, run_st) = match chars.get(gi).map(|&c| run_at(c as usize)) {
Some((own, own_st)) if crate::harakat::paint_only(gst, own_st) => (own, own_st),
_ => (run, gst),
};
// A mark glyph (GDEF class 3) moves by its run's Adjust Diacritic Positions, thousandths
// of the em it is set in: right and up for positive values.
let (mut dx, mut dy) = (xo as f64 * k * hs, -(yo as f64) * k * vs);
if let Some(classes) = &diacritic_classes
&& classes.get(skrifa::GlyphId::new(gid)) == 3
{
dx += run_st.diacritic_horizontal / 1000.0 * size * hs;
dy -= run_st.diacritic_vertical / 1000.0 * size * vs;
}
let end = cluster_end(cl);
let last_in_cluster = gi + 1 == n || raw[gi + 1].1 as usize != cl;
let ch = first_char(cl);
@@ -1828,8 +1855,8 @@ fn shape_segment(text: &str, context: &Range<usize>, seg: &Segment, feats: &OtFe
run,
adv,
tracking: tracked,
dx: xo as f64 * k * hs,
dy: -(yo as f64) * k * vs,
dx,
dy,
kern_shift,
aki_shift,
aki: aki_in_adv,
+72
View File
@@ -173,6 +173,8 @@ fn paint_only_keeps_every_drawing_attribute_and_partial_equality() {
b.style_name = a.style_name.clone();
b.kerning_before = a.kerning_before;
b.features = a.features.clone();
b.diacritic_horizontal = a.diacritic_horizontal;
b.diacritic_vertical = a.diacritic_vertical;
*a == b
}
@@ -226,6 +228,8 @@ fn paint_only_keeps_every_drawing_attribute_and_partial_equality() {
field!(tcy_left_right, 1.0, false);
field!(standard_vertical_roman, true, false);
field!(digits, Digits::Hindi, false);
field!(diacritic_horizontal, 100.0, true);
field!(diacritic_vertical, -100.0, true);
field!(font_height_reference, FontHeightReference::CapHeight, false);
field!(no_break, true, false);
field!(language, Some("ar".into()), false);
@@ -331,6 +335,74 @@ fn feature_only_harakat_boundaries_keep_attachment_and_ownership() {
}
}
/// Adjust Horizontal and Vertical Diacritic Position move the mark glyphs (GDEF class 3) by
/// thousandths of an em of the glyph size, right and up for positive values, and leave the letters
/// where they were. A mark styled apart from its letter takes its own values.
#[test]
fn diacritic_positions_move_marks_and_keep_letters() {
let db = FontDb::with_font_dirs(vec![]);
assert_eq!(db.add_font(crate::test_fonts::lam_alef_font(b"rlig").expect("the test font builds")), 1);
let family = crate::test_fonts::lam_alef_family(b"rlig");
let face = db.face(family, "Regular").expect("the test face");
const WORD: &str = "بَبَبَ";
let plain = TextObject::point(Point::ZERO, WORD, style(family));
let before = layout(&db, &plain);
assert_eq!(before.glyphs.len(), 6, "three bases with their attached marks");
let (h, v) = (200.0, 100.0);
let moved = (h / 1000.0 * 48.0, -v / 1000.0 * 48.0);
// (letters set, marks set): which glyphs move.
for (letters, marks) in [(true, true), (false, true), (true, false), (false, false)] {
let mut text = plain.clone();
for (byte, ch) in WORD.char_indices() {
if (is_harakat(ch) && marks) || (!is_harakat(ch) && letters) {
crate::edit::style_range(&mut text.runs, byte, byte + ch.len_utf8(), |st| {
st.diacritic_horizontal = h;
st.diacritic_vertical = v;
});
}
}
let after = layout(&db, &text);
assert_eq!(after.glyphs.len(), before.glyphs.len(), "letters {letters}, marks {marks}");
let mut marks_seen = 0;
for (a, b) in before.glyphs.iter().zip(&after.glyphs) {
assert_eq!((a.gid, a.byte, a.origin, a.advance), (b.gid, b.byte, b.origin, b.advance), "letters {letters}, marks {marks}");
let (ta, tb) = (a.xf.translation(), b.xf.translation());
let delta = (tb.x - ta.x, tb.y - ta.y);
let mark = is_gdef_mark(&face, a.gid);
marks_seen += usize::from(mark);
let want = if mark && marks { moved } else { (0.0, 0.0) };
assert!(
(delta.0 - want.0).abs() < 1e-9 && (delta.1 - want.1).abs() < 1e-9,
"letters {letters}, marks {marks}: glyph {} moved {delta:?}, want {want:?}",
a.gid
);
}
assert_eq!(marks_seen, 3, "the three fathas are marks");
}
}
/// Hebrew points count as diacritics as well as Arabic harakat; Latin accents and letters do not.
/// A boundary where only the diacritic positions differ asks for the character-level pass only
/// at such a mark.
#[test]
fn hebrew_points_and_harakat_are_diacritics() {
use crate::harakat::{diacritic_mark_boundary, is_diacritic};
for c in ['\u{05B8}', '\u{05C1}', '\u{05BC}', '\u{064E}', '\u{0651}'] {
assert!(is_diacritic(c), "{c:?}");
}
for c in ['\u{05D0}', '\u{0628}', '\u{0301}', 'a', '\u{05BE}'] {
assert!(!is_diacritic(c), "{c:?}");
}
let a = style(FAMILY);
let b = CharStyle { diacritic_vertical: 150.0, ..a.clone() };
assert!(diacritic_mark_boundary("שָׁ", 2, &a, &b), "a Hebrew point styled apart");
assert!(diacritic_mark_boundary("بَ", 2, &a, &b), "a fatha styled apart");
assert!(!diacritic_mark_boundary("e\u{301}", 1, &a, &b), "a Latin accent keeps its cluster's values");
assert!(!diacritic_mark_boundary("بَ", 2, &a, &a), "the same values");
let c = CharStyle { size: 20.0, ..b.clone() };
assert!(!diacritic_mark_boundary("بَ", 2, &a, &c), "a size change splits the run anyway");
}
/// A range is normalised as `edit::style_range` takes one: clamped, each end moved back to the
/// start of its character, put in order. Never a silent empty result for a usable range.
#[test]
@@ -26,13 +26,40 @@ const NUMBERS: &[&str] = &["size", "leading", "kerning", "tracking"];
/// The on, off or unset checkboxes.
const SWITCHES: &[&str] = &["underline", "strikethrough", "standardVerticalRoman"];
/// The attributes of Advanced Character Formats, in the order the section shows them.
const ADVANCED: &[&str] =
&["h_scale", "v_scale", "baseline_shift", "tcyUpDown", "tcyLeftRight", "rotation", "akiLeft", "akiRight", "tsume", "language"];
const ADVANCED: &[&str] = &[
"h_scale",
"v_scale",
"baseline_shift",
"tcyUpDown",
"tcyLeftRight",
"rotation",
"akiLeft",
"akiRight",
"tsume",
"diacriticHorizontal",
"diacriticVertical",
"language",
];
/// The number fields of Advanced Character Formats.
const ADVANCED_NUMBERS: &[&str] = &["h_scale", "v_scale", "baseline_shift", "tcyUpDown", "tcyLeftRight", "rotation", "akiLeft", "akiRight", "tsume"];
const ADVANCED_NUMBERS: &[&str] = &[
"h_scale",
"v_scale",
"baseline_shift",
"tcyUpDown",
"tcyLeftRight",
"rotation",
"akiLeft",
"akiRight",
"tsume",
"diacriticHorizontal",
"diacriticVertical",
];
/// The Insert Aki Left and Right fields, which take the Character panel's presets and stop at
/// [`vectorcraft_doc::text::MAX_AKI`].
const AKI: [&str; 2] = ["akiLeft", "akiRight"];
/// The Adjust Horizontal and Vertical Diacritic Position fields, which take the Character panel's
/// presets and stop at [`vectorcraft_doc::text::MAX_DIACRITIC_POSITION`] either way.
const DIACRITIC: [&str; 2] = ["diacriticHorizontal", "diacriticVertical"];
/// The attributes of Character Color.
const COLOR: &[&str] = &["fill", "stroke", "stroke_width", "overprint_fill", "overprint_stroke"];
/// The fields of Character Color: the fill and stroke paints, their tints in percent, the stroke
@@ -103,6 +130,8 @@ pub(super) const SPEC: DialogSpec = DialogSpec {
"akiLeft",
"akiRight",
"tsume",
"diacriticHorizontal",
"diacriticVertical",
"language",
"fill",
"fill_tint",
@@ -295,6 +324,8 @@ fn optional_number(d: &Dialog, key: &str) -> Result<Option<Value>, String> {
"akiLeft" => tl!("Insert Aki Left"),
"akiRight" => tl!("Insert Aki Right"),
"tsume" => tl!("Tsume"),
"diacriticHorizontal" => tl!("Adjust Horizontal Diacritic Position"),
"diacriticVertical" => tl!("Adjust Vertical Diacritic Position"),
"fill_tint" => tl!("Fill Tint"),
"stroke_tint" => tl!("Stroke Tint"),
"stroke_width" => tl!("Weight"),
@@ -344,6 +375,9 @@ fn optional_number(d: &Dialog, key: &str) -> Result<Option<Value>, String> {
let n = if AKI.contains(&key) { n.clamp(0.0, vectorcraft_doc::text::MAX_AKI) } else { n };
// Tsume stops at 0% and 100% the same way.
let n = if key == "tsume" { n.clamp(0.0, vectorcraft_doc::text::MAX_TSUME) } else { n };
// The diacritic positions stop at the largest value the style takes either way.
let max = vectorcraft_doc::text::MAX_DIACRITIC_POSITION;
let n = if DIACRITIC.contains(&key) { n.clamp(-max, max) } else { n };
Ok(Some(json!(n)))
}
}
@@ -622,7 +656,7 @@ pub(crate) fn reset_basic(d: &mut Dialog) {
}
}
/// Reset Panel in Advanced Character Formats: its ten attributes become unset.
/// Reset Panel in Advanced Character Formats: its twelve attributes become unset.
pub(crate) fn reset_advanced(d: &mut Dialog) {
d.fields.insert("__resetAdvanced".into(), json!(true));
for key in ADVANCED_NUMBERS {
@@ -777,8 +811,9 @@ pub(crate) fn basic_body(ui: &mut egui::Ui, d: &mut Dialog) {
}
/// Advanced Character Formats: Horizontal Scale, Vertical Scale, Baseline Shift, the Tate-chu-yoko
/// Up/Down and Left/Right, Character Rotation, Insert Aki Left and Right and Tsume (with the
/// Character panel's presets) and Language, each empty (unset) or set.
/// Up/Down and Left/Right, Character Rotation, Insert Aki Left and Right, Tsume and the Adjust
/// Horizontal and Vertical Diacritic Positions (with the Character panel's presets) and Language,
/// each empty (unset) or set.
pub(crate) fn advanced_body(ui: &mut egui::Ui, d: &mut Dialog) {
egui::Grid::new("character-style-advanced").num_columns(2).spacing([18.0, 8.0]).show(ui, |ui| {
for (key, caption, unit) in [
@@ -820,6 +855,18 @@ pub(crate) fn advanced_body(ui: &mut egui::Ui, d: &mut Dialog) {
ui.label("%");
});
ui.end_row();
let presets: Vec<String> = crate::panels::character::DIACRITIC_PRESETS.iter().map(f64::to_string).collect();
let presets: Vec<&str> = presets.iter().map(String::as_str).collect();
for (key, caption) in
[("diacriticHorizontal", tl!("Adjust Horizontal Diacritic Position")), ("diacriticVertical", tl!("Adjust Vertical Diacritic Position"))]
{
let row = ui.label(caption);
let value = if d.fields.get(key).is_none_or(Value::is_null) { String::new() } else { d.str(key) };
if let Some(v) = ui.label_inputs_by(row.id, |ui| crate::widgets::text_presets(ui, (KIND, key), &value, &presets, 160.0)) {
d.fields.insert(key.into(), json!(v));
}
ui.end_row();
}
let row = ui.label(tl!("Language:"));
let names: Vec<&str> = std::iter::once(" ").chain(vectorcraft_doc::setup::LANGUAGES.iter().map(|(name, _, _)| *name)).collect();
let current = d.fields.get("language").and_then(Value::as_str).unwrap_or("").to_string();
@@ -1882,6 +1929,55 @@ mod tests {
assert!(t.runs.iter().all(|r| (r.style.aki_left, r.style.aki_right) == (250.0, 1000.0)));
}
/// The Adjust Diacritic Positions in Advanced Character Formats: empty is unset, a typed value
/// stops at -1000 and 1000, Reset Panel unsets them, and the fields are drawn and commit to the
/// style and the text set in it.
#[test]
fn diacritic_position_fields_show_set_reset_and_commit() {
let d = dialog_for(json!({"diacriticHorizontal": -250.0, "size": 12.0}));
assert_eq!((d.fields["diacriticHorizontal"].clone(), d.fields["diacriticVertical"].clone()), (json!(-250.0), json!("")));
assert_eq!(edited_attrs(&d).unwrap(), attrs(json!({"diacriticHorizontal": -250.0, "size": 12.0})));
let mut d = dialog_for(json!({"diacriticHorizontal": -250.0}));
d.fields.insert("diacriticHorizontal".into(), json!(""));
for (typed, kept) in [("0", 0.0), ("150", 150.0), ("5000", 1000.0), ("-5000", -1000.0)] {
d.fields.insert("diacriticVertical".into(), json!(typed));
assert_eq!(edited_attrs(&d).unwrap(), attrs(json!({"diacriticVertical": kept})), "{typed}");
}
d.fields.insert("diacriticHorizontal".into(), json!("left"));
assert_eq!(edited_attrs(&d).unwrap_err(), "Adjust Horizontal Diacritic Position must be a number");
let mut d = dialog_for(json!({"diacriticHorizontal": 100.0, "diacriticVertical": 200.0, "size": 12.0}));
d.fields.insert("section".into(), json!("advanced"));
reset_section(&mut d);
assert_eq!(edited_attrs(&d).unwrap(), attrs(json!({"size": 12.0})));
let mut app = app();
app.run("charStyle.new", json!({"name": "Body", "attrs": {"size": 24.0}})).unwrap();
let id = app.run("text.create", json!({"x": 10, "y": 40, "text": "بَب"})).unwrap()["id"].as_u64().unwrap();
app.run("charStyle.apply", json!({"name": "Body", "id": id})).unwrap();
open(&mut app, "Body").unwrap();
let ctx = egui::Context::default();
crate::theme::install_fonts(&ctx);
let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(900.0, 900.0));
let mut d = app.ui.dialog.clone().unwrap();
let input = egui::RawInput { screen_rect: Some(screen), ..Default::default() };
let mut out = ctx.run_ui(input, |ui| advanced_body(ui, &mut d));
let texts = texts_of(&out);
out.textures_delta.clear();
for label in ["Adjust Horizontal Diacritic Position", "Adjust Vertical Diacritic Position"] {
assert!(texts.iter().any(|(text, _)| text == label), "{label} is drawn: {texts:?}");
}
{
let d = app.ui.dialog.as_mut().unwrap();
d.fields.insert("diacriticHorizontal".into(), json!("-120"));
d.fields.insert("diacriticVertical".into(), json!("3000"));
}
super::super::confirm(&mut app).unwrap();
let state = app.session.doc().unwrap();
assert_eq!(state.doc.char_styles[0].attrs, attrs(json!({"size": 24.0, "diacriticHorizontal": -120.0, "diacriticVertical": 1000.0})));
let vectorcraft_doc::NodeKind::Text(t) = &state.doc.node(vectorcraft_doc::NodeId(id)).unwrap().kind else { panic!("text") };
assert!(t.runs.iter().all(|r| (r.style.diacritic_horizontal, r.style.diacritic_vertical) == (-120.0, 1000.0)));
}
/// Tsume in Advanced Character Formats: empty is unset, an explicit 0 stays set, a typed value
/// stops at 0 and 100, Reset Panel unsets it, and the field is drawn and commits to the style
/// and the text set in it.
+2
View File
@@ -2648,6 +2648,8 @@ font-technology Variable Променливи
Insert Aki Left Вмъкване на аки отляво
Insert Aki Right Вмъкване на аки отдясно
Tsume Цуме
Adjust Horizontal Diacritic Position Коригиране на хоризонталната позиция на диакритиците
Adjust Vertical Diacritic Position Коригиране на вертикалната позиция на диакритиците
Character Direction Посока на знаците
Digits Цифри
Arabic Арабски
Can't render this file because it is too large.
+2
View File
@@ -1606,6 +1606,8 @@ lighting Light Svjetlo
Insert Aki Left Umetni aki lijevo
Insert Aki Right Umetni aki desno
Tsume Tsume
Adjust Horizontal Diacritic Position Podesi vodoravni položaj dijakritika
Adjust Vertical Diacritic Position Podesi okomiti položaj dijakritika
Character Direction Smjer znakova
Digits Cifre
Arabic Arapski
Can't render this file because it contains an unexpected character in line 2 and column 73.
+2
View File
@@ -3431,6 +3431,8 @@ digits Malayalam Malaiàlam
Insert Aki Left Insereix aki a l'esquerra
Insert Aki Right Insereix aki a la dreta
Tsume Tsume
Adjust Horizontal Diacritic Position Ajusta la posició horitzontal dels diacrítics
Adjust Vertical Diacritic Position Ajusta la posició vertical dels diacrítics
Proportional Lining Xifres proporcionals alineades
Position: Posició:
Default Position Posició predeterminada
Can't render this file because it contains an unexpected character in line 2 and column 73.
+2
View File
@@ -1634,6 +1634,8 @@ lighting Light Světlo
Insert Aki Left Vložit aki vlevo
Insert Aki Right Vložit aki vpravo
Tsume Tsume
Adjust Horizontal Diacritic Position Upravit vodorovnou polohu diakritiky
Adjust Vertical Diacritic Position Upravit svislou polohu diakritiky
Character Direction Směr znaků
Digits Číslice
Arabic Arabské
Can't render this file because it is too large.
+2
View File
@@ -2158,6 +2158,8 @@ lighting Light Lys
Insert Aki Left Indsæt aki til venstre
Insert Aki Right Indsæt aki til højre
Tsume Tsume
Adjust Horizontal Diacritic Position Juster vandret placering af diakritiske tegn
Adjust Vertical Diacritic Position Juster lodret placering af diakritiske tegn
Character Direction Tegnretning
Digits Cifre
Arabic Arabisk
Can't render this file because it contains an unexpected character in line 2 and column 73.
+2
View File
@@ -2689,6 +2689,8 @@ mark-style Japanese Japanisch
Insert Aki Left Aki links einfügen
Insert Aki Right Aki rechts einfügen
Tsume Tsume
Adjust Horizontal Diacritic Position Horizontale Position diakritischer Zeichen anpassen
Adjust Vertical Diacritic Position Vertikale Position diakritischer Zeichen anpassen
Character Direction Zeichenrichtung
Digits Ziffern
Arabic Arabisch
Can't render this file because it is too large.
+2
View File
@@ -3501,6 +3501,8 @@ theme Appearance Εμφάνιση
Insert Aki Left Εισαγωγή aki αριστερά
Insert Aki Right Εισαγωγή aki δεξιά
Tsume Tsume
Adjust Horizontal Diacritic Position Προσαρμογή οριζόντιας θέσης διακριτικών
Adjust Vertical Diacritic Position Προσαρμογή κατακόρυφης θέσης διακριτικών
Arabic Αραβικά
Hindi Χίντι
Farsi Περσικά
Can't render this file because it is too large.
+2
View File
@@ -2726,6 +2726,8 @@ font-technology Variable Variables
Insert Aki Left Insertar aki a la izquierda
Insert Aki Right Insertar aki a la derecha
Tsume Tsume
Adjust Horizontal Diacritic Position Ajustar posición horizontal de los diacríticos
Adjust Vertical Diacritic Position Ajustar posición vertical de los diacríticos
Character Direction Dirección de caracteres
Digits Dígitos
Arabic Árabes
Can't render this file because it contains an unexpected character in line 2 and column 73.
+2
View File
@@ -1609,6 +1609,8 @@ lighting Light Valo
Insert Aki Left Lisää aki vasemmalle
Insert Aki Right Lisää aki oikealle
Tsume Tsume
Adjust Horizontal Diacritic Position Säädä tarkkeiden vaakasijaintia
Adjust Vertical Diacritic Position Säädä tarkkeiden pystysijaintia
Character Direction Merkkien suunta
Digits Numerot
Arabic Arabia
Can't render this file because it contains an unexpected character in line 2 and column 73.
+2
View File
@@ -2718,6 +2718,8 @@ font-technology Variable Variables
Insert Aki Left Insérer un aki à gauche
Insert Aki Right Insérer un aki à droite
Tsume Tsume
Adjust Horizontal Diacritic Position Ajuster la position horizontale des signes diacritiques
Adjust Vertical Diacritic Position Ajuster la position verticale des signes diacritiques
Character Direction Direction des caractères
Digits Chiffres
Arabic Arabes
Can't render this file because it is too large.
+2
View File
@@ -4444,6 +4444,8 @@ antiAlias Sharp શાર્પ
Preview: પ્રીવ્યૂ:
Insert Aki Left ડાબે અકી ઉમેરો
Insert Aki Right જમણે અકી ઉમેરો
Adjust Horizontal Diacritic Position ડાયાક્રિટિકની આડી સ્થિતિ ગોઠવો
Adjust Vertical Diacritic Position ડાયાક્રિટિકની ઊભી સ્થિતિ ગોઠવો
Conic Gradient કોનિક ગ્રેડિયન્ટ
Diamond Gradient ડાયમંડ ગ્રેડિયન્ટ
Include Placed Images પ્લેસ કરેલી ઇમેજો સામેલ કરો
Can't render this file because it contains an unexpected character in line 72 and column 5.
+2
View File
@@ -3773,6 +3773,8 @@ antiAlias Sharp शार्प
Insert Aki Left बाईं ओर आकी जोड़ें
Insert Aki Right दाईं ओर आकी जोड़ें
Tsume त्सुमे
Adjust Horizontal Diacritic Position डायक्रिटिक की क्षैतिज स्थिति समायोजित करें
Adjust Vertical Diacritic Position डायक्रिटिक की लंबवत स्थिति समायोजित करें
Proportional Oldstyle आनुपातिक ओल्डस्टाइल
Protect Corners कॉर्नर को सुरक्षित रखें
Proximity Guides निकटता गाइड
Can't render this file because it is too large.
+2
View File
@@ -3290,6 +3290,8 @@ mark-style Japanese Japán
Insert Aki Left Aki beszúrása balra
Insert Aki Right Aki beszúrása jobbra
Tsume Tsume
Adjust Horizontal Diacritic Position Mellékjelek vízszintes helyzetének igazítása
Adjust Vertical Diacritic Position Mellékjelek függőleges helyzetének igazítása
Proportional Lining Arányos modern
Position: Pozíció:
Default Position Alapértelmezett pozíció
Can't render this file because it is too large.
+2
View File
@@ -1534,6 +1534,8 @@ lighting Light Cahaya
Insert Aki Left Sisipkan aki kiri
Insert Aki Right Sisipkan aki kanan
Tsume Tsume
Adjust Horizontal Diacritic Position Sesuaikan posisi horizontal diakritik
Adjust Vertical Diacritic Position Sesuaikan posisi vertikal diakritik
Character Direction Arah karakter
Digits Digit
Arabic Arab
1 # Indonesian (id) catalog. Same format as zh-hant.tsv: context <TAB> source <TAB> translation
1534
1535
1536
1537
1538
1539
1540
1541
+2
View File
@@ -2766,6 +2766,8 @@ mark-style Japanese Giapponese
Insert Aki Left Inserisci aki a sinistra
Insert Aki Right Inserisci aki a destra
Tsume Tsume
Adjust Horizontal Diacritic Position Regola posizione orizzontale dei segni diacritici
Adjust Vertical Diacritic Position Regola posizione verticale dei segni diacritici
Character Direction Direzione caratteri
Digits Cifre
Arabic Arabe
Can't render this file because it is too large.
+2
View File
@@ -55,6 +55,8 @@ font-technology Variable バリアブル
Insert Aki Left 前にアキを挿入
Insert Aki Right 後ろにアキを挿入
Tsume 文字ツメ
Adjust Horizontal Diacritic Position 発音区別符号の水平位置を調整
Adjust Vertical Diacritic Position 発音区別符号の垂直位置を調整
Character Direction 文字の方向
Digits 数字
Arabic アラビア数字
Can't render this file because it is too large.
+2
View File
@@ -3556,6 +3556,8 @@ lighting Light სინათლე
Insert Aki Left აკის ჩასმა მარცხნივ
Insert Aki Right აკის ჩასმა მარჯვნივ
Tsume ცუმე
Adjust Horizontal Diacritic Position დიაკრიტიკის ჰორიზონტალური პოზიციის მორგება
Adjust Vertical Diacritic Position დიაკრიტიკის ვერტიკალური პოზიციის მორგება
Character Direction სიმბოლოების მიმართულება
Digits ციფრები
Arabic არაბული
Can't render this file because it is too large.
+2
View File
@@ -49,6 +49,8 @@ font-technology Variable 가변
Insert Aki Left 앞 아키 삽입
Insert Aki Right 뒤 아키 삽입
Tsume 츠메
Adjust Horizontal Diacritic Position 발음 구별 기호 가로 위치 조정
Adjust Vertical Diacritic Position 발음 구별 기호 세로 위치 조정
Character Direction 문자 방향
Digits 숫자
Arabic 아라비아어
Can't render this file because it is too large.
+2
View File
@@ -2054,6 +2054,8 @@ lighting Light Licht
Insert Aki Left Aki links invoegen
Insert Aki Right Aki rechts invoegen
Tsume Tsume
Adjust Horizontal Diacritic Position Horizontale positie van diakritische tekens aanpassen
Adjust Vertical Diacritic Position Verticale positie van diakritische tekens aanpassen
Character Direction Tekenrichting
Digits Cijfers
Arabic Arabisch
Can't render this file because it is too large.
+2
View File
@@ -1547,6 +1547,8 @@ lighting Light Światło
Insert Aki Left Wstaw aki z lewej
Insert Aki Right Wstaw aki z prawej
Tsume Tsume
Adjust Horizontal Diacritic Position Dostosuj poziome położenie znaków diakrytycznych
Adjust Vertical Diacritic Position Dostosuj pionowe położenie znaków diakrytycznych
Character Direction Kierunek znaków
Digits Cyfry
Arabic Arabskie
Can't render this file because it is too large.
+2
View File
@@ -2253,6 +2253,8 @@ antiAlias Sharp Nítido
Insert Aki Left Inserir Aki à Esquerda
Insert Aki Right Inserir Aki à Direita
Tsume Tsume
Adjust Horizontal Diacritic Position Ajustar Posição Horizontal dos Diacríticos
Adjust Vertical Diacritic Position Ajustar Posição Vertical dos Diacríticos
Character Direction Direção de Caracteres
Digits Dígitos
Arabic Arábicos
Can't render this file because it is too large.
+2
View File
@@ -2755,6 +2755,8 @@ mark-style Japanese Японский
Insert Aki Left Вставить аки слева
Insert Aki Right Вставить аки справа
Tsume Цумэ
Adjust Horizontal Diacritic Position Настроить горизонтальное положение диакритических знаков
Adjust Vertical Diacritic Position Настроить вертикальное положение диакритических знаков
Character Direction Направление символов
Digits Цифры
Arabic Арабские
Can't render this file because it is too large.
+2
View File
@@ -2661,6 +2661,8 @@ font-technology Variable Variabla
Insert Aki Left Infoga aki till vänster
Insert Aki Right Infoga aki till höger
Tsume Tsume
Adjust Horizontal Diacritic Position Justera vågrät position för diakritiska tecken
Adjust Vertical Diacritic Position Justera lodrät position för diakritiska tecken
Character Direction Teckenriktning
Digits Siffror
Arabic Arabiska
Can't render this file because it is too large.
+2
View File
@@ -2502,6 +2502,8 @@ shape Open Açık
Insert Aki Left Sola Aki Ekle
Insert Aki Right Sağa Aki Ekle
Tsume Tsume
Adjust Horizontal Diacritic Position Yatay Aksan İşareti Konumunu Ayarla
Adjust Vertical Diacritic Position Dikey Aksan İşareti Konumunu Ayarla
Digits Rakamlar
Arabic Arapça
Hindi Hintçe
Can't render this file because it is too large.
+2
View File
@@ -2758,6 +2758,8 @@ mark-style Japanese Японський
Insert Aki Left Вставити акі ліворуч
Insert Aki Right Вставити акі праворуч
Tsume Цуме
Adjust Horizontal Diacritic Position Налаштувати горизонтальне положення діакритичних знаків
Adjust Vertical Diacritic Position Налаштувати вертикальне положення діакритичних знаків
Character Direction Напрямок символів
Digits Цифри
Arabic Арабські
Can't render this file because it is too large.
+2
View File
@@ -3079,6 +3079,8 @@ mark-style Japanese Kiểu Nhật
Insert Aki Left Chèn aki bên trái
Insert Aki Right Chèn aki bên phải
Tsume Tsume
Adjust Horizontal Diacritic Position Điều chỉnh vị trí ngang của dấu phụ
Adjust Vertical Diacritic Position Điều chỉnh vị trí dọc của dấu phụ
Proportional Lining Số tỷ lệ đứng
Position: Vị trí:
Default Position Vị trí mặc định
Can't render this file because it contains an unexpected character in line 205 and column 5.
+2
View File
@@ -2619,6 +2619,8 @@ font-script Japanese 汉字
Insert Aki Left 在前方插入空白
Insert Aki Right 在后方插入空白
Tsume 比例间距
Adjust Horizontal Diacritic Position 调整变音符号水平位置
Adjust Vertical Diacritic Position 调整变音符号垂直位置
Character Direction 字符方向
Digits 数字
Arabic 阿拉伯数字
Can't render this file because it is too large.
+2
View File
@@ -3843,6 +3843,8 @@ font-script Japanese 漢字
Insert Aki Left 在前方插入空白
Insert Aki Right 在後方插入空白
Tsume 比例間距
Adjust Horizontal Diacritic Position 調整變音符號水平位置
Adjust Vertical Diacritic Position 調整變音符號垂直位置
Character Direction 字元方向
Digits 數字
Arabic 阿拉伯數字
Can't render this file because it is too large.
+28 -5
View File
@@ -28,6 +28,8 @@ pub const SCALE_PRESETS: [f64; 8] = [25.0, 50.0, 75.0, 90.0, 100.0, 110.0, 125.0
pub const AKI_PRESETS: [f64; 4] = [0.0, 250.0, 500.0, 1000.0];
/// Tsume presets, in percent.
pub const TSUME_PRESETS: [f64; 5] = [0.0, 25.0, 50.0, 75.0, 100.0];
/// Adjust Horizontal and Vertical Diacritic Position presets, in thousandths of an em.
pub const DIACRITIC_PRESETS: [f64; 7] = [-200.0, -100.0, -50.0, 0.0, 50.0, 100.0, 200.0];
/// The stored character style: the selected range's (or the caret's) while the Type
/// tool edits text, else the first selected text object's first run (including groups). With it, the paragraph
@@ -881,9 +883,10 @@ fn cell(ui: &mut Ui, label: &str, tip: &str, add: impl FnOnce(&mut Ui)) {
/// The Character panel's grid of fields, `w` wide: Font Size, Leading, Kerning and Tracking,
/// then with `more` the scales, Baseline Shift and Character Rotation, and a row with the
/// Anti-aliasing Method dropdown under Character Rotation (`s`: the style shown), and with Show East
/// Asian Options on a row with Insert Aki Left and Right and a row with Tsume. With Show Font
/// Height Options on, a row under Font Size holds the Set Font Height Reference dropdown. The
/// Properties panel shows its first rows.
/// Asian Options on a row with Insert Aki Left and Right and a row with Tsume, and with Show Indic
/// Options (the Middle Eastern options) on a row with Adjust Horizontal and Vertical Diacritic
/// Position. With Show Font Height Options on, a row under Font Size holds the Set Font Height
/// Reference dropdown. The Properties panel shows its first rows.
pub(crate) fn metrics_grid(app: &mut VectorcraftApp, ui: &mut Ui, id: &str, s: &CharStyle, w: f32, more: bool) {
let fw = ((w - 66.0) / 2.0).clamp(60.0, 100.0);
let unit = app.session.type_unit();
@@ -986,6 +989,24 @@ pub(crate) fn metrics_grid(app: &mut VectorcraftApp, ui: &mut Ui, id: &str, s: &
});
ui.end_row();
}
// Adjust Horizontal and Vertical Diacritic Position, with the Middle Eastern options: the
// marks of the characters move across and up, in thousandths of an em.
if app.session.prefs.show_indic_options {
let max = vectorcraft_doc::text::MAX_DIACRITIC_POSITION;
for (field, label, key, icon) in [
("ch-diacritic-h", tl!("Adjust Horizontal Diacritic Position"), "diacriticHorizontal", "´↔"),
("ch-diacritic-v", tl!("Adjust Vertical Diacritic Position"), "diacriticVertical", "´↕"),
] {
cell(ui, icon, label, |ui| {
let value = shared(app, |s| if key == "diacriticHorizontal" { s.diacritic_horizontal } else { s.diacritic_vertical });
if let Some(v) = widgets::spin_plain(ui, field, value, "", 0, fw, 10.0, -max, &DIACRITIC_PRESETS) {
// The field stops at the largest value the command takes.
format(app, json!({ key: v.min(max) }));
}
});
}
ui.end_row();
}
});
}
@@ -1730,7 +1751,8 @@ fn fractional_widths_on(app: &VectorcraftApp) -> bool {
/// character alignment, Proportional Metrics, Tate-chu-yoko, Warichu, Standard Vertical Roman Alignment and
/// No Break off, Tate-chu-yoko Settings Up/Down and Left/Right 0, the default Warichu Settings (2 lines, no
/// line gap, 50%, Auto alignment), Insert Aki Left and Right 0, Tsume 0, the Default character direction,
/// Kashidas on, the Default digits and the Em Box font height reference, whether or not Show East Asian
/// Kashidas on, the Default digits, Adjust Horizontal and Vertical Diacritic Position 0 and the Em Box
/// font height reference, whether or not Show East Asian
/// Options, Show Indic Options and Show Font Height Options are on. Inside an undo group that is
/// already open, the reset is part of that group's step.
fn reset_panel(app: &mut VectorcraftApp) {
@@ -1752,7 +1774,8 @@ fn reset_panel(app: &mut VectorcraftApp) {
"tsume": d.tsume, "warichu": d.warichu, "warichuLines": d.warichu_lines, "warichuGap": d.warichu_gap, "warichuScale": d.warichu_scale,
"warichuAlign": d.warichu_align,
"standardVerticalRoman": d.standard_vertical_roman, "noBreak": d.no_break, "charDirection": "default", "kashidas": d.kashidas,
"digits": d.digits, "fontHeightReference": d.font_height_reference
"digits": d.digits, "diacriticHorizontal": d.diacritic_horizontal, "diacriticVertical": d.diacritic_vertical,
"fontHeightReference": d.font_height_reference
}),
);
set_anti_alias(app, TypeAntiAlias::Sharp);
+57 -3
View File
@@ -782,6 +782,57 @@ fn insert_aki_fields_show_with_the_east_asian_options() {
assert!(left(&app).iter().all(|v| *v == 1000.0), "{:?}", left(&app));
}
/// Adjust Horizontal and Vertical Diacritic Position are fields of the panel with the Middle
/// Eastern options only, and show the selected characters' values, blank where they differ. A value
/// typed past -1000 sets -1000. Bad values sent to the commands are errors that change nothing.
#[test]
fn diacritic_position_fields_show_with_the_middle_eastern_options() {
let mut app = VectorcraftApp::new(Session::new(), Default::default());
app.run("file.new", json!({"width": 300, "height": 200})).unwrap();
let id = app.run("text.create", json!({"x": 20, "y": 50, "text": "بَبَ"})).unwrap()["id"].as_u64().unwrap();
app.run("select.set", json!({"ids": [id]})).unwrap();
app.run("text.setFormat", json!({"diacriticHorizontal": 125, "diacriticVertical": -375})).unwrap();
let text = crate::tests_labels::painted_text(&mut app, show);
assert!(!text.contains("´↔") && !text.contains("-375"), "{text}");
app.session.prefs.show_indic_options = true;
let text = crate::tests_labels::painted_text(&mut app, show);
assert!(text.contains("´↔") && text.contains("´↕") && text.contains("125") && text.contains("-375"), "{text}");
let undo = app.session.active().unwrap().history.undo.len();
let doc = app.session.active().unwrap().doc.clone();
for (cmd, params) in [
("text.setFormat", json!({"diacriticHorizontal": 1000.5})),
("text.setFormat", json!({"diacriticVertical": "up"})),
("text.setRangeStyle", json!({"id": id, "start": 0, "end": 2, "diacriticVertical": -1001})),
("text.setRangeStyle", json!({"id": id, "start": 0, "end": 2, "diacriticHorizontal": true})),
] {
let error = app.run(cmd, params.clone()).unwrap_err().to_string();
assert!(error.contains("`diacritic"), "{cmd} {params}: {error}");
}
assert_eq!(app.session.active().unwrap().history.undo.len(), undo);
assert!(app.session.active().unwrap().doc == doc);
// Setting the value the characters already have records no undo step.
app.run("text.setFormat", json!({"diacriticVertical": -375})).unwrap();
assert_eq!(app.session.active().unwrap().history.undo.len(), undo);
// Only the first letter and its fatha have -375: the Vertical field is blank.
app.run("text.setRangeStyle", json!({"id": id, "start": 4, "end": 8, "diacriticVertical": 0})).unwrap();
let text = crate::tests_labels::painted_text(&mut app, show);
assert!(text.contains("125") && !text.contains("-375"), "{text}");
use super::super::tests_appearance::{click, frame_events, text_rect};
let ctx = egui::Context::default();
let texts = frame_events(&ctx, &mut app, vec![], show);
click(&ctx, &mut app, text_rect(&texts, "125").center(), show);
let key = |key, modifiers| egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers };
frame_events(&ctx, &mut app, vec![key(egui::Key::A, egui::Modifiers::COMMAND)], show);
frame_events(&ctx, &mut app, vec![egui::Event::Text("-1500".into())], show);
frame_events(&ctx, &mut app, vec![key(egui::Key::Enter, egui::Modifiers::NONE)], show);
frame_events(&ctx, &mut app, vec![], show);
let horizontal = |app: &VectorcraftApp| match &app.session.active().unwrap().doc.node(NodeId(id)).unwrap().kind {
NodeKind::Text(t) => t.runs.iter().map(|r| r.style.diacritic_horizontal).collect::<Vec<_>>(),
_ => panic!("text"),
};
assert!(horizontal(&app).iter().all(|v| *v == -1000.0), "{:?}", horizontal(&app));
}
/// Tsume is a field of the panel with the East Asian options only, and shows the selected
/// characters' value, blank where they differ. A value typed past 100 sets 100.
#[test]
@@ -1487,6 +1538,8 @@ fn reset_panel_resets_every_attribute_but_the_font() {
s.char_direction != d.char_direction,
s.digits != d.digits,
s.font_height_reference != d.font_height_reference,
s.diacritic_horizontal != d.diacritic_horizontal,
s.diacritic_vertical != d.diacritic_vertical,
]
};
let custom = |app: &mut VectorcraftApp| {
@@ -1496,16 +1549,17 @@ fn reset_panel_resets_every_attribute_but_the_font() {
"id": id, "tracking": 50, "leading": 30, "kerning": 20, "baselineShift": 3, "hScale": 120, "vScale": 90, "rotation": 15,
"underline": true, "strikethrough": true, "allCaps": true, "smallCaps": true, "position": "superscript",
"charAlign": "emBoxCenter", "proportionalMetrics": true, "tateChuYoko": true, "tcyUpDown": 2, "tcyLeftRight": -3,
"akiLeft": 250, "akiRight": 500, "tsume": 50, "standardVerticalRoman": true, "noBreak": true, "charDirection": "rightToLeft", "digits": "hindi", "fontHeightReference": "capHeight"
"akiLeft": 250, "akiRight": 500, "tsume": 50, "standardVerticalRoman": true, "noBreak": true, "charDirection": "rightToLeft", "digits": "hindi", "fontHeightReference": "capHeight",
"diacriticHorizontal": 120, "diacriticVertical": -80
}),
)
.unwrap();
};
let plain = runs(&app)[0].1.clone();
assert_eq!(differs(&plain, &CharStyle::default()), [false; 25]);
assert_eq!(differs(&plain, &CharStyle::default()), [false; 27]);
custom(&mut app);
let styled = runs(&app)[0].1.clone();
assert_eq!(differs(&styled, &CharStyle::default()), [true; 25]);
assert_eq!(differs(&styled, &CharStyle::default()), [true; 27]);
app.run("select.set", json!({"ids": [id]})).unwrap();
reset_panel(&mut app);
assert_eq!(runs(&app), [("One 12".to_string(), plain.clone())]);
+28 -2
View File
@@ -10087,6 +10087,30 @@ A digit the font lacks comes from a fallback font. Default and saved only when s
{"name":"run_command","arguments":{"command":"text.setFormat","params":{"digits":"hindi"}}}
```
## Adjust Diacritic Position
`text.setFormat {diacriticHorizontal?, diacriticVertical?}` (the selected type, or `ids`) and
`text.setRangeStyle {id, start, end, diacriticHorizontal?, diacriticVertical?}` (a range) move the characters' diacritical
marks relative to their letters, as the Character panel's Adjust Horizontal and Adjust Vertical Diacritic Position do
([the reference, page 549](https://web.archive.org/web/20210601162814/https://helpx.adobe.com/pdf/illustrator_reference.pdf#page=549)).
The units, range and direction are VectorCraft's own rules: each value is in thousandths of an em of the characters' size,
from -1000 to 1000; a positive horizontal value moves the marks right and a positive vertical value moves them up. Only
glyphs the font classes as marks (GDEF class 3) move; the letters keep their places and advances, and a font without
mark classes moves nothing. An Arabic harakat or a Hebrew point styled apart from its letter takes its own values;
other marks take the values of their letter. Setting one value leaves the other as it is. Both are 0 by default and
saved only when not 0, and character styles carry them (`charStyle.new`, `charStyle.setAttrs` and `charStyle.edit`
refuse a value outside the range). A value that is not a number is refused with `` `diacriticHorizontal` must be a
number ``, and one outside the range with `` `diacriticHorizontal` must be from -1000 to 1000 ``, naming the key. One
undo step, and a `text.setFormat` call that gives the values the characters already have records none. With Show Middle Eastern
Options on, the Character panel shows both fields, blank where the selected characters differ, with -200, -100, -50,
0, 50, 100 and 200 in their menus, and a value typed past either end sets that end; Reset Panel sets both to 0.
Character Style Options shows both fields in Advanced Character Formats. The canvas, PDF export and outlines draw the
moved marks; SVG export writes type with a moved mark as outlines.
```json
{"name":"run_command","arguments":{"command":"text.setRangeStyle","params":{"id":12,"start":2,"end":4,"diacriticVertical":150}}}
```
## Font height reference
`text.setFormat {fontHeightReference: "emBox"|"capHeight"|"xHeight"|"icfBox"}` (the selected type, or `ids`) and
@@ -10408,7 +10432,7 @@ attribute map in one undo step. `to` is trimmed and must be unique. The command
while preserving local overrides; Undo/Redo restores the definition and its users. The `charStyleOptions`
dialog exposes `name`, `font_family`, `font_style`, `size`, `leading`, `kerning`, `tracking`, `case`,
`position`, `underline`, `strikethrough`, `charAlign`, `h_scale`, `v_scale`, `baseline_shift`, `tcyUpDown`,
`tcyLeftRight`, `rotation`, `akiLeft`, `akiRight`, `tsume`, `language`, `fill`, `fill_tint`, `stroke`, `stroke_tint`, `stroke_width`, `overprint_fill`, `overprint_stroke`,
`tcyLeftRight`, `rotation`, `akiLeft`, `akiRight`, `tsume`, `diacriticHorizontal`, `diacriticVertical`, `language`, `fill`, `fill_tint`, `stroke`, `stroke_tint`, `stroke_width`, `overprint_fill`, `overprint_stroke`,
`ot_figure`, `ot_position`, `ot_liga`, `ot_calt`, `ot_dlig`, `ot_swsh`, `ot_salt`, `ot_titl`, `ot_ordn`, `ot_frac`,
`ot_sets`, `section` (`general`, `basic`, `advanced`, `color` or `opentype`), and `preview`. An empty field leaves its
attribute unset. `leading` and `kerning` also accept `Auto` to store an explicit automatic value.
@@ -10417,7 +10441,9 @@ Advanced Character Formats holds `h_scale` and `v_scale` (percent, 1 to 10000),
-1296 to 1296, as `text.setRangeStyle` takes them; an explicit 0 stays distinct from unset), `rotation` (degrees, stored from -180 to 180), Insert Aki Left and Right `akiLeft` and `akiRight` (thousandths of
an em, with the Character panel's 0, 250, 500 and 1000 in their menus; a value typed below 0 or past 1000 sets 0 or
1000), Tsume `tsume` (percent, with the Character panel's 0, 25, 50, 75 and 100 in its menu; a value typed below 0 or
past 100 sets 0 or 100; an explicit 0 stays distinct from unset) and `language` (a name or tag from Document
past 100 sets 0 or 100; an explicit 0 stays distinct from unset), Adjust Horizontal and Vertical Diacritic Position
`diacriticHorizontal` and `diacriticVertical` (thousandths of an em, with the Character panel's -200, -100, -50, 0, 50,
100 and 200 in their menus; a value typed below -1000 or past 1000 sets -1000 or 1000) and `language` (a name or tag from Document
Setup's languages; English: USA stores the explicit default `null`, and a tag not in the list that the style
already has is kept). Language sets the language the characters are shaped in; it does not change hyphenation
or spelling.
+1
View File
@@ -1473,6 +1473,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
The Paragraph panel's Insert Kashidas (with the Indic options; `text.setFormat {kashida}`) lengthens each Arabic word of a justified horizontal area type line with a kashida, a tatweel between its last pair of joined letters, before the word spaces widen: Short, Medium and Long kashidas are at most a quarter, half and a whole em long, Stylistic ones are whole tatweels up to an em, and None (the default) leaves the line as before; paragraph styles and the native file keep the setting.
The Character panel menu's Kashidas switch (with the Indic options; `text.setFormat` / `text.setRangeStyle {kashidas}`) allows Kashidas on selected characters, on by default for new and old text. A pair of joined letters receives one only when both characters allow it; turning one off leaves other eligible pairs in the word available. Character styles and the native file keep the switch. [Public help](https://helpx.adobe.com/illustrator/desktop/design-with-text/fonts-and-scripts/justify-text-using-kashida-and-hyphenation.html) documents the menu control and the separate paragraph length choices; the default and pair rule are VectorCraft choices.
Paint-only Arabic harakat (marks whose character styles differ only in fill, stroke and related paint) stay inside one shaping cluster so letters keep their joining forms; when a second character-level shaping pass matches the monotone glyphs, a glyph may take a later in-cluster character's run only when GDEF classifies it as a mark (class 3) and that character is a harakat; otherwise it keeps the shaping cluster's first character. Insert Kashidas tatweels take the base letter's paint rather than a trailing mark's. Fonts without GDEF and some AAT/`morx` ligatures can leave a mark painted as its letter (`crates/text/src/tests/harakat.rs`).
Character panel › Adjust Horizontal and Adjust Vertical Diacritic Position (with the Middle Eastern options; `text.setFormat` or `text.setRangeStyle {diacriticHorizontal, diacriticVertical}`, VectorCraft's own thousandths of an em from -1000 to 1000, 0 by default) move the selected characters' mark glyphs (GDEF class 3) right or left and up or down while the letters stay in place ([the reference, page 549](https://web.archive.org/web/20210601162814/https://helpx.adobe.com/pdf/illustrator_reference.pdf#page=549)); an Arabic harakat or Hebrew point styled apart takes its own values, character styles carry both (Character Style Options › Advanced Character Formats edits them), the canvas and PDF draw the moved marks and SVG writes such type as outlines (`tests::harakat::diacritic_positions_move_marks_and_keep_letters`).
The Paragraph panel's Bullets button, Type › Bullets and Numbering › Apply Bullets and the context menu's Apply Bullets (`text.setFormat {list, bullet}`, `type.applyBullets`) make paragraphs a bulleted list with the documented presets (none, filled dot, dash, hollow circle, filled square; [Create bulleted or numbered lists](https://web.archive.org/web/20260417034638/https://helpx.adobe.com/illustrator/desktop/design-with-text/edit-format-text/create-bulleted-or-numbered-lists.html)): the bullet starts each paragraph's first line in its first character's font, size and color, the first line's text starts at the next tab stop after the bullet (the left indent counts as a stop), the lines it wraps to start at the left indent, a paragraph with no indents gets 18 pt and -18 pt, and Return continues the list; Reset Panel turns it off, and paragraph styles and the native file keep it.
The Paragraph panel's Bullets button, Type › Bullets and Numbering › Apply Bullets and the context menu's Apply Bullets (`text.setFormat {list, bullet}`, `type.applyBullets`) make paragraphs a bulleted list with the documented presets (none, filled dot, dash, hollow circle, filled square; [Create bulleted or numbered lists](https://web.archive.org/web/20260417034638/https://helpx.adobe.com/illustrator/desktop/design-with-text/edit-format-text/create-bulleted-or-numbered-lists.html)): the bullet starts each paragraph's first line in its first character's font, size and color, the first line's text starts at the next tab stop after the bullet (the left indent counts as a stop), the lines it wraps to start at the left indent, a paragraph with no indents gets 18 pt and -18 pt, and Return continues the list; Reset Panel turns it off, and paragraph styles and the native file keep it. The Bullets and Numbering dialog, levels and Convert to Text are not built yet.
The Paragraph panel's Numbered List button, Type › Bullets and Numbering › Apply Numbers and the context menu's Apply Numbers (`text.setFormat {list, number}`, `type.applyNumbers`) make paragraphs a numbered list with the documented presets (1, A, a, I, i, 01, 001, and None, which turns the list off; [Bullets and numbering](https://web.archive.org/web/20250807202418/https://helpx.adobe.com/illustrator/using/bullets-numbering.html), [Create bulleted or numbered lists](https://web.archive.org/web/20260417034638/https://helpx.adobe.com/illustrator/desktop/design-with-text/edit-format-text/create-bulleted-or-numbered-lists.html)): each paragraph starts with its number and a period, counted through the list paragraphs of the story and its threaded frames, with the text and indents as in a bulleted list; letters go on from Z to AA, and roman numerals go on from III to IV, an empty paragraph is not numbered, and a paragraph in no list starts the count again at 1.
+1
View File
@@ -62,6 +62,7 @@ against Illustrator's public documentation; **estimated** unless noted.
| Middle Eastern: bidirectional layout, Paragraph Direction | done | PDF export keeps harakat and zero-advance Noto Arabic dot glyphs in one compatible batch per layout line, with per-glyph vertical offsets (#6309). `crates/pdf/src/tests/realtext.rs` (`mark_text_*`) checks decoded cluster mappings, mixed Arabic/Latin/digits, contour placement against outline export, vertical columns, differing path rotations and PDF/X-1a/3/4. Editable-text import still needs ActualText support (#6165); separately styled or differently rotated clusters and external viewer search/copy remain outside this export-only evidence. |
| Middle Eastern and Indic: digit types (Character panel menu › Digits: Default, Arabic, Hindi, Farsi; Devanagari, Bengali, Gurmukhi, Gujarati, Odia, Tamil, Telugu, Kannada, Malayalam) | done | `text.setFormat` / `text.setRangeStyle {digits}` (`"devanagari"`, `"bengali"`, `"gurmukhi"`, `"gujarati"`, `"odia"`, `"tamil"`, `"telugu"`, `"kannada"`, `"malayalam"` added, #4942); the text keeps the typed digits, the glyphs and SVG export follow the style; carried by character styles. Not yet: `.ai` export of the setting; Indic digits typed as such stay as typed under another system. Evidence: `text::tests::indic_digits_map_to_their_scripts_block`, `tests::bidi::indic_digits_draw_the_scripts_own_digits`, `typecmd::area_tests::indic_digits_round_trip_through_the_commands_and_the_file` |
| Middle Eastern: Kashidas | done | Paragraph Insert Kashidas sets the length for justified Arabic area type; Character-menu Kashidas allows or excludes selected characters, on by default. A kashida is inserted only between two allowed joined characters. The character switch is retained in character styles and the native file; the length is retained in paragraph styles and the native file. Paint-only harakat (coloured or hidden marks) stay in one shaping cluster so letters keep joining; when the character-level pass matches, a glyph may take a later in-cluster character's run only if GDEF names it a mark (class 3) and that character is a harakat—otherwise the cluster start (a mark may miss its colour; a base never takes a mark's). Inserted tatweels take the base letter's paint—not a trailing mark's. Fonts without GDEF and some AAT/`morx` ligatures (e.g. Geeza Pro Allah) can leave a mark painted as its letter. No Character-panel harakat colour command yet. Evidence: `tests::harakat`. [Public help](https://helpx.adobe.com/illustrator/desktop/design-with-text/fonts-and-scripts/justify-text-using-kashida-and-hyphenation.html). |
| Middle Eastern: Adjust Horizontal and Vertical Diacritic Position | done | `text.setFormat` / `text.setRangeStyle {diacriticHorizontal, diacriticVertical}` and the Character panel's fields (with the Middle Eastern options) move mark glyphs (GDEF class 3) by VectorCraft's own thousandths of an em, -1000 to 1000; letters keep their places, harakat and Hebrew points styled apart take their own values, character styles and the native file keep both, and SVG writes such type as outlines. Not yet: `.ai` import and export of the values. Evidence: `tests::harakat::diacritic_positions_move_marks_and_keep_letters`. [Reference, page 549](https://web.archive.org/web/20210601162814/https://helpx.adobe.com/pdf/illustrator_reference.pdf#page=549). |
| Middle Eastern & South Asian composers and Standard composers (Paragraph panel menu, paragraph styles, `text.setFormat {composer}`) | done / partial | #4935: per paragraph, four choices. Middle Eastern & South Asian Single-line and Every-line are how all type was already set (complex-script shaping on) and stay the default, so existing documents do not change. Standard Single-line and Every-line break lines the same way and set Indic, Arabic and Hebrew type glyph by glyph as the font maps its characters (no conjuncts, reordering, mark placement or joining), for legacy fonts that keep a script on Latin character codes. Indic, Arabic and the other joining scripts and Hebrew are the scripts left unshaped (their letters do not join, so Insert Kashidas adds no tatweel); Latin, Greek, Cyrillic, CJK, Thai and the rest keep their kerning and ligatures. The native file and paragraph styles keep the choice (`standardSingleLine` / `standardEveryLine`; an older VectorCraft cannot read a file that uses them). `.ai`, EPS and PDF import and export carry no composer: this app has no recorded format for it, so a Standard paragraph opened from or saved to those files comes back Middle Eastern & South Asian. Evidence: `tests::composers`, `tests::panelcmds::text_set_format_takes_the_four_composers`, `native_v3::all_four_composers_round_trip` |
| Middle Eastern: split caret | missing | Character Direction is done; editable bidirectional SVG text remains incomplete. |
| CJK: input methods (marked text, candidate window) | done | |