Collapse whitespace after single letter ligature macros (siefkenj#106)

* Collapse whitespace after single letter ligature macros * Add ligature macro pairs for \' + single letter macro ligature --------- Co-authored-by: arne <[email protected]>
ems-press · Aug 2, 2024 · 9fc9cb5 · 9fc9cb5
1 parent 473cdcd
commit 9fc9cb5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/packages/support-tables/ligature-macros.json b/packages/support-tables/ligature-macros.json
@@ -41,7 +41,6 @@
     ["\\\" w", "ẅ"],
     ["\\\" y", "ÿ"],
     ["\\\" Y", "Ÿ"],
-    ["\\' i", "í"],
     ["\\' A", "Á"],
     ["\\' a", "á"],
     ["\\' C", "Ć"],
@@ -51,16 +50,23 @@
     ["\\' G", "Ǵ"],
     ["\\' g", "ǵ"],
     ["\\' I", "Í"],
+    ["\\' i", "í"],
+    ["\\' \\i", "í"],
+    ["\\' \\j", "j́"],
     ["\\' K", "Ḱ"],
     ["\\' k", "ḱ"],
     ["\\' L", "Ĺ"],
+    ["\\' \\L", "Ł́"],
     ["\\' l", "ĺ"],
+    ["\\' \\l", "ł́"],
     ["\\' M", "Ḿ"],
     ["\\' m", "ḿ"],
     ["\\' N", "Ń"],
     ["\\' n", "ń"],
     ["\\' O", "Ó"],
+    ["\\' \\O", "Ǿ"],
     ["\\' o", "ó"],
+    ["\\' \\o", "ǿ"],
     ["\\' P", "Ṕ"],
     ["\\' p", "ṕ"],
     ["\\' R", "Ŕ"],

diff --git a/packages/unified-latex-util-ligatures/libs/parse.ts b/packages/unified-latex-util-ligatures/libs/parse.ts
@@ -19,6 +19,12 @@ export function createMatchers() {
                 if (match.group(arg) && arg.content.length === 1) {
                     nodesToTest[1] = arg.content[0];
                 }
+
+                // whitespace directly after one-letter macros like `\o` should
+                // be skipped
+                if (nodes[0].content.length === 1 && nodesToTest[1].type === 'whitespace') {
+                    nodesToTest.length = 1
+                }
             }
             return ligatureToUnicode(nodesToTest);
         },

diff --git a/packages/unified-latex-util-ligatures/tests/ligatures.test.ts b/packages/unified-latex-util-ligatures/tests/ligatures.test.ts
@@ -58,6 +58,9 @@ describe("unified-latex-util-ligatures", () => {
 
         ast = strToNodes("a\\v sb");
         expect(printRaw(parseLigatures(ast))).toEqual("ašb");
+
+        ast = strToNodes("r\\o y");
+        expect(printRaw(parseLigatures(ast))).toEqual("røy");
     });
 
     it("can replace macro ligatures with an argument in a group", () => {