Made syste-name macros callable (At, Bsx, etc.).

3 files changed, 24 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index 142bc452..8958073e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 .SUFFIXES:	.html .sgml
 
-VERSION	= 1.4.12
+VERSION	= 1.4.13
 VDATE	= 13 March 2009
 
 BINDIR		= $(PREFIX)/bin
diff --git a/macro.c b/macro.c
index 9e4a13fb..208ec908 100644
--- a/macro.c
+++ b/macro.c
@@ -128,13 +128,13 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Ac */
 	{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Ao */
 	{ macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Aq */
-	{ macro_constant_delimited, 0 }, /* At */
+	{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* At */
 	{ macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Bc */
 	{ macro_scoped, MDOC_EXPLICIT }, /* Bf */ 
 	{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bo */
 	{ macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Bq */
-	{ macro_constant_delimited, MDOC_PARSED }, /* Bsx */
-	{ macro_constant_delimited, MDOC_PARSED }, /* Bx */
+	{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Bsx */
+	{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Bx */
 	{ macro_constant, 0 }, /* Db */
 	{ macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Dc */
 	{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Do */
@@ -143,12 +143,12 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ macro_scoped_close, MDOC_EXPLICIT }, /* Ef */
 	{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Em */ 
 	{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */
-	{ macro_constant_delimited, MDOC_PARSED }, /* Fx */
+	{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */
 	{ macro_text, MDOC_PARSED }, /* Ms */
 	{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* No */
 	{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Ns */
-	{ macro_constant_delimited, MDOC_PARSED }, /* Nx */
-	{ macro_constant_delimited, MDOC_PARSED }, /* Ox */
+	{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */
+	{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Ox */
 	{ macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Pc */
 	{ macro_constant_delimited, MDOC_PARSED }, /* Pf */
 	{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Po */
@@ -166,7 +166,7 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Sx */
 	{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Sy */
 	{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */
-	{ macro_constant_delimited, MDOC_PARSED }, /* Ux */
+	{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Ux */
 	{ macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Xc */
 	{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Xo */
 	/* XXX - .Fo supposed to be (but isn't) callable. */
diff --git a/mdoc.3 b/mdoc.3
index ca8e86cf..2feb6d98 100644
--- a/mdoc.3
+++ b/mdoc.3
@@ -404,12 +404,16 @@ incorrectly by following it with a delimeter (see
 and expecting the delimiter to render.  This is not supported.
 .\" LIST-ITEM
 .It
-The 
-.Sq Bx
-family of macros (
-.Sq Ux ,
-.Sq Nx
-and so on) are not callable as they are in NetBSD.
+The system-name macros (
+.Ns Sq \&At ,
+.Sq \&Bsx ,
+.Sq \&Bx ,
+.Sq \&Fx ,
+.Sq \&Nx ,
+.Sq \&Ox ,
+and
+.Sq \&Ux )
+are callable.
 .El
 .\" SECTION
 .Sh SEE ALSO
@@ -436,4 +440,10 @@ macros aren't handled when used to span lines for the
 .Sq \&It
 macro.  Such usage is specifically discouraged in
 .Xr mdoc.samples 7 .
+.\" LIST-ITEM
+.It
+The 
+.Sq \&Bsx
+macro doesn't understand yet the arguments as dictated for 
+.Nx .
 .El