Support nesting of elements with next-line scope.

[mandoc.git] / html.c

diff --git a/html.c b/html.c
index 786e1c3a92e0cf6ce738e79ae8364709799df951..b97f357705e7367bff8f98b3b063d6e16185a105 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,4 +1,4 @@
-/*     $Id: html.c,v 1.234 2018/06/25 13:26:57 schwarze Exp $ */
+/*     $Id: html.c,v 1.239 2018/08/16 13:54:06 schwarze Exp $ */

 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>


@@ -69,8 +69,6 @@ static        const struct htmldata htmltags[TAG_MAX] = {
        {"br",          HTML_NOSTACK | HTML_AUTOCLOSE | HTML_NLALL},
        {"a",           0},
        {"table",       HTML_NLALL | HTML_INDENT},
        {"br",          HTML_NOSTACK | HTML_AUTOCLOSE | HTML_NLALL},
        {"a",           0},
        {"table",       HTML_NLALL | HTML_INDENT},

-       {"colgroup",    HTML_NLALL | HTML_INDENT},
-       {"col",         HTML_NOSTACK | HTML_AUTOCLOSE | HTML_NLALL},

        {"tr",          HTML_NLALL | HTML_INDENT},
        {"td",          HTML_NLAROUND},
        {"li",          HTML_NLAROUND | HTML_INDENT},
        {"tr",          HTML_NLALL | HTML_INDENT},
        {"td",          HTML_NLAROUND},
        {"li",          HTML_NLAROUND | HTML_INDENT},


@@ -106,23 +104,9 @@ static     const struct htmldata htmltags[TAG_MAX] = {
        {"mover",       0},
 };
 
        {"mover",       0},
 };
 

-static const char      *const roffscales[SCALE_MAX] = {
-       "cm", /* SCALE_CM */
-       "in", /* SCALE_IN */
-       "pc", /* SCALE_PC */
-       "pt", /* SCALE_PT */
-       "em", /* SCALE_EM */
-       "em", /* SCALE_MM */
-       "ex", /* SCALE_EN */
-       "ex", /* SCALE_BU */
-       "em", /* SCALE_VS */
-       "ex", /* SCALE_FS */
-};
-

 /* Avoid duplicate HTML id= attributes. */
 static struct ohash     id_unique;
 
 /* Avoid duplicate HTML id= attributes. */
 static struct ohash     id_unique;
 

-static void     a2width(const char *, struct roffsu *);

 static void     print_byte(struct html *, char);
 static void     print_endword(struct html *);
 static void     print_indent(struct html *);
 static void     print_byte(struct html *, char);
 static void     print_endword(struct html *);
 static void     print_indent(struct html *);


@@ -326,57 +310,6 @@ html_make_id(const struct roff_node *n, int unique)
        return buf;
 }
 
        return buf;
 }
 

