Unbreak Russian KOI8-R support.

8 files changed, 324 insertions, 172 deletions

diff --git a/contrib/groff/src/devices/grotty/grotty.man b/contrib/groff/src/devices/grotty/grotty.man
index b510240..7e59569 100644
--- a/contrib/groff/src/devices/grotty/grotty.man
+++ b/contrib/groff/src/devices/grotty/grotty.man
@@ -51,8 +51,8 @@ should be invoked by using the
 command
 with a
 .BR \-Tascii ,
-.BR \-Tkoi8-r ,
-.B \-Tlatin1
+.BR \-Tlatin1 ,
+.B \-Tkoi8-r
 or
 .B \-Tutf8
 option on ASCII based systems, and with
@@ -237,8 +237,8 @@ to the search path for font and device description files;
 .I name
 is the name of the device, usually
 .BR ascii ,
-.BR koi8-r ,
 .BR latin1 ,
+.BR koi8-r ,
 .BR utf8 ,
 or
 .BR cp1047 .
diff --git a/contrib/groff/tmac/eqnrc b/contrib/groff/tmac/eqnrc
index 7c10296..e23db46 100644
--- a/contrib/groff/tmac/eqnrc
+++ b/contrib/groff/tmac/eqnrc
@@ -52,9 +52,9 @@ ifdef ps|X|html ! set draw_lines 1 !
 
 ifdef ascii ! define n %1% !
 ifdef latin1 ! define n %1% !
+ifdef koi8-r ! define n %1% !
 ifdef utf8 ! define n %1% !
 ifdef cp1047 ! define n %1% !
-ifdef koi8-r ! define n %1% !
 ifdef n !
 set nroff 1
 !
diff --git a/contrib/groff/tmac/troffrc b/contrib/groff/tmac/troffrc
index fb7c6c4..231a66c 100644
--- a/contrib/groff/tmac/troffrc
+++ b/contrib/groff/tmac/troffrc
@@ -28,7 +28,10 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp troffrc!html
 .
 .\" test whether we work under EBCDIC
 .do ie '\[char97]'a' \
-.	if !"\*[.T]"koi8-r" .do tr \[char160]\~
+.	ie '\*[.T]'koi8-r' \
+.		do tr \[char154]\~
+.	el \
+.		do tr \[char160]\~
 .el \
 .	do tr \[char65]\~
 .
@@ -38,13 +41,8 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp troffrc!html
 .\" Load hyphenation patterns and exceptions.
 .do hpf hyphen.us
 .do hpfa hyphenex.us
-.
-.if "\*[.T]"koi8-r" \{\
-.
-.\" Append hyphenation patterns from `hyphen.ru' (in the tmac directory).
-.do hpfa hyphen.ru
-.
-.\}
+.if '\*[.T]'koi8-r' \
+.	do hpfa hyphen.ru
 .
 .\" Load composite mappings.
 .do mso composite.tmac
diff --git a/contrib/groff/tmac/tty-char.tmac b/contrib/groff/tmac/tty-char.tmac
index c5483ac..b7cf2e3 100644
--- a/contrib/groff/tmac/tty-char.tmac
+++ b/contrib/groff/tmac/tty-char.tmac
@@ -227,5 +227,7 @@
 .
 .ie '\*(.T'cp1047' \
 .	do mso cp1047.tmac
+.el .ie '\*(.T'koi8-r' \
+.	do mso koi8-r.tmac
 .el \
 .	do mso latin1.tmac
diff --git a/contrib/groff/tmac/tty.tmac b/contrib/groff/tmac/tty.tmac
index 4b337fd..34fa11d 100644
--- a/contrib/groff/tmac/tty.tmac
+++ b/contrib/groff/tmac/tty.tmac
@@ -79,9 +79,10 @@
 .
 .ie '\*(.T'cp1047' \
 .  do mso cp1047.tmac
-.el \
-.  if !'\*(.T'ascii' \
-.    do mso latin1.tmac
+.el .ie '\*(.T'koi8-r' \
+.  do mso koi8-r.tmac
+.el .if !'\*(.T'ascii' \
+.  do mso latin1.tmac
 .
 .\" If you want the character definitions in tty-char.tmac to be loaded
 .\" automatically, remove the `\"' from the next line.
