* font/devascii/R.proto, font/devcp1047/R.proto,

font/devlatin1/R.proto: Remove entry for `.i'.
* font/devdvi/generate/textt.map: Add entry for `ad'.
* font/devdvi/generate/texr.map, font/devdvi/generate/texb.map,
font/devdvi/generate/texi.map: Add dummy glyph name `slash@for@l'.
We need this for getting kerning values to compose `/l' and `/L'.
* font/devdvi: Regenerated font definition files for CM fonts.
* font/devhtml/R.proto: Add entries for "'C", "'c", `IJ', and `ij'.
* font/devutf8/R.proto: Ditto.
Remove double entry for `ti'.

* src/roff/troff/glyphuni.cc (glyph_to_unicode_list): Fix entries
for (groff) ligatures, `la', and `ra'.
Add "'C", "'c", `IJ', and `ij'.
Remove double entry for `ti'.
* src/roff/troff/uniglyph.cc (unicode_to_glyph_list): Remove all
double entries.
Add "'C", "'c", `IJ', and `ij'.
Fix entries for (groff) ligatures, `la', and `ra'.

* tmac/ps.tmac (ps-achar): New macro.
Define "'c" and "'C".
* tmac/tty.tmac: Add entry for `.i'.
* tmac/X.tmac (X-achar): New macro.
Define "'c", "'C", and `:Y'.
Add entries for `IJ' and `ij'.
* tmac/Xps.tmac (Xps-achar): New macro.
Define "'c" and "'C".
Add entries for `IJ' and `ij'.
* tmac/lbp.tmac (lbp-achar): New macro.
Add fallback characters for all groff ligatures and many other
glyphs.
* tmac/dvi.tmac: Fix definitions of `_' and `ul'.
Add entries for `/l' and `/L'.
Define "'c" and "'C".
Add entries for `IJ' and `ij'.

14 files changed, 44 insertions, 24 deletions

diff --git a/font/devdvi/CW b/font/devdvi/CW
index 8a01912d..2cb32688 100644
--- a/font/devdvi/CW
+++ b/font/devdvi/CW
@@ -149,4 +149,4 @@ ba	"
 rC	"
 ~	550498,640797	2	0176
 a~	"
----	550498,640797	2	0177
+ad	550498,640797	2	0177
diff --git a/font/devdvi/CWI b/font/devdvi/CWI
index d2417543..13ded182 100644
--- a/font/devdvi/CWI
+++ b/font/devdvi/CWI
@@ -149,4 +149,4 @@ ba	"
 rC	"
 ~	550498,640797,0,182045	2	0176
 a~	"
----	550498,640797,0,182045	2	0177
+ad	550498,640797,0,182045	2	0177
diff --git a/font/devdvi/HB b/font/devdvi/HB
index bd915844..7d9847b8 100644
--- a/font/devdvi/HB
+++ b/font/devdvi/HB
@@ -12,6 +12,8 @@ ff ! 80101
 ff ) 80101
 ff rB 80101
 ff ] 80101
+slash@for@l l -267971
+slash@for@l L -307293
 cq ? 128160
 ' ? 128160
 cq ! 128160
@@ -185,7 +187,7 @@ oe	897120,480597	0	0033
 AE	993240,728178	2	0035
 OE	1121400,728178	2	0036
 /O	897120,779150,50973	3	0037
----	267971,480597	0	0040
+slash@for@l	267971,480597	0	0040
 !	384480,728178	2	0041
 rq	585458,728178	2	0042
 sh	961200,728178,203888	3	0043
diff --git a/font/devdvi/HBI b/font/devdvi/HBI
index 4e9efd08..f410707e 100644
--- a/font/devdvi/HBI
+++ b/font/devdvi/HBI
@@ -13,6 +13,8 @@ ff ! 80101
 ff ) 80101
 ff rB 80101
 ff ] 80101
+slash@for@l l -267971
+slash@for@l L -307293
 cq ? 128160
 ' ? 128160
 cq ! 128160
@@ -186,7 +188,7 @@ oe	897120,480597,0,78936	0	0033
 AE	993240,728178,0,122738	2	0035
 OE	1121400,728178,0,122738	2	0036
 /O	897120,779150,50973,76304	3	0037
----	267971,480597	0	0040
+slash@for@l	267971,480597	0	0040
 !	384480,728178,0,63027	2	0041
 rq	585458,728178,0,28947	2	0042
 sh	961200,728178,203888,58506	3	0043
