===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.22
retrieving revision 1.30
diff -u -p -r1.22 -r1.30
--- mandoc/mdoc_term.c	2009/07/07 11:47:17	1.22
+++ mandoc/mdoc_term.c	2009/07/12 17:49:32	1.30
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.22 2009/07/07 11:47:17 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.30 2009/07/12 17:49:32 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -80,26 +80,16 @@ const	int ttypes[TTYPE_NMAX] = {
 	TERMP_BOLD		/* TTYPE_LIST */
 };
 
-/* XXX - clean this up. */
-
+/* 
+ * This is used to preserve a style of value across a macro, instead of
+ * losing it while the body is processed.
+ */
 struct	termpair {
 	struct termpair	 *ppair;
-	int		  type;
-#define	TERMPAIR_FLAG	 (1 << 0)
-	int	  	  flag;		/* Whether being used. */
-	size_t	  	  offset;	/* Left margin. */
-	size_t	  	  rmargin;	/* Right margin. */
+	int	  	  flag;		/* Cross-body struct termp:flags. */
 	int		  count;	/* Enum count. */
 };
 
-#define	TERMPAIR_SETFLAG(termp, p, fl) \
-	do { \
-		assert(! (TERMPAIR_FLAG & (p)->type)); \
-		(termp)->flags |= (fl); \
-		(p)->flag = (fl); \
-		(p)->type |= TERMPAIR_FLAG; \
-	} while ( /* CONSTCOND */ 0)
-
 #define	DECL_ARGS \
 	struct termp *p, struct termpair *pair, \
 	const struct mdoc_meta *meta, \
@@ -141,16 +131,13 @@ DECL_PRE(termp_ap);
 DECL_PRE(termp_ar);
 DECL_PRE(termp_at);
 DECL_PRE(termp_bf);
-DECL_PRE(termp_bsx);
 DECL_PRE(termp_bt);
 DECL_PRE(termp_cd);
 DECL_PRE(termp_cm);
-DECL_PRE(termp_dx);
 DECL_PRE(termp_em);
 DECL_PRE(termp_ex);
 DECL_PRE(termp_fa);
 DECL_PRE(termp_fl);
-DECL_PRE(termp_fx);
 DECL_PRE(termp_ic);
 DECL_PRE(termp_lk);
 DECL_PRE(termp_ms);
@@ -158,8 +145,7 @@ DECL_PRE(termp_mt);
 DECL_PRE(termp_nd);
 DECL_PRE(termp_nm);
 DECL_PRE(termp_ns);
-DECL_PRE(termp_nx);
-DECL_PRE(termp_ox);
+DECL_PRE(termp_xx);
 DECL_PRE(termp_pa);
 DECL_PRE(termp_pp);
 DECL_PRE(termp_rs);
@@ -169,7 +155,6 @@ DECL_PRE(termp_st);
 DECL_PRE(termp_sx);
 DECL_PRE(termp_sy);
 DECL_PRE(termp_ud);
-DECL_PRE(termp_ux);
 DECL_PRE(termp_va);
 DECL_PRE(termp_xr);
 
