===================================================================
RCS file: /cvs/mandoc/man_macro.c,v
retrieving revision 1.104
retrieving revision 1.108
diff -u -p -r1.104 -r1.108
--- mandoc/man_macro.c	2015/04/03 23:19:15	1.104
+++ mandoc/man_macro.c	2015/04/19 14:57:38	1.108
@@ -1,4 +1,4 @@
-/*	$Id: man_macro.c,v 1.104 2015/04/03 23:19:15 schwarze Exp $ */
+/*	$Id: man_macro.c,v 1.108 2015/04/19 14:57:38 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -29,15 +29,16 @@
 #include "roff.h"
 #include "man.h"
 #include "libmandoc.h"
+#include "roff_int.h"
 #include "libman.h"
 
 static	void		 blk_close(MACRO_PROT_ARGS);
 static	void		 blk_exp(MACRO_PROT_ARGS);
 static	void		 blk_imp(MACRO_PROT_ARGS);
 static	void		 in_line_eoln(MACRO_PROT_ARGS);
-static	int		 man_args(struct man *, int,
+static	int		 man_args(struct roff_man *, int,
 				int *, char *, char **);
-static	void		 rew_scope(struct man *, int);
+static	void		 rew_scope(struct roff_man *, int);
 
 const	struct man_macro __man_macros[MAN_MAX] = {
 	{ in_line_eoln, MAN_NSCOPED }, /* br */
@@ -84,7 +85,7 @@ const	struct man_macro * const man_macros = __man_macr
 
 
 void
-man_unscope(struct man *man, const struct roff_node *to)
+man_unscope(struct roff_man *man, const struct roff_node *to)
 {
 	struct roff_node *n;
 
@@ -110,7 +111,7 @@ man_unscope(struct man *man, const struct roff_node *t
 				}
 				man->last = n;
 				n = n->parent;
-				man_node_delete(man, man->last);
+				roff_node_delete(man, man->last);
 				continue;
 			}
 			if (n->type == ROFFT_BLOCK &&
@@ -140,7 +141,7 @@ man_unscope(struct man *man, const struct roff_node *t
 	 */
 
 	man->next = (man->last == to) ?
-	    MAN_NEXT_CHILD : MAN_NEXT_SIBLING;
+	    ROFF_NEXT_CHILD : ROFF_NEXT_SIBLING;
 }
 
 /*
@@ -149,7 +150,7 @@ man_unscope(struct man *man, const struct roff_node *t
  * scopes.  When a scope is closed, it must be validated and actioned.
  */
 static void
-rew_scope(struct man *man, int tok)
+rew_scope(struct roff_man *man, int tok)
 {
 	struct roff_node *n;
 
@@ -258,13 +259,12 @@ blk_exp(MACRO_PROT_ARGS)
 	int		 la;
 
 	rew_scope(man, tok);
-	man_block_alloc(man, line, ppos, tok);
-	man_head_alloc(man, line, ppos, tok);
-	head = man->last;
+	roff_block_alloc(man, line, ppos, tok);
+	head = roff_head_alloc(man, line, ppos, tok);
 
 	la = *pos;
 	if (man_args(man, line, pos, buf, &p))
-		man_word_alloc(man, line, la, p);
+		roff_word_alloc(man, line, la, p);
 
 	if (buf[*pos] != '\0')
 		mandoc_vmsg(MANDOCERR_ARG_EXCESS,
@@ -272,7 +272,7 @@ blk_exp(MACRO_PROT_ARGS)
 		    man_macronames[tok], buf + *pos);
 
 	man_unscope(man, head);
-	man_body_alloc(man, line, ppos, tok);
+	roff_body_alloc(man, line, ppos, tok);
 }
 
 /*
@@ -289,9 +289,10 @@ blk_imp(MACRO_PROT_ARGS)
 	struct roff_node *n;
 
 	rew_scope(man, tok);
-	man_block_alloc(man, line, ppos, tok);
-	man_head_alloc(man, line, ppos, tok);
-	n = man->last;
+	n = roff_block_alloc(man, line, ppos, tok);
+	if (n->tok == MAN_SH || n->tok == MAN_SS)
+		man->flags &= ~MAN_LITERAL;
+	n = roff_head_alloc(man, line, ppos, tok);
 
 	/* Add line arguments. */
 
@@ -299,7 +300,7 @@ blk_imp(MACRO_PROT_ARGS)
 		la = *pos;
 		if ( ! man_args(man, line, pos, buf, &p))
 			break;
-		man_word_alloc(man, line, la, p);
+		roff_word_alloc(man, line, la, p);
 	}
 
 	/*
@@ -317,7 +318,7 @@ blk_imp(MACRO_PROT_ARGS)
 	/* Close out the head and open the body. */
 
 	man_unscope(man, n);
-	man_body_alloc(man, line, ppos, tok);
+	roff_body_alloc(man, line, ppos, tok);
 }
 
 void
@@ -327,7 +328,7 @@ in_line_eoln(MACRO_PROT_ARGS)
 	char		*p;
 	struct roff_node *n;
 
-	man_elem_alloc(man, line, ppos, tok);
+	roff_elem_alloc(man, line, ppos, tok);
 	n = man->last;
 
 	for (;;) {
@@ -350,9 +351,9 @@ in_line_eoln(MACRO_PROT_ARGS)
 			break;
 		if (man_macros[tok].flags & MAN_JOIN &&
 		    man->last->type == ROFFT_TEXT)
-			man_word_append(man, p);
+			roff_word_append(man, p);
 		else
-			man_word_alloc(man, line, la, p);
+			roff_word_alloc(man, line, la, p);
 	}
 
 	/*
@@ -377,7 +378,7 @@ in_line_eoln(MACRO_PROT_ARGS)
 	}
 
 	assert(man->last->type != ROFFT_ROOT);
-	man->next = MAN_NEXT_SIBLING;
+	man->next = ROFF_NEXT_SIBLING;
 
 	/*
 	 * Rewind our element scope.  Note that when TH is pruned, we'll
@@ -405,14 +406,14 @@ in_line_eoln(MACRO_PROT_ARGS)
 
 
 void
-man_macroend(struct man *man)
+man_macroend(struct roff_man *man)
 {
 
 	man_unscope(man, man->first);
 }
 
 static int
-man_args(struct man *man, int line, int *pos, char *buf, char **v)
+man_args(struct roff_man *man, int line, int *pos, char *buf, char **v)
 {
 	char	 *start;