sync to 1.9.2: Add .UC libman macro for compatibility, has no effect.

Correct .UC and .DT to not print their arguments.
Document that .UC and .DT should not be used.

8 files changed, 37 insertions, 21 deletions

diff --git a/usr.bin/mandoc/man.7 b/usr.bin/mandoc/man.7
index cc32b12bdbc..bccfc130c40 100644
--- a/usr.bin/mandoc/man.7
+++ b/usr.bin/mandoc/man.7
@@ -1,4 +1,4 @@
-.\"	$Id: man.7,v 1.10 2009/08/22 23:17:39 schwarze Exp $
+.\"	$Id: man.7,v 1.11 2009/09/18 22:46:14 schwarze 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: August 22 2009 $
+.Dd $Mdocdate: September 18 2009 $
 .Dt MAN 7
 .Os
 .
@@ -228,6 +228,7 @@ If a next-line macro is proceded by a block macro, it is ignored.
 .It    SB    Ta    n         Ta    next-line
 .It    SM    Ta    n         Ta    next-line
 .It    TH    Ta    >1, <6    Ta    current
+.It    UC    Ta    n         Ta    current
 .It    br    Ta    0         Ta    current
 .It    fi    Ta    0         Ta    current
 .It    i     Ta    n         Ta    current
@@ -241,6 +242,7 @@ If a next-line macro is proceded by a block macro, it is ignored.
 The
 .Sq RS ,
 .Sq RE ,
+.Sq UC ,
 .Sq br ,
 .Sq fi ,
 .Sq i ,
@@ -249,9 +251,7 @@ The
 .Sq r ,
 and
 .Sq sp
-macros aren't historically part of
-.Nm
-and should not be used.  They're included for compatibility.
+macros should not be used.  They're included for compatibility.
 .
 .
 .Ss Block Macros
@@ -303,6 +303,7 @@ If a block macro is next-line scoped, it may only be followed by in-line
 macros (excluding
 .Sq DT ,
 .Sq TH ,
+.Sq UC ,
 .Sq br ,
 .Sq na ,
 .Sq sp ,
@@ -357,7 +358,7 @@ render in italics.  Whitespace between arguments is omitted in output.
 Text is rendered alternately in bold face and roman (the default font).
 Whitespace between arguments is omitted in output.
 .It DT
-Re-set the tab spacing to 0.5 inches.
+Has no effect.  Included for compatibility.
 .It HP
 Begin a paragraph whose initial output line is left-justified, but
 subsequent output lines are indented, with the following syntax:
@@ -475,6 +476,8 @@ must be a properly-formed numeric width.  If
 .Va width
 is specified, it's saved for later paragraph left-margins; if
 unspecified, the saved or default width is used.
+.It UC
+Has no effect.  Included for compatibility.
 .It br
 Breaks the current line.  Consecutive invocations have no further effect.
 .It fi
@@ -484,7 +487,7 @@ End literal mode begun by
 Italicise arguments.  If no arguments are specified, all subsequent text
 is italicised.
 .It na
-Don't alignment the right margin.
+Don't align to the right margin.
 .It nf
 Begin literal mode: all subsequent free-form lines have their end of
 line boundaries preserved.  May be ended by
diff --git a/usr.bin/mandoc/man.c b/usr.bin/mandoc/man.c
index ab25e160094..c3888bb684c 100644
--- a/usr.bin/mandoc/man.c
+++ b/usr.bin/mandoc/man.c
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.11 2009/09/18 22:37:05 schwarze Exp $ */
+/*	$Id: man.c,v 1.12 2009/09/18 22:46:14 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -54,7 +54,7 @@ const	char *const __man_macronames[MAN_MAX] = {
 	"R",		"B",		"I",		"IR",
 	"RI",		"na",		"i",		"sp",
 	"nf",		"fi",		"r",		"RE",
-	"RS",		"DT"
+	"RS",		"DT",		"UC"
 	};
 
 const	char * const *man_macronames = __man_macronames;
diff --git a/usr.bin/mandoc/man.h b/usr.bin/mandoc/man.h
index 1ddeef9f981..a07e8675cfa 100644
--- a/usr.bin/mandoc/man.h
+++ b/usr.bin/mandoc/man.h
@@ -1,4 +1,4 @@
-/*	$Id: man.h,v 1.8 2009/08/22 23:17:40 schwarze Exp $ */
+/*	$Id: man.h,v 1.9 2009/09/18 22:46:14 schwarze Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -49,7 +49,8 @@
 #define	MAN_RE		 27
 #define	MAN_RS		 28
 #define	MAN_DT		 29
-#define	MAN_MAX	 	 30
+#define	MAN_UC		 30
+#define	MAN_MAX	 	 31
 
 enum	man_type {
 	MAN_TEXT,
diff --git a/usr.bin/mandoc/man_action.c b/usr.bin/mandoc/man_action.c
index c296042276c..a3999e62748 100644
--- a/usr.bin/mandoc/man_action.c
+++ b/usr.bin/mandoc/man_action.c
@@ -1,4 +1,4 @@
-/*	$Id: man_action.c,v 1.7 2009/08/22 23:17:40 schwarze Exp $ */
+/*	$Id: man_action.c,v 1.8 2009/09/18 22:46:14 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -62,6 +62,7 @@ const	struct actions man_actions[MAN_MAX] = {
 	{ NULL }, /* RE */
 	{ NULL }, /* RS */
 	{ NULL }, /* DT */
+	{ NULL }, /* UC */
 };
 
 static	time_t	  man_atotime(const char *);
