Unbreak Russian KOI8-R support.

5 files changed, 16 insertions, 15 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.