Merge Groff 1.19.2 changes.

3 files changed, 15 insertions, 4 deletions

diff --git a/contrib/groff/tmac/troffrc b/contrib/groff/tmac/troffrc
index 231a66c..5defe8a 100644
--- a/contrib/groff/tmac/troffrc
+++ b/contrib/groff/tmac/troffrc
@@ -4,6 +4,9 @@
 .\" This is tested by pic.
 .nr 0p 0
 .
+.\" Load composite mappings.
+.do mso composite.tmac
+.
 .\" Use .do here, so that it works with -C.
 .\" The groff command defines the .X string if the -X option was given.
 .ie r.X .do ds troffrc!ps Xps.tmac
@@ -44,9 +47,6 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp troffrc!html
 .if '\*[.T]'koi8-r' \
 .	do hpfa hyphen.ru
 .
-.\" Load composite mappings.
-.do mso composite.tmac
-.
 .\" Handle paper formats
 .do mso papersize.tmac
 .
diff --git a/contrib/groff/tmac/tty-char.tmac b/contrib/groff/tmac/tty-char.tmac
index b7cf2e3..58f8fdb 100644
--- a/contrib/groff/tmac/tty-char.tmac
+++ b/contrib/groff/tmac/tty-char.tmac
@@ -1,4 +1,5 @@
 .\" tty-char.tmac
+.\" $FreeBSD$
 .\"
 .\" This file defines standard troff characters and some groff characters for
 .\" use with -Tascii, -Tlatin1, -Tutf8, and -Tcp1047.
@@ -141,7 +142,7 @@
 .tty-char \[rk] }
 .tty-char \[lt] ,-
 .tty-char \[rt] -.
-.\" Latin-1 characters
+.\" Latin characters
 .tty-char \[r!] \z,i
 .tty-char \[Po] \z-L
 .tty-char \[Cs] \zox
@@ -168,6 +169,7 @@
 .tty-char \[:A] \z"A
 .tty-char \[oA] \zoA
 .tty-char \[,C] \z,C
+.tty-char "\[S ,]" \z,S
 .tty-char \[`E] \z`E
 .tty-char \['E] \z'E
 .tty-char \[^E] \z^E
@@ -197,6 +199,7 @@
 .tty-char \[:a] \z"a
 .tty-char \[oa] \zoa
 .tty-char \[,c] \z,c
+.tty-char "\[s ,]" \z,s
 .tty-char \[`e] \z`e
 .tty-char \['e] \z'e
 .tty-char \[^e] \z^e
@@ -220,6 +223,10 @@
 .tty-char \['y] \z'y
 .tty-char \[Tp] \zpb
 .tty-char \[:y] \z"y
+.\" for Turkish
+.tty-char "\[G ab]" G
+.tty-char "\[g ab]" g
+.tty-char "\[I .]" I
 .\"tty-char \[:y] \ij
 .tty-char \[arrowvertex] |
 .tty-char \[mc] \z,u
diff --git a/contrib/groff/tmac/tty.tmac b/contrib/groff/tmac/tty.tmac
index 34fa11d..6e6a856 100644
--- a/contrib/groff/tmac/tty.tmac
+++ b/contrib/groff/tmac/tty.tmac
@@ -1,4 +1,5 @@
 .\" tty.tmac
+.\" $FreeBSD$
 .\"
 .nr _C \n(.C
 .cp 0
@@ -65,6 +66,9 @@
 .fchar \[.i] i
 .fchar \[bq] ,
 .
+.if '\*[.T]'utf8' \
+.  mso unicode.tmac
+.
 .\" color definitions
 .defcolor black rgb #000000
 .defcolor red rgb #ff0000