`Sm' no longer produces a linebreak when used in `Bd'.

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index c2e4bec07161f67ac08defdfd94ba8d8f7d46a5b..d7b15131e14e6ef10e641aa3bf60beabb9f72610 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,6 +1,6 @@
-/*     $Id: man_macro.c,v 1.44 2010/05/15 22:44:04 kristaps Exp $ */
+/*     $Id: man_macro.c,v 1.50 2010/07/31 23:52:58 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "mandoc.h"
 #include "libman.h"
 
 enum   rew {
@@ -43,7 +44,7 @@ static        enum rew         rew_dohalt(enum mant, enum man_type,
 static enum rew         rew_block(enum mant, enum man_type, 
                                const struct man_node *);
 static int              rew_warn(struct man *, 
-                               struct man_node *, enum merr);
+                               struct man_node *, enum mandocerr);
 
 const  struct man_macro __man_macros[MAN_MAX] = {
        { in_line_eoln, MAN_NSCOPED }, /* br */
@@ -81,6 +82,8 @@ const struct man_macro __man_macros[MAN_MAX] = {
        { in_line_eoln, MAN_NSCOPED }, /* Sp */
        { in_line_eoln, 0 }, /* Vb */
        { in_line_eoln, 0 }, /* Ve */
+       { in_line_eoln, 0 }, /* AT */
+       { in_line_eoln, 0 }, /* in */
 };
 
 const  struct man_macro * const man_macros = __man_macros;
@@ -90,25 +93,26 @@ const       struct man_macro * const man_macros = __man_macros;
  * Warn when "n" is an explicit non-roff macro.
  */
 static int
-rew_warn(struct man *m, struct man_node *n, enum merr er)
+rew_warn(struct man *m, struct man_node *n, enum mandocerr er)
 {
 
-       if (er == WERRMAX || MAN_BLOCK != n->type)
+       if (er == MANDOCERR_MAX || MAN_BLOCK != n->type)
                return(1);
        if (MAN_VALID & n->flags)
                return(1);
        if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags))
                return(1);
-       return(man_nwarn(m, n, er));
+       return(man_nmsg(m, n, er));
 }
 
 
 /*
- * Rewind scope.  If a code "er" != WERRMAX has been provided, it will
- * be used if an explicit block scope is being closed out.
+ * Rewind scope.  If a code "er" != MANDOCERR_MAX has been provided, it
+ * will be used if an explicit block scope is being closed out.
  */
 int
-man_unscope(struct man *m, const struct man_node *n, enum merr er)
+man_unscope(struct man *m, const struct man_node *n, 
+               enum mandocerr er)
 {
 
        assert(n);
@@ -247,7 +251,7 @@ rew_scope(enum man_type type, struct man *m, enum mant tok)
         */
        assert(n);
 
-       return(man_unscope(m, n, WERRMAX));
+       return(man_unscope(m, n, MANDOCERR_MAX));
 }
 
 
@@ -275,7 +279,7 @@ blk_close(MACRO_PROT_ARGS)
                        break;
 
        if (NULL == nn)
-               if ( ! man_pwarn(m, line, ppos, WNOSCOPE))
+               if ( ! man_pmsg(m, line, ppos, MANDOCERR_NOSCOPE))
                        return(0);
 
        if ( ! rew_scope(MAN_BODY, m, ntok))
@@ -287,6 +291,7 @@ blk_close(MACRO_PROT_ARGS)
 }
 
 
+/* ARGSUSED */
 int
 blk_exp(MACRO_PROT_ARGS)
 {
@@ -338,6 +343,7 @@ blk_exp(MACRO_PROT_ARGS)
  * scopes, such as `SH' closing out an `SS', are defined in the rew
  * routines.
  */
+/* ARGSUSED */
 int
 blk_imp(MACRO_PROT_ARGS)
 {
@@ -395,6 +401,7 @@ blk_imp(MACRO_PROT_ARGS)
 }
 
 
+/* ARGSUSED */
 int
 in_line_eoln(MACRO_PROT_ARGS)
 {
@@ -477,6 +484,6 @@ int
 man_macroend(struct man *m)
 {
 
-       return(man_unscope(m, m->first, WEXITSCOPE));
+       return(man_unscope(m, m->first, MANDOCERR_SCOPEEXIT));
 }