=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.14 retrieving revision 1.16 diff -u -p -r1.14 -r1.16 --- mandoc/term.c 2009/02/24 14:52:55 1.14 +++ mandoc/term.c 2009/02/24 16:16:45 1.16 @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.14 2009/02/24 14:52:55 kristaps Exp $ */ +/* $Id: term.c,v 1.16 2009/02/24 16:16:45 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -103,6 +103,7 @@ 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); @@ -112,6 +113,7 @@ 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); @@ -120,7 +122,7 @@ DECL_PREPOST(termp_nm); DECL_PREPOST(termp_op); DECL_PREPOST(termp_pa); DECL_PREPOST(termp_pf); -DECL_PREPOST(termp_qo); +DECL_PREPOST(termp_pq); DECL_PREPOST(termp_qq); DECL_PREPOST(termp_sh); DECL_PREPOST(termp_ss); @@ -130,8 +132,10 @@ DECL_PREPOST(termp_va); DECL_PREPOST(termp_vt); DECL_PRE(termp_at); +DECL_PRE(termp_bsx); DECL_PRE(termp_bx); DECL_PRE(termp_ex); +DECL_PRE(termp_fx); DECL_PRE(termp_nd); DECL_PRE(termp_ns); DECL_PRE(termp_nx); @@ -140,6 +144,7 @@ DECL_PRE(termp_pp); DECL_PRE(termp_rv); DECL_PRE(termp_st); DECL_PRE(termp_ud); +DECL_PRE(termp_ux); DECL_PRE(termp_xr); DECL_POST(termp_bl); @@ -203,19 +208,19 @@ const struct termact __termacts[MDOC_MAX] = { { termp_at_pre, NULL }, /* At */ { NULL, NULL }, /* Bc */ { NULL, NULL }, /* Bf */ - { NULL, NULL }, /* Bo */ - { NULL, NULL }, /* Bq */ - { NULL, NULL }, /* Bsx */ + { termp_bq_pre, termp_bq_post }, /* Bo */ + { termp_bq_pre, termp_bq_post }, /* Bq */ + { termp_bsx_pre, NULL }, /* Bsx */ { termp_bx_pre, NULL }, /* Bx */ { NULL, NULL }, /* Db */ { NULL, NULL }, /* Dc */ - { NULL, NULL }, /* Do */ + { termp_dq_pre, termp_dq_post }, /* Do */ { termp_dq_pre, termp_dq_post }, /* Dq */ { NULL, NULL }, /* Ec */ { NULL, NULL }, /* Ef */ { termp_em_pre, termp_em_post }, /* Em */ { NULL, NULL }, /* Eo */ - { NULL, NULL }, /* Fx */ + { termp_fx_pre, NULL }, /* Fx */ { NULL, NULL }, /* Ms */ { NULL, NULL }, /* No */ { termp_ns_pre, NULL }, /* Ns */ @@ -223,27 +228,27 @@ const struct termact __termacts[MDOC_MAX] = { { termp_ox_pre, NULL }, /* Ox */ { NULL, NULL }, /* Pc */ { termp_pf_pre, termp_pf_post }, /* Pf */ - { NULL, NULL }, /* Po */ - { NULL, NULL }, /* Pq */ + { termp_pq_pre, termp_pq_post }, /* Po */ + { termp_pq_pre, termp_pq_post }, /* Pq */ { NULL, NULL }, /* Qc */ - { NULL, NULL }, /* Ql */ - { termp_qo_pre, termp_qo_post }, /* Qo */ + { termp_sq_pre, termp_sq_post }, /* Ql */ + { termp_qq_pre, termp_qq_post }, /* Qo */ { termp_qq_pre, termp_qq_post }, /* Qq */ { NULL, NULL }, /* Re */ { NULL, NULL }, /* Rs */ { NULL, NULL }, /* Sc */ - { NULL, NULL }, /* So */ + { 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 */ { NULL, NULL }, /* Tn */ - { NULL, NULL }, /* Ux */ + { termp_ux_pre, NULL }, /* Ux */ { NULL, NULL }, /* Xc */ { NULL, NULL }, /* Xo */ - { NULL, NULL }, /* Fo */ + { termp_fo_pre, termp_fo_post }, /* Fo */ { NULL, NULL }, /* Fc */ - { NULL, NULL }, /* Oo */ + { termp_op_pre, termp_op_post }, /* Oo */ { NULL, NULL }, /* Oc */ { NULL, NULL }, /* Bk */ { NULL, NULL }, /* Ek */ @@ -895,7 +900,6 @@ termp_fn_pre(DECL_ARGS) word(p, node->child->data.text.string); p->flags &= ~ttypes[TTYPE_FUNC_NAME]; - p->flags |= TERMP_NOSPACE; word(p, "("); p->flags |= TERMP_NOSPACE; @@ -904,11 +908,10 @@ termp_fn_pre(DECL_ARGS) p->flags |= ttypes[TTYPE_FUNC_ARG]; word(p, n->data.text.string); p->flags &= ~ttypes[TTYPE_FUNC_ARG]; - if ((n->next)) + if (n->next) word(p, ","); } - p->flags |= TERMP_NOSPACE; word(p, ")"); if (SEC_SYNOPSIS == node->sec) @@ -952,9 +955,28 @@ termp_sx_post(DECL_ARGS) static int termp_fa_pre(DECL_ARGS) { + struct mdoc_node *n; - p->flags |= ttypes[TTYPE_FUNC_ARG]; - return(1); + if (node->parent->tok != MDOC_Fo) { + p->flags |= ttypes[TTYPE_FUNC_ARG]; + return(1); + } + + for (n = node->child; n; n = n->next) { + assert(MDOC_TEXT == n->type); + + p->flags |= ttypes[TTYPE_FUNC_ARG]; + word(p, n->data.text.string); + p->flags &= ~ttypes[TTYPE_FUNC_ARG]; + + if (n->next) + word(p, ","); + } + + if (node->next && node->next->tok == MDOC_Fa) + word(p, ","); + + return(0); } @@ -1078,6 +1100,16 @@ termp_qq_post(DECL_ARGS) /* ARGSUSED */ static int +termp_bsx_pre(DECL_ARGS) +{ + + word(p, "BSDI BSD/OS"); + return(1); +} + + +/* ARGSUSED */ +static int termp_bx_pre(DECL_ARGS) { @@ -1098,6 +1130,26 @@ termp_ox_pre(DECL_ARGS) /* ARGSUSED */ static int +termp_ux_pre(DECL_ARGS) +{ + + word(p, "UNIX"); + return(1); +} + + +/* ARGSUSED */ +static int +termp_fx_pre(DECL_ARGS) +{ + + word(p, "FreeBSD"); + return(1); +} + + +/* ARGSUSED */ +static int termp_nx_pre(DECL_ARGS) { @@ -1208,31 +1260,6 @@ termp_pa_post(DECL_ARGS) /* ARGSUSED */ static int -termp_qo_pre(DECL_ARGS) -{ - - if (MDOC_BODY != node->type) - return(1); - word(p, "\""); - p->flags |= TERMP_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -termp_qo_post(DECL_ARGS) -{ - - if (MDOC_BODY != node->type) - return; - p->flags |= TERMP_NOSPACE; - word(p, "\""); -} - - -/* ARGSUSED */ -static int termp_em_pre(DECL_ARGS) { @@ -1341,3 +1368,90 @@ termp_at_pre(DECL_ARGS) word(p, mdoc_att2a(c)); return(0); } + + +/* ARGSUSED */ +static int +termp_bq_pre(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return(1); + word(p, "["); + p->flags |= TERMP_NOSPACE; + return(1); +} + + +/* ARGSUSED */ +static void +termp_bq_post(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return; + word(p, "]"); +} + + +/* ARGSUSED */ +static int +termp_pq_pre(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return(1); + word(p, "("); + p->flags |= TERMP_NOSPACE; + return(1); +} + + +/* ARGSUSED */ +static void +termp_pq_post(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return; + word(p, ")"); +} + + +/* ARGSUSED */ +static int +termp_fo_pre(DECL_ARGS) +{ + const struct mdoc_node *n; + + if (MDOC_BODY == node->type) { + word(p, "("); + p->flags |= TERMP_NOSPACE; + return(1); + } else if (MDOC_HEAD != node->type) + return(1); + + p->flags |= ttypes[TTYPE_FUNC_NAME]; + for (n = node->child; n; n = n->next) { + assert(MDOC_TEXT == n->type); + word(p, n->data.text.string); + } + p->flags &= ~ttypes[TTYPE_FUNC_NAME]; + + return(0); +} + + +/* ARGSUSED */ +static void +termp_fo_post(DECL_ARGS) +{ + + if (MDOC_BODY != node->type) + return; + word(p, ")"); + word(p, ";"); + newln(p); +} + +