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.5/8.14.5) with ESMTP id q03CJw43031795 for ; Tue, 3 Jan 2012 07:19:58 -0500 (EST) Received: from mailscan-1.sys.kth.se (mailscan-1.sys.kth.se [130.237.32.91]) by smtp-1.sys.kth.se (Postfix) with ESMTP id 1E095156B52 for ; Tue, 3 Jan 2012 13:19:52 +0100 (CET) X-Virus-Scanned: by amavisd-new at kth.se Received: from smtp-1.sys.kth.se ([130.237.32.175]) by mailscan-1.sys.kth.se (mailscan-1.sys.kth.se [130.237.32.91]) (amavisd-new, port 10024) with LMTP id nSfRrH7eltGV for ; Tue, 3 Jan 2012 13:19:50 +0100 (CET) X-KTH-Auth: kristaps [193.10.49.5] X-KTH-mail-from: kristaps@bsd.lv X-KTH-rcpt-to: tech@mdocml.bsd.lv Received: from ctime.hhs.se (ctime.hhs.se [193.10.49.5]) by smtp-1.sys.kth.se (Postfix) with ESMTP id AB26A1557D3 for ; Tue, 3 Jan 2012 13:19:49 +0100 (CET) Message-ID: <4F02F264.2070407@bsd.lv> Date: Tue, 03 Jan 2012 13:19:48 +0100 From: Kristaps Dzonsons User-Agent: Mozilla/5.0 (X11; OpenBSD amd64; rv:5.0) Gecko/20110805 Thunderbird/5.0 X-Mailinglist: mdocml-tech Reply-To: tech@mdocml.bsd.lv MIME-Version: 1.0 To: tech@mdocml.bsd.lv Subject: Can of worms: \h"..." Content-Type: multipart/mixed; boundary="------------090807060706090805000308" This is a multi-part message in MIME format. --------------090807060706090805000308 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, On the verge of checking in a quick fix for the \h"..." TODO, it occurred to me that we either don't want to accomodate for pod2man badness OR something more subtle's at work. \h"..." is specifically disallowed by groff(1). So I searched in the groff source. Behold! In groff.c's input.cpp, we see several escapes (h, H, N, S, v, x) directly condition their enclosing markers on the first character (see get_delim_number()) while others do so indirectly. These set the end marker on the first character given that it satisfies the token::delimiter() method (or whatever is C++'s name for an object function). The delimiter() function (also in input.cpp) allows any character but a certain ASCII subset and whitespace. groff(7) mentions the apostrophe, but it can much much more. Question is: do we want this behaviour? I'd say we do, but as it's somewhat intrusive, I want some consensus before committing. Either way, I do NOT suggest that we outwardly document this. Note that this also fixes the situation where some non-\N escapes were being assigned the NUMERIC identifier, which is only used for \N. I also removed the check for \N numbers, as this is done again later. Thoughts? Kristaps --------------090807060706090805000308 Content-Type: text/plain; name="patch.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch.txt" Index: mandoc.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mandoc.c,v retrieving revision 1.62 diff -u -p -r1.62 mandoc.c --- mandoc.c 3 Dec 2011 16:08:51 -0000 1.62 +++ mandoc.c 3 Jan 2012 12:18:51 -0000 @@ -209,9 +209,15 @@ mandoc_escape(const char **end, const ch break; /* - * These escapes are of the form \X'N', where 'X' is the trigger - * and 'N' resolves to a numerical expression. + * These escapes accept most characters as enclosure marks + * (except for those listed in the switch). + * The enclosed materials are numbers, so run them through the + * numerical subexpression calculator after we process. */ + case ('N'): + /* Special case: numerical representation of char. */ + gly = ESCAPE_NUMBERED; + /* FALLTHROUGH */ case ('B'): /* FALLTHROUGH */ case ('h'): @@ -221,7 +227,6 @@ mandoc_escape(const char **end, const ch case ('L'): /* FALLTHROUGH */ case ('l'): - gly = ESCAPE_NUMBERED; /* FALLTHROUGH */ case ('S'): /* FALLTHROUGH */ @@ -230,32 +235,62 @@ mandoc_escape(const char **end, const ch case ('w'): /* FALLTHROUGH */ case ('x'): - if (ESCAPE_ERROR == gly) + if (ESCAPE_NUMBERED != gly) gly = ESCAPE_IGNORE; - if ('\'' != cp[i++]) + numeric = term = cp[i++]; + switch (numeric) { + case('0'): + /* FALLTHROUGH */ + case('1'): + /* FALLTHROUGH */ + case('2'): + /* FALLTHROUGH */ + case('3'): + /* FALLTHROUGH */ + case('4'): + /* FALLTHROUGH */ + case('5'): + /* FALLTHROUGH */ + case('6'): + /* FALLTHROUGH */ + case('7'): + /* FALLTHROUGH */ + case('8'): + /* FALLTHROUGH */ + case('9'): + /* FALLTHROUGH */ + case('+'): + /* FALLTHROUGH */ + case('-'): + /* FALLTHROUGH */ + case('/'): + /* FALLTHROUGH */ + case('*'): + /* FALLTHROUGH */ + case('%'): + /* FALLTHROUGH */ + case('<'): + /* FALLTHROUGH */ + case('>'): + /* FALLTHROUGH */ + case('='): + /* FALLTHROUGH */ + case('&'): + /* FALLTHROUGH */ + case(':'): + /* FALLTHROUGH */ + case('('): + /* FALLTHROUGH */ + case(')'): + /* FALLTHROUGH */ + case('.'): return(ESCAPE_ERROR); - term = numeric = '\''; - break; - - /* - * Special handling for the numbered character escape. - * XXX Do any other escapes need similar handling? - */ - case ('N'): - if ('\0' == cp[i]) + default: + break; + } + if (isspace((unsigned char)numeric)) return(ESCAPE_ERROR); - *end = &cp[++i]; - if (isdigit((unsigned char)cp[i-1])) - return(ESCAPE_IGNORE); - while (isdigit((unsigned char)**end)) - (*end)++; - if (start) - *start = &cp[i]; - if (sz) - *sz = *end - &cp[i]; - if ('\0' != **end) - (*end)++; - return(ESCAPE_NUMBERED); + break; /* * Sizes get a special category of their own. --------------090807060706090805000308-- -- To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv