From ddb8c20e76ca162b2fbfbf7131f5b2a6ee36eea5 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Mon, 27 Sep 2010 23:03:44 +0000 Subject: Merge from OpenBSD right after 1.10.6; now back to full sync. * mdoc.c: blank lines outside literal mode are more similar to .sp than .Pp * backslashes do not terminate macros; partial revert of mdoc.c 1.164; the intention of that commit is fully achieved in roff.c * mdoc_term.c: no need to list the same prototype twice * mdoc_validate.c: drop .Pp before .sp just like .Pp before .Pp * fix off-by-one found by jsg@ with parfait, OpenBSD term_ps.c 1.12 ok kristaps@ --- mdoc.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'mdoc.c') diff --git a/mdoc.c b/mdoc.c index bee01503..103a8a88 100644 --- a/mdoc.c +++ b/mdoc.c @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.164 2010/08/29 11:29:51 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.165 2010/09/27 23:03:44 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * Copyright (c) 2010 Ingo Schwarze @@ -691,11 +691,11 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs) return(0); /* - * Insert a `Pp' in the case of a blank line. Technically, + * Insert a `sp' in the case of a blank line. Technically, * blank lines aren't allowed, but enough manuals assume this * behaviour that we want to work around it. */ - if ( ! mdoc_elem_alloc(m, line, offs, MDOC_Pp, NULL)) + if ( ! mdoc_elem_alloc(m, line, offs, MDOC_sp, NULL)) return(0); m->next = MDOC_NEXT_SIBLING; @@ -758,14 +758,11 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs) /* * Copy the first word into a nil-terminated buffer. - * Stop copying when a tab, space, backslash, or eoln is encountered. + * Stop copying when a tab, space, or eoln is encountered. */ j = 0; - while (j < 4 && '\0' != buf[i] && - ' ' != buf[i] && - '\t' != buf[i] && - '\\' != buf[i]) + while (j < 4 && '\0' != buf[i] && ' ' != buf[i] && '\t' != buf[i]) mac[j++] = buf[i++]; mac[j] = '\0'; -- cgit v1.2.3-56-ge451