]> git.cameronkatri.com Git - mandoc.git/blobdiff - html.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add a LICENSE file for clarity and for the convenience of porters
[mandoc.git] / html.c
diff --git a/html.c b/html.c
index 6ee11b5e06ea0ddcdc91579698d92ab390a594ec..7319de66790264f0774ce3072b67843393e57498 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,7 +1,7 @@
-/*     $Id: html.c,v 1.149 2011/07/07 14:34:11 kristaps Exp $ */
+/*     $Id: html.c,v 1.156 2014/04/20 16:46:04 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2012, 2013, 2014 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -31,6 +31,7 @@
 #include <unistd.h>
 
 #include "mandoc.h"
 #include <unistd.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libmandoc.h"
 #include "out.h"
 #include "html.h"
 #include "libmandoc.h"
 #include "out.h"
 #include "html.h"
@@ -114,17 +115,19 @@ static    void     print_metaf(struct html *, enum mandoc_esc);
 static void     print_attr(struct html *, const char *, const char *);
 static void     *ml_alloc(char *, enum htmltype);
 
 static void     print_attr(struct html *, const char *, const char *);
 static void     *ml_alloc(char *, enum htmltype);
 
+
 static void *
 ml_alloc(char *outopts, enum htmltype type)
 {
        struct html     *h;
 static void *
 ml_alloc(char *outopts, enum htmltype type)
 {
        struct html     *h;
-       const char      *toks[4];
+       const char      *toks[5];
        char            *v;
 
        toks[0] = "style";
        toks[1] = "man";
        toks[2] = "includes";
        char            *v;
 
        toks[0] = "style";
        toks[1] = "man";
        toks[2] = "includes";
-       toks[3] = NULL;
+       toks[3] = "fragment";
+       toks[4] = NULL;
 
        h = mandoc_calloc(1, sizeof(struct html));
 
 
        h = mandoc_calloc(1, sizeof(struct html));
 
@@ -134,15 +137,18 @@ ml_alloc(char *outopts, enum htmltype type)
 
        while (outopts && *outopts)
                switch (getsubopt(&outopts, UNCONST(toks), &v)) {
 
        while (outopts && *outopts)
                switch (getsubopt(&outopts, UNCONST(toks), &v)) {
-               case (0):
+               case 0:
                        h->style = v;
                        break;
                        h->style = v;
                        break;
-               case (1):
+               case 1:
                        h->base_man = v;
                        break;
                        h->base_man = v;
                        break;
-               case (2):
+               case 2:
                        h->base_includes = v;
                        break;
                        h->base_includes = v;
                        break;
+               case 3:
+                       h->oflags |= HTML_FRAGMENT;
+                       break;
                default:
                        break;
                }
                default:
                        break;
                }
@@ -157,7 +163,6 @@ html_alloc(char *outopts)
        return(ml_alloc(outopts, HTML_HTML_4_01_STRICT));
 }
 
        return(ml_alloc(outopts, HTML_HTML_4_01_STRICT));
 }
 
-
 void *
 xhtml_alloc(char *outopts)
 {
 void *
 xhtml_alloc(char *outopts)
 {
@@ -165,7 +170,6 @@ xhtml_alloc(char *outopts)
        return(ml_alloc(outopts, HTML_XHTML_1_0_STRICT));
 }
 
        return(ml_alloc(outopts, HTML_XHTML_1_0_STRICT));
 }
 
-
 void
 html_free(void *p)
 {
 void
 html_free(void *p)
 {
@@ -175,17 +179,16 @@ html_free(void *p)
        h = (struct html *)p;
 
        while ((tag = h->tags.head) != NULL) {
        h = (struct html *)p;
 
        while ((tag = h->tags.head) != NULL) {
-               h->tags.head = tag->next;       
+               h->tags.head = tag->next;
                free(tag);
        }
                free(tag);
        }
-       
+
        if (h->symtab)
                mchars_free(h->symtab);
 
        free(h);
 }
 
        if (h->symtab)
                mchars_free(h->symtab);
 
        free(h);
 }
 
-
 void
 print_gen_head(struct html *h)
 {
 void
 print_gen_head(struct html *h)
 {
@@ -222,18 +225,21 @@ print_metaf(struct html *h, enum mandoc_esc deco)
        enum htmlfont    font;
 
        switch (deco) {
        enum htmlfont    font;
 
        switch (deco) {
-       case (ESCAPE_FONTPREV):
+       case ESCAPE_FONTPREV:
                font = h->metal;
                break;
                font = h->metal;
                break;
-       case (ESCAPE_FONTITALIC):
+       case ESCAPE_FONTITALIC:
                font = HTMLFONT_ITALIC;
                break;
                font = HTMLFONT_ITALIC;
                break;
-       case (ESCAPE_FONTBOLD):
+       case ESCAPE_FONTBOLD:
                font = HTMLFONT_BOLD;
                break;
                font = HTMLFONT_BOLD;
                break;
-       case (ESCAPE_FONT):
+       case ESCAPE_FONTBI:
+               font = HTMLFONT_BI;
+               break;
+       case ESCAPE_FONT:
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case (ESCAPE_FONTROMAN):
+       case ESCAPE_FONTROMAN:
                font = HTMLFONT_NONE;
                break;
        default:
                font = HTMLFONT_NONE;
                break;
        default:
@@ -249,17 +255,27 @@ print_metaf(struct html *h, enum mandoc_esc deco)
        h->metal = h->metac;
        h->metac = font;
 
        h->metal = h->metac;
        h->metac = font;
 
-       if (HTMLFONT_NONE != font)
-               h->metaf = HTMLFONT_BOLD == font ?
-                       print_otag(h, TAG_B, 0, NULL) :
-                       print_otag(h, TAG_I, 0, NULL);
+       switch (font) {
+       case HTMLFONT_ITALIC:
+               h->metaf = print_otag(h, TAG_I, 0, NULL);
+               break;
+       case HTMLFONT_BOLD:
+               h->metaf = print_otag(h, TAG_B, 0, NULL);
+               break;
+       case HTMLFONT_BI:
+               h->metaf = print_otag(h, TAG_B, 0, NULL);
+               print_otag(h, TAG_I, 0, NULL);
+               break;
+       default:
+               break;
+       }
 }
 
 int
 html_strlen(const char *cp)
 {
 }
 
 int
 html_strlen(const char *cp)
 {
-       int              ssz, sz;
-       const char      *seq, *p;
+       size_t           rsz;
+       int              skip, sz;
 
        /*
         * Account for escaped sequences within string length
 
        /*
         * Account for escaped sequences within string length
@@ -270,26 +286,41 @@ html_strlen(const char *cp)
         */
 
        sz = 0;
         */
 
        sz = 0;
