From: Ben Harris <bjh21@bjh21.me.uk>
Date: Wed, 15 Jan 2025 13:55:06 +0000 (+0000)
Subject: Merge SUFFIXSUB and SUFFIXSUB1 macros
X-Git-Tag: bedstead-3.251~31
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~bjharris/git?a=commitdiff_plain;h=a993909e6fa3066fd3a23a5d1022e547added0ff;p=bedstead.git

Merge SUFFIXSUB and SUFFIXSUB1 macros
---

diff --git a/bedstead.c b/bedstead.c
index 5f615da..59a04e9 100644
--- a/bedstead.c
+++ b/bedstead.c
@@ -2763,22 +2763,24 @@ static struct gsub_feature {
 	{ "c2sc", SCRIPT_LATN, .suffix = ".c2sc" },
 	{ "rtlm", SCRIPT_ALL, .suffix = ".rtlm" },
 #define SUB(in, out) "<Substitution in='" in "' out='" out "'/>\n"
-#define SUFFIXSUB(base, suffix) SUB(base, base suffix)
-#define SUFFIXSUB1(base, suffix1, suffix2) SUB(base, base suffix1)
-#define SUFFIXSUB2(base, suffix1, suffix2) SUB(base, base suffix2)
+#define SUFFIXSUB1(base, suffix1, ...) SUB(base, base suffix1)
+#define SUFFIXSUB2(base, suffix1, suffix2, ...) SUB(base, base suffix2)
 #define SINGLESUB(x) "<SingleSubst>\n" x "</SingleSubst>\n"
 	{ "ss01", SCRIPT_ALL, .name = "SAA5051",
-	  .xml = SINGLESUB(CV12(SUFFIXSUB) CV14(SUFFIXSUB) CV26(SUFFIXSUB)
-			   CV27(SUFFIXSUB) CV31(SUFFIXSUB)
-			   CV38(SUFFIXSUB1) CV42(SUFFIXSUB)
-			   CV44(SUFFIXSUB) CV74(SUFFIXSUB) CV84(SUFFIXSUB)) },
+	  .xml = SINGLESUB(CV12(SUFFIXSUB1) CV14(SUFFIXSUB1) CV26(SUFFIXSUB1)
+			   CV27(SUFFIXSUB1) CV31(SUFFIXSUB1)
+			   CV38(SUFFIXSUB1) CV42(SUFFIXSUB1)
+			   CV44(SUFFIXSUB1) CV74(SUFFIXSUB1)
+			   CV84(SUFFIXSUB1)) },
 	{ "ss02", SCRIPT_ALL, .name = "SAA5052",
-	  .xml = SINGLESUB(CV12(SUFFIXSUB) CV14(SUFFIXSUB) CV26(SUFFIXSUB)
-			   CV27(SUFFIXSUB) CV31(SUFFIXSUB)
-			   CV38(SUFFIXSUB2) CV42(SUFFIXSUB)
-			   CV44(SUFFIXSUB) CV74(SUFFIXSUB) CV84(SUFFIXSUB)) },
+	  .xml = SINGLESUB(CV12(SUFFIXSUB1) CV14(SUFFIXSUB1) CV26(SUFFIXSUB1)
+			   CV27(SUFFIXSUB1) CV31(SUFFIXSUB1)
+			   CV38(SUFFIXSUB2) CV42(SUFFIXSUB1)
+			   CV44(SUFFIXSUB1) CV74(SUFFIXSUB1)
+			   CV84(SUFFIXSUB1)) },
 	{ "ss04", SCRIPT_ALL, .name = "SAA5054",
-	  .xml = SINGLESUB(CV61(SUFFIXSUB) CV79(SUFFIXSUB) CV96(SUFFIXSUB)) },
+	  .xml = SINGLESUB(CV61(SUFFIXSUB1) CV79(SUFFIXSUB1)
+			   CV96(SUFFIXSUB1)) },
 #define ALT1(g) "<Alternate glyph='" g "'/>"
 #define ALT2(a, b) ALT1(a) ALT1(b)
 #define ALT3(a, b, c) ALT1(a) ALT2(b, c)