version 1.277, 2015/10/06 18:32:20 |
version 1.278, 2015/10/12 00:08:16 |
Line 1037 roff_node_append(struct roff_man *man, struct roff_nod |
|
Line 1037 roff_node_append(struct roff_man *man, struct roff_nod |
|
break; |
break; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ROFFT_TAIL: |
case ROFFT_TAIL: |
/* FALLTHROUGH */ |
|
case ROFFT_HEAD: |
case ROFFT_HEAD: |
n->norm = n->parent->norm; |
n->norm = n->parent->norm; |
break; |
break; |
Line 1335 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
Line 1334 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
res = NULL; |
res = NULL; |
break; |
break; |
case 'B': |
case 'B': |
/* FALLTHROUGH */ |
|
case 'w': |
case 'w': |
term = cp[1]; |
term = cp[1]; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 1410 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
Line 1408 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
} |
} |
switch (mandoc_escape(&cp, NULL, NULL)) { |
switch (mandoc_escape(&cp, NULL, NULL)) { |
case ESCAPE_SPECIAL: |
case ESCAPE_SPECIAL: |
/* FALLTHROUGH */ |
|
case ESCAPE_UNICODE: |
case ESCAPE_UNICODE: |
/* FALLTHROUGH */ |
|
case ESCAPE_NUMBERED: |
case ESCAPE_NUMBERED: |
/* FALLTHROUGH */ |
|
case ESCAPE_OVERSTRIKE: |
case ESCAPE_OVERSTRIKE: |
naml++; |
naml++; |
break; |
break; |
Line 1721 roff_cblock(ROFF_ARGS) |
|
Line 1716 roff_cblock(ROFF_ARGS) |
|
switch (r->last->tok) { |
switch (r->last->tok) { |
case ROFF_am: |
case ROFF_am: |
/* ROFF_am1 is remapped to ROFF_am in roff_block(). */ |
/* ROFF_am1 is remapped to ROFF_am in roff_block(). */ |
/* FALLTHROUGH */ |
|
case ROFF_ami: |
case ROFF_ami: |
/* FALLTHROUGH */ |
|
case ROFF_de: |
case ROFF_de: |
/* ROFF_de1 is remapped to ROFF_de in roff_block(). */ |
/* ROFF_de1 is remapped to ROFF_de in roff_block(). */ |
/* FALLTHROUGH */ |
|
case ROFF_dei: |
case ROFF_dei: |
/* FALLTHROUGH */ |
|
case ROFF_ig: |
case ROFF_ig: |
break; |
break; |
default: |
default: |
Line 1770 roff_ccond(struct roff *r, int ln, int ppos) |
|
Line 1761 roff_ccond(struct roff *r, int ln, int ppos) |
|
|
|
switch (r->last->tok) { |
switch (r->last->tok) { |
case ROFF_el: |
case ROFF_el: |
/* FALLTHROUGH */ |
|
case ROFF_ie: |
case ROFF_ie: |
/* FALLTHROUGH */ |
|
case ROFF_if: |
case ROFF_if: |
break; |
break; |
default: |
default: |
Line 2059 roff_getnum(const char *v, int *pos, int *res, int fla |
|
Line 2048 roff_getnum(const char *v, int *pos, int *res, int fla |
|
scaled = *res * 240 / 2.54; |
scaled = *res * 240 / 2.54; |
break; |
break; |
case 'v': |
case 'v': |
/* FALLTHROUGH */ |
|
case 'P': |
case 'P': |
scaled = *res * 40; |
scaled = *res * 40; |
break; |
break; |
case 'm': |
case 'm': |
/* FALLTHROUGH */ |
|
case 'n': |
case 'n': |
scaled = *res * 24; |
scaled = *res * 24; |
break; |
break; |
Line 2153 roff_evalcond(struct roff *r, int ln, char *v, int *po |
|
Line 2140 roff_evalcond(struct roff *r, int ln, char *v, int *po |
|
case '\0': |
case '\0': |
return 0; |
return 0; |
case 'n': |
case 'n': |
/* FALLTHROUGH */ |
|
case 'o': |
case 'o': |
(*pos)++; |
(*pos)++; |
return wanttrue; |
return wanttrue; |
case 'c': |
case 'c': |
/* FALLTHROUGH */ |
|
case 'd': |
case 'd': |
/* FALLTHROUGH */ |
|
case 'e': |
case 'e': |
/* FALLTHROUGH */ |
|
case 't': |
case 't': |
/* FALLTHROUGH */ |
|
case 'v': |
case 'v': |
(*pos)++; |
(*pos)++; |
return !wanttrue; |
return !wanttrue; |
Line 2340 roff_getop(const char *v, int *pos, char *res) |
|
Line 2322 roff_getop(const char *v, int *pos, char *res) |
|
|
|
switch (*res) { |
switch (*res) { |
case '+': |
case '+': |
/* FALLTHROUGH */ |
|
case '-': |
case '-': |
/* FALLTHROUGH */ |
|
case '*': |
case '*': |
/* FALLTHROUGH */ |
|
case '/': |
case '/': |
/* FALLTHROUGH */ |
|
case '%': |
case '%': |
/* FALLTHROUGH */ |
|
case '&': |
case '&': |
/* FALLTHROUGH */ |
|
case ':': |
case ':': |
break; |
break; |
case '<': |
case '<': |