MANDOCERR_BADTAB needs checking, but .UR/.UE is done

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 1a1458b0ceef9c0e9b1d499f4bd0f5f625b07eac..b27dc4ae2806e8ad84c86186c3a5f3cee7515035 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc_term.c,v 1.256 2013/12/25 14:40:34 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.259 2014/02/16 12:33:39 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -873,8 +873,11 @@ termp_it_pre(DECL_ARGS)
                assert(width);
                if (MDOC_HEAD == n->type)
                        p->rmargin = p->offset + width;
-               else 
+               else {
                        p->offset += width;
+                       if (p->rmargin < p->offset)
+                               p->rmargin = p->offset;
+               }
                break;
        case (LIST_column):
                assert(width);
@@ -1529,7 +1532,7 @@ termp_ft_pre(DECL_ARGS)
 static int
 termp_fn_pre(DECL_ARGS)
 {
-       size_t           width, rmargin = 0;
+       size_t           rmargin = 0;
        int              pretty;
 
        pretty = MDOC_SYNPRETTY & n->flags;
@@ -1540,9 +1543,8 @@ termp_fn_pre(DECL_ARGS)
                return(0);
 
        if (pretty) {
-               width = term_len(p, 4);
                rmargin = p->rmargin;
-               p->rmargin = p->offset + width;
+               p->rmargin = p->offset + term_len(p, 4);
                p->flags |= TERMP_NOBREAK | TERMP_HANG;
        }
 
@@ -1602,8 +1604,7 @@ termp_fa_pre(DECL_ARGS)
 
        for (nn = n->child; nn; nn = nn->next) {
                term_fontpush(p, TERMFONT_UNDER);
-               if (MDOC_SYNPRETTY & n->flags)
-                       p->flags |= TERMP_NBRWORD;
+               p->flags |= TERMP_NBRWORD;
                term_word(p, nn->string);
                term_fontpop(p);
 
@@ -2034,7 +2035,7 @@ termp_quote_post(DECL_ARGS)
 static int
 termp_fo_pre(DECL_ARGS)
 {
-       size_t           width, rmargin = 0;
+       size_t           rmargin = 0;
        int              pretty;
 
        pretty = MDOC_SYNPRETTY & n->flags;
@@ -2044,9 +2045,8 @@ termp_fo_pre(DECL_ARGS)
                return(1);
        } else if (MDOC_BODY == n->type) {
                if (pretty) {
-                       width = term_len(p, 4);
                        rmargin = p->rmargin;
-                       p->rmargin = p->offset + width;
+                       p->rmargin = p->offset + term_len(p, 4);
                        p->flags |= TERMP_NOBREAK | TERMP_HANG;
                }
                p->flags |= TERMP_NOSPACE;