===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.54
retrieving revision 1.57
diff -u -p -r1.54 -r1.57
--- mandoc/mdoc_term.c	2009/07/21 15:03:37	1.54
+++ mandoc/mdoc_term.c	2009/07/21 15:54:18	1.57
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.54 2009/07/21 15:03:37 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.57 2009/07/21 15:54:18 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -50,8 +50,9 @@
 #define	TTYPE_LINK_ANCHOR 19
 #define	TTYPE_LINK_TEXT	  20
 #define	TTYPE_REF_JOURNAL 21
-#define	TTYPE_LIST	  22
-#define	TTYPE_NMAX	  23
+#define	TTYPE_REF_TITLE	  22
+#define	TTYPE_LIST	  23
+#define	TTYPE_NMAX	  24
 
 const	int ttypes[TTYPE_NMAX] = {
 	TERMP_BOLD, 		/* TTYPE_PROG */
@@ -65,7 +66,7 @@ const	int ttypes[TTYPE_NMAX] = {
 	TERMP_UNDER, 		/* TTYPE_FUNC_ARG */
 	TERMP_UNDER, 		/* TTYPE_LINK */
 	TERMP_BOLD,	 	/* TTYPE_SSECTION */
-	0, 			/* TTYPE_FILE */
+	TERMP_UNDER,		/* TTYPE_FILE */
 	TERMP_UNDER, 		/* TTYPE_EMPH */
 	TERMP_BOLD,	 	/* TTYPE_CONFIG */
 	TERMP_BOLD,	 	/* TTYPE_CMD */
@@ -76,6 +77,7 @@ const	int ttypes[TTYPE_NMAX] = {
 	TERMP_UNDER, 		/* TTYPE_LINK_ANCHOR */
 	TERMP_BOLD,	 	/* TTYPE_LINK_TEXT */
 	TERMP_UNDER,	 	/* TTYPE_REF_JOURNAL */
+	TERMP_UNDER,	 	/* TTYPE_REF_TITLE */
 	TERMP_BOLD		/* TTYPE_LIST */
 };
 
@@ -96,7 +98,6 @@ struct	termact {
 };
 
 static	void	  termp____post(DECL_ARGS);
-static	void	  termp__t_post(DECL_ARGS);
 static	void	  termp_aq_post(DECL_ARGS);
 static	void	  termp_bd_post(DECL_ARGS);
 static	void	  termp_bl_post(DECL_ARGS);
@@ -154,6 +155,7 @@ static	int	  termp_nd_pre(DECL_ARGS);
 static	int	  termp_nm_pre(DECL_ARGS);
 static	int	  termp_ns_pre(DECL_ARGS);
 static	int	  termp_op_pre(DECL_ARGS);
+static	int	  termp_pa_pre(DECL_ARGS);
 static	int	  termp_pf_pre(DECL_ARGS);
 static	int	  termp_pp_pre(DECL_ARGS);
 static	int	  termp_pq_pre(DECL_ARGS);
@@ -209,7 +211,7 @@ static const struct termact termacts[MDOC_MAX] = {
 	{ termp_nm_pre, NULL }, /* Nm */ 
 	{ termp_op_pre, termp_op_post }, /* Op */
 	{ NULL, NULL }, /* Ot */
-	{ NULL, NULL }, /* Pa */
+	{ termp_pa_pre, NULL }, /* Pa */
 	{ termp_rv_pre, NULL }, /* Rv */
 	{ NULL, NULL }, /* St */ 
 	{ termp_va_pre, NULL }, /* Va */
@@ -224,7 +226,7 @@ static const struct termact termacts[MDOC_MAX] = {
 	{ NULL, termp____post }, /* %O */
 	{ NULL, termp____post }, /* %P */
 	{ NULL, termp____post }, /* %R */
-	{ termp__t_pre, termp__t_post }, /* %T */
+	{ termp__t_pre, termp____post }, /* %T */
 	{ NULL, termp____post }, /* %V */
 	{ NULL, NULL }, /* Ac */
 	{ termp_aq_pre, termp_aq_post }, /* Ao */
@@ -689,14 +691,25 @@ fmt_block_vspace(struct termp *p, 
 	}
 
 	/* 
-	 * XXX - not documented: a `-column' does not ever assert
-	 * vertical space within the list.
+	 * XXX - not documented: a `-column' does not ever assert vspace
+	 * within the list.
 	 */
 
 	if (arg_hasattr(MDOC_Column, bl))
 		if (node->prev && MDOC_It == node->prev->tok)
 			return;
 
+	/*
+	 * XXX - not documented: a `-diag' without a body does not
+	 * assert a vspace prior to the next element. 
+	 */
+	if (arg_hasattr(MDOC_Diag, bl)) 
+		if (node->prev && MDOC_It == node->prev->tok) {
+			assert(node->prev->body);
+			if (NULL == node->prev->body->child)
+				return;
+		}
+
 	term_vspace(p);
 }
 
@@ -1722,6 +1735,16 @@ termp_sq_post(DECL_ARGS)
 
 /* ARGSUSED */
 static int
+termp_pa_pre(DECL_ARGS)
+{
+
+	pair->flag |= ttypes[TTYPE_FILE];
+	return(1);
+}
+
+
+/* ARGSUSED */
+static int
 termp_pf_pre(DECL_ARGS)
 {
 
@@ -2094,20 +2117,8 @@ static int
 termp__t_pre(DECL_ARGS)
 {
 
-	term_word(p, "\"");
-	p->flags |= TERMP_NOSPACE;
+	pair->flag |= ttypes[TTYPE_REF_TITLE];
 	return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp__t_post(DECL_ARGS)
-{
-
-	p->flags |= TERMP_NOSPACE;
-	term_word(p, "\"");
-	termp____post(p, pair, meta, node);
 }