diff --git a/gnu/usr.bin/groff/font/devkoi8-r/R.proto b/gnu/usr.bin/groff/font/devkoi8-r/R.proto
index 9a26116..8c16013 100644
--- a/gnu/usr.bin/groff/font/devkoi8-r/R.proto
+++ b/gnu/usr.bin/groff/font/devkoi8-r/R.proto
@@ -3,6 +3,38 @@ name R
 internalname 0
 spacewidth 24
 charset
+---	24	0	0000
+---	24	0	0001
+---	24	0	0002
+---	24	0	0003
+---	24	0	0004
+---	24	0	0005
+---	24	0	0006
+---	24	0	0007
+---	24	0	0010
+---	24	0	0011
+---	24	0	0012
+---	24	0	0013
+---	24	0	0014
+---	24	0	0015
+---	24	0	0016
+---	24	0	0017
+---	24	0	0020
+---	24	0	0021
+---	24	0	0022
+---	24	0	0023
+---	24	0	0024
+---	24	0	0025
+---	24	0	0026
+---	24	0	0027
+---	24	0	0030
+---	24	0	0031
+---	24	0	0032
+---	24	0	0033
+---	24	0	0034
+---	24	0	0035
+---	24	0	0036
+---	24	0	0037
 !	24	0	0041
 "	24	0	0042
 dq	"
@@ -123,7 +155,6 @@ f	24	0	0146
 g	24	0	0147
 h	24	0	0150
 i	24	0	0151
-.i	"
 j	24	0	0152
 k	24	0	0153
 l	24	0	0154
@@ -141,6 +172,7 @@ v	24	0	0166
 w	24	0	0167
 x	24	0	0170
 mu	"
+tmu	"
 y	24	0	0171
 z	24	0	0172
 lC	24	0	0173
@@ -150,165 +182,151 @@ or	"
 bv	"
 br	"
 |	"
-lb	"
-lc	"
-lf	"
-lk	"
-lt	"
-rb	"
-rc	"
-rf	"
-rk	"
-rt	"
 rC	24	0	0175
 }	"
 a~	24	0	0176
 ~	"
 ap	"
 ti	"
-char128	24	0	0200
-char129	24	0	0201
-char130	24	0	0202
-char131	24	0	0203
-char132	24	0	0204
-char133	24	0	0205
-char134	24	0	0206
-char135	24	0	0207
-char136	24	0	0210
-char137	24	0	0211
-char138	24	0	0212
-char139	24	0	0213
-char140	24	0	0214
-char141	24	0	0215
-char142	24	0	0216
-char143	24	0	0217
-char144	24	0	0220
-char145	24	0	0221
-char146	24	0	0222
-char147	24	0	0223
-char148	24	0	0224
-bu	24	0	0225
-char149	"
-sr	24	0	0226
-char150	"
-~~	24	0	0227
+---	24	0	0177
+u2500	24	0	0200
+u2502	24	0	0201
+br	"
+u250C	24	0	0202
+u2510	24	0	0203
+u2514	24	0	0204
+u2518	24	0	0205
+u251C	24	0	0206
+u2524	24	0	0207
+u252C	24	0	0210
+u2534	24	0	0211
+u253C	24	0	0212
+u2580	24	0	0213
+u2584	24	0	0214
+u2588	24	0	0215
+u258C	24	0	0216
+u2590	24	0	0217
+u2591	24	0	0220
+u2592	24	0	0221
+u2593	24	0	0222
+u2320	24	0	0223
+u25A0	24	0	0224
+u2219	24	0	0225
+u221A	24	0	0226
+sr	"
+sqrt	"
+u2248	24	0	0227
+~~	"
 ~=	"
