===================================================================
RCS file: /cvs/mandoc/mdoc_man.c,v
retrieving revision 1.10
retrieving revision 1.18
diff -u -p -r1.10 -r1.18
--- mandoc/mdoc_man.c	2012/07/07 13:37:42	1.10
+++ mandoc/mdoc_man.c	2012/07/08 11:10:13	1.18
@@ -1,6 +1,6 @@
-/*	$Id: mdoc_man.c,v 1.10 2012/07/07 13:37:42 schwarze Exp $ */
+/*	$Id: mdoc_man.c,v 1.18 2012/07/08 11:10:13 schwarze Exp $ */
 /*
- * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -18,10 +18,12 @@
 #include "config.h"
 #endif
 
+#include <assert.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "mandoc.h"
+#include "out.h"
 #include "man.h"
 #include "mdoc.h"
 #include "main.h"
@@ -31,7 +33,9 @@
 		  struct mman *mm
 
 struct	mman {
+	int		  mode_space; /* spacing mode: 1 = on */
 	int		  need_space; /* next word needs prior ws */
+	int		  mode_keep; /* currently inside a keep */
 	int		  need_nl; /* next word needs prior nl */
 };
 
@@ -46,28 +50,43 @@ struct	manact {
 static	int	  cond_body(DECL_ARGS);
 static	int	  cond_head(DECL_ARGS);
 static	void	  post_bd(DECL_ARGS);
+static	void	  post_bk(DECL_ARGS);
 static	void	  post_dl(DECL_ARGS);
 static	void	  post_enc(DECL_ARGS);
+static	void	  post_fa(DECL_ARGS);
+static	void	  post_fn(DECL_ARGS);
+static	void	  post_fo(DECL_ARGS);
+static	void	  post_in(DECL_ARGS);
+static	void	  post_lb(DECL_ARGS);
 static	void	  post_nm(DECL_ARGS);
 static	void	  post_percent(DECL_ARGS);
 static	void	  post_pf(DECL_ARGS);
 static	void	  post_sect(DECL_ARGS);
 static	void	  post_sp(DECL_ARGS);
+static	void	  post_vt(DECL_ARGS);
 static	int	  pre_ap(DECL_ARGS);
 static	int	  pre_bd(DECL_ARGS);
+static	int	  pre_bk(DECL_ARGS);
 static	int	  pre_br(DECL_ARGS);
 static	int	  pre_bx(DECL_ARGS);
 static	int	  pre_dl(DECL_ARGS);
 static	int	  pre_enc(DECL_ARGS);
+static	int	  pre_fa(DECL_ARGS);
+static	int	  pre_fn(DECL_ARGS);
+static	int	  pre_fo(DECL_ARGS);
+static	int	  pre_in(DECL_ARGS);
 static	int	  pre_it(DECL_ARGS);
 static	int	  pre_nm(DECL_ARGS);
 static	int	  pre_ns(DECL_ARGS);
 static	int	  pre_pp(DECL_ARGS);
+static	int	  pre_sm(DECL_ARGS);
 static	int	  pre_sp(DECL_ARGS);
 static	int	  pre_sect(DECL_ARGS);
+static	int	  pre_vt(DECL_ARGS);
 static	int	  pre_ux(DECL_ARGS);
 static	int	  pre_xr(DECL_ARGS);
 static	void	  print_word(struct mman *, const char *);
+static	void	  print_offs(struct mman *, const char *);
 static	void	  print_node(DECL_ARGS);
 
 static	const struct manact manacts[MDOC_MAX + 1] = {
@@ -96,13 +115,13 @@ static	const struct manact manacts[MDOC_MAX + 1] = {
 	{ NULL, pre_enc, post_enc, "The \\fB",
 	    "\\fP\nutility exits 0 on success, and >0 if an error occurs."
 	    }, /* Ex */
-	{ NULL, NULL, NULL, NULL, NULL }, /* _Fa */
+	{ NULL, pre_fa, post_fa, NULL, NULL }, /* Fa */
 	{ NULL, NULL, NULL, NULL, NULL }, /* _Fd */
 	{ NULL, pre_enc, post_enc, "\\fB-", "\\fP" }, /* Fl */
-	{ NULL, NULL, NULL, NULL, NULL }, /* _Fn */
-	{ NULL, NULL, NULL, NULL, NULL }, /* _Ft */
+	{ NULL, pre_fn, post_fn, NULL, NULL }, /* Fn */
+	{ NULL, pre_enc, post_enc, "\\fI", "\\fP" }, /* Ft */
 	{ NULL, pre_enc, post_enc, "\\fB", "\\fP" }, /* Ic */
-	{ NULL, NULL, NULL, NULL, NULL }, /* _In */
+	{ NULL, pre_in, post_in, NULL, NULL }, /* In */
 	{ NULL, pre_enc, post_enc, "\\fR", "\\fP" }, /* Li */
 	{ cond_head, pre_enc, NULL, "\\- ", NULL }, /* Nd */
 	{ NULL, pre_nm, post_nm, NULL, NULL }, /* Nm */
@@ -116,7 +135,7 @@ static	const struct manact manacts[MDOC_MAX + 1] = {
 		}, /* Rv */
 	{ NULL, NULL, NULL, NULL, NULL }, /* St */
 	{ NULL, NULL, NULL, NULL, NULL }, /* _Va */
-	{ NULL, NULL, NULL, NULL, NULL }, /* _Vt */
+	{ NULL, pre_vt, post_vt, NULL, NULL }, /* Vt */
 	{ NULL, pre_xr, NULL, NULL, NULL }, /* Xr */
 	{ NULL, NULL, post_percent, NULL, NULL }, /* _%A */
 	{ NULL, NULL, NULL, NULL, NULL }, /* _%B */
@@ -166,24 +185,24 @@ static	const struct manact manacts[MDOC_MAX + 1] = {
 	{ NULL, NULL, NULL, NULL, NULL }, /* Sc */
 	{ cond_body, pre_enc, post_enc, "`", "'" }, /* So */
 	{ cond_body, pre_enc, post_enc, "`", "'" }, /* Sq */
-	{ NULL, NULL, NULL, NULL, NULL }, /* _Sm */
+	{ NULL, pre_sm, NULL, NULL, NULL }, /* Sm */
 	{ NULL, pre_enc, post_enc, "\\fI", "\\fP" }, /* Sx */
 	{ NULL, pre_enc, post_enc, "\\fB", "\\fP" }, /* Sy */
 	{ NULL, pre_enc, post_enc, "\\fR", "\\fP" }, /* Tn */
 	{ NULL, pre_ux, NULL, "UNIX", NULL }, /* Ux */
 	{ NULL, NULL, NULL, NULL, NULL }, /* _Xc */
 	{ NULL, NULL, NULL, NULL, NULL }, /* _Xo */
-	{ NULL, NULL, NULL, NULL, NULL }, /* _Fo */
-	{ NULL, NULL, NULL, NULL, NULL }, /* _Fc */
+	{ NULL, pre_fo, post_fo, NULL, NULL }, /* Fo */
+	{ NULL, NULL, NULL, NULL, NULL }, /* Fc */
 	{ cond_body, pre_enc, post_enc, "[", "]" }, /* Oo */
 	{ NULL, NULL, NULL, NULL, NULL }, /* Oc */
-	{ NULL, NULL, NULL, NULL, NULL }, /* _Bk */
-	{ NULL, NULL, NULL, NULL, NULL }, /* _Ek */
+	{ NULL, pre_bk, post_bk, NULL, NULL }, /* Bk */
+	{ NULL, NULL, NULL, NULL, NULL }, /* Ek */
 	{ NULL, pre_ux, NULL, "is currently in beta test.", NULL }, /* Bt */
 	{ NULL, NULL, NULL, NULL, NULL }, /* Hf */
 	{ NULL, NULL, NULL, NULL, NULL }, /* Fr */
 	{ NULL, pre_ux, NULL, "currently under development.", NULL }, /* Ud */
-	{ NULL, NULL, NULL, NULL, NULL }, /* _Lb */
+	{ NULL, NULL, post_lb, NULL, NULL }, /* Lb */
 	{ NULL, pre_pp, NULL, NULL, NULL }, /* Lp */
 	{ NULL, NULL, NULL, NULL, NULL }, /* _Lk */
 	{ NULL, NULL, NULL, NULL, NULL }, /* _Mt */
@@ -220,15 +239,20 @@ print_word(struct mman *mm, const char *s)
 		 * (2) a word that is non-punctuation; and
 		 * (3) if punctuation, non-terminating puncutation.
 		 */
-		if (NULL == strchr(".,:;)]?!", s[0]) || '\0' != s[1])
-			putchar(' ');
+		if (NULL == strchr(".,:;)]?!", s[0]) || '\0' != s[1]) {
+			if (mm->mode_keep) {
+				putchar('\\');
+				putchar('~');
+			} else 
+				putchar(' ');
+		}
 
 	/*
 	 * Reassign needing space if we're not following opening
 	 * punctuation.
 	 */
-	mm->need_space = 
-		('(' != s[0] && '[' != s[0]) || '\0' != s[1];
+	mm->need_space = mm->mode_space &&
+		(('(' != s[0] && '[' != s[0]) || '\0' != s[1]);
 
 	for ( ; *s; s++) {
 		switch (*s) {
@@ -245,6 +269,29 @@ print_word(struct mman *mm, const char *s)
 	}
 }
 
+static void
+print_offs(struct mman *mm, const char *v)
+{
+	char		  buf[24];
+	struct roffsu	  su;
+	size_t		  sz;
+
+	if (NULL == v || '\0' == *v || 0 == strcmp(v, "left"))
+		sz = 0;
+	else if (0 == strcmp(v, "indent"))
+		sz = 6;
+	else if (0 == strcmp(v, "indent-two"))
+		sz = 12;
+	else if (a2roffsu(v, &su, SCALE_MAX)) {
+		print_word(mm, v);
+		return;
+	} else
+		sz = strlen(v);
+
+	snprintf(buf, sizeof(buf), "%ldn", sz);
+	print_word(mm, buf);
+}
+
 void
 man_man(void *arg, const struct man *man)
 {
@@ -273,6 +320,7 @@ man_mdoc(void *arg, const struct mdoc *mdoc)
 
 	memset(&mm, 0, sizeof(struct mman));
 
+	mm.mode_space = 1;
 	mm.need_nl = 1;
 	print_node(m, n, &mm);
 	putchar('\n');
@@ -290,7 +338,8 @@ print_node(DECL_ARGS)
 	 * This makes the page structure be more consistent.
 	 */
 	prev = n->prev ? n->prev : n->parent;
-	if (prev && prev->line < n->line && MDOC_Ns != prev->tok)
+	if (prev && prev->line < n->line &&
+	    MDOC_Fo != prev->tok && MDOC_Ns != prev->tok)
 		mm->need_nl = 1;
 
 	act = NULL;
@@ -445,12 +494,19 @@ static int
 pre_bd(DECL_ARGS)
 {
 
+	if (0 == n->norm->Bd.comp) {
+		mm->need_nl = 1;
+		print_word(mm, ".sp");
+	}
 	if (DISP_unfilled == n->norm->Bd.type ||
 	    DISP_literal  == n->norm->Bd.type) {
 		mm->need_nl = 1;
 		print_word(mm, ".nf");
 	}
 	mm->need_nl = 1;
+	print_word(mm, ".RS");
+	print_offs(mm, n->norm->Bd.offs);
+	mm->need_nl = 1;
 	return(1);
 }
 
@@ -458,6 +514,8 @@ static void
 post_bd(DECL_ARGS)
 {
 
+	mm->need_nl = 1;
+	print_word(mm, ".RE");
 	if (DISP_unfilled == n->norm->Bd.type ||
 	    DISP_literal  == n->norm->Bd.type) {
 		mm->need_nl = 1;
@@ -467,6 +525,29 @@ post_bd(DECL_ARGS)
 }
 
 static int
+pre_bk(DECL_ARGS)
+{
+
+	switch (n->type) {
+	case (MDOC_BLOCK):
+		return(1);
+	case (MDOC_BODY):
+		mm->mode_keep = 1;
+		return(1);
+	default:
+		return(0);
+	}
+}
+
+static void
+post_bk(DECL_ARGS)
+{
+
+	if (MDOC_BODY == n->type)
+		mm->mode_keep = 0;
+}
+
+static int
 pre_br(DECL_ARGS)
 {
 
@@ -516,6 +597,139 @@ post_dl(DECL_ARGS)
 }
 
 static int
+pre_fa(DECL_ARGS)
+{
+
+	if (MDOC_Fa == n->tok)
+		n = n->child;
+
+	while (NULL != n) {
+		print_word(mm, "\\fI");
+		mm->need_space = 0;
+		print_node(m, n, mm);
+		mm->need_space = 0;
+		print_word(mm, "\\fP");
+		if (NULL != (n = n->next))
+			print_word(mm, ",");
+	}
+	return(0);
+}
+
+static void
+post_fa(DECL_ARGS)
+{
+
+	if (NULL != n->next && MDOC_Fa == n->next->tok)
+		print_word(mm, ",");
+}
+
+static int
+pre_fn(DECL_ARGS)
+{
+
+	n = n->child;
+	if (NULL == n)
+		return(0);
+
+	if (MDOC_SYNPRETTY & n->flags) {
+		mm->need_nl = 1;
+		print_word(mm, ".br");
+		mm->need_nl = 1;
+	}
+	print_word(mm, "\\fB");
+	mm->need_space = 0;
+	print_node(m, n, mm);
+	mm->need_space = 0;
+	print_word(mm, "\\fP(");
+	mm->need_space = 0;
+	return(pre_fa(m, n->next, mm));
+}
+
+static void
+post_fn(DECL_ARGS)
+{
+
+	print_word(mm, ")");
+	if (MDOC_SYNPRETTY & n->flags) {
+		print_word(mm, ";");
+		mm->need_nl = 1;
+		print_word(mm, ".br");
+		mm->need_nl = 1;
+	}
+}
+
+static int
+pre_fo(DECL_ARGS)
+{
+
+	switch (n->type) {
+	case (MDOC_HEAD):
+		if (MDOC_SYNPRETTY & n->flags) {
+			mm->need_nl = 1;
+			print_word(mm, ".br");
+			mm->need_nl = 1;
+		}
+		print_word(mm, "\\fB");
+		mm->need_space = 0;
+		break;
+	case (MDOC_BODY):
+		mm->need_space = 0;
+		print_word(mm, "(");
+		mm->need_space = 0;
+		break;
+	default:
+		break;
+	}
+	return(1);
+}
+		
+static void
+post_fo(DECL_ARGS)
+{
+
+	switch (n->type) {
+	case (MDOC_HEAD):
+		mm->need_space = 0;
+		print_word(mm, "\\fP");
+		break;
+	case (MDOC_BODY):
+		post_fn(m, n, mm);
+		break;
+	default:
+		break;
+	}
+}
+
+static int
+pre_in(DECL_ARGS)
+{
+
+	if (MDOC_SYNPRETTY & n->flags) {
+		mm->need_nl = 1;
+		print_word(mm, ".br");
+		mm->need_nl = 1;
+		print_word(mm, "\\fB#include <");
+	} else
+		print_word(mm, "<\\fI");
+	mm->need_space = 0;
+	return(1);
+}
+
+static void
+post_in(DECL_ARGS)
+{
+
+	mm->need_space = 0;
+	if (MDOC_SYNPRETTY & n->flags) {
+		print_word(mm, ">\\fP");
+		mm->need_nl = 1;
+		print_word(mm, ".br");
+		mm->need_nl = 1;
+	} else
+		print_word(mm, "\\fP>");
+}
+
+static int
 pre_it(DECL_ARGS)
 {
 	const struct mdoc_node *bln;
@@ -540,6 +754,17 @@ pre_it(DECL_ARGS)
 	return(1);
 }
 
+static void
+post_lb(DECL_ARGS)
+{
+
+	if (SEC_LIBRARY == n->sec) {
+		mm->need_nl = 1;
+		print_word(mm, ".br");
+		mm->need_nl = 1;
+	}
+}
+
 static int
 pre_nm(DECL_ARGS)
 {
@@ -597,6 +822,18 @@ pre_pp(DECL_ARGS)
 }
 
 static int
+pre_sm(DECL_ARGS)
+{
+
+	assert(n->child && MDOC_TEXT == n->child->type);
+	if (0 == strcmp("on", n->child->string))
+		mm->mode_space = 1;
+	else
+		mm->mode_space = 0;
+	return(0);
+}
+
+static int
 pre_sp(DECL_ARGS)
 {
 
@@ -610,6 +847,44 @@ post_sp(DECL_ARGS)
 {
 
 	mm->need_nl = 1;
+}
+
+static int
+pre_vt(DECL_ARGS)
+{
+
+	if (MDOC_SYNPRETTY & n->flags) {
+		switch (n->type) {
+		case (MDOC_BLOCK):
+			return(1);
+		case (MDOC_BODY):
+			break;
+		default:
+			return(0);
+		}
+		mm->need_nl = 1;
+		print_word(mm, ".br");
+		mm->need_nl = 1;
+	}
+	print_word(mm, "\\fI");
+	mm->need_space = 0;
+	return(1);
+}
+
+static void
+post_vt(DECL_ARGS)
+{
+
+	if (MDOC_BODY != n->type)
+		return;
+
+	mm->need_space = 0;
+	print_word(mm, "\\fP");
+	if (MDOC_SYNPRETTY & n->flags) {
+		mm->need_nl = 1;
+		print_word(mm, ".br");
+		mm->need_nl = 1;
+	}
 }
 
 static int