From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from krisdoz.my.domain (kristaps@localhost [127.0.0.1]) by krisdoz.my.domain (8.14.3/8.14.3) with ESMTP id o4FKpfNH008535 for ; Sat, 15 May 2010 14:51:41 -0600 (MDT) Received: (from kristaps@localhost) by krisdoz.my.domain (8.14.3/8.14.3/Submit) id o4FKpffk005810; Sat, 15 May 2010 16:51:41 -0400 (EDT) Date: Sat, 15 May 2010 16:51:41 -0400 (EDT) Message-Id: <201005152051.o4FKpffk005810@krisdoz.my.domain> X-Mailinglist: mdocml-source Reply-To: source@mdocml.bsd.lv MIME-Version: 1.0 From: kristaps@bsd.lv To: source@mdocml.bsd.lv Subject: mdocml: Pull `ig' out of -man and leave it the roff preparser. X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Log Message: ----------- Pull `ig' out of -man and leave it the roff preparser. Modified Files: -------------- mdocml: man.c man.h man_action.c man_html.c man_macro.c man_term.c man_validate.c roff.c Revision Data ------------- Index: man_term.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_term.c,v retrieving revision 1.66 retrieving revision 1.67 diff -Lman_term.c -Lman_term.c -u -p -r1.66 -r1.67 --- man_term.c +++ man_term.c @@ -146,7 +146,6 @@ static const struct termact termacts[MAN { pre_ign, NULL, MAN_NOTEXT }, /* dei */ { pre_ign, NULL, MAN_NOTEXT }, /* am */ { pre_ign, NULL, MAN_NOTEXT }, /* ami */ - { pre_ign, NULL, MAN_NOTEXT }, /* ig */ { NULL, NULL, 0 }, /* . */ }; Index: man_html.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_html.c,v retrieving revision 1.31 retrieving revision 1.32 diff -Lman_html.c -Lman_html.c -u -p -r1.31 -r1.32 --- man_html.c +++ man_html.c @@ -110,7 +110,6 @@ static const struct htmlman mans[MAN_MAX { man_ign_pre, NULL }, /* dei */ { man_ign_pre, NULL }, /* am */ { man_ign_pre, NULL }, /* ami */ - { man_ign_pre, NULL }, /* ig */ { NULL, NULL }, /* . */ }; Index: man.h =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man.h,v retrieving revision 1.30 retrieving revision 1.31 diff -Lman.h -Lman.h -u -p -r1.30 -r1.31 --- man.h +++ man.h @@ -59,7 +59,6 @@ enum mant { MAN_dei, MAN_am, MAN_ami, - MAN_ig, MAN_dot, MAN_MAX }; Index: man_action.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_action.c,v retrieving revision 1.32 retrieving revision 1.33 diff -Lman_action.c -Lman_action.c -u -p -r1.32 -r1.33 --- man_action.c +++ man_action.c @@ -74,7 +74,6 @@ const struct actions man_actions[MAN_MAX { post_de }, /* dei */ { post_de }, /* am */ { post_de }, /* ami */ - { post_de }, /* ig */ { NULL }, /* . */ }; Index: man.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man.c,v retrieving revision 1.68 retrieving revision 1.69 diff -Lman.c -Lman.c -u -p -r1.68 -r1.69 --- man.c +++ man.c @@ -65,8 +65,7 @@ const char *const __man_macronames[MAN_M "nf", "fi", "r", "RE", "RS", "DT", "UC", "PD", "Sp", "Vb", "Ve", "de", - "dei", "am", "ami", "ig", - ".", + "dei", "am", "ami", ".", }; const char * const *man_macronames = __man_macronames; Index: roff.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/roff.c,v retrieving revision 1.69 retrieving revision 1.70 diff -Lroff.c -Lroff.c -u -p -r1.69 -r1.70 --- roff.c +++ roff.c @@ -76,7 +76,6 @@ const struct roffmac roffs[ROFF_MAX] = { ".", NULL, roff_new_close }, }; -static void roff_alloc1(struct roff *); static void roff_free1(struct roff *); static enum rofft roff_hash_find(const char *); static int roffnode_push(struct roff *, @@ -153,20 +152,11 @@ roff_free1(struct roff *r) } -static void -roff_alloc1(struct roff *r) -{ - - /* Do nothing for now. */ -} - - void roff_reset(struct roff *r) { roff_free1(r); - roff_alloc1(r); } Index: man_validate.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_validate.c,v retrieving revision 1.37 retrieving revision 1.38 diff -Lman_validate.c -Lman_validate.c -u -p -r1.37 -r1.38 --- man_validate.c +++ man_validate.c @@ -101,7 +101,6 @@ static const struct man_valid man_valids { pres_roff, NULL }, /* dei */ { pres_roff, NULL }, /* am */ { pres_roff, NULL }, /* ami */ - { pres_roff, NULL }, /* ig */ { NULL, NULL }, /* . */ }; @@ -335,8 +334,7 @@ check_roff(CHKARGS) for (n = n->parent; n; n = n->parent) if (MAN_de == n->tok || MAN_dei == n->tok || MAN_am == n->tok || - MAN_ami == n->tok || - MAN_ig == n->tok) + MAN_ami == n->tok) return(man_nerr(m, n, WROFFNEST)); return(1); Index: man_macro.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_macro.c,v retrieving revision 1.42 retrieving revision 1.43 diff -Lman_macro.c -Lman_macro.c -u -p -r1.42 -r1.43 --- man_macro.c +++ man_macro.c @@ -86,7 +86,6 @@ const struct man_macro __man_macros[MAN_ { blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* dei */ { blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* am */ { blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* ami */ - { blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* ig */ { blk_dotted, 0 }, /* . */ }; @@ -297,8 +296,7 @@ blk_dotted(MACRO_PROT_ARGS) for (nn = m->last->parent; nn; nn = nn->parent) if (nn->tok == MAN_de || nn->tok == MAN_dei || nn->tok == MAN_am || - nn->tok == MAN_ami || - nn->tok == MAN_ig) { + nn->tok == MAN_ami) { ntok = nn->tok; break; } -- To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv