Keep words after .Ic together in a single argument.

[mandoc.git] / html.c

diff --git a/html.c b/html.c
index b884dab103a22225c8e81adddfccb59a5385357d..30ed53e4dfe93d6e03d770d18898b4cb8ac561bd 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,6 +1,7 @@
-/*     $Id: html.c,v 1.125 2011/01/13 14:30:13 kristaps Exp $ */
+/*     $Id: html.c,v 1.153 2014/01/05 19:10:56 joerg Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011, 2012, 2013 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


@@ -30,8 +31,8 @@
 #include <unistd.h>
 
 #include "mandoc.h"
 #include <unistd.h>
 
 #include "mandoc.h"

+#include "libmandoc.h"

 #include "out.h"
 #include "out.h"

-#include "chars.h"

 #include "html.h"
 #include "main.h"
 
 #include "html.h"
 #include "main.h"
 


@@ -93,40 +94,44 @@ static      const char      *const htmlattrs[ATTR_MAX] = {
        "colspan", /* ATTR_COLSPAN */
 };
 
        "colspan", /* ATTR_COLSPAN */
 };
 

-static void              print_spec(struct html *, enum roffdeco,
-                               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_doctype(struct html *);
-static void              print_xmltype(struct html *);
-static int               print_encode(struct html *, const char *, int);
-static void              print_metaf(struct html *, enum roffdeco);
-static void              print_attr(struct html *, 
-                               const char *, const char *);
-static void             *ml_alloc(char *, enum htmltype);
+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 */
+};

 
 

+static void     bufncat(struct html *, const char *, size_t);
+static void     print_ctag(struct html *, enum htmltag);
+static int      print_encode(struct html *, const char *, int);
+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 *
 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 = calloc(1, sizeof(struct html));
-       if (NULL == h) {
-               perror(NULL);
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
+       h = mandoc_calloc(1, sizeof(struct html));

 
        h->type = type;
        h->tags.head = NULL;
 
        h->type = type;
        h->tags.head = NULL;

-       h->symtab = chars_init(CHARS_HTML);
+       h->symtab = mchars_alloc();

 
        while (outopts && *outopts)
                switch (getsubopt(&outopts, UNCONST(toks), &v)) {
 
        while (outopts && *outopts)
                switch (getsubopt(&outopts, UNCONST(toks), &v)) {


@@ -139,6 +144,9 @@ ml_alloc(char *outopts, enum htmltype type)
                case (2):
                        h->base_includes = v;
                        break;
                case (2):
                        h->base_includes = v;
                        break;

+               case (3):
+                       h->oflags |= HTML_FRAGMENT;
+                       break;

                default:
                        break;
                }
                default:
                        break;
                }


@@ -176,7 +184,7 @@ html_free(void *p)
        }
        
        if (h->symtab)
        }
        
        if (h->symtab)

-               chars_free(h->symtab);
+               mchars_free(h->symtab);

 
        free(h);
 }
 
        free(h);
 }


@@ -212,62 +220,27 @@ print_gen_head(struct html *h)
        }
 }
 
        }
 }
 

-
-static void
-print_spec(struct html *h, enum roffdeco d, const char *p, size_t len)
-{
-       int              cp;
-       const char      *rhs;
-       size_t           sz;
-
-       if ((cp = chars_spec2cp(h->symtab, p, len)) > 0) {
-               printf("&#%d;", cp);
-               return;
-       } else if (-1 == cp && DECO_SSPECIAL == d) {
-               fwrite(p, 1, len, stdout);
-               return;
-       } else if (-1 == cp)
-               return;
-
-       if (NULL != (rhs = chars_spec2str(h->symtab, p, len, &sz)))
-               fwrite(rhs, 1, sz, stdout);
-}
-
-

 static void
 static void

