]> git.cameronkatri.com Git - mandoc.git/blobdiff - man_html.c
add arch.o
[mandoc.git] / man_html.c
index e11ed0e697d121d56254ff5b9c22970d5cc18311..994a208aa0eeace2ac42a796c683cbadb9738f1c 100644 (file)
@@ -1,4 +1,4 @@
-/*     $Id: man_html.c,v 1.168 2019/01/11 12:56:43 schwarze Exp $ */
+/*     $Id: man_html.c,v 1.173 2019/03/02 16:30:53 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -46,6 +46,8 @@ static        void              print_man_head(const struct roff_meta *,
                                struct html *);
 static void              print_man_nodelist(MAN_ARGS);
 static void              print_man_node(MAN_ARGS);
+static char              list_continues(const struct roff_node *,
+                               const struct roff_node *);
 static int               man_B_pre(MAN_ARGS);
 static int               man_IP_pre(MAN_ARGS);
 static int               man_I_pre(MAN_ARGS);
@@ -119,7 +121,7 @@ html_man(void *arg, const struct roff_meta *man)
        if ((h->oflags & HTML_FRAGMENT) == 0) {
                print_gen_decls(h);
                print_otag(h, TAG_HTML, "");
-               if (n->type == ROFFT_COMMENT)
+               if (n != NULL && n->type == ROFFT_COMMENT)
                        print_gen_comment(h, n);
                t = print_otag(h, TAG_HEAD, "");
                print_man_head(man, h);
@@ -168,10 +170,6 @@ print_man_node(MAN_ARGS)
        html_fillmode(h, n->flags & NODE_NOFILL ? ROFF_nf : ROFF_fi);
 
        child = 1;
-       t = h->tag;
-       if (t->tag == TAG_P || t->tag == TAG_PRE)
-               t = t->next;
-
        switch (n->type) {
        case ROFFT_TEXT:
                if (*n->string == '\0') {
@@ -183,9 +181,13 @@ print_man_node(MAN_ARGS)
                        print_endline(h);
                else if (n->flags & NODE_DELIMC)
                        h->flags |= HTML_NOSPACE;
+               t = h->tag;
+               t->refcnt++;
                print_text(h, n->string);
                break;
        case ROFFT_EQN:
+               t = h->tag;
+               t->refcnt++;
                print_eqn(h, n->eqn);
                break;
        case ROFFT_TBL:
@@ -211,12 +213,13 @@ print_man_node(MAN_ARGS)
                 * the "meta" table state.  This will be reopened on the
                 * next table element.
                 */
-               if (h->tblt != NULL) {
+               if (h->tblt != NULL)
                        print_tblclose(h);
-                       t = h->tag;
-               }
+               t = h->tag;
+               t->refcnt++;
                if (n->tok < ROFF_MAX) {
                        roff_html_pre(h, n);
+                       t->refcnt--;
                        print_stagq(h, t);
                        return;
                }
@@ -231,7 +234,23 @@ print_man_node(MAN_ARGS)
                print_man_nodelist(man, n->child, h);
 
        /* This will automatically close out any font scope. */
