From cf3d74aa716d1916209c4bcd7985e99aa7aae20e Mon Sep 17 00:00:00 2001
From: librasteve <librasteve@furnival.net>
Date: Mon, 22 Jul 2024 21:42:51 +0100
Subject: [PATCH] ok no inner

---
 bin/synopsis-rahx |  7 +++----
 lib/HTMX.rakumod  | 16 ++++++++--------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/bin/synopsis-rahx b/bin/synopsis-rahx
index ceccd87..8f776ed 100755
--- a/bin/synopsis-rahx
+++ b/bin/synopsis-rahx
@@ -3,14 +3,13 @@ use v6.d;
 
 use HTMX;
 
-put +list-tags;
-put +list-singulars;
-put +list-regulars;
+
 
 
 say h1('text', :class<jumbotron>);
+say h1 :class<doobie>;
 
-say div (:class<jumbotron>, <xx>);
+say div :class<jumbotron>, 'xx';
 
 
 
diff --git a/lib/HTMX.rakumod b/lib/HTMX.rakumod
index 90f078e..35d7bd2 100644
--- a/lib/HTMX.rakumod
+++ b/lib/HTMX.rakumod
@@ -6,7 +6,7 @@ constant term:<¶> = $?NL;
 
 #viz. https://www.w3schools.com/tags/default.asp
 
-constant @tags = <a abbr address area article aside audio b base bdi bdo blockquote body br
+constant @all-tags = <a abbr address area article aside audio b base bdi bdo blockquote body br
     button canvas caption cite code col colgroup data datalist dd del details dfn dialog div
     dl dt em embed fieldset figcaption figure footer form h1 h2 h3 h4 h5 h6 head header hgroup
     hr html i iframe img input ins kbd label legend li link main map mark menu meta meter nav
@@ -17,28 +17,28 @@ constant @tags = <a abbr address area article aside audio b base bdi bdo blockqu
 #of which "empty" / "singular" tags from https://www.tutsinsider.com/html/html-empty-elements/
 constant @singular-tags = <area base br col embed hr img input link meta param source track wbr>;
 
-my @regular-tags = ( @tags.Set (-) @singular-tags.Set ).List;
+my @regular-tags = (@all-tags.Set (-) @singular-tags.Set ).List;
 
-sub list-tags is export { @tags.sort }
+sub list-tags is export {@all-tags.sort }
 sub list-singulars is export { @singular-tags.sort }
 sub list-regulars is export { @regular-tags.sort }
 
 # Export them so that `h1("text")` makes `<h1>text</h1>` and so on
 # eg sub h1(Str $inner) {do-tag 'h1', $inner}
 
-sub do-tag( $tag, $inner, *%h ) {
+sub do-tag( $tag, $inner?, *%h ) {
 
-    my Str $attrs = (+%h ?? ' ' !! '') ~ %h.map({ .key ~ '="' ~ .value ~ '"'  }).join(' ');
+    my $attrs = +%h ?? (' ' ~ %h.map({.key ~ '="' ~ .value ~ '"'}).join(' ') ) !! '';
 
-    '<' ~ $tag ~ $attrs ~ '>' ~ $inner ~ '</' ~ $tag ~ '>'
+    '<' ~ $tag ~ $attrs ~ '>' ~ ($inner // '') ~ '</' ~ $tag ~ '>'
 }
 
 # put in all the tags programmatically
 # viz. https://docs.raku.org/language/modules#Exporting_and_selective_importing
 
 my package EXPORT::DEFAULT {
-    for @tags -> $tag {
-        OUR::{'&' ~ $tag} := sub ($inner, *%h) { do-tag( "$tag", $inner, |%h ) }
+    for @all-tags -> $tag {
+        OUR::{'&' ~ $tag} := sub ($inner?, *%h) { do-tag( "$tag", $inner, |%h ) }
     }
 }