-print_res(struct html *h, const char *p, size_t len)
-{
-       int              cp;
-       const char      *rhs;
-       size_t           sz;
-
-       if ((cp = chars_res2cp(h->symtab, p, len)) > 0) {
-               printf("&#%d;", cp);
-               return;
-       } else if (-1 == cp)
-               return;
-
-       if (NULL != (rhs = chars_res2str(h->symtab, p, len, &sz)))
-               fwrite(rhs, 1, sz, stdout);
-}
-
-
-static void
-print_metaf(struct html *h, enum roffdeco deco)
+print_metaf(struct html *h, enum mandoc_esc deco)

 {
        enum htmlfont    font;
 
        switch (deco) {
 {
        enum htmlfont    font;
 
        switch (deco) {

-       case (DECO_PREVIOUS):
+       case (ESCAPE_FONTPREV):

                font = h->metal;
                break;
                font = h->metal;
                break;

-       case (DECO_ITALIC):
+       case (ESCAPE_FONTITALIC):

                font = HTMLFONT_ITALIC;
                break;
                font = HTMLFONT_ITALIC;
                break;

-       case (DECO_BOLD):
+       case (ESCAPE_FONTBOLD):

                font = HTMLFONT_BOLD;
                break;
                font = HTMLFONT_BOLD;
                break;

-       case (DECO_ROMAN):
+       case (ESCAPE_FONTBI):
+               font = HTMLFONT_BI;
+               break;
+       case (ESCAPE_FONT):
+               /* FALLTHROUGH */
+       case (ESCAPE_FONTROMAN):

                font = HTMLFONT_NONE;
                break;
        default:
                font = HTMLFONT_NONE;
                break;
        default:


@@ -283,83 +256,174 @@ print_metaf(struct html *h, enum roffdeco 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)
+{
+       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):
+                       /* FALLTHROUGH */
+               case (ESCAPE_NUMBERED):
+                       /* FALLTHROUGH */
+               case (ESCAPE_SPECIAL):
+                       if (skip)
+                               skip = 0;
+                       else
+                               sz++;
+                       break;
+               case (ESCAPE_SKIPCHAR):
+                       skip = 1;
+                       break;
+               default:
+                       break;
+               }
+       }
+       return(sz);
+}

 
 static int
 print_encode(struct html *h, const char *p, int norecurse)
 {
        size_t           sz;
 
 static int
 print_encode(struct html *h, const char *p, int norecurse)
 {
        size_t           sz;

-       int              len, nospace;
+       int              c, len, nospace;

        const char      *seq;
        const char      *seq;

-       enum roffdeco    deco;
+       enum mandoc_esc  esc;

        static const char rejs[6] = { '\\', '<', '>', '&', ASCII_HYPH, '\0' };
 
        nospace = 0;
 
        static const char rejs[6] = { '\\', '<', '>', '&', ASCII_HYPH, '\0' };
 
        nospace = 0;
 

-       for (; *p; p++) {
+       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);

-               p += /* LINTED */
-                       sz;
+               p += (int)sz;
+
+               if ('\0' == *p)
+                       break;

 
 

-               if ('<' == *p) {
+               switch (*p++) {
+               case ('<'):

                        printf("&lt;");
                        continue;
                        printf("&lt;");
                        continue;

-               } else if ('>' == *p) {
+               case ('>'):

                        printf("&gt;");
                        continue;
                        printf("&gt;");
                        continue;

-               } else if ('&' == *p) {
+               case ('&'):

                        printf("&amp;");
                        continue;
                        printf("&amp;");
                        continue;

-               } else if (ASCII_HYPH == *p) {
-                       /*
-                        * Note: "soft hyphens" aren't graphically
-                        * displayed when not breaking the text; we want
-                        * them to be displayed.
-                        */
-                       /*printf("&#173;");*/
+               case (ASCII_HYPH):

                        putchar('-');
                        continue;
                        putchar('-');
                        continue;

-               } else if ('\0' == *p)
+               default:

                        break;
                        break;

+               }

 
 

-               seq = ++p;
-               len = a2roffdeco(&deco, &seq, &sz);
-
-               switch (deco) {
-               case (DECO_RESERVED):
-                       print_res(h, seq, sz);
+               esc = mandoc_escape(&p, &seq, &len);
+               if (ESCAPE_ERROR == esc)

                        break;
                        break;

-               case (DECO_SSPECIAL):
+
+               switch (esc) {
+               case (ESCAPE_FONT):

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (DECO_SPECIAL):
-                       print_spec(h, deco, seq, sz);
-                       break;
-               case (DECO_PREVIOUS):
+               case (ESCAPE_FONTPREV):

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (DECO_BOLD):
+               case (ESCAPE_FONTBOLD):

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (DECO_ITALIC):
+               case (ESCAPE_FONTITALIC):

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

-               case (DECO_ROMAN):
-                       if (norecurse)
-                               break;
-                       print_metaf(h, deco);
-                       break;
+               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;
                }
 
                default:
                        break;
                }
 

-               p += len - 1;
+               if (h->flags & HTML_SKIPCHAR) {
+                       h->flags &= ~HTML_SKIPCHAR;
+                       continue;
+               }

 
 

-               if (DECO_NOSPACE == deco && '\0' == *(p + 1))
-                       nospace = 1;
+               switch (esc) {
+               case (ESCAPE_UNICODE):
+                       /* Skip passed "u" header. */
+                       c = mchars_num2uc(seq + 1, len - 1);
+                       if ('\0' != c)
+                               printf("&#x%x;", c);
+                       break;
+               case (ESCAPE_NUMBERED):
+                       c = mchars_num2char(seq, len);
+                       if ('\0' != c)
+                               putchar(c);
+                       break;
+               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;
+               case (ESCAPE_NOSPACE):
+                       if ('\0' == *p)
+                               nospace = 1;
+                       break;
+               default:
+                       break;
+               }

        }
 
        return(nospace);
        }
 
        return(nospace);


@@ -385,11 +449,7 @@ print_otag(struct html *h, enum htmltag tag,
        /* Push this tags onto the stack of open scopes. */
 
        if ( ! (HTML_NOSTACK & htmltags[tag].flags)) {
        /* Push this tags onto the stack of open scopes. */
 
        if ( ! (HTML_NOSTACK & htmltags[tag].flags)) {

-               t = malloc(sizeof(struct tag));
-               if (NULL == t) {
-                       perror(NULL);
-                       exit((int)MANDOCLEVEL_SYSERR);
-               }
+               t = mandoc_malloc(sizeof(struct tag));

                t->tag = tag;
                t->next = h->tags.head;
                h->tags.head = t;
                t->tag = tag;
                t->next = h->tags.head;
                h->tags.head = t;


@@ -426,7 +486,7 @@ print_otag(struct html *h, enum htmltag tag,
                print_attr(h, "lang", "en");
        }
 
                print_attr(h, "lang", "en");
        }
 

-       /* Accomodate for XML "well-formed" singleton escaping. */
+       /* Accommodate for XML "well-formed" singleton escaping. */

 
        if (HTML_AUTOCLOSE & htmltags[tag].flags)
                switch (h->type) {
 
        if (HTML_AUTOCLOSE & htmltags[tag].flags)
                switch (h->type) {


@@ -459,27 +519,8 @@ print_ctag(struct html *h, enum htmltag tag)
        } 
 }
 
        } 
 }
 

-

 void
 print_gen_decls(struct html *h)
 void
 print_gen_decls(struct html *h)

-{
-
-       print_xmltype(h);
-       print_doctype(h);
-}
-
-
-static void
-print_xmltype(struct html *h)
-{
-
-       if (HTML_XHTML_1_0_STRICT == h->type)
-               puts("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-}
-
-
-static void
-print_doctype(struct html *h)

 {
        const char      *doctype;
        const char      *dtd;
 {
        const char      *doctype;
        const char      *dtd;


@@ -492,6 +533,7 @@ print_doctype(struct html *h)
                dtd = "http://www.w3.org/TR/html4/strict.dtd";
                break;
        default:
                dtd = "http://www.w3.org/TR/html4/strict.dtd";
                break;
        default:

+               puts("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");

                name = "html";
                doctype = "-//W3C//DTD XHTML 1.0 Strict//EN";
                dtd = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";
                name = "html";
                doctype = "-//W3C//DTD XHTML 1.0 Strict//EN";
                dtd = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";


@@ -502,35 +544,10 @@ print_doctype(struct html *h)
                        name, doctype, dtd);
 }
 
                        name, doctype, dtd);
 }
 

-

 void
 print_text(struct html *h, const char *word)
 {
 
 void
 print_text(struct html *h, const char *word)
 {
 

-       if (word[0] && '\0' == word[1])
-               switch (word[0]) {
-               case('.'):
-                       /* FALLTHROUGH */
-               case(','):
-                       /* FALLTHROUGH */
-               case(';'):
-                       /* FALLTHROUGH */
-               case(':'):
-                       /* FALLTHROUGH */
-               case('?'):
-                       /* FALLTHROUGH */
-               case('!'):
-                       /* FALLTHROUGH */
-               case(')'):
-                       /* FALLTHROUGH */
-               case(']'):
-                       if ( ! (HTML_IGNDELIM & h->flags))
-                               h->flags |= HTML_NOSPACE;
-                       break;
-               default:
-                       break;
-               }
-

        if ( ! (HTML_NOSPACE & h->flags)) {
                /* Manage keeps! */
                if ( ! (HTML_KEEP & h->flags)) {
        if ( ! (HTML_NOSPACE & h->flags)) {
                /* Manage keeps! */
                if ( ! (HTML_KEEP & h->flags)) {


@@ -542,15 +559,27 @@ 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);
 
        assert(word);

-       if ( ! print_encode(h, word, 0))
+       if ( ! print_encode(h, word, 0)) {

                if ( ! (h->flags & HTML_NONOSPACE))
                        h->flags &= ~HTML_NOSPACE;
                if ( ! (h->flags & HTML_NONOSPACE))
                        h->flags &= ~HTML_NOSPACE;

+       } else
+               h->flags |= HTML_NOSPACE;

 
        if (h->metaf) {
                print_tagq(h, h->metaf);
 
        if (h->metaf) {
                print_tagq(h, h->metaf);


@@ -558,21 +587,6 @@ print_text(struct html *h, const char *word)
        }
 
        h->flags &= ~HTML_IGNDELIM;
        }
 
        h->flags &= ~HTML_IGNDELIM;

-
-       /* 
-        * Note that we don't process the pipe: the parser sees it as
-        * punctuation, but we don't in terms of typography.
-        */
-       if (word[0] && '\0' == word[1])
-               switch (word[0]) {
-               case('('):
-                       /* FALLTHROUGH */
-               case('['):
-                       h->flags |= HTML_NOSPACE;
-                       break;
-               default:
-                       break;
-               }

 }
 
 
 }
 
 


@@ -621,7 +635,6 @@ print_stagq(struct html *h, const struct tag *suntil)
        }
 }
 
        }
 }
 

