summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-03-20 16:43:28 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-03-20 16:43:28 +0000
commitbe580e96cc87913d3720c581d51bf965f725d8aa (patch)
treeb52d9af1c3f2c4bd2c7afd1ff87be2fcbc7e6f91
parent00aebf138812dfbbad4079310459c4a98d262466 (diff)
downloadmandoc-be580e96cc87913d3720c581d51bf965f725d8aa.tar.gz
Fixed literal-formatting error with `Dl'.
-rw-r--r--Makefile2
-rw-r--r--action.c13
-rw-r--r--term.c1
3 files changed, 9 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 5254ce10..0ac776b1 100644
--- a/Makefile
+++ b/Makefile
@@ -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)\"
diff --git a/action.c b/action.c
index 9823be46..23f613ae 100644
--- a/action.c
+++ b/action.c
@@ -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)
diff --git a/term.c b/term.c
index 28c5fa97..701a864a 100644
--- a/term.c
+++ b/term.c
@@ -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;