Merge from OpenBSD (similar to my original fix committed on Oct 15, 2010):

[mandoc.git] / tree.c

diff --git a/tree.c b/tree.c
index f39b1cab736e6a9eec5b22cde26e8622d045742c..70bd73d9ef27dc7ed15e56fe0c235839c0e39f71 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,6 +1,6 @@
-/*     $Id: tree.c,v 1.20 2010/05/17 22:11:42 kristaps Exp $ */
+/*     $Id: tree.c,v 1.31 2011/01/03 13:59:21 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -30,6 +30,7 @@
 
 static void    print_mdoc(const struct mdoc_node *, int);
 static void    print_man(const struct man_node *, int);
 
 static void    print_mdoc(const struct mdoc_node *, int);
 static void    print_man(const struct man_node *, int);

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

 
 
 /* ARGSUSED */
 
 
 /* ARGSUSED */


@@ -74,7 +75,10 @@ print_mdoc(const struct mdoc_node *n, int indent)
                t = "block-head";
                break;
        case (MDOC_BODY):
                t = "block-head";
                break;
        case (MDOC_BODY):

-               t = "block-body";
+               if (n->end)
+                       t = "body-end";
+               else
+                       t = "block-body";

                break;
        case (MDOC_TAIL):
                t = "block-tail";
                break;
        case (MDOC_TAIL):
                t = "block-tail";


@@ -85,11 +89,16 @@ print_mdoc(const struct mdoc_node *n, int indent)
        case (MDOC_TEXT):
                t = "text";
                break;
        case (MDOC_TEXT):
                t = "text";
                break;

+       case (MDOC_TBL):
+               t = "tbl";
+               break;

        default:
                abort();
                /* NOTREACHED */
        }
 
        default:
                abort();
                /* NOTREACHED */
        }
 

+       p = NULL;
+

        switch (n->type) {
        case (MDOC_TEXT):
                p = n->string;
        switch (n->type) {
        case (MDOC_TEXT):
                p = n->string;


@@ -117,6 +126,8 @@ print_mdoc(const struct mdoc_node *n, int indent)
                        argc = n->args->argc;
                }
                break;
                        argc = n->args->argc;
                }
                break;

+       case (MDOC_TBL):
+               break;

        case (MDOC_ROOT):
                p = "root";
                break;
        case (MDOC_ROOT):
                p = "root";
                break;


@@ -125,24 +136,32 @@ print_mdoc(const struct mdoc_node *n, int indent)
                /* NOTREACHED */
        }
 
                /* NOTREACHED */
        }
 

-       for (i = 0; i < indent; i++)
-               (void)printf("    ");
-       (void)printf("%s (%s)", p, t);
-
-       for (i = 0; i < (int)argc; i++) {
-               (void)printf(" -%s", mdoc_argnames[argv[i].arg]);
-               if (argv[i].sz > 0)
-                       (void)printf(" [");
-               for (j = 0; j < (int)argv[i].sz; j++)
-                       (void)printf(" [%s]", argv[i].value[j]);
-               if (argv[i].sz > 0)
-                       (void)printf(" ]");
-       }
+       if (n->span) {
+               assert(NULL == p);
+               print_span(n->span, indent);
+       } else {
+               for (i = 0; i < indent; i++)
+                       putchar('\t');

 
 

-       for (i = 0; i < (int)sz; i++)
-               (void)printf(" [%s]", params[i]);
+               printf("%s (%s)", p, t);

 
 

-       (void)printf(" %d:%d\n", n->line, n->pos);
+               for (i = 0; i < (int)argc; i++) {
+                       printf(" -%s", mdoc_argnames[argv[i].arg]);
+                       if (argv[i].sz > 0)
+                               printf(" [");
+                       for (j = 0; j < (int)argv[i].sz; j++)
+                               printf(" [%s]", argv[i].value[j]);
+                       if (argv[i].sz > 0)
+                               printf(" ]");
+               }
+               
+               for (i = 0; i < (int)sz; i++)
+                       printf(" [%s]", params[i]);
+
+               printf(" %d:%d", n->line, n->pos);
+       }
+
+       putchar('\n');

 
        if (n->child)
                print_mdoc(n->child, indent + 1);
 
        if (n->child)
                print_mdoc(n->child, indent + 1);


@@ -176,11 +195,16 @@ print_man(const struct man_node *n, int indent)
        case (MAN_BODY):
                t = "block-body";
                break;
        case (MAN_BODY):
                t = "block-body";
                break;

+       case (MAN_TBL):
+               t = "tbl";
+               break;

        default:
                abort();
                /* NOTREACHED */
        }
 
        default:
                abort();
                /* NOTREACHED */
        }
 

+       p = NULL;
+

        switch (n->type) {
        case (MAN_TEXT):
                p = n->string;
        switch (n->type) {
        case (MAN_TEXT):
                p = n->string;


@@ -197,17 +221,69 @@ print_man(const struct man_node *n, int indent)
        case (MAN_ROOT):
                p = "root";
                break;
        case (MAN_ROOT):
                p = "root";
                break;

+       case (MAN_TBL):
+               break;

        default:
                abort();
                /* NOTREACHED */
        }
 
        default:
                abort();
                /* NOTREACHED */
        }
 

-       for (i = 0; i < indent; i++)
-               (void)printf("    ");
-       (void)printf("%s (%s) %d:%d\n", p, t, n->line, n->pos);
+       if (n->span) {
+               assert(NULL == p);
+               print_span(n->span, indent);
+       } else {
+               for (i = 0; i < indent; i++)
+                       putchar('\t');
+               printf("%s (%s) %d:%d", p, t, n->line, n->pos);
+       }
+
+       putchar('\n');

 
        if (n->child)
                print_man(n->child, indent + 1);
        if (n->next)
                print_man(n->next, indent);
 }
 
        if (n->child)
                print_man(n->child, indent + 1);
        if (n->next)
                print_man(n->next, indent);
 }

+
+static void
+print_span(const struct tbl_span *sp, int indent)
+{
+       const struct tbl_dat *dp;
+       int              i;
+
+       for (i = 0; i < indent; i++)
+               putchar('\t');
+
+       printf("tbl: ");
+
+       switch (sp->pos) {
+       case (TBL_SPAN_HORIZ):
+               putchar('-');
+               return;
+       case (TBL_SPAN_DHORIZ):
+               putchar('=');
+               return;
+       default:
+               break;
+       }
+
+       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):
+                       /* FALLTHROUGH */
+               case (TBL_DATA_NDHORIZ):
+                       putchar('=');
+                       continue;
+               default:
+                       break;
+               }
+               printf("[%s%s]", dp->string, dp->layout ?  "" : "*");
+               if (dp->next)
+                       putchar(' ');
+       }
+}