Add private-use code points for new unmapped glyphs

Also turn seriffed Dcroats into aliases for the corresponding Eths to
slightly reduce the number of nominally distinct glyphs.

diff --git a/bedstead.c b/bedstead.c
index f4419ea3544a87faa9ee9810524ebbc853bf5bd6..c44b53fef06add27d869f113beb9818fe94d74c0 100644 (file)
--- a/bedstead.c
+++ b/bedstead.c
@@ -607,12 +607,12 @@ 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", -1, "cedilla.angular" },
+ {"\00\00\00\00\00\00\04\02\06", 0xf200, "cedilla.angular" },
  {"\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" },
  {"\00\00\04\00\04\04\10\21\16", 0x00bf, "questiondown" },
- {"\00\00\04\00\04\10\20\21\16", -1, "questiondown.open" },
+ {"\00\00\04\00\04\10\20\21\16", 0xf211, "questiondown.open" },
  {"\10\04\16\21\37\21\21\00\00", 0x00c0, "Agrave" },
  {"\02\04\16\21\37\21\21\00\00", 0x00c1, "Aacute" },
  {"\04\12\16\21\37\21\21\00\00", 0x00c2, "Acircumflex" },
@@ -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", -1, "Ccedilla.angular" },
+ {"\16\21\20\20\20\21\16\04\14", 0xf201, "Ccedilla.angular" },
  {"\00\00\16\21\20\21\16\04\10", 0xf190, "Ccedilla.c2sc" },
- {"\00\00\16\21\20\21\16\04\14", -1, "Ccedilla.c2sc.angular" },
+ {"\00\00\16\21\20\21\16\04\14", 0xf202, "Ccedilla.c2sc.angular" },
  {"\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" },
@@ -631,7 +631,7 @@ 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" },
+ {"\36\11\11\35\11\11\36\00\00", 0xf221, "Eth.serif" },
  ALIAS("Eth.c2sc", "uni1D06"),
  ALIAS("Eth.c2sc.serif", "uni1D06.serif"),
  {"\05\12\00\31\25\23\21\00\00", 0x00d1, "Ntilde" },
