diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2017-06-23 23:00:01 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2017-06-23 23:00:01 +0000 |
commit | 1660eae97848a0145bed3ea818cb1ef29e7e3dad (patch) | |
tree | 2ac526314a9a692f215d8648f3b2528d31b34230 /eqn_html.c | |
parent | 5d8dc76c4654afbc13b1745d30c69cec2aa74cbe (diff) | |
download | mandoc-1660eae97848a0145bed3ea818cb1ef29e7e3dad.tar.gz |
Consistently treat character escape sequences as operators,
not as letters, even if their names contain letters.
This is certainly not perfect, but code to recognize that \(*a is
not an operator but a letter would need a huge table, or Unicode
character property support, which won't happen at this time.
Diffstat (limited to 'eqn_html.c')
-rw-r--r-- | eqn_html.c | 22 |
1 files changed, 14 insertions, 8 deletions
@@ -34,7 +34,7 @@ eqn_box(struct html *p, const struct eqn_box *bp) { struct tag *post, *row, *cell, *t; const struct eqn_box *child, *parent; - const unsigned char *cp; + const char *cp; size_t i, j, rows; enum htmltag tag; enum eqn_fontt font; @@ -143,22 +143,28 @@ eqn_box(struct html *p, const struct eqn_box *bp) if (bp->text != NULL) { assert(post == NULL); tag = TAG_MI; - cp = (unsigned char *)bp->text; - if (isdigit(cp[0]) || (cp[0] == '.' && isdigit(cp[1]))) { + cp = bp->text; + if (isdigit((unsigned char)cp[0]) || + (cp[0] == '.' && isdigit((unsigned char)cp[1]))) { tag = TAG_MN; while (*++cp != '\0') { - if (*cp != '.' && !isdigit(*cp)) { + if (*cp != '.' && + isdigit((unsigned char)*cp) == 0) { tag = TAG_MI; break; } } - } else if (*cp != '\0' && isalpha(*cp) == 0) { + } else if (*cp != '\0' && isalpha((unsigned char)*cp) == 0) { tag = TAG_MO; - while (*++cp != '\0') { - if (isalnum(*cp)) { + while (*cp != '\0') { + if (cp[0] == '\\' && cp[1] != '\0') { + cp++; + mandoc_escape(&cp, NULL, NULL); + } else if (isalnum((unsigned char)*cp)) { tag = TAG_MI; break; - } + } else + cp++; } } font = bp->font; |