On a new RS nesting level, the saved width starts from the default

[mandoc.git] / man_term.c

diff --git a/man_term.c b/man_term.c
index d4a03de840c6d391afaa413cfcbc5b6d5b4dfa4d..a96c309b1652b32a5600c2c176fd77bf3141536f 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/*     $Id: man_term.c,v 1.176 2015/04/04 18:52:51 schwarze Exp $ */
+/*     $Id: man_term.c,v 1.178 2015/04/06 14:59:21 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -879,7 +879,9 @@ pre_RS(DECL_ARGS)
 
        n = n->parent->head;
        n->aux = SHRT_MAX + 1;
-       if (n->child != NULL && a2roffsu(n->child->string, &su, SCALE_EN))
+       if (n->child == NULL)
+               n->aux = mt->lmargin[mt->lmargincur];
+       else if (a2roffsu(n->child->string, &su, SCALE_EN))
                n->aux = term_hspan(p, &su) / 24;
        if (n->aux < 0 && (size_t)(-n->aux) > mt->offset)
                n->aux = -mt->offset;
@@ -893,7 +895,7 @@ pre_RS(DECL_ARGS)
        if (++mt->lmarginsz < MAXMARGINS)
                mt->lmargincur = mt->lmarginsz;
 
-       mt->lmargin[mt->lmargincur] = mt->lmargin[mt->lmargincur - 1];
+       mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
        return(1);
 }