version 1.86, 2012/11/18 00:05:35 |
version 1.91, 2014/03/30 19:47:48 |
|
|
|
|
#include "mdoc.h" |
#include "mdoc.h" |
#include "mandoc.h" |
#include "mandoc.h" |
|
#include "mandoc_aux.h" |
#include "libmdoc.h" |
#include "libmdoc.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
|
|
Line 260 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
Line 261 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
{ ARGSFL_NONE, NULL }, /* %C */ |
{ ARGSFL_NONE, NULL }, /* %C */ |
{ ARGSFL_NONE, NULL }, /* Es */ |
{ ARGSFL_NONE, NULL }, /* Es */ |
{ ARGSFL_NONE, NULL }, /* En */ |
{ ARGSFL_NONE, NULL }, /* En */ |
{ ARGSFL_NONE, NULL }, /* Dx */ |
{ ARGSFL_DELIM, NULL }, /* Dx */ |
{ ARGSFL_NONE, NULL }, /* %Q */ |
{ ARGSFL_NONE, NULL }, /* %Q */ |
{ ARGSFL_NONE, NULL }, /* br */ |
{ ARGSFL_NONE, NULL }, /* br */ |
{ ARGSFL_NONE, NULL }, /* sp */ |
{ ARGSFL_NONE, NULL }, /* sp */ |
{ ARGSFL_NONE, NULL }, /* %U */ |
{ ARGSFL_NONE, NULL }, /* %U */ |
{ ARGSFL_NONE, NULL }, /* Ta */ |
{ ARGSFL_NONE, NULL }, /* Ta */ |
|
{ ARGSFL_NONE, NULL }, /* ll */ |
}; |
}; |
|
|
|
|
Line 447 args(struct mdoc *mdoc, int line, int *pos, |
|
Line 449 args(struct mdoc *mdoc, int line, int *pos, |
|
char *buf, enum argsflag fl, char **v) |
char *buf, enum argsflag fl, char **v) |
{ |
{ |
char *p, *pp; |
char *p, *pp; |
|
int pairs; |
enum margserr rc; |
enum margserr rc; |
|
|
if ('\0' == buf[*pos]) { |
if ('\0' == buf[*pos]) { |
Line 535 args(struct mdoc *mdoc, int line, int *pos, |
|
Line 538 args(struct mdoc *mdoc, int line, int *pos, |
|
/* Skip ahead. */ ; |
/* Skip ahead. */ ; |
|
|
return(rc); |
return(rc); |
} |
} |
|
|
/* |
/* |
* Process a quoted literal. A quote begins with a double-quote |
* Process a quoted literal. A quote begins with a double-quote |
* and ends with a double-quote NOT preceded by a double-quote. |
* and ends with a double-quote NOT preceded by a double-quote. |
|
* NUL-terminate the literal in place. |
|
* Collapse pairs of quotes inside quoted literals. |
* Whitespace is NOT involved in literal termination. |
* Whitespace is NOT involved in literal termination. |
*/ |
*/ |
|
|
Line 550 args(struct mdoc *mdoc, int line, int *pos, |
|
Line 555 args(struct mdoc *mdoc, int line, int *pos, |
|
if (MDOC_PPHRASE & mdoc->flags) |
if (MDOC_PPHRASE & mdoc->flags) |
mdoc->flags |= MDOC_PHRASELIT; |
mdoc->flags |= MDOC_PHRASELIT; |
|
|
|
pairs = 0; |
for ( ; buf[*pos]; (*pos)++) { |
for ( ; buf[*pos]; (*pos)++) { |
|
/* Move following text left after quoted quotes. */ |
|
if (pairs) |
|
buf[*pos - pairs] = buf[*pos]; |
if ('\"' != buf[*pos]) |
if ('\"' != buf[*pos]) |
continue; |
continue; |
|
/* Unquoted quotes end quoted args. */ |
if ('\"' != buf[*pos + 1]) |
if ('\"' != buf[*pos + 1]) |
break; |
break; |
|
/* Quoted quotes collapse. */ |
|
pairs++; |
(*pos)++; |
(*pos)++; |
} |
} |
|
if (pairs) |
|
buf[*pos - pairs] = '\0'; |
|
|
if ('\0' == buf[*pos]) { |
if ('\0' == buf[*pos]) { |
if (MDOC_PPHRASE & mdoc->flags) |
if (MDOC_PPHRASE & mdoc->flags) |