-

 void
 bufinit(struct html *h)
 {
 void
 bufinit(struct html *h)
 {


@@ -630,28 +643,26 @@ bufinit(struct html *h)
        h->buflen = 0;
 }
 
        h->buflen = 0;
 }
 

-

 void
 bufcat_style(struct html *h, const char *key, const char *val)
 {
 
        bufcat(h, key);
 void
 bufcat_style(struct html *h, const char *key, const char *val)
 {
 
        bufcat(h, key);

-       bufncat(h, ":", 1);
+       bufcat(h, ":");

        bufcat(h, val);
        bufcat(h, val);

-       bufncat(h, ";", 1);
+       bufcat(h, ";");

 }
 
 }
 

-

 void
 bufcat(struct html *h, const char *p)
 {
 
 void
 bufcat(struct html *h, const char *p)
 {
 

-       bufncat(h, p, strlen(p));
+       h->buflen = strlcat(h->buf, p, BUFSIZ);
+       assert(h->buflen < BUFSIZ);

 }
 
 }
 

-

 void
 void

-buffmt(struct html *h, const char *fmt, ...)
+bufcat_fmt(struct html *h, const char *fmt, ...)

 {
        va_list          ap;
 
 {
        va_list          ap;
 


@@ -662,19 +673,15 @@ buffmt(struct html *h, const char *fmt, ...)
        h->buflen = strlen(h->buf);
 }
 
        h->buflen = strlen(h->buf);
 }
 

