diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2010-05-10 08:05:17 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-05-10 08:05:17 +0000 |
| commit | c368f1d502310930cf0f80dd42e696657e42e636 (patch) | |
| tree | 6058eb1e2750dbb927f744cbc490f61ec3b7a113 | |
| parent | 0ef1c8050efed1d207538f2a822b1d623cfae0c2 (diff) | |
| download | mandoc-c368f1d502310930cf0f80dd42e696657e42e636.tar.gz mandoc-c368f1d502310930cf0f80dd42e696657e42e636.tar.zst mandoc-c368f1d502310930cf0f80dd42e696657e42e636.zip | |
-man also now has unbound margins for literal context.
| -rw-r--r-- | man_term.c | 8 | ||||
| -rw-r--r-- | mdoc_term.c | 6 | ||||
| -rw-r--r-- | term.h | 4 |
3 files changed, 9 insertions, 9 deletions
@@ -1,4 +1,4 @@ -/* $Id: man_term.c,v 1.59 2010/03/24 20:10:53 kristaps Exp $ */ +/* $Id: man_term.c,v 1.60 2010/05/10 08:05:17 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -260,7 +260,6 @@ static int pre_fi(DECL_ARGS) { - p->rmargin = p->maxrmargin = 65; mt->fl &= ~MANT_LITERAL; return(1); } @@ -271,10 +270,7 @@ static int pre_nf(DECL_ARGS) { - p->rmargin = p->maxrmargin = 78; - term_newln(p); mt->fl |= MANT_LITERAL; - return(MAN_Vb != n->tok); } @@ -820,8 +816,10 @@ print_man_node(DECL_ARGS) /* FIXME: this means that macro lines are munged! */ if (MANT_LITERAL & mt->fl) { + p->rmargin = p->maxrmargin = TERM_MAXMARGIN; p->flags |= TERMP_NOSPACE; term_flushln(p); + p->rmargin = p->maxrmargin = 65; } break; default: diff --git a/mdoc_term.c b/mdoc_term.c index f8824910..4f625a58 100644 --- a/mdoc_term.c +++ b/mdoc_term.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.119 2010/05/09 16:38:38 kristaps Exp $ */ +/* $Id: mdoc_term.c,v 1.120 2010/05/10 08:05:17 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -1659,7 +1659,7 @@ termp_bd_pre(DECL_ARGS) rm = p->rmargin; rmax = p->maxrmargin; - p->rmargin = p->maxrmargin = 100000; /* FIXME */ + p->rmargin = p->maxrmargin = TERM_MAXMARGIN; for (nn = n->child; nn; nn = nn->next) { p->flags |= TERMP_NOSPACE; @@ -1695,7 +1695,7 @@ termp_bd_post(DECL_ARGS) rmax = p->maxrmargin; if (MDOC_Literal == type || MDOC_Unfilled == type) - p->rmargin = p->maxrmargin = 100000; /* FIXME */ + p->rmargin = p->maxrmargin = TERM_MAXMARGIN; p->flags |= TERMP_NOSPACE; term_flushln(p); @@ -1,4 +1,4 @@ -/* $Id: term.h,v 1.52 2010/03/23 12:42:22 kristaps Exp $ */ +/* $Id: term.h,v 1.53 2010/05/10 08:05:17 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -29,6 +29,8 @@ enum termfont { TERMFONT_UNDER }; +#define TERM_MAXMARGIN 100000 /* FIXME */ + struct termp { size_t rmargin; /* Current right margin. */ size_t maxrmargin; /* Max right margin. */ |