-/* $Id: term.c,v 1.16 2009/02/24 16:16:45 kristaps Exp $ */
+/* $Id: term.c,v 1.19 2009/02/25 12:27:37 kristaps Exp $ */
/*
* Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
*
#define TTYPE_CONFIG 13
#define TTYPE_CMD 14
#define TTYPE_INCLUDE 15
-#define TTYPE_NMAX 16
+#define TTYPE_SYMB 16
+#define TTYPE_SYMBOL 17
+#define TTYPE_NMAX 18
/*
* These define "styles" for element types, like command arguments or
TERMP_UNDERLINE, /* TTYPE_EMPH */
TERMP_BOLD, /* TTYPE_CONFIG */
TERMP_BOLD, /* TTYPE_CMD */
- TERMP_BOLD /* TTYPE_INCLUDE */
+ TERMP_BOLD, /* TTYPE_INCLUDE */
+ TERMP_BOLD, /* TTYPE_SYMB */
+ TERMP_BOLD /* TTYPE_SYMBOL */
};
static int arg_hasattr(int, size_t,
#define DECL_ARGS \
struct termp *p, \
+ struct termpair *pair, \
const struct mdoc_meta *meta, \
const struct mdoc_node *node
DECL_POST(name);
DECL_PREPOST(termp_aq);
-DECL_PREPOST(termp_ar);
DECL_PREPOST(termp_bd);
DECL_PREPOST(termp_bq);
-DECL_PREPOST(termp_cd);
-DECL_PREPOST(termp_cm);
DECL_PREPOST(termp_d1);
DECL_PREPOST(termp_dq);
-DECL_PREPOST(termp_em);
-DECL_PREPOST(termp_fa);
DECL_PREPOST(termp_fd);
-DECL_PREPOST(termp_fl);
DECL_PREPOST(termp_fn);
DECL_PREPOST(termp_fo);
DECL_PREPOST(termp_ft);
-DECL_PREPOST(termp_ic);
-DECL_PREPOST(termp_in);
DECL_PREPOST(termp_it);
-DECL_PREPOST(termp_nm);
DECL_PREPOST(termp_op);
-DECL_PREPOST(termp_pa);
DECL_PREPOST(termp_pf);
DECL_PREPOST(termp_pq);
DECL_PREPOST(termp_qq);
DECL_PREPOST(termp_sh);
DECL_PREPOST(termp_ss);
DECL_PREPOST(termp_sq);
-DECL_PREPOST(termp_sx);
-DECL_PREPOST(termp_va);
DECL_PREPOST(termp_vt);
+DECL_PRE(termp_ar);
DECL_PRE(termp_at);
+DECL_PRE(termp_bf);
DECL_PRE(termp_bsx);
+DECL_PRE(termp_bt);
DECL_PRE(termp_bx);
+DECL_PRE(termp_cd);
+DECL_PRE(termp_cm);
+DECL_PRE(termp_em);
DECL_PRE(termp_ex);
+DECL_PRE(termp_fa);
+DECL_PRE(termp_fl);
DECL_PRE(termp_fx);
+DECL_PRE(termp_ic);
+DECL_PRE(termp_in);
+DECL_PRE(termp_ms);
DECL_PRE(termp_nd);
+DECL_PRE(termp_nm);
DECL_PRE(termp_ns);
DECL_PRE(termp_nx);
DECL_PRE(termp_ox);
+DECL_PRE(termp_pa);
DECL_PRE(termp_pp);
DECL_PRE(termp_rv);
DECL_PRE(termp_st);
+DECL_PRE(termp_sx);
+DECL_PRE(termp_sy);
DECL_PRE(termp_ud);
DECL_PRE(termp_ux);
+DECL_PRE(termp_va);
DECL_PRE(termp_xr);
DECL_POST(termp_bl);
{ termp_it_pre, termp_it_post }, /* It */
{ NULL, NULL }, /* Ad */
{ NULL, NULL }, /* An */
- { termp_ar_pre, termp_ar_post }, /* Ar */
- { termp_cd_pre, termp_cd_post }, /* Cd */
- { termp_cm_pre, termp_cm_post }, /* Cm */
+ { termp_ar_pre, NULL }, /* Ar */
+ { termp_cd_pre, NULL }, /* Cd */
+ { termp_cm_pre, NULL }, /* Cm */
{ NULL, NULL }, /* Dv */
{ NULL, NULL }, /* Er */
{ NULL, NULL }, /* Ev */
{ termp_ex_pre, NULL }, /* Ex */
- { termp_fa_pre, termp_fa_post }, /* Fa */
+ { termp_fa_pre, NULL }, /* Fa */
{ termp_fd_pre, termp_fd_post }, /* Fd */
- { termp_fl_pre, termp_fl_post }, /* Fl */
+ { termp_fl_pre, NULL }, /* Fl */
{ termp_fn_pre, termp_fn_post }, /* Fn */
{ termp_ft_pre, termp_ft_post }, /* Ft */
- { termp_ic_pre, termp_ic_post }, /* Ic */
- { termp_in_pre, termp_in_post }, /* In */
+ { termp_ic_pre, NULL }, /* Ic */
+ { termp_in_pre, NULL }, /* In */
{ NULL, NULL }, /* Li */
{ termp_nd_pre, NULL }, /* Nd */
- { termp_nm_pre, termp_nm_post }, /* Nm */
+ { termp_nm_pre, NULL }, /* Nm */
{ termp_op_pre, termp_op_post }, /* Op */
{ NULL, NULL }, /* Ot */
- { termp_pa_pre, termp_pa_post }, /* Pa */
+ { termp_pa_pre, NULL }, /* Pa */
{ termp_rv_pre, NULL }, /* Rv */
{ termp_st_pre, NULL }, /* St */
- { termp_va_pre, termp_va_post }, /* Va */
+ { termp_va_pre, NULL }, /* Va */
{ termp_vt_pre, termp_vt_post }, /* Vt */
{ termp_xr_pre, NULL }, /* Xr */
{ NULL, NULL }, /* %A */
{ termp_aq_pre, termp_aq_post }, /* Aq */
{ termp_at_pre, NULL }, /* At */
{ NULL, NULL }, /* Bc */
- { NULL, NULL }, /* Bf */
+ { termp_bf_pre, NULL }, /* Bf */
{ termp_bq_pre, termp_bq_post }, /* Bo */
{ termp_bq_pre, termp_bq_post }, /* Bq */
{ termp_bsx_pre, NULL }, /* Bsx */
{ termp_dq_pre, termp_dq_post }, /* Dq */
{ NULL, NULL }, /* Ec */
{ NULL, NULL }, /* Ef */
- { termp_em_pre, termp_em_post }, /* Em */
+ { termp_em_pre, NULL }, /* Em */
{ NULL, NULL }, /* Eo */
{ termp_fx_pre, NULL }, /* Fx */
- { NULL, NULL }, /* Ms */
+ { termp_ms_pre, NULL }, /* Ms */
{ NULL, NULL }, /* No */
{ termp_ns_pre, NULL }, /* Ns */
{ termp_nx_pre, NULL }, /* Nx */
{ termp_sq_pre, termp_sq_post }, /* So */
{ termp_sq_pre, termp_sq_post }, /* Sq */
{ NULL, NULL }, /* Sm */
- { termp_sx_pre, termp_sx_post }, /* Sx */
- { NULL, NULL }, /* Sy */
+ { termp_sx_pre, NULL }, /* Sx */
+ { termp_sy_pre, NULL }, /* Sy */
{ NULL, NULL }, /* Tn */
{ termp_ux_pre, NULL }, /* Ux */
{ NULL, NULL }, /* Xc */
{ NULL, NULL }, /* Oc */
{ NULL, NULL }, /* Bk */
{ NULL, NULL }, /* Ek */
- { NULL, NULL }, /* Bt */
+ { termp_bt_pre, NULL }, /* Bt */
{ NULL, NULL }, /* Hf */
{ NULL, NULL }, /* Fr */
{ termp_ud_pre, NULL }, /* Ud */
/* ARGSUSED */
-static void
-termp_nm_post(DECL_ARGS)
-{
-
- p->flags &= ~ttypes[TTYPE_PROG];
-}
-
-
-/* ARGSUSED */
-static void
-termp_fl_post(DECL_ARGS)
+static int
+termp_nm_pre(DECL_ARGS)
{
- p->flags &= ~ttypes[TTYPE_CMD_FLAG];
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_PROG]);
+ if (NULL == node->child)
+ word(p, meta->name);
+ return(1);
}
/* ARGSUSED */
static int
-termp_ar_pre(DECL_ARGS)
+termp_fl_pre(DECL_ARGS)
{
- p->flags |= ttypes[TTYPE_CMD_ARG];
- if (NULL == node->child)
- word(p, "...");
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_FLAG]);
+ word(p, "\\-");
+ p->flags |= TERMP_NOSPACE;
return(1);
}
/* ARGSUSED */
static int
-termp_nm_pre(DECL_ARGS)
+termp_ar_pre(DECL_ARGS)
{
- p->flags |= ttypes[TTYPE_PROG];
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_ARG]);
if (NULL == node->child)
- word(p, meta->name);
+ word(p, "...");
return(1);
}
}
-/* ARGSUSED */
-static void
-termp_ar_post(DECL_ARGS)
-{
-
- p->flags &= ~ttypes[TTYPE_CMD_ARG];
-}
-
-
/* ARGSUSED */
static int
termp_st_pre(DECL_ARGS)
}
-/* ARGSUSED */
-static void
-termp_sh_post(DECL_ARGS)
-{
-
- switch (node->type) {
- case (MDOC_HEAD):
- p->flags &= ~ttypes[TTYPE_SECTION];
- newln(p);
- break;
- case (MDOC_BODY):
- newln(p);
- p->offset = 0;
- break;
- default:
- break;
- }
-}
-
-
/* ARGSUSED */
static int
termp_xr_pre(DECL_ARGS)
{
/* FIXME: this can be "type name". */
- p->flags |= ttypes[TTYPE_VAR_DECL];
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_VAR_DECL]);
return(1);
}
termp_vt_post(DECL_ARGS)
{
- p->flags &= ~ttypes[TTYPE_VAR_DECL];
if (node->sec == SEC_SYNOPSIS)
vspace(p);
}
* FIXME: this naming is bad. This value is used, in general,
* for the #include header or other preprocessor statement.
*/
- p->flags |= ttypes[TTYPE_FUNC_DECL];
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_DECL]);
return(1);
}
termp_fd_post(DECL_ARGS)
{
- p->flags &= ~ttypes[TTYPE_FUNC_DECL];
if (node->sec == SEC_SYNOPSIS)
vspace(p);
-
}
switch (node->type) {
case (MDOC_HEAD):
vspace(p);
- p->flags |= ttypes[TTYPE_SECTION];
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SECTION]);
break;
case (MDOC_BODY):
p->offset = INDENT;
}
+/* ARGSUSED */
+static void
+termp_sh_post(DECL_ARGS)
+{
+
+ switch (node->type) {
+ case (MDOC_HEAD):
+ newln(p);
+ break;
+ case (MDOC_BODY):
+ newln(p);
+ p->offset = 0;
+ break;
+ default:
+ break;
+ }
+}
+
+
/* ARGSUSED */
static int
termp_op_pre(DECL_ARGS)
/* ARGSUSED */
static int
-termp_ud_pre(DECL_ARGS)
+termp_bt_pre(DECL_ARGS)
{
- word(p, "currently under development.");
+ word(p, "is currently in beta test.");
return(1);
}
/* ARGSUSED */
static int
-termp_fl_pre(DECL_ARGS)
+termp_ud_pre(DECL_ARGS)
{
- p->flags |= ttypes[TTYPE_CMD_FLAG];
- word(p, "\\-");
- p->flags |= TERMP_NOSPACE;
+ word(p, "currently under development.");
return(1);
}
if (MDOC_BODY != node->type)
return(1);
newln(p);
- p->offset += INDENT;
+ p->offset += (pair->offset = INDENT);
return(1);
}
if (MDOC_BODY != node->type)
return;
newln(p);
- p->offset -= INDENT;
+ p->offset -= pair->offset;
}
termp_ft_pre(DECL_ARGS)
{
- p->flags |= ttypes[TTYPE_FUNC_TYPE];
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_TYPE]);
return(1);
}
termp_ft_post(DECL_ARGS)
{
- p->flags &= ~ttypes[TTYPE_FUNC_TYPE];
if (node->sec == SEC_SYNOPSIS)
newln(p);
-
}
termp_sx_pre(DECL_ARGS)
{
- p->flags |= ttypes[TTYPE_LINK];
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_LINK]);
return(1);
}
-/* ARGSUSED */
-static void
-termp_sx_post(DECL_ARGS)
-{
-
- p->flags &= ~ttypes[TTYPE_LINK];
-}
-
-
/* ARGSUSED */
static int
termp_fa_pre(DECL_ARGS)
struct mdoc_node *n;
if (node->parent->tok != MDOC_Fo) {
- p->flags |= ttypes[TTYPE_FUNC_ARG];
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_ARG]);
return(1);
}
}
-/* ARGSUSED */
-static void
-termp_fa_post(DECL_ARGS)
-{
-
- p->flags &= ~ttypes[TTYPE_FUNC_ARG];
-}
-
-
/* ARGSUSED */
static int
termp_va_pre(DECL_ARGS)
{
- p->flags |= ttypes[TTYPE_VAR_DECL];
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_VAR_DECL]);
return(1);
}
-/* ARGSUSED */
-static void
-termp_va_post(DECL_ARGS)
-{
-
- p->flags &= ~ttypes[TTYPE_VAR_DECL];
-}
-
-
/* ARGSUSED */
static int
termp_bd_pre(DECL_ARGS)
i = arg_getattr(MDOC_Offset, bl->argc, bl->argv);
if (-1 != i) {
assert(1 == bl->argv[i].sz);
- p->offset += arg_offset(&bl->argv[i]);
+ pair->offset = arg_offset(&bl->argv[i]);
+ p->offset += pair->offset;
}
if ( ! arg_hasattr(MDOC_Literal, bl->argc, bl->argv))
static void
termp_bd_post(DECL_ARGS)
{
- int i;
- const struct mdoc_block *bl;
-
- if (MDOC_BODY != node->type)
- return;
- assert(MDOC_BLOCK == node->parent->type);
- bl = &node->parent->data.block;
-
- i = arg_getattr(MDOC_Offset, bl->argc, bl->argv);
- if (-1 != i) {
- assert(1 == bl->argv[i].sz);
- p->offset -= arg_offset(&bl->argv[i]);
- }
+ if (MDOC_BODY == node->type)
+ p->offset -= pair->offset;
}
switch (node->type) {
case (MDOC_HEAD):
vspace(p);
- p->flags |= ttypes[TTYPE_SSECTION];
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SSECTION]);
p->offset = INDENT / 2;
break;
default:
switch (node->type) {
case (MDOC_HEAD):
- p->flags &= ~ttypes[TTYPE_SSECTION];
newln(p);
p->offset = INDENT;
break;
termp_pa_pre(DECL_ARGS)
{
- p->flags |= ttypes[TTYPE_FILE];
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FILE]);
return(1);
}
-/* ARGSUSED */
-static void
-termp_pa_post(DECL_ARGS)
-{
-
- p->flags &= ~ttypes[TTYPE_FILE];
-}
-
-
/* ARGSUSED */
static int
termp_em_pre(DECL_ARGS)
{
- p->flags |= ttypes[TTYPE_EMPH];
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]);
return(1);
}
-/* ARGSUSED */
-static void
-termp_em_post(DECL_ARGS)
-{
-
- p->flags &= ~ttypes[TTYPE_EMPH];
-}
-
-
/* ARGSUSED */
static int
termp_cd_pre(DECL_ARGS)
{
- p->flags |= ttypes[TTYPE_CONFIG];
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CONFIG]);
return(1);
}
-/* ARGSUSED */
-static void
-termp_cd_post(DECL_ARGS)
-{
-
- p->flags &= ~ttypes[TTYPE_CONFIG];
-}
-
-
/* ARGSUSED */
static int
termp_cm_pre(DECL_ARGS)
{
- p->flags |= ttypes[TTYPE_CMD_FLAG];
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_FLAG]);
return(1);
}
-/* ARGSUSED */
-static void
-termp_cm_post(DECL_ARGS)
-{
-
- p->flags &= ~ttypes[TTYPE_CMD_FLAG];
-}
-
-
/* ARGSUSED */
static int
termp_ic_pre(DECL_ARGS)
{
- p->flags |= ttypes[TTYPE_CMD];
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD]);
return(1);
}
-/* ARGSUSED */
-static void
-termp_ic_post(DECL_ARGS)
-{
-
- p->flags &= ~ttypes[TTYPE_CMD];
-}
-
-
/* ARGSUSED */
static int
termp_in_pre(DECL_ARGS)
{
- p->flags |= ttypes[TTYPE_INCLUDE];
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_INCLUDE]);
return(1);
}
-/* ARGSUSED */
-static void
-termp_in_post(DECL_ARGS)
-{
-
- p->flags &= ~ttypes[TTYPE_INCLUDE];
-}
-
-
/* ARGSUSED */
static int
termp_at_pre(DECL_ARGS)
} else if (MDOC_HEAD != node->type)
return(1);
+ /* XXX - groff shows only first parameter */
+
p->flags |= ttypes[TTYPE_FUNC_NAME];
for (n = node->child; n; n = n->next) {
assert(MDOC_TEXT == n->type);
}
+/* ARGSUSED */
+static int
+termp_bf_pre(DECL_ARGS)
+{
+ const struct mdoc_node *n;
+ const struct mdoc_block *b;
+
+ /* XXX - we skip over possible trailing HEAD tokens. */
+
+ if (MDOC_HEAD == node->type)
+ return(0);
+ else if (MDOC_BLOCK != node->type)
+ return(1);
+
+ b = &node->data.block;
+
+ if (NULL == (n = b->head->child)) {
+ if (arg_hasattr(MDOC_Emphasis, b->argc, b->argv))
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]);
+ else if (arg_hasattr(MDOC_Symbolic, b->argc, b->argv))
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMB]);
+
+ return(1);
+ }
+
+ assert(MDOC_TEXT == n->type);
+
+ if (0 == strcmp("Em", n->data.text.string))
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]);
+ else if (0 == strcmp("Sy", n->data.text.string))
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]);
+
+ return(1);
+}
+
+
+/* ARGSUSED */
+static int
+termp_sy_pre(DECL_ARGS)
+{
+
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMB]);
+ return(1);
+}
+
+
+/* ARGSUSED */
+static int
+termp_ms_pre(DECL_ARGS)
+{
+
+ TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMBOL]);
+ return(1);
+}
+
git.ckatri.com / mandoc.git / blobdiff