Add integral extension glyph.

Add new option `-x' to afmtodit to suppress use of built-in AGL.

* font/devhtml/R.proto, font/devutf8/R.proto: Add `u23AE'.

* font/devps/generate/textmap: Provide entry for `integralex' to
override (old) PUA value of the AGL.
* font/devps/generate/Makefile (SS): Add afmtodit option `-x'.
* font/devps/*: Regenerated.

* src/utils/afmtodit/afmtodit.pl: Add option `-x'.
* src/utils/afmtodit/afmtodit.man, NEWS: Updated.

35 files changed, 318 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index 09660516..ffd1fdfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2003-12-28  Werner LEMBERG  <wl@gnu.org>
+
+	Add integral extension glyph.
+	Add new option `-x' to afmtodit to suppress use of built-in AGL.
+
+	* font/devhtml/R.proto, font/devutf8/R.proto: Add `u23AE'.
+
+	* font/devps/generate/textmap: Provide entry for `integralex' to
+	override (old) PUA value of the AGL.
+	* font/devps/generate/Makefile (SS): Add afmtodit option `-x'.
+	* font/devps/*: Regenerated.
+
+	* src/utils/afmtodit/afmtodit.pl: Add option `-x'.
+	* src/utils/afmtodit/afmtodit.man, NEWS: Updated.
+
 2003-12-27  Werner LEMBERG  <wl@gnu.org>
 
 	Add forgotten `coproduct' symbol (already available for DVI).
diff --git a/NEWS b/NEWS
index 65c54022..83c81aea 100644
--- a/NEWS
+++ b/NEWS
@@ -66,7 +66,6 @@ Grohtml
 
 o New option `-j' to emit output splitted into multiple files.
 
-
 Grops
 -----
 
@@ -76,6 +75,10 @@ o New command line option `-I' to specify a directory to search for files
 
 o The default value for the `broken' keyword in the DESC file is now 0.
 
+Afmtodit
+--------
+
+o New option `-x' to prevent use of built-in Adobe Glyph List.
 
 Macro Packages
 --------------
diff --git a/font/devhtml/R.proto b/font/devhtml/R.proto
index 0cd62ff4..12e7c9f0 100644
--- a/font/devhtml/R.proto
+++ b/font/devhtml/R.proto
@@ -469,6 +469,7 @@ rk	24	0	0x23AC	&#9132;
 bracerightmid	"
 rb	24	0	0x23AD	&#9133;
 bracerightbt	"
+u23AE	24	0	0x23AE	&#9134;
 an	24	0	0x23AF	&#9135;
 br	24	0	0x2502	&#9474;
 sq	24	0	0x25A1	&#9633;
diff --git a/font/devps/AB b/font/devps/AB
index 8fd6fcea..464dd520 100644
--- a/font/devps/AB
+++ b/font/devps/AB
@@ -138,6 +138,7 @@ b v -20
 c y -20
 c l -15
 c k -15
+, u0020 -50
 , ' -70
 , cq -70
 , rq -70
@@ -168,10 +169,12 @@ o x -30
 o w -20
 o v -30
 p y -20
+. u0020 -50
 . ' -70
 . cq -70
 . rq -70
 lq A -50
+rq u0020 -50
 ` ` -80
 ` oq -80
 oq ` -80
@@ -182,6 +185,8 @@ oq A -50
 cq v -10
 ' t 10
 cq t 10
+' u0020 -50
+cq u0020 -50
 ' s -15
 cq s -15
 ' r -20
@@ -215,6 +220,14 @@ r , -75
 r c -7
 s . 20
 s , 20
+u0020 ` -50
+u0020 oq -50
+u0020 lq -50
+u0020 Y -60
+u0020 W -25
+u0020 V -80
+u0020 T -25
+u0020 A -20
 v . -90
 v o -20
 v e -20
diff --git a/font/devps/ABI b/font/devps/ABI
index f3a38b25..22b3126b 100644
--- a/font/devps/ABI
+++ b/font/devps/ABI
@@ -139,6 +139,7 @@ b v -20
 c y -20
 c l -15
 c k -15
+, u0020 -50
 , ' -70
 , cq -70
 , rq -70
@@ -169,10 +170,12 @@ o x -30
 o w -20
 o v -30
 p y -20
+. u0020 -50
 . ' -70
 . cq -70
 . rq -70
 lq A -50
+rq u0020 -50
 ` ` -80
 ` oq -80
 oq ` -80
@@ -183,6 +186,8 @@ oq A -50
 cq v -10
 ' t 10
 cq t 10
+' u0020 -50
+cq u0020 -50
 ' s -15
 cq s -15
 ' r -20
@@ -216,6 +221,14 @@ r , -75
 r c -7
 s . 20
 s , 20
+u0020 ` -50
+u0020 oq -50
+u0020 lq -50
+u0020 Y -60
+u0020 W -25
+u0020 V -80
+u0020 T -25
+u0020 A -20
 v . -90
 v o -20
 v e -20
diff --git a/font/devps/AI b/font/devps/AI
index 611434b8..47589169 100644
--- a/font/devps/AI
+++ b/font/devps/AI
@@ -136,6 +136,7 @@ b y -20
 b v -20
 c y -20
 c k -15
+, u0020 -110
 , ' -120
 , cq -120
 , rq -120
@@ -165,12 +166,14 @@ o x -15
 o w -20
 o v -30
 p y -20
+. u0020 -110
 . ' -120
 . cq -120
 . rq -120
 lq ` -35
 lq oq -35
 lq A -100
+rq u0020 -110
 ` ` -203
 ` oq -203
 oq ` -203
@@ -181,6 +184,8 @@ oq A -100
 cq v -30
 ' t 10
 cq t 10
+' u0020 -110
+cq u0020 -110
 ' s -15
 cq s -15
 ' r -20
@@ -217,6 +222,14 @@ r c -20
 r a -20
 s . 20
 s , 20
+u0020 ` -110
+u0020 oq -110
+u0020 lq -110
+u0020 Y -60
+u0020 W -25
+u0020 V -50
+u0020 T -25
+u0020 A -20
 v . -130
 v o -30
 v e -20
diff --git a/font/devps/AR b/font/devps/AR
index 6490cdc1..f5fb6c3c 100644
--- a/font/devps/AR
+++ b/font/devps/AR
@@ -135,6 +135,7 @@ b y -20
 b v -20
 c y -20
 c k -15
+, u0020 -110
 , ' -120
 , cq -120
 , rq -120
@@ -164,12 +165,14 @@ o x -15
 o w -20
 o v -30
 p y -20
+. u0020 -110
 . ' -120
 . cq -120
 . rq -120
 lq ` -35
 lq oq -35
 lq A -100
+rq u0020 -110
 ` ` -203
 ` oq -203
 oq ` -203
@@ -180,6 +183,8 @@ oq A -100
 cq v -30
 ' t 10
 cq t 10
+' u0020 -110
+cq u0020 -110
 ' s -15
 cq s -15
 ' r -20
@@ -216,6 +221,14 @@ r c -20
 r a -20
 s . 20
 s , 20
+u0020 ` -110
+u0020 oq -110
+u0020 lq -110
+u0020 Y -60
+u0020 W -25
+u0020 V -50
+u0020 T -25
+u0020 A -20
 v . -130
 v o -30
 v e -20
diff --git a/font/devps/HB b/font/devps/HB
index 759f8845..ac3c1f35 100644
--- a/font/devps/HB
+++ b/font/devps/HB
@@ -135,6 +135,8 @@ c y -10
 c l -20
 c k -20
 c h -10
+: u0020 -40
+, u0020 -40
 , ' -120
 , cq -120
 , rq -120
@@ -171,15 +173,19 @@ o x -30
 o w -15
 o v -20
 p y -15
+. u0020 -40
 . ' -120
 . cq -120
 . rq -120
+rq u0020 -80
 ` ` -46
 ` oq -46
 oq ` -46
 oq oq -46
 ' v -20
 cq v -20
+' u0020 -80
+cq u0020 -80
 ' s -60
 cq s -60
 ' r -40
@@ -206,6 +212,14 @@ r d -20
 r , -60
 r c -20
 s w -15
+; u0020 -40
+u0020 ` -60
+u0020 oq -60
+u0020 lq -80
+u0020 Y -120
+u0020 W -80
+u0020 V -80
+u0020 T -100
 v . -80
 v o -30
 v , -80
diff --git a/font/devps/HBI b/font/devps/HBI
index 2529a52d..72d58721 100644
--- a/font/devps/HBI
+++ b/font/devps/HBI
@@ -136,6 +136,8 @@ c y -10
 c l -20
 c k -20
 c h -10
+: u0020 -40
+, u0020 -40
 , ' -120
 , cq -120
 , rq -120
@@ -172,15 +174,19 @@ o x -30
 o w -15
 o v -20
 p y -15
+. u0020 -40
 . ' -120
 . cq -120
 . rq -120
+rq u0020 -80
 ` ` -46
 ` oq -46
 oq ` -46
 oq oq -46
 ' v -20
 cq v -20
+' u0020 -80
+cq u0020 -80
 ' s -60
 cq s -60
 ' r -40
@@ -207,6 +213,14 @@ r d -20
 r , -60
 r c -20
 s w -15
+; u0020 -40
+u0020 ` -60
+u0020 oq -60
+u0020 lq -80
+u0020 Y -120
+u0020 W -80
+u0020 V -80
+u0020 T -100
 v . -80
 v o -30
 v , -80
diff --git a/font/devps/HI b/font/devps/HI
index f2601136..20055dfd 100644
--- a/font/devps/HI
+++ b/font/devps/HI
@@ -144,6 +144,7 @@ b , -40
 b b -10
 c k -20
 c , -15
+: u0020 -50
 , ' -100
 , cq -100
 , rq -100
@@ -208,13 +209,17 @@ o , -40
 p y -30
 p . -35
 p , -35
+. u0020 -60
 . ' -100
 . cq -100
 . rq -100
+rq u0020 -40
 ` ` -57
 ` oq -57
 oq ` -57
 oq oq -57
+' u0020 -70
+cq u0020 -70
 ' s -50
 cq s -50
 ' r -50
@@ -243,6 +248,14 @@ r a -10
 s w -30
 s . -15
 s , -15
+; u0020 -50
+u0020 ` -60
+u0020 oq -60
+u0020 lq -30
+u0020 Y -90
+u0020 W -40
+u0020 V -50
+u0020 T -50
 v . -80
 v o -25
 v e -25
diff --git a/font/devps/HNB b/font/devps/HNB
index f4131f91..5e86bb49 100644
--- a/font/devps/HNB
+++ b/font/devps/HNB
@@ -135,6 +135,8 @@ c y -7
 c l -15
 c k -15
 c h -7
+: u0020 -32
+, u0020 -32
 , ' -97
 , cq -97
 , rq -97
@@ -171,15 +173,19 @@ o x -24
 o w -11
 o v -15
 p y -11
+. u0020 -32
 . ' -97
 . cq -97
 . rq -97
+rq u0020 -65
 ` ` -37
 ` oq -37
 oq ` -37
 oq oq -37
 ' v -15
 cq v -15
+' u0020 -65
+cq u0020 -65
 ' s -48
 cq s -48
 ' r -32
@@ -206,6 +212,14 @@ r d -15
 r , -48
 r c -15
 s w -11
+; u0020 -32
+u0020 ` -48
+u0020 oq -48
+u0020 lq -65
+u0020 Y -97
+u0020 W -65
+u0020 V -65
+u0020 T -81
 v . -65
 v o -24
 v , -65
diff --git a/font/devps/HNBI b/font/devps/HNBI
index 771dd75b..74414b44 100644
--- a/font/devps/HNBI
+++ b/font/devps/HNBI
@@ -136,6 +136,8 @@ c y -10
 c l -20
 c k -20
 c h -10
+: u0020 -40
+, u0020 -40
 , ' -120
 , cq -120
 , rq -120
@@ -172,15 +174,19 @@ o x -30
 o w -15
 o v -20
 p y -15
+. u0020 -40
 . ' -120
 . cq -120
 . rq -120
+rq u0020 -80
 ` ` -46
 ` oq -46
 oq ` -46
 oq oq -46
 ' v -20
 cq v -20
+' u0020 -80
+cq u0020 -80
 ' s -60
 cq s -60
 ' r -40
@@ -207,6 +213,14 @@ r d -20
 r , -60
 r c -20
 s w -15
+; u0020 -40
+u0020 ` -60
+u0020 oq -60
+u0020 lq -80
+u0020 Y -120
+u0020 W -80
+u0020 V -80
+u0020 T -100
 v . -80
 v o -30
 v , -80
diff --git a/font/devps/HNI b/font/devps/HNI
index 1c63dfed..a9c39ed6 100644
--- a/font/devps/HNI
+++ b/font/devps/HNI
@@ -144,6 +144,7 @@ b , -40
 b b -10
 c k -20
 c , -15
+: u0020 -50
 , ' -100
 , cq -100
 , rq -100
@@ -208,13 +209,17 @@ o , -40
 p y -30
 p . -35
 p , -35
+. u0020 -60
 . ' -100
 . cq -100
 . rq -100
+rq u0020 -40
 ` ` -57
 ` oq -57
 oq ` -57
 oq oq -57
+' u0020 -70
+cq u0020 -70
 ' s -50
 cq s -50
 ' r -50
@@ -243,6 +248,14 @@ r a -10
 s w -30
 s . -15
 s , -15
+; u0020 -50
+u0020 ` -60
+u0020 oq -60
+u0020 lq -30
+u0020 Y -90
+u0020 W -40
+u0020 V -50
+u0020 T -50
 v . -80
 v o -25
 v e -25
diff --git a/font/devps/HNR b/font/devps/HNR
index 5acaac06..989bdf04 100644
--- a/font/devps/HNR
+++ b/font/devps/HNR
@@ -143,6 +143,7 @@ b , -32
 b b -7
 c k -15
 c , -11
+: u0020 -40
 , ' -81
 , cq -81
 , rq -81
@@ -207,13 +208,17 @@ o , -32
 p y -24
 p . -28
 p , -28
+. u0020 -48
 . ' -81
 . cq -81
 . rq -81
+rq u0020 -32
 ` ` -46
 ` oq -46
 oq ` -46
 oq oq -46
+' u0020 -56
+cq u0020 -56
 ' s -40
 cq s -40
 ' r -40
@@ -242,6 +247,14 @@ r a -7
 s w -24
 s . -11
 s , -11
+; u0020 -40
+u0020 ` -48
+u0020 oq -48
+u0020 lq -24
+u0020 Y -73
+u0020 W -32
+u0020 V -40
+u0020 T -40
 v . -65
 v o -20
 v e -20
diff --git a/font/devps/HR b/font/devps/HR
index 469f47f8..cbf1ab80 100644
--- a/font/devps/HR
+++ b/font/devps/HR
@@ -143,6 +143,7 @@ b , -40
 b b -10
 c k -20
 c , -15
+: u0020 -50
 , ' -100
 , cq -100
 , rq -100
@@ -207,13 +208,17 @@ o , -40
 p y -30
 p . -35
 p , -35
+. u0020 -60
 . ' -100
 . cq -100
 . rq -100
+rq u0020 -40
 ` ` -57
 ` oq -57
 oq ` -57
 oq oq -57
+' u0020 -70
+cq u0020 -70
 ' s -50
 cq s -50
 ' r -50
@@ -242,6 +247,14 @@ r a -10
 s w -30
 s . -15
 s , -15
+; u0020 -50
+u0020 ` -60
+u0020 oq -60
+u0020 lq -30
+u0020 Y -90
+u0020 W -40
+u0020 V -50
+u0020 T -50
 v . -80
 v o -25
 v e -25
diff --git a/font/devps/NB b/font/devps/NB
index 66c27937..bc81dd01 100644
--- a/font/devps/NB
+++ b/font/devps/NB
@@ -108,16 +108,20 @@ Y , -100
 Y : -25
 Y a -100
 Y A -91
+: u0020 -18
+, u0020 -18
 , ' -18
 , cq -18
 , rq -18
 f ' 75
 f cq 75
 f rq 75
+. u0020 -18
 . ' -18
 . cq -18
 . rq -18
 lq A -74
+rq u0020 -18
 ` A -74
 oq A -74
 ' s -25
@@ -126,6 +130,15 @@ cq s -25
 cq d -25
 r . -74
 r , -74
+; u0020 -18
+u0020 ` -18
+u0020 oq -18
+u0020 lq -18
+u0020 Y -18
+u0020 W -18
+u0020 V -18
+u0020 T -18
+u0020 A -18
 v . -100
 v , -100
 w . -100
diff --git a/font/devps/NBI b/font/devps/NBI
index e633e6e3..aa4b09e2 100644
--- a/font/devps/NBI
+++ b/font/devps/NBI
@@ -148,6 +148,8 @@ c l -13
 c k -8
 c h -18
 c , -8
+: u0020 -18
+, u0020 -18
 , ' -18
 , cq -18
 , rq -18
@@ -192,12 +194,14 @@ o v 6
 p y -4
 p . 8
 p , 8
+. u0020 -18
 . ' -18
 . cq -18
 . rq -18
 lq ` 20
 lq oq 20
 lq A -60
+rq u0020 -18
 ` A -80
 oq A -80
 ' v -16
@@ -236,6 +240,13 @@ r : 9
 r a -11
 s . 11
 s , 11
+; u0020 -18
+u0020 lq -18
+u0020 Y -18
+u0020 W -33
+u0020 V -24
+u0020 T -18
+u0020 A -22
 v . -11
 v o -6
 v , -11
diff --git a/font/devps/NI b/font/devps/NI
index b27ce519..aab0a0b6 100644
--- a/font/devps/NI
+++ b/font/devps/NI
@@ -141,6 +141,8 @@ c . -50
 c k -18
 c h -18
 c , -50
+: u0020 -37
+, u0020 -37
 , ' -37
 , cq -37
 , rq -37
@@ -159,10 +161,12 @@ o . -50
 o , -50
 p . -50
 p , -50
+. u0020 -37
 . ' -37
 . cq -37
 . rq -37
 lq A -75
+rq u0020 -37
 ` ` -37
 ` oq -37
 oq ` -37
@@ -187,6 +191,15 @@ r , -125
 r : -25
 s . -50
 s , -50
+; u0020 -37
+u0020 ` -37
+u0020 oq -37
+u0020 lq -37
+u0020 Y -37
+u0020 W -37
+u0020 V -37
+u0020 T -37
+u0020 A -37
 v . -75
 v , -75
 w . -75
diff --git a/font/devps/NR b/font/devps/NR
index ae9e2ffd..0f4a683d 100644
--- a/font/devps/NR
+++ b/font/devps/NR
@@ -133,6 +133,8 @@ c l -7
 c k -7
 c h -7
 c , -18
+: u0020 -37
+, u0020 -37
 , ' -37
 , cq -37
 , rq -37
@@ -149,10 +151,12 @@ o . -18
 o , -18
 p . -18
 p , -18
+. u0020 -37
 . ' -37
 . cq -37
 . rq -37
 lq A -74
+rq u0020 -37
 ` ` -25
 ` oq -25
 oq ` -25
@@ -173,6 +177,15 @@ r hy -37
 r , -100
 s . -25
 s , -25
+; u0020 -37
+u0020 ` -37
+u0020 oq -37
+u0020 lq -37
+u0020 Y -37
+u0020 W -37
+u0020 V -37
+u0020 T -37
+u0020 A -37
 v . -125
 v , -125
 w . -125
diff --git a/font/devps/PB b/font/devps/PB
index e1057584..bed42bf0 100644
--- a/font/devps/PB
+++ b/font/devps/PB
@@ -7,6 +7,7 @@ kernpairs
 A y -70
 A w -70
 A v -70
+A u0020 -18
 A ' -92
 A cq -92
 A Y -111
@@ -17,6 +18,7 @@ F . -111
 F , -111
 F A -55
 L y -74
+L u0020 -18
 L ' -74
 L cq -74
 L Y -92
@@ -101,6 +103,8 @@ oq ` -55
 oq oq -55
 ' t -18
 cq t -18
+' u0020 -55
+cq u0020 -55
 ' s -55
 cq s -55
 ' ' -55
diff --git a/font/devps/PBI b/font/devps/PBI
index 31f50196..602c4e45 100644
--- a/font/devps/PBI
+++ b/font/devps/PBI
@@ -8,22 +8,26 @@ kernpairs
 A y -55
 A w -37
 A v -55
+A u0020 -55
 A ' -55
 A cq -55
 A Y -74
 A W -74
 A V -74
 A T -55
+F u0020 -18
 F . -111
 F , -111
 F A -74
 L y -37
+L u0020 -18
 L ' -55
 L cq -55
 L Y -74
 L W -74
 L V -74
 L T -74
+P u0020 -55
 P . -129
 P , -129
 P A -92
@@ -101,6 +105,8 @@ oq ` -55
 oq oq -55
 ' t -18
 cq t -18
+' u0020 -37
+cq u0020 -37
 ' s -37
 cq s -37
 ' ' -55
diff --git a/font/devps/PI b/font/devps/PI
index 4942dc03..53bc3034 100644
--- a/font/devps/PI
+++ b/font/devps/PI
@@ -8,6 +8,7 @@ kernpairs
 A y -55
 A w -37
 A v -37
+A u0020 -37
 A ' -55
 A cq -55
 A Y -55
@@ -18,6 +19,7 @@ F . -111
 F , -111
 F A -111
 L y -37
+L u0020 -18
 L ' -37
 L cq -37
 L Y -74
@@ -102,6 +104,8 @@ oq ` -74
 oq oq -74
 ' t -37
 cq t -37
+' u0020 -55
+cq u0020 -55
 ' s -55
 cq s -55
 ' ' -74
diff --git a/font/devps/PR b/font/devps/PR
index a4e44470..2f005e7b 100644
--- a/font/devps/PR
+++ b/font/devps/PR
@@ -7,6 +7,7 @@ kernpairs
 A y -74
 A w -74
 A v -92
+A u0020 -55
 A ' -74
 A cq -74
 A Y -111
@@ -17,12 +18,14 @@ F . -92
 F , -92
 F A -74
 L y -55
+L u0020 -37
 L ' -74
 L cq -74
 L Y -92
 L W -74
 L V -92
 L T -74
+P u0020 -18
 P . -129
 P , -129
 P A -92
@@ -79,6 +82,7 @@ W a -92
 W A -92
 Y v -90
 Y u -90
+Y u0020 -18
 Y ; -74
 Y q -90
 Y . -111
@@ -118,6 +122,8 @@ r e -18
 r d -18
 r , -74
 r c -18
+u0020 Y -18
+u0020 A -37
 v . -111
 v , -111
 w . -92
diff --git a/font/devps/S b/font/devps/S
index 527379f9..7ed54bce 100644
--- a/font/devps/S
+++ b/font/devps/S
@@ -61,7 +61,7 @@ eq	"
 *R	556,673,0,7	3	82	Rho
 *S	592,673	3	83	Sigma
 *T	611,673	3	84	Tau
----	690,673,0,4,8	3	85	Upsilon
+u03A5	690,673,0,4,8	3	85	Upsilon
 ts	439,500,233	3	86	sigma1
 *W	768,688	3	87	Omega
 *C	645,673	3	88	Xi
@@ -143,7 +143,7 @@ di	"
 ==	549,443	3	186	equivalence
 ~~	549,394	3	187	approxequal
 ~=	"
----	1000,95,17	3	188	ellipsis
+u2026	1000,95,17	3	188	ellipsis
 arrowvertex	603,1010,120	3	189	arrowvertex
 an	1000,276,0,50,60	3	190	arrowhorizex
 CR	658,629,16	3	191	carriagereturn
@@ -209,9 +209,9 @@ bv	"
 ra	329,746,198	3	241	angleright
 is	274,916,107,67,52,-10	3	242	integral
 integral	"
----	686,921,83,29	3	243	integraltp
----	686,975,88	3	244	integralex
----	686,921,81	3	245	integralbt
+u2320	686,921,83,29	3	243	integraltp
+u23AE	686,975,88	3	244	integralex
+u2321	686,921,81	3	245	integralbt
 parenrighttp	384,926,293,66	3	246	parenrighttp
 parenrightex	384,920,80,66	3	247	parenrightex
 parenrightbt	384,920,293,66	3	248	parenrightbt
diff --git a/font/devps/SS b/font/devps/SS
index 5eb6b9b4..92c3c54f 100644
--- a/font/devps/SS
+++ b/font/devps/SS
@@ -192,4 +192,3 @@ ts	391,445,208,151,-28,99	3	86	sigma1
 ---	440,824,67,35,-108,35	3	252	bracerighttp
 ---	440,832,76,127,-105,99	3	253	bracerightmid
 ---	440,824,62,94,54,94	3	254	bracerightbt
----	703,719,2,131,-86,99	3	256	apple
diff --git a/font/devps/TB b/font/devps/TB
index fba840d7..e9f11c79 100644
--- a/font/devps/TB
+++ b/font/devps/TB
@@ -172,6 +172,8 @@ oq oq -63
 oq A -10
 ' v -20
 cq v -20
+' u0020 -74
+cq u0020 -74
 ' s -37
 cq s -37
 ' r -20
@@ -194,6 +196,11 @@ r g -10
 r e -18
 r , -92
 r c -18
+u0020 Y -55
+u0020 W -30
+u0020 V -45
+u0020 T -30
+u0020 A -55
 v . -70
 v o -10
 v e -10
diff --git a/font/devps/TBI b/font/devps/TBI
index 0f883d9f..abda4918 100644
--- a/font/devps/TBI
+++ b/font/devps/TBI
@@ -166,6 +166,8 @@ oq oq -74
 cq v -15
 ' t -37
 cq t -37
+' u0020 -74
+cq u0020 -74
 ' s -74
 cq s -74
 ' r -15
@@ -178,6 +180,10 @@ cq cq -74
 cq d -15
 r . -65
 r , -65
+u0020 Y -70
+u0020 W -70
+u0020 V -70
+u0020 A -37
 v . -37
 v o -15
 v e -15
diff --git a/font/devps/TI b/font/devps/TI
index 471d88d2..c5dc3af0 100644
--- a/font/devps/TI
+++ b/font/devps/TI
@@ -174,6 +174,8 @@ oq oq -111
 cq v -10
 ' t -30
 cq t -30
+' u0020 -111
+cq u0020 -111
 ' s -40
 cq s -40
 ' r -25
@@ -196,6 +198,11 @@ r d -37
 r , -111
 r c -37
 r a -15
+u0020 Y -75
+u0020 W -40
+u0020 V -35
+u0020 T -18
+u0020 A -18
 v . -74
 v , -74
 w . -74
diff --git a/font/devps/TR b/font/devps/TR
index ecea19c7..5096c945 100644
--- a/font/devps/TR
+++ b/font/devps/TR
@@ -165,6 +165,8 @@ oq A -80
 cq v -50
 ' t -18
 cq t -18
+' u0020 -74
+cq u0020 -74
 ' s -55
 cq s -55
 ' r -50
@@ -182,6 +184,11 @@ r - -20
 r hy -20
 r g -18
 r , -40
+u0020 Y -90
+u0020 W -30
+u0020 V -50
+u0020 T -18
+u0020 A -55
 v . -65
 v o -20
 v e -15
diff --git a/font/devps/generate/Makefile b/font/devps/generate/Makefile
index 223ce2fe..781dac06 100644
--- a/font/devps/generate/Makefile
+++ b/font/devps/generate/Makefile
@@ -188,7 +188,8 @@ ZD:
 	`$(AFMNAME) $(afmdir)/ZapfDingbats.afm` $(srcdir)/dingbats.map $@
 
 SS: $(srcdir)/symbolsl.afm
-	$(AFMTODIT) -s $(IFLAG) $(srcdir)/symbolsl.afm $(srcdir)/lgreekmap $@
+	$(AFMTODIT) -s -x $(IFLAG) \
+	$(srcdir)/symbolsl.afm $(srcdir)/lgreekmap $@
 
 S: symbol.afm
 	$(AFMTODIT) -s $(RFLAG) symbol.afm symbolmap $@
diff --git a/font/devps/generate/textmap b/font/devps/generate/textmap
index 79f78450..485705c3 100644
--- a/font/devps/generate/textmap
+++ b/font/devps/generate/textmap
@@ -210,6 +210,8 @@ ij ij
 infinity if
 integral is
 integral integral
+# the next line overrides the (old) PUA value of the AGL
+integralex u23AE
 intersection ca
 less <
 lessequal <=
diff --git a/font/devps/symbolmap b/font/devps/symbolmap
index f14acd24..ac2b5bf2 100644
--- a/font/devps/symbolmap
+++ b/font/devps/symbolmap
@@ -213,6 +213,8 @@ ij ij
 infinity if
 integral is
 integral integral
+# the next line overrides the (old) PUA value of the AGL
+integralex u23AE
 intersection ca
 less <
 lessequal <=
diff --git a/font/devutf8/R.proto b/font/devutf8/R.proto
index a8e6afc1..3a65b1b9 100644
--- a/font/devutf8/R.proto
+++ b/font/devutf8/R.proto
@@ -535,6 +535,7 @@ rk	24	0	0x23AC
 bracerightmid	"
 rb	24	0	0x23AD
 bracerightbt	"
+u23AE	24	0	0x23AE
 an	24	0	0x23AF
 br	24	0	0x2502
 sq	24	0	0x25A1
diff --git a/src/utils/afmtodit/afmtodit.man b/src/utils/afmtodit/afmtodit.man
index df2eb072..0c79a614 100644
--- a/src/utils/afmtodit/afmtodit.man
+++ b/src/utils/afmtodit/afmtodit.man
@@ -21,13 +21,13 @@ the original English.
 .\" Like TP, but if specified indent is more than half
 .\" the current line-length - indent, use the default indent.
 .de Tp
-.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.el .TP "\\$1"
+.  ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
+.  el .TP "\\$1"
 ..
 .
 .de OP
-.ie \\n(.$-1 .RI "[\ \fB\\$1\fP\ " "\\$2" "\ ]"
-.el .RB "[\ " "\\$1" "\ ]"
+.  ie \\n(.$-1 .RI "[\ \fB\\$1\fP\ " "\\$2" "\ ]"
+.  el .RB "[\ " "\\$1" "\ ]"
 ..
 .
 .
@@ -45,7 +45,7 @@ afmtodit \- create font files for use with groff \-Tps
 .in +\w'\fBafmtodit 'u
 .ti \niu
 .B afmtodit
-.OP \-mnsv
+.OP \-mnsvx
 .OP \-a n
 .OP \-d desc_file
 .OP \-e enc_file
@@ -110,7 +110,7 @@ If a PostScript character is not named as
 are four uppercase hexadecimal digits), and is not mentioned in
 .IR map_file ,
 and a generic groff glyph name can't be deduced using the
-Adobe Glyph List (built into
+Adobe Glyph List (AGL, built into
 .BR  afmtodit ),
 then
 .B afmtodit
@@ -295,6 +295,10 @@ command to the font file.
 .B \-v
 Print version.
 .
+.TP
+.B \-x
+Don't use the built-in Adobe Glyph List.
+.
 .
 .SH FILES
 .Tp \w'\fB@FONTDIR@/devps/download'u+2n
diff --git a/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl
index 0a4d7070..3d35049c 100644
--- a/src/utils/afmtodit/afmtodit.pl
+++ b/src/utils/afmtodit/afmtodit.pl
@@ -6046,7 +6046,7 @@ $prog =~ s@.*/@@;
 $groff_sys_fontdir = "@FONTDIR@";
 
 do 'getopts.pl';
