diff options
| -rw-r--r-- | mandoc.c | 27 | ||||
| -rw-r--r-- | out.c | 22 |
2 files changed, 46 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $Id: mandoc.c,v 1.32 2010/08/24 13:39:37 kristaps Exp $ */ +/* $Id: mandoc.c,v 1.33 2010/08/24 13:56:51 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -128,6 +128,27 @@ mandoc_special(char *p) p++; } + /* Handle embedded numerical subexp or escape. */ + + if ('(' == *p) { + while (*p && ')' != *p) + if ('\\' == *p++) { + i = mandoc_special(--p); + if (0 == i) + return(0); + p += i; + } + + if (')' == *p++) + break; + + return(0); + } else if ('\\' == *p) { + if (0 == (i = mandoc_special(p))) + return(0); + p += i; + } + break; #if 0 case ('Y'): @@ -172,7 +193,9 @@ mandoc_special(char *p) case ('z'): len = 1; if ('\\' == *p) { - p += mandoc_special(p); + if (0 == (i = mandoc_special(p))) + return(0); + p += i; return(*p ? (int)(p - sv) : 0); } break; @@ -1,4 +1,4 @@ -/* $Id: out.c,v 1.27 2010/08/24 13:39:37 kristaps Exp $ */ +/* $Id: out.c,v 1.28 2010/08/24 13:56:51 kristaps Exp $ */ /* * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -279,6 +279,26 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t *sz) i++; } + /* Handle embedded numerical subexp or escape. */ + + if ('(' == wp[i]) { + while (wp[i] && ')' != wp[i]) + if ('\\' == wp[i++]) { + /* Handle embedded escape. */ + *word = &wp[i]; + i += a2roffdeco(&dd, word, sz); + } + + if (')' == wp[i++]) + break; + + *d = DECO_NONE; + return(i - 1); + } else if ('\\' == wp[i]) { + *word = &wp[++i]; + i += a2roffdeco(&dd, word, sz); + } + break; case ('['): *d = DECO_SPECIAL; |