version 1.240, 2012/07/08 22:49:29 |
version 1.244, 2012/11/16 17:16:55 |
Line 42 struct termpair { |
|
Line 42 struct termpair { |
|
#define DECL_ARGS struct termp *p, \ |
#define DECL_ARGS struct termp *p, \ |
struct termpair *pair, \ |
struct termpair *pair, \ |
const struct mdoc_meta *m, \ |
const struct mdoc_meta *m, \ |
const struct mdoc_node *n |
struct mdoc_node *n |
|
|
struct termact { |
struct termact { |
int (*pre)(DECL_ARGS); |
int (*pre)(DECL_ARGS); |
Line 69 static void termp_an_post(DECL_ARGS); |
|
Line 69 static void termp_an_post(DECL_ARGS); |
|
static void termp_bd_post(DECL_ARGS); |
static void termp_bd_post(DECL_ARGS); |
static void termp_bk_post(DECL_ARGS); |
static void termp_bk_post(DECL_ARGS); |
static void termp_bl_post(DECL_ARGS); |
static void termp_bl_post(DECL_ARGS); |
static void termp_d1_post(DECL_ARGS); |
static void termp_fd_post(DECL_ARGS); |
static void termp_fo_post(DECL_ARGS); |
static void termp_fo_post(DECL_ARGS); |
static void termp_in_post(DECL_ARGS); |
static void termp_in_post(DECL_ARGS); |
static void termp_it_post(DECL_ARGS); |
static void termp_it_post(DECL_ARGS); |
Line 129 static const struct termact termacts[MDOC_MAX] = { |
|
Line 129 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_sh_pre, termp_sh_post }, /* Sh */ |
{ termp_sh_pre, termp_sh_post }, /* Sh */ |
{ termp_ss_pre, termp_ss_post }, /* Ss */ |
{ termp_ss_pre, termp_ss_post }, /* Ss */ |
{ termp_sp_pre, NULL }, /* Pp */ |
{ termp_sp_pre, NULL }, /* Pp */ |
{ termp_d1_pre, termp_d1_post }, /* D1 */ |
{ termp_d1_pre, termp_bl_post }, /* D1 */ |
{ termp_d1_pre, termp_d1_post }, /* Dl */ |
{ termp_d1_pre, termp_bl_post }, /* Dl */ |
{ termp_bd_pre, termp_bd_post }, /* Bd */ |
{ termp_bd_pre, termp_bd_post }, /* Bd */ |
{ NULL, NULL }, /* Ed */ |
{ NULL, NULL }, /* Ed */ |
{ termp_bl_pre, termp_bl_post }, /* Bl */ |
{ termp_bl_pre, termp_bl_post }, /* Bl */ |
Line 146 static const struct termact termacts[MDOC_MAX] = { |
|
Line 146 static const struct termact termacts[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Ev */ |
{ NULL, NULL }, /* Ev */ |
{ termp_ex_pre, NULL }, /* Ex */ |
{ termp_ex_pre, NULL }, /* Ex */ |
{ termp_fa_pre, NULL }, /* Fa */ |
{ termp_fa_pre, NULL }, /* Fa */ |
{ termp_fd_pre, NULL }, /* Fd */ |
{ termp_fd_pre, termp_fd_post }, /* Fd */ |
{ termp_fl_pre, NULL }, /* Fl */ |
{ termp_fl_pre, NULL }, /* Fl */ |
{ termp_fn_pre, NULL }, /* Fn */ |
{ termp_fn_pre, NULL }, /* Fn */ |
{ termp_ft_pre, NULL }, /* Ft */ |
{ termp_ft_pre, NULL }, /* Ft */ |
Line 242 static const struct termact termacts[MDOC_MAX] = { |
|
Line 242 static const struct termact termacts[MDOC_MAX] = { |
|
{ NULL, termp____post }, /* %Q */ |
{ NULL, termp____post }, /* %Q */ |
{ termp_sp_pre, NULL }, /* br */ |
{ termp_sp_pre, NULL }, /* br */ |
{ termp_sp_pre, NULL }, /* sp */ |
{ termp_sp_pre, NULL }, /* sp */ |
{ termp_under_pre, termp____post }, /* %U */ |
{ NULL, termp____post }, /* %U */ |
{ NULL, NULL }, /* Ta */ |
{ NULL, NULL }, /* Ta */ |
}; |
}; |
|
|
|
|
print_mdoc_node(DECL_ARGS) |
print_mdoc_node(DECL_ARGS) |
{ |
{ |
int chld; |
int chld; |
const void *font; |
|
struct termpair npair; |
struct termpair npair; |
size_t offset, rmargin; |
size_t offset, rmargin; |
|
|
chld = 1; |
chld = 1; |
offset = p->offset; |
offset = p->offset; |
rmargin = p->rmargin; |
rmargin = p->rmargin; |
font = term_fontq(p); |
n->prev_font = term_fontq(p); |
|
|
memset(&npair, 0, sizeof(struct termpair)); |
memset(&npair, 0, sizeof(struct termpair)); |
npair.ppair = pair; |
npair.ppair = pair; |
Line 366 print_mdoc_node(DECL_ARGS) |
|
Line 365 print_mdoc_node(DECL_ARGS) |
|
if (chld && n->child) |
if (chld && n->child) |
print_mdoc_nodelist(p, &npair, m, n->child); |
print_mdoc_nodelist(p, &npair, m, n->child); |
|
|
term_fontpopq(p, font); |
term_fontpopq(p, |
|
(ENDBODY_NOT == n->end ? n : n->pending)->prev_font); |
|
|
switch (n->type) { |
switch (n->type) { |
case (MDOC_TEXT): |
case (MDOC_TEXT): |
Line 727 termp_it_pre(DECL_ARGS) |
|
Line 727 termp_it_pre(DECL_ARGS) |
|
case (LIST_dash): |
case (LIST_dash): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (LIST_hyphen): |
case (LIST_hyphen): |
if (width < term_len(p, 4)) |
/* FALLTHROUGH */ |
width = term_len(p, 4); |
|
break; |
|
case (LIST_enum): |
case (LIST_enum): |
if (width < term_len(p, 5)) |
if (width < term_len(p, 2)) |
width = term_len(p, 5); |
width = term_len(p, 2); |
break; |
break; |
case (LIST_hang): |
case (LIST_hang): |
if (0 == width) |
if (0 == width) |
Line 787 termp_it_pre(DECL_ARGS) |
|
Line 785 termp_it_pre(DECL_ARGS) |
|
*/ |
*/ |
|
|
switch (type) { |
switch (type) { |
|
case (LIST_enum): |
|
/* |
|
* Weird special case. |
|
* Very narrow enum lists actually hang. |
|
*/ |
|
if (width == term_len(p, 2)) |
|
p->flags |= TERMP_HANG; |
|
/* FALLTHROUGH */ |
case (LIST_bullet): |
case (LIST_bullet): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (LIST_dash): |
case (LIST_dash): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (LIST_enum): |
|
/* FALLTHROUGH */ |
|
case (LIST_hyphen): |
case (LIST_hyphen): |
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_NOBREAK; |
Line 1407 termp_fd_pre(DECL_ARGS) |
|
Line 1411 termp_fd_pre(DECL_ARGS) |
|
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
|
static void |
|
termp_fd_post(DECL_ARGS) |
|
{ |
|
|
|
term_newln(p); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
static int |
static int |
termp_sh_pre(DECL_ARGS) |
termp_sh_pre(DECL_ARGS) |
{ |
{ |
Line 1500 termp_d1_pre(DECL_ARGS) |
|
Line 1513 termp_d1_pre(DECL_ARGS) |
|
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static void |
|
termp_d1_post(DECL_ARGS) |
|
{ |
|
|
|
if (MDOC_BLOCK != n->type) |
|
return; |
|
term_newln(p); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static int |
static int |
termp_ft_pre(DECL_ARGS) |
termp_ft_pre(DECL_ARGS) |
{ |
{ |
|
|
termp_bd_pre(DECL_ARGS) |
termp_bd_pre(DECL_ARGS) |
{ |
{ |
size_t tabwidth, rm, rmax; |
size_t tabwidth, rm, rmax; |
const struct mdoc_node *nn; |
struct mdoc_node *nn; |
|
|
if (MDOC_BLOCK == n->type) { |
if (MDOC_BLOCK == n->type) { |
print_bvspace(p, n, n); |
print_bvspace(p, n, n); |
Line 2073 termp_bf_pre(DECL_ARGS) |
|
Line 2075 termp_bf_pre(DECL_ARGS) |
|
|
|
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
return(0); |
return(0); |
else if (MDOC_BLOCK != n->type) |
else if (MDOC_BODY != n->type) |
return(1); |
return(1); |
|
|
if (FONT_Em == n->norm->Bf.font) |
if (FONT_Em == n->norm->Bf.font) |