Full support for `An -split/-nosplit'. Compat documented.

3 files changed, 79 insertions, 5 deletions

diff --git a/mdoc.7 b/mdoc.7
index c68912e3..2c69fb83 100644
--- a/mdoc.7
+++ b/mdoc.7
@@ -1,4 +1,4 @@
-.\"	$Id: mdoc.7,v 1.50 2009/07/20 13:45:11 kristaps Exp $
+.\"	$Id: mdoc.7,v 1.51 2009/07/24 12:47:35 kristaps Exp $
 .\"
 .\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 20 2009 $
+.Dd $Mdocdate: July 24 2009 $
 .Dt MDOC 7
 .Os
 .\" SECTION---------------------------------------------
@@ -456,6 +456,16 @@ file re-write
 .Bl -dash -compact
 .\" LIST-ITEM
 .It
+The
+.Sq \-split
+or
+.Sq \-nosplit
+argument to 
+.Sq \&An
+applies to the whole document, not just to the current section as it
+does in groff.
+.\" LIST-ITEM
+.It
 In quoted literals, groff allowed pair-wise double-quotes to produce a
 standalone double-quote in formatted output.  This idiosyncratic
 behaviour is no longer applicable.
diff --git a/mdoc_term.c b/mdoc_term.c
index d8f02b12..33e37f05 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.60 2009/07/24 11:54:54 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.61 2009/07/24 12:47:35 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -98,6 +98,7 @@ struct	termact {
 };
 
 static	void	  termp____post(DECL_ARGS);
+static	void	  termp_an_post(DECL_ARGS);
 static	void	  termp_aq_post(DECL_ARGS);
 static	void	  termp_bd_post(DECL_ARGS);
 static	void	  termp_bl_post(DECL_ARGS);
@@ -124,6 +125,7 @@ static	void	  termp_vt_post(DECL_ARGS);
 
 static	int	  termp__j_pre(DECL_ARGS);
 static	int	  termp__t_pre(DECL_ARGS);
+static	int	  termp_an_pre(DECL_ARGS);
 static	int	  termp_ap_pre(DECL_ARGS);
 static	int	  termp_aq_pre(DECL_ARGS);
 static	int	  termp_ar_pre(DECL_ARGS);
@@ -191,7 +193,7 @@ static const struct termact termacts[MDOC_MAX] = {
 	{ NULL, NULL }, /* El */
 	{ termp_it_pre, termp_it_post }, /* It */
 	{ NULL, NULL }, /* Ad */ 
-	{ NULL, NULL }, /* An */
+	{ termp_an_pre, termp_an_post }, /* An */
 	{ termp_ar_pre, NULL }, /* Ar */
 	{ termp_cd_pre, NULL }, /* Cd */
 	{ termp_cm_pre, NULL }, /* Cm */
@@ -1130,6 +1132,65 @@ termp_fl_pre(DECL_ARGS)
 
 /* ARGSUSED */
 static int
+termp_an_pre(DECL_ARGS)
+{
+
+	if (NULL == node->child)
+		return(1);
+
+	/*
+	 * XXX: this is poorly documented.  If not in the AUTHORS
+	 * section, `An -split' will cause newlines to occur before the
+	 * author name.  If in the AUTHORS section, by default, the
+	 * first `An' invocation is nosplit, then all subsequent ones,
+	 * regardless of whether interspersed with other macros/text,
+	 * are split.  -split, in this case, will override the condition
+	 * of the implied first -nosplit.
+	 */
+	
+	if (node->sec == SEC_AUTHORS) {
+		if ( ! (TERMP_ANPREC & p->flags)) {
+			if (TERMP_SPLIT & p->flags)
+				term_newln(p);
+			return(1);
+		}
+		if (TERMP_NOSPLIT & p->flags)
+			return(1);
+		term_newln(p);
+		return(1);
+	}
+
+	if (TERMP_SPLIT & p->flags)
+		term_newln(p);
+
+	return(1);
+}
+
+
+/* ARGSUSED */
+static void
+termp_an_post(DECL_ARGS)
+{
+
+	if (node->child) {
+		if (SEC_AUTHORS == node->sec)
+			p->flags |= TERMP_ANPREC;
+		return;
+	}
+
+	if (arg_getattr(MDOC_Split, node) > -1) {
+		p->flags &= ~TERMP_NOSPLIT;
+		p->flags |= TERMP_SPLIT;
+	} else {
+		p->flags &= ~TERMP_SPLIT;
+		p->flags |= TERMP_NOSPLIT;
+	}
+
+}
+
+
+/* ARGSUSED */
+static int
 termp_ar_pre(DECL_ARGS)
 {
 
diff --git a/term.h b/term.h
index e14a69c6..29f1afd2 100644
--- a/term.h
+++ b/term.h
@@ -1,4 +1,4 @@
-/*	$Id: term.h,v 1.41 2009/07/21 15:33:05 kristaps Exp $ */
+/*	$Id: term.h,v 1.42 2009/07/24 12:47:35 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -48,6 +48,9 @@ struct	termp {
 #define	TERMP_DANGLE	 (1 << 8)	/* See term_flushln(). */
 #define	TERMP_HANG	 (1 << 9)	/* See term_flushln(). */
 #define	TERMP_TWOSPACE	 (1 << 10)	/* See term_flushln(). */
+#define	TERMP_NOSPLIT	 (1 << 11)	/* See termp_an_pre/post(). */
+#define	TERMP_SPLIT	 (1 << 12)	/* See termp_an_pre/post(). */
+#define	TERMP_ANPREC	 (1 << 13)	/* See termp_an_pre(). */
 	char		 *buf;		/* Output buffer. */
 	enum termenc	  enc;		/* Type of encoding. */
 	void		 *symtab;	/* Encoded-symbol table. */