summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-06-11 20:02:37 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-06-11 20:02:37 +0000
commitc3b3cef562cad122a19ef12743ef5aa73df002b5 (patch)
tree02a5982cfd30750fdf892fec8e4449ccb996aae4
parent9dd0605c9c0799b9c9940c6aa64dd4c529ca3508 (diff)
downloadmandoc-c3b3cef562cad122a19ef12743ef5aa73df002b5.tar.gz
`Ft' and `Ms' are now callable and compat-noted in mdoc.7 (joerg@netbsd.org).
-rw-r--r--mdoc.77
-rw-r--r--mdoc_macro.c6
2 files changed, 7 insertions, 6 deletions
diff --git a/mdoc.7 b/mdoc.7
index 0497368f..9599239b 100644
--- a/mdoc.7
+++ b/mdoc.7
@@ -405,7 +405,7 @@ then the macro accepts an arbitrary number of arguments.
.It \&.Fd Ta \&No Ta \&No Ta >0
.It \&.Fl Ta Yes Ta Yes Ta n
.It \&.Fn Ta Yes Ta Yes Ta >0
-.It \&.Ft Ta \&No Ta Yes Ta n
+.It \&.Ft Ta Yes Ta Yes Ta n
.It \&.Ic Ta Yes Ta Yes Ta >0
.It \&.In Ta \&No Ta \&No Ta n
.It \&.Li Ta Yes Ta Yes Ta n
@@ -436,7 +436,7 @@ then the macro accepts an arbitrary number of arguments.
.It \&.Db Ta \&No Ta \&No Ta 1
.It \&.Em Ta Yes Ta Yes Ta >0
.It \&.Fx Ta Yes Ta Yes Ta n
-.It \&.Ms Ta \&No Ta Yes Ta >0
+.It \&.Ms Ta Yes Ta Yes Ta >0
.It \&.No Ta Yes Ta Yes Ta 0
.It \&.Ns Ta Yes Ta Yes Ta 0
.It \&.Nx Ta Yes Ta Yes Ta n
@@ -481,9 +481,10 @@ compatibility with these systems.
.It
.Sq \&.An ,
.Sq \&.Fo ,
+.Sq \&.Ms ,
and
.Sq \&.St
-historically weren't always callable. Both are now correctly callable.
+historically weren't callable (they are now).
.\" LIST-ITEM
.It
.Sq \&.It \-nested
diff --git a/mdoc_macro.c b/mdoc_macro.c
index add06c9d..0dd18d0b 100644
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -101,9 +101,9 @@ const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
{ in_line_eoln, 0 }, /* Fd */
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fl */
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fn */
- { in_line, MDOC_PARSED }, /* Ft */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ft */
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ic */
- { in_line_eoln, 0 }, /* In */
+ { in_line_eoln, 0 }, /* In */ /* FIXME: historic usage! */
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Li */
{ in_line_eoln, 0 }, /* Nd */
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */
@@ -145,7 +145,7 @@ const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Em */
{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */
- { in_line, MDOC_PARSED }, /* Ms */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ms */
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* No */
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ns */
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */