From e701df09a9f57ac32a3f1dc2a8f10e9b58367cd9 Mon Sep 17 00:00:00 2001
From: totoro <david.rene@rack-matrix.com>
Date: Tue, 26 Oct 2021 23:23:28 +0200
Subject: [PATCH] [-] remove unused label from HTML_Off_form. This break the type HTML_Off_form, all source use this type must be recompiled [+] add some helper in html_tag to use String directly instead of "text"

---
 web/making_a_web_site.anubis       | 33 +++++++++++++++++++++++----------
 web/types/making_a_web_site.anubis |  2 +-
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/web/making_a_web_site.anubis b/web/making_a_web_site.anubis
index 0706dbf..5a37743 100644
--- a/web/making_a_web_site.anubis
+++ b/web/making_a_web_site.anubis
@@ -1473,6 +1473,7 @@ public define HTML_Off_Form h6(HTML_Off_Form content)                           
   // <hr>
 public define HTML_Off_Form hr                                                      = html_void_tag("hr", []).
 public define HTML_Off_Form hr(List(CoreAttrs) attrs)                               = html_void_tag("hr", attrs).
+public define HTML_Off_Form hr(CoreAttrs attr)                                      = html_void_tag("hr", [attr]).
 
   // <iframe>
 public define HTML_Off_Form iframe(CoreAttrs _attr, String src, Int width, Int height) =
