[groff] 21/45: [font]: Make glyph definitions more consistent.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 3f8b171edfad888a506b71c26907e977fca4951f
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sun Jan 16 19:44:29 2022 +1100

    [font]: Make glyph definitions more consistent.
    
    [font]: For 'ascii' and 'latin1' devices, consistently define glyphs for
    ordinary characters before their special character aliases.  This
    parallels existing usage for the 'cp1047' device, and, I think, makes
    the file contents slightly more accessible.
    
    * font/devascii/R.proto:
    * font/devlatin1/R.proto: Do it.
---
 ChangeLog              | 10 ++++++++++
 font/devascii/R.proto  | 20 ++++++++++----------
 font/devlatin1/R.proto | 20 ++++++++++----------
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c2fa24c0..9646ab27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2022-01-16  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       [font]: For 'ascii' and 'latin1' devices, consistently define
+       glyphs for ordinary characters before their special character
+       aliases.  This parallels existing usage for the 'cp1047' device,
+       and, I think, makes the file contents slightly more accessible.
+
+       * font/devascii/R.proto:
+       * font/devlatin1/R.proto: Do it.
+
 2022-01-16  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [grohtml]: Update diagnostic messages.
diff --git a/font/devascii/R.proto b/font/devascii/R.proto
index 7144dae5..bb1f9009 100644
--- a/font/devascii/R.proto
+++ b/font/devascii/R.proto
@@ -136,8 +136,8 @@ lB  "
 rs     "
 ]      24      0       0135
 rB     "
-a^     24      0       0136
-^      "
+^      24      0       0136
+a^     "
 ha     "
 _      24      0       0137
 ru     "
@@ -174,17 +174,17 @@ mu        "
 tmu    "
 y      24      0       0171
 z      24      0       0172
-lC     24      0       0173
-{      "
-ba     24      0       0174
+{      24      0       0173
+lC     "
+|      24      0       0174
 or     "
 bv     "
 br     "
-|      "
-rC     24      0       0175
-}      "
-a~     24      0       0176
-~      "
+ba     "
+}      24      0       0175
+rC     "
+~      24      0       0176
+a~     "
 ap     "
 ti     "
 ---    24      0       0177
diff --git a/font/devlatin1/R.proto b/font/devlatin1/R.proto
index a8d093a1..b54d0d5e 100644
--- a/font/devlatin1/R.proto
+++ b/font/devlatin1/R.proto
@@ -136,8 +136,8 @@ lB  "
 rs     "
 ]      24      0       0135
 rB     "
-a^     24      0       0136
-^      "
+^      24      0       0136
+a^     "
 ha     "
 _      24      0       0137
 ru     "
@@ -171,17 +171,17 @@ w 24      0       0167
 x      24      0       0170
 y      24      0       0171
 z      24      0       0172
-lC     24      0       0173
-{      "
-ba     24      0       0174
+{      24      0       0173
+lC     "
+|      24      0       0174
 or     "
 bv     "
 br     "
-|      "
-rC     24      0       0175
-}      "
-a~     24      0       0176
-~      "
+ba     "
+}      24      0       0175
+rC     "
+~      24      0       0176
+a~     "
 ap     "
 ti     "
 ---    24      0       0177