Add --single-par in tests as well

Author: LaurenzV

scripts/gen-shaping-tests.py

@@ -118,7 +118,7 @@ def convert_test(hb_dir, hb_shape_exe, tests_name, file_name, idx, data, fonts):
     glyphs_expected = subprocess.run(options_list, check=True, stdout=subprocess.PIPE)\
         .stdout.decode()
 
-    glyphs_expected = glyphs_expected[1:-2]  # remove `[..]\n`
+    glyphs_expected = glyphs_expected.strip()[1:-1]  # remove leading and trailing whitespaces and `[..]`
     glyphs_expected = glyphs_expected.replace('|', '|\\\n         ')
 
     options = options.replace('"', '\\"')

tests/shaping/main.rs

@@ -26,6 +26,7 @@ struct Args {
     no_clusters: bool,
     show_extents: bool,
     show_flags: bool,
+    single_par: bool,
     ned: bool,
     bot: bool,
     eot: bool,
@@ -61,6 +62,7 @@ fn parse_args(args: Vec<std::ffi::OsString>) -> Result<Args, pico_args::Error> {
         no_clusters: parser.contains("--no-clusters"),
         show_extents: parser.contains("--show-extents"),
         show_flags: parser.contains("--show-flags"),
+        single_par: parser.contains("--single-par"),
         ned: parser.contains("--ned"),
         bot: parser.contains("--bot"),
         eot: parser.contains("--eot"),
@@ -115,67 +117,79 @@ pub fn shape(font_path: &str, text: &str, options: &str) -> String {
         face.set_variations(&variations);
     }
 
-    let mut buffer = rustybuzz::UnicodeBuffer::new();
-    if let Some(pre_context) = args.pre_context {
-        buffer.set_pre_context(&pre_context);
-    }
-    buffer.push_str(text);
-    if let Some(post_context) = args.post_context {
-        buffer.set_post_context(&post_context);
-    }
-
-    if let Some(d) = args.direction {
-        buffer.set_direction(d);
-    }
-
-    if let Some(lang) = args.language {
-        buffer.set_language(lang);
-    }
-
-    if let Some(script) = args.script {
-        buffer.set_script(script);
-    }
-
-    let mut buffer_flags = BufferFlags::default();
-    buffer_flags.set(BufferFlags::BEGINNING_OF_TEXT, args.bot);
-    buffer_flags.set(BufferFlags::END_OF_TEXT, args.eot);
-    buffer.set_flags(buffer_flags);
-
-    buffer.set_cluster_level(args.cluster_level);
-    buffer.reset_clusters();
-
-    let mut features = Vec::new();
-    for feature_str in args.features {
-        let feature = rustybuzz::Feature::from_str(&feature_str).unwrap();
-        features.push(feature);
-    }
-
-    let glyph_buffer = rustybuzz::shape(&face, &features, buffer);
-
-    let mut format_flags = rustybuzz::SerializeFlags::default();
-    if args.no_glyph_names {
-        format_flags |= rustybuzz::SerializeFlags::NO_GLYPH_NAMES;
-    }
-
-    if args.no_clusters || args.ned {
-        format_flags |= rustybuzz::SerializeFlags::NO_CLUSTERS;
-    }
-
-    if args.no_positions {
-        format_flags |= rustybuzz::SerializeFlags::NO_POSITIONS;
-    }
-
-    if args.no_advances || args.ned {
-        format_flags |= rustybuzz::SerializeFlags::NO_ADVANCES;
-    }
-
-    if args.show_extents {
-        format_flags |= rustybuzz::SerializeFlags::GLYPH_EXTENTS;
-    }
-
-    if args.show_flags {
-        format_flags |= rustybuzz::SerializeFlags::GLYPH_FLAGS;
-    }
+    let lines = if args.single_par {
+        vec![text]
+    } else {
+        text.split("\n").filter(|s| !s.is_empty()).collect()
+    };
 
-    glyph_buffer.serialize(&face, format_flags)
+    lines
+        .into_iter()
+        .map(|text| {
+            let mut buffer = rustybuzz::UnicodeBuffer::new();
+            if let Some(ref pre_context) = args.pre_context {
+                buffer.set_pre_context(pre_context);
+            }
+            buffer.push_str(text);
+            if let Some(ref post_context) = args.post_context {
+                buffer.set_post_context(post_context);
+            }
+
+            if let Some(d) = args.direction {
+                buffer.set_direction(d);
+            }
+
+            if let Some(lang) = args.language.clone() {
+                buffer.set_language(lang);
+            }
+
+            if let Some(script) = args.script {
+                buffer.set_script(script);
+            }
+
+            let mut buffer_flags = BufferFlags::default();
+            buffer_flags.set(BufferFlags::BEGINNING_OF_TEXT, args.bot);
+            buffer_flags.set(BufferFlags::END_OF_TEXT, args.eot);
+            buffer.set_flags(buffer_flags);
+
+            buffer.set_cluster_level(args.cluster_level);
+            buffer.reset_clusters();
+
+            let mut features = Vec::new();
+            for feature_str in &args.features {
+                let feature = rustybuzz::Feature::from_str(feature_str).unwrap();
+                features.push(feature);
+            }
+
+            let glyph_buffer = rustybuzz::shape(&face, &features, buffer);
+
+            let mut format_flags = rustybuzz::SerializeFlags::default();
+            if args.no_glyph_names {
+                format_flags |= rustybuzz::SerializeFlags::NO_GLYPH_NAMES;
+            }
+
+            if args.no_clusters || args.ned {
+                format_flags |= rustybuzz::SerializeFlags::NO_CLUSTERS;
+            }
+
+            if args.no_positions {
+                format_flags |= rustybuzz::SerializeFlags::NO_POSITIONS;
+            }
+
+            if args.no_advances || args.ned {
+                format_flags |= rustybuzz::SerializeFlags::NO_ADVANCES;
+            }
+
+            if args.show_extents {
+                format_flags |= rustybuzz::SerializeFlags::GLYPH_EXTENTS;
+            }
+
+            if args.show_flags {
+                format_flags |= rustybuzz::SerializeFlags::GLYPH_FLAGS;
+            }
+
+            glyph_buffer.serialize(&face, format_flags)
+        })
+        .collect::<Vec<String>>()
+        .join("\n")
 }