-char151	"
-<=	24	0	0230
-char152	"
->=	24	0	0231
-char153	"
-char154	24	0	0232
-char155	24	0	0233
-de	24	0	0234
-char156	"
-S2	24	0	0235
-char157	"
-pc	24	0	0236
-char158	"
-di	24	0	0237
-char159	"
-char160	24	0	0240
-char161	24	0	0241
-char162	24	0	0242
-:e	24	0	0243
-char163	"
-char164	24	0	0244
-char165	24	0	0245
-char166	24	0	0246
-char167	24	0	0247
-char168	24	0	0250
-char169	24	0	0251
-char170	24	0	0252
-char171	24	0	0253
-char172	24	0	0254
-char173	24	0	0255
-char174	24	0	0256
-char175	24	0	0257
-char176	24	0	0260
-char177	24	0	0261
-char178	24	0	0262
-:E	24	0	0263
-char179	"
-char180	24	0	0264
-char181	24	0	0265
-char182	24	0	0266
-char183	24	0	0267
-char184	24	0	0270
-char185	24	0	0271
-char186	24	0	0272
-char187	24	0	0273
-char188	24	0	0274
-char189	24	0	0275
-char190	24	0	0276
-co	24	0	0277
-char191	"
-char192	24	0	0300
-char193	24	0	0301
-char194	24	0	0302
-char195	24	0	0303
-char196	24	0	0304
-char197	24	0	0305
-*f	24	0	0306
-char198	"
-char199	24	0	0307
-char200	24	0	0310
-char201	24	0	0311
-char202	24	0	0312
-char203	24	0	0313
-char204	24	0	0314
-char205	24	0	0315
-char206	24	0	0316
-char207	24	0	0317
-*p	24	0	0320
-char208	"
-char209	24	0	0321
-char210	24	0	0322
-char211	24	0	0323
-char212	24	0	0324
-char213	24	0	0325
-char214	24	0	0326
-char215	24	0	0327
-char216	24	0	0330
-char217	24	0	0331
-char218	24	0	0332
-char219	24	0	0333
-char220	24	0	0334
-char221	24	0	0335
-char222	24	0	0336
-char223	24	0	0337
-char224	24	0	0340
-char225	24	0	0341
-char226	24	0	0342
-char227	24	0	0343
-char228	24	0	0344
-char229	24	0	0345
-*F	24	0	0346
-char230	"
-*G	24	0	0347
-char231	"
-char232	24	0	0350
-char233	24	0	0351
-char234	24	0	0352
-char235	24	0	0353
-char236	24	0	0354
-char237	24	0	0355
-char238	24	0	0356
-char239	24	0	0357
-*P	24	0	0360
-char240	"
-char241	24	0	0361
-char242	24	0	0362
-char243	24	0	0363
-char244	24	0	0364
-char245	24	0	0365
-char246	24	0	0366
-char247	24	0	0367
-char248	24	0	0370
-char249	24	0	0371
-char250	24	0	0372
-char251	24	0	0373
-char252	24	0	0374
-char253	24	0	0375
-char254	24	0	0376
-char255	24	0	0377
+u2264	24	0	0230
+<=	"
+u2265	24	0	0231
+>=	"
+u00A0	24	0	0232
+u2321	24	0	0233
+u00B0	24	0	0234
+de	"
+u00B2	24	0	0235
+S2	"
+u00B7	24	0	0236
+pc	"
+u00F7	24	0	0237
+di	"
+tdi	"
+u2550	24	0	0240
+u2551	24	0	0241
+u2552	24	0	0242
+u0435_0308	24	0	0243
+u2553	24	0	0244
+u2554	24	0	0245
+u2555	24	0	0246
+u2556	24	0	0247
+u2557	24	0	0250
+u2558	24	0	0251
+u2559	24	0	0252
+u255A	24	0	0253
+u255B	24	0	0254
+u255C	24	0	0255
+u255D	24	0	0256
+u255E	24	0	0257
+u255F	24	0	0260
+u2560	24	0	0261
+u2561	24	0	0262
+u0415_0308	24	0	0263
+u2562	24	0	0264
+u2563	24	0	0265
+u2564	24	0	0266
+u2565	24	0	0267
+u2566	24	0	0270
+u2567	24	0	0271
+u2568	24	0	0272
+u2569	24	0	0273
+u256A	24	0	0274
+u256B	24	0	0275
+u256C	24	0	0276
+u00A9	24	0	0277
+co	"
+u044E	24	0	0300
+u0430	24	0	0301
+u0431	24	0	0302
+u0446	24	0	0303
+u0434	24	0	0304
+u0435	24	0	0305
+u0444	24	0	0306
+u0433	24	0	0307
+u0445	24	0	0310
+u0438	24	0	0311
+u0438_0306	24	0	0312
+u043A	24	0	0313
+u043B	24	0	0314
+u043C	24	0	0315
+u043D	24	0	0316
+u043E	24	0	0317
+u043F	24	0	0320
+u044F	24	0	0321
+u0440	24	0	0322
+u0441	24	0	0323
+u0442	24	0	0324
+u0443	24	0	0325
+u0436	24	0	0326
+u0432	24	0	0327
+u044C	24	0	0330
+u044B	24	0	0331
+u0437	24	0	0332
+u0448	24	0	0333
+u044D	24	0	0334
+u0449	24	0	0335
+u0447	24	0	0336
+u044A	24	0	0337
+u042E	24	0	0340
+u0410	24	0	0341
+u0411	24	0	0342
+u0426	24	0	0343
+u0414	24	0	0344
+u0415	24	0	0345
+u0424	24	0	0346
+u0413	24	0	0347
+u0425	24	0	0350
+u0418	24	0	0351
+u0418_0306	24	0	0352
+u041A	24	0	0353
+u041B	24	0	0354
+u041C	24	0	0355
+u041D	24	0	0356
+u041E	24	0	0357
+u041F	24	0	0360
+u042F	24	0	0361
+u0420	24	0	0362
+u0421	24	0	0363
+u0422	24	0	0364
+u0423	24	0	0365
+u0416	24	0	0366
+u0412	24	0	0367
+u042C	24	0	0370
+u042B	24	0	0371
+u0417	24	0	0372
+u0428	24	0	0373
+u042D	24	0	0374
+u0429	24	0	0375
+u0427	24	0	0376
+u042A	24	0	0377
diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile
index 6591a85..43ef6fe 100644
--- a/gnu/usr.bin/groff/tmac/Makefile
+++ b/gnu/usr.bin/groff/tmac/Makefile
@@ -63,7 +63,7 @@ beforeinstall:
 	    ${NORMALFILES} ${DESTDIR}${TMACDIR}
 	cd ${.CURDIR}; \
 	    ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