-do Getopts('a:d:e:i:mnsv');
+do Getopts('a:d:e:i:mnsvx');
 
 if ($opt_v) {
     print "GNU afmtodit (groff) version @VERSION@\n";
@@ -6054,7 +6054,7 @@ if ($opt_v) {
 }
 
 if ($#ARGV != 2) {
-    die "usage: $prog [-mnsv] [-a angle] [-d DESC] [-e encoding]\n" .
+    die "usage: $prog [-mnsvx] [-a angle] [-d DESC] [-e encoding]\n" .
 	"       [-i n] afmfile mapfile font\n";
 }
 
@@ -6225,22 +6225,24 @@ $italic_angle = $opt_a if $opt_a;
 
 # add unencoded characters and unmapped characters of the form `uniXXXX'
 
-$i = ($#encoding > 256) ? ($#encoding + 1) : 256;
-while ($ch = each %width) {
-    if (!$in_encoding{$ch}) {
-	$encoding[$i] = $ch;
-	$i++;
-    }
-    if (!$nmap{$ch}) {
-	$u1 = $AGL_to_unicode{$ch};
-	if (!$u1 && ($ch =~ /^uni([0-9A-F]{4})$/)) {
-	    $u1 = "u" . $1;
+if (!$opt_x) {
+    $i = ($#encoding > 256) ? ($#encoding + 1) : 256;
+    while ($ch = each %width) {
+	if (!$in_encoding{$ch}) {
+	    $encoding[$i] = $ch;
+	    $i++;
 	}
-	if ($u1) {
-	    $u2 = $unicode_decomposed{$u1};
-	    $u = $u2 ? $u2 : $u1;
-	    $nmap{$ch} += 1;
-	    $map{$ch,"0"} = $u;
+	if (!$nmap{$ch}) {
+	    $u1 = $AGL_to_unicode{$ch};
+	    if (!$u1 && ($ch =~ /^uni([0-9A-F]{4})$/)) {
+		$u1 = "u" . $1;
+	    }
+	    if ($u1) {
+		$u2 = $unicode_decomposed{$u1};
+		$u = $u2 ? $u2 : $u1;
+		$nmap{$ch} += 1;
+		$map{$ch,"0"} = $u;
+	    }
 	}
     }
 }