diff options
-rw-r--r-- | man.h | 5 | ||||
-rw-r--r-- | man_html.c | 4 | ||||
-rw-r--r-- | man_term.c | 4 | ||||
-rw-r--r-- | man_validate.c | 4 | ||||
-rw-r--r-- | mdoc.h | 3 | ||||
-rw-r--r-- | mdoc_html.c | 4 | ||||
-rw-r--r-- | mdoc_term.c | 6 | ||||
-rw-r--r-- | mdoc_validate.c | 4 | ||||
-rw-r--r-- | tree.c | 14 |
9 files changed, 38 insertions, 10 deletions
@@ -1,4 +1,4 @@ -/* $Id: man.h,v 1.51 2011/01/12 10:43:22 kristaps Exp $ */ +/* $Id: man.h,v 1.52 2011/02/06 21:44:36 kristaps Exp $ */ /* * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -67,7 +67,8 @@ enum man_type { MAN_BLOCK, MAN_HEAD, MAN_BODY, - MAN_TBL + MAN_TBL, + MAN_EQN }; /* @@ -1,4 +1,4 @@ -/* $Id: man_html.c,v 1.67 2011/01/17 00:21:29 schwarze Exp $ */ +/* $Id: man_html.c,v 1.68 2011/02/06 21:44:36 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -215,6 +215,8 @@ print_man_node(MAN_ARGS) n->next->line > n->line)) print_otag(h, TAG_BR, 0, NULL); return; + case (MAN_EQN): + return; case (MAN_TBL): /* * This will take care of initialising all of the table @@ -1,4 +1,4 @@ -/* $Id: man_term.c,v 1.101 2011/01/25 12:35:09 schwarze Exp $ */ +/* $Id: man_term.c,v 1.102 2011/02/06 21:44:36 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -896,6 +896,8 @@ print_man_node(DECL_ARGS) if (MAN_EOS & n->flags) p->flags |= TERMP_SENTENCE; return; + case (MAN_EQN): + return; case (MAN_TBL): /* * Tables are preceded by a newline. Then process a diff --git a/man_validate.c b/man_validate.c index 0dc275a1..ee174d45 100644 --- a/man_validate.c +++ b/man_validate.c @@ -1,4 +1,4 @@ -/* $Id: man_validate.c,v 1.60 2011/01/17 00:21:29 schwarze Exp $ */ +/* $Id: man_validate.c,v 1.61 2011/02/06 21:44:36 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -121,6 +121,8 @@ man_valid_pre(struct man *m, struct man_node *n) /* FALLTHROUGH */ case (MAN_ROOT): /* FALLTHROUGH */ + case (MAN_EQN): + /* FALLTHROUGH */ case (MAN_TBL): return(1); default: @@ -1,4 +1,4 @@ -/* $Id: mdoc.h,v 1.115 2011/01/25 10:37:49 kristaps Exp $ */ +/* $Id: mdoc.h,v 1.116 2011/02/06 21:44:36 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -191,6 +191,7 @@ enum mdoc_type { MDOC_BODY, MDOC_BLOCK, MDOC_TBL, + MDOC_EQN, MDOC_ROOT }; diff --git a/mdoc_html.c b/mdoc_html.c index c0e9b4ef..cf71aef6 100644 --- a/mdoc_html.c +++ b/mdoc_html.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.150 2011/02/02 21:40:45 kristaps Exp $ */ +/* $Id: mdoc_html.c,v 1.151 2011/02/06 21:44:36 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -432,6 +432,8 @@ print_mdoc_node(MDOC_ARGS) print_otag(h, TAG_BR, 0, NULL); print_text(h, n->string); return; + case (MDOC_EQN): + return; case (MDOC_TBL): /* * This will take care of initialising all of the table diff --git a/mdoc_term.c b/mdoc_term.c index d9ecbbf0..e84d56d2 100644 --- a/mdoc_term.c +++ b/mdoc_term.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.215 2011/02/02 21:40:45 kristaps Exp $ */ +/* $Id: mdoc_term.c,v 1.216 2011/02/06 21:44:36 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> @@ -319,6 +319,8 @@ print_mdoc_node(DECL_ARGS) term_newln(p); term_word(p, n->string); break; + case (MDOC_EQN): + break; case (MDOC_TBL): term_tbl(p, n->span); break; @@ -369,6 +371,8 @@ print_mdoc_node(DECL_ARGS) break; case (MDOC_TBL): break; + case (MDOC_EQN): + break; default: if ( ! termacts[n->tok].post || MDOC_ENDED & n->flags) break; diff --git a/mdoc_validate.c b/mdoc_validate.c index 86cf2309..56b249f0 100644 --- a/mdoc_validate.c +++ b/mdoc_validate.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_validate.c,v 1.155 2011/02/02 21:40:45 kristaps Exp $ */ +/* $Id: mdoc_validate.c,v 1.156 2011/02/06 21:44:36 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -338,6 +338,8 @@ mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n) /* FALLTHROUGH */ case (MDOC_TBL): /* FALLTHROUGH */ + case (MDOC_EQN): + /* FALLTHROUGH */ case (MDOC_ROOT): return(1); default: @@ -1,4 +1,4 @@ -/* $Id: tree.c,v 1.32 2011/01/10 14:40:30 kristaps Exp $ */ +/* $Id: tree.c,v 1.33 2011/02/06 21:44:36 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -92,6 +92,9 @@ print_mdoc(const struct mdoc_node *n, int indent) case (MDOC_TBL): t = "tbl"; break; + case (MDOC_EQN): + t = "eqn"; + break; default: abort(); /* NOTREACHED */ @@ -128,6 +131,9 @@ print_mdoc(const struct mdoc_node *n, int indent) break; case (MDOC_TBL): break; + case (MDOC_EQN): + p = "eqn"; + break; case (MDOC_ROOT): p = "root"; break; @@ -198,6 +204,9 @@ print_man(const struct man_node *n, int indent) case (MAN_TBL): t = "tbl"; break; + case (MAN_EQN): + t = "eqn"; + break; default: abort(); /* NOTREACHED */ @@ -223,6 +232,9 @@ print_man(const struct man_node *n, int indent) break; case (MAN_TBL): break; + case (MAN_EQN): + p = "eqn"; + break; default: abort(); /* NOTREACHED */ |