diff options
-rw-r--r-- | roff.7 | 9 | ||||
-rw-r--r-- | roff.c | 35 |
2 files changed, 32 insertions, 12 deletions
@@ -106,6 +106,15 @@ The .Cm key values may be invoked in subsequent text by using \e*(NN for two-letter pairs, \e*N for one-letter, and \e*[NNN] for arbitrary-length values. +.Pp +If +.Cm val +is begun with a double-quote mark, the mark is passed over. +.Cm val +consists of +.Em all +text following this point, including whitespace and trailing +double-quotes. .Ss \&de1 The syntax of this macro is the same as that of .Sx \&ig , @@ -969,30 +969,40 @@ roff_cond(ROFF_ARGS) static enum rofferr roff_ds(ROFF_ARGS) { - char *name, *string, *end; + char *name, *string; + + /* + * A symbol is named by the first word following the macro + * invocation up to a space. Its value is anything after the + * name's trailing whitespace and optional double-quote. Thus, + * + * [.ds foo "bar " ] + * + * will have `bar " ' as its value. + */ name = *bufp + pos; if ('\0' == *name) return(ROFF_IGN); string = name; + /* Read until end of name. */ while (*string && ' ' != *string) string++; + + /* Nil-terminate name. */ if (*string) - *(string++) = NULL; - if (*string && '"' == *string) - string++; + *(string++) = '\0'; + + /* Read past spaces. */ while (*string && ' ' == *string) string++; - end = string; - while (*end) - end++; - if (string < end) { - end--; - if (*end == '"') - *end = '\0'; - } + /* Read passed initial double-quote. */ + if (*string && '"' == *string) + string++; + + /* The rest is the value. */ roff_setstr(r, name, string); return(ROFF_IGN); } @@ -1060,6 +1070,7 @@ roff_setstr(struct roff *r, const char *name, const char *string) } else free(n->string); + ROFF_DEBUG("roff: new symbol: [%s] = [%s]\n", name, string); n->string = string ? strdup(string) : NULL; } |