=================================================================== RCS file: /cvs/mandoc/mdoc_macro.c,v retrieving revision 1.77 retrieving revision 1.80 diff -u -p -r1.77 -r1.80 --- mandoc/mdoc_macro.c 2010/05/31 15:42:09 1.77 +++ mandoc/mdoc_macro.c 2010/06/19 20:46:28 1.80 @@ -1,6 +1,6 @@ -/* $Id: mdoc_macro.c,v 1.77 2010/05/31 15:42:09 kristaps Exp $ */ +/* $Id: mdoc_macro.c,v 1.80 2010/06/19 20:46:28 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -1683,13 +1683,13 @@ phrase(struct mdoc *m, int line, int ppos, char *buf) } +/* ARGSUSED */ static int phrase_ta(MACRO_PROT_ARGS) { int la; enum mdoct ntok; enum margserr ac; - struct mdoc_node *n; char *p; /* @@ -1697,29 +1697,8 @@ phrase_ta(MACRO_PROT_ARGS) * it should simply error out with ARGSLOST. */ - n = m->last; if ( ! rew_sub(MDOC_BODY, m, MDOC_It, line, ppos)) return(0); - - /* - * FIXME: this is necessary in bogus constructions like - * .Bl -column foo bar - * .Sy foo Ta bar - * It is, however, an ugly way to do it. - * - * XXX; remove this when the above construct builds an implied - * `It' marker. - */ - if (NULL == m->last || - MDOC_BODY != m->last->type || - MDOC_It != m->last->tok || - NULL == m->last->parent->parent || - MDOC_Bl != m->last->parent->parent->tok || - LIST_column != m->last->parent->parent->data.list) { - swarn(m, tok, line, ppos, n); - return(0); - } - if ( ! mdoc_body_alloc(m, line, ppos, MDOC_It)) return(0);