From bbca9de4c44fc5e7d5aa68015495daccc2f69081 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Thu, 13 May 2010 06:22:11 +0000 Subject: Fixed bug in -Thtml -mdoc where `Lb' would line-break in LIBRARY section. Fixed assumption that parse-point == 1 equates to beginning of line (false if whitespace separates macro and control character). Fixed line-break for non-first-macro in several SYNOPSIS macros. --- mdoc.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'mdoc.c') diff --git a/mdoc.c b/mdoc.c index 8cb8c4ed..38f97ed1 100644 --- a/mdoc.c +++ b/mdoc.c @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.129 2010/05/12 17:08:03 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.130 2010/05/13 06:22:11 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -289,7 +289,9 @@ mdoc_parseln(struct mdoc *m, int ln, char *buf) if (MDOC_HALT & m->flags) return(0); - return('.' == *buf ? mdoc_pmacro(m, ln, buf) : + m->flags |= MDOC_NEWLINE; + return('.' == *buf ? + mdoc_pmacro(m, ln, buf) : mdoc_ptext(m, ln, buf)); } @@ -453,7 +455,9 @@ node_alloc(struct mdoc *m, int line, int pos, p->pos = pos; p->tok = tok; p->type = type; - + if (MDOC_NEWLINE & m->flags) + p->flags |= MDOC_LINE; + m->flags &= ~MDOC_NEWLINE; return(p); } @@ -726,7 +730,7 @@ int mdoc_pmacro(struct mdoc *m, int ln, char *buf) { enum mdoct tok; - int i, j; + int i, j, sv; char mac[5]; /* Empty lines are ignored. */ @@ -746,6 +750,8 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf) return(1); } + sv = i; + /* Copy the first word into a nil-terminated buffer. */ for (j = 0; j < 4; j++, i++) { @@ -793,7 +799,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf) * Begin recursive parse sequence. Since we're at the start of * the line, we don't need to do callable/parseable checks. */ - if ( ! mdoc_macro(m, tok, ln, 1, &i, buf)) + if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) goto err; return(1); -- cgit v1.2.3