version 1.253, 2015/01/22 22:51:43 |
version 1.258, 2015/01/28 17:32:07 |
|
|
ROFF_minss, |
ROFF_minss, |
ROFF_mk, |
ROFF_mk, |
ROFF_mso, |
ROFF_mso, |
/* MAN_na; ignored in mdoc(7) */ |
ROFF_na, |
ROFF_ne, |
ROFF_ne, |
/* MAN_nf; ignored in mdoc(7) */ |
/* MAN_nf; ignored in mdoc(7) */ |
ROFF_nh, |
ROFF_nh, |
Line 580 static struct roffmac roffs[ROFF_MAX] = { |
|
Line 580 static struct roffmac roffs[ROFF_MAX] = { |
|
{ "minss", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "minss", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "mk", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "mk", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "mso", roff_insec, NULL, NULL, 0, NULL }, |
{ "mso", roff_insec, NULL, NULL, 0, NULL }, |
|
{ "na", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "ne", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "ne", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "nh", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "nh", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "nhychar", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "nhychar", roff_line_ignore, NULL, NULL, 0, NULL }, |
Line 608 static struct roffmac roffs[ROFF_MAX] = { |
|
Line 609 static struct roffmac roffs[ROFF_MAX] = { |
|
{ "po", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "po", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "ps", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "ps", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "psbb", roff_unsupp, NULL, NULL, 0, NULL }, |
{ "psbb", roff_unsupp, NULL, NULL, 0, NULL }, |
{ "pshape", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "pshape", roff_unsupp, NULL, NULL, 0, NULL }, |
{ "pso", roff_insec, NULL, NULL, 0, NULL }, |
{ "pso", roff_insec, NULL, NULL, 0, NULL }, |
{ "ptr", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "ptr", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "pvs", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "pvs", roff_line_ignore, NULL, NULL, 0, NULL }, |
Line 640 static struct roffmac roffs[ROFF_MAX] = { |
|
Line 641 static struct roffmac roffs[ROFF_MAX] = { |
|
{ "sv", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "sv", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "sy", roff_insec, NULL, NULL, 0, NULL }, |
{ "sy", roff_insec, NULL, NULL, 0, NULL }, |
{ "T&", roff_T_, NULL, NULL, 0, NULL }, |
{ "T&", roff_T_, NULL, NULL, 0, NULL }, |
{ "ta", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "ta", roff_unsupp, NULL, NULL, 0, NULL }, |
{ "tc", roff_unsupp, NULL, NULL, 0, NULL }, |
{ "tc", roff_unsupp, NULL, NULL, 0, NULL }, |
{ "TE", roff_TE, NULL, NULL, 0, NULL }, |
{ "TE", roff_TE, NULL, NULL, 0, NULL }, |
{ "TH", roff_TH, NULL, NULL, 0, NULL }, |
{ "TH", roff_TH, NULL, NULL, 0, NULL }, |
{ "ti", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "ti", roff_unsupp, NULL, NULL, 0, NULL }, |
{ "tkf", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "tkf", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "tl", roff_unsupp, NULL, NULL, 0, NULL }, |
{ "tl", roff_unsupp, NULL, NULL, 0, NULL }, |
{ "tm", roff_line_ignore, NULL, NULL, 0, NULL }, |
{ "tm", roff_line_ignore, NULL, NULL, 0, NULL }, |
Line 1236 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
Line 1237 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
if (r->tbl != NULL && (t == ROFF_MAX || t == ROFF_TS)) { |
if (r->tbl != NULL && (t == ROFF_MAX || t == ROFF_TS)) { |
mandoc_msg(MANDOCERR_TBLMACRO, r->parse, |
mandoc_msg(MANDOCERR_TBLMACRO, r->parse, |
ln, pos, buf->buf + spos); |
ln, pos, buf->buf + spos); |
return(ROFF_IGN); |
if (t == ROFF_TS) |
|
return(ROFF_IGN); |
|
while (buf->buf[pos] != '\0' && buf->buf[pos] != ' ') |
|
pos++; |
|
while (buf->buf[pos] != '\0' && buf->buf[pos] == ' ') |
|
pos++; |
|
return(tbl_read(r->tbl, ln, buf->buf, pos)); |
} |
} |
|
|
/* |
/* |
Line 1641 roff_getnum(const char *v, int *pos, int *res) |
|
Line 1648 roff_getnum(const char *v, int *pos, int *res) |
|
if (n) |
if (n) |
*res = -*res; |
*res = -*res; |
|
|
*pos = p; |
/* Each number may be followed by one optional scaling unit. */ |
return 1; |
|
|
switch (v[p]) { |
|
case 'f': |
|
*res *= 65536; |
|
break; |
|
case 'i': |
|
*res *= 240; |
|
break; |
|
case 'c': |
|
*res *= 240; |
|
*res /= 2.54; |
|
break; |
|
case 'v': |
|
/* FALLTROUGH */ |
|
case 'P': |
|
*res *= 40; |
|
break; |
|
case 'm': |
|
/* FALLTROUGH */ |
|
case 'n': |
|
*res *= 24; |
|
break; |
|
case 'p': |
|
*res *= 10; |
|
*res /= 3; |
|
break; |
|
case 'u': |
|
break; |
|
case 'M': |
|
*res *= 6; |
|
*res /= 25; |
|
break; |
|
default: |
|
p--; |
|
break; |
|
} |
|
|
|
*pos = p + 1; |
|
return(1); |
} |
} |
|
|
/* |
/* |
Line 2331 roff_TE(ROFF_ARGS) |
|
Line 2376 roff_TE(ROFF_ARGS) |
|
if (NULL == r->tbl) |
if (NULL == r->tbl) |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse, |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse, |
ln, ppos, "TE"); |
ln, ppos, "TE"); |
else |
else if ( ! tbl_end(&r->tbl)) { |
tbl_end(&r->tbl); |
free(buf->buf); |
|
buf->buf = mandoc_strdup(".sp"); |
|
buf->sz = 4; |
|
return(ROFF_REPARSE); |
|
} |
return(ROFF_IGN); |
return(ROFF_IGN); |
} |
} |
|
|