diff --git a/font/devdvi/HI b/font/devdvi/HI
index f98081e5..4034e21b 100644
--- a/font/devdvi/HI
+++ b/font/devdvi/HI
@@ -13,6 +13,8 @@ ff ! 72818
 ff ) 72818
 ff rB 72818
 ff ] 72818
+slash@for@l l -250494
+slash@for@l L -270885
 cq ? 116509
 ' ? 116509
 cq ! 116509
@@ -186,7 +188,7 @@ oe	815562,466034,0,71070	0	0033
 AE	902944,728178,0,125650	2	0035
 OE	1019453,728178,0,125650	2	0036
 /O	815562,779150,50973,79216	3	0037
----	250494,466034	0	0040
+slash@for@l	250494,466034	0	0040
 !	334963,728178,0,60114	2	0041
 rq	524290,728178,0,3315	2	0042
 sh	873816,728178,203888,53338	3	0043
diff --git a/font/devdvi/HR b/font/devdvi/HR
index 93b8a2d4..d9d660b5 100644
--- a/font/devdvi/HR
+++ b/font/devdvi/HR
@@ -12,6 +12,8 @@ ff ! 72818
 ff ) 72818
 ff rB 72818
 ff ] 72818
+slash@for@l l -250494
+slash@for@l L -270885
 cq ? 116509
 ' ? 116509
 cq ! 116509
@@ -185,7 +187,7 @@ oe	815562,466034	0	0033
 AE	902944,728178	2	0035
 OE	1019453,728178	2	0036
 /O	815562,779150,50973	3	0037
----	250494,466034	0	0040
+slash@for@l	250494,466034	0	0040
 !	334963,728178	2	0041
 rq	524290,728178	2	0042
 sh	873816,728178,203888	3	0043
diff --git a/font/devdvi/TB b/font/devdvi/TB
index 92b231a6..581840af 100644
--- a/font/devdvi/TB
+++ b/font/devdvi/TB
@@ -1,5 +1,5 @@
 #
-# manually added kernings for `` and ''
+# manually added kerning for `` and ''
 #
 name TB
 internalname cmbx10
@@ -8,8 +8,8 @@ ligatures ff fi fl ffi ffl 0
 checksum 452076118
 designsize 10485760
 kernpairs
-ff ' 114323
 ff cq 114323
+ff ' 114323
 ff ? 114323
 ff ! 114323
 ff ) 114323
@@ -19,10 +19,12 @@ ff ] 114323
 ' cq -100488
 cq ' -100488
 cq cq -100488
-' ? 133984
+slash@for@l l -334960
+slash@for@l L -396128
 cq ? 133984
-' ! 133984
+' ? 133984
 cq ! 133984
+' ! 133984
 A t -33496
 A C -33496
 A O -33496
@@ -135,8 +137,8 @@ b y -33496
 b w -33496
 c h -33496
 c k -33496
-f ' 114323
 f cq 114323
+f ' 114323
 f ? 114323
 f ! 114323
 f ) 114323
@@ -236,7 +238,7 @@ oe	937888,466034	0	0033
 AE	1092261,719440	2	0035
 OE	1226245,719440	2	0036
 /O	937888,770413,50973	3	0037
----	334960,466034	0	0040
+slash@for@l	334960,466034	0	0040
 !	367000,728178	2	0041
 rq	632056,728178	2	0042
 sh	1004880,728178,203888	3	0043
diff --git a/font/devdvi/TBI b/font/devdvi/TBI
index 7020689e..5c34bc2d 100644
--- a/font/devdvi/TBI
+++ b/font/devdvi/TBI
@@ -1,5 +1,5 @@
 #
-# manually added kernings for `` and ''
+# manually added kerning for `` and ''
 #
 name TBI
 internalname cmbxti10
@@ -20,10 +20,12 @@ ff ] 111848
 cq ' -92624
 ' cq -92624
 cq cq -92624
-' ? 123498
+slash@for@l l -311075
+slash@for@l L -402826
 cq ? 123498
-' ! 123498
+' ? 123498
 cq ! 123498
+' ! 123498
 A n -30875
 A l -30875
 A r -30875
@@ -185,8 +187,8 @@ Fn ] 111848
 f rB 111848
 f ] 111848
 l l 61749
-n ' -123498
 n cq -123498
+n ' -123498
 o e -61749
 o a -61749
 o o -61749