@@ -243,7 +228,7 @@ static const struct termact termacts[MDOC_MAX] = {
 	{ termp_bf_pre, NULL }, /* Bf */ 
 	{ termp_bq_pre, termp_bq_post }, /* Bo */
 	{ termp_bq_pre, termp_bq_post }, /* Bq */
-	{ termp_bsx_pre, NULL }, /* Bsx */
+	{ termp_xx_pre, NULL }, /* Bsx */
 	{ NULL, termp_bx_post }, /* Bx */
 	{ NULL, NULL }, /* Db */
 	{ NULL, NULL }, /* Dc */
@@ -253,12 +238,12 @@ static const struct termact termacts[MDOC_MAX] = {
 	{ NULL, NULL }, /* Ef */
 	{ termp_em_pre, NULL }, /* Em */ 
 	{ NULL, NULL }, /* Eo */
-	{ termp_fx_pre, NULL }, /* Fx */
+	{ termp_xx_pre, NULL }, /* Fx */
 	{ termp_ms_pre, NULL }, /* Ms */
 	{ NULL, NULL }, /* No */
 	{ termp_ns_pre, NULL }, /* Ns */
-	{ termp_nx_pre, NULL }, /* Nx */
-	{ termp_ox_pre, NULL }, /* Ox */
+	{ termp_xx_pre, NULL }, /* Nx */
+	{ termp_xx_pre, NULL }, /* Ox */
 	{ NULL, NULL }, /* Pc */
 	{ termp_pf_pre, termp_pf_post }, /* Pf */
 	{ termp_pq_pre, termp_pq_post }, /* Po */
@@ -276,7 +261,7 @@ static const struct termact termacts[MDOC_MAX] = {
 	{ termp_sx_pre, NULL }, /* Sx */
 	{ termp_sy_pre, NULL }, /* Sy */
 	{ NULL, NULL }, /* Tn */
-	{ termp_ux_pre, NULL }, /* Ux */
+	{ termp_xx_pre, NULL }, /* Ux */
 	{ NULL, NULL }, /* Xc */
 	{ NULL, NULL }, /* Xo */
 	{ termp_fo_pre, termp_fo_post }, /* Fo */ 
@@ -299,7 +284,7 @@ static const struct termact termacts[MDOC_MAX] = {
 	{ NULL, NULL }, /* %C */ 
 	{ NULL, NULL }, /* Es */ 
 	{ NULL, NULL }, /* En */ 
-	{ termp_dx_pre, NULL }, /* Dx */ 
+	{ termp_xx_pre, NULL }, /* Dx */ 
 	{ NULL, NULL }, /* %Q */ 
 };
 
@@ -360,13 +345,13 @@ print_node(DECL_ARGS)
 {
 	int		 dochild;
 	struct termpair	 npair;
+	size_t		 offset, rmargin;
 
-	/* Pre-processing. */
-
 	dochild = 1;
+	offset = p->offset;
+	rmargin = p->rmargin;
+
 	npair.ppair = pair;
-	npair.type = 0;
-	npair.offset = npair.rmargin = 0;
 	npair.flag = 0;
 	npair.count = 0;
 
@@ -379,20 +364,20 @@ print_node(DECL_ARGS)
 
 	/* Children. */
 
-	if (TERMPAIR_FLAG & npair.type)
-		p->flags |= npair.flag;
+	p->flags |= npair.flag;
 
 	if (dochild && node->child)
 		print_body(p, &npair, meta, node->child);
 
-	if (TERMPAIR_FLAG & npair.type)
-		p->flags &= ~npair.flag;
-
 	/* Post-processing. */
 
 	if (MDOC_TEXT != node->type)
 		if (termacts[node->tok].post)
 			(*termacts[node->tok].post)(p, &npair, meta, node);
+
+	p->offset = offset;
+	p->rmargin = rmargin;
+	p->flags &= ~npair.flag;
 }
 
 
@@ -721,8 +706,6 @@ termp_it_pre(DECL_ARGS)
 
 	/* Save parent attributes. */
 
-	pair->offset = p->offset;
-	pair->rmargin = p->rmargin;
 	pair->flag = p->flags;
 
 	/* Get list width and offset. */
@@ -913,7 +896,7 @@ termp_it_pre(DECL_ARGS)
 			/* FALLTHROUGH */
 		case (MDOC_Hyphen):
 			p->flags |= TERMP_BOLD;
-			term_word(p, "\\-");
+			term_word(p, "\\(hy");
 			break;
 		case (MDOC_Enum):
 			(pair->ppair->ppair->count)++;
@@ -985,8 +968,6 @@ termp_it_post(DECL_ARGS)
 		break;
 	}
 
-	p->offset = pair->offset;
-	p->rmargin = pair->rmargin;
 	p->flags = pair->flag;
 }
 
@@ -999,7 +980,9 @@ termp_nm_pre(DECL_ARGS)
 	if (SEC_SYNOPSIS == node->sec)
 		term_newln(p);
 
-	TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_PROG]);
+	pair->flag |= ttypes[TTYPE_PROG];
+	p->flags |= ttypes[TTYPE_PROG];
+
 	if (NULL == node->child)
 		term_word(p, meta->name);
 
