=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.14 retrieving revision 1.18 diff -u -p -r1.14 -r1.18 --- mandoc/term.c 2009/02/24 14:52:55 1.14 +++ mandoc/term.c 2009/02/25 12:09:20 1.18 @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.14 2009/02/24 14:52:55 kristaps Exp $ */ +/* $Id: term.c,v 1.18 2009/02/25 12:09:20 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -48,7 +48,9 @@ #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 @@ -72,7 +74,9 @@ const int ttypes[TTYPE_NMAX] = { 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, @@ -89,6 +93,7 @@ static size_t arg_width(const struct mdoc_arg *); #define DECL_ARGS \ struct termp *p, \ + struct termpair *pair, \ const struct mdoc_meta *meta, \ const struct mdoc_node *node @@ -101,45 +106,54 @@ DECL_PRE(name); \ DECL_POST(name); DECL_PREPOST(termp_aq); -DECL_PREPOST(termp_ar); DECL_PREPOST(termp_bd); -DECL_PREPOST(termp_cd); -DECL_PREPOST(termp_cm); +DECL_PREPOST(termp_bq); 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_qo); +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); @@ -161,29 +175,29 @@ const struct termact __termacts[MDOC_MAX] = { { 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 */ @@ -202,52 +216,52 @@ const struct termact __termacts[MDOC_MAX] = { { termp_aq_pre, termp_aq_post }, /* Aq */ { termp_at_pre, NULL }, /* At */ { NULL, NULL }, /* Bc */ - { NULL, NULL }, /* Bf */ - { NULL, NULL }, /* Bo */ - { NULL, NULL }, /* Bq */ - { NULL, NULL }, /* Bsx */ + { 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_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 */ + { termp_em_pre, NULL }, /* Em */ { NULL, NULL }, /* Eo */ - { NULL, NULL }, /* Fx */ - { NULL, NULL }, /* Ms */ + { termp_fx_pre, NULL }, /* Fx */ + { termp_ms_pre, NULL }, /* Ms */ { NULL, NULL }, /* No */ { termp_ns_pre, NULL }, /* Ns */ { termp_nx_pre, NULL }, /* Nx */ { 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 */ + { termp_sx_pre, NULL }, /* Sx */ + { termp_sy_pre, 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 */ - { NULL, NULL }, /* Bt */ + { termp_bt_pre, NULL }, /* Bt */ { NULL, NULL }, /* Hf */ { NULL, NULL }, /* Fr */ { termp_ud_pre, NULL }, /* Ud */ @@ -486,20 +500,26 @@ termp_it_pre(DECL_ARGS) /* ARGSUSED */ -static void -termp_nm_post(DECL_ARGS) +static int +termp_nm_pre(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_PROG]; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_PROG]); + if (NULL == node->child) + word(p, meta->name); + return(1); } /* ARGSUSED */ -static void -termp_fl_post(DECL_ARGS) +static int +termp_fl_pre(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_CMD_FLAG]; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_FLAG]); + word(p, "\\-"); + p->flags |= TERMP_NOSPACE; + return(1); } @@ -508,7 +528,7 @@ static int termp_ar_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_CMD_ARG]; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_ARG]); if (NULL == node->child) word(p, "..."); return(1); @@ -517,18 +537,6 @@ termp_ar_pre(DECL_ARGS) /* ARGSUSED */ static int -termp_nm_pre(DECL_ARGS) -{ - - p->flags |= ttypes[TTYPE_PROG]; - if (NULL == node->child) - word(p, meta->name); - return(1); -} - - -/* ARGSUSED */ -static int termp_ns_pre(DECL_ARGS) { @@ -548,15 +556,6 @@ termp_pp_pre(DECL_ARGS) /* ARGSUSED */ -static void -termp_ar_post(DECL_ARGS) -{ - - p->flags &= ~ttypes[TTYPE_CMD_ARG]; -} - - -/* ARGSUSED */ static int termp_st_pre(DECL_ARGS) { @@ -661,7 +660,6 @@ termp_sh_post(DECL_ARGS) switch (node->type) { case (MDOC_HEAD): - p->flags &= ~ttypes[TTYPE_SECTION]; newln(p); break; case (MDOC_BODY): @@ -707,7 +705,7 @@ termp_vt_pre(DECL_ARGS) { /* FIXME: this can be "type name". */ - p->flags |= ttypes[TTYPE_VAR_DECL]; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_VAR_DECL]); return(1); } @@ -717,7 +715,6 @@ static void termp_vt_post(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_VAR_DECL]; if (node->sec == SEC_SYNOPSIS) vspace(p); } @@ -732,7 +729,7 @@ termp_fd_pre(DECL_ARGS) * 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); } @@ -742,10 +739,8 @@ static void termp_fd_post(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_FUNC_DECL]; if (node->sec == SEC_SYNOPSIS) vspace(p); - } @@ -757,7 +752,7 @@ termp_sh_pre(DECL_ARGS) 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; @@ -788,22 +783,20 @@ 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); } @@ -863,7 +856,7 @@ static int termp_ft_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_FUNC_TYPE]; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_TYPE]); return(1); } @@ -873,10 +866,8 @@ static void termp_ft_post(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_FUNC_TYPE]; if (node->sec == SEC_SYNOPSIS) newln(p); - } @@ -895,7 +886,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 +894,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) @@ -934,36 +923,37 @@ static int 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; - p->flags |= ttypes[TTYPE_FUNC_ARG]; - return(1); -} + if (node->parent->tok != MDOC_Fo) { + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_ARG]); + return(1); + } + for (n = node->child; n; n = n->next) { + assert(MDOC_TEXT == n->type); -/* ARGSUSED */ -static void -termp_fa_post(DECL_ARGS) -{ + p->flags |= ttypes[TTYPE_FUNC_ARG]; + word(p, n->data.text.string); + p->flags &= ~ttypes[TTYPE_FUNC_ARG]; - p->flags &= ~ttypes[TTYPE_FUNC_ARG]; + if (n->next) + word(p, ","); + } + + if (node->next && node->next->tok == MDOC_Fa) + word(p, ","); + + return(0); } @@ -972,21 +962,12 @@ 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) { @@ -1078,6 +1059,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 +1089,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) { @@ -1159,7 +1170,7 @@ termp_ss_pre(DECL_ARGS) 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: @@ -1177,7 +1188,6 @@ termp_ss_post(DECL_ARGS) switch (node->type) { case (MDOC_HEAD): - p->flags &= ~ttypes[TTYPE_SSECTION]; newln(p); p->offset = INDENT; break; @@ -1192,152 +1202,217 @@ static int 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) +static int +termp_em_pre(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_FILE]; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]); + return(1); } /* ARGSUSED */ static int -termp_qo_pre(DECL_ARGS) +termp_cd_pre(DECL_ARGS) { - if (MDOC_BODY != node->type) - return(1); - word(p, "\""); - p->flags |= TERMP_NOSPACE; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CONFIG]); return(1); } /* ARGSUSED */ -static void -termp_qo_post(DECL_ARGS) +static int +termp_cm_pre(DECL_ARGS) { - if (MDOC_BODY != node->type) - return; - p->flags |= TERMP_NOSPACE; - word(p, "\""); + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_FLAG]); + return(1); } /* ARGSUSED */ static int -termp_em_pre(DECL_ARGS) +termp_ic_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_EMPH]; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD]); return(1); } /* ARGSUSED */ -static void -termp_em_post(DECL_ARGS) +static int +termp_in_pre(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_EMPH]; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_INCLUDE]); + return(1); } /* ARGSUSED */ static int -termp_cd_pre(DECL_ARGS) +termp_at_pre(DECL_ARGS) { + enum mdoc_att c; - p->flags |= ttypes[TTYPE_CONFIG]; + c = ATT_DEFAULT; + if (node->child) { + assert(MDOC_TEXT == node->child->type); + c = mdoc_atoatt(node->child->data.text.string); + } + + 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_cd_post(DECL_ARGS) +termp_bq_post(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_CONFIG]; + if (MDOC_BODY != node->type) + return; + word(p, "]"); } /* ARGSUSED */ static int -termp_cm_pre(DECL_ARGS) +termp_pq_pre(DECL_ARGS) { - p->flags |= ttypes[TTYPE_CMD_FLAG]; + if (MDOC_BODY != node->type) + return(1); + word(p, "("); + p->flags |= TERMP_NOSPACE; return(1); } /* ARGSUSED */ static void -termp_cm_post(DECL_ARGS) +termp_pq_post(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_CMD_FLAG]; + if (MDOC_BODY != node->type) + return; + word(p, ")"); } /* ARGSUSED */ static int -termp_ic_pre(DECL_ARGS) +termp_fo_pre(DECL_ARGS) { + const struct mdoc_node *n; - p->flags |= ttypes[TTYPE_CMD]; - return(1); + if (MDOC_BODY == node->type) { + word(p, "("); + p->flags |= TERMP_NOSPACE; + return(1); + } 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); + word(p, n->data.text.string); + } + p->flags &= ~ttypes[TTYPE_FUNC_NAME]; + + return(0); } /* ARGSUSED */ static void -termp_ic_post(DECL_ARGS) +termp_fo_post(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_CMD]; + if (MDOC_BODY != node->type) + return; + word(p, ")"); + word(p, ";"); + newln(p); } /* ARGSUSED */ static int -termp_in_pre(DECL_ARGS) +termp_bf_pre(DECL_ARGS) { + const struct mdoc_node *n; + const struct mdoc_block *b; - p->flags |= ttypes[TTYPE_INCLUDE]; + /* 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 void -termp_in_post(DECL_ARGS) +static int +termp_sy_pre(DECL_ARGS) { - p->flags &= ~ttypes[TTYPE_INCLUDE]; + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMB]); + return(1); } /* ARGSUSED */ static int -termp_at_pre(DECL_ARGS) +termp_ms_pre(DECL_ARGS) { - enum mdoc_att c; - c = ATT_DEFAULT; - if (node->child) { - assert(MDOC_TEXT == node->child->type); - c = mdoc_atoatt(node->child->data.text.string); - } - - word(p, mdoc_att2a(c)); - return(0); + TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMBOL]); + return(1); } +