Sevan Janiyan resigned from the NetBSD project and pkgsrc in 2020.

[mandoc.git] / tree.c

diff --git a/tree.c b/tree.c
index f08695d3acb7eefcf4f5fbd8864c63f7ea0958be..12e841a50b78dde81891c5289c05d18db16ec5e3 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,7 +1,7 @@
-/* $Id: tree.c,v 1.87 2020/03/13 15:32:29 schwarze Exp $ */
+/* $Id: tree.c,v 1.91 2021/09/07 10:59:18 schwarze Exp $ */
 /*
- * Copyright (c) 2013-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008, 2009, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2013-2015, 2017-2021 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
@@ -36,6 +36,7 @@
 #include "eqn.h"
 #include "main.h"
 
+static void    print_attr(const struct roff_node *);
 static void    print_box(const struct eqn_box *, int);
 static void    print_cellt(enum tbl_cellt);
 static void    print_man(const struct roff_node *, int);
@@ -191,35 +192,8 @@ print_mdoc(const struct roff_node *n, int indent)
                        if (argv[i].sz > 0)
                                printf(" ]");
                }
-
-               putchar(' ');
-               if (n->flags & NODE_DELIMO)
-                       putchar('(');
-               if (n->flags & NODE_LINE)
-                       putchar('*');
-               printf("%d:%d", n->line, n->pos + 1);
-               if (n->flags & NODE_DELIMC)
-                       putchar(')');
-               if (n->flags & NODE_EOS)
-                       putchar('.');
-               if (n->flags & NODE_ID) {
-                       printf(" ID");
-                       if (n->string != NULL)
-                               printf("=%s", n->string);
-               }
-               if (n->flags & NODE_HREF)
-                       printf(" HREF");
-               if (n->flags & NODE_BROKEN)
-                       printf(" BROKEN");
-               if (n->flags & NODE_NOFILL)
-                       printf(" NOFILL");
-               if (n->flags & NODE_NOSRC)
-                       printf(" NOSRC");
-               if (n->flags & NODE_NOPRT)
-                       printf(" NOPRT");
-               putchar('\n');
+               print_attr(n);
        }
-
        if (n->eqn)
                print_box(n->eqn->first, indent + 4);
        if (n->child)
@@ -300,24 +274,9 @@ print_man(const struct roff_node *n, int indent)
        } else {
                for (i = 0; i < indent; i++)
                        putchar(' ');
-               printf("%s (%s) ", p, t);
-               if (n->flags & NODE_LINE)
-                       putchar('*');
-               printf("%d:%d", n->line, n->pos + 1);
-               if (n->flags & NODE_DELIMC)
-                       putchar(')');
-               if (n->flags & NODE_EOS)
-                       putchar('.');
-               if (n->flags & NODE_ID) {
-                       printf(" ID");
-                       if (n->string != NULL)
-                               printf("=%s", n->string);
-               }
-               if (n->flags & NODE_NOFILL)
-                       printf(" NOFILL");
-               putchar('\n');
+               printf("%s (%s)", p, t);
+               print_attr(n);
        }
-
        if (n->eqn)
                print_box(n->eqn->first, indent + 4);
        if (n->child)
@@ -327,6 +286,40 @@ print_man(const struct roff_node *n, int indent)
                print_man(n->next, indent);
 }
 
+static void
+print_attr(const struct roff_node *n)
+{
+       putchar(' ');
+       if (n->flags & NODE_DELIMO)
+               putchar('(');
+       if (n->flags & NODE_LINE)
+               putchar('*');
+       printf("%d:%d", n->line, n->pos + 1);
+       if (n->flags & NODE_DELIMC)
+               putchar(')');
+       if (n->flags & NODE_EOS)
+               putchar('.');
+       if (n->flags & NODE_ID) {
+               printf(" ID");
+               if (n->flags & NODE_HREF)
+                       printf("=HREF");
+       } else if (n->flags & NODE_HREF)
+               printf(" HREF");
+       else if (n->tag != NULL)
+               printf(" STRAYTAG");
+       if (n->tag != NULL)
+               printf("=%s", n->tag);
+       if (n->flags & NODE_BROKEN)
+               printf(" BROKEN");
+       if (n->flags & NODE_NOFILL)
+               printf(" NOFILL");
+       if (n->flags & NODE_NOSRC)
+               printf(" NOSRC");
+       if (n->flags & NODE_NOPRT)
+               printf(" NOPRT");
+       putchar('\n');
+}
+
 static void
 print_box(const struct eqn_box *ep, int indent)
 {
@@ -478,10 +471,30 @@ print_span(const struct tbl_span *sp, int indent)
                        else {
                                printf("%d", cp->col);
                                print_cellt(dp->layout->pos);
-                               if (cp->flags & TBL_CELL_BOLD)
+                               switch (cp->font) {
+                               case ESCAPE_FONTROMAN:
+                                       break;
+                               case ESCAPE_FONTBOLD:
                                        putchar('b');
-                               if (cp->flags & TBL_CELL_ITALIC)
+                                       break;
+                               case ESCAPE_FONTITALIC:
                                        putchar('i');
+                                       break;
+                               case ESCAPE_FONTBI:
+                                       fputs("bi", stdout);
+                                       break;
+                               case ESCAPE_FONTCR:
+                                       putchar('c');
+                                       break;
+                               case ESCAPE_FONTCB:
+                                       fputs("cb", stdout);
+                                       break;
+                               case ESCAPE_FONTCI:
+                                       fputs("ci", stdout);
+                                       break;
+                               default:
+                                       abort();
+                               }
                                if (cp->flags & TBL_CELL_TALIGN)
                                        putchar('t');
                                if (cp->flags & TBL_CELL_UP)