In quoted macro arguments, double quotes can be quoted by doubling them.

[mandoc.git] / tree.c

diff --git a/tree.c b/tree.c
index 6c0ff01c763b954957ee2a952cba62767b1f3cff..08a76b80eda76593381b19421a19fce397bc6208 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,6 +1,6 @@
-/*     $Id: tree.c,v 1.24 2010/07/07 15:04:54 kristaps Exp $ */
+/*     $Id: tree.c,v 1.49 2013/09/15 17:33:57 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2011 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
@@ -19,6 +19,7 @@
 #endif
 
 #include <assert.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
@@ -28,8 +29,10 @@
 #include "man.h"
 #include "main.h"
 
-static void    print_mdoc(const struct mdoc_node *, int);
+static void    print_box(const struct eqn_box *, int);
 static void    print_man(const struct man_node *, int);
+static void    print_mdoc(const struct mdoc_node *, int);
+static void    print_span(const struct tbl_span *, int);
 
 
 /* ARGSUSED */
@@ -55,13 +58,12 @@ print_mdoc(const struct mdoc_node *n, int indent)
 {
        const char       *p, *t;
        int               i, j;
-       size_t            argc, sz;
-       char            **params;
+       size_t            argc;
        struct mdoc_argv *argv;
 
        argv = NULL;
-       argc = sz = 0;
-       params = NULL;
+       argc = 0;
+       t = p = NULL;
 
        switch (n->type) {
        case (MDOC_ROOT):
@@ -88,6 +90,10 @@ print_mdoc(const struct mdoc_node *n, int indent)
        case (MDOC_TEXT):
                t = "text";
                break;
+       case (MDOC_TBL):
+               /* FALLTHROUGH */
+       case (MDOC_EQN):
+               break;
        default:
                abort();
                /* NOTREACHED */
@@ -120,6 +126,10 @@ print_mdoc(const struct mdoc_node *n, int indent)
                        argc = n->args->argc;
                }
                break;
+       case (MDOC_TBL):
+               /* FALLTHROUGH */
+       case (MDOC_EQN):
+               break;
        case (MDOC_ROOT):
                p = "root";
                break;
@@ -128,24 +138,33 @@ print_mdoc(const struct mdoc_node *n, int indent)
                /* 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 && NULL == t);
+               print_span(n->span, indent);
+       } else if (n->eqn) {
+               assert(NULL == p && NULL == t);
+               print_box(n->eqn->root, indent);
+       } else {
+               for (i = 0; i < indent; i++)
+                       putchar('\t');
+
+               printf("%s (%s)", p, t);
 
-       for (i = 0; i < (int)sz; i++)
-               (void)printf(" [%s]", params[i]);
+               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(" ]");
+               }
 
-       (void)printf(" %d:%d\n", n->line, n->pos);
+               putchar(' ');
+               if (MDOC_LINE & n->flags)
+                       putchar('*');
+               printf("%d:%d\n", n->line, n->pos);
+       }
 
        if (n->child)
                print_mdoc(n->child, indent + 1);
@@ -160,6 +179,8 @@ print_man(const struct man_node *n, int indent)
        const char       *p, *t;
        int               i;
 
+       t = p = NULL;
+
        switch (n->type) {
        case (MAN_ROOT):
                t = "root";
@@ -179,6 +200,13 @@ print_man(const struct man_node *n, int indent)
        case (MAN_BODY):
                t = "block-body";
                break;
+       case (MAN_TAIL):
+               t = "block-tail";
+               break;
+       case (MAN_TBL):
+               /* FALLTHROUGH */
+       case (MAN_EQN):
+               break;
        default:
                abort();
                /* NOTREACHED */
@@ -194,23 +222,126 @@ print_man(const struct man_node *n, int indent)
                /* FALLTHROUGH */
        case (MAN_HEAD):
                /* FALLTHROUGH */
+       case (MAN_TAIL):
+               /* FALLTHROUGH */
        case (MAN_BODY):
                p = man_macronames[n->tok];
                break;
        case (MAN_ROOT):
                p = "root";
                break;
+       case (MAN_TBL):
+               /* FALLTHROUGH */
+       case (MAN_EQN):
+               break;
        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 && NULL == t);
+               print_span(n->span, indent);
+       } else if (n->eqn) {
+               assert(NULL == p && NULL == t);
+               print_box(n->eqn->root, indent);
+       } else {
+               for (i = 0; i < indent; i++)
+                       putchar('\t');
+               printf("%s (%s) %d:%d\n", p, t, n->line, n->pos);
+       }
 
        if (n->child)
                print_man(n->child, indent + 1);
        if (n->next)
                print_man(n->next, indent);
 }
+
+static void
+print_box(const struct eqn_box *ep, int indent)
+{
+       int              i;
+       const char      *t;
+
+       if (NULL == ep)
+               return;
+       for (i = 0; i < indent; i++)
+               putchar('\t');
+
+       t = NULL;
+       switch (ep->type) {
+       case (EQN_ROOT):
+               t = "eqn-root";
+               break;
+       case (EQN_LIST):
+               t = "eqn-list";
+               break;
+       case (EQN_SUBEXPR):
+               t = "eqn-expr";
+               break;
+       case (EQN_TEXT):
+               t = "eqn-text";
+               break;
+       case (EQN_MATRIX):
+               t = "eqn-matrix";
+               break;
+       }
+
+       assert(t);
+       printf("%s(%d, %d, %d, %d, %d, \"%s\", \"%s\") %s\n", 
+               t, EQN_DEFSIZE == ep->size ? 0 : ep->size,
+               ep->pos, ep->font, ep->mark, ep->pile, 
+               ep->left ? ep->left : "",
+               ep->right ? ep->right : "",
+               ep->text ? ep->text : "");
+
+       print_box(ep->first, indent + 1);
+       print_box(ep->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');
+
+       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\"", dp->string ? dp->string : "");
+               if (dp->spans)
+                       printf("(%d)", dp->spans);
+               if (NULL == dp->layout)
+                       putchar('*');
+               putchar(']');
+               putchar(' ');
+       }
+
+       printf("(tbl) %d:1\n", sp->line);
+}