Backport from xs.

html.c

@@ -999,12 +999,15 @@ static xs_html *html_button(char *clss, char *label, char *hint)
 {
     xs *c = xs_fmt("snac-btn-%s", clss);
 
-    return xs_html_sctag("input",
+    /* use an NULL tag to separate non-css-classed buttons from one another */
+    return xs_html_tag(NULL,
+        xs_html_sctag("input",
             xs_html_attr("type",    "submit"),
             xs_html_attr("name",    "action"),
             xs_html_attr("class",   c),
             xs_html_attr("value",   label),
-        xs_html_attr("title",   hint));
+            xs_html_attr("title",   hint)),
+        xs_html_text("\n"));
 }
 
 

xs_html.h

@@ -169,6 +169,9 @@ static xs_html *_xs_html_tag_t(xs_html_type type, char *tag, xs_html *var[])
     xs_html *a = XS_HTML_NEW();
 
     a->type = type;
+
+    /* a tag can be NULL, to be a kind of 'wrapper' */
+    if (tag)
         a->content = xs_dup(tag);
 
     _xs_html_add(a, var);
@@ -197,6 +200,7 @@ void xs_html_render_f(xs_html *h, FILE *f)
     switch (h->type) {
     case XS_HTML_TAG:
     case XS_HTML_SCTAG:
+        if (h->content)
             fprintf(f, "<%s", h->content);
 
         /* render the attributes */
@@ -209,9 +213,11 @@ void xs_html_render_f(xs_html *h, FILE *f)
 
         if (h->type == XS_HTML_SCTAG) {
             /* self-closing tags should not have subtags */
-            fprintf(f, "/>\n");
+            if (h->content)
+                fprintf(f, "/>");
         }
         else {
+            if (h->content)
                 fprintf(f, ">");
 
             /* render the subtags */
@@ -222,6 +228,7 @@ void xs_html_render_f(xs_html *h, FILE *f)
                 st = nst;
             }
 
+            if (h->content)
                 fprintf(f, "</%s>", h->content);
         }
 

xs_version.h

@@ -1 +1 @@
-/* 8994b1ef8501039ec97a388680ee361138e34554 2023-11-27T11:45:06+01:00 */
+/* b26300d01136fad22ee774d20a7da5b299f30d13 2023-12-03T11:38:09+01:00 */