@@ -1012,7 +995,8 @@ static int
 termp_fl_pre(DECL_ARGS)
 {
 
-	TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_FLAG]);
+	pair->flag |= ttypes[TTYPE_CMD_FLAG];
+	p->flags |= ttypes[TTYPE_CMD_FLAG];
 	term_word(p, "\\-");
 	p->flags |= TERMP_NOSPACE;
 	return(1);
@@ -1024,7 +1008,7 @@ static int
 termp_ar_pre(DECL_ARGS)
 {
 
-	TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_ARG]);
+	pair->flag |= ttypes[TTYPE_CMD_ARG];
 	return(1);
 }
 
@@ -1135,7 +1119,19 @@ static int
 termp_nd_pre(DECL_ARGS)
 {
 
+	if (MDOC_BODY != node->type)
+		return(1);
+
+	/* 
+	 * XXX: signed off by jmc@openbsd.org.  This technically
+	 * produces a minus sign after the Nd, which is wrong, but is
+	 * consistent with the historic OpenBSD tmac file.
+	 */
+#if defined(__OpenBSD__) || defined(__linux__)
 	term_word(p, "\\-");
+#else
+	term_word(p, "\\(em");
+#endif
 	return(1);
 }
 
@@ -1190,7 +1186,7 @@ termp_vt_pre(DECL_ARGS)
 {
 
 	/* FIXME: this can be "type name". */
-	TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_VAR_DECL]);
+	pair->flag |= ttypes[TTYPE_VAR_DECL];
 	return(1);
 }
 
@@ -1210,11 +1206,7 @@ static int
 termp_fd_pre(DECL_ARGS)
 {
 
-	/* 
-	 * FIXME: this naming is bad.  This value is used, in general,
-	 * for the #include header or other preprocessor statement.
-	 */
-	TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_DECL]);
+	pair->flag |= ttypes[TTYPE_FUNC_DECL];
 	return(1);
 }
 
@@ -1226,6 +1218,7 @@ termp_fd_post(DECL_ARGS)
 
 	if (node->sec != SEC_SYNOPSIS)
 		return;
+
 	term_newln(p);
 	if (node->next && MDOC_Fd != node->next->tok)
 		term_vspace(p);
@@ -1240,7 +1233,7 @@ termp_sh_pre(DECL_ARGS)
 	switch (node->type) {
 	case (MDOC_HEAD):
 		term_vspace(p);
-		TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SECTION]);
+		pair->flag |= ttypes[TTYPE_SECTION];
 		break;
 	case (MDOC_BODY):
 		p->offset = INDENT;
@@ -1342,8 +1335,7 @@ termp_d1_pre(DECL_ARGS)
 	if (MDOC_BLOCK != node->type)
 		return(1);
 	term_newln(p);
-	pair->offset = INDENT + 1;
-	p->offset += pair->offset;
+	p->offset += (INDENT + 1);
 	return(1);
 }
 
@@ -1356,7 +1348,6 @@ termp_d1_post(DECL_ARGS)
 	if (MDOC_BLOCK != node->type) 
 		return;
 	term_newln(p);
-	p->offset -= pair->offset;
 }
 
 
@@ -1393,7 +1384,7 @@ termp_ft_pre(DECL_ARGS)
 	if (SEC_SYNOPSIS == node->sec)
 		if (node->prev && MDOC_Fo == node->prev->tok)
 			term_vspace(p);
-	TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_TYPE]);
+	pair->flag |= ttypes[TTYPE_FUNC_TYPE];
 	return(1);
 }
 
@@ -1449,7 +1440,6 @@ termp_fn_post(DECL_ARGS)
 
 	if (node->sec == SEC_SYNOPSIS && node->next)
 		term_vspace(p);
-
 }
 
 
@@ -1458,7 +1448,7 @@ static int
 termp_sx_pre(DECL_ARGS)
 {
 
-	TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_LINK]);
+	pair->flag |= ttypes[TTYPE_LINK];
 	return(1);
 }
 