-       while (NULL != (p = strchr(cp, '\\'))) {
-               sz += (int)(p - cp);
-               ++cp;
-               switch (mandoc_escape(&cp, &seq, &ssz)) {
-               case (ESCAPE_ERROR):
+       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);
                        return(sz);
-               case (ESCAPE_UNICODE):
+               case ESCAPE_UNICODE:
                        /* FALLTHROUGH */
                        /* FALLTHROUGH */
-               case (ESCAPE_NUMBERED):
+               case ESCAPE_NUMBERED:
                        /* FALLTHROUGH */
                        /* FALLTHROUGH */
-               case (ESCAPE_SPECIAL):
-                       sz++;
+               case ESCAPE_SPECIAL:
+                       if (skip)
+                               skip = 0;
+                       else
+                               sz++;
+                       break;
+               case ESCAPE_SKIPCHAR:
+                       skip = 1;
                        break;
                default:
                        break;
                }
        }
                        break;
                default:
                        break;
                }
        }
-
-       assert(sz >= 0);
-       return(sz + strlen(cp));
+       return(sz);
 }
 
 static int
 }
 
 static int
@@ -299,11 +330,18 @@ print_encode(struct html *h, const char *p, int norecurse)
        int              c, len, nospace;
        const char      *seq;
        enum mandoc_esc  esc;
        int              c, len, nospace;
        const char      *seq;
        enum mandoc_esc  esc;
