From 2e23f8f9c30c16d1bfa05a8f8dade799f72f9122 Mon Sep 17 00:00:00 2001 From: Ben Harris Date: Thu, 16 Jan 2025 23:53:53 +0000 Subject: [PATCH] Fill in 'cv38' with far too many kinds of capital 'D' --- bedstead.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 2 deletions(-) diff --git a/bedstead.c b/bedstead.c index 795085a..33bd262 100644 --- a/bedstead.c +++ b/bedstead.c @@ -524,6 +524,8 @@ static struct glyph { ALIAS("B.c2sc", "uni0299"), ALIAS("C.c2sc", "uni1D04"), ALIAS("D.c2sc", "uni1D05"), + ALIAS("D.c2sc.serif", "uni1D05.serif"), + ALIAS("D.c2sc.narrow", "uni1D05.narrow"), ALIAS("E.c2sc", "uni1D07"), ALIAS("F.c2sc", "uniA730"), ALIAS("G.c2sc", "uni0262"), @@ -553,6 +555,8 @@ static struct glyph { ALIAS("b.sc", "B.c2sc"), ALIAS("c.sc", "C.c2sc"), ALIAS("d.sc", "D.c2sc"), + ALIAS("d.sc.serif", "D.c2sc.serif"), + ALIAS("d.sc.narrow", "D.c2sc.narrow"), ALIAS("e.sc", "E.c2sc"), ALIAS("f.sc", "F.c2sc"), ALIAS("g.sc", "G.c2sc"), @@ -624,7 +628,9 @@ static struct glyph { {"\04\12\00\16\04\04\16\00\00", 0x00ce, "Icircumflex" }, {"\12\00\16\04\04\04\16\00\00", 0x00cf, "Idieresis" }, {"\16\11\11\35\11\11\16\00\00", 0x00d0, "Eth" }, + {"\36\11\11\35\11\11\36\00\00", -1, "Eth.serif" }, ALIAS("Eth.c2sc", "uni1D06"), + ALIAS("Eth.c2sc.serif", "uni1D06.serif"), {"\05\12\00\31\25\23\21\00\00", 0x00d1, "Ntilde" }, {"\10\04\16\21\21\21\16\00\00", 0x00d2, "Ograve" }, {"\02\04\16\21\21\21\16\00\00", 0x00d3, "Oacute" }, @@ -662,6 +668,7 @@ static struct glyph { ALIAS("idieresis.sc", "Idieresis"), {"\32\04\12\01\17\21\16\00\00", 0x00f0, "eth" }, ALIAS("eth.sc", "Eth.c2sc"), + ALIAS("eth.sc.serif", "Eth.c2sc.serif"), {"\05\12\36\21\21\21\21\00\00", 0x00f1, "ntilde" }, ALIAS("ntilde.sc", "Ntilde"), ALIAS("ograve.large", "Ograve"), @@ -710,12 +717,19 @@ static struct glyph { {"\12\04\17\20\20\20\17\00\00", 0x010d, "ccaron" }, ALIAS("ccaron.sc", "Ccaron"), {"\12\04\36\21\21\21\36\00\00", 0x010e, "Dcaron" }, + {"\12\04\36\11\11\11\36\00\00", -1, "Dcaron.serif" }, + {"\12\04\16\11\11\11\16\00\00", -1, "Dcaron.narrow" }, {"\05\05\14\24\24\24\14\00\00", 0x010f, "dcaron" }, ALIAS("dcaron.sc", "Dcaron"), + ALIAS("dcaron.sc.serif", "Dcaron.serif"), + ALIAS("dcaron.sc.narrow", "Dcaron.narrow"), {"\16\11\11\35\11\11\16\00\00", 0x0110, "Dcroat" }, + {"\36\11\11\35\11\11\36\00\00", -1, "Dcroat.serif" }, {"\00\00\16\11\35\11\16\00\00", 0xf192, "Dcroat.c2sc" }, + {"\00\00\36\11\35\11\36\00\00", -1, "Dcroat.c2sc.serif" }, {"\02\07\02\16\22\22\16\00\00", 0x0111, "dcroat" }, ALIAS("dcroat.sc", "Dcroat.c2sc"), + ALIAS("dcroat.sc.serif", "Dcroat.c2sc.serif"), {"\16\00\37\20\36\20\37\00\00", 0x0112, "Emacron" }, {"\16\00\16\21\37\20\16\00\00", 0x0113, "emacron" }, ALIAS("emacron.sc", "Emacron"), @@ -1283,7 +1297,10 @@ static struct glyph { {"\00\00\16\11\36\11\16\00\00", U(1D03) }, /* small cap barred B */ {"\00\00\16\21\20\21\16\00\00", U(1D04) }, /* small cap C */ {"\00\00\36\21\21\21\36\00\00", U(1D05) }, /* small cap D */ + {"\00\00\36\11\11\11\36\00\00", -1, "uni1D05.serif" }, + {"\00\00\16\11\11\11\16\00\00", -1, "uni1D05.narrow" }, {"\00\00\16\11\35\11\16\00\00", U(1D06) }, /* small cap Eth */ + {"\00\00\36\11\35\11\36\00\00", -1, "uni1D06.serif" }, {"\00\00\37\20\36\20\37\00\00", U(1D07) }, /* small cap E */ {"\00\00\16\04\04\04\06\00\04", U(1D09) }, /* turned i */ {"\00\00\01\01\01\21\16\00\00", U(1D0A) }, /* small cap J */ @@ -1331,28 +1348,68 @@ static struct glyph { ALIAS("uni1E09.sc", "uni1E08"), ALIAS("uni1E09.sc.angular", "uni1E08.angular"), {"\04\00\36\21\21\21\36\00\00", U(1E0A) }, /* Ddotaccent */ + {"\04\00\36\11\11\11\36\00\00", -1, "uni1E0A.serif" }, + {"\04\00\36\11\11\11\36\00\00", -1, "uni1E0A.narrow" }, {"\05\01\17\21\21\21\17\00\00", U(1E0B) }, /* ddotaccent */ ALIAS("uni1E0B.sc", "uni1E0A"), + ALIAS("uni1E0B.sc.serif", "uni1E0A.serif"), + ALIAS("uni1E0B.sc.narrow", "uni1E0A.narrow"), {"\36\21\21\21\21\21\36\00\04", U(1E0C) }, /* Ddotbelow */ + {"\36\11\11\11\11\11\36\00\04", -1, "uni1E0C.serif" }, + {"\16\11\11\11\11\11\16\00\04", -1, "uni1E0C.narrow" }, {"\00\00\36\21\21\21\36\00\04", 0xf19f, "uni1E0C.c2sc" }, + {"\00\00\36\11\11\11\36\00\04", -1, "uni1E0C.c2sc.serif" }, + {"\00\00\16\11\11\11\16\00\04", -1, "uni1E0C.c2sc.narrow" }, {"\01\01\17\21\21\21\17\00\04", U(1E0D) }, /* ddotbelow */ ALIAS("uni1E0D.sc", "uni1E0C.c2sc"), + ALIAS("uni1E0D.sc.serif", "uni1E0C.c2sc.serif"), + ALIAS("uni1E0D.sc.narrow", "uni1E0C.c2sc.narrow"), {"\36\21\21\21\21\21\36\00\16", U(1E0E) }, /* Dmacronbelow */ + {"\36\11\11\11\11\11\36\00\16", -1, "uni1E0E.serif" }, + {"\16\11\11\11\11\11\16\00\16", -1, "uni1E0E.narrow" }, {"\00\00\36\21\21\21\36\00\16", 0xf1a0, "uni1E0E.c2sc" }, + {"\00\00\36\11\11\11\36\00\16", -1, "uni1E0E.c2sc.serif" }, + {"\00\00\16\11\11\11\16\00\16", -1, "uni1E0E.c2sc.narrow" }, {"\01\01\17\21\21\21\17\00\16", U(1E0F) }, /* dmacronbelow */ ALIAS("uni1E0F.sc", "uni1E0E.c2sc"), + ALIAS("uni1E0F.sc.serif", "uni1E0E.c2sc.serif"), + ALIAS("uni1E0F.sc.narrow", "uni1E0E.c2sc.narrow"), {"\36\21\21\21\21\21\36\04\10", U(1E10) }, /* Dcedilla */ + {"\36\11\11\11\11\11\36\04\10", -1, "uni1E10.serif" }, + {"\16\11\11\11\11\11\16\04\10", -1, "uni1E10.narrow" }, {"\36\21\21\21\21\21\36\04\14", -1, "uni1E10.angular" }, + {"\36\11\11\11\11\11\36\04\14", -1, "uni1E10.angular.serif" }, + {"\16\11\11\11\11\11\16\04\14", -1, "uni1E10.angular.narrow" }, + ALIAS("uni1E10.serif.angular", "uni1E10.angular.serif"), + ALIAS("uni1E10.narrow.angular", "uni1E10.angular.narrow"), {"\00\00\36\21\21\21\36\04\10", 0xf1a1, "uni1E10.c2sc" }, + {"\00\00\36\11\11\11\36\04\10", -1, "uni1E10.c2sc.serif" }, + {"\00\00\16\11\11\11\16\04\10", -1, "uni1E10.c2sc.narrow" }, {"\00\00\36\21\21\21\36\04\14", -1, "uni1E10.c2sc.angular" }, + {"\00\00\36\11\11\11\36\04\14", -1, "uni1E10.c2sc.angular.serif" }, + {"\00\00\16\11\11\11\16\04\14", -1, "uni1E10.c2sc.angular.narrow" }, + ALIAS("uni1E10.c2sc.serif.angular", "uni1E10.c2sc.angular.serif"), + ALIAS("uni1E10.c2sc.narrow.angular", "uni1E10.c2sc.angular.narrow"), {"\01\01\17\21\21\21\17\04\10", U(1E11) }, /* dcedilla */ {"\01\01\17\21\21\21\17\04\14", -1, "uni1E11.angular" }, ALIAS("uni1E11.sc", "uni1E10.c2sc"), + ALIAS("uni1E11.sc.serif", "uni1E10.c2sc.serif"), + ALIAS("uni1E11.sc.narrow", "uni1E10.c2sc.narrow"), ALIAS("uni1E11.sc.angular", "uni1E10.c2sc.angular"), + ALIAS("uni1E11.sc.angular.serif", "uni1E10.c2sc.angular.serif"), + ALIAS("uni1E11.sc.angular.narrow", "uni1E10.c2sc.angular.narrow"), + ALIAS("uni1E11.sc.serif.angular", "uni1E11.sc.angular.serif"), + ALIAS("uni1E11.sc.narrow.angular", "uni1E11.sc.angular.narrow"), {"\36\21\21\21\21\21\36\04\12", U(1E12) }, /* Dcircumflexbelow */ + {"\36\11\11\11\11\11\36\04\12", -1, "uni1E12.serif" }, + {"\16\11\11\11\11\11\16\04\12", -1, "uni1E12.narrow" }, {"\00\00\36\21\21\21\36\04\12", 0xf1a2, "uni1E12.c2sc" }, + {"\00\00\36\11\11\11\36\04\12", -1, "uni1E12.c2sc.serif" }, + {"\00\00\16\11\11\11\16\04\12", -1, "uni1E12.c2sc.narrow" }, {"\01\01\17\21\21\21\17\04\12", U(1E13) }, /* dcircumflexbelow */ ALIAS("uni1E13.sc", "uni1E12.c2sc"), + ALIAS("uni1E13.sc.serif", "uni1E12.c2sc.serif"), + ALIAS("uni1E13.sc.narrow", "uni1E12.c2sc.narrow"), {"\37\20\20\36\20\20\37\04\12", U(1E18) }, /* Ecircumflexbelow */ {"\00\00\37\20\36\20\37\04\12", 0xf1a3, "uni1E18.c2sc" }, {"\00\00\16\21\37\20\16\04\12", U(1E19) }, /* ecircumflexbelow */ @@ -2794,7 +2851,31 @@ static struct alt_sub_override { #define CV27(VAR2) VAR2("semicolon", ".left") #define CV31(VAR2) VAR2("question", ".open") VAR2("questiondown", ".open") \ VAR2("uni2E2E", ".open") -#define CV38(VAR3) VAR3("D", ".serif", ".narrow") +#define CV38(VAR3) VAR3("D", ".serif", ".narrow") \ + VAR3("D.c2sc", ".serif", ".narrow") VAR3("d.sc", ".serif", ".narrow") \ + VAR3("Eth", ".serif", "") \ + VAR3("Eth.c2sc", ".serif", "") VAR3("eth.sc", ".serif", "") \ + VAR3("Dcaron", ".serif", ".narrow") \ + VAR3("dcaron.sc", ".serif", ".narrow") VAR3("Dcroat", ".serif", "") \ + VAR3("Dcroat.c2sc", ".serif", "") VAR3("dcroat.sc", ".serif", "") \ + VAR3("uni1D05", ".serif", ".narrow") VAR3("uni1D06", ".serif", "") \ + VAR3("uni1E0A", ".serif", ".narrow") \ + VAR3("uni1E0B.sc", ".serif", ".narrow") \ + VAR3("uni1E0C", ".serif", ".narrow") \ + VAR3("uni1E0C.c2sc", ".serif", ".narrow") \ + VAR3("uni1E0D.sc", ".serif", ".narrow") \ + VAR3("uni1E0E", ".serif", ".narrow") \ + VAR3("uni1E0E.c2sc", ".serif", ".narrow") \ + VAR3("uni1E0F.sc", ".serif", ".narrow") \ + VAR3("uni1E10", ".serif", ".narrow") \ + VAR3("uni1E10.angular", ".serif", ".narrow") \ + VAR3("uni1E10.c2sc", ".serif", ".narrow") \ + VAR3("uni1E10.c2sc.angular", ".serif", ".narrow") \ + VAR3("uni1E11.sc", ".serif", ".narrow") \ + VAR3("uni1E11.sc.angular", ".serif", ".narrow") \ + VAR3("uni1E12", ".serif", ".narrow") \ + VAR3("uni1E12.c2sc", ".serif", ".narrow") \ + VAR3("uni1E13.sc", ".serif", ".narrow") #define CV42(VAR2) VAR2("J", ".narrow") VAR2("J.c2sc", ".narrow") \ VAR2("j.sc", ".narrow") VAR2("uni1D0A", ".narrow") #define CV44(VAR2) VAR2("L", ".narrow") VAR2("L.c2sc", ".narrow") \ @@ -2827,8 +2908,13 @@ static struct alt_sub_override { VAR2("uni0163.sc", ".angular") \ VAR2("uni1E08", ".angular") \ VAR2("uni1E09", ".angular") VAR2("uni1E09.sc", ".angular") \ - VAR2("uni1E10", ".angular") VAR2("uni1E10.c2sc", ".angular") \ + VAR2("uni1E10", ".angular") VAR2("uni1E10.serif", ".angular") \ + VAR2("uni1E10.narrow", ".angular") VAR2("uni1E10.c2sc", ".angular") \ + VAR2("uni1E10.c2sc.serif", ".angular") \ + VAR2("uni1E10.c2sc.narrow", ".angular") \ VAR2("uni1E11", ".angular") VAR2("uni1E11.sc", ".angular") \ + VAR2("uni1E11.sc.serif", ".angular") \ + VAR2("uni1E11.sc.narrow", ".angular") \ VAR2("uni1E28", ".angular") VAR2("uni1E28.c2sc", ".angular") \ VAR2("uni1E29", ".angular") VAR2("uni1E29.sc", ".angular") -- 2.30.2