===================================================================
RCS file: /cvs/mandoc/mdoc_man.c,v
retrieving revision 1.12
retrieving revision 1.17
diff -u -p -r1.12 -r1.17
--- mandoc/mdoc_man.c	2012/07/07 13:53:14	1.12
+++ mandoc/mdoc_man.c	2012/07/08 10:19:37	1.17
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_man.c,v 1.12 2012/07/07 13:53:14 schwarze Exp $ */
+/*	$Id: mdoc_man.c,v 1.17 2012/07/08 10:19:37 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -35,6 +35,7 @@
 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 */
 };
 
@@ -49,8 +50,14 @@ 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);
@@ -58,10 +65,15 @@ static	void	  post_sect(DECL_ARGS);
 static	void	  post_sp(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);
@@ -101,13 +113,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 */
@@ -178,17 +190,17 @@ static	const struct manact manacts[MDOC_MAX + 1] = {
 	{ 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 */
@@ -225,8 +237,13 @@ 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
@@ -319,7 +336,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;
@@ -505,6 +523,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)
 {
 
@@ -554,6 +595,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;
@@ -576,6 +750,17 @@ pre_it(DECL_ARGS)
 		mm->need_nl = 1;
 	}
 	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