@@ -1521,6 +1522,9 @@ public define HTML_Off_Form label(List(CoreAttrs) attrs, List(HTML_Off_Form) con
 public define HTML_Off_Form label(CoreAttrs attr, List(HTML_Off_Form) content)          = html_tag("label", [attr], content).
 public define HTML_Off_Form label(List(HTML_Off_Form) content)                          = html_tag("label", [],     content).
 public define HTML_Off_Form label(HTML_Off_Form content)                                = html_tag("label", [],     [content]).
+public define HTML_Off_Form label(String string)                                        = html_tag("label", [],     [text(string)]).
+public define HTML_Off_Form label(CoreAttrs attr, String string)                        = html_tag("label", [attr], [text(string)]).
+public define HTML_Off_Form label(List(CoreAttrs) attrs, String string)                 = html_tag("label", attrs,  [text(string)]).
 
   // <li>
 public define HTML_Off_Form li(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("li", attrs,   content).
@@ -1528,6 +1532,9 @@ public define HTML_Off_Form li(List(CoreAttrs) attrs, HTML_Off_Form content)    
 public define HTML_Off_Form li(CoreAttrs attr, HTML_Off_Form content)               = html_tag("li", [attr],  [content]).
 public define HTML_Off_Form li(List(HTML_Off_Form) content)                         = html_tag("li", [],      content).
 public define HTML_Off_Form li(HTML_Off_Form content)                               = html_tag("li", [],      [content]).
+public define HTML_Off_Form li(String string)                                        = html_tag("li", [],     [text(string)]).
+public define HTML_Off_Form li(CoreAttrs attr, String string)                        = html_tag("li", [attr], [text(string)]).
+public define HTML_Off_Form li(List(CoreAttrs) attrs, String string)                 = html_tag("li", attrs,  [text(string)]).
 
   // <nav>
 public define HTML_Off_Form nav(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("nav", attrs, content).
@@ -1622,19 +1629,25 @@ public define HTML_Off_Form tfoot(HTML_Off_Form content)                        
 
   // <th>
 public define HTML_Off_Form th(List(CoreAttrs) attrs, List(HTML_Off_Form) content)    = html_tag("th", attrs, content).
-public define HTML_Off_Form th(List(CoreAttrs) attrs, HTML_Off_Form content)         = html_tag("th", attrs, [content]).
-public define HTML_Off_Form th(CoreAttrs attr, List(HTML_Off_Form) content)          = html_tag("th", [attr], content).
-public define HTML_Off_Form th(CoreAttrs attr, HTML_Off_Form content)                = html_tag("th", [attr], [content]).
-public define HTML_Off_Form th(List(HTML_Off_Form) content)                          = html_tag("th", [],    content).
-public define HTML_Off_Form th(HTML_Off_Form content)                                = html_tag("th", [],    [content]).
+public define HTML_Off_Form th(List(CoreAttrs) attrs, HTML_Off_Form content)          = html_tag("th", attrs, [content]).
+public define HTML_Off_Form th(CoreAttrs attr, List(HTML_Off_Form) content)           = html_tag("th", [attr], content).
+public define HTML_Off_Form th(CoreAttrs attr, HTML_Off_Form content)                 = html_tag("th", [attr], [content]).
+public define HTML_Off_Form th(List(HTML_Off_Form) content)                           = html_tag("th", [],    content).
+public define HTML_Off_Form th(HTML_Off_Form content)                                 = html_tag("th", [],    [content]).
+public define HTML_Off_Form th(String string)                                         = html_tag("th", [],     [text(string)]).
+public define HTML_Off_Form th(CoreAttrs attr, String string)                         = html_tag("th", [attr], [text(string)]).
+public define HTML_Off_Form th(List(CoreAttrs) attrs, String string)                  = html_tag("th", attrs,  [text(string)]).
 
   // <td>
-public define HTML_Off_Form td(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("td", attrs, content).
-public define HTML_Off_Form td(List(CoreAttrs) attrs, HTML_Off_Form content)         = html_tag("td", attrs, [content]).
+public define HTML_Off_Form td(List(CoreAttrs) attrs, List(HTML_Off_Form) content)   = html_tag("td", attrs,   content).
+public define HTML_Off_Form td(List(CoreAttrs) attrs, HTML_Off_Form content)         = html_tag("td", attrs,  [content]).
 public define HTML_Off_Form td(CoreAttrs attr, List(HTML_Off_Form) content)          = html_tag("td", [attr], content).
 public define HTML_Off_Form td(CoreAttrs attr, HTML_Off_Form content)                = html_tag("td", [attr], [content]).
-public define HTML_Off_Form td(List(HTML_Off_Form) content)                          = html_tag("td", [],    content).
-public define HTML_Off_Form td(HTML_Off_Form content)                                = html_tag("td", [],    [content]).
+public define HTML_Off_Form td(List(HTML_Off_Form) content)                          = html_tag("td", [],     content).
+public define HTML_Off_Form td(HTML_Off_Form content)                                = html_tag("td", [],     [content]).
+public define HTML_Off_Form td(String string)                                        = html_tag("td", [],     [text(string)]).
+public define HTML_Off_Form td(CoreAttrs attr, String string)                        = html_tag("td", [attr], [text(string)]).
+public define HTML_Off_Form td(List(CoreAttrs) attrs, String string)                 = html_tag("td", attrs,  [text(string)]).
 
   // <tr>
 public define HTML_Off_Form tr(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("tr", attrs, content).
@@ -5162,7 +5175,7 @@ define Printable_tree
          format(cinfo,ic_v,any_foreign_link(options,url,name),format_element,is_https, action_count, head_tags), 
        private_download(url,name,extra,action)     then 
          format(cinfo,ic_v,any_private_download(url,name,extra,action),format_element,is_https, action_count, head_tags),    
-       label(n)                     then ["<a name=\"",n,"\">"],
+//       label(n)                     then ["<a name=\"",n,"\">"],
        form(fn,attributs, l)        then
          [
            "<form id=\"",fn,"\"",
diff --git a/web/types/making_a_web_site.anubis b/web/types/making_a_web_site.anubis
index 995ac3f..7f61be8 100644
--- a/web/types/making_a_web_site.anubis
+++ b/web/types/making_a_web_site.anubis
@@ -459,7 +459,7 @@ public type HTML_Off_Form:
    foreign_link         (List(Text_Option), String url, String name), 
    private_download     (String abs_path, String name, String extra_ext,
                             Maybe((String,List((String,String)))) action),    
-   label                (String name),
+   //label                (String name),
    form                 (HTML_Id form_id, List(CoreAttrs), List(HTML_In_Form) content),
    form                 (HTML_Id form_id, List(CoreAttrs), 
                            WEB_Action_Name action, List((String,String)) extra_ops,
--
libgit2 0.21.4