Clean-up fallout: differentiate ID's and HREF's (where to put the `#').

Make buffmt functions internally bufinit(), too.

diff --git a/html.c b/html.c
index 5203abdbfb1a0ecd65bf769500b15000c34125b8..a50d2eb03adab1d2b14a203b52204e2fccf67d91 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,4 +1,4 @@
-/*     $Id: html.c,v 1.142 2011/05/17 11:34:31 kristaps Exp $ */
+/*     $Id: html.c,v 1.143 2011/05/17 11:38:18 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>


@@ -656,6 +656,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)) {


@@ -680,7 +681,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)) {


@@ -718,8 +719,6 @@ bufcat_id(struct html *h, const char *src)
 
        /* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */
 
 
        /* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */
 

-       if (0 == h->buflen)
-               bufcat(h, "#x");

        while ('\0' != *src)
                bufcat_fmt(h, "%.2x", *src++);
 }
        while ('\0' != *src)
                bufcat_fmt(h, "%.2x", *src++);
 }

diff --git a/mdoc_html.c b/mdoc_html.c
index 1e766b04dc6cef4a0e7cabd0433b10b8b701dce4..57ebc34804d4e667fef5d2740e51fe0550e3923c 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.168 2011/05/17 11:34:31 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.169 2011/05/17 11:38:18 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -1171,6 +1171,7 @@ mdoc_sx_pre(MDOC_ARGS)
        struct htmlpair  tag[2];
 
        bufinit(h);
        struct htmlpair  tag[2];
 
        bufinit(h);

+       bufcat(h, "#x");

        for (n = n->child; n; n = n->next) {
                bufcat_id(h, n->string);
                if (n->next)
        for (n = n->child; n; n = n->next) {
                bufcat_id(h, n->string);
                if (n->next)