===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.158
retrieving revision 1.160
diff -u -p -r1.158 -r1.160
--- mandoc/man.c	2015/04/19 13:50:25	1.158
+++ mandoc/man.c	2015/04/19 14:25:41	1.160
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.158 2015/04/19 13:50:25 schwarze Exp $ */
+/*	$Id: man.c,v 1.160 2015/04/19 14:25:41 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -50,7 +50,6 @@ const	char *const __man_macronames[MAN_MAX] = {
 
 const	char * const *man_macronames = __man_macronames;
 
-static	void		 man_breakscope(struct roff_man *, int);
 static	void		 man_descope(struct roff_man *, int, int);
 static	int		 man_ptext(struct roff_man *, int, char *, int);
 static	int		 man_pmacro(struct roff_man *, int, char *, int);
@@ -95,61 +94,6 @@ man_block_alloc(struct roff_man *man, int line, int po
 	man->next = ROFF_NEXT_CHILD;
 }
 
-void
-man_word_alloc(struct roff_man *man, int line, int pos, const char *word)
-{
-	struct roff_node *n;
-
-	n = roff_node_alloc(man, line, pos, ROFFT_TEXT, MAN_MAX);
-	n->string = roff_strdup(man->roff, word);
-	roff_node_append(man, n);
-	man_valid_post(man);
-	man->next = ROFF_NEXT_SIBLING;
-}
-
-void
-man_word_append(struct roff_man *man, const char *word)
-{
-	struct roff_node *n;
-	char		*addstr, *newstr;
-
-	n = man->last;
-	addstr = roff_strdup(man->roff, word);
-	mandoc_asprintf(&newstr, "%s %s", n->string, addstr);
-	free(addstr);
-	free(n->string);
-	n->string = newstr;
-	man->next = ROFF_NEXT_SIBLING;
-}
-
-void
-man_addeqn(struct roff_man *man, const struct eqn *ep)
-{
-	struct roff_node *n;
-
-	n = roff_node_alloc(man, ep->ln, ep->pos, ROFFT_EQN, MAN_MAX);
-	n->eqn = ep;
-	if (ep->ln > man->last->line)
-		n->flags |= MAN_LINE;
-	roff_node_append(man, n);
-	man->next = ROFF_NEXT_SIBLING;
-	man_descope(man, ep->ln, ep->pos);
-}
-
-void
-man_addspan(struct roff_man *man, const struct tbl_span *sp)
-{
-	struct roff_node *n;
-
-	man_breakscope(man, MAN_MAX);
-	n = roff_node_alloc(man, sp->line, 0, ROFFT_TBL, MAN_MAX);
-	n->span = sp;
-	roff_node_append(man, n);
-	man_valid_post(man);
-	man->next = ROFF_NEXT_SIBLING;
-	man_descope(man, sp->line, 0);
-}
-
 static void
 man_descope(struct roff_man *man, int line, int offs)
 {
@@ -178,7 +122,7 @@ man_ptext(struct roff_man *man, int line, char *buf, i
 	/* Literal free-form text whitespace is preserved. */
 
 	if (man->flags & MAN_LITERAL) {
-		man_word_alloc(man, line, offs, buf + offs);
+		roff_word_alloc(man, line, offs, buf + offs);
 		man_descope(man, line, offs);
 		return(1);
 	}
@@ -222,7 +166,7 @@ man_ptext(struct roff_man *man, int line, char *buf, i
 
 		buf[i] = '\0';
 	}
-	man_word_alloc(man, line, offs, buf + offs);
+	roff_word_alloc(man, line, offs, buf + offs);
 
 	/*
 	 * End-of-sentence check.  If the last character is an unescaped
@@ -261,9 +205,9 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in
 
 	mac[i] = '\0';
 
-	tok = (i > 0 && i < 4) ? man_hash_find(mac) : MAN_MAX;
+	tok = (i > 0 && i < 4) ? man_hash_find(mac) : TOKEN_NONE;
 
-	if (tok == MAN_MAX) {
+	if (tok == TOKEN_NONE) {
 		mandoc_msg(MANDOCERR_MACRO, man->parse,
 		    ln, ppos, buf + ppos - 1);
 		return(1);
@@ -349,7 +293,7 @@ man_breakscope(struct roff_man *man, int tok)
 	 * Delete the element that is being broken.
 	 */
 
-	if (man->flags & MAN_ELINE && (tok == MAN_MAX ||
+	if (man->flags & MAN_ELINE && (tok == TOKEN_NONE ||
 	    ! (man_macros[tok].flags & MAN_NSCOPED))) {
 		n = man->last;
 		assert(n->type != ROFFT_TEXT);
@@ -358,7 +302,7 @@ man_breakscope(struct roff_man *man, int tok)
 
 		mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
 		    n->line, n->pos, "%s breaks %s",
-		    tok == MAN_MAX ? "TS" : man_macronames[tok],
+		    tok == TOKEN_NONE ? "TS" : man_macronames[tok],
 		    man_macronames[n->tok]);
 
 		roff_node_delete(man, n);
@@ -371,7 +315,7 @@ man_breakscope(struct roff_man *man, int tok)
 	 * Delete the block that is being broken.
 	 */
 
-	if (man->flags & MAN_BLINE && (tok == MAN_MAX ||
+	if (man->flags & MAN_BLINE && (tok == TOKEN_NONE ||
 	    man_macros[tok].flags & MAN_BSCOPE)) {
 		n = man->last;
 		if (n->type == ROFFT_TEXT)
@@ -386,7 +330,7 @@ man_breakscope(struct roff_man *man, int tok)
 
 		mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
 		    n->line, n->pos, "%s breaks %s",
-		    tok == MAN_MAX ? "TS" : man_macronames[tok],
+		    tok == TOKEN_NONE ? "TS" : man_macronames[tok],
 		    man_macronames[n->tok]);
 
 		roff_node_delete(man, n);