@@ -1470,7 +1460,7 @@ termp_fa_pre(DECL_ARGS)
 	struct mdoc_node *n;
 
 	if (node->parent->tok != MDOC_Fo) {
-		TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_ARG]);
+		pair->flag |= ttypes[TTYPE_FUNC_ARG];
 		return(1);
 	}
 
@@ -1494,7 +1484,7 @@ static int
 termp_va_pre(DECL_ARGS)
 {
 
-	TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_VAR_DECL]);
+	pair->flag |= ttypes[TTYPE_VAR_DECL];
 	return(1);
 }
 
@@ -1526,8 +1516,6 @@ termp_bd_pre(DECL_ARGS)
 	if (NULL == node->parent->args)
 		errx(1, "missing display type");
 
-	pair->offset = p->offset;
-
 	for (type = -1, i = 0; 
 			i < (int)node->parent->args->argc; i++) {
 		switch (node->parent->args->argv[i].arg) {
@@ -1597,7 +1585,6 @@ termp_bd_post(DECL_ARGS)
 
 	term_flushln(p);
 	p->flags &= ~TERMP_LITERAL;
-	p->offset = pair->offset;
 	p->flags |= TERMP_NOSPACE;
 }
 
@@ -1628,16 +1615,6 @@ termp_qq_post(DECL_ARGS)
 
 
 /* ARGSUSED */
-static int
-termp_bsx_pre(DECL_ARGS)
-{
-
-	term_word(p, "BSDI BSD/OS");
-	return(1);
-}
-
-
-/* ARGSUSED */
 static void
 termp_bx_post(DECL_ARGS)
 {
@@ -1650,56 +1627,42 @@ termp_bx_post(DECL_ARGS)
 
 /* ARGSUSED */
 static int
-termp_ox_pre(DECL_ARGS)
+termp_xx_pre(DECL_ARGS)
 {
+	const char	*pp;
 
-	term_word(p, "OpenBSD");
-	return(1);
-}
+	pp = NULL;
+	switch (node->tok) {
+	case (MDOC_Bsx):
+		pp = "BSDI BSD/OS";
+		break;
+	case (MDOC_Dx):
+		pp = "DragonFlyBSD";
+		break;
+	case (MDOC_Fx):
+		pp = "FreeBSD";
+		break;
+	case (MDOC_Nx):
+		pp = "NetBSD";
+		break;
+	case (MDOC_Ox):
+		pp = "OpenBSD";
+		break;
+	case (MDOC_Ux):
+		pp = "UNIX";
+		break;
+	default:
+		break;
+	}
 
-
-/* ARGSUSED */
-static int
-termp_dx_pre(DECL_ARGS)
-{
-
-	term_word(p, "DragonFly");
+	assert(pp);
+	term_word(p, pp);
 	return(1);
 }
 
 
 /* ARGSUSED */
 static int
-termp_ux_pre(DECL_ARGS)
-{
-
-	term_word(p, "UNIX");
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_fx_pre(DECL_ARGS)
-{
-
-	term_word(p, "FreeBSD");
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_nx_pre(DECL_ARGS)
-{
-
-	term_word(p, "NetBSD");
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
 termp_sq_pre(DECL_ARGS)
 {
 
@@ -1755,7 +1718,7 @@ termp_ss_pre(DECL_ARGS)
 			term_vspace(p);
 		break;
 	case (MDOC_HEAD):
-		TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SSECTION]);
+		pair->flag |= ttypes[TTYPE_SSECTION];
 		p->offset = HALFINDENT;
 		break;
 	default:
@@ -1771,14 +1734,8 @@ static void
 termp_ss_post(DECL_ARGS)
 {
 
-	switch (node->type) {
-	case (MDOC_HEAD):
+	if (MDOC_HEAD == node->type)
 		term_newln(p);
-		p->offset = INDENT;
-		break;
-	default:
-		break;
-	}
 }
 
 
@@ -1787,7 +1744,7 @@ static int
 termp_pa_pre(DECL_ARGS)
 {
 
-	TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FILE]);
+	pair->flag |= ttypes[TTYPE_FILE];
 	return(1);
 }
 
@@ -1797,7 +1754,7 @@ static int
 termp_em_pre(DECL_ARGS)
 {
 
-	TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);
+	pair->flag |= ttypes[TTYPE_EMPH];
 	return(1);
 }
 
@@ -1807,7 +1764,7 @@ static int
 termp_cd_pre(DECL_ARGS)
 {
 
-	TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CONFIG]);
+	pair->flag |= ttypes[TTYPE_CONFIG];
 	term_newln(p);
 	return(1);
 }
