diff options
| -rw-r--r-- | gnu/usr.bin/groff/tmac/tmac.an | 13 | ||||
| -rw-r--r-- | gnu/usr.bin/groff/tmac/troffrc | 4 | ||||
| -rw-r--r-- | usr.bin/mandoc/man_term.c | 11 |
3 files changed, 17 insertions, 11 deletions
diff --git a/gnu/usr.bin/groff/tmac/tmac.an b/gnu/usr.bin/groff/tmac/tmac.an index 144dbc87de4..95059d6c2b7 100644 --- a/gnu/usr.bin/groff/tmac/tmac.an +++ b/gnu/usr.bin/groff/tmac/tmac.an @@ -59,7 +59,18 @@ .el \{\ . nr IN 7.2n .\} -.nr LL 6.5i +.if n \{\ +. nr ll 78n +. ll 78n +. nr lt 78n +. lt 78n +.\} +.el \{\ +. nr ll 6.5i +. ll 6.5i +. nr lt 6.5i +. lt 6.5i +.\} .PD .nr PS 10 \" normal point-size .nr SN 3n \" the indentation of sub-sub-headings relative to sub-headings diff --git a/gnu/usr.bin/groff/tmac/troffrc b/gnu/usr.bin/groff/tmac/troffrc index 19024438ea9..8d99e96c9a1 100644 --- a/gnu/usr.bin/groff/tmac/troffrc +++ b/gnu/usr.bin/groff/tmac/troffrc @@ -20,7 +20,7 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troffrc!html .do tr \[char160] .\" Set the hyphenation language to `us'. -.do hla us +.\" .do hla us .\" Load hyphenation patterns from `hyphen.us' (in the tmac directory). -.do hpf hyphen.us +.\" .do hpf hyphen.us .\" Don't let blank lines creep in here. diff --git a/usr.bin/mandoc/man_term.c b/usr.bin/mandoc/man_term.c index aed43f0b45d..8fb34d5849e 100644 --- a/usr.bin/mandoc/man_term.c +++ b/usr.bin/mandoc/man_term.c @@ -1,4 +1,4 @@ -/* $Id: man_term.c,v 1.38 2010/05/24 01:36:22 schwarze Exp $ */ +/* $Id: man_term.c,v 1.39 2010/06/05 19:09:55 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -154,14 +154,9 @@ terminal_man(void *arg, const struct man *man) p = (struct termp *)arg; - /* - * XXX - * Hardcode the -man output width for now; - * it is not yet externally configurable, anyway. - */ - p->defrmargin = 65; - p->maxrmargin = p->defrmargin; p->overstep = 0; + p->maxrmargin = p->defrmargin; + p->tabwidth = 5; if (NULL == p->symtab) switch (p->enc) { |