Fixed \c support for all input and output modes (documented in mandoc_char.7).

[mandoc.git] / html.c

diff --git a/html.c b/html.c
index 33c37bb7d7eb3bdcc5172d582cba6c25f63ee98e..f1a256f1c6674b51d905705c8328dceea97b13d7 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,4 +1,4 @@
-/*     $Id: html.c,v 1.77 2009/11/01 08:15:20 kristaps Exp $ */
+/*     $Id: html.c,v 1.84 2009/11/12 08:21:05 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -66,7 +66,7 @@ static        const struct htmldata htmltags[TAG_MAX] = {
        {"base",        HTML_CLRLINE | HTML_NOSTACK}, /* TAG_BASE */
 };
 
-static const char       *const htmlattrs[ATTR_MAX] = {
+static const char      *const htmlattrs[ATTR_MAX] = {
        "http-equiv",
        "content",
        "name",
@@ -87,6 +87,13 @@ static       const char       *const htmlattrs[ATTR_MAX] = {
 extern int               getsubopt(char **, char * const *, char **);
 #endif
 
+
+static void              print_spec(struct html *, const char *, size_t);
+static void              print_res(struct html *, const char *, size_t);
+static void              print_ctag(struct html *, enum htmltag);
+static void              print_encode(struct html *, const char *);
+
+
 void *
 html_alloc(char *outopts)
 {
@@ -186,12 +193,12 @@ print_gen_head(struct html *h)
 
 
 static void
-print_spec(struct html *h, const char *p, int len)
+print_spec(struct html *h, const char *p, size_t len)
 {
        const char      *rhs;
        size_t           sz;
 
-       rhs = chars_a2ascii(h->symtab, p, (size_t)len, &sz);
+       rhs = chars_a2ascii(h->symtab, p, len, &sz);
 
        if (NULL == rhs) 
                return;
@@ -200,12 +207,12 @@ print_spec(struct html *h, const char *p, int len)
 
 
 static void
-print_res(struct html *h, const char *p, int len)
+print_res(struct html *h, const char *p, size_t len)
 {
        const char      *rhs;
        size_t           sz;
 
-       rhs = chars_a2res(h->symtab, p, (size_t)len, &sz);
+       rhs = chars_a2res(h->symtab, p, len, &sz);
 
        if (NULL == rhs)
                return;
@@ -213,129 +220,51 @@ print_res(struct html *h, const char *p, int len)
 }
 
 
-static void
-print_escape(struct html *h, const char **p)
-{
-       int              j, type;
-       const char      *wp;
-
-       wp = *p;
-       type = 1;
-
-       if (0 == *(++wp)) {
-               *p = wp;
-               return;
-       }
-
-       if ('(' == *wp) {
-               wp++;
-               if (0 == *wp || 0 == *(wp + 1)) {
-                       *p = 0 == *wp ? wp : wp + 1;
-                       return;
-               }
-
-               print_spec(h, wp, 2);
-               *p = ++wp;
-               return;
-
-       } else if ('*' == *wp) {
-               if (0 == *(++wp)) {
-                       *p = wp;
-                       return;
-               }
-
-               switch (*wp) {
-               case ('('):
-                       wp++;
-                       if (0 == *wp || 0 == *(wp + 1)) {
-                               *p = 0 == *wp ? wp : wp + 1;
-                               return;
-                       }
-
-                       print_res(h, wp, 2);
-                       *p = ++wp;
-                       return;
-               case ('['):
-                       type = 0;
-                       break;
-               default:
-                       print_res(h, wp, 1);
-                       *p = wp;
-                       return;
-               }
-       
-       } else if ('f' == *wp) {
-               if (0 == *(++wp)) {
-                       *p = wp;
-                       return;
-               }
-
-               switch (*wp) {
-               case ('B'):
-                       /* TODO */
-                       break;
-               case ('I'):
-                       /* TODO */
-                       break;
-               case ('P'):
-                       /* FALLTHROUGH */
-               case ('R'):
-                       /* TODO */
-                       break;
-               default:
-                       break;
-               }
-
-               *p = wp;
-               return;
-
-       } else if ('[' != *wp) {
-               print_spec(h, wp, 1);
-               *p = wp;
-               return;
-       }
-
-       wp++;
-       for (j = 0; *wp && ']' != *wp; wp++, j++)
-               /* Loop... */ ;
-
-       if (0 == *wp) {
-               *p = wp;
-               return;
-       }
-
-       if (type)
-               print_spec(h, wp - j, j);
-       else
-               print_res(h, wp - j, j);
-
-       *p = wp;
-}
-
-
 static void
 print_encode(struct html *h, const char *p)
 {
        size_t           sz;
+       int              len;
+       const char      *seq;
+       enum roffdeco    deco;
 
        for (; *p; p++) {
                sz = strcspn(p, "\\<>&");
 
                fwrite(p, 1, sz, stdout);
-               p += sz;
+               p += /* LINTED */
+                       sz;
 
-               if ('\\' == *p) {
-                       print_escape(h, &p);
+               if ('<' == *p) {
+                       printf("&lt;");
+                       continue;
+               } else if ('>' == *p) {
+                       printf("&gt;");
+                       continue;
+               } else if ('&' == *p) {
+                       printf("&amp;");
                        continue;
                } else if ('\0' == *p)
                        break;
 
-               if ('<' == *p)
-                       printf("&lt;");
-               else if ('>' == *p)
-                       printf("&gt;");
-               else if ('&' == *p)
-                       printf("&amp;");
+               seq = ++p;
+               len = a2roffdeco(&deco, &seq, &sz);
+
+               switch (deco) {
+               case (DECO_RESERVED):
+                       print_res(h, seq, sz);
+                       break;
+               case (DECO_SPECIAL):
+                       print_spec(h, seq, sz);
+                       break;
+               default:
+                       break;
+               }
+
+               p += len - 1;
+
+               if (DECO_NOSPACE == deco && '\0' == *(p + 1))
+                       h->flags |= HTML_NOSPACE;
        }
 }
 
@@ -361,16 +290,16 @@ print_otag(struct html *h, enum htmltag tag,
 
        if ( ! (HTML_NOSPACE & h->flags))
                if ( ! (HTML_CLRLINE & htmltags[tag].flags))
-                       printf(" ");
+                       putchar(' ');
 
        printf("<%s", htmltags[tag].name);
        for (i = 0; i < sz; i++) {
                printf(" %s=\"", htmlattrs[p[i].key]);
                assert(p->val);
                print_encode(h, p[i].val);
-               printf("\"");
+               putchar('\"');
        }
-       printf(">");
+       putchar('>');
 
        h->flags |= HTML_NOSPACE;
        if (HTML_CLRLINE & htmltags[tag].flags)
@@ -391,7 +320,7 @@ print_ctag(struct html *h, enum htmltag tag)
        if (HTML_CLRLINE & htmltags[tag].flags) {
                h->flags |= HTML_NOSPACE;
                h->flags |= HTML_NEWLINE;
-               printf("\n");
+               putchar('\n');
        } else
                h->flags &= ~HTML_NEWLINE;
 }
@@ -437,7 +366,7 @@ print_text(struct html *h, const char *p)
                }
 
        if ( ! (h->flags & HTML_NOSPACE))
-               printf(" ");
+               putchar(' ');
 
        h->flags &= ~HTML_NOSPACE;
        h->flags &= ~HTML_NEWLINE;