diff options
| author | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-05-14 12:55:22 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-05-14 12:55:22 +0000 |
| commit | a833976284885670ea154f3f0327d83d71f658c2 (patch) | |
| tree | 5c6ce0bc2300bb8ed3b801369a1876a34f74d3e7 /mdoc_macro.c | |
| parent | 342d24c886a6b292ac067b3d34f489262f2fc6dc (diff) | |
| download | mandoc-a833976284885670ea154f3f0327d83d71f658c2.tar.gz | |
Proper handling of quoted tab-separated column lists.
Diffstat (limited to 'mdoc_macro.c')
| -rw-r--r-- | mdoc_macro.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/mdoc_macro.c b/mdoc_macro.c index 75255c0c..fe794bbc 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -48,7 +48,7 @@ static int append_delims(struct mdoc *, static enum mdoct lookup(enum mdoct, const char *); static enum mdoct lookup_raw(const char *); static int phrase(struct mdoc *, int, int, - char *, enum margserr, int); + char *, enum margserr); static enum mdoct rew_alt(enum mdoct); static int rew_dobreak(enum mdoct, const struct mdoc_node *); @@ -888,7 +888,7 @@ in_line(MACRO_PROT_ARGS) static int blk_full(MACRO_PROT_ARGS) { - int la, pcnt; + int la; struct mdoc_arg *arg; struct mdoc_node *head; /* save of head macro */ struct mdoc_node *body; /* save of body macro */ @@ -959,7 +959,7 @@ blk_full(MACRO_PROT_ARGS) ac = ARGS_ERROR; - for (pcnt = 0; ; ) { + for ( ; ; ) { la = *pos; lac = ac; ac = mdoc_args(m, line, pos, buf, tok, &p); @@ -1007,7 +1007,7 @@ blk_full(MACRO_PROT_ARGS) else if (ARGS_PEND == ac && ARGS_PHRASE == lac) ac = ARGS_PHRASE; - if ( ! phrase(m, line, la, buf, ac, pcnt++)) + if ( ! phrase(m, line, la, buf, ac)) return(0); if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) return(0); @@ -1536,8 +1536,7 @@ obsolete(MACRO_PROT_ARGS) * macro is encountered. */ static int -phrase(struct mdoc *m, int line, int ppos, char *buf, - enum margserr ac, int count) +phrase(struct mdoc *m, int line, int ppos, char *buf, enum margserr ac) { int la, pos; enum margserr aac; @@ -1548,14 +1547,10 @@ phrase(struct mdoc *m, int line, int ppos, char *buf, ARGS_PEND == ac || ARGS_PPHRASE == ac); - if (count && ARGS_PPHRASE == ac) - return(mdoc_word_alloc(m, line, ppos, &buf[ppos])); - for (pos = ppos; ; ) { la = pos; - /* Note: no calling context! */ - aac = mdoc_zargs(m, line, &pos, buf, 0, &p); + aac = mdoc_zargs(m, line, &pos, buf, ARGS_PPHRASED, &p); if (ARGS_ERROR == aac) return(0); |