version 1.61, 2015/03/05 08:35:35 |
version 1.64, 2015/03/07 11:49:32 |
Line 61 static void doitemize(struct texi *, enum texicmd, siz |
|
Line 61 static void doitemize(struct texi *, enum texicmd, siz |
|
static void dolink(struct texi *, enum texicmd, size_t *); |
static void dolink(struct texi *, enum texicmd, size_t *); |
static void domacro(struct texi *, enum texicmd, size_t *); |
static void domacro(struct texi *, enum texicmd, size_t *); |
static void domath(struct texi *, enum texicmd, size_t *); |
static void domath(struct texi *, enum texicmd, size_t *); |
|
#if 0 |
|
static void domenu(struct texi *, enum texicmd, size_t *); |
|
#endif |
static void domultitable(struct texi *, enum texicmd, size_t *); |
static void domultitable(struct texi *, enum texicmd, size_t *); |
static void doquotation(struct texi *, enum texicmd, size_t *); |
static void doquotation(struct texi *, enum texicmd, size_t *); |
static void dotable(struct texi *, enum texicmd, size_t *); |
static void dotable(struct texi *, enum texicmd, size_t *); |
Line 544 dodefn(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 547 dodefn(struct texi *p, enum texicmd cmd, size_t *pos) |
|
break; |
break; |
} |
} |
teximacro(p, "Bd -filled -offset indent"); |
teximacro(p, "Bd -filled -offset indent"); |
p->seenvs = 1; |
|
parseto(p, pos, blk); |
parseto(p, pos, blk); |
teximacro(p, "Ed"); |
teximacro(p, "Ed"); |
|
p->seenvs = 1; |
} |
} |
|
|
static void |
static void |
Line 755 doinline(struct texi *p, enum texicmd cmd, size_t *pos |
|
Line 758 doinline(struct texi *p, enum texicmd cmd, size_t *pos |
|
|
|
teximacroopen(p, macro); |
teximacroopen(p, macro); |
p->seenws = 0; |
p->seenws = 0; |
|
if (TEXICMD_CODE == cmd) |
|
p->literal++; |
if (TEXICMD_SC == cmd) |
if (TEXICMD_SC == cmd) |
p->uppercase++; |
p->uppercase++; |
parsebracket(p, pos, 0); |
parsebracket(p, pos, 0); |
if (TEXICMD_SC == cmd) |
if (TEXICMD_SC == cmd) |
p->uppercase--; |
p->uppercase--; |
|
if (TEXICMD_CODE == cmd) |
|
p->literal--; |
texipunctuate(p, pos); |
texipunctuate(p, pos); |
teximacroclose(p); |
teximacroclose(p); |
} |
} |
Line 880 doverbatim(struct texi *p, enum texicmd cmd, size_t *p |
|
Line 887 doverbatim(struct texi *p, enum texicmd cmd, size_t *p |
|
advance(p, pos); |
advance(p, pos); |
} |
} |
teximacro(p, "Ed"); |
teximacro(p, "Ed"); |
|
p->seenvs = 1; |
if (*pos < BUFSZ(p)) |
if (*pos < BUFSZ(p)) |
advanceto(p, pos, endpos + endsz); |
advanceto(p, pos, endpos + endsz); |
} |
} |
Line 1029 dodisplay(struct texi *p, enum texicmd cmd, size_t *po |
|
Line 1037 dodisplay(struct texi *p, enum texicmd cmd, size_t *po |
|
break; |
break; |
} |
} |
|
|
p->seenvs = 1; |
|
parseto(p, pos, texitoks[cmd].tok); |
parseto(p, pos, texitoks[cmd].tok); |
teximacro(p, "Ed"); |
teximacro(p, "Ed"); |
|
p->seenvs = 1; |
} |
} |
|
|
static void |
static void |
Line 1045 doexample(struct texi *p, enum texicmd cmd, size_t *po |
|
Line 1053 doexample(struct texi *p, enum texicmd cmd, size_t *po |
|
parseto(p, pos, texitoks[cmd].tok); |
parseto(p, pos, texitoks[cmd].tok); |
p->literal--; |
p->literal--; |
teximacro(p, "Ed"); |
teximacro(p, "Ed"); |
|
p->seenvs = 1; |
} |
} |
|
|
static void |
static void |
Line 1445 doquotation(struct texi *p, enum texicmd cmd, size_t * |
|
Line 1454 doquotation(struct texi *p, enum texicmd cmd, size_t * |
|
teximacro(p, "Qc"); |
teximacro(p, "Qc"); |
} |
} |
|
|
|
#if 0 |
static void |
static void |
|
domenu(struct texi *p, enum texicmd cmd, size_t *pos) |
|
{ |
|
size_t start; |
|
|
|
if (NULL != p->chapters) { |
|
doignblock(p, cmd, pos); |
|
return; |
|
} |
|
|
|
advanceeoln(p, pos, 1); |
|
|
|
teximacro(p, "Bl -tag -width Ds"); |
|
while (*pos < BUFSZ(p)) { |
|
/* Read to next menu item. */ |
|
while (*pos < BUFSZ(p) && ismspace(BUF(p)[*pos])) |
|
advance(p, pos); |
|
if ('*' != BUF(p)[*pos]) |
|
break; |
|
|
|
assert('*' == BUF(p)[*pos]); |
|
advance(p, pos); |
|
while (*pos < BUFSZ(p) && ismspace(BUF(p)[*pos])) |
|
advance(p, pos); |
|
start = *pos; |
|
while (*pos < BUFSZ(p) && ':' != BUF(p)[*pos]) |
|
advance(p, pos); |
|
if (*pos == BUFSZ(p) || *pos == start) { |
|
texiwarn(p, "empty menu name"); |
|
break; |
|
} |
|
teximacroopen(p, "It"); |
|
teximacroopen(p, "Sx"); |
|
for ( ; start < *pos; start++) |
|
texiputchar(p, BUF(p)[start]); |
|
teximacroclose(p); |
|
teximacroclose(p); |
|
|
|
advance(p, pos); |
|
if (*pos == BUFSZ(p)) { |
|
texiwarn(p, "bad menu syntax"); |
|
break; |
|
} else if (':' != BUF(p)[*pos]) { |
|
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) |
|
advance(p, pos); |
|
start = *pos; |
|
while (*pos < BUFSZ(p)) { |
|
switch (BUF(p)[*pos]) { |
|
case ('\t'): |
|
case ('\n'): |
|
case (','): |
|
break; |
|
case ('.'): |
|
if (*pos + 1 == BUFSZ(p)) { |
|
advance(p, pos); |
|
continue; |
|
} |
|
if (' ' == BUF(p)[*pos + 1]) { |
|
advance(p, pos); |
|
break; |
|
} |
|
/* FALLTHROUGH */ |
|
default: |
|
advance(p, pos); |
|
continue; |
|
} |
|
advance(p, pos); |
|
break; |
|
} |
|
} else |
|
advance(p, pos); |
|
|
|
while (*pos < BUFSZ(p) && isws(BUF(p)[*pos])) |
|
advance(p, pos); |
|
|
|
if (*pos == BUFSZ(p)) { |
|
texiwarn(p, "bad menu syntax"); |
|
break; |
|
} |
|
|
|
while (*pos < BUFSZ(p)) { |
|
if ('*' == BUF(p)[*pos]) |
|
break; |
|
if ('\n' != BUF(p)[*pos]) { |
|
texiputchar(p, BUF(p)[*pos]); |
|
advance(p, pos); |
|
continue; |
|
} |
|
advance(p, pos); |
|
while (*pos == BUFSZ(p)) { |
|
texiwarn(p, "bad menu syntax"); |
|
break; |
|
} |
|
if ('\n' == BUF(p)[*pos]) { |
|
advance(p, pos); |
|
break; |
|
} else if ('*' == BUF(p)[*pos]) { |
|
continue; |
|
} else if ('@' == BUF(p)[*pos]) |
|
break; |
|
texiputchar(p, ' '); |
|
} |
|
} |
|
|
|
teximacro(p, "El"); |
|
|
|
doignblock(p, cmd, pos); |
|
} |
|
#endif |
|
|
|
static void |
domath(struct texi *p, enum texicmd cmd, size_t *pos) |
domath(struct texi *p, enum texicmd cmd, size_t *pos) |
{ |
{ |
|
|
Line 1668 dosection(struct texi *p, enum texicmd cmd, size_t *po |
|
Line 1788 dosection(struct texi *p, enum texicmd cmd, size_t *po |
|
teximacroopen(p, sects[sec]); |
teximacroopen(p, sects[sec]); |
parseeoln(p, pos); |
parseeoln(p, pos); |
teximacroclose(p); |
teximacroclose(p); |
p->seenvs = 1; |
|
} |
} |
|
|
static void |
static void |
Line 1700 doitem(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 1819 doitem(struct texi *p, enum texicmd cmd, size_t *pos) |
|
|
|
/* Multitable is using raw tbl(7). */ |
/* Multitable is using raw tbl(7). */ |
if (TEXILIST_TABLE == p->list) { |
if (TEXILIST_TABLE == p->list) { |
texiputchar(p, '\n'); |
if (p->outcol > 0) |
|
texiputchar(p, '\n'); |
return; |
return; |
} |
} |
|
|
Line 1722 doitem(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 1842 doitem(struct texi *p, enum texicmd cmd, size_t *pos) |
|
} |
} |
|
|
/* Trick so we don't start with Pp. */ |
/* Trick so we don't start with Pp. */ |
p->seenvs = 1; |
|
parseeoln(p, pos); |
parseeoln(p, pos); |
|
|
if (TEXILIST_ITEM == p->list) |
if (TEXILIST_ITEM == p->list) |
Line 1736 dotab(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 1855 dotab(struct texi *p, enum texicmd cmd, size_t *pos) |
|
{ |
{ |
|
|
/* This command is only useful in @multitable. */ |
/* This command is only useful in @multitable. */ |
if (TEXILIST_TABLE == p->list) |
if (TEXILIST_TABLE == p->list && p->outcol) |
texiputchar(p, '\t'); |
texiputchar(p, '\t'); |
} |
} |
|
|
Line 1748 domultitable(struct texi *p, enum texicmd cmd, size_t |
|
Line 1867 domultitable(struct texi *p, enum texicmd cmd, size_t |
|
enum texicmd type; |
enum texicmd type; |
size_t i, end, columns; |
size_t i, end, columns; |
|
|
|
texivspace(p); |
p->list = TEXILIST_TABLE; |
p->list = TEXILIST_TABLE; |
/* |
/* |
* TS/TE blocks aren't "in mdoc(7)", so we can disregard the |
* TS/TE blocks aren't "in mdoc(7)", so we can disregard the |
Line 1801 domultitable(struct texi *p, enum texicmd cmd, size_t |
|
Line 1921 domultitable(struct texi *p, enum texicmd cmd, size_t |
|
texiputchar(p, ' '); |
texiputchar(p, ' '); |
texiputchar(p, 'l'); |
texiputchar(p, 'l'); |
} |
} |
texiputchars(p, ".\n"); |
|
|
texiputchar(p, '.'); |
|
texiputchar(p, '\n'); |
p->outmacro++; |
p->outmacro++; |
parseto(p, pos, texitoks[cmd].tok); |
parseto(p, pos, texitoks[cmd].tok); |
p->outmacro--; |
p->outmacro--; |
Line 1819 dotable(struct texi *p, enum texicmd cmd, size_t *pos) |
|
Line 1941 dotable(struct texi *p, enum texicmd cmd, size_t *pos) |
|
|
|
p->list = TEXILIST_ITEM; |
p->list = TEXILIST_ITEM; |
teximacro(p, "Bl -tag -width Ds"); |
teximacro(p, "Bl -tag -width Ds"); |
p->seenvs = 1; |
|
parseto(p, pos, texitoks[cmd].tok); |
parseto(p, pos, texitoks[cmd].tok); |
teximacro(p, "El"); |
teximacro(p, "El"); |
|
p->seenvs = 1; |
p->list = sv; |
p->list = sv; |
} |
} |
|
|
Line 1850 doenumerate(struct texi *p, enum texicmd cmd, size_t * |
|
Line 1972 doenumerate(struct texi *p, enum texicmd cmd, size_t * |
|
|
|
p->list = TEXILIST_NOITEM; |
p->list = TEXILIST_NOITEM; |
teximacro(p, "Bl -enum"); |
teximacro(p, "Bl -enum"); |
p->seenvs = 1; |
|
parseto(p, pos, texitoks[cmd].tok); |
parseto(p, pos, texitoks[cmd].tok); |
teximacro(p, "El"); |
teximacro(p, "El"); |
|
p->seenvs = 1; |
p->list = sv; |
p->list = sv; |
} |
} |
|
|
Line 1865 doitemize(struct texi *p, enum texicmd cmd, size_t *po |
|
Line 1987 doitemize(struct texi *p, enum texicmd cmd, size_t *po |
|
|
|
p->list = TEXILIST_NOITEM; |
p->list = TEXILIST_NOITEM; |
teximacro(p, "Bl -bullet"); |
teximacro(p, "Bl -bullet"); |
p->seenvs = 1; |
|
parseto(p, pos, texitoks[cmd].tok); |
parseto(p, pos, texitoks[cmd].tok); |
teximacro(p, "El"); |
teximacro(p, "El"); |
|
p->seenvs = 1; |
p->list = sv; |
p->list = sv; |
} |
} |
|
|