diff options
-rw-r--r-- | libmdoc.h | 2 | ||||
-rw-r--r-- | mdoc_argv.c | 51 | ||||
-rw-r--r-- | mdoc_strings.c | 67 |
3 files changed, 61 insertions, 59 deletions
@@ -114,7 +114,7 @@ int mdoc_endbody_alloc(struct mdoc *m, int line, int pos, void mdoc_node_delete(struct mdoc *, struct mdoc_node *); void mdoc_hash_init(void); enum mdoct mdoc_hash_find(const char *); -enum mdelim mdoc_iscdelim(char); +#define DELIMSZ 6 /* maximum size of a delimiter string */ enum mdelim mdoc_isdelim(const char *); size_t mdoc_isescape(const char *); enum mdoc_sec mdoc_str2sec(const char *); diff --git a/mdoc_argv.c b/mdoc_argv.c index 313439cc..12c15966 100644 --- a/mdoc_argv.c +++ b/mdoc_argv.c @@ -412,13 +412,6 @@ args(struct mdoc *m, int line, int *pos, return(ARGS_EOLN); } - /* - * If the first character is a closing delimiter and we're to - * look for delimited strings, then pass down the buffer seeing - * if it follows the pattern of [[::delim::][ ]+]+. Note that - * we ONLY care about closing delimiters. - */ - *v = &buf[*pos]; if (ARGS_DELIM & fl && args_checkpunct(&buf[*pos])) { @@ -572,28 +565,50 @@ args(struct mdoc *m, int line, int *pos, /* * Check if the string consists only of space-separated closing - * delimiters. + * delimiters. This is a bit of a dance: the first must be a close + * delimiter, but it may be followed by middle delimiters. Arbitrary + * whitespace may separate these tokens. */ static int args_checkpunct(const char *p) { - int i; + int i, j; + char buf[DELIMSZ]; enum mdelim d; i = 0; - if (DELIM_CLOSE != mdoc_iscdelim(p[i])) + /* First token must be a close-delimiter. */ + + for (j = 0; p[i] && ' ' != p[i] && j < DELIMSZ; j++, i++) + buf[j] = p[i]; + + if (DELIMSZ == j) return(0); - while ('\0' != p[i]) { - d = mdoc_iscdelim(p[i]); - if (DELIM_NONE == d || DELIM_OPEN == d) - break; - i++; - if ('\0' == p[i] || ' ' != p[i]) - break; + buf[j] = '\0'; + if (DELIM_CLOSE != mdoc_isdelim(buf)) + return(0); + + while (' ' == p[i]) i++; - while (p[i] && ' ' == p[i]) + + /* Remaining must NOT be open/none. */ + + while (p[i]) { + j = 0; + while (p[i] && ' ' != p[i] && j < DELIMSZ) + buf[j++] = p[i++]; + + if (DELIMSZ == j) + return(0); + + buf[j] = '\0'; + d = mdoc_isdelim(buf); + if (DELIM_NONE == d || DELIM_OPEN == d) + return(0); + + while (' ' == p[i]) i++; } diff --git a/mdoc_strings.c b/mdoc_strings.c index 9bcab1df..cd4654b4 100644 --- a/mdoc_strings.c +++ b/mdoc_strings.c @@ -54,53 +54,40 @@ static const char * const secnames[SEC__MAX] = { NULL }; -/* - * FIXME: this is repeated in print_text() (html.c) and term_word() - * (term.c). - */ -enum mdelim -mdoc_iscdelim(char p) -{ - - switch (p) { - case('('): - /* FALLTHROUGH */ - case('['): - return(DELIM_OPEN); - case('|'): - return(DELIM_MIDDLE); - case('.'): - /* FALLTHROUGH */ - case(','): - /* FALLTHROUGH */ - case(';'): - /* FALLTHROUGH */ - case(':'): - /* FALLTHROUGH */ - case('?'): - /* FALLTHROUGH */ - case('!'): - /* FALLTHROUGH */ - case(')'): - /* FALLTHROUGH */ - case(']'): - return(DELIM_CLOSE); - default: - break; - } - - return(DELIM_NONE); -} - - enum mdelim mdoc_isdelim(const char *p) { if ('\0' == p[0]) return(DELIM_NONE); + if ('\0' == p[1]) - return(mdoc_iscdelim(p[0])); + switch (p[0]) { + case('('): + /* FALLTHROUGH */ + case('['): + return(DELIM_OPEN); + case('|'): + return(DELIM_MIDDLE); + case('.'): + /* FALLTHROUGH */ + case(','): + /* FALLTHROUGH */ + case(';'): + /* FALLTHROUGH */ + case(':'): + /* FALLTHROUGH */ + case('?'): + /* FALLTHROUGH */ + case('!'): + /* FALLTHROUGH */ + case(')'): + /* FALLTHROUGH */ + case(']'): + return(DELIM_CLOSE); + default: + return(DELIM_NONE); + } /* * XXX; account for groff bubu where the \*(Ba reserved string |