mandoc/mdoc_macro.c - diff

Return to mdoc_macro.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mdoc_macro.c between version 1.61 and 1.62

version 1.61, 2010/05/13 11:34:45

version 1.62, 2010/05/14 12:55:22

Line 48 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 *);

Line 888 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 */

Line 959 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);

Line 1007 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);

Line 1536 obsolete(MACRO_PROT_ARGS)

* macro is encountered.

static int

phrase(struct mdoc *m, int line, int ppos, char *buf,

phrase(struct mdoc *m, int line, int ppos, char *buf, enum margserr ac)

enum margserr ac, int count)

{

int la, pos;

enum margserr aac;

Line 1548 phrase(struct mdoc *m, int line, int ppos, char *buf,

Line 1547 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, ARGS_PPHRASED, &p);

aac = mdoc_zargs(m, line, &pos, buf, 0, &p);

if (ARGS_ERROR == aac)

return(0);

CVSweb