When finding a bogus database entry,

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index b9a43170efb8130071afaf017a3b8899020c9d7f..aa8b200196a6eb36e24aecaae246b7634188b20d 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: man_macro.c,v 1.116 2017/04/24 23:06:18 schwarze Exp $ */
+/*     $Id: man_macro.c,v 1.123 2017/06/25 11:45:37 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -61,8 +61,6 @@ const struct man_macro __man_macros[MAN_MAX - MAN_TH] = {
        { in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* I */
        { in_line_eoln, 0 }, /* IR */
        { in_line_eoln, 0 }, /* RI */
-       { in_line_eoln, MAN_NSCOPED }, /* br */
-       { in_line_eoln, MAN_NSCOPED }, /* sp */
        { in_line_eoln, MAN_NSCOPED }, /* nf */
        { in_line_eoln, MAN_NSCOPED }, /* fi */
        { blk_close, MAN_BSCOPE }, /* RE */
@@ -71,14 +69,14 @@ const       struct man_macro __man_macros[MAN_MAX - MAN_TH] = {
        { in_line_eoln, 0 }, /* UC */
        { in_line_eoln, MAN_NSCOPED }, /* PD */
        { in_line_eoln, 0 }, /* AT */
-       { in_line_eoln, 0 }, /* in */
-       { in_line_eoln, 0 }, /* ft */
+       { in_line_eoln, MAN_NSCOPED }, /* in */
        { in_line_eoln, 0 }, /* OP */
        { in_line_eoln, MAN_BSCOPE }, /* EX */
        { in_line_eoln, MAN_BSCOPE }, /* EE */
        { blk_exp, MAN_BSCOPE }, /* UR */
        { blk_close, MAN_BSCOPE }, /* UE */
-       { in_line_eoln, 0 }, /* ll */
+       { blk_exp, MAN_BSCOPE }, /* MT */
+       { blk_close, MAN_BSCOPE }, /* ME */
 };
 const  struct man_macro *const man_macros = __man_macros - MAN_TH;
 
@@ -221,6 +219,9 @@ blk_close(MACRO_PROT_ARGS)
        case MAN_UE:
                ntok = MAN_UR;
                break;
+       case MAN_ME:
+               ntok = MAN_MT;
+               break;
        default:
                abort();
        }
@@ -239,6 +240,10 @@ blk_close(MACRO_PROT_ARGS)
                ntok = man->last->tok;
                man_unscope(man, nn);
 
+               if (tok == MAN_RE && nn->head->aux > 0)
+                       roff_setreg(man->roff, "an-margin",
+                           nn->head->aux, '-');
+
                /* Move a trailing paragraph behind the block. */
 
                if (ntok == MAN_LP || ntok == MAN_PP || ntok == MAN_P) {
@@ -260,8 +265,17 @@ blk_exp(MACRO_PROT_ARGS)
        head = roff_head_alloc(man, line, ppos, tok);
 
        la = *pos;
-       if (man_args(man, line, pos, buf, &p))
+       if (man_args(man, line, pos, buf, &p)) {
                roff_word_alloc(man, line, la, p);
+               if (tok == MAN_RS) {
+                       if (roff_getreg(man->roff, "an-margin") == 0)
+                               roff_setreg(man->roff, "an-margin",
+                                   7 * 24, '=');
+                       if ((head->aux = strtod(p, NULL) * 24.0) > 0)
+                               roff_setreg(man->roff, "an-margin",
+                                   head->aux, '+');
+               }
+       }
 
        if (buf[*pos] != '\0')
                mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse, line,
@@ -328,15 +342,13 @@ in_line_eoln(MACRO_PROT_ARGS)
        n = man->last;
 
        for (;;) {
-               if (buf[*pos] != '\0' && (tok == MAN_br ||
-                   tok == MAN_fi || tok == MAN_nf)) {
+               if (buf[*pos] != '\0' && (tok == MAN_fi || tok == MAN_nf)) {
                        mandoc_vmsg(MANDOCERR_ARG_SKIP,
                            man->parse, line, *pos, "%s %s",
                            roff_name[tok], buf + *pos);
                        break;
                }
-               if (buf[*pos] != '\0' && man->last != n &&
-                   (tok == MAN_PD || tok == MAN_ft || tok == MAN_sp)) {
+               if (buf[*pos] != '\0' && man->last != n && tok == MAN_PD) {
                        mandoc_vmsg(MANDOCERR_ARG_EXCESS,
                            man->parse, line, *pos, "%s ... %s",
                            roff_name[tok], buf + *pos);