The groff man-ext macros define fonts CB, CI, and CR,

[mandoc.git] / tree.c

diff --git a/tree.c b/tree.c
index 989a2c3cf817401f7e046709403e012c0a94291d..b9774e1cd8e1ac0d8655484e5cf65296a8cd0234 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,7 +1,7 @@
-/*     $Id: tree.c,v 1.74 2017/04/24 23:06:18 schwarze Exp $ */
+/*     $Id: tree.c,v 1.78 2018/04/11 17:11:13 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2013,2014,2015,2017,2018 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
@@ -115,6 +115,9 @@ print_mdoc(const struct roff_node *n, int indent)
        case ROFFT_TEXT:
                t = "text";
                break;
+       case ROFFT_COMMENT:
+               t = "comment";
+               break;
        case ROFFT_TBL:
                break;
        case ROFFT_EQN:
@@ -126,6 +129,7 @@ print_mdoc(const struct roff_node *n, int indent)
 
        switch (n->type) {
        case ROFFT_TEXT:
+       case ROFFT_COMMENT:
                p = n->string;
                break;
        case ROFFT_BODY:
@@ -202,7 +206,7 @@ print_mdoc(const struct roff_node *n, int indent)
        }
 
        if (n->eqn)
-               print_box(n->eqn->root->first, indent + 4);
+               print_box(n->eqn->first, indent + 4);
        if (n->child)
                print_mdoc(n->child, indent +
                    (n->type == ROFFT_BLOCK ? 2 : 4));
@@ -231,6 +235,9 @@ print_man(const struct roff_node *n, int indent)
        case ROFFT_TEXT:
                t = "text";
                break;
+       case ROFFT_COMMENT:
+               t = "comment";
+               break;
        case ROFFT_BLOCK:
                t = "block";
                break;
@@ -251,6 +258,7 @@ print_man(const struct roff_node *n, int indent)
 
        switch (n->type) {
        case ROFFT_TEXT:
+       case ROFFT_COMMENT:
                p = n->string;
                break;
        case ROFFT_ELEM:
@@ -287,7 +295,7 @@ print_man(const struct roff_node *n, int indent)
        }
 
        if (n->eqn)
-               print_box(n->eqn->root->first, indent + 4);
+               print_box(n->eqn->first, indent + 4);
        if (n->child)
                print_man(n->child, indent +
                    (n->type == ROFFT_BLOCK ? 2 : 4));
@@ -313,10 +321,6 @@ print_box(const struct eqn_box *ep, int indent)
 
        t = NULL;
        switch (ep->type) {
-       case EQN_ROOT:
-               t = "eqn-root";
-               break;
-       case EQN_LISTONE:
        case EQN_LIST:
                t = "eqn-list";
                break;