-
-void
+static void

 bufncat(struct html *h, const char *p, size_t sz)
 {
 
 bufncat(struct html *h, const char *p, size_t sz)
 {
 

-       if (h->buflen + sz > BUFSIZ - 1)
-               sz = BUFSIZ - 1 - h->buflen;
-
-       (void)strncat(h->buf, p, sz);
+       assert(h->buflen + sz + 1 < BUFSIZ);
+       strncat(h->buf, p, sz);

        h->buflen += sz;
 }
 
        h->buflen += sz;
 }
 

-

 void
 buffmt_includes(struct html *h, const char *name)
 {
 void
 buffmt_includes(struct html *h, const char *name)
 {


@@ -682,6 +689,7 @@ buffmt_includes(struct html *h, const char *name)
 
        pp = h->base_includes;
        
 
        pp = h->base_includes;
        

+       bufinit(h);

        while (NULL != (p = strchr(pp, '%'))) {
                bufncat(h, pp, (size_t)(p - pp));
                switch (*(p + 1)) {
        while (NULL != (p = strchr(pp, '%'))) {
                bufncat(h, pp, (size_t)(p - pp));
                switch (*(p + 1)) {


@@ -698,7 +706,6 @@ buffmt_includes(struct html *h, const char *name)
                bufcat(h, pp);
 }
 
                bufcat(h, pp);
 }
 

-

 void
 buffmt_man(struct html *h, 
                const char *name, const char *sec)
 void
 buffmt_man(struct html *h, 
                const char *name, const char *sec)


@@ -707,7 +714,7 @@ buffmt_man(struct html *h,
 
        pp = h->base_man;
        
 
        pp = h->base_man;
        

-       /* LINTED */
+       bufinit(h);

        while (NULL != (p = strchr(pp, '%'))) {
                bufncat(h, pp, (size_t)(p - pp));
                switch (*(p + 1)) {
        while (NULL != (p = strchr(pp, '%'))) {
                bufncat(h, pp, (size_t)(p - pp));
                switch (*(p + 1)) {


@@ -715,7 +722,7 @@ buffmt_man(struct html *h,
                        bufcat(h, sec ? sec : "1");
                        break;
                case('N'):
                        bufcat(h, sec ? sec : "1");
                        break;
                case('N'):

-                       buffmt(h, name);
+                       bufcat_fmt(h, "%s", name);

                        break;
                default:
                        bufncat(h, p, 2);
                        break;
                default:
                        bufncat(h, p, 2);


@@ -727,85 +734,24 @@ buffmt_man(struct html *h,
                bufcat(h, pp);
 }
 
                bufcat(h, pp);
 }
 

-

 void
 bufcat_su(struct html *h, const char *p, const struct roffsu *su)
 {
        double           v;
 void
 bufcat_su(struct html *h, const char *p, const struct roffsu *su)
 {
        double           v;

-       const char      *u;

 
        v = su->scale;
 
        v = su->scale;

+       if (SCALE_MM == su->unit && 0.0 == (v /= 100.0))
+               v = 1.0;

 
 

-       switch (su->unit) {
-       case (SCALE_CM):
-               u = "cm";
-               break;
-       case (SCALE_IN):
-               u = "in";
-               break;
-       case (SCALE_PC):
-               u = "pc";
-               break;
-       case (SCALE_PT):
-               u = "pt";
-               break;
-       case (SCALE_EM):
-               u = "em";
-               break;
-       case (SCALE_MM):
-               if (0 == (v /= 100))
-                       v = 1;
-               u = "em";
-               break;
-       case (SCALE_EN):
-               u = "ex";
-               break;
-       case (SCALE_BU):
-               u = "ex";
-               break;
-       case (SCALE_VS):
-               u = "em";
-               break;
-       default:
-               u = "ex";
-               break;
-       }
-
-       /* 
-        * XXX: the CSS spec isn't clear as to which types accept
-        * integer or real numbers, so we just make them all decimals.
-        */
-       buffmt(h, "%s: %.2f%s;", p, v, u);
+       bufcat_fmt(h, "%s: %.2f%s;", p, v, roffscales[su->unit]);

 }
 
 }
 

-

 void
 void

-html_idcat(char *dst, const char *src, int sz)
+bufcat_id(struct html *h, const char *src)

 {
 {

-       int              ssz;
-
-       assert(sz > 2);

 
        /* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */
 
 
        /* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */
 

-       /* We can't start with a number (bah). */
-
-       if ('#' == *dst) {
-               dst++;
-               sz--;
-       }
-       if ('\0' == *dst) {
-               *dst++ = 'x';
-               *dst = '\0';
-               sz--;
-       }
-
-       for ( ; *dst != '\0' && sz; dst++, sz--)
-               /* Jump to end. */ ;
-
-       for ( ; *src != '\0' && sz > 1; src++) {
-               ssz = snprintf(dst, (size_t)sz, "%.2x", *src);
-               sz -= ssz;
-               dst += ssz;
-       }
+       while ('\0' != *src)
+               bufcat_fmt(h, "%.2x", *src++);

 }
 }