From: Ben Harris <bjh21@bjh21.me.uk>
Date: Fri, 10 May 2024 20:34:31 +0000 (+0100)
Subject: Revert "Private use area mappings for separated 4-cell mosaic graphics"
X-Git-Tag: bedstead-002.005~7
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~bjharris/git?a=commitdiff_plain;h=ac569c276ed023a04f1de310daafe3d5917cb205;p=bedstead.git

Revert "Private use area mappings for separated 4-cell mosaic graphics"

It looks like these will have an official mapping in the next version of
Unicode, so I'll leave out the PUA mapping and put in a proper mapping
once they're in Unicode proper.

This reverts commit dd35eed4ed411ca3468306f5a281118cef8a2f28.
---

diff --git a/bedstead.c b/bedstead.c
index 4af92b1..f73e81d 100644
--- a/bedstead.c
+++ b/bedstead.c
@@ -1720,20 +1720,22 @@ static struct glyph {
  {{016,016,016,016,016,004,004,004,004}, U(257F) },
 
  /* Block elements */
-#define M4N(x, u, n) { {x}, u, n, MOS4 }, { {x}, u+0xd000, n ".sep4", SEP4 }
- M4N(0x03, 0x2580, "upblock"), M4N(0x0c, 0x2584, "dnblock"),
- M4N(0x0f, 0x2588, "block"),   {{0x3f}, -1, "block.sep6", SEP6 },
- M4N(0x05, 0x258c, "lfblock"), {{0x15}, -1, "lfblock.sep6", SEP6 },
- M4N(0x0a, 0x2590, "rtblock"), {{0x2a}, -1, "rtblock.sep6", SEP6 },
+ {{0x03}, 0x2580, "upblock", MOS4 }, {{0x03}, -1, "upblock.sep4", SEP4 },
+ {{0x0c}, 0x2584, "dnblock", MOS4 }, {{0x0c}, -1, "dnblock.sep4", SEP4 },
+ {{0x0f}, 0x2588, "block",   MOS4 }, {{0x0f}, -1, "block.sep4",   SEP4 },
+ {{0x3f}, -1, "block.sep6", SEP6 },
+ {{0x05}, 0x258c, "lfblock", MOS4 }, {{0x05}, -1, "lfblock.sep4", SEP4 },
+ {{0x15}, -1, "lfblock.sep6", SEP6 },
+ {{0x0a}, 0x2590, "rtblock", MOS4 }, {{0x0a}, -1, "rtblock.sep4", SEP4 },
+ {{0x2a}, -1, "rtblock.sep6", SEP6 },
  {{025,000,012,000,025,000,012,000,025}, 0x2591, "ltshade" },
  {{022,011,004,022,011,004,022,011,004}, 0x2592, "shade" },
  {{025,037,012,037,025,037,012,037,025}, 0x2593, "dkshade" },
-#define M4(x, u) M4N(x, 0x ## u, "uni" #u)
- M4( 4, 2596), M4( 8, 2597), M4( 1, 2598), M4(13, 2599),
- M4( 9, 259A), M4( 7, 259B), M4(11, 259C), M4( 2, 259D),
- M4( 6, 259E), M4(14, 259F),
-#undef M4
-#undef M4N
+#define M(x, u) { {x}, U(u), MOS4 }, { {x}, -1, "uni" #u ".sep4", SEP4 }
+ M( 4, 2596), M( 8, 2597), M( 1, 2598), M(13, 2599),
+ M( 9, 259A), M( 7, 259B), M(11, 259C), M( 2, 259D),
+ M( 6, 259E), M(14, 259F),
+#undef M
 
  /* Geometric shapes */
  {{037,021,021,021,021,021,037,000,000}, 0x25a1, "H22073" },
@@ -2011,9 +2013,8 @@ static struct glyph {
   * 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+F1D0 to U+F1D9 are used above for glyphs from real
-  * character generators. U+F580 to U+F59F are used above for
-  * separated 4-cell mosaic graphics.  U+F1C0 and U+F1C1 are used
-  * below for small caps glyphs.
+  * character generators. U+F1C0 and U+F1C1 are used below for small
+  * caps glyphs.
   */
  
  /* Alphabetic presentation forms */