version 1.40, 2010/05/07 05:54:09 |
version 1.42, 2010/05/07 15:49:36 |
Line 378 args(struct mdoc *m, int line, int *pos, |
|
Line 378 args(struct mdoc *m, int line, int *pos, |
|
{ |
{ |
int i; |
int i; |
char *p, *pp; |
char *p, *pp; |
|
enum margserr rc; |
|
|
/* |
/* |
* Parse out the terms (like `val' in `.Xx -arg val' or simply |
* Parse out the terms (like `val' in `.Xx -arg val' or simply |
Line 397 args(struct mdoc *m, int line, int *pos, |
|
Line 398 args(struct mdoc *m, int line, int *pos, |
|
assert(*pos); |
assert(*pos); |
assert(' ' != buf[*pos]); |
assert(' ' != buf[*pos]); |
|
|
if (0 == buf[*pos]) |
if ('\0' == buf[*pos]) |
return(ARGS_EOLN); |
return(ARGS_EOLN); |
|
|
/* |
/* |
Line 453 args(struct mdoc *m, int line, int *pos, |
|
Line 454 args(struct mdoc *m, int line, int *pos, |
|
break; |
break; |
} |
} |
|
|
|
/* By default, assume a phrase. */ |
|
rc = ARGS_PHRASE; |
|
|
/* |
/* |
* Adjust new-buffer position to be beyond delimiter |
* Adjust new-buffer position to be beyond delimiter |
* mark (e.g., Ta -> end + 2). |
* mark (e.g., Ta -> end + 2). |
*/ |
*/ |
if (p && pp) { |
if (p && pp) { |
*pos += pp < p ? 2 : 1; |
*pos += pp < p ? 2 : 1; |
|
rc = pp < p ? ARGS_PHRASE : ARGS_PPHRASE; |
p = pp < p ? pp : p; |
p = pp < p ? pp : p; |
} else if (p && ! pp) { |
} else if (p && ! pp) { |
|
rc = ARGS_PPHRASE; |
*pos += 1; |
*pos += 1; |
} else if (pp && ! p) { |
} else if (pp && ! p) { |
p = pp; |
p = pp; |
Line 488 args(struct mdoc *m, int line, int *pos, |
|
Line 494 args(struct mdoc *m, int line, int *pos, |
|
for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++) |
for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++) |
/* Skip ahead. */ ; |
/* Skip ahead. */ ; |
|
|
return(ARGS_PHRASE); |
return(rc); |
} |
} |
|
|
/* |
/* |