In the validators, translate obsolete macro aliases (Lp, Ot, LP, P)

[mandoc.git] / mandocdb.c

diff --git a/mandocdb.c b/mandocdb.c
index 0872555aa8d5343cacb4b1336d63a92fb6f107c5..a2d9e494b562b58f87e4b1f7100c4f1866e3d457 100644 (file)
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,7 +1,7 @@
-/*     $Id: mandocdb.c,v 1.257 2018/02/07 20:31:39 schwarze Exp $ */
+/*     $Id: mandocdb.c,v 1.259 2018/08/17 20:33:37 schwarze Exp $ */

 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2011-2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011-2018 Ingo Schwarze <schwarze@openbsd.org>

  * Copyright (c) 2016 Ed Maste <emaste@freebsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * Copyright (c) 2016 Ed Maste <emaste@freebsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any


@@ -139,6 +139,8 @@ static      void     parse_mdoc(struct mpage *, const struct roff_meta *,
                        const struct roff_node *);
 static int      parse_mdoc_head(struct mpage *, const struct roff_meta *,
                        const struct roff_node *);
                        const struct roff_node *);
 static int      parse_mdoc_head(struct mpage *, const struct roff_meta *,
                        const struct roff_node *);

+static int      parse_mdoc_Fa(struct mpage *, const struct roff_meta *,
+                       const struct roff_node *);

 static int      parse_mdoc_Fd(struct mpage *, const struct roff_meta *,
                        const struct roff_node *);
 static void     parse_mdoc_fname(struct mpage *, const struct roff_node *);
 static int      parse_mdoc_Fd(struct mpage *, const struct roff_meta *,
                        const struct roff_node *);
 static void     parse_mdoc_fname(struct mpage *, const struct roff_node *);


@@ -183,7 +185,7 @@ static      struct ohash     names; /* table of all names */
 static struct ohash     strings; /* table of all strings */
 static uint64_t         name_mask;
 
 static struct ohash     strings; /* table of all strings */
 static uint64_t         name_mask;
 

