Merge Groff 1.19 changes.

2 files changed, 10 insertions, 3 deletions

diff --git a/contrib/groff/tmac/eqnrc b/contrib/groff/tmac/eqnrc
index 63bd037..7c10296 100644
--- a/contrib/groff/tmac/eqnrc
+++ b/contrib/groff/tmac/eqnrc
@@ -23,7 +23,7 @@ ifdef html ! define ps|X|html %1% !
 ifdef ps|X|html ! sdefine inf %"\s[\En[.s]*13u/10u]\v'12M'\(if\v'-12M'\s0"% !
 
 ifdef dvi !
-sdefine int %{type "operator" vcenter \(is}%
+sdefine int %{type "operator" vcenter \[integral]}%
 sdefine sum %{type "operator" vcenter \[sum]}%
 sdefine prod %{type "operator" vcenter \[product]}%
 sdefine coprod %{type "operator" vcenter \[coproduct]}%
diff --git a/contrib/groff/tmac/troffrc b/contrib/groff/tmac/troffrc
index a1e5a36..fb7c6c4 100644
--- a/contrib/groff/tmac/troffrc
+++ b/contrib/groff/tmac/troffrc
@@ -20,7 +20,7 @@
 .do ds troffrc!cp1047 tty.tmac
 .do ds troffrc!lj4 lj4.tmac
 .do ds troffrc!lbp lbp.tmac
-.do ds troffrc!html www.tmac
+.do ds troffrc!html html.tmac
 .do if d troffrc!\*[.T] \
 .	do mso \*[troffrc!\*[.T]]
 .do rm troffrc!ps troffrc!Xps troffrc!dvi troffrc!X75 troffrc!X75-12 \
@@ -35,8 +35,9 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp troffrc!html
 .\" Set the hyphenation language to `us'.
 .do hla us
 .
-.\" Load hyphenation patterns from `hyphen.us' (in the tmac directory).
+.\" Load hyphenation patterns and exceptions.
 .do hpf hyphen.us
+.do hpfa hyphenex.us
 .
 .if "\*[.T]"koi8-r" \{\
 .
@@ -45,6 +46,12 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp troffrc!html
 .
 .\}
 .
+.\" Load composite mappings.
+.do mso composite.tmac
+.
+.\" Handle paper formats
+.do mso papersize.tmac
+.
 .\" Disable SGR support in grotty(1).
 .if n \{\
 .  do nop \X'tty: sgr 0'