-       print_stagq(h, t);
+       t->refcnt--;
+       if (n->type == ROFFT_BLOCK &&
+           (n->tok == MAN_IP || n->tok == MAN_TP || n->tok == MAN_TQ)) {
+               t = h->tag;
+               while (t->tag != TAG_DL && t->tag != TAG_UL)
+                       t = t->next;
+               /*
+                * Close the list if no further item of the same type
+                * follows; otherwise, close the item only.
+                */
+               if (list_continues(n, n->next) == '\0') {
+                       print_tagq(h, t);
+                       t = NULL;
+               }
+       }
+       if (t != NULL)
+               print_stagq(h, t);
 
        if (n->flags & NODE_NOFILL && n->tok != MAN_YS &&
            (n->next != NULL && n->next->flags & NODE_LINE)) {
@@ -290,18 +309,25 @@ man_root_post(const struct roff_meta *man, struct html *h)
 static int
 man_SH_pre(MAN_ARGS)
 {
-       char    *id;
-
+       const char      *class;
+       char            *id;
+       enum htmltag     tag;
+
+       if (n->tok == MAN_SH) {
+               tag = TAG_H1;
+               class = "Sh";
+       } else {
+               tag = TAG_H2;
+               class = "Ss";
+       }
        switch (n->type) {
        case ROFFT_BLOCK:
                html_close_paragraph(h);
+               print_otag(h, TAG_SECTION, "c", class);
                break;
        case ROFFT_HEAD:
                id = html_make_id(n, 1);
-               if (n->tok == MAN_SH)
-                       print_otag(h, TAG_H1, "ci", "Sh", id);
-               else
-                       print_otag(h, TAG_H2, "ci", "Ss", id);
+               print_otag(h, tag, "ci", class, id);
                if (id != NULL)
                        print_otag(h, TAG_A, "chR", "permalink", id);
                break;
@@ -389,21 +415,82 @@ man_PP_pre(MAN_ARGS)
        return 1;
 }
 
+static char
+list_continues(const struct roff_node *n1, const struct roff_node *n2)
+{
+       const char *s1, *s2;
+       char c1, c2;
+
+       if (n1 == NULL || n1->type != ROFFT_BLOCK ||
+           n2 == NULL || n2->type != ROFFT_BLOCK)
+               return '\0';
+       if ((n1->tok == MAN_TP || n1->tok == MAN_TQ) &&
+           (n2->tok == MAN_TP || n2->tok == MAN_TQ))
+               return ' ';
+       if (n1->tok != MAN_IP || n2->tok != MAN_IP)
+               return '\0';
+       n1 = n1->head->child;
+       n2 = n2->head->child;
+       s1 = n1 == NULL ? "" : n1->string;
+       s2 = n2 == NULL ? "" : n2->string;
+       c1 = strcmp(s1, "*") == 0 ? '*' :
+            strcmp(s1, "\\-") == 0 ? '-' :
+            strcmp(s1, "\\(bu") == 0 ? 'b' : ' ';
+       c2 = strcmp(s2, "*") == 0 ? '*' :
+            strcmp(s2, "\\-") == 0 ? '-' :
+            strcmp(s2, "\\(bu") == 0 ? 'b' : ' ';
+       return c1 != c2 ? '\0' : c1 == 'b' ? '*' : c1;
+}
+
 static int
 man_IP_pre(MAN_ARGS)
 {
        const struct roff_node  *nn;
+       const char              *list_class;
+       enum htmltag             list_elem, body_elem;
+       char                     list_type;
+
+       nn = n->type == ROFFT_BLOCK ? n : n->parent;
+       if ((list_type = list_continues(nn->prev, nn)) == '\0') {
+               /* Start a new list. */
+               if ((list_type = list_continues(nn, nn->next)) == '\0')
+                       list_type = ' ';
+               switch (list_type) {
+               case ' ':
+                       list_class = "Bl-tag";
+                       list_elem = TAG_DL;
+                       break;
+               case '*':
+                       list_class = "Bl-bullet";
+                       list_elem = TAG_UL;
+                       break;
+               case '-':
+                       list_class = "Bl-dash";
+                       list_elem = TAG_UL;
+                       break;
+               default:
+                       abort();
+               }
+       } else {
+               /* Continue a list that was started earlier. */
+               list_class = NULL;
+               list_elem = TAG_MAX;
+       }
+       body_elem = list_type == ' ' ? TAG_DD : TAG_LI;
 
        switch (n->type) {
        case ROFFT_BLOCK:
                html_close_paragraph(h);
-               print_otag(h, TAG_DL, "c", "Bl-tag");
+               if (list_elem != TAG_MAX)
+                       print_otag(h, list_elem, "c", list_class);
                return 1;
        case ROFFT_HEAD:
+               if (body_elem == TAG_LI)
+                       return 0;
                print_otag(h, TAG_DT, "");
                break;
        case ROFFT_BODY:
-               print_otag(h, TAG_DD, "");
+               print_otag(h, body_elem, "");
                return 1;
        default:
                abort();