diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | action.c | 15 | ||||
| -rw-r--r-- | term.c | 3 |
3 files changed, 11 insertions, 9 deletions
@@ -9,7 +9,7 @@ INSTALL_DATA = install -m 0444 INSTALL_LIB = install -m 0644 INSTALL_MAN = $(INSTALL_DATA) -VERSION = 1.6.2 +VERSION = 1.6.3 VDATE = 20 March 2009 VFLAGS = -DVERSION=\"$(VERSION)\" @@ -1,4 +1,4 @@ -/* $Id: action.c,v 1.44 2009/03/20 15:14:01 kristaps Exp $ */ +/* $Id: action.c,v 1.45 2009/03/20 16:43:28 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org> * @@ -57,7 +57,7 @@ static int post_ar(POST_ARGS); static int post_bl(POST_ARGS); static int post_bl_width(POST_ARGS); static int post_bl_tagwidth(POST_ARGS); -static int post_display(POST_ARGS); +static int post_bd(POST_ARGS); static int post_dd(POST_ARGS); static int post_dt(POST_ARGS); static int post_nm(POST_ARGS); @@ -66,7 +66,7 @@ static int post_prol(POST_ARGS); static int post_sh(POST_ARGS); static int post_std(POST_ARGS); -static int pre_display(PRE_ARGS); +static int pre_bd(PRE_ARGS); #define merr(m, t) perr((m), (m)->last->line, (m)->last->pos, (t)) #define mwarn(m, t) pwarn((m), (m)->last->line, (m)->last->pos, (t)) @@ -80,8 +80,8 @@ const struct actions mdoc_actions[MDOC_MAX] = { { NULL, NULL }, /* Ss */ { NULL, NULL }, /* Pp */ { NULL, NULL }, /* D1 */ - { pre_display, post_display }, /* Dl */ - { pre_display, post_display }, /* Bd */ + { NULL, NULL }, /* Dl */ + { pre_bd, post_bd }, /* Bd */ { NULL, NULL }, /* Ed */ { NULL, post_bl }, /* Bl */ { NULL, NULL }, /* El */ @@ -686,7 +686,7 @@ post_prol(POST_ARGS) static int -pre_display(PRE_ARGS) +pre_bd(PRE_ARGS) { int i; @@ -699,6 +699,7 @@ pre_display(PRE_ARGS) */ n = n->parent; + for (i = 0; i < (int)n->args->argc; i++) if (MDOC_Literal == n->args->argv[i].arg) break; @@ -713,7 +714,7 @@ pre_display(PRE_ARGS) static int -post_display(POST_ARGS) +post_bd(POST_ARGS) { if (MDOC_BODY == m->last->type) @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.62 2009/03/20 15:14:01 kristaps Exp $ */ +/* $Id: term.c,v 1.63 2009/03/20 16:43:28 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org> * @@ -1343,6 +1343,7 @@ termp_bd_post(DECL_ARGS) if (MDOC_BODY != node->type) return; + term_flushln(p); p->flags &= ~TERMP_LITERAL; p->offset = pair->offset; p->flags |= TERMP_NOSPACE; |