diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2011-03-17 01:23:28 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-03-17 01:23:28 +0000 |
| commit | cc5eaab1fc61af7bb315ef9938831121ef7ad4bc (patch) | |
| tree | f3ff3328cbe7d0600aa562a39ca6b2c7ae81cc37 /mdoc_strings.c | |
| parent | 5ac5955e47f16a7b4767aa4bd138b6ad73e53760 (diff) | |
| download | mandoc-cc5eaab1fc61af7bb315ef9938831121ef7ad4bc.tar.gz mandoc-cc5eaab1fc61af7bb315ef9938831121ef7ad4bc.tar.zst mandoc-cc5eaab1fc61af7bb315ef9938831121ef7ad4bc.zip | |
Make args_checkpunct() use mdoc_isdelim() instead of mdoc_iscdelim(),
which is wrong. Then remove mdoc_iscdelim() alltogether.
Diffstat (limited to 'mdoc_strings.c')
| -rw-r--r-- | mdoc_strings.c | 69 |
1 files changed, 28 insertions, 41 deletions
diff --git a/mdoc_strings.c b/mdoc_strings.c index e7ced1fe..83e58a98 100644 --- a/mdoc_strings.c +++ b/mdoc_strings.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_strings.c,v 1.24 2010/07/31 23:52:58 schwarze Exp $ */ +/* $Id: mdoc_strings.c,v 1.25 2011/03/17 01:23:29 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -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 |