From: Ben Harris Date: Sun, 2 Feb 2025 11:29:26 +0000 (+0000) Subject: Rename "angular" cedilla as "square" X-Git-Tag: bedstead-3.251~1 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~bjharris/git?a=commitdiff_plain;h=9b8a3dc4fd69d71c96ebd395da2f2591e2911831;p=bedstead.git Rename "angular" cedilla as "square" They both have angles, after all. Also "square" sorts more conveniently in the 'aalt' lookup. --- diff --git a/bedstead-faces.css b/bedstead-faces.css index 9a1ffd8..706e747 100644 --- a/bedstead-faces.css +++ b/bedstead-faces.css @@ -135,6 +135,6 @@ bar-default: 92 1; bar-broken: 92 2; cedilla-default: 96 1; - cedilla-angular: 96 2; + cedilla-square: 96 2; } } diff --git a/bedstead.c b/bedstead.c index c44b53f..42603cd 100644 --- a/bedstead.c +++ b/bedstead.c @@ -388,7 +388,7 @@ static struct glyph { {"\04\12\16\01\17\21\17\00\00", 0x00e2, "acircumflex" }, {"\04\12\16\21\21\21\16\00\00", 0xf1d7, "ocircumflex.large" }, {"\04\12\00\21\21\21\17\00\00", 0x00fb, "ucircumflex" }, - {"\00\00\17\20\20\20\17\02\06", 0xf1d8, "ccedilla.angular" }, + {"\00\00\17\20\20\20\17\02\06", 0xf1d8, "ccedilla.square" }, /* Extra characters found in the Hebrew (SAA5056) character set */ {"\00\21\11\25\22\21\21\00\00", U(05D0) }, /* alef */ @@ -607,7 +607,7 @@ static struct glyph { {"\15\25\25\15\05\05\05\00\00", 0x00b6, "paragraph" }, {"\00\00\00\04\00\00\00\00\00", 0x00b7, "periodcentered" }, {"\00\00\00\00\00\00\04\02\04", 0x00b8, "cedilla" }, - {"\00\00\00\00\00\00\04\02\06", 0xf200, "cedilla.angular" }, + {"\00\00\00\00\00\00\04\02\06", 0xf200, "cedilla.square" }, {"\04\14\04\04\16\00\00\00\00", 0x00b9, "onesuperior" }, {"\16\21\21\21\16\00\37\00\00", 0x00ba, "ordmasculine" }, {"\00\00\00\22\11\22\00\00\00", 0x00bb, "guillemotright" }, @@ -620,9 +620,9 @@ static struct glyph { {"\17\24\24\26\34\24\27\00\00", 0x00c6, "AE" }, ALIAS("AE.c2sc", "uni1D01"), {"\16\21\20\20\20\21\16\04\10", 0x00c7, "Ccedilla" }, - {"\16\21\20\20\20\21\16\04\14", 0xf201, "Ccedilla.angular" }, + {"\16\21\20\20\20\21\16\04\14", 0xf201, "Ccedilla.square" }, {"\00\00\16\21\20\21\16\04\10", 0xf190, "Ccedilla.c2sc" }, - {"\00\00\16\21\20\21\16\04\14", 0xf202, "Ccedilla.c2sc.angular" }, + {"\00\00\16\21\20\21\16\04\14", 0xf202, "Ccedilla.c2sc.square" }, {"\10\04\37\20\36\20\37\00\00", 0x00c8, "Egrave" }, {"\04\12\37\20\36\20\37\00\00", 0x00ca, "Ecircumflex" }, {"\12\00\37\20\36\20\37\00\00", 0x00cb, "Edieresis" }, @@ -660,7 +660,7 @@ static struct glyph { {"\00\00\12\05\17\24\16\00\00", 0x00e6, "ae" }, ALIAS("ae.sc", "AE.c2sc"), ALIAS("ccedilla.sc", "Ccedilla.c2sc"), - ALIAS("ccedilla.sc.angular", "Ccedilla.c2sc.angular"), + ALIAS("ccedilla.sc.square", "Ccedilla.c2sc.square"), ALIAS("egrave.sc", "Egrave"), ALIAS("eacute.sc", "Eacute"), ALIAS("ecircumflex.sc", "Ecircumflex"), @@ -847,23 +847,23 @@ static struct glyph { ALIAS("rcaron.sc", "Rcaron"), {"\02\04\17\20\16\01\36\00\00", 0x015b, "sacute" }, {"\16\21\20\16\01\21\16\04\10", 0x015e, "Scedilla" }, - {"\16\21\20\16\01\21\16\04\14", 0xf203, "Scedilla.angular" }, + {"\16\21\20\16\01\21\16\04\14", 0xf203, "Scedilla.square" }, ALIAS("Scedilla.c2sc", "scedilla"), - ALIAS("Scedilla.c2sc.angular", "scedilla.angular"), + ALIAS("Scedilla.c2sc.square", "scedilla.square"), {"\00\00\17\20\16\01\36\04\10", 0x015f, "scedilla" }, - {"\00\00\17\20\16\01\36\04\14", 0xf204, "scedilla.angular" }, + {"\00\00\17\20\16\01\36\04\14", 0xf204, "scedilla.square" }, {"\12\04\17\20\16\01\36\00\00", 0x0161, "scaron" }, {"\37\04\04\04\04\04\04\02\04", U(0162) }, /* Tcedilla */ - {"\37\04\04\04\04\04\04\02\06", 0xf205, "uni0162.angular" }, + {"\37\04\04\04\04\04\04\02\06", 0xf205, "uni0162.square" }, {"\00\00\37\04\04\04\04\02\04", 0xf19b, "uni0162.c2sc" }, - {"\00\00\37\04\04\04\04\02\06", 0xf206, "uni0162.c2sc.angular" }, + {"\00\00\37\04\04\04\04\02\06", 0xf206, "uni0162.c2sc.square" }, {"\04\04\16\04\04\05\02\02\04", U(0163) }, /* tcedilla */ - {"\04\04\16\04\04\05\02\02\06", 0xf207, "uni0163.angular" }, + {"\04\04\16\04\04\05\02\02\06", 0xf207, "uni0163.square" }, {"\00\04\16\04\04\05\02\02\04", 0xf240, "uni0163.small" }, - {"\00\04\16\04\04\05\02\02\06", 0xf208, "uni0163.small.angular" }, - ALIAS("uni0163.angular.small", "uni0163.small.angular"), + {"\00\04\16\04\04\05\02\02\06", 0xf208, "uni0163.small.square" }, + ALIAS("uni0163.square.small", "uni0163.small.square"), ALIAS("uni0163.sc", "uni0162.c2sc"), - ALIAS("uni0163.sc.angular", "uni0162.c2sc.angular"), + ALIAS("uni0163.sc.square", "uni0162.c2sc.square"), {"\12\04\37\04\04\04\04\00\00", 0x0164, "Tcaron" }, {"\11\11\34\10\10\10\04\00\00", 0x0165, "tcaron" }, {"\01\11\34\10\10\10\04\00\00", 0xf241, "tcaron.small" }, @@ -972,13 +972,13 @@ static struct glyph { {"\00\04\16\04\04\02\00\04\10", 0xf244, "uni021B.small" }, ALIAS("uni021B.sc", "uni021A.c2sc"), {"\37\20\20\36\20\20\37\04\10", U(0228) }, /* Ecedilla */ - {"\37\20\20\36\20\20\37\04\14", 0xf209, "uni0228.angular" }, + {"\37\20\20\36\20\20\37\04\14", 0xf209, "uni0228.square" }, {"\00\00\37\20\36\20\37\04\10", 0xf185, "uni0228.c2sc" }, - {"\00\00\37\20\36\20\37\04\14", 0xf20a, "uni0228.c2sc.angular" }, + {"\00\00\37\20\36\20\37\04\14", 0xf20a, "uni0228.c2sc.square" }, {"\00\00\16\21\37\20\16\04\10", U(0229) }, /* ecedilla */ - {"\00\00\16\21\37\20\16\04\14", 0xf20b, "uni0229.angular" }, + {"\00\00\16\21\37\20\16\04\14", 0xf20b, "uni0229.square" }, ALIAS("uni0229.sc", "uni0228.c2sc"), - ALIAS("uni0229.sc.angular", "uni0228.c2sc.angular"), + ALIAS("uni0229.sc.square", "uni0228.c2sc.square"), {"\16\00\21\12\04\04\04\00\00", U(0232) }, /* Ymacron */ {"\16\00\21\21\21\21\17\01\16", U(0233) }, /* ymacron */ ALIAS("uni0233.sc", "uni0232"), @@ -1384,11 +1384,11 @@ static struct glyph { {"\20\20\36\21\21\21\36\00\16", U(1E07) }, /* bmacronbelow */ ALIAS("uni1E06.sc", "uni1E06.c2sc"), {"\02\04\16\21\20\21\16\04\10", U(1E08) }, /* Ccedillaacute */ - {"\02\04\16\21\20\21\16\04\14", 0xf20c, "uni1E08.angular" }, + {"\02\04\16\21\20\21\16\04\14", 0xf20c, "uni1E08.square" }, {"\02\04\17\20\20\20\17\04\10", U(1E09) }, /* ccedillaacute */ - {"\02\04\17\20\20\20\17\04\14", 0xf20d, "uni1E09.angular" }, + {"\02\04\17\20\20\20\17\04\14", 0xf20d, "uni1E09.square" }, ALIAS("uni1E09.sc", "uni1E08"), - ALIAS("uni1E09.sc.angular", "uni1E08.angular"), + ALIAS("uni1E09.sc.square", "uni1E08.square"), {"\04\00\36\21\21\21\36\00\00", U(1E0A) }, /* Ddotaccent */ {"\04\00\36\11\11\11\36\00\00", 0xf224, "uni1E0A.serif" }, {"\04\00\36\11\11\11\36\00\00", 0xf234, "uni1E0A.narrow" }, @@ -1458,13 +1458,13 @@ static struct glyph { {"\25\20\36\21\21\21\21\00\00", U(1E27) }, /* hdieresis */ ALIAS("uni1E27.sc", "uni1E26"), {"\21\21\21\37\21\21\21\10\20", U(1E28) }, /* Hcedilla */ - {"\21\21\21\37\21\21\21\10\30", 0xf20e, "uni1E28.angular" }, + {"\21\21\21\37\21\21\21\10\30", 0xf20e, "uni1E28.square" }, {"\00\00\21\21\37\21\21\10\20", 0xf1a6, "uni1E28.c2sc" }, - {"\00\00\21\21\37\21\21\10\30", 0xf20f, "uni1E28.c2sc.angular" }, + {"\00\00\21\21\37\21\21\10\30", 0xf20f, "uni1E28.c2sc.square" }, {"\20\20\36\21\21\21\21\10\20", U(1E29) }, /* hcedilla */ - {"\20\20\36\21\21\21\21\10\30", 0xf210, "uni1E29.angular" }, + {"\20\20\36\21\21\21\21\10\30", 0xf210, "uni1E29.square" }, ALIAS("uni1E29.sc", "uni1E28"), - ALIAS("uni1E29.sc.angular", "uni1E28.angular"), + ALIAS("uni1E29.sc.square", "uni1E28.square"), {"\21\22\24\30\24\22\21\00\04", U(1E32) }, /* Kdotbelow */ {"\10\10\11\12\14\12\11\00\04", U(1E33) }, /* kdotbelow */ {"\21\22\24\30\24\22\21\00\16", U(1E34) }, /* Kmacronbelow */ @@ -2834,7 +2834,7 @@ static struct glyph { COMPAT_ALIAS("t.saa5052", "t.small"), COMPAT_ALIAS("ocircumflex.saa5054", "ocircumflex.large"), COMPAT_ALIAS("ugrave.saa5054", "ugrave.roundjoined"), - COMPAT_ALIAS("ccedilla.saa5054", "ccedilla.angular"), + COMPAT_ALIAS("ccedilla.saa5054", "ccedilla.square"), /* and finally */ {"\37\21\21\21\21\21\37\00\00", 0xf1ff, ".notdef" }, @@ -2865,7 +2865,6 @@ static struct alt_sub_override { { "D", { "D.c2sc", "D.serif", "D.narrow" } }, { "J", { "J.c2sc", "J.narrow", "J.narrow" } }, { "L", { "L.c2sc", "L.narrow", "L.narrow" } }, - { "ccedilla", { "ccedilla.angular", "ccedilla.sc" } }, { "colon", { "colon.leftsmall", "colon.leftsmall" } }, { "ocircumflex", { "ocircumflex.large", "ocircumflex.sc" } }, { "question", { "question.open", "question.open" } }, @@ -2927,7 +2926,7 @@ static struct alt_sub_override { V("ocircumflex", ".large") V("otilde", ".large") \ V("odieresis", ".large") V("omacron", ".large") #define CV84(V) V("t", ".small") V("uni0163", ".small") \ - V("uni0163.angular", ".small") \ + V("uni0163.square", ".small") \ V("tcaron", ".small") V("tbar", ".small") \ V("uni01AB", ".small") V("uni021B", ".small") \ V("uni0287", ".small") \ @@ -2936,19 +2935,19 @@ static struct alt_sub_override { V("uni1E6F", ".small") V("uni1E71", ".small") \ V("uni1E97", ".small") #define CV92(V) V("bar", ".broken") -#define CV96(V) V("cedilla", ".angular") \ - V("ccedilla", ".angular") V("ccedilla.sc", ".angular") \ - V("Ccedilla", ".angular") V("Ccedilla.c2sc", ".angular") \ - V("Scedilla", ".angular") V("Scedilla.c2sc", ".angular") \ - V("scedilla", ".angular") \ - V("uni0162", ".angular") V("uni0162.c2sc", ".angular") \ - V("uni0163", ".angular") V("uni0163.small", ".angular") \ - V("uni0163.sc", ".angular") V("uni0228", ".angular") \ - V("uni0228.c2sc", ".angular") V("uni0229", ".angular") \ - V("uni0229.sc", ".angular") V("uni1E08", ".angular") \ - V("uni1E09", ".angular") V("uni1E09.sc", ".angular") \ - V("uni1E28", ".angular") V("uni1E28.c2sc", ".angular") \ - V("uni1E29", ".angular") V("uni1E29.sc", ".angular") +#define CV96(V) V("cedilla", ".square") \ + V("ccedilla", ".square") V("ccedilla.sc", ".square") \ + V("Ccedilla", ".square") V("Ccedilla.c2sc", ".square") \ + V("Scedilla", ".square") V("Scedilla.c2sc", ".square") \ + V("scedilla", ".square") \ + V("uni0162", ".square") V("uni0162.c2sc", ".square") \ + V("uni0163", ".square") V("uni0163.small", ".square") \ + V("uni0163.sc", ".square") V("uni0228", ".square") \ + V("uni0228.c2sc", ".square") V("uni0229", ".square") \ + V("uni0229.sc", ".square") V("uni1E08", ".square") \ + V("uni1E09", ".square") V("uni1E09.sc", ".square") \ + V("uni1E28", ".square") V("uni1E28.c2sc", ".square") \ + V("uni1E29", ".square") V("uni1E29.sc", ".square") #define MAXSUBNAME 3 static struct gsub_feature { @@ -3055,7 +3054,7 @@ static struct gsub_feature { .subnames = { "solid", "broken" }, .xml = ALTSUB(CV92(CV)) }, { "cv96", SCRIPT_ALL, .name = "cedilla variants", - .subnames = { "standard", "angular" }, + .subnames = { "standard", "square" }, .xml = ALTSUB(CV96(CV)) }, { "ss14", SCRIPT_ALL, ".sep4", .name = "4-cell separated graphics" }, { "ss16", SCRIPT_ALL, ".sep6", .name = "6-cell separated graphics" },