-int
-html_strlen(const char *cp)
-{
-       size_t           rsz;
-       int              skip, sz;
-
-       /*
-        * Account for escaped sequences within string length
-        * calculations.  This follows the logic in term_strlen() as we
-        * must calculate the width of produced strings.
-        * Assume that characters are always width of "1".  This is
-        * hacky, but it gets the job done for approximation of widths.
-        */
-
-       sz = 0;
-       skip = 0;
-       while (1) {
-               rsz = strcspn(cp, "\\");
-               if (rsz) {
-                       cp += rsz;
-                       if (skip) {
-                               skip = 0;
-                               rsz--;
-                       }
-                       sz += rsz;
-               }
-               if ('\0' == *cp)
-                       break;
-               cp++;
-               switch (mandoc_escape(&cp, NULL, NULL)) {
-               case ESCAPE_ERROR:
-                       return sz;
-               case ESCAPE_UNICODE:
-               case ESCAPE_NUMBERED:
-               case ESCAPE_SPECIAL:
-               case ESCAPE_OVERSTRIKE:
-                       if (skip)
-                               skip = 0;
-                       else
-                               sz++;
-                       break;
-               case ESCAPE_SKIPCHAR:
-                       skip = 1;
-                       break;
-               default:
-                       break;
-               }
-       }
-       return sz;
-}
-

 static int
 print_escape(struct html *h, char c)
 {
 static int
 print_escape(struct html *h, char c)
 {


@@ -500,6 +433,9 @@ print_encode(struct html *h, const char *p, const char *pend, int norecurse)
                        if (c <= 0)
                                continue;
                        break;
                        if (c <= 0)
                                continue;
                        break;

+               case ESCAPE_DEVICE:
+                       print_word(h, "html");
+                       continue;

                case ESCAPE_BREAK:
                        breakline = 1;
                        continue;
                case ESCAPE_BREAK:
                        breakline = 1;
                        continue;


@@ -556,13 +492,10 @@ struct tag *
 print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
 {
        va_list          ap;
 print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
 {
        va_list          ap;

-       struct roffsu    mysu, *su;
-       char             numbuf[16];

        struct tag      *t;
        const char      *attr;
        char            *arg1, *arg2;
        struct tag      *t;
        const char      *attr;
        char            *arg1, *arg2;

-       double           v;
-       int              i, have_style, tflags;
+       int              tflags;

 
        tflags = htmltags[tag].flags;
 
 
        tflags = htmltags[tag].flags;
 


@@ -602,17 +535,12 @@ print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
 
        va_start(ap, fmt);
 
 
        va_start(ap, fmt);
 

-       have_style = 0;

        while (*fmt != '\0') {
        while (*fmt != '\0') {

-               if (*fmt == 's') {
-                       have_style = 1;
-                       fmt++;
-                       break;
-               }

 
 

-               /* Parse a non-style attribute and its arguments. */
+               /* Parse attributes and arguments. */

 
                arg1 = va_arg(ap, char *);
 
                arg1 = va_arg(ap, char *);

+               arg2 = NULL;

                switch (*fmt++) {
                case 'c':
                        attr = "class";
                switch (*fmt++) {
                case 'c':
                        attr = "class";


@@ -623,6 +551,10 @@ print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
                case 'i':
                        attr = "id";
                        break;
                case 'i':
                        attr = "id";
                        break;

+               case 's':
+                       attr = "style";
+                       arg2 = va_arg(ap, char *);
+                       break;

                case '?':
                        attr = arg1;
                        arg1 = va_arg(ap, char *);
                case '?':
                        attr = arg1;
                        arg1 = va_arg(ap, char *);


@@ -630,13 +562,12 @@ print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
                default:
                        abort();
                }
                default:
                        abort();
                }

-               arg2 = NULL;

                if (*fmt == 'M')
                        arg2 = va_arg(ap, char *);
                if (arg1 == NULL)
                        continue;
 
                if (*fmt == 'M')
                        arg2 = va_arg(ap, char *);
                if (arg1 == NULL)
                        continue;
 

-               /* Print the non-style attributes. */
+               /* Print the attributes. */

 
                print_byte(h, ' ');
                print_word(h, attr);
 
                print_byte(h, ' ');
                print_word(h, attr);


@@ -663,100 +594,19 @@ print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
                        fmt++;
                        break;
                default:
                        fmt++;
                        break;
                default:

-                       print_encode(h, arg1, NULL, 1);
-                       break;
-               }
-               print_byte(h, '"');
-       }
-
-       /* Print out styles. */
-
-       while (*fmt != '\0') {
-               arg1 = NULL;
-               su = NULL;
-
-               /* First letter: input argument type. */
-
-               switch (*fmt++) {
-               case 'h':
-                       i = va_arg(ap, int);
-                       su = &mysu;
-                       SCALE_HS_INIT(su, i);
-                       break;
-               case 's':
-                       arg1 = va_arg(ap, char *);
-                       break;
-               case 'u':
-                       su = va_arg(ap, struct roffsu *);
-                       break;
-               case 'w':
-                       if ((arg2 = va_arg(ap, char *)) != NULL) {
-                               su = &mysu;
-                               a2width(arg2, su);
-                       }
-                       if (*fmt == '+') {
-                               if (su != NULL) {
-                                       /* Make even bold text fit. */
-                                       su->scale *= 1.2;
-                                       /* Add padding. */
-                                       su->scale += 3.0;
-                               }
-                               fmt++;
+                       if (arg2 == NULL)
+                               print_encode(h, arg1, NULL, 1);
+                       else {
+                               print_word(h, arg1);
+                               print_byte(h, ':');
+                               print_byte(h, ' ');
+                               print_word(h, arg2);
+                               print_byte(h, ';');

                        }
                        break;
                        }
                        break;

-               default:
-                       abort();
-               }
-
-               /* Second letter: style name. */
-
-               switch (*fmt++) {
-               case 'h':
-                       attr = "height";
-                       break;
-               case 'l':
-                       attr = "margin-left";
-                       break;
-               case 'w':
-                       attr = "width";
-                       break;
-               case 'W':
-                       attr = "min-width";
-                       break;
-               case '?':
-                       attr = arg1;
-                       arg1 = va_arg(ap, char *);
-                       break;
-               default:
-                       abort();

                }
                }

-               if (su == NULL && arg1 == NULL)
-                       continue;
-
-               if (have_style == 1)
-                       print_word(h, " style=\"");
-               else
-                       print_byte(h, ' ');
-               print_word(h, attr);
-               print_byte(h, ':');
-               print_byte(h, ' ');
-               if (su != NULL) {
-                       v = su->scale;
-                       if (su->unit == SCALE_MM && (v /= 100.0) == 0.0)
-                               v = 1.0;
-                       else if (su->unit == SCALE_BU)
-                               v /= 24.0;
-                       (void)snprintf(numbuf, sizeof(numbuf), "%.2f", v);
-                       print_word(h, numbuf);
-                       print_word(h, roffscales[su->unit]);
-               } else
-                       print_word(h, arg1);
-               print_byte(h, ';');
-               have_style = 2;
-       }
-       if (have_style == 2)

                print_byte(h, '"');
                print_byte(h, '"');

-
+       }

        va_end(ap);
 
        /* Accommodate for "well-formed" singleton escaping. */
        va_end(ap);
 
        /* Accommodate for "well-formed" singleton escaping. */


@@ -1037,21 +887,3 @@ print_word(struct html *h, const char *cp)
        while (*cp != '\0')
                print_byte(h, *cp++);
 }
        while (*cp != '\0')
                print_byte(h, *cp++);
 }

-
-/*
- * Calculate the scaling unit passed in a `-width' argument.  This uses
- * either a native scaling unit (e.g., 1i, 2m) or the string length of
- * the value.
- */
-static void
-a2width(const char *p, struct roffsu *su)
-{
-       const char      *end;
-
-       end = a2roffsu(p, su, SCALE_MAX);
-       if (end == NULL || *end != '\0') {
-               su->unit = SCALE_EN;
-               su->scale = html_strlen(p);
-       } else if (su->scale < 0.0)
-               su->scale = 0.0;
-}