diff --git a/usr.bin/mandoc/man_macro.c b/usr.bin/mandoc/man_macro.c
index 1bdc4c2563a..74fea4bc12c 100644
--- a/usr.bin/mandoc/man_macro.c
+++ b/usr.bin/mandoc/man_macro.c
@@ -1,4 +1,4 @@
-/*	$Id: man_macro.c,v 1.7 2009/08/22 23:17:40 schwarze Exp $ */
+/*	$Id: man_macro.c,v 1.8 2009/09/18 22:46:14 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -66,6 +66,7 @@ const	struct man_macro __man_macros[MAN_MAX] = {
 	{ blk_close, 0 }, /* RE */
 	{ blk_imp, MAN_EXPLICIT }, /* RS */
 	{ in_line_eoln, 0 }, /* DT */
+	{ in_line_eoln, 0 }, /* UC */
 };
 
 const	struct man_macro * const man_macros = __man_macros;
diff --git a/usr.bin/mandoc/man_term.c b/usr.bin/mandoc/man_term.c
index 9995a9ed377..540f94756af 100644
--- a/usr.bin/mandoc/man_term.c
+++ b/usr.bin/mandoc/man_term.c
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.13 2009/08/22 23:17:40 schwarze Exp $ */
+/*	$Id: man_term.c,v 1.14 2009/09/18 22:46:14 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -76,6 +76,7 @@ static	int		  pre_SS(DECL_ARGS);
 static	int		  pre_TP(DECL_ARGS);
 static	int		  pre_br(DECL_ARGS);
 static	int		  pre_fi(DECL_ARGS);
+static	int		  pre_ign(DECL_ARGS);
 static	int		  pre_nf(DECL_ARGS);
 static	int		  pre_r(DECL_ARGS);
 static	int		  pre_sp(DECL_ARGS);
@@ -120,7 +121,8 @@ static const struct termact termacts[MAN_MAX] = {
 	{ pre_r, NULL }, /* r */
 	{ NULL, NULL }, /* RE */
 	{ pre_RS, post_RS }, /* RS */
-	{ NULL, NULL }, /* DT */
+	{ pre_ign, NULL }, /* DT */
+	{ pre_ign, NULL }, /* UC */
 };
 
 static	void		  print_head(struct termp *, 
@@ -203,6 +205,15 @@ arg_width(const struct man_node *n)
 
 /* ARGSUSED */
 static int
+pre_ign(DECL_ARGS)
+{
+
+	return(0);
+}
+
+
+/* ARGSUSED */
+static int
 pre_I(DECL_ARGS)
 {
 
diff --git a/usr.bin/mandoc/man_validate.c b/usr.bin/mandoc/man_validate.c
index cb07087c74d..358c23bdb91 100644
--- a/usr.bin/mandoc/man_validate.c
+++ b/usr.bin/mandoc/man_validate.c
@@ -1,4 +1,4 @@
-/*	$Id: man_validate.c,v 1.8 2009/08/22 23:17:40 schwarze Exp $ */
+/*	$Id: man_validate.c,v 1.9 2009/09/18 22:46:14 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -86,6 +86,7 @@ static	const struct man_valid man_valids[MAN_MAX] = {
 	{ NULL, NULL }, /* RE */
 	{ NULL, posts_part }, /* RS */
 	{ NULL, NULL }, /* DT */
+	{ NULL, NULL }, /* UC */
 };
 
 
diff --git a/usr.bin/mandoc/mandoc.1 b/usr.bin/mandoc/mandoc.1
index 35d4e739d4f..d92aa0a4949 100644
--- a/usr.bin/mandoc/mandoc.1
+++ b/usr.bin/mandoc/mandoc.1
@@ -1,4 +1,4 @@
-.\"	$Id: mandoc.1,v 1.15 2009/09/18 22:41:24 schwarze Exp $
+.\"	$Id: mandoc.1,v 1.16 2009/09/18 22:46:14 schwarze Exp $
 .\"
 .\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
 .\"
@@ -316,12 +316,10 @@ does not assert a prior vertical break, just as it doesn't with
 .It
 The
 .Sq \&na
-and
-.Sq \&Dt
 .Xr man 7
-macros in
+macro in
 .Fl T Ns Ar ascii
-have no effect.
+has no effect.
 .
 .It
 Words aren't hyphenated.