From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-1.sys.kth.se (smtp-1.sys.kth.se [130.237.32.175]) by krisdoz.my.domain (8.14.3/8.14.3) with ESMTP id p0B1CYWG005352 for ; Mon, 10 Jan 2011 20:12:34 -0500 (EST) Received: from smtp-1.sys.kth.se (localhost [127.0.0.1]) by smtp-1.sys.kth.se (Postfix) with ESMTP id 95BCF1557D3 for ; Tue, 11 Jan 2011 02:12:28 +0100 (CET) X-Virus-Scanned: by amavisd-new at kth.se Received: from smtp-1.sys.kth.se ([127.0.0.1]) by smtp-1.sys.kth.se (smtp-1.sys.kth.se [127.0.0.1]) (amavisd-new, port 10024) with LMTP id BkPrKeU5JdcW for ; Tue, 11 Jan 2011 02:12:17 +0100 (CET) X-KTH-Auth: kristaps [85.8.60.237] X-KTH-mail-from: kristaps@bsd.lv X-KTH-rcpt-to: tech@mdocml.bsd.lv Received: from h85-8-60-237.dynamic.se.alltele.net (h85-8-60-237.dynamic.se.alltele.net [85.8.60.237]) by smtp-1.sys.kth.se (Postfix) with ESMTP id 7AE3A155190 for ; Tue, 11 Jan 2011 02:12:17 +0100 (CET) Message-ID: <4D2BAE71.8000303@bsd.lv> Date: Tue, 11 Jan 2011 02:12:17 +0100 From: Kristaps Dzonsons User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.13) Gecko/20101207 Thunderbird/3.1.7 X-Mailinglist: mdocml-tech Reply-To: tech@mdocml.bsd.lv MIME-Version: 1.0 To: tech@mdocml.bsd.lv Subject: Re: Leading space in roff = leading newline. References: <4D2BAE03.7050709@bsd.lv> In-Reply-To: <4D2BAE03.7050709@bsd.lv> Content-Type: multipart/mixed; boundary="------------000201090604060203090302" This is a multi-part message in MIME format. --------------000201090604060203090302 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit > I came across a real gem in gm.1. Apparently leading a line with a space > causes a leading newline, as in > > ++++ > The \fBGraphicsMagick\fP utilities recognize the following image formats: > > > \fBName\fP \fBMode\fP \fBDescription\fP > o 8BIM *rw- Photoshop resource format > o 8BIMTEXT *rw- Photoshop resource format > o 8BIMWTEXT *rw- Photoshop resource format > o APP1 *rw- Photoshop resource format > o ART *r-- PF1: 1st Publisher > ---- > > and so on. It works with mdoc(7) and man(7). > > Anybody against the following patch? Blarg, now with diff -u. --------------000201090604060203090302 Content-Type: text/plain; name="patch.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch.txt" Index: libman.h =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/libman.h,v retrieving revision 1.44 diff -u -r1.44 libman.h --- libman.h 30 Nov 2010 15:36:28 -0000 1.44 +++ libman.h 11 Jan 2011 01:11:29 -0000 @@ -34,6 +34,7 @@ #define MAN_ILINE (1 << 3) /* Ignored in next-line scope. */ #define MAN_LITERAL (1 << 4) /* Literal input. */ #define MAN_BPLINE (1 << 5) +#define MAN_NEWLINE (1 << 6) /* first macro/text in a line */ enum man_next next; /* where to put the next node */ struct man_node *last; /* the last parsed node */ struct man_node *first; /* the first parsed node */ Index: man.7 =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man.7,v retrieving revision 1.94 diff -u -r1.94 man.7 --- man.7 4 Jan 2011 23:32:21 -0000 1.94 +++ man.7 11 Jan 2011 01:11:29 -0000 @@ -59,6 +59,9 @@ .Pp Blank lines are acceptable; where found, the output will assert a vertical space. +.Pp +If the first character of a line is whitespace, that line is printed +verbatim, including the end-of-line. .Ss Comments Text following a .Sq \e\*q , Index: man.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man.c,v retrieving revision 1.96 diff -u -r1.96 man.c --- man.c 3 Jan 2011 11:31:26 -0000 1.96 +++ man.c 11 Jan 2011 01:11:29 -0000 @@ -44,7 +44,7 @@ const char * const *man_macronames = __man_macronames; -static struct man_node *man_node_alloc(int, int, +static struct man_node *man_node_alloc(struct man *, int, int, enum man_type, enum mant); static int man_node_append(struct man *, struct man_node *); @@ -129,6 +129,8 @@ man_parseln(struct man *m, int ln, char *buf, int offs) { + m->flags |= MAN_NEWLINE; + assert( ! (MAN_HALT & m->flags)); return(('.' == buf[offs] || '\'' == buf[offs]) ? man_pmacro(m, ln, buf, offs) : @@ -229,7 +231,8 @@ static struct man_node * -man_node_alloc(int line, int pos, enum man_type type, enum mant tok) +man_node_alloc(struct man *m, int line, int pos, + enum man_type type, enum mant tok) { struct man_node *p; @@ -238,6 +241,10 @@ p->pos = pos; p->type = type; p->tok = tok; + + if (MAN_NEWLINE & m->flags) + p->flags |= MAN_LINE; + m->flags &= ~MAN_NEWLINE; return(p); } @@ -247,7 +254,7 @@ { struct man_node *p; - p = man_node_alloc(line, pos, MAN_ELEM, tok); + p = man_node_alloc(m, line, pos, MAN_ELEM, tok); if ( ! man_node_append(m, p)) return(0); m->next = MAN_NEXT_CHILD; @@ -260,7 +267,7 @@ { struct man_node *p; - p = man_node_alloc(line, pos, MAN_HEAD, tok); + p = man_node_alloc(m, line, pos, MAN_HEAD, tok); if ( ! man_node_append(m, p)) return(0); m->next = MAN_NEXT_CHILD; @@ -273,7 +280,7 @@ { struct man_node *p; - p = man_node_alloc(line, pos, MAN_BODY, tok); + p = man_node_alloc(m, line, pos, MAN_BODY, tok); if ( ! man_node_append(m, p)) return(0); m->next = MAN_NEXT_CHILD; @@ -286,7 +293,7 @@ { struct man_node *p; - p = man_node_alloc(line, pos, MAN_BLOCK, tok); + p = man_node_alloc(m, line, pos, MAN_BLOCK, tok); if ( ! man_node_append(m, p)) return(0); m->next = MAN_NEXT_CHILD; @@ -299,7 +306,7 @@ struct man_node *n; /* FIXME: grab from span */ - n = man_node_alloc(0, 0, MAN_TBL, MAN_MAX); + n = man_node_alloc(m, 0, 0, MAN_TBL, MAN_MAX); n->span = span; if ( ! man_node_append(m, n)) @@ -317,7 +324,7 @@ len = strlen(word); - n = man_node_alloc(line, pos, MAN_TEXT, MAN_MAX); + n = man_node_alloc(m, line, pos, MAN_TEXT, MAN_MAX); n->string = mandoc_malloc(len + 1); sv = strlcpy(n->string, word, len + 1); Index: man.h =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man.h,v retrieving revision 1.50 diff -u -r1.50 man.h --- man.h 1 Jan 2011 12:59:17 -0000 1.50 +++ man.h 11 Jan 2011 01:11:29 -0000 @@ -97,6 +97,7 @@ int flags; #define MAN_VALID (1 << 0) /* has been validated */ #define MAN_EOS (1 << 2) /* at sentence boundary */ +#define MAN_LINE (1 << 3) /* first macro/text on line */ enum man_type type; /* AST node type */ char *string; /* TEXT node argument */ struct man_node *head; /* BLOCK node HEAD ptr */ Index: man_html.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_html.c,v retrieving revision 1.62 diff -u -r1.62 man_html.c --- man_html.c 7 Jan 2011 13:20:58 -0000 1.62 +++ man_html.c 11 Jan 2011 01:11:29 -0000 @@ -197,7 +197,16 @@ child = man_root_pre(m, n, mh, h); break; case (MAN_TEXT): + if ('\0' == *n->string) { + print_otag(h, TAG_P, 0, NULL); + return; + } + + if (' ' == *n->string && MAN_LINE & n->flags) + print_otag(h, TAG_BR, 0, NULL); + print_text(h, n->string); + if (MANH_LITERAL & mh->fl) print_otag(h, TAG_BR, 0, NULL); return; Index: man_term.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_term.c,v retrieving revision 1.95 diff -u -r1.95 man_term.c --- man_term.c 11 Jan 2011 00:39:00 -0000 1.95 +++ man_term.c 11 Jan 2011 01:11:29 -0000 @@ -859,10 +859,13 @@ switch (n->type) { case(MAN_TEXT): - if (0 == *n->string) { + if ('\0' == *n->string) { term_vspace(p); break; - } + } + + if (' ' == *n->string && MAN_LINE & n->flags) + term_newln(p); term_word(p, n->string); @@ -878,6 +881,7 @@ p->rmargin = rm; p->maxrmargin = rmax; } + break; case (MAN_TBL): if (TBL_SPAN_FIRST & n->span->flags) Index: mdoc.7 =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc.7,v retrieving revision 1.174 diff -u -r1.174 mdoc.7 --- mdoc.7 4 Jan 2011 23:32:21 -0000 1.174 +++ mdoc.7 11 Jan 2011 01:11:30 -0000 @@ -55,6 +55,9 @@ All manuals must have .Ux line terminators. +.Pp +If the first character of a line is whitespace, that line is printed +verbatim, including the end-of-line. .Ss Comments Text following a .Sq \e\*q , Index: mdoc_html.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_html.c,v retrieving revision 1.142 diff -u -r1.142 mdoc_html.c --- mdoc_html.c 7 Jan 2011 13:20:58 -0000 1.142 +++ mdoc_html.c 11 Jan 2011 01:11:30 -0000 @@ -420,6 +420,8 @@ child = mdoc_root_pre(m, n, h); break; case (MDOC_TEXT): + if (' ' == *n->string && MDOC_LINE & n->flags) + print_otag(h, TAG_BR, 0, NULL); print_text(h, n->string); return; case (MDOC_TBL): Index: mdoc_term.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_term.c,v retrieving revision 1.208 diff -u -r1.208 mdoc_term.c --- mdoc_term.c 6 Jan 2011 14:05:12 -0000 1.208 +++ mdoc_term.c 11 Jan 2011 01:11:30 -0000 @@ -315,6 +315,8 @@ switch (n->type) { case (MDOC_TEXT): + if (' ' == *n->string && MDOC_LINE & n->flags) + term_newln(p); term_word(p, n->string); break; case (MDOC_TBL): --------------000201090604060203090302-- -- To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv