Provide a variable BINM_CATMAN.

[mandoc.git] / tree.c

diff --git a/tree.c b/tree.c
index d7cd037b3b87a296be3ba5dbbbf62c97a6653dd5..dd36ff594e53142e089c49e117db1daab68b6f72 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,7 +1,7 @@
-/*     $Id: tree.c,v 1.64 2015/04/02 22:48:18 schwarze Exp $ */
+/*     $Id: tree.c,v 1.73 2017/02/10 15:45:28 schwarze Exp $ */

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

- * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -33,22 +33,46 @@
 
 static void    print_box(const struct eqn_box *, int);
 static void    print_man(const struct roff_node *, int);
 
 static void    print_box(const struct eqn_box *, int);
 static void    print_man(const struct roff_node *, int);

+static void    print_meta(const struct roff_meta *);

 static void    print_mdoc(const struct roff_node *, int);
 static void    print_span(const struct tbl_span *, int);
 
 
 void
 static void    print_mdoc(const struct roff_node *, int);
 static void    print_span(const struct tbl_span *, int);
 
 
 void

-tree_mdoc(void *arg, const struct mdoc *mdoc)
+tree_mdoc(void *arg, const struct roff_man *mdoc)

 {
 {

-
-       print_mdoc(mdoc_node(mdoc)->child, 0);
+       print_meta(&mdoc->meta);
+       putchar('\n');
+       print_mdoc(mdoc->first->child, 0);

 }
 
 void
 }
 
 void

-tree_man(void *arg, const struct man *man)
+tree_man(void *arg, const struct roff_man *man)

 {
 {

+       print_meta(&man->meta);
+       if (man->meta.hasbody == 0)
+               puts("body  = empty");
+       putchar('\n');
+       print_man(man->first->child, 0);
+}

 
 

-       print_man(man_node(man)->child, 0);
+static void
+print_meta(const struct roff_meta *meta)
+{
+       if (meta->title != NULL)
+               printf("title = \"%s\"\n", meta->title);
+       if (meta->name != NULL)
+               printf("name  = \"%s\"\n", meta->name);
+       if (meta->msec != NULL)
+               printf("sec   = \"%s\"\n", meta->msec);
+       if (meta->vol != NULL)
+               printf("vol   = \"%s\"\n", meta->vol);
+       if (meta->arch != NULL)
+               printf("arch  = \"%s\"\n", meta->arch);
+       if (meta->os != NULL)
+               printf("os    = \"%s\"\n", meta->os);
+       if (meta->date != NULL)
+               printf("date  = \"%s\"\n", meta->date);

 }
 
 static void
 }
 
 static void


@@ -74,16 +98,16 @@ print_mdoc(const struct roff_node *n, int indent)
                t = "block";
                break;
        case ROFFT_HEAD:
                t = "block";
                break;
        case ROFFT_HEAD:

-               t = "block-head";
+               t = "head";

                break;
        case ROFFT_BODY:
                if (n->end)
                        t = "body-end";
                else
                break;
        case ROFFT_BODY:
                if (n->end)
                        t = "body-end";
                else

-                       t = "block-body";
+                       t = "body";

                break;
        case ROFFT_TAIL:
                break;
        case ROFFT_TAIL:

-               t = "block-tail";
+               t = "tail";

                break;
        case ROFFT_ELEM:
                t = "elem";
                break;
        case ROFFT_ELEM:
                t = "elem";


@@ -98,7 +122,6 @@ print_mdoc(const struct roff_node *n, int indent)
                break;
        default:
                abort();
                break;
        default:
                abort();

-               /* NOTREACHED */

        }
 
        switch (n->type) {
        }
 
        switch (n->type) {


@@ -138,7 +161,6 @@ print_mdoc(const struct roff_node *n, int indent)
                break;
        default:
                abort();
                break;
        default:
                abort();

-               /* NOTREACHED */

        }
 
        if (n->span) {
        }
 
        if (n->span) {


@@ -161,9 +183,22 @@ print_mdoc(const struct roff_node *n, int indent)
                }
 
                putchar(' ');
                }
 
                putchar(' ');

-               if (MDOC_LINE & n->flags)
+               if (NODE_DELIMO & n->flags)
+                       putchar('(');
+               if (NODE_LINE & n->flags)

                        putchar('*');
                        putchar('*');

-               printf("%d:%d\n", n->line, n->pos + 1);
+               printf("%d:%d", n->line, n->pos + 1);
+               if (NODE_DELIMC & n->flags)
+                       putchar(')');
+               if (NODE_EOS & n->flags)
+                       putchar('.');
+               if (NODE_BROKEN & n->flags)
+                       printf(" BROKEN");
+               if (NODE_NOSRC & n->flags)
+                       printf(" NOSRC");
+               if (NODE_NOPRT & n->flags)
+                       printf(" NOPRT");
+               putchar('\n');

        }
 
        if (n->eqn)
        }
 
        if (n->eqn)


@@ -200,10 +235,10 @@ print_man(const struct roff_node *n, int indent)
                t = "block";
                break;
        case ROFFT_HEAD:
                t = "block";
                break;
        case ROFFT_HEAD:

-               t = "block-head";
+               t = "head";

                break;
        case ROFFT_BODY:
                break;
        case ROFFT_BODY:

-               t = "block-body";
+               t = "body";

                break;
        case ROFFT_TBL:
                break;
                break;
        case ROFFT_TBL:
                break;


@@ -212,7 +247,6 @@ print_man(const struct roff_node *n, int indent)
                break;
        default:
                abort();
                break;
        default:
                abort();

-               /* NOTREACHED */

        }
 
        switch (n->type) {
        }
 
        switch (n->type) {


@@ -220,11 +254,8 @@ print_man(const struct roff_node *n, int indent)
                p = n->string;
                break;
        case ROFFT_ELEM:
                p = n->string;
                break;
        case ROFFT_ELEM:

-               /* FALLTHROUGH */

        case ROFFT_BLOCK:
        case ROFFT_BLOCK:

-               /* FALLTHROUGH */

        case ROFFT_HEAD:
        case ROFFT_HEAD:

-               /* FALLTHROUGH */

        case ROFFT_BODY:
                p = man_macronames[n->tok];
                break;
        case ROFFT_BODY:
                p = man_macronames[n->tok];
                break;


@@ -238,7 +269,6 @@ print_man(const struct roff_node *n, int indent)
                break;
        default:
                abort();
                break;
        default:
                abort();

-               /* NOTREACHED */

        }
 
        if (n->span) {
        }
 
        if (n->span) {


@@ -248,9 +278,12 @@ print_man(const struct roff_node *n, int indent)
                for (i = 0; i < indent; i++)
                        putchar(' ');
                printf("%s (%s) ", p, t);
                for (i = 0; i < indent; i++)
                        putchar(' ');
                printf("%s (%s) ", p, t);

-               if (MAN_LINE & n->flags)
+               if (NODE_LINE & n->flags)

                        putchar('*');
                        putchar('*');

-               printf("%d:%d\n", n->line, n->pos + 1);
+               printf("%d:%d", n->line, n->pos + 1);
+               if (NODE_EOS & n->flags)
+                       putchar('.');
+               putchar('\n');

        }
 
        if (n->eqn)
        }
 
        if (n->eqn)


@@ -351,12 +384,10 @@ print_span(const struct tbl_span *sp, int indent)
        for (dp = sp->first; dp; dp = dp->next) {
                switch (dp->pos) {
                case TBL_DATA_HORIZ:
        for (dp = sp->first; dp; dp = dp->next) {
                switch (dp->pos) {
                case TBL_DATA_HORIZ:

-                       /* FALLTHROUGH */

                case TBL_DATA_NHORIZ:
                        putchar('-');
                        continue;
                case TBL_DATA_DHORIZ:
                case TBL_DATA_NHORIZ:
                        putchar('-');
                        continue;
                case TBL_DATA_DHORIZ:

-                       /* FALLTHROUGH */

                case TBL_DATA_NDHORIZ:
                        putchar('=');
                        continue;
                case TBL_DATA_NDHORIZ:
                        putchar('=');
                        continue;