More descriptive names for variant characters

This means yet more compatibility aliases, but I think it's the right
way to go.

diff --git a/bedstead.c b/bedstead.c
index c2d2f8107e1af4080025f43868a37f4a19dfd754..737bbcd7c010751c7eabd24e9c4baa88afc76331 100644 (file)
--- a/bedstead.c
+++ b/bedstead.c
@@ -342,21 +342,21 @@ static struct glyph {
  {"\00\04\00\37\00\04\00\00\00", 0x00f7, "divide" },
 
  /* Extra characters found in the German (SAA5051) character set */
- {"\00\00\00\00\00\10\10\20\00", 0xf1d0, "comma.saa5051" },
- {"\00\00\00\00\00\14\14\00\00", 0xf1d1, "period.saa5051" },
- {"\00\00\00\10\00\00\10\00\00", 0xf1d2, "colon.saa5051" },
- {"\00\00\10\00\00\10\10\20\00", 0xf1d3, "semicolon.saa5051" },
- {"\16\21\01\02\04\00\04\00\00", 0xf1da, "question.saa5051" },
+ {"\00\00\00\00\00\10\10\20\00", 0xf1d0, "comma.left" },
+ {"\00\00\00\00\00\14\14\00\00", 0xf1d1, "period.large" },
+ {"\00\00\00\10\00\00\10\00\00", 0xf1d2, "colon.leftsmall" },
+ {"\00\00\10\00\00\10\10\20\00", 0xf1d3, "semicolon.left" },
+ {"\16\21\01\02\04\00\04\00\00", 0xf1da, "question.open" },
  {"\16\21\20\16\21\16\01\21\16", 0x00a7, "section" },
- {"\36\11\11\11\11\11\36\00\00", 0xf1db, "D.saa5051" },
- {"\02\02\02\02\02\22\14\00\00", 0xf1dc, "J.saa5051" },
- {"\10\10\10\10\10\10\17\00\00", 0xf1d5, "L.saa5051" },
+ {"\36\11\11\11\11\11\36\00\00", 0xf1db, "D.serif" },
+ {"\02\02\02\02\02\22\14\00\00", 0xf1dc, "J.narrow" },
+ {"\10\10\10\10\10\10\17\00\00", 0xf1d5, "L.narrow" },
  {"\12\00\16\21\37\21\21\00\00", 0x00c4, "Adieresis" },
  {"\12\00\16\21\21\21\16\00\00", 0x00d6, "Odieresis" },
  {"\12\00\21\21\21\21\16\00\00", 0x00dc, "Udieresis" },
  {"\06\11\06\00\00\00\00\00\00", 0x00b0, "degree" },
- {"\04\00\14\04\04\04\04\04\10", 0xf1dd, "j.saa5051" },
- {"\00\04\16\04\04\04\02\00\00", 0xf1de, "t.saa5051" },
+ {"\04\00\14\04\04\04\04\04\10", 0xf1dd, "j.serif" },
+ {"\00\04\16\04\04\04\02\00\00", 0xf1de, "t.small" },
  {"\12\00\16\01\17\21\17\00\00", 0x00e4, "adieresis" },
  {"\00\12\00\16\21\21\16\00\00", 0x00f6, "odieresis" },
  {"\00\12\00\21\21\21\17\00\00", 0x00fc, "udieresis" },
@@ -364,18 +364,9 @@ static struct glyph {
 
  /* Extra characters found in the Swedish (SAA5052) character set */
  {"\00\00\21\16\12\16\21\00\00", 0x00a4, "currency" },
- ALIAS("comma.saa5052", "comma.saa5051"),
- ALIAS("period.saa5052", "period.saa5051"),
- ALIAS("colon.saa5052", "colon.saa5051"),
- ALIAS("semicolon.saa5052", "semicolon.saa5051"),
- ALIAS("question.saa5052", "question.saa5051"),
  {"\02\04\37\20\36\20\37\00\00", 0x00c9, "Eacute" },
- {"\16\11\11\11\11\11\16\00\00", 0xf1d4, "D.saa5052" },
- ALIAS("J.saa5052", "J.saa5051"),
- ALIAS("L.saa5052", "L.saa5051"),
+ {"\16\11\11\11\11\11\16\00\00", 0xf1d4, "D.narrow" },
  {"\04\00\16\21\37\21\21\00\00", 0x00c5, "Aring" },
- ALIAS("j.saa5052", "j.saa5051"),
- ALIAS("t.saa5052", "t.saa5051"),
  {"\02\04\16\21\37\20\16\00\00", 0x00e9, "eacute" },
  {"\04\00\16\01\17\21\17\00\00", 0x00e5, "aring" },
 
@@ -391,12 +382,12 @@ static struct glyph {
  {"\12\00\14\04\04\04\16\00\00", 0x00ef, "idieresis" },
  {"\12\00\16\21\37\20\16\00\00", 0x00eb, "edieresis" },
  {"\04\12\16\21\37\20\16\00\00", 0x00ea, "ecircumflex" },
- {"\04\02\21\21\21\21\17\00\00", 0xf1d6, "ugrave.saa5054" },
+ {"\04\02\21\21\21\21\17\00\00", 0xf1d6, "ugrave.joined" },
  {"\04\12\00\14\04\04\16\00\00", 0x00ee, "icircumflex" },
  {"\04\12\16\01\17\21\17\00\00", 0x00e2, "acircumflex" },
- {"\04\12\16\21\21\21\16\00\00", 0xf1d7, "ocircumflex.saa5054" },
+ {"\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.saa5054" },
+ {"\00\00\17\20\20\20\17\02\06", 0xf1d8, "ccedilla.angular" },
 
  /* Extra characters found in the Hebrew (SAA5056) character set */
  {"\00\21\11\25\22\21\21\00\00", U(05D0) }, /* alef */
@@ -2666,6 +2657,31 @@ static struct glyph {
  M(C, "dnblock"), M(D, "uni2599"), M(E, "uni259F"), M(F, "block"),
 #undef M
 
+ /* Added after 3.246. */
+ COMPAT_ALIAS("comma.saa5051", "comma.left"),
+ COMPAT_ALIAS("comma.saa5052", "comma.left"),
+ COMPAT_ALIAS("period.saa5051", "period.large"),
+ COMPAT_ALIAS("period.saa5052", "period.large"),
+ COMPAT_ALIAS("colon.saa5051", "colon.leftsmall"),
+ COMPAT_ALIAS("colon.saa5052", "colon.leftsmall"),
+ COMPAT_ALIAS("semicolon.saa5051", "semicolon.left"),
+ COMPAT_ALIAS("semicolon.saa5052", "semicolon.left"),
+ COMPAT_ALIAS("question.saa5051", "question.open"),
+ COMPAT_ALIAS("question.saa5052", "question.open"),
+ COMPAT_ALIAS("D.saa5051", "D.serif"),
+ COMPAT_ALIAS("D.saa5052", "D.narrow"),
+ COMPAT_ALIAS("J.saa5051", "J.narrow"),
+ COMPAT_ALIAS("J.saa5052", "J.narrow"),
+ COMPAT_ALIAS("L.saa5051", "L.narrow"),
+ COMPAT_ALIAS("L.saa5052", "L.narrow"),
+ COMPAT_ALIAS("j.saa5051", "j.serif"),
+ COMPAT_ALIAS("j.saa5052", "j.serif"),
+ COMPAT_ALIAS("t.saa5051", "t.small"),
+ COMPAT_ALIAS("t.saa5052", "t.small"),
+ COMPAT_ALIAS("ocircumflex.saa5054", "ocircumflex.large"),
+ COMPAT_ALIAS("ugrave.saa5054", "ugrave.joined"),
+ COMPAT_ALIAS("ccedilla.saa5054", "ccedilla.angular"),
+
  /* and finally */
  {"\37\21\21\21\21\21\37\00\00", 0xf1ff, ".notdef" },
 };
@@ -2693,18 +2709,18 @@ static struct gsub_feature {
        { "c2sc", SCRIPT_LATN, .suffix = ".c2sc" },
        { "rtlm", SCRIPT_ALL, .suffix = ".rtlm" },
        { "ss01", SCRIPT_ALL, .name = "SAA5051",
-         .subs = { "comma.saa5051", "period.saa5051", "colon.saa5051",
-                   "semicolon.saa5051", "question.saa5051",
-                   "D.saa5051", "J.saa5051", "L.saa5051",
-                   "j.saa5051", "t.saa5051" } },
+         .subs = { "comma.left", "period.large", "colon.leftsmall",
+                   "semicolon.left", "question.open",
+                   "D.serif", "J.narrow", "L.narrow",
+                   "j.serif", "t.small" } },
        { "ss02", SCRIPT_ALL, .name = "SAA5052",
-         .subs = { "comma.saa5052", "period.saa5052", "colon.saa5052",
-                   "semicolon.saa5052", "question.saa5052",
-                   "D.saa5052", "J.saa5052", "L.saa5052",
-                   "j.saa5052", "t.saa5052" } },
+         .subs = { "comma.left", "period.large", "colon.leftsmall",
+                   "semicolon.left", "question.open",
+                   "D.narrow", "J.narrow", "L.narrow",
+                   "j.serif", "t.small" } },
        { "ss04", SCRIPT_ALL, .name = "SAA5054",
-         .subs = { "ugrave.saa5054", "ocircumflex.saa5054",
-                   "ccedilla.saa5054" } },
+         .subs = { "ugrave.joined", "ocircumflex.large",
+                   "ccedilla.angular" } },
        { "ss14", SCRIPT_ALL,  ".sep4", .name = "4-cell separated graphics" },
        { "ss16", SCRIPT_ALL,  ".sep6", .name = "6-cell separated graphics" },
 };