@@ -1818,7 +1775,7 @@ static int
 termp_cm_pre(DECL_ARGS)
 {
 
-	TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_FLAG]);
+	pair->flag |= ttypes[TTYPE_CMD_FLAG];
 	return(1);
 }
 
@@ -1828,7 +1785,7 @@ static int
 termp_ic_pre(DECL_ARGS)
 {
 
-	TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD]);
+	pair->flag |= ttypes[TTYPE_CMD];
 	return(1);
 }
 
@@ -1838,8 +1795,8 @@ static int
 termp_in_pre(DECL_ARGS)
 {
 
-	/* XXX This conforms to new-groff style. */
-	TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_INCLUDE]);
+	pair->flag |= ttypes[TTYPE_INCLUDE];
+	p->flags |= ttypes[TTYPE_INCLUDE];
 
 	if (SEC_SYNOPSIS == node->sec)
 		term_word(p, "#include");
@@ -2012,25 +1969,25 @@ termp_bf_pre(DECL_ARGS)
 {
 	const struct mdoc_node	*n;
 
-	if (MDOC_HEAD == node->type) {
+	if (MDOC_HEAD == node->type)
 		return(0);
-	} else if (MDOC_BLOCK != node->type)
+	else if (MDOC_BLOCK != node->type)
 		return(1);
 
 	if (NULL == (n = node->head->child)) {
 		if (arg_hasattr(MDOC_Emphasis, node))
-			TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);
+			pair->flag |= ttypes[TTYPE_EMPH];
 		else if (arg_hasattr(MDOC_Symbolic, node))
-			TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMB]);
+			pair->flag |= ttypes[TTYPE_SYMB];
 
 		return(1);
 	} 
 
 	assert(MDOC_TEXT == n->type);
 	if (0 == strcmp("Em", n->string))
-		TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);
+		pair->flag |= ttypes[TTYPE_EMPH];
 	else if (0 == strcmp("Sy", n->string))
-		TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);
+		pair->flag |= ttypes[TTYPE_SYMB];
 
 	return(1);
 }
@@ -2041,7 +1998,7 @@ static int
 termp_sy_pre(DECL_ARGS)
 {
 
-	TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMB]);
+	pair->flag |= ttypes[TTYPE_SYMB];
 	return(1);
 }
 
@@ -2051,7 +2008,7 @@ static int
 termp_ms_pre(DECL_ARGS)
 {
 
-	TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMBOL]);
+	pair->flag |= ttypes[TTYPE_SYMBOL];
 	return(1);
 }
 
@@ -2090,7 +2047,7 @@ static int
 termp__j_pre(DECL_ARGS)
 {
 
-	TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_REF_JOURNAL]);
+	pair->flag |= ttypes[TTYPE_REF_JOURNAL];
 	return(1);
 }
 
@@ -2137,7 +2094,7 @@ termp_lk_pre(DECL_ARGS)
 	n = node->child;
 
 	if (NULL == n->next) {
-		TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_LINK_ANCHOR]);
+		pair->flag |= ttypes[TTYPE_LINK_ANCHOR];
 		return(1);
 	}
 
@@ -2161,7 +2118,7 @@ static int
 termp_mt_pre(DECL_ARGS)
 {
 
-	TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_LINK_ANCHOR]);
+	pair->flag |= ttypes[TTYPE_LINK_ANCHOR];
 	return(1);
 }