From: Ben Harris <bjh21@bjh21.me.uk>
Date: Wed, 15 Jan 2025 21:17:58 +0000 (+0000)
Subject: Extend 'cv74' to other characters based on lower-case 'j'
X-Git-Tag: bedstead-3.251~29
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~bjharris/git?a=commitdiff_plain;h=da26a18aa06b020a3b94d5b53f345a595228aa9a;p=bedstead-debian.git

Extend 'cv74' to other characters based on lower-case 'j'

I didn't do U+0254 LATIN SMALL LETTER DOTLESS J WITH STROKE because the
Unicode standard says it's based on a turned 'f', not 'j'.
---

diff --git a/bedstead.c b/bedstead.c
index 824fcae..d923e98 100644
--- a/bedstead.c
+++ b/bedstead.c
@@ -743,9 +743,11 @@ static struct glyph {
  {"\21\21\21\21\21\25\22\00\00", 0x0132, "IJ" },
  {"\00\00\21\21\21\25\22\00\00", 0xf196, "IJ.c2sc" },
  {"\11\00\31\11\11\11\35\01\02", 0x0133, "ij" },
+ {"\11\00\33\11\11\11\35\01\02", -1, "ij.serif" },
  ALIAS("ij.sc", "IJ.c2sc"),
  {"\02\05\00\02\02\22\14\00\00", 0x0134, "Jcircumflex" },
  {"\04\12\00\04\04\04\04\04\10", 0x0135, "jcircumflex" },
+ {"\04\12\00\14\04\04\04\04\10", -1, "jcircumflex.serif" },
  ALIAS("jcircumflex.sc", "Jcircumflex"),
  {"\00\00\21\22\34\22\21\00\00", 0x0138, "kgreenlandic" },
  {"\22\22\24\20\20\20\37\00\00", 0x013d, "Lcaron" },
@@ -889,6 +891,7 @@ static struct glyph {
  {"\16\00\12\05\17\24\16\00\00", U(01E3) }, /* aemacron */
  ALIAS("uni01E3.sc", "uni01E2"),
  {"\12\04\00\04\04\04\04\04\10", U(01F0) }, /* J wedge */
+ {"\12\04\00\14\04\04\04\04\10", -1, "uni01F0.serif" },
  {"\10\04\21\31\25\23\21\00\00", U(01F8) }, /* Ngrave */
  {"\10\04\36\21\21\21\21\00\00", U(01F9) }, /* ngrave */
  ALIAS("uni01F9.sc", "uni01F8"),
@@ -896,6 +899,7 @@ static struct glyph {
  {"\16\00\21\21\21\21\17\01\16", U(0233) }, /* ymacron */
  ALIAS("uni0233.sc", "uni0232"),
  {"\00\00\04\04\04\04\04\04\10", U(0237) }, /* dotlessj */
+ {"\00\00\14\04\04\04\04\04\10", -1, "uni0237.serif" },
  {"\00\00\17\20\16\01\36\04\03", U(023F) }, /* s with swash tail */
  {"\00\00\37\02\04\10\30\04\03", U(0240) }, /* z with swash tail */
  ALIAS("uni0240.sc", "uni2C7E.c2sc"),
@@ -989,6 +993,7 @@ static struct glyph {
  {"\01\02\16\20\26\22\16\00\00", U(029B) }, /* Hooktop small capital G */
  {"\00\00\21\21\37\21\21\00\00", U(029C) }, /* Small capital H */
  {"\04\00\04\04\04\16\24\24\10", U(029D) }, /* Curly-tail j */
+ {"\04\00\14\04\04\16\24\24\10", -1, "uni029D.serif" }, /* Curly-tail j */
  ALIAS("uni029D.sc", "uniA7B2.c2sc"),
  {"\00\00\22\12\06\12\22\02\02", U(029E) }, /* Turned k */
  ALIAS("uni029E.sc", "uniA7B0.c2sc"),
@@ -2752,7 +2757,9 @@ static struct alt_sub_override {
 #define CV42(VAR2) VAR2("J", ".narrow")
 #define CV44(VAR2) VAR2("L", ".narrow")
 #define CV61(VAR2) VAR2("ugrave",".roundjoined")
-#define CV74(VAR2) VAR2("j", ".serif")
+#define CV74(VAR2) VAR2("j", ".serif") VAR2("ij", ".serif")	\
+	VAR2("jcircumflex", ".serif") VAR2("uni01F0", ".serif") \
+	VAR2("uni0237", ".serif") VAR2("uni029D", ".serif")
 #define CV79(VAR2) VAR2("ocircumflex", ".large")
 #define CV84(VAR2) VAR2("t", ".small") VAR2("uni0163", ".small") \
 	VAR2("tcaron", ".small") VAR2("tbar", ".small")		 \