@@ -242,7 +244,7 @@ oe	866814,466034,0,89131	0	0033
 AE	1072450,719440,0,119859	2	0035
 OE	1195947,719440,0,119859	2	0036
 /O	928563,770413,50973,95027	3	0037
----	311075,466034	0	0040
+slash@for@l	311075,466034	0	0040
 !	404864,728178,0,119714	2	0041
 rq	650696,728178,0,83248	2	0042
 sh	990312,728178,203888,71653	3	0043
diff --git a/font/devdvi/TI b/font/devdvi/TI
index f0739372..31a0edcc 100644
--- a/font/devdvi/TI
+++ b/font/devdvi/TI
@@ -1,5 +1,5 @@
 #
-# manually added kernings for `` and ''
+# manually added kerning for `` and ''
 #
 name TI
 special
@@ -21,6 +21,8 @@ ff ] 109373
 cq ' -80390
 ' cq -80390
 cq cq -80390
+slash@for@l l -267968
+slash@for@l L -336125
 cq ? 107187
 ' ? 107187
 cq ! 107187
@@ -243,7 +245,7 @@ oe	750310,451470,0,78789	0	0033
 AE	925654,716526,0,126120	2	0035
 OE	1032842,716526,0,126120	2	0036
 /O	803904,767499,50973,98595	3	0037
----	267968,451470	0	0040
+slash@for@l	267968,451470	0	0040
 !	321562,728178,0,130200	2	0041
 rq	539432,728178,0,72994	2	0042
 sh	857498,728178,203888,69378	3	0043
diff --git a/font/devdvi/TR b/font/devdvi/TR
index 4a42532d..64f457b9 100644
--- a/font/devdvi/TR
+++ b/font/devdvi/TR
@@ -1,5 +1,5 @@
 #
-# manually added kernings for `` and ''
+# manually added kerning for `` and ''
 #
 name TR
 special
@@ -20,10 +20,12 @@ ff ] 81557
 cq ' -87382
 ' cq -87382
 cq cq -87382
-' ? 116509
+slash@for@l l -291272
+slash@for@l L -334963
 cq ? 116509
-' ! 116509
+' ? 116509
 cq ! 116509
+' ! 116509
 *A t -29128
 A t -29128
 *A C -29128
@@ -203,8 +205,8 @@ b y -29128
 b w -29128
 c h -29128
 c k -29128
-f ' 81557
 f cq 81557
+f ' 81557
 f ? 81557
 f ! 81557
 f ) 81557
@@ -304,7 +306,7 @@ oe	815562,451470	0	0033
 AE	946634,716526	2	0035
 OE	1063142,716526	2	0036
 /O	815562,767499,50973	3	0037
----	291272,451470	0	0040
+slash@for@l	291272,451470	0	0040
 !	291272,728178	2	0041
 rq	524290,728178	2	0042
 sh	873816,728178,203888	3	0043
diff --git a/font/devdvi/generate/texb.map b/font/devdvi/generate/texb.map
index 6ea689f5..ddab640f 100644
--- a/font/devdvi/generate/texb.map
+++ b/font/devdvi/generate/texb.map
@@ -30,6 +30,7 @@
 29 AE
 30 OE
 31 /O
+32 slash@for@l
 33 !
 34 rq
 35 # sh
diff --git a/font/devdvi/generate/texi.map b/font/devdvi/generate/texi.map
index 82497eb8..4e3915d9 100644
--- a/font/devdvi/generate/texi.map
+++ b/font/devdvi/generate/texi.map
@@ -30,6 +30,7 @@
 29 AE
 30 OE
 31 /O
+32 slash@for@l
 33 !
 34 rq
 35 # sh
diff --git a/font/devdvi/generate/texr.map b/font/devdvi/generate/texr.map
index 73abe162..0eaf4230 100644
--- a/font/devdvi/generate/texr.map
+++ b/font/devdvi/generate/texr.map
@@ -30,6 +30,7 @@
 29 AE
 30 OE
 31 /O
+32 slash@for@l
 33 !
 34 rq
 35 # sh
diff --git a/font/devdvi/generate/textt.map b/font/devdvi/generate/textt.map
index c980496c..6d6031be 100644
--- a/font/devdvi/generate/textt.map
+++ b/font/devdvi/generate/textt.map
@@ -124,3 +124,4 @@
 124 ba |
 125 rC }
 126 a~ ~
+127 ad