-	    hyphen.ru ${DESTDIR}${TMACDIR}
+	    koi8-r.tmac hyphen.ru ${DESTDIR}${TMACDIR}
 	cd ${.OBJDIR}
 .for f in ${STRIPFILES} ${SPECIALFILES}
 	${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
diff --git a/gnu/usr.bin/groff/tmac/koi8-r.tmac b/gnu/usr.bin/groff/tmac/koi8-r.tmac
new file mode 100644
index 0000000..068f716
--- /dev/null
+++ b/gnu/usr.bin/groff/tmac/koi8-r.tmac
@@ -0,0 +1,133 @@
+.\" $FreeBSD$
+.\"
+.nr _C \n(.C
+.cp 0
+.trin \[char128]\[u2500]
+.trin \[char129]\[u2502]
+.trin \[char130]\[u250C]
+.trin \[char131]\[u2510]
+.trin \[char132]\[u2514]
+.trin \[char133]\[u2518]
+.trin \[char134]\[u251C]
+.trin \[char135]\[u2524]
+.trin \[char136]\[u252C]
+.trin \[char137]\[u2534]
+.trin \[char138]\[u253C]
+.trin \[char139]\[u2580]
+.trin \[char140]\[u2584]
+.trin \[char141]\[u2588]
+.trin \[char142]\[u258C]
+.trin \[char143]\[u2590]
+.trin \[char144]\[u2591]
+.trin \[char145]\[u2592]
+.trin \[char146]\[u2593]
+.trin \[char147]\[u2320]
+.trin \[char148]\[u25A0]
+.trin \[char149]\[u2219]
+.trin \[char150]\[u221A]
+.trin \[char151]\[u2248]
+.trin \[char152]\[u2264]
+.trin \[char153]\[u2265]
+.trin \[char154]\[u00A0]
+.trin \[char155]\[u2321]
+.trin \[char156]\[u00B0]
+.trin \[char157]\[u00B2]
+.trin \[char158]\[u00B7]
+.trin \[char159]\[u00F7]
+.trin \[char160]\[u2550]
+.trin \[char161]\[u2551]
+.trin \[char162]\[u2552]
+.trin \[char163]\[u0451]
+.trin \[char164]\[u2553]
+.trin \[char165]\[u2554]
+.trin \[char166]\[u2555]
+.trin \[char167]\[u2556]
+.trin \[char168]\[u2557]
+.trin \[char169]\[u2558]
+.trin \[char170]\[u2559]
+.trin \[char171]\[u255A]
+.trin \[char172]\[u255B]
+.trin \[char173]\[u255C]
+.trin \[char174]\[u255D]
+.trin \[char175]\[u255E]
+.trin \[char176]\[u255F]
+.trin \[char177]\[u2560]
+.trin \[char178]\[u2561]
+.trin \[char179]\[u0401]
+.trin \[char180]\[u2562]
+.trin \[char181]\[u2563]
+.trin \[char182]\[u2564]
+.trin \[char183]\[u2565]
+.trin \[char184]\[u2566]
+.trin \[char185]\[u2567]
+.trin \[char186]\[u2568]
+.trin \[char187]\[u2569]
+.trin \[char188]\[u256A]
+.trin \[char189]\[u256B]
+.trin \[char190]\[u256C]
+.trin \[char191]\[u00A9]
+.trin \[char192]\[u044E]
+.trin \[char193]\[u0430]
+.trin \[char194]\[u0431]
+.trin \[char195]\[u0446]
+.trin \[char196]\[u0434]
+.trin \[char197]\[u0435]
+.trin \[char198]\[u0444]
+.trin \[char199]\[u0433]
+.trin \[char200]\[u0445]
+.trin \[char201]\[u0438]
+.trin \[char202]\[u0439]
+.trin \[char203]\[u043A]
+.trin \[char204]\[u043B]
+.trin \[char205]\[u043C]
+.trin \[char206]\[u043D]
+.trin \[char207]\[u043E]
+.trin \[char208]\[u043F]
+.trin \[char209]\[u044F]
+.trin \[char210]\[u0440]
+.trin \[char211]\[u0441]
+.trin \[char212]\[u0442]
+.trin \[char213]\[u0443]
+.trin \[char214]\[u0436]
+.trin \[char215]\[u0432]
+.trin \[char216]\[u044C]
+.trin \[char217]\[u044B]
+.trin \[char218]\[u0437]
+.trin \[char219]\[u0448]
+.trin \[char220]\[u044D]
+.trin \[char221]\[u0449]
+.trin \[char222]\[u0447]
+.trin \[char223]\[u044A]
+.trin \[char224]\[u042E]
+.trin \[char225]\[u0410]
+.trin \[char226]\[u0411]
+.trin \[char227]\[u0426]
+.trin \[char228]\[u0414]
+.trin \[char229]\[u0415]
+.trin \[char230]\[u0424]
+.trin \[char231]\[u0413]
+.trin \[char232]\[u0425]
+.trin \[char233]\[u0418]
+.trin \[char234]\[u0419]
+.trin \[char235]\[u041A]
+.trin \[char236]\[u041B]
+.trin \[char237]\[u041C]
+.trin \[char238]\[u041D]
+.trin \[char239]\[u041E]
+.trin \[char240]\[u041F]
+.trin \[char241]\[u042F]
+.trin \[char242]\[u0420]
+.trin \[char243]\[u0421]
+.trin \[char244]\[u0422]
+.trin \[char245]\[u0423]
+.trin \[char246]\[u0416]
+.trin \[char247]\[u0412]
+.trin \[char248]\[u042C]
+.trin \[char249]\[u042B]
+.trin \[char250]\[u0417]
+.trin \[char251]\[u0428]
+.trin \[char252]\[u042D]
+.trin \[char253]\[u0429]
+.trin \[char254]\[u0427]
+.trin \[char255]\[u042A]
+.cp \n[_C]