@@ -720,16 +720,16 @@ 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" },
+ {"\12\04\36\11\11\11\36\00\00", 0xf223, "Dcaron.serif" },
+ {"\12\04\16\11\11\11\16\00\00", 0xf233, "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" },
+ ALIAS("Dcroat.serif", "Eth.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" },
+ ALIAS("Dcroat.c2sc.serif", "Eth.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"),
@@ -753,7 +753,7 @@ static struct glyph {
  {"\04\00\17\21\21\21\17\01\16", 0x0121, "gdotaccent" },
  ALIAS("gdotaccent.sc", "Gdotaccent"),
  {"\16\21\20\20\23\21\17\04\10", U(0122) }, /* Gcommaaccent */
- {"\00\00\17\20\23\21\17\04\10", -1, "uni0122.c2sc" },
+ {"\00\00\17\20\23\21\17\04\10", 0xf1cf, "uni0122.c2sc" },
  {"\02\04\17\21\21\21\17\01\16", U(0123) }, /* gcommaaccent */
  ALIAS("uni0123.sc", "uni0122.c2sc"),
  {"\21\37\21\37\21\21\21\00\00", 0x0126, "Hbar" },
@@ -776,35 +776,35 @@ 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" },
+ {"\11\00\33\11\11\11\35\01\02", 0xf21d, "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" },
+ {"\04\12\00\14\04\04\04\04\10", 0xf21e, "jcircumflex.serif" },
  ALIAS("jcircumflex.sc", "Jcircumflex"),
  {"\21\21\22\34\22\21\25\04\10", U(0136) }, /* Kcommaaccent */
- {"\00\00\21\22\34\22\21\04\10", -1, "uni0136.c2sc" },
+ {"\00\00\21\22\34\22\21\04\10", 0xf180, "uni0136.c2sc" },
  {"\20\20\21\22\34\22\21\04\10", U(0137) }, /* kcommaaccent */
  ALIAS("uni0137.sc", "uni0136.c2sc"),
  {"\00\00\21\22\34\22\21\00\00", 0x0138, "kgreenlandic" },
  {"\20\20\20\20\20\20\37\04\10", U(013B) }, /* Lcommaaccent */
- {"\10\10\10\10\10\10\17\02\04", -1, "uni013B.narrow" },
- {"\00\00\20\20\20\20\37\04\10", -1, "uni013B.c2sc" },
- {"\00\00\10\10\10\10\17\02\04", -1, "uni013B.c2sc.narrow" },
+ {"\10\10\10\10\10\10\17\02\04", 0xf213, "uni013B.narrow" },
+ {"\00\00\20\20\20\20\37\04\10", 0xf181, "uni013B.c2sc" },
+ {"\00\00\10\10\10\10\17\02\04", 0xf214, "uni013B.c2sc.narrow" },
  {"\14\04\04\04\04\04\16\04\10", U(013C) }, /* lcommaaccent */
  ALIAS("uni013C.sc", "uni013B.c2sc"),
  ALIAS("uni013C.sc.narrow", "uni013B.c2sc.narrow"),
  {"\22\22\24\20\20\20\37\00\00", 0x013d, "Lcaron" },
- {"\11\11\12\10\10\10\17\00\00", -1, "Lcaron.narrow" },
+ {"\11\11\12\10\10\10\17\00\00", 0xf215, "Lcaron.narrow" },
  {"\00\00\22\22\24\20\37\00\00", 0xf197, "Lcaron.c2sc" },
- {"\00\00\11\11\12\10\17\00\00", -1, "Lcaron.c2sc.narrow" },
+ {"\00\00\11\11\12\10\17\00\00", 0xf216, "Lcaron.c2sc.narrow" },
  {"\31\11\12\10\10\10\34\00\00", 0x013e, "lcaron" },
  ALIAS("lcaron.sc", "Lcaron.c2sc"),
  ALIAS("lcaron.sc.narrow", "Lcaron.c2sc.narrow"),
  {"\20\20\20\22\20\20\37\00\00", 0x013f, "Ldot" },
- {"\20\20\20\22\20\20\36\00\00", -1, "Ldot.narrow" },
+ {"\20\20\20\22\20\20\36\00\00", 0xf217, "Ldot.narrow" },
  {"\00\00\20\22\20\20\37\00\00", 0xf198, "Ldot.c2sc" },
- {"\00\00\20\22\20\20\36\00\00", -1, "Ldot.c2sc.narrow" },
+ {"\00\00\20\22\20\20\36\00\00", 0xf218, "Ldot.c2sc.narrow" },
  {"\30\10\10\11\10\10\34\00\00", 0x0140, "ldot" },
  ALIAS("ldot.sc", "Ldot.c2sc"),
  ALIAS("ldot.sc.narrow", "Ldot.c2sc.narrow"),
@@ -816,7 +816,7 @@ static struct glyph {
  {"\02\04\36\21\21\21\21\00\00", 0x0144, "nacute" },
  ALIAS("nacute.sc", "Nacute"),
  {"\21\21\31\25\23\21\25\04\10", U(0145) }, /* Ncommaaccent */
- {"\00\00\31\25\23\21\25\04\10", -1, "uni0145.c2sc" },
+ {"\00\00\31\25\23\21\25\04\10", 0xf182, "uni0145.c2sc" },
  {"\00\00\36\21\21\21\25\04\10", U(0146) }, /* ncommaaccent */
  ALIAS("uni0146.sc", "uni0145.c2sc"),
  {"\12\04\21\31\25\23\21\00\00", 0x0147, "Ncaron" },
@@ -839,7 +839,7 @@ static struct glyph {
  {"\01\02\13\14\10\10\10\00\00", 0x0155, "racute" },
  ALIAS("racute.sc", "Racute"),
  {"\36\21\21\36\22\21\25\04\10", U(0156) }, /* Rcommaaccent */
- {"\00\00\36\21\36\21\25\04\10", -1, "uni0156.c2sc" },
+ {"\00\00\36\21\36\21\25\04\10", 0xf183, "uni0156.c2sc" },
  {"\00\00\13\14\10\10\12\02\04", U(0157) }, /* rcommaaccent */
  ALIAS("uni0157.sc", "uni0156.c2sc"),
  {"\12\04\36\21\36\22\21\00\00", 0x0158, "Rcaron" },
@@ -847,31 +847,31 @@ 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", -1, "Scedilla.angular" },
+ {"\16\21\20\16\01\21\16\04\14", 0xf203, "Scedilla.angular" },
  ALIAS("Scedilla.c2sc", "scedilla"),
  ALIAS("Scedilla.c2sc.angular", "scedilla.angular"),
  {"\00\00\17\20\16\01\36\04\10", 0x015f, "scedilla" },
- {"\00\00\17\20\16\01\36\04\14", -1, "scedilla.angular" },
+ {"\00\00\17\20\16\01\36\04\14", 0xf204, "scedilla.angular" },
  {"\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", -1, "uni0162.angular" },
+ {"\37\04\04\04\04\04\04\02\06", 0xf205, "uni0162.angular" },
  {"\00\00\37\04\04\04\04\02\04", 0xf19b, "uni0162.c2sc" },
- {"\00\00\37\04\04\04\04\02\06", -1, "uni0162.c2sc.angular" },
+ {"\00\00\37\04\04\04\04\02\06", 0xf206, "uni0162.c2sc.angular" },
  {"\04\04\16\04\04\05\02\02\04", U(0163) }, /* tcedilla */
- {"\04\04\16\04\04\05\02\02\06", -1, "uni0163.angular" },
- {"\00\04\16\04\04\05\02\02\04", -1, "uni0163.small" },
- {"\00\04\16\04\04\05\02\02\06", -1, "uni0163.small.angular" },
+ {"\04\04\16\04\04\05\02\02\06", 0xf207, "uni0163.angular" },
+ {"\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"),
  ALIAS("uni0163.sc", "uni0162.c2sc"),
  ALIAS("uni0163.sc.angular", "uni0162.c2sc.angular"),
  {"\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", -1, "tcaron.small" },
+ {"\01\11\34\10\10\10\04\00\00", 0xf241, "tcaron.small" },
  ALIAS("tcaron.sc", "Tcaron"),
  {"\37\04\04\16\04\04\04\00\00", 0x0166, "Tbar" },
  {"\00\00\37\04\16\04\04\00\00", 0xf1cd, "Tbar.c2sc" },
  {"\04\16\04\16\04\04\02\00\00", 0x0167, "tbar" },
- {"\00\04\16\04\16\04\02\00\00", -1, "tbar.small" },
+ {"\00\04\16\04\16\04\02\00\00", 0xf242, "tbar.small" },
  ALIAS("tbar.sc", "Tbar.c2sc"),
  {"\16\00\21\21\21\21\16\00\00", 0x016a, "Umacron" },
  {"\00\16\00\21\21\21\17\00\00", 0x016b, "umacron" },
@@ -922,7 +922,7 @@ static struct glyph {
  ALIAS("uni01A7.c2sc", "uni01A8"),
  {"\00\00\36\01\16\20\17\00\00", U(01A8) }, /* tone 2 (reversed s) */
  {"\04\04\16\04\04\04\02\14\00", U(01AB) }, /* Left-hook T */
- {"\00\04\16\04\04\04\02\14\00", -1, "uni01AB.small" },
+ {"\00\04\16\04\04\04\02\14\00", 0xf243, "uni01AB.small" },
  {"\02\04\16\04\04\04\02\00\00", U(01AD) }, /* Hooktop T */
  {"\16\21\05\02\15\20\37\00\00", U(01BB) }, /* Barred two */
  {"\04\04\04\04\04\04\04\04\04", U(01C0) }, /* Pipe */
@@ -959,7 +959,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" },
+ {"\12\04\00\14\04\04\04\04\10", 0xf21f, "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"),
@@ -967,23 +967,23 @@ static struct glyph {
  ALIAS("uni0218.c2sc", "uni0219"),
  {"\00\00\17\20\16\01\36\04\10", U(0219) }, /* scommaaccent */
  {"\37\04\04\04\04\04\00\04\10", U(021A) }, /* Tcommaaccent */
- {"\00\00\37\04\04\04\00\04\10", -1, "uni021A.c2sc" },
+ {"\00\00\37\04\04\04\00\04\10", 0xf184, "uni021A.c2sc" },
  {"\04\04\16\04\04\02\00\04\10", U(021B) }, /* tcommaaccent */
- {"\00\04\16\04\04\02\00\04\10", -1, "uni021B.small" },
+ {"\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", -1, "uni0228.angular" },
- {"\00\00\37\20\36\20\37\04\10", -1, "uni0228.c2sc" },
- {"\00\00\37\20\36\20\37\04\14", -1, "uni0228.c2sc.angular" },
+ {"\37\20\20\36\20\20\37\04\14", 0xf209, "uni0228.angular" },
+ {"\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\16\21\37\20\16\04\10", U(0229) }, /* ecedilla */
- {"\00\00\16\21\37\20\16\04\14", -1, "uni0229.angular" },
+ {"\00\00\16\21\37\20\16\04\14", 0xf20b, "uni0229.angular" },
  ALIAS("uni0229.sc", "uni0228.c2sc"),
  ALIAS("uni0229.sc.angular", "uni0228.c2sc.angular"),
  {"\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"),
  {"\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\14\04\04\04\04\04\10", 0xf22d, "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"),
@@ -1052,10 +1052,10 @@ static struct glyph {
  {"\02\04\04\04\04\16\04\04\10", U(0284) }, /* Hooktop barred dotless j */
  {"\02\04\04\04\04\16\24\24\10", U(0286) }, /* Curly-tail esh */
  {"\00\00\10\04\04\04\16\04\04", U(0287) }, /* Turned t */
- {"\00\00\10\04\04\04\16\04\00", -1, "uni0287.small" },
+ {"\00\00\10\04\04\04\16\04\00", 0xf245, "uni0287.small" },
  ALIAS("uni0287.sc", "uniA7B1.c2sc"),
  {"\04\04\16\04\04\04\04\04\02", U(0288) }, /* Right-tail t */
- {"\00\04\16\04\04\04\04\04\02", -1, "uni0288.small" },
+ {"\00\04\16\04\04\04\04\04\02", 0xf246, "uni0288.small" },
  {"\00\00\12\37\12\12\06\00\00", U(0289) }, /* Barred u */
  {"\00\00\33\12\21\21\16\00\00", U(028A) }, /* upsilon */
  {"\00\00\32\11\11\12\14\00\00", U(028B) }, /* Cursive v */
@@ -1077,12 +1077,12 @@ 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 */
+ {"\04\00\14\04\04\16\24\24\10", 0xf22e, "uni029D.serif" },
  ALIAS("uni029D.sc", "uniA7B2.c2sc"),
  {"\00\00\22\12\06\12\22\02\02", U(029E) }, /* Turned k */
  ALIAS("uni029E.sc", "uniA7B0.c2sc"),
  {"\00\00\20\20\20\20\37\00\00", U(029F) }, /* Small capital L */
- {"\00\00\10\10\10\10\17\00\00", -1, "uni029F.narrow" },
+ {"\00\00\10\10\10\10\17\00\00", 0xf219, "uni029F.narrow" },
  {"\06\01\17\21\21\21\17\01\01", U(02A0) }, /* Hooktop q */
  {"\16\21\01\06\04\16\04\00\00", U(02A1) }, /* Barred glottal stop */
  {"\16\21\20\14\04\16\04\00\00", U(02A2) }, /* Barred reversed glottal stop */
@@ -1090,9 +1090,9 @@ static struct glyph {
  {"\04\04\17\25\26\25\15\01\06", U(02A4) }, /* dezh ligature */
  {"\04\04\17\25\26\26\17\05\02", U(02A5) }, /* dz-curl ligature */
  {"\20\20\37\24\22\21\16\00\00", U(02A6) }, /* ts ligature */
- {"\00\20\37\24\22\21\16\00\00", -1, "uni02A6.small" },
+ {"\00\20\37\24\22\21\16\00\00", 0xf247, "uni02A6.small" },
  {"\11\12\36\12\12\12\06\02\04", U(02A7) }, /* tesh ligature */
- {"\01\12\36\12\12\12\06\02\04", -1, "uni02A7.small" },
+ {"\01\12\36\12\12\12\06\02\04", 0xf248, "uni02A7.small" },
  {"\20\30\23\24\24\24\16\05\02", U(02A8) }, /* tc-curl ligature */
  {"\10\20\20\36\25\25\25\01\06", U(02A9) }, /* feng ligature */
  {"\30\10\13\14\12\11\36\00\00", U(02AA) }, /* ls ligature */
@@ -1339,14 +1339,14 @@ 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\36\11\11\11\36\00\00", 0xf220, "uni1D05.serif" },
+ {"\00\00\16\11\11\11\16\00\00", 0xf230, "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\36\11\35\11\36\00\00", 0xf222, "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 */
- {"\00\00\02\02\02\22\14\00\00", -1, "uni1D0A.narrow" },
+ {"\00\00\02\02\02\22\14\00\00", 0xf21c, "uni1D0A.narrow" },
  {"\00\00\21\22\34\22\21\00\00", U(1D0B) }, /* small cap K */
  {"\00\00\21\33\25\21\21\00\00", U(1D0D) }, /* small cap M */
  {"\00\00\21\23\25\31\21\00\00", U(1D0E) }, /* small cap reversed N */
@@ -1384,54 +1384,54 @@ 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", -1, "uni1E08.angular" },
+ {"\02\04\16\21\20\21\16\04\14", 0xf20c, "uni1E08.angular" },
  {"\02\04\17\20\20\20\17\04\10", U(1E09) }, /* ccedillaacute */
- {"\02\04\17\20\20\20\17\04\14", -1, "uni1E09.angular" },
+ {"\02\04\17\20\20\20\17\04\14", 0xf20d, "uni1E09.angular" },
  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" },
+ {"\04\00\36\11\11\11\36\00\00", 0xf224, "uni1E0A.serif" },
+ {"\04\00\36\11\11\11\36\00\00", 0xf234, "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" },
+ {"\36\11\11\11\11\11\36\00\04", 0xf225, "uni1E0C.serif" },
+ {"\16\11\11\11\11\11\16\00\04", 0xf235, "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" },
+ {"\00\00\36\11\11\11\36\00\04", 0xf226, "uni1E0C.c2sc.serif" },
+ {"\00\00\16\11\11\11\16\00\04", 0xf236, "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" },
+ {"\36\11\11\11\11\11\36\00\16", 0xf227, "uni1E0E.serif" },
+ {"\16\11\11\11\11\11\16\00\16", 0xf237, "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" },
+ {"\00\00\36\11\11\11\36\00\16", 0xf228, "uni1E0E.c2sc.serif" },
+ {"\00\00\16\11\11\11\16\00\16", 0xf238, "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) }, /* Dcommaaccent */
- {"\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\11\11\11\11\11\36\04\10", 0xf229, "uni1E10.serif" },
+ {"\16\11\11\11\11\11\16\04\10", 0xf239, "uni1E10.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\11\11\11\36\04\10", 0xf22a, "uni1E10.c2sc.serif" },
+ {"\00\00\16\11\11\11\16\04\10", 0xf23a, "uni1E10.c2sc.narrow" },
  {"\01\01\17\21\21\21\17\04\10", U(1E11) }, /* dcommaaccent */
  ALIAS("uni1E11.sc", "uni1E10.c2sc"),
  ALIAS("uni1E11.sc.serif", "uni1E10.c2sc.serif"),
  ALIAS("uni1E11.sc.narrow", "uni1E10.c2sc.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" },
+ {"\36\11\11\11\11\11\36\04\12", 0xf22b, "uni1E12.serif" },
+ {"\16\11\11\11\11\11\16\04\12", 0xf23b, "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" },
+ {"\00\00\36\11\11\11\36\04\12", 0xf22c, "uni1E12.c2sc.serif" },
+ {"\00\00\16\11\11\11\16\04\12", 0xf23c, "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"),
@@ -1458,11 +1458,11 @@ 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", -1, "uni1E28.angular" },
+ {"\21\21\21\37\21\21\21\10\30", 0xf20e, "uni1E28.angular" },
  {"\00\00\21\21\37\21\21\10\20", 0xf1a6, "uni1E28.c2sc" },
- {"\00\00\21\21\37\21\21\10\30", -1, "uni1E28.c2sc.angular" },
+ {"\00\00\21\21\37\21\21\10\30", 0xf20f, "uni1E28.c2sc.angular" },
  {"\20\20\36\21\21\21\21\10\20", U(1E29) }, /* hcedilla */
- {"\20\20\36\21\21\21\21\10\30", -1, "uni1E29.angular" },
+ {"\20\20\36\21\21\21\21\10\30", 0xf210, "uni1E29.angular" },
  ALIAS("uni1E29.sc", "uni1E28"),
  ALIAS("uni1E29.sc.angular", "uni1E28.angular"),
  {"\21\22\24\30\24\22\21\00\04", U(1E32) }, /* Kdotbelow */
@@ -1535,17 +1535,17 @@ static struct glyph {
  {"\37\04\04\04\04\04\04\00\04", U(1E6C) }, /* Tdotbelow */
  {"\00\00\37\04\04\04\04\00\04", 0xf1b2, "uni1E6C.c2sc" },
  {"\04\04\16\04\04\04\02\00\04", U(1E6D) }, /* tdotbelow */
- {"\00\04\16\04\04\04\02\00\04", -1, "uni1E6D.small" },
+ {"\00\04\16\04\04\04\02\00\04", 0xf249, "uni1E6D.small" },
  ALIAS("uni1E6D.sc", "uni1E6C.c2sc"),
  {"\37\04\04\04\04\04\04\00\16", U(1E6E) }, /* Tmacronbelow */
  {"\00\00\37\04\04\04\04\00\16", 0xf1b3, "uni1E6E.c2sc" },
  {"\04\04\16\04\04\04\02\00\16", U(1E6F) }, /* tmacronbelow */
- {"\00\04\16\04\04\04\02\00\16", -1, "uni1E6F.small" },
+ {"\00\04\16\04\04\04\02\00\16", 0xf24a, "uni1E6F.small" },
  ALIAS("uni1E6F.sc", "uni1E6E.c2sc"),
  {"\37\04\04\04\04\04\00\04\12", U(1E70) }, /* Tcircumflexbelow */
  {"\00\00\37\04\04\04\00\04\12", 0xf1b4, "uni1E70.c2sc" },
  {"\04\04\16\04\04\02\00\04\12", U(1E71) }, /* tcircumflexbelow */
- {"\00\04\16\04\04\02\00\04\12", -1, "uni1E71.small" },
+ {"\00\04\16\04\04\02\00\04\12", 0xf24b, "uni1E71.small" },
  ALIAS("uni1E71.sc", "uni1E70.c2sc"),
  {"\21\21\21\21\21\21\16\00\12", U(1E72) }, /* Udieresisbelow */
  {"\00\00\21\21\21\21\16\00\12", 0xf1b5, "uni1E72.c2sc" },
@@ -1590,7 +1590,7 @@ static struct glyph {
  ALIAS("uni1E95.sc", "uni1E94.c2sc"),
  {"\20\20\36\21\21\21\21\00\16", U(1E96) }, /* hmacronbelow */
  {"\25\04\16\04\04\04\02\00\00", U(1E97) }, /* tdieresis */
- {"\21\04\16\04\04\04\02\00\00", -1, "uni1E97.small" },
+ {"\21\04\16\04\04\04\02\00\00", 0xf24c, "uni1E97.small" },
  {"\16\21\22\22\21\21\26\00\00", U(1E9E) }, /* Germandbls */
  {"\00\00\16\21\22\21\26\00\00", 0xf1c1, "uni1E9E.c2sc" },
  {"\04\12\21\21\37\21\21\00\04", U(1EA0) }, /* Adotbelow */
@@ -2473,7 +2473,7 @@ static struct glyph {
  {"\00\00\21\00\00\00\21\00\00", U(2E2C) }, /* squared four dots */
  {"\00\00\04\00\25\00\04\00\00", U(2E2D) }, /* five dot mark */
  {"\16\21\10\04\04\00\04\00\00", U(2E2E) }, /* reversed question */
- {"\16\21\20\10\04\00\04\00\00", -1, "uni2E2E.open" },
+ {"\16\21\20\10\04\00\04\00\00", 0xf212, "uni2E2E.open" },
  {"\00\00\00\00\00\02\04\04\00", U(2E32) }, /* turned comma */
  {"\00\02\04\04\00\00\04\00\00", U(2E35) }, /* turned semicolon */
  {"\04\04\34\04\04\04\04\04\04", U(2E36) }, /* dagger w/left guard */
@@ -2510,9 +2510,9 @@ static struct glyph {
  {"\00\00\37\20\36\20\20\00\00", U(A730) }, /* small cap F */
  {"\00\00\17\20\16\01\36\00\00", U(A731) }, /* small cap S */
  {"\37\01\01\01\01\01\01\00\00", U(A780) }, /* turned L */
- {"\00\00\37\01\01\01\01\00\00", -1, "uniA780.c2sc" },
- {"\36\02\02\02\02\02\02\00\00", -1, "uniA780.narrow" },
- {"\00\00\36\02\02\02\02\00\00", -1, "uniA780.c2sc.narrow" },
+ {"\00\00\37\01\01\01\01\00\00", 0xf186, "uniA780.c2sc" },
+ {"\36\02\02\02\02\02\02\00\00", 0xf21a, "uniA780.narrow" },
+ {"\00\00\36\02\02\02\02\00\00", 0xf21b, "uniA780.c2sc.narrow" },
  {"\16\04\04\04\04\04\06\00\00", U(A781) }, /* turned l */
  ALIAS("uniA781.sc", "uniA780.c2sc"),
  ALIAS("uniA781.sc.narrow", "uniA780.c2sc.narrow"),