-static const struct mdoc_handler __mdocs[MDOC_MAX - MDOC_Dd] = {
+static const struct mdoc_handler mdoc_handlers[MDOC_MAX - MDOC_Dd] = {

        { NULL, 0, NODE_NOPRT },  /* Dd */
        { NULL, 0, NODE_NOPRT },  /* Dt */
        { NULL, 0, NODE_NOPRT },  /* Os */
        { NULL, 0, NODE_NOPRT },  /* Dd */
        { NULL, 0, NODE_NOPRT },  /* Dt */
        { NULL, 0, NODE_NOPRT },  /* Os */


@@ -207,11 +209,11 @@ static    const struct mdoc_handler __mdocs[MDOC_MAX - MDOC_Dd] = {
        { NULL, TYPE_Er, 0 },  /* Er */
        { NULL, TYPE_Ev, 0 },  /* Ev */
        { NULL, 0, 0 },  /* Ex */
        { NULL, TYPE_Er, 0 },  /* Er */
        { NULL, TYPE_Ev, 0 },  /* Ev */
        { NULL, 0, 0 },  /* Ex */

-       { NULL, TYPE_Fa, 0 },  /* Fa */
+       { parse_mdoc_Fa, 0, 0 },  /* Fa */

        { parse_mdoc_Fd, 0, 0 },  /* Fd */
        { NULL, TYPE_Fl, 0 },  /* Fl */
        { parse_mdoc_Fn, 0, 0 },  /* Fn */
        { parse_mdoc_Fd, 0, 0 },  /* Fd */
        { NULL, TYPE_Fl, 0 },  /* Fl */
        { parse_mdoc_Fn, 0, 0 },  /* Fn */

-       { NULL, TYPE_Ft, 0 },  /* Ft */
+       { NULL, TYPE_Ft | TYPE_Vt, 0 },  /* Ft */

        { NULL, TYPE_Ic, 0 },  /* Ic */
        { NULL, TYPE_In, 0 },  /* In */
        { NULL, TYPE_Li, 0 },  /* Li */
        { NULL, TYPE_Ic, 0 },  /* Ic */
        { NULL, TYPE_In, 0 },  /* In */
        { NULL, TYPE_Li, 0 },  /* Li */


@@ -305,7 +307,6 @@ static      const struct mdoc_handler __mdocs[MDOC_MAX - MDOC_Dd] = {
        { NULL, 0, 0 },  /* %U */
        { NULL, 0, 0 },  /* Ta */
 };
        { NULL, 0, 0 },  /* %U */
        { NULL, 0, 0 },  /* Ta */
 };

-static const struct mdoc_handler *const mdocs = __mdocs - MDOC_Dd;

 
 
 int
 
 
 int


@@ -1544,25 +1545,28 @@ static void
 parse_mdoc(struct mpage *mpage, const struct roff_meta *meta,
        const struct roff_node *n)
 {
 parse_mdoc(struct mpage *mpage, const struct roff_meta *meta,
        const struct roff_node *n)
 {

+       const struct mdoc_handler *handler;

 
        for (n = n->child; n != NULL; n = n->next) {
 
        for (n = n->child; n != NULL; n = n->next) {

-               if (n->tok == TOKEN_NONE ||
-                   n->tok < ROFF_MAX ||
-                   n->flags & mdocs[n->tok].taboo)
+               if (n->tok == TOKEN_NONE || n->tok < ROFF_MAX)

                        continue;
                assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
                        continue;
                assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);

+               handler = mdoc_handlers + (n->tok - MDOC_Dd);
+               if (n->flags & handler->taboo)
+                       continue;
+

                switch (n->type) {
                case ROFFT_ELEM:
                case ROFFT_BLOCK:
                case ROFFT_HEAD:
                case ROFFT_BODY:
                case ROFFT_TAIL:
                switch (n->type) {
                case ROFFT_ELEM:
                case ROFFT_BLOCK:
                case ROFFT_HEAD:
                case ROFFT_BODY:
                case ROFFT_TAIL:

-                       if (mdocs[n->tok].fp != NULL &&
-                           (*mdocs[n->tok].fp)(mpage, meta, n) == 0)
+                       if (handler->fp != NULL &&
+                           (*handler->fp)(mpage, meta, n) == 0)

                                break;
                                break;

-                       if (mdocs[n->tok].mask)
+                       if (handler->mask)

                                putmdockey(mpage, n->child,
                                putmdockey(mpage, n->child,

-                                   mdocs[n->tok].mask, mdocs[n->tok].taboo);
+                                   handler->mask, handler->taboo);

                        break;
                default:
                        continue;
                        break;
                default:
                        continue;


@@ -1572,6 +1576,20 @@ parse_mdoc(struct mpage *mpage, const struct roff_meta *meta,
        }
 }
 
        }
 }
 

+static int
+parse_mdoc_Fa(struct mpage *mpage, const struct roff_meta *meta,
+       const struct roff_node *n)
+{
+       uint64_t mask;
+
+       mask = TYPE_Fa;
+       if (n->sec == SEC_SYNOPSIS)
+               mask |= TYPE_Vt;
+
+       putmdockey(mpage, n->child, mask, 0);
+       return 0;
+}
+

 static int
 parse_mdoc_Fd(struct mpage *mpage, const struct roff_meta *meta,
        const struct roff_node *n)
 static int
 parse_mdoc_Fd(struct mpage *mpage, const struct roff_meta *meta,
        const struct roff_node *n)


@@ -1641,15 +1659,20 @@ static int
 parse_mdoc_Fn(struct mpage *mpage, const struct roff_meta *meta,
        const struct roff_node *n)
 {
 parse_mdoc_Fn(struct mpage *mpage, const struct roff_meta *meta,
        const struct roff_node *n)
 {

+       uint64_t mask;

 
        if (n->child == NULL)
                return 0;
 
        parse_mdoc_fname(mpage, n->child);
 
 
        if (n->child == NULL)
                return 0;
 
        parse_mdoc_fname(mpage, n->child);
 

-       for (n = n->child->next; n != NULL; n = n->next)
-               if (n->type == ROFFT_TEXT)
-                       putkey(mpage, n->string, TYPE_Fa);
+       n = n->child->next;
+       if (n != NULL && n->type == ROFFT_TEXT) {
+               mask = TYPE_Fa;
+               if (n->sec == SEC_SYNOPSIS)
+                       mask |= TYPE_Vt;
+               putmdockey(mpage, n, mask, 0);
+       }

 
        return 0;
 }
 
        return 0;
 }