While I'm rooting around, note that we depend on sqlite3 now, not berkeley.

[mandoc.git] / html.c

diff --git a/html.c b/html.c
index 326df035fc443c83adaa3b25773ab43a3bb284de..115b79a0697a208e18436182407e54cc2be2ef58 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,7 +1,7 @@
-/*     $Id: html.c,v 1.150 2011/10/05 21:35:17 kristaps Exp $ */
+/*     $Id: html.c,v 1.151 2012/05/31 22:29:13 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 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


@@ -262,8 +262,8 @@ print_metaf(struct html *h, enum mandoc_esc deco)
 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


@@ -274,10 +274,21 @@ 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)) {
+       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_ERROR):
                        return(sz);
                case (ESCAPE_UNICODE):


@@ -285,15 +296,19 @@ html_strlen(const char *cp)
                case (ESCAPE_NUMBERED):
                        /* FALLTHROUGH */
                case (ESCAPE_SPECIAL):
                case (ESCAPE_NUMBERED):
                        /* FALLTHROUGH */
                case (ESCAPE_SPECIAL):

-                       sz++;
+                       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


@@ -308,6 +323,12 @@ print_encode(struct html *h, const char *p, int norecurse)
        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);


@@ -337,6 +358,31 @@ print_encode(struct html *h, const char *p, int norecurse)
                if (ESCAPE_ERROR == esc)
                        break;
 
                if (ESCAPE_ERROR == esc)
                        break;
 

+               switch (esc) {
+               case (ESCAPE_FONT):
+                       /* FALLTHROUGH */
+               case (ESCAPE_FONTPREV):
+                       /* FALLTHROUGH */
+               case (ESCAPE_FONTBOLD):
+                       /* FALLTHROUGH */
+               case (ESCAPE_FONTITALIC):
+                       /* 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. */
                switch (esc) {
                case (ESCAPE_UNICODE):
                        /* Skip passed "u" header. */


@@ -356,19 +402,6 @@ print_encode(struct html *h, const char *p, int norecurse)
                        else if (-1 == c && 1 == len)
                                putchar((int)*seq);
                        break;
                        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):
                        if ('\0' == *p)
                                nospace = 1;
                case (ESCAPE_NOSPACE):
                        if ('\0' == *p)
                                nospace = 1;