Resolve conflicts after v1.16.1 import.

4 files changed, 28 insertions, 14 deletions

diff --git a/contrib/groff/tmac/eqnrc b/contrib/groff/tmac/eqnrc
index 2156c15..63bd037 100644
--- a/contrib/groff/tmac/eqnrc
+++ b/contrib/groff/tmac/eqnrc
@@ -52,13 +52,14 @@ ifdef ps|X|html ! set draw_lines 1 !
 
 ifdef ascii ! define n %1% !
 ifdef latin1 ! define n %1% !
+ifdef utf8 ! define n %1% !
+ifdef cp1047 ! define n %1% !
 ifdef koi8-r ! define n %1% !
 ifdef n !
 set nroff 1
 !
 
 undef X
-undef ps|X
+undef ps|X|html
 undef n
-undef html
 .EN
diff --git a/contrib/groff/tmac/tmac.tty b/contrib/groff/tmac/tmac.tty
index 2d21af2..a4eee79 100644
--- a/contrib/groff/tmac/tmac.tty
+++ b/contrib/groff/tmac/tmac.tty
@@ -5,11 +5,12 @@
 .\" Don't warn about non-existent fonts.
 .warn \n[.warn]-(\n[.warn]/131072%2*131072)
 .po 0
-.if !"\*[.T]"koi8-r" .if c\[char173] .shc \[char173]
+.if c\[shc] .shc \[shc]
 .de tty-char
 .if !c\\$1 .char \\$1 "\\$2
 ..
-.if c\(md .tr \(bu\(md
+.ie c\(pc .tr \(bu\(pc
+.el .if c\(md .tr \(bu\(md
 .tty-char \(bu \z+o
 .tty-char \(14 1/4
 .tty-char \(12 1/2
diff --git a/contrib/groff/tmac/tmac.tty-char b/contrib/groff/tmac/tmac.tty-char
index e2770f2..f9bb805 100644
--- a/contrib/groff/tmac/tmac.tty-char
+++ b/contrib/groff/tmac/tmac.tty-char
@@ -1,12 +1,14 @@
 .\" This file defines standard troff characters and some groff characters for
-.\" use with -Tascii and -Tlatin1.
+.\" use with -Tascii, -Tlatin1, -Tutf8, and -Tcp1047.
 .\"
 .\" These definitions are chosen so that, as far as possible, they:
-.\" - work with both -Tascii and -Tlatin1.
+.\" - work with all of -Tascii, -Tlatin1, -Tutf8, and -Tcp1047.
 .\" - work on devices that display only the last overstruck character
 .\"   as well as on devices that support overstriking
 .\" - represent the character's graphical shape (not its meaning)
 .\"
+.\" $FreeBSD$
+.\"
 .nr _C \n(.C
 .cp 0
 .de tty-char
@@ -85,7 +87,9 @@
 .tty-char \(OR v
 .tty-char \(uA \z=^
 .tty-char \(dA \z=v
-.if c\(md .tty-char \(a. \(md
+.if c\(md .tty-char \(pc \(md
+.if c\(pc .tty-char \(md \(pc
+.if c\(pc .tty-char \(a. \(pc
 .tty-char \(Im I
 .tty-char \(Re R
 .tty-char \(/L \z/L
@@ -128,6 +132,7 @@
 .tty-char \(S3 3
 .tty-char \(ps 9|
 .tty-char \(md .
+.tty-char \(pc .
 .tty-char \(ac ,
 .tty-char \(S1 1
 .tty-char \(Om \z_o
@@ -195,4 +200,5 @@
 .\"tty-char \(:y \ij
 .tty-char \[arrowvertex] |
 .cp \n(_C
-.if "\*[.T]"ascii" .do mso tmac.latin1
+.if !'\*(.T'cp1047' \
+.	do mso tmac.latin1
diff --git a/contrib/groff/tmac/troffrc b/contrib/groff/tmac/troffrc
index 858d915..0b3bdd6 100644
--- a/contrib/groff/tmac/troffrc
+++ b/contrib/groff/tmac/troffrc
@@ -14,22 +14,28 @@
 .do ds troffrc!ascii tmac.tty
 .do ds troffrc!latin1 tmac.tty
 .do ds troffrc!koi8-r tmac.tty
+.do ds troffrc!utf8 tmac.tty
+.do ds troffrc!cp1047 tmac.tty
 .do ds troffrc!lj4 tmac.lj4
-.do ds troffrc!html tmac.html
+.do ds troffrc!lbp tmac.lbp
+.do ds troffrc!html tmac.arkup
 .do if d troffrc!\*[.T] \
 .	do mso \*[troffrc!\*[.T]]
 .do rm troffrc!ps troffrc!Xps troffrc!dvi troffrc!X75 troffrc!X75-12 \
-troffrc!X100 troffrc!X100-12 troffrc!lj4 troffrc!html
+troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp troffrc!html
+.ie '\*(.T'cp1047' .do tr \[char65]
+.el \{\
 .ie "\*[.T]"koi8-r" .do tr \[char154]
 .el .do tr \[char160]
-.\" Set the hyphenation language to `us' unless we're using koi8-r (russian)
-.\" Load hyphenation patterns from `hyphen.us' (in the tmac directory).
+.\}
 .ie "\*[.T]"koi8-r" \{\
 .do hla us-ru
 .do hpf locale/hyphen.us-ru
-.   \}
+.\}
 .el \{\
+.\" Set the hyphenation language to `us'.
 .do hla us
+.\" Load hyphenation patterns from `hyphen.us' (in the tmac directory).
 .do hpf hyphen.us
-.   \}
+.\}
 .\" Don't let blank lines creep in here.