-       static const char rejs[6] = { '\\', '<', '>', '&', ASCII_HYPH, '\0' };
+       static const char rejs[8] = { '\\', '<', '>', '&',
+               ASCII_NBRSP, ASCII_HYPH, ASCII_BREAK, '\0' };
 
        nospace = 0;
 
        while ('\0' != *p) {
 
        nospace = 0;
 
        while ('\0' != *p) {
+               if (HTML_SKIPCHAR & h->flags && '\\' != *p) {
+                       h->flags &= ~HTML_SKIPCHAR;
+                       p++;
+                       continue;
+               }
+
                sz = strcspn(p, rejs);
 
                fwrite(p, 1, sz, stdout);
                sz = strcspn(p, rejs);
 
                fwrite(p, 1, sz, stdout);
@@ -313,18 +351,23 @@ print_encode(struct html *h, const char *p, int norecurse)
                        break;
 
                switch (*p++) {
                        break;
 
                switch (*p++) {
-               case ('<'):
+               case '<':
                        printf("&lt;");
                        continue;
                        printf("&lt;");
                        continue;
-               case ('>'):
+               case '>':
                        printf("&gt;");
                        continue;
                        printf("&gt;");
                        continue;
-               case ('&'):
+               case '&':
                        printf("&amp;");
                        continue;
                        printf("&amp;");
                        continue;
-               case (ASCII_HYPH):
+               case ASCII_NBRSP:
                        putchar('-');
                        continue;
                        putchar('-');
                        continue;
+               case ASCII_HYPH:
+                       putchar('-');
+                       /* FALLTHROUGH */
+               case ASCII_BREAK:
+                       continue;
                default:
                        break;
                }
                default:
                        break;
                }
@@ -334,38 +377,52 @@ print_encode(struct html *h, const char *p, int norecurse)
                        break;
 
                switch (esc) {
                        break;
 
                switch (esc) {
-               case (ESCAPE_UNICODE):
+               case ESCAPE_FONT:
+                       /* FALLTHROUGH */
+               case ESCAPE_FONTPREV:
+                       /* FALLTHROUGH */
+               case ESCAPE_FONTBOLD:
+                       /* FALLTHROUGH */
+               case ESCAPE_FONTITALIC:
+                       /* FALLTHROUGH */
+               case ESCAPE_FONTBI:
+                       /* FALLTHROUGH */
+               case ESCAPE_FONTROMAN:
+                       if (0 == norecurse)
+                               print_metaf(h, esc);
+                       continue;
+               case ESCAPE_SKIPCHAR:
+                       h->flags |= HTML_SKIPCHAR;
+                       continue;
+               default:
+                       break;
+               }
+
+               if (h->flags & HTML_SKIPCHAR) {
+                       h->flags &= ~HTML_SKIPCHAR;
+                       continue;
+               }
+
+               switch (esc) {
+               case ESCAPE_UNICODE:
                        /* Skip passed "u" header. */
                        c = mchars_num2uc(seq + 1, len - 1);
                        if ('\0' != c)
                                printf("&#x%x;", c);
                        break;
                        /* Skip passed "u" header. */
                        c = mchars_num2uc(seq + 1, len - 1);
                        if ('\0' != c)
                                printf("&#x%x;", c);
                        break;
-               case (ESCAPE_NUMBERED):
+               case ESCAPE_NUMBERED:
                        c = mchars_num2char(seq, len);
                        if ('\0' != c)
                                putchar(c);
                        break;
                        c = mchars_num2char(seq, len);
                        if ('\0' != c)
                                putchar(c);
                        break;
-               case (ESCAPE_SPECIAL):
+               case ESCAPE_SPECIAL:
                        c = mchars_spec2cp(h->symtab, seq, len);
                        if (c > 0)
                                printf("&#%d;", c);
                        else if (-1 == c && 1 == len)
                                putchar((int)*seq);
                        break;
                        c = mchars_spec2cp(h->symtab, seq, len);
                        if (c > 0)
                                printf("&#%d;", c);
                        else if (-1 == c && 1 == len)
                                putchar((int)*seq);
                        break;
-               case (ESCAPE_FONT):
-                       /* FALLTHROUGH */
-               case (ESCAPE_FONTPREV):
-                       /* FALLTHROUGH */
-               case (ESCAPE_FONTBOLD):
-                       /* FALLTHROUGH */
-               case (ESCAPE_FONTITALIC):
-                       /* FALLTHROUGH */
-               case (ESCAPE_FONTROMAN):
-                       if (norecurse)
-                               break;
-                       print_metaf(h, esc);
-                       break;
-               case (ESCAPE_NOSPACE):
+               case ESCAPE_NOSPACE:
                        if ('\0' == *p)
                                nospace = 1;
                        break;
                        if ('\0' == *p)
                                nospace = 1;
                        break;
@@ -377,7 +434,6 @@ print_encode(struct html *h, const char *p, int norecurse)
        return(nospace);
 }
 
        return(nospace);
 }
 
-
 static void
 print_attr(struct html *h, const char *key, const char *val)
 {
 static void
 print_attr(struct html *h, const char *key, const char *val)
 {
@@ -386,9 +442,8 @@ print_attr(struct html *h, const char *key, const char *val)
        putchar('\"');
 }
 
        putchar('\"');
 }
 
-
 struct tag *
 struct tag *
-print_otag(struct html *h, enum htmltag tag, 
+print_otag(struct html *h, enum htmltag tag,
                int sz, const struct htmlpair *p)
 {
        int              i;
                int sz, const struct htmlpair *p)
 {
        int              i;
@@ -438,7 +493,7 @@ print_otag(struct html *h, enum htmltag tag,
 
        if (HTML_AUTOCLOSE & htmltags[tag].flags)
                switch (h->type) {
 
        if (HTML_AUTOCLOSE & htmltags[tag].flags)
                switch (h->type) {
-               case (HTML_XHTML_1_0_STRICT):
+               case HTML_XHTML_1_0_STRICT:
                        putchar('/');
                        break;
                default:
                        putchar('/');
                        break;
                default:
@@ -455,16 +510,15 @@ print_otag(struct html *h, enum htmltag tag,
        return(t);
 }
 
        return(t);
 }
 
-
 static void
 print_ctag(struct html *h, enum htmltag tag)
 {
 static void
 print_ctag(struct html *h, enum htmltag tag)
 {
-       
+
        printf("</%s>", htmltags[tag].name);
        if (HTML_CLRLINE & htmltags[tag].flags) {
                h->flags |= HTML_NOSPACE;
                putchar('\n');
        printf("</%s>", htmltags[tag].name);
        if (HTML_CLRLINE & htmltags[tag].flags) {
                h->flags |= HTML_NOSPACE;
                putchar('\n');
-       } 
+       }
 }
 
 void
 }
 
 void
@@ -475,7 +529,7 @@ print_gen_decls(struct html *h)
        const char      *name;
 
        switch (h->type) {
        const char      *name;
 
        switch (h->type) {
-       case (HTML_HTML_4_01_STRICT):
+       case HTML_HTML_4_01_STRICT:
                name = "HTML";
                doctype = "-//W3C//DTD HTML 4.01//EN";
                dtd = "http://www.w3.org/TR/html4/strict.dtd";
                name = "HTML";
                doctype = "-//W3C//DTD HTML 4.01//EN";
                dtd = "http://www.w3.org/TR/html4/strict.dtd";
@@ -488,8 +542,8 @@ print_gen_decls(struct html *h)
                break;
        }
 
                break;
        }
 
-       printf("<!DOCTYPE %s PUBLIC \"%s\" \"%s\">\n", 
-                       name, doctype, dtd);
+       printf("<!DOCTYPE %s PUBLIC \"%s\" \"%s\">\n",
+           name, doctype, dtd);
 }
 
 void
 }
 
 void
@@ -507,10 +561,20 @@ print_text(struct html *h, const char *word)
        }
 
        assert(NULL == h->metaf);
        }
 
        assert(NULL == h->metaf);
-       if (HTMLFONT_NONE != h->metac)
-               h->metaf = HTMLFONT_BOLD == h->metac ?
-                       print_otag(h, TAG_B, 0, NULL) :
-                       print_otag(h, TAG_I, 0, NULL);
+       switch (h->metac) {
+       case HTMLFONT_ITALIC:
+               h->metaf = print_otag(h, TAG_I, 0, NULL);
+               break;
+       case HTMLFONT_BOLD:
+               h->metaf = print_otag(h, TAG_B, 0, NULL);
+               break;
+       case HTMLFONT_BI:
+               h->metaf = print_otag(h, TAG_B, 0, NULL);
+               print_otag(h, TAG_I, 0, NULL);
+               break;
+       default:
+               break;
+       }
 
        assert(word);
        if ( ! print_encode(h, word, 0)) {
 
        assert(word);
        if ( ! print_encode(h, word, 0)) {
@@ -527,14 +591,13 @@ print_text(struct html *h, const char *word)
        h->flags &= ~HTML_IGNDELIM;
 }
 
        h->flags &= ~HTML_IGNDELIM;
 }
 
-
 void
 print_tagq(struct html *h, const struct tag *until)
 {
        struct tag      *tag;
 
        while ((tag = h->tags.head) != NULL) {
 void
 print_tagq(struct html *h, const struct tag *until)
 {
        struct tag      *tag;
 
        while ((tag = h->tags.head) != NULL) {
-               /* 
+               /*
                 * Remember to close out and nullify the current
                 * meta-font and table, if applicable.
                 */
                 * Remember to close out and nullify the current
                 * meta-font and table, if applicable.
                 */
@@ -550,7 +613,6 @@ print_tagq(struct html *h, const struct tag *until)
        }
 }
 
        }
 }
 
-
 void
 print_stagq(struct html *h, const struct tag *suntil)
 {
 void
 print_stagq(struct html *h, const struct tag *suntil)
 {
@@ -559,7 +621,7 @@ print_stagq(struct html *h, const struct tag *suntil)
        while ((tag = h->tags.head) != NULL) {
                if (suntil && tag == suntil)
                        return;
        while ((tag = h->tags.head) != NULL) {
                if (suntil && tag == suntil)
                        return;
-               /* 
+               /*
                 * Remember to close out and nullify the current
                 * meta-font and table, if applicable.
                 */
                 * Remember to close out and nullify the current
                 * meta-font and table, if applicable.
                 */
@@ -605,8 +667,8 @@ bufcat_fmt(struct html *h, const char *fmt, ...)
        va_list          ap;
 
        va_start(ap, fmt);
        va_list          ap;
 
        va_start(ap, fmt);
-       (void)vsnprintf(h->buf + (int)h->buflen, 
-                       BUFSIZ - h->buflen - 1, fmt, ap);
+       (void)vsnprintf(h->buf + (int)h->buflen,
+           BUFSIZ - h->buflen - 1, fmt, ap);
        va_end(ap);
        h->buflen = strlen(h->buf);
 }
        va_end(ap);
        h->buflen = strlen(h->buf);
 }
@@ -626,12 +688,12 @@ buffmt_includes(struct html *h, const char *name)
        const char      *p, *pp;
 
        pp = h->base_includes;
        const char      *p, *pp;
 
        pp = h->base_includes;
-       
+
        bufinit(h);
        while (NULL != (p = strchr(pp, '%'))) {
                bufncat(h, pp, (size_t)(p - pp));
                switch (*(p + 1)) {
        bufinit(h);
        while (NULL != (p = strchr(pp, '%'))) {
                bufncat(h, pp, (size_t)(p - pp));
                switch (*(p + 1)) {
-               case('I'):
+               case'I':
                        bufcat(h, name);
                        break;
                default:
                        bufcat(h, name);
                        break;
                default:
@@ -645,22 +707,21 @@ buffmt_includes(struct html *h, const char *name)
 }
 
 void
 }
 
 void
-buffmt_man(struct html *h, 
-               const char *name, const char *sec)
+buffmt_man(struct html *h, const char *name, const char *sec)
 {
        const char      *p, *pp;
 
        pp = h->base_man;
 {
        const char      *p, *pp;
 
        pp = h->base_man;
-       
+
        bufinit(h);
        while (NULL != (p = strchr(pp, '%'))) {
                bufncat(h, pp, (size_t)(p - pp));
                switch (*(p + 1)) {
        bufinit(h);
        while (NULL != (p = strchr(pp, '%'))) {
                bufncat(h, pp, (size_t)(p - pp));
                switch (*(p + 1)) {
-               case('S'):
+               case 'S':
                        bufcat(h, sec ? sec : "1");
                        break;
                        bufcat(h, sec ? sec : "1");
                        break;
-               case('N'):
-                       bufcat_fmt(h, name);
+               case 'N':
+                       bufcat_fmt(h, "%s", name);
                        break;
                default:
                        bufncat(h, p, 2);
                        break;
                default:
                        bufncat(h, p, 2);
A git conversion mirror of mandoc.bsd.lv