version 1.162, 2014/12/23 09:31:46 |
version 1.163, 2014/12/23 13:48:57 |
|
|
struct mtermp { |
struct mtermp { |
int fl; |
int fl; |
#define MANT_LITERAL (1 << 0) |
#define MANT_LITERAL (1 << 0) |
size_t lmargin[MAXMARGINS]; /* margins (incl. visible page) */ |
int lmargin[MAXMARGINS]; /* margins (incl. vis. page) */ |
int lmargincur; /* index of current margin */ |
int lmargincur; /* index of current margin */ |
int lmarginsz; /* actual number of nested margins */ |
int lmarginsz; /* actual number of nested margins */ |
size_t offset; /* default offset to visible page */ |
size_t offset; /* default offset to visible page */ |
|
|
#define MAN_NOTEXT (1 << 0) /* Never has text children. */ |
#define MAN_NOTEXT (1 << 0) /* Never has text children. */ |
}; |
}; |
|
|
static int a2width(const struct termp *, const char *); |
|
|
|
static void print_man_nodelist(DECL_ARGS); |
static void print_man_nodelist(DECL_ARGS); |
static void print_man_node(DECL_ARGS); |
static void print_man_node(DECL_ARGS); |
static void print_man_head(struct termp *, const void *); |
static void print_man_head(struct termp *, const void *); |
Line 183 terminal_man(void *arg, const struct man *man) |
|
Line 181 terminal_man(void *arg, const struct man *man) |
|
} |
} |
} |
} |
|
|
static int |
|
a2width(const struct termp *p, const char *cp) |
|
{ |
|
struct roffsu su; |
|
|
|
if ( ! a2roffsu(cp, &su, SCALE_EN)) |
|
return(-1); |
|
|
|
return((int)term_hspan(p, &su)); |
|
} |
|
|
|
/* |
/* |
* Printing leading vertical space before a block. |
* Printing leading vertical space before a block. |
* This is used for the paragraph macros. |
* This is used for the paragraph macros. |
Line 412 pre_ft(DECL_ARGS) |
|
Line 399 pre_ft(DECL_ARGS) |
|
static int |
static int |
pre_in(DECL_ARGS) |
pre_in(DECL_ARGS) |
{ |
{ |
int len, less; |
struct roffsu su; |
size_t v; |
|
const char *cp; |
const char *cp; |
|
size_t v; |
|
int less; |
|
|
term_newln(p); |
term_newln(p); |
|
|
Line 433 pre_in(DECL_ARGS) |
|
Line 421 pre_in(DECL_ARGS) |
|
else |
else |
cp--; |
cp--; |
|
|
if ((len = a2width(p, ++cp)) < 0) |
if ( ! a2roffsu(++cp, &su, SCALE_EN)) |
return(0); |
return(0); |
|
|
v = (size_t)len; |
v = term_hspan(p, &su); |
|
|
if (less < 0) |
if (less < 0) |
p->offset -= p->offset > v ? v : p->offset; |
p->offset -= p->offset > v ? v : p->offset; |
|
|
pre_sp(DECL_ARGS) |
pre_sp(DECL_ARGS) |
{ |
{ |
struct roffsu su; |
struct roffsu su; |
char *s; |
int i, len; |
size_t i, len; |
|
int neg; |
|
|
|
if ((NULL == n->prev && n->parent)) { |
if ((NULL == n->prev && n->parent)) { |
switch (n->parent->tok) { |
switch (n->parent->tok) { |
Line 474 pre_sp(DECL_ARGS) |
|
Line 460 pre_sp(DECL_ARGS) |
|
} |
} |
} |
} |
|
|
neg = 0; |
if (n->tok == MAN_br) |
switch (n->tok) { |
|
case MAN_br: |
|
len = 0; |
len = 0; |
break; |
else if (n->child == NULL) |
default: |
len = 1; |
if (NULL == n->child) { |
else { |
len = 1; |
if ( ! a2roffsu(n->child->string, &su, SCALE_VS)) |
break; |
|
} |
|
s = n->child->string; |
|
if ('-' == *s) { |
|
neg = 1; |
|
s++; |
|
} |
|
if ( ! a2roffsu(s, &su, SCALE_VS)) |
|
su.scale = 1.0; |
su.scale = 1.0; |
len = term_vspan(p, &su); |
len = term_vspan(p, &su); |
break; |
|
} |
} |
|
|
if (0 == len) |
if (len == 0) |
term_newln(p); |
term_newln(p); |
else if (neg) |
else if (len < 0) |
p->skipvsp += len; |
p->skipvsp -= len; |
else |
else |
for (i = 0; i < len; i++) |
for (i = 0; i < len; i++) |
term_vspace(p); |
term_vspace(p); |
Line 509 pre_sp(DECL_ARGS) |
|
Line 484 pre_sp(DECL_ARGS) |
|
static int |
static int |
pre_HP(DECL_ARGS) |
pre_HP(DECL_ARGS) |
{ |
{ |
size_t len, one; |
struct roffsu su; |
int ival; |
|
const struct man_node *nn; |
const struct man_node *nn; |
|
int len; |
|
|
switch (n->type) { |
switch (n->type) { |
case MAN_BLOCK: |
case MAN_BLOCK: |
Line 528 pre_HP(DECL_ARGS) |
|
Line 503 pre_HP(DECL_ARGS) |
|
p->trailspace = 2; |
p->trailspace = 2; |
} |
} |
|
|
len = mt->lmargin[mt->lmargincur]; |
|
ival = -1; |
|
|
|
/* Calculate offset. */ |
/* Calculate offset. */ |
|
|
if (NULL != (nn = n->parent->head->child)) |
if ((nn = n->parent->head->child) != NULL && |
if ((ival = a2width(p, nn->string)) >= 0) |
a2roffsu(nn->string, &su, SCALE_EN)) { |
len = (size_t)ival; |
len = term_hspan(p, &su); |
|
mt->lmargin[mt->lmargincur] = len; |
|
} else |
|
len = mt->lmargin[mt->lmargincur]; |
|
|
one = term_len(p, 1); |
|
if (len < one) |
|
len = one; |
|
|
|
p->offset = mt->offset; |
p->offset = mt->offset; |
p->rmargin = mt->offset + len; |
if (len > 0 || (size_t)(-len) < mt->offset) |
|
p->rmargin = mt->offset + len; |
|
else |
|
p->rmargin = 0; |
|
|
if (ival >= 0) |
|
mt->lmargin[mt->lmargincur] = (size_t)ival; |
|
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 587 pre_PP(DECL_ARGS) |
|
Line 558 pre_PP(DECL_ARGS) |
|
static int |
static int |
pre_IP(DECL_ARGS) |
pre_IP(DECL_ARGS) |
{ |
{ |
|
struct roffsu su; |
const struct man_node *nn; |
const struct man_node *nn; |
size_t len; |
int len, savelit; |
int savelit, ival; |
|
|
|
switch (n->type) { |
switch (n->type) { |
case MAN_BODY: |
case MAN_BODY: |
Line 606 pre_IP(DECL_ARGS) |
|
Line 577 pre_IP(DECL_ARGS) |
|
return(1); |
return(1); |
} |
} |
|
|
len = mt->lmargin[mt->lmargincur]; |
|
ival = -1; |
|
|
|
/* Calculate the offset from the optional second argument. */ |
/* Calculate the offset from the optional second argument. */ |
if (NULL != (nn = n->parent->head->child)) |
if ((nn = n->parent->head->child) != NULL && |
if (NULL != (nn = nn->next)) |
(nn = nn->next) != NULL && |
if ((ival = a2width(p, nn->string)) >= 0) |
a2roffsu(nn->string, &su, SCALE_EN)) { |
len = (size_t)ival; |
len = term_hspan(p, &su); |
|
mt->lmargin[mt->lmargincur] = len; |
|
if (len < 0 && (size_t)(-len) > mt->offset) |
|
len = -mt->offset; |
|
} else |
|
len = mt->lmargin[mt->lmargincur]; |
|
|
switch (n->type) { |
switch (n->type) { |
case MAN_HEAD: |
case MAN_HEAD: |
/* Handle zero-width lengths. */ |
|
if (0 == len) |
|
len = term_len(p, 1); |
|
|
|
p->offset = mt->offset; |
p->offset = mt->offset; |
p->rmargin = mt->offset + len; |
p->rmargin = mt->offset + len; |
|
|
/* Set the saved left-margin. */ |
|
if (ival >= 0) |
|
mt->lmargin[mt->lmargincur] = (size_t)ival; |
|
|
|
savelit = MANT_LITERAL & mt->fl; |
savelit = MANT_LITERAL & mt->fl; |
mt->fl &= ~MANT_LITERAL; |
mt->fl &= ~MANT_LITERAL; |
|
|
Line 672 post_IP(DECL_ARGS) |
|
Line 637 post_IP(DECL_ARGS) |
|
static int |
static int |
pre_TP(DECL_ARGS) |
pre_TP(DECL_ARGS) |
{ |
{ |
|
struct roffsu su; |
const struct man_node *nn; |
const struct man_node *nn; |
size_t len; |
int len, savelit; |
int savelit, ival; |
|
|
|
switch (n->type) { |
switch (n->type) { |
case MAN_HEAD: |
case MAN_HEAD: |
Line 691 pre_TP(DECL_ARGS) |
|
Line 656 pre_TP(DECL_ARGS) |
|
return(1); |
return(1); |
} |
} |
|
|
len = (size_t)mt->lmargin[mt->lmargincur]; |
|
ival = -1; |
|
|
|
/* Calculate offset. */ |
/* Calculate offset. */ |
|
|
if (NULL != (nn = n->parent->head->child)) |
if ((nn = n->parent->head->child) != NULL && |
if (nn->string && 0 == (MAN_LINE & nn->flags)) |
nn->string != NULL && ! (MAN_LINE & nn->flags) && |
if ((ival = a2width(p, nn->string)) >= 0) |
a2roffsu(nn->string, &su, SCALE_EN)) { |
len = (size_t)ival; |
len = term_hspan(p, &su); |
|
mt->lmargin[mt->lmargincur] = len; |
|
if (len < 0 && (size_t)(-len) > mt->offset) |
|
len = -mt->offset; |
|
} else |
|
len = mt->lmargin[mt->lmargincur]; |
|
|
switch (n->type) { |
switch (n->type) { |
case MAN_HEAD: |
case MAN_HEAD: |
/* Handle zero-length properly. */ |
|
if (0 == len) |
|
len = term_len(p, 1); |
|
|
|
p->offset = mt->offset; |
p->offset = mt->offset; |
p->rmargin = mt->offset + len; |
p->rmargin = mt->offset + len; |
|
|
Line 725 pre_TP(DECL_ARGS) |
|
Line 688 pre_TP(DECL_ARGS) |
|
|
|
if (savelit) |
if (savelit) |
mt->fl |= MANT_LITERAL; |
mt->fl |= MANT_LITERAL; |
if (ival >= 0) |
|
mt->lmargin[mt->lmargincur] = (size_t)ival; |
|
|
|
return(0); |
return(0); |
case MAN_BODY: |
case MAN_BODY: |
p->offset = mt->offset + len; |
p->offset = mt->offset + len; |
Line 872 post_SH(DECL_ARGS) |
|
Line 832 post_SH(DECL_ARGS) |
|
static int |
static int |
pre_RS(DECL_ARGS) |
pre_RS(DECL_ARGS) |
{ |
{ |
int ival; |
struct roffsu su; |
size_t sz; |
int len; |
|
|
switch (n->type) { |
switch (n->type) { |
case MAN_BLOCK: |
case MAN_BLOCK: |
Line 885 pre_RS(DECL_ARGS) |
|
Line 845 pre_RS(DECL_ARGS) |
|
break; |
break; |
} |
} |
|
|
sz = term_len(p, p->defindent); |
if ((n = n->parent->head->child) != NULL && |
|
a2roffsu(n->string, &su, SCALE_EN)) |
|
len = term_hspan(p, &su); |
|
else |
|
len = term_len(p, p->defindent); |
|
|
if (NULL != (n = n->parent->head->child)) |
if (len > 0 || (size_t)(-len) < mt->offset) |
if ((ival = a2width(p, n->string)) >= 0) |
mt->offset += len; |
sz = (size_t)ival; |
else |
|
mt->offset = 0; |
mt->offset += sz; |
|
p->offset = mt->offset; |
p->offset = mt->offset; |
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
|
|
Line 905 pre_RS(DECL_ARGS) |
|
Line 868 pre_RS(DECL_ARGS) |
|
static void |
static void |
post_RS(DECL_ARGS) |
post_RS(DECL_ARGS) |
{ |
{ |
int ival; |
struct roffsu su; |
size_t sz; |
int len; |
|
|
switch (n->type) { |
switch (n->type) { |
case MAN_BLOCK: |
case MAN_BLOCK: |
Line 918 post_RS(DECL_ARGS) |
|
Line 881 post_RS(DECL_ARGS) |
|
break; |
break; |
} |
} |
|
|
sz = term_len(p, p->defindent); |
if ((n = n->parent->head->child) != NULL && |
|
a2roffsu(n->string, &su, SCALE_EN)) |
|
len = term_hspan(p, &su); |
|
else |
|
len = term_len(p, p->defindent); |
|
|
if (NULL != (n = n->parent->head->child)) |
if (len < 0 || (size_t)len < mt->offset) |
if ((ival = a2width(p, n->string)) >= 0) |
mt->offset -= len; |
sz = (size_t)ival; |
else |
|
mt->offset = 0; |
mt->offset = mt->offset < sz ? 0 : mt->offset - sz; |
|
p->offset = mt->offset; |
p->offset = mt->offset; |
|
|
if (--mt->lmarginsz < MAXMARGINS) |
if (--mt->lmarginsz < MAXMARGINS) |