Assign PUA code points for new small-cap glyphs

diff --git a/bedstead.c b/bedstead.c
index e332f462e3607613f8a9179a78121c1b91933f81..31b17b5ee542d672bac21cf1313faad76df8767d 100644 (file)
--- a/bedstead.c
+++ b/bedstead.c
@@ -597,7 +597,7 @@ static struct glyph {
  {{017,024,024,026,034,024,027,000,000}, 0x00c6, "AE" },
  ALIAS("AE.c2sc", "uni1D01"),
  {{016,021,020,020,020,021,016,004,010}, 0x00c7, "Ccedilla" },
- {{000,000,016,021,020,021,016,004,010}, -1, "Ccedilla.c2sc" },
+ {{000,000,016,021,020,021,016,004,010}, 0xf190, "Ccedilla.c2sc" },
  {{010,004,037,020,036,020,037,000,000}, 0x00c8, "Egrave" },
  {{004,012,037,020,036,020,037,000,000}, 0x00ca, "Ecircumflex" },
  {{012,000,037,020,036,020,037,000,000}, 0x00cb, "Edieresis" },
@@ -671,7 +671,7 @@ static struct glyph {
  {{016,000,016,001,017,021,017,000,000}, 0x0101, "amacron" },
  ALIAS("amacron.sc", "Amacron"),
  {{004,012,021,021,037,021,021,002,001}, 0x0104, "Aogonek" },
- {{000,000,004,012,021,037,021,002,001}, -1, "Aogonek.c2sc" },
+ {{000,000,004,012,021,037,021,002,001}, 0xf191, "Aogonek.c2sc" },
  {{000,000,016,001,017,021,017,002,001}, 0x0105, "aogonek" },
  ALIAS("aogonek.sc", "Aogonek.c2sc"),
  {{002,004,016,021,020,021,016,000,000}, 0x0106, "Cacute" },
@@ -690,7 +690,7 @@ static struct glyph {
  {{005,005,014,024,024,024,014,000,000}, 0x010f, "dcaron" },
  ALIAS("dcaron.sc", "Dcaron"),
  {{016,011,011,035,011,011,016,000,000}, 0x0110, "Dcroat" },
- {{000,000,016,011,035,011,016,000,000}, -1, "Dcroat.c2sc" },
+ {{000,000,016,011,035,011,016,000,000}, 0xf192, "Dcroat.c2sc" },
  {{002,007,002,016,022,022,016,000,000}, 0x0111, "dcroat" },
  ALIAS("dcroat.sc", "Dcroat.c2sc"),
  {{016,000,037,020,036,020,037,000,000}, 0x0112, "Emacron" },
@@ -700,7 +700,7 @@ static struct glyph {
  {{004,000,016,021,037,020,016,000,000}, 0x0117, "edotaccent" },
  ALIAS("edotaccent.sc", "Edotaccent"),
  {{037,020,020,036,020,020,037,002,001}, 0x0118, "Eogonek" },
- {{000,000,037,020,036,020,037,002,001}, -1, "Eogonek.c2sc" },
+ {{000,000,037,020,036,020,037,002,001}, 0xf193, "Eogonek.c2sc" },
  {{000,000,016,021,037,020,016,002,001}, 0x0119, "eogonek" },
  ALIAS("eogonek.sc", "Eogonek.c2sc"),
  {{012,004,037,020,036,020,037,000,000}, 0x011a, "Ecaron" },
@@ -713,7 +713,7 @@ static struct glyph {
  {{004,000,017,021,021,021,017,001,016}, 0x0121, "gdotaccent" },
  ALIAS("gdotaccent.sc", "Gdotaccent"),
  {{021,037,021,037,021,021,021,000,000}, 0x0126, "Hbar" },
- {{000,000,021,037,021,037,021,000,000}, -1, "Hbar.c2sc" },
+ {{000,000,021,037,021,037,021,000,000}, 0xf194, "Hbar.c2sc" },
  {{010,034,010,016,011,011,011,000,000}, 0x0127, "hbar" },
  ALIAS("hbar.sc", "Hbar.c2sc"),
  {{005,012,000,016,004,004,016,000,000}, 0x0128, "Itilde" },
@@ -723,14 +723,14 @@ static struct glyph {
  {{016,000,014,004,004,004,016,000,000}, 0x012b, "imacron" },
  ALIAS("imacron.sc", "Imacron"),
  {{016,004,004,004,004,004,016,004,002}, 0x012e, "Iogonek" },
- {{000,000,016,004,004,004,016,004,002}, -1, "Iogonek.c2sc" },
+ {{000,000,016,004,004,004,016,004,002}, 0xf195, "Iogonek.c2sc" },
  {{004,000,014,004,004,004,016,004,002}, 0x012f, "iogonek" },
  ALIAS("iogonek.sc", "Iogonek.c2sc"),
  {{004,000,016,004,004,004,016,000,000}, 0x0130, "Idotaccent" },
  {{000,000,014,004,004,004,016,000,000}, 0x0131, "dotlessi" },
  ALIAS("dotlessi.sc", "I.c2sc"),
  {{021,021,021,021,021,025,022,000,000}, 0x0132, "IJ" },
- {{000,000,021,021,021,025,022,000,000}, -1, "IJ.c2sc" },
+ {{000,000,021,021,021,025,022,000,000}, 0xf196, "IJ.c2sc" },
  {{011,000,031,011,011,011,035,001,002}, 0x0133, "ij" },
  ALIAS("ij.sc", "IJ.c2sc"),
  {{002,005,000,002,002,022,014,000,000}, 0x0134, "Jcircumflex" },
@@ -738,15 +738,15 @@ static struct glyph {
  ALIAS("jcircumflex.sc", "Jcircumflex"),
  {{000,000,021,022,034,022,021,000,000}, 0x0138, "kgreenlandic" },
  {{022,022,024,020,020,020,037,000,000}, 0x013d, "Lcaron" },
- {{000,000,022,022,024,020,037,000,000}, -1, "Lcaron.c2sc" },
+ {{000,000,022,022,024,020,037,000,000}, 0xf197, "Lcaron.c2sc" },
  {{031,011,012,010,010,010,034,000,000}, 0x013e, "lcaron" },
  ALIAS("lcaron.sc", "Lcaron.c2sc"),
  {{020,020,020,021,020,020,037,000,000}, 0x013f, "Ldot" },
- {{000,000,020,021,020,020,037,000,000}, -1, "Ldot.c2sc" },
+ {{000,000,020,021,020,020,037,000,000}, 0xf198, "Ldot.c2sc" },
  {{030,010,010,011,010,010,034,000,000}, 0x0140, "ldot" },
  ALIAS("ldot.sc", "Ldot.c2sc"),
  {{010,010,014,030,010,010,017,000,000}, 0x0141, "Lslash" },
- {{000,000,010,014,030,010,017,000,000}, -1, "Lslash.c2sc" },
+ {{000,000,010,014,030,010,017,000,000}, 0xf199, "Lslash.c2sc" },
  {{014,004,006,014,004,004,016,000,000}, 0x0142, "lslash" },
  ALIAS("lslash.sc", "Lslash.c2sc"),
  {{002,004,021,031,025,023,021,000,000}, 0x0143, "Nacute" },
@@ -757,7 +757,7 @@ static struct glyph {
  ALIAS("ncaron.sc", "Ncaron"),
  {{020,020,026,005,005,005,005,000,000}, 0x0149, "napostrophe" },
  {{021,021,031,025,023,021,021,001,016}, 0x014a, "Eng" },
- {{000,000,021,031,025,023,021,001,016}, -1, "Eng.c2sc" },
+ {{000,000,021,031,025,023,021,001,016}, 0xf19a, "Eng.c2sc" },
  {{000,000,036,021,021,021,021,001,016}, 0x014b, "eng" },
  ALIAS("eng.sc", "Eng.c2sc"),
  {{016,000,016,021,021,021,016,000,000}, 0x014c, "Omacron" },
@@ -779,7 +779,7 @@ static struct glyph {
  {{000,000,017,020,016,001,036,004,010}, 0x015f, "scedilla" },
  {{012,004,017,020,016,001,036,000,000}, 0x0161, "scaron" },
  {{037,004,004,004,004,004,004,002,004}, U(0162) }, /* Tcedilla */
- {{000,000,037,004,004,004,004,002,004}, -1, "uni0162.c2sc" },
+ {{000,000,037,004,004,004,004,002,004}, 0xf19b, "uni0162.c2sc" },
  {{004,004,016,004,004,005,002,002,004}, U(0163) }, /* tcedilla */
  ALIAS("uni0163.sc", "uni0162.c2sc"),
  {{012,004,037,004,004,004,004,000,000}, 0x0164, "Tcaron" },
@@ -791,7 +791,7 @@ static struct glyph {
  {{004,000,021,021,021,021,016,000,000}, 0x016e, "Uring" },
  {{004,000,021,021,021,021,017,000,000}, 0x016f, "uring" },
  {{021,021,021,021,021,021,016,004,002}, 0x0172, "Uogonek" },
- {{000,000,021,021,021,021,016,004,002}, -1, "Uogonek.c2sc" },
+ {{000,000,021,021,021,021,016,004,002}, 0xf19c, "Uogonek.c2sc" },
  {{000,000,021,021,021,021,017,002,001}, 0x0173, "uogonek" },
  ALIAS("uogonek.sc", "Uogonek.c2sc"),
  {{004,012,000,021,025,025,012,000,000}, 0x0174, "Wcircumflex" },
@@ -1234,11 +1234,11 @@ static struct glyph {
  {{024,020,036,021,021,021,036,000,000}, U(1E03) }, /* bdotaccent */
  ALIAS("uni1E03.sc", "uni1E02"),
  {{036,021,021,036,021,021,036,000,004}, U(1E04) }, /* Bdotbelow */
- {{000,000,036,021,036,021,036,000,004}, -1, "uni1E04.c2sc"},
+ {{000,000,036,021,036,021,036,000,004}, 0xf19d, "uni1E04.c2sc"},
  {{020,020,036,021,021,021,036,000,004}, U(1E05) }, /* bdotbelow */
  ALIAS("uni1E05.sc", "uni1E04.c2sc"),
  {{036,021,021,036,021,021,036,000,016}, U(1E06) }, /* Bmacronbelow */
- {{000,000,036,021,036,021,036,000,016}, -1, "uni1E06.c2sc"},
+ {{000,000,036,021,036,021,036,000,016}, 0xf19e, "uni1E06.c2sc"},
  {{020,020,036,021,021,021,036,000,016}, U(1E07) }, /* bmacronbelow */
  ALIAS("uni1E06.sc", "uni1E06.c2sc"),
  {{002,004,016,021,020,021,016,004,010}, U(1E08) }, /* Ccedillaacute */
@@ -1248,23 +1248,23 @@ static struct glyph {
  {{005,001,017,021,021,021,017,000,000}, U(1E0B) }, /* ddotaccent */
  ALIAS("uni1E0B.sc", "uni1E0A"),
  {{036,021,021,021,021,021,036,000,004}, U(1E0C) }, /* Ddotbelow */
- {{000,000,036,021,021,021,036,000,004}, -1, "uni1E0C.c2sc" },
+ {{000,000,036,021,021,021,036,000,004}, 0xf19f, "uni1E0C.c2sc" },
  {{001,001,017,021,021,021,017,000,004}, U(1E0D) }, /* ddotbelow */
  ALIAS("uni1E0D.sc", "uni1E0C.c2sc"),
  {{036,021,021,021,021,021,036,000,016}, U(1E0E) }, /* Dmacronbelow */
- {{000,000,036,021,021,021,036,000,016}, -1, "uni1E0E.c2sc" }, 
+ {{000,000,036,021,021,021,036,000,016}, 0xf1a0, "uni1E0E.c2sc" }, 
  {{001,001,017,021,021,021,017,000,016}, U(1E0F) }, /* dmacronbelow */
  ALIAS("uni1E0F.sc", "uni1E0E.c2sc"),
  {{036,021,021,021,021,021,036,004,010}, U(1E10) }, /* Dcedilla */
- {{000,000,036,021,021,021,036,004,016}, -1, "uni1E10.c2sc" },
+ {{000,000,036,021,021,021,036,004,016}, 0xf1a1, "uni1E10.c2sc" },
  {{001,001,017,021,021,021,017,004,010}, U(1E11) }, /* dcedilla */
  ALIAS("uni1E11.sc", "uni1E10.c2sc"),
  {{036,021,021,021,021,021,036,004,012}, U(1E12) }, /* Dcircumflexbelow */
- {{000,000,036,021,021,021,036,004,012}, -1, "uni1E12.c2sc" },
+ {{000,000,036,021,021,021,036,004,012}, 0xf1a2, "uni1E12.c2sc" },
  {{001,001,017,021,021,021,017,004,012}, U(1E13) }, /* dcircumflexbelow */
  ALIAS("uni1E13.sc", "uni1E12.c2sc"),
  {{037,020,020,036,020,020,037,004,012}, U(1E18) }, /* Ecircumflexbelow */
- {{000,000,037,020,036,020,037,004,012}, -1, "uni1E18.c2sc" },
+ {{000,000,037,020,036,020,037,004,012}, 0xf1a3, "uni1E18.c2sc" },
  {{000,000,016,021,037,020,016,004,012}, U(1E19) }, /* ecircumflexbelow */
  ALIAS("uni1E19.sc", "uni1E18.c2sc"),
  {{004,000,037,020,036,020,020,000,000}, U(1E1E) }, /* Fdotaccent */
@@ -1274,59 +1274,59 @@ static struct glyph {
  {{016,000,017,021,021,021,017,001,016}, U(1E21) }, /* gmacron */
  ALIAS("uni1E21.sc", "uni1E20"),
  {{025,021,021,037,021,021,021,000,000}, U(1E22) }, /* Hdotaccent */
- {{004,000,021,021,037,021,021,000,000}, -1, "uni1E22.c2sc" },
+ {{004,000,021,021,037,021,021,000,000}, 0xf1a4, "uni1E22.c2sc" },
  {{024,020,036,021,021,021,021,000,000}, U(1E23) }, /* hdotaccent */
  ALIAS("uni1E23.sc", "uni1E22.c2sc"),
  {{021,021,021,037,021,021,021,000,004}, U(1E24) }, /* Hdotbelow */
- {{000,000,021,021,037,021,021,000,004}, -1, "uni1E24.c2sc" },
+ {{000,000,021,021,037,021,021,000,004}, 0xf1a5, "uni1E24.c2sc" },
  {{020,020,036,021,021,021,021,000,004}, U(1E25) }, /* hdotbelow */
  ALIAS("uni1E25.sc", "uni1E24.c2sc"),
  {{012,000,021,021,037,021,021,000,000}, U(1E26) }, /* Hdieresis */
  {{025,020,036,021,021,021,021,000,000}, U(1E27) }, /* hdieresis */
  ALIAS("uni1E27.sc", "uni1E26"),
  {{021,021,037,021,021,021,004,002,004}, U(1E28) }, /* Hcedilla */
- {{000,000,021,037,021,021,004,002,004}, -1, "uni1E28.c2sc" },
+ {{000,000,021,037,021,021,004,002,004}, 0xf1a6, "uni1E28.c2sc" },
  {{020,020,036,021,021,021,004,002,004}, U(1E29) }, /* hcedilla */
  ALIAS("uni1E29.sc", "uni1E28"),
  {{021,022,024,030,024,022,021,000,004}, U(1E32) }, /* Kdotbelow */
  {{010,010,011,012,014,012,011,000,004}, U(1E33) }, /* kdotbelow */
  {{021,022,024,030,024,022,021,000,016}, U(1E34) }, /* Kmacronbelow */
- {{000,000,021,022,034,022,021,000,016}, -1, "uni1E34.c2sc" },
+ {{000,000,021,022,034,022,021,000,016}, 0xf1a7, "uni1E34.c2sc" },
  {{010,010,011,012,014,012,011,000,016}, U(1E35) }, /* kmacronbelow */
  ALIAS("uni1E35.sc", "uni1E34.c2sc"),
  {{020,020,020,020,020,020,037,000,004}, U(1E36) }, /* Ldotbelow */
- {{000,000,020,020,020,020,037,000,004}, -1, "uni1E36.c2sc" },
+ {{000,000,020,020,020,020,037,000,004}, 0xf1a8, "uni1E36.c2sc" },
  {{014,004,004,004,004,004,016,000,004}, U(1E37) }, /* ldotbelow */
  ALIAS("uni1E37.sc", "uni1E36.c2sc"),
  {{020,020,020,020,020,020,037,000,016}, U(1E3A) }, /* Lmacronbelow */
- {{000,000,020,020,020,020,037,000,016}, -1, "uni1E3A.c2sc" },
+ {{000,000,020,020,020,020,037,000,016}, 0xf1a9, "uni1E3A.c2sc" },
  {{014,004,004,004,004,004,016,000,016}, U(1E3B) }, /* lmacronbelow */
  ALIAS("uni1E3B.sc", "uni1E3A.c2sc"),
  {{020,020,020,020,020,020,037,004,012}, U(1E3C) }, /* Lcircumflexbelow */
- {{000,000,020,020,020,020,037,004,012}, -1, "uni1E3C.c2sc" }, 
+ {{000,000,020,020,020,020,037,004,012}, 0xf1aa, "uni1E3C.c2sc" }, 
  {{014,004,004,004,004,016,000,004,012}, U(1E3D) }, /* lcircumflexbelow */
  ALIAS("uni1E3D.sc", "uni1E3C.c2sc"),
  {{002,004,021,033,025,021,021,000,000}, U(1E3E) }, /* Macute */
  {{002,004,000,032,025,025,025,000,000}, U(1E3F) }, /* macute */
  ALIAS("uni1E3F.sc", "uni1E3E"),
  {{004,021,033,025,021,021,021,000,000}, U(1E40) }, /* Mdotaccent */
- {{004,000,021,033,025,021,021,000,000}, -1, "uni1E40.c2sc" },
+ {{004,000,021,033,025,021,021,000,000}, 0xf1ab, "uni1E40.c2sc" },
  {{004,000,032,025,025,025,025,000,000}, U(1E41) }, /* mdotaccent */
  ALIAS("uni1E41.sc", "uni1E40.c2sc"),
  {{021,033,025,025,021,021,021,000,004}, U(1E42) }, /* Mdotbelow */
- {{000,000,021,033,025,021,021,000,004}, -1, "uni1E42.c2sc" },
+ {{000,000,021,033,025,021,021,000,004}, 0xf1ac, "uni1E42.c2sc" },
  {{000,000,032,025,025,025,025,000,004}, U(1E43) }, /* mdotbelow */
  ALIAS("uni1E43.sc", "uni1E42.c2sc"),
  {{025,021,031,025,023,021,021,000,000}, U(1E44) }, /* Ndotaccent */
- {{004,000,021,031,025,023,021,000,000}, -1, "uni1E44.c2sc" },
+ {{004,000,021,031,025,023,021,000,000}, 0xf1ad, "uni1E44.c2sc" },
  {{004,000,036,021,021,021,021,000,000}, U(1E45) }, /* ndotaccent */
  ALIAS("uni1E45.sc", "uni1E44.c2sc"),
  {{021,021,031,025,023,021,021,000,004}, U(1E46) }, /* Ndotbelow */
- {{000,000,021,031,025,023,021,000,004}, -1, "uni1E46.c2sc" },
+ {{000,000,021,031,025,023,021,000,004}, 0xf1ae, "uni1E46.c2sc" },
  {{000,000,036,021,021,021,021,000,004}, U(1E47) }, /* ndotbelow */
  ALIAS("uni1E47.sc", "uni1E46.c2sc"),
  {{021,021,031,025,023,021,021,000,016}, U(1E48) }, /* Nmacronbelow */
- {{000,000,021,031,025,023,021,000,016}, -1, "uni1E48.c2sc" },
+ {{000,000,021,031,025,023,021,000,016}, 0xf1af, "uni1E48.c2sc" },
  {{000,000,036,021,021,021,021,000,016}, U(1E49) }, /* nmacronbelow */
  ALIAS("uni1E49.sc", "uni1E48.c2sc"),
  {{002,004,036,021,036,020,020,000,000}, U(1E54) }, /* Pacute */
@@ -1339,14 +1339,14 @@ static struct glyph {
  {{004,000,013,014,010,010,010,000,000}, U(1E59) }, /* rdotaccent */
  ALIAS("uni1E59.sc", "uni1E58"),
  {{036,021,021,036,024,022,021,000,004}, U(1E5A) }, /* Rdotbelow */
- {{000,000,036,021,036,022,021,000,004}, -1, "uni1E5A.c2sc" },
+ {{000,000,036,021,036,022,021,000,004}, 0xf1b0, "uni1E5A.c2sc" },
  {{000,000,013,014,010,010,010,000,004}, U(1E5B) }, /* rdotbelow */
  ALIAS("uni1E5B.sc", "uni1E5A.c2sc"),
  {{016,000,036,021,036,022,021,000,004}, U(1E5C) }, /* Rdotbelowmacron */
  {{016,000,013,014,010,010,010,000,004}, U(1E5D) }, /* rdotbelowmacron */
  ALIAS("uni1E5D.sc", "uni1E5C"),
  {{036,021,021,036,024,022,021,000,016}, U(1E5E) }, /* Rmacronbelow */
- {{000,000,036,021,036,022,021,000,016}, -1, "uni1E5E.c2sc" },
+ {{000,000,036,021,036,022,021,000,016}, 0xf1b1, "uni1E5E.c2sc" },
  {{000,000,013,014,010,010,010,000,016}, U(1E5F) }, /* rmacronbelow */
  ALIAS("uni1E5F.sc", "uni1E5E.c2sc"),
  {{016,021,020,016,001,021,016,000,004}, U(1E62) }, /* Sdotbelow */
@@ -1356,23 +1356,23 @@ static struct glyph {
  {{004,000,004,016,004,004,002,000,000}, U(1E6B) }, /* tdotaccent */
  ALIAS("uni1E6B.sc", "uni1E6A"),
  {{037,004,004,004,004,004,004,000,004}, U(1E6C) }, /* Tdotbelow */
- {{000,000,037,004,004,004,004,000,004}, -1, "uni1E6C.c2sc" },
+ {{000,000,037,004,004,004,004,000,004}, 0xf1b2, "uni1E6C.c2sc" },
  {{004,004,016,004,004,004,002,000,004}, U(1E6D) }, /* tdotbelow */
  ALIAS("uni1E6D.sc", "uni1E6C.c2sc"),
  {{037,004,004,004,004,004,004,000,016}, U(1E6E) }, /* Tmacronbelow */
- {{000,000,037,004,004,004,004,000,016}, -1, "uni1E6E.c2sc" },
+ {{000,000,037,004,004,004,004,000,016}, 0xf1b3, "uni1E6E.c2sc" },
  {{004,004,016,004,004,004,002,000,016}, U(1E6F) }, /* tmacronbelow */
  ALIAS("uni1E6F.sc", "uni1E6E.c2sc"),
  {{037,004,004,004,004,004,000,004,012}, U(1E70) }, /* Tcircumflexbelow */
- {{000,000,037,004,004,004,000,004,012}, -1, "uni1E70.c2sc" },
+ {{000,000,037,004,004,004,000,004,012}, 0xf1b4, "uni1E70.c2sc" },
  {{004,004,016,004,004,002,000,004,012}, U(1E71) }, /* tcircumflexbelow */
  ALIAS("uni1E71.sc", "uni1E70.c2sc"),
  {{021,021,021,021,021,021,016,000,012}, U(1E72) }, /* Udieresisbelow */
- {{000,000,021,021,021,021,016,000,012}, -1, "uni1E72.c2sc" },
+ {{000,000,021,021,021,021,016,000,012}, 0xf1b5, "uni1E72.c2sc" },
  {{000,000,021,021,021,021,017,000,012}, U(1E73) }, /* udieresisbelow */
  ALIAS("uni1E73.sc", "uni1E72.c2sc"),
  {{021,021,021,021,021,021,016,004,012}, U(1E76) }, /* Ucircumflexbelow */
- {{000,000,021,021,021,021,016,004,012}, -1, "uni1E76.c2sc" },
+ {{000,000,021,021,021,021,016,004,012}, 0xf1b6, "uni1E76.c2sc" },
  {{000,000,021,021,021,021,017,004,012}, U(1E77) }, /* ucircumflexbelow */
  ALIAS("uni1E77.sc", "uni1E76.c2sc"),
  {{012,000,016,000,021,021,016,000,000}, U(1E7A) }, /* Umacrondieresis */
@@ -1394,18 +1394,18 @@ static struct glyph {
  {{012,000,021,012,004,012,021,000,000}, U(1E8D) }, /* xdieresis */
  ALIAS("uni1E8D.sc", "uni1E8C"),
  {{025,021,012,004,004,004,004,000,000}, U(1E8E) }, /* Ydotaccent */
- {{004,000,021,012,004,004,004,000,000}, -1, "uni1E8E.c2sc" },
+ {{004,000,021,012,004,004,004,000,000}, 0xf1b7, "uni1E8E.c2sc" },
  {{004,000,021,021,021,021,017,001,016}, U(1E8F) }, /* ydotaccent */
  ALIAS("uni1E8F.sc", "uni1E8E.c2sc"),
  {{004,012,037,001,016,020,037,000,000}, U(1E90) }, /* Zcircumflex */
  {{004,012,037,002,004,010,037,000,000}, U(1E91) }, /* zcircumflex */
  ALIAS("uni1E91.sc", "uni1E90"),
  {{037,001,002,004,010,020,037,000,004}, U(1E92) }, /* Zdotbelow */
- {{000,000,037,001,016,020,037,000,004}, -1, "uni1E92.c2sc" },
+ {{000,000,037,001,016,020,037,000,004}, 0xf1b8, "uni1E92.c2sc" },
  {{000,000,037,002,004,010,037,000,004}, U(1E93) }, /* zdotbelow */
  ALIAS("uni1E93.sc", "uni1E92.c2sc"),
  {{037,001,002,004,010,020,037,000,016}, U(1E94) }, /* Zmacronbelow */
- {{000,000,037,001,016,020,037,000,016}, -1, "uni1E94.c2sc" },
+ {{000,000,037,001,016,020,037,000,016}, 0xf1b9, "uni1E94.c2sc" },
  {{000,000,037,002,004,010,037,000,016}, U(1E95) }, /* zmacronbelow */
  ALIAS("uni1E95.sc", "uni1E94.c2sc"),
  {{020,020,036,021,021,021,021,000,016}, U(1E96) }, /* hmacronbelow */
@@ -1413,26 +1413,26 @@ static struct glyph {
  {{016,021,022,022,021,021,026,000,000}, U(1E9E) }, /* Germandbls */
  {{000,000,016,021,022,021,026,000,000}, 0xf1c1, "uni1E9E.c2sc" },
  {{004,012,021,021,037,021,021,000,004}, U(1EA0) }, /* Adotbelow */
- {{000,000,016,021,037,021,021,000,004}, -1, "uni1EA0.c2sc" },
+ {{000,000,016,021,037,021,021,000,004}, 0xf1ba, "uni1EA0.c2sc" },
  {{000,000,016,001,017,021,017,000,004}, U(1EA1) }, /* adotbelow */
  ALIAS("uni1EA1.sc", "uni1EA0.c2sc"),
  {{037,020,020,036,020,020,037,000,004}, U(1EB8) }, /* Edotbelow */
- {{000,000,037,020,036,020,037,000,004}, -1, "uni1EB8.c2sc" },
+ {{000,000,037,020,036,020,037,000,004}, 0xf1bb, "uni1EB8.c2sc" },
  {{000,000,016,021,037,020,016,000,004}, U(1EB9) }, /* edotbelow */
  ALIAS("uni1EB9.sc", "uni1EB8.c2sc"),
  {{016,004,004,004,004,004,016,000,004}, U(1ECA) }, /* Idotbelow */
- {{000,000,016,004,004,004,016,000,004}, -1, "uni1ECA.c2sc" },
+ {{000,000,016,004,004,004,016,000,004}, 0xf1bc, "uni1ECA.c2sc" },
  {{004,000,014,004,004,004,016,000,004}, U(1ECB) }, /* idotbelow */
  ALIAS("uni1ECB.sc", "uni1ECA.c2sc"),
  {{016,021,021,021,021,021,016,000,004}, U(1ECC) }, /* Odotbelow */
  ALIAS("uni1ECC.c2sc", "uni1ECD"),
  {{000,000,016,021,021,021,016,000,004}, U(1ECD) }, /* odotbelow */
  {{021,021,021,021,021,021,016,000,004}, U(1EE4) }, /* Udotbelow */
- {{000,000,021,021,021,021,016,000,004}, -1, "uni1EE4.c2sc" },
+ {{000,000,021,021,021,021,016,000,004}, 0xf1bd, "uni1EE4.c2sc" },
  {{000,000,021,021,021,021,017,000,004}, U(1EE5) }, /* udotbelow */
  ALIAS("uni1EE5.sc", "uni1EE4.c2sc"),
  {{021,021,012,004,004,004,004,000,004}, U(1EF4) }, /* Ydotbelow */
- {{000,000,021,012,004,004,004,000,004}, -1, "uni1EF4.c2sc" },
+ {{000,000,021,012,004,004,004,000,004}, 0xf1be, "uni1EF4.c2sc" },
  {{000,000,021,021,017,001,016,000,004}, U(1EF5) }, /* ydotbelow */
  ALIAS("uni1EF5.sc", "uni1EF4.c2sc"),
  
@@ -2250,13 +2250,13 @@ static struct glyph {
 
  /* Latin extended-C */
  {{021,021,037,021,021,012,004,000,000}, U(2C6F) }, /* turned A */
- {{000,000,021,021,037,021,016,000,000}, -1, "uni2C6F.c2sc" },
+ {{000,000,021,021,037,021,016,000,000}, 0xf1bf, "uni2C6F.c2sc" },
  {{000,000,022,025,024,024,010,000,000}, U(2C71) }, /* vhook */
  {{000,000,037,001,017,001,037,000,000}, U(2C7B) }, /* small cap turned E */
  {{016,021,020,016,001,021,016,004,003}, U(2C7E) }, /* S with swash tail */
  ALIAS("uni2C7E.c2sc", "uni023F"),
  {{037,001,002,004,010,020,030,004,003}, U(2C7F) }, /* Z with swash tail */
- {{000,000,037,001,016,020,030,004,003}, -1, "uni2C7F.c2sc" },
+ {{000,000,037,001,016,020,030,004,003}, 0xf1c3, "uni2C7F.c2sc" },
 
  /* Supplemental punctuation */
  {{002,004,010,002,004,010,000,000,000}, U(2E17) }, /* dbl oblique hyphen */
@@ -2306,7 +2306,7 @@ static struct glyph {
 
  /* Latin extended-D */
  {{021,021,021,037,021,021,021,001,016}, U(A726) }, /* Heng */
- {{000,000,021,021,037,021,021,001,016}, -1, "uniA726.c2sc" },
+ {{000,000,021,021,037,021,021,001,016}, 0xf1c4, "uniA726.c2sc" },
  {{020,020,036,021,021,021,021,001,006}, U(A727) }, /* heng */
  ALIAS("uniA727.sc", "uniA726.c2sc"),
  {{000,000,037,020,036,020,020,000,000}, U(A730) }, /* small cap F */
@@ -2315,24 +2315,24 @@ static struct glyph {
  {{016,004,004,004,004,004,006,000,000}, U(A781) }, /* turned l */
  {{021,021,021,037,001,001,001,000,000}, U(A78D) }, /* cap turned h */
  {{006,011,010,034,010,011,006,000,000}, U(A792) }, /* C with bar */
- {{000,000,006,011,034,011,006,000,000}, -1, "uniA792.c2sc" },
+ {{000,000,006,011,034,011,006,000,000}, 0xf1c5, "uniA792.c2sc" },
  {{000,000,007,010,034,010,007,000,000}, U(A793) }, /* c with bar */
  ALIAS("uniA793.sc", "uniA792.c2sc"),
  {{011,031,011,017,011,011,011,000,000}, U(A7AA) }, /* H with hook */
- {{000,000,011,031,017,011,011,000,000}, -1, "uniA7AA.c2sc" },
+ {{000,000,011,031,017,011,011,000,000}, 0xf1c6, "uniA7AA.c2sc" },
  {{016,021,001,006,001,021,016,000,000}, U(A7AB) }, /* reversed Epsilon */
- {{000,000,016,021,006,021,016,000,000}, -1, "uniA7AB.c2sc" },
+ {{000,000,016,021,006,021,016,000,000}, 0xf1c7, "uniA7AB.c2sc" },
  {{004,004,014,025,016,004,007,000,000}, U(A7AD) }, /* belted L */
- {{000,000,014,025,016,004,007,000,000}, -1, "uniA7AD.c2sc" },
+ {{000,000,014,025,016,004,007,000,000}, 0xf1c8, "uniA7AD.c2sc" },
  {{037,025,004,004,004,025,037,000,000}, U(A7AE) }, /* cap small-cap I */
- {{000,000,037,025,004,025,037,000,000}, -1, "uniA7AE.c2sc" },
+ {{000,000,037,025,004,025,037,000,000}, 0xf1c9, "uniA7AE.c2sc" },
  {{000,000,016,021,025,022,015,000,000}, U(A7AF) }, /* small cap Q */
  {{021,011,005,003,005,011,021,000,000}, U(A7B0) }, /* turned K */
- {{000,000,021,011,007,011,021,000,000}, -1, "uniA7B0.c2sc" },
+ {{000,000,021,011,007,011,021,000,000}, 0xf1ca, "uniA7B0.c2sc" },
  {{004,004,004,004,004,004,037,000,000}, U(A7B1) }, /* turned T */
- {{000,000,004,004,004,004,037,000,000}, -1, "uniA7B1.c2sc" },
+ {{000,000,004,004,004,004,037,000,000}, 0xf1cb, "uniA7B1.c2sc" },
  {{001,001,001,011,025,025,016,004,000}, U(A7B2) }, /* crossed-tail J */
- {{000,000,001,001,011,025,016,004,000}, -1, "uniA7B2.c2sc" },
+ {{000,000,001,001,011,025,016,004,000}, 0xf1cc, "uniA7B2.c2sc" },
  {{037,001,001,017,001,001,001,000,000}, U(A7FB) }, /* reversed F */
  {{017,021,021,017,001,001,001,000,000}, U(A7FC) }, /* reversed P */
  {{021,021,021,025,025,033,021,000,000}, U(A7FD) }, /* inverted M */
@@ -2363,9 +2363,8 @@ static struct glyph {
   * Characters in the private use area are used for Bedstead glyphs
   * that would otherwise be unencoded so as to make them easier to
   * use. These encodings should be stable, but they do not use uniXXXX
-  * glyph names.  U+F100 to U+F11F are used for right-to-left mirrored
-  * glyphs.  U+F1D0 to U+F1D9 are used for glyphs from real character
-  * generators. U+F1C0 and U+F1C1 are used for small caps glyphs.
+  * glyph names. They appear scattered across the glyph list, and not
+  * here.
   */
  
  /* Alphabetic presentation forms */