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

diff --git a/Makefile b/Makefile
index 142bc45224187e4542d008a7dc64a3b644cc62d7..8958073e79da7b29f8e73ce8aeed5cf8e0e8e18c 100644 (file)
--- 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 20aac15bff904eb6dc88e9a9847c140eae7285bc..2953e26cc4d3d70ce019b9f5732991ceea5e620c 100644 (file)
--- a/macro.c
+++ b/macro.c
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.70 2009/03/12 16:30:50 kristaps Exp $ */
+/* $Id: macro.c,v 1.71 2009/03/12 23:05:21 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -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 ec6b2ef135404d111149b9597f564b81ab744823..973e86fb065194ccf7c1d14b54cf1dc59d61d917 100644 (file)
--- a/mdoc.3
+++ b/mdoc.3
@@ -1,4 +1,4 @@
-.\" $Id: mdoc.3,v 1.15 2009/03/12 16:30:50 kristaps Exp $
+.\" $Id: mdoc.3,v 1.16 2009/03/12 23:05:21 kristaps Exp $
 .\"
 .\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
 .\"
@@ -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