From 272e47b262435cb4b6080c7cdf924e56ea62aa67 Mon Sep 17 00:00:00 2001
From: totoro <david.rene@rack-matrix.com>
Date: Sun, 12 Dec 2021 00:59:17 +0100
Subject: [PATCH] remove some alternative from HTML_Off_Form to move it as html_tag or some are completely removed due to their useless preformated move to html_tag pre progress move to html_tag progress center removed mail_to removed scroller removed fixed_size removed fixed_size_2 removed

---
 web/controllers_web_site.anubis    |  6 +++---
 web/making_a_web_site.anubis       | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
 web/types/making_a_web_site.anubis | 18 +++++++++---------
 3 files changed, 68 insertions(+), 43 deletions(-)

diff --git a/web/controllers_web_site.anubis b/web/controllers_web_site.anubis
index f1de826..eff966e 100644
--- a/web/controllers_web_site.anubis
+++ b/web/controllers_web_site.anubis
@@ -151,9 +151,9 @@ define HTTP_Answer
       
       // content of page
       sequence([
-        preformated([size(14)],"Anubis Web Server - Standard Lib v1.19.0.0 - Anubis language v1.19"),
-        preformated([size(12)],"Error "+to_String(http_status)),
-        preformated([size(12)],"Internal message :"+message),
+        pre("Anubis Web Server - Standard Lib v1.19.0.0 - Anubis language v1.19"),
+        pre("Error "+to_String(http_status)),
+        pre("Internal message :"+message),
         br,
         in_form(html_Id(""),text_area(wan(""), init(dump(_session)), 120, 60))
       ])
diff --git a/web/making_a_web_site.anubis b/web/making_a_web_site.anubis
index a261611..e4803b7 100644
--- a/web/making_a_web_site.anubis
+++ b/web/making_a_web_site.anubis
@@ -680,6 +680,7 @@ public define Printable_tree [WebArgValue  x . Printable_tree y] = str_pt(x.valu
 public define Printable_tree [InitialValue x . Printable_tree y] = str_pt(x.value, y).
 
 public define CoreAttrs   attr(String name, Bool value) = attr(name, if value then "true" else "false").
+public define CoreAttrs   attr(String name, Int value)  = attr(name, to_String(value)).
 
 
 public define InputAttrs   attr(String name, Bool value) = attr(name, if value then "true" else "false").
@@ -1566,6 +1567,27 @@ public define HTML_Off_Form p(CoreAttrs attr, HTML_Off_Form content)            
 public define HTML_Off_Form p(List(HTML_Off_Form) content)                                = html_tag("p", [],    content).
 public define HTML_Off_Form p(HTML_Off_Form content)                                      = html_tag("p", [],    [content]).
 
+  // <pre>  preformatted
+public define HTML_Off_Form pre(List(CoreAttrs) attrs, List(HTML_Off_Form) content)         = html_tag("pre", attrs, content).
+public define HTML_Off_Form pre(List(CoreAttrs) attrs, HTML_Off_Form content)               = html_tag("pre", attrs, [content]).
+public define HTML_Off_Form pre(CoreAttrs attr, List(HTML_Off_Form) content)                = html_tag("pre", [attr], content).
+public define HTML_Off_Form pre(CoreAttrs attr, HTML_Off_Form content)                      = html_tag("pre", [attr], [content]).
+public define HTML_Off_Form pre(List(HTML_Off_Form) content)                                = html_tag("pre", [],    content).
+public define HTML_Off_Form pre(HTML_Off_Form content)                                      = html_tag("pre", [],    [content]).
+public define HTML_Off_Form pre(String string)                                              = html_tag("pre", [],     [text(string)]).
+public define HTML_Off_Form pre(CoreAttrs attr, String string)                              = html_tag("pre", [attr], [text(string)]).
+public define HTML_Off_Form pre(List(CoreAttrs) attrs, String string)                       = html_tag("pre", attrs,  [text(string)]).
+
+  // <progress>
+public define HTML_Off_Form progress(List(CoreAttrs) attrs, Int value, Int max, List(HTML_Off_Form) content)  = html_tag("progress", [attr("value", value), attr("max", max) . attrs],  content).
+public define HTML_Off_Form progress(List(CoreAttrs) attrs, Int value, Int max, HTML_Off_Form content)        = html_tag("progress", [attr("value", value), attr("max", max) . attrs],  [content]).
+public define HTML_Off_Form progress(CoreAttrs _attr, Int value, Int max, HTML_Off_Form content)               = html_tag("progress", [attr("value", value), attr("max", max) , _attr],   [content]).
+public define HTML_Off_Form progress(Int value, Int max, HTML_Off_Form content)                               = html_tag("progress", [attr("value", value), attr("max", max)], [content]).
+public define HTML_Off_Form progress(List(CoreAttrs) attrs, Int value, Int max, String content)               = html_tag("progress", [attr("value", value), attr("max", max) . attrs], [text(content)]).
+public define HTML_Off_Form progress(CoreAttrs _attr, Int value, Int max, String content)                      = html_tag("progress", [attr("value", value), attr("max", max), _attr], [text(content)]).
+public define HTML_Off_Form progress(Int value, Int max, String content)                                      = html_tag("progress", [attr("value", value), attr("max", max)], [text(content)]).
+
+
   // <section>
 public define HTML_Off_Form section(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("section", attrs, content).
 public define HTML_Off_Form section(List(CoreAttrs) attrs, HTML_Off_Form content)        = html_tag("section", attrs, [content]).
@@ -1643,23 +1665,26 @@ public define HTML_Off_Form th(CoreAttrs attr, String 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(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(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)]).
+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(CoreAttrs) attrs, String string)                  = html_tag("td", attrs,  [text(string)]).
+public define HTML_Off_Form td(CoreAttrs attr, String string)                         = html_tag("td", [attr], [text(string)]).
+public define HTML_Off_Form td(String string)                                         = html_tag("td", [],     [text(string)]).
+public define HTML_Off_Form td(List(CoreAttrs) attrs, Int i)                          = html_tag("td", attrs,  [text(to_decimal(i))]).
+public define HTML_Off_Form td(CoreAttrs attr, Int i)                                 = html_tag("td", [attr], [text(to_decimal(i))]).
+public define HTML_Off_Form td(Int i)                                                 = html_tag("td", [],     [text(to_decimal(i))]).
 
   // <tr>
-public define HTML_Off_Form tr(List(CoreAttrs) attrs, List(HTML_Off_Form) content)  = html_tag("tr", attrs, content).
-public define HTML_Off_Form tr(List(CoreAttrs) attrs, HTML_Off_Form content)         = html_tag("tr", attrs, [content]).
-public define HTML_Off_Form tr(CoreAttrs attr, List(HTML_Off_Form) content)          = html_tag("tr", [attr], content).
-public define HTML_Off_Form tr(CoreAttrs attr, HTML_Off_Form content)                = html_tag("tr", [attr], [content]).
-public define HTML_Off_Form tr(List(HTML_Off_Form) content)                          = html_tag("tr", [],    content).
-public define HTML_Off_Form tr(HTML_Off_Form content)                                = html_tag("tr", [],    [content]).
+public define HTML_Off_Form tr(List(CoreAttrs) attrs, List(HTML_Off_Form) content)    = html_tag("tr", attrs, content).
+public define HTML_Off_Form tr(List(CoreAttrs) attrs, HTML_Off_Form content)          = html_tag("tr", attrs, [content]).
+public define HTML_Off_Form tr(CoreAttrs attr, List(HTML_Off_Form) content)           = html_tag("tr", [attr], content).
+public define HTML_Off_Form tr(CoreAttrs attr, HTML_Off_Form content)                 = html_tag("tr", [attr], [content]).
+public define HTML_Off_Form tr(List(HTML_Off_Form) content)                           = html_tag("tr", [],    content).
+public define HTML_Off_Form tr(HTML_Off_Form content)                                 = html_tag("tr", [],    [content]).
 
 
   // <textarea>
@@ -1755,8 +1780,8 @@ public define HTML_Off_Form
   form(html_Id(form_name), options, action_name(action), extra_ops, contents).
   
 public define HTML_Off_Form literal(Printable_tree t) = literal_pt(t). 
-public define HTML_Off_Form fixed_size(HTML_Size width, HTML_Size height, String name_of_HTML_file)
-   = fixed_size_2(width,height,name_of_HTML_file). 
+//public define HTML_Off_Form fixed_size(HTML_Size width, HTML_Size height, String name_of_HTML_file)
+//   = fixed_size_2(width,height,name_of_HTML_file). 
 
    
 public define HTML_Off_Form
@@ -2156,7 +2181,7 @@ public define HTTP_Answer
       ],
       
       // content of page
-      center(text(name+" Controller error"))
+      text(name+" Controller error")
     )
   )
 .
@@ -5103,8 +5128,8 @@ define Printable_tree
        sequence(l)                  then flat(map(format_element,l)),
        text(opts,t)                 then 
          format(cinfo,ic_v,any_text(opts,t),format_element,is_https, action_count, head_tags), 
-       preformated(o,s)             then 
-         format(cinfo,ic_v,any_preformated(o,s),format_element,is_https, action_count, head_tags), 
+//       preformated(o,s)             then 
+//         format(cinfo,ic_v,any_preformated(o,s),format_element,is_https, action_count, head_tags), 
 //       paragraph(opts,t)            then 
 //         format(cinfo,ic_v,any_paragraph(opts,t),format_element,is_https, action_count, head_tags), 
 //       image(opts,url,alt)          then 
@@ -5113,16 +5138,16 @@ define Printable_tree
 //         format(cinfo,ic_v,any_image(opts,url,alt,w,h),format_element,is_https, action_count, head_tags), 
        table(opts,header_row, rows, footer_row) then 
          format(cinfo,ic_v,any_table(opts,header_row, rows, footer_row),format_element,is_https, action_count, head_tags), 
-       center(e)                    then 
-         format(cinfo,ic_v,any_center(e),format_element,is_https, action_count, head_tags), 
-       mail_to(a,e)                 then
-         format(cinfo,ic_v,any_mail_to(a,e),format_element,is_https, action_count, head_tags), 
-       scroller(w,h,cw,ch,c)        then 
-         format(cinfo,ic_v,any_scroller(w,h,cw,ch,c),format_element,is_https, action_count, head_tags), 
-       fixed_size(w,h,c)            then 
-         format(cinfo,ic_v,any_fixed_size(w,h,c),format_element,is_https, action_count, head_tags), 
-       fixed_size_2(w,h,fn)           then 
-         format(cinfo,ic_v,any_fixed_size_2(w,h,fn),format_element,is_https, action_count, head_tags), 
+//       center(e)                    then 
+//         format(cinfo,ic_v,any_center(e),format_element,is_https, action_count, head_tags), 
+//       mail_to(a,e)                 then
+//         format(cinfo,ic_v,any_mail_to(a,e),format_element,is_https, action_count, head_tags), 
+//       scroller(w,h,cw,ch,c)        then 
+//         format(cinfo,ic_v,any_scroller(w,h,cw,ch,c),format_element,is_https, action_count, head_tags), 
+//       fixed_size(w,h,c)            then 
+//         format(cinfo,ic_v,any_fixed_size(w,h,c),format_element,is_https, action_count, head_tags), 
+//       fixed_size_2(w,h,fn)           then 
+//         format(cinfo,ic_v,any_fixed_size_2(w,h,fn),format_element,is_https, action_count, head_tags), 
        actioner(c,t,a,an,eo,ja)     then 
          format(cinfo,ic_v,any_actioner(c,t,a,an,eo,ja,failure),format_element,is_https, action_count, head_tags), 
        actioner(c,t,a,an,eo,ja,fn)  then 
@@ -5200,7 +5225,7 @@ define Printable_tree
           head_tags <- *head_tags + tags;          
           format(cinfo, ic_v, html_elements, is_https, action_count, head_tags),
 //       br                               then ["<br>"],
-       progress(options, value, max)    then ["<progress max=\"",value,"\" value=\"",max,"\"",format_attrs(options),"></progress>"],
+//       progress(options, value, max)    then ["<progress max=\"",max,"\" value=\"",value,"\"",format_attrs(options),"></progress>"],
 //       ol(opts, t)            then 
 //         format(cinfo,ic_v,any_ol(opts,t),format_element,is_https, action_count, head_tags), 
 //       ul(opts, t)            then 
diff --git a/web/types/making_a_web_site.anubis b/web/types/making_a_web_site.anubis
index 7f61be8..3cd494b 100644
--- a/web/types/making_a_web_site.anubis
+++ b/web/types/making_a_web_site.anubis
@@ -439,15 +439,15 @@ public type HTML_Off_Form:
    literal               (String),
    sequence              (List(HTML_Off_Form) items), 
    text                  (List(CoreAttrs), String the_text), 
-   preformated          (List(Text_Option), String), 
+//   preformated          (List(Text_Option), String), 
    table                 (List(Table_Option), HTML_Header_Row(HTML_Off_Form), List(HTML_Row(HTML_Off_Form)), HTML_Footer_Row(HTML_Off_Form)), 
-   center                (HTML_Off_Form),
-   mail_to               (String email, HTML_Off_Form element), 
-   scroller              (Int width, Int height, 
-                          Int content_width, Int content_height,
-                          HTML_Off_Form content), 
-   fixed_size            (HTML_Size width, HTML_Size height, HTML_Off_Form content), 
-   fixed_size_2          (HTML_Size width, HTML_Size height, String name_of_HTML_file), 
+   //center                (HTML_Off_Form),
+//   mail_to               (String email, HTML_Off_Form element), 
+//   scroller              (Int width, Int height, 
+//                          Int content_width, Int content_height,
+//                          HTML_Off_Form content), 
+   //fixed_size            (HTML_Size width, HTML_Size height, HTML_Off_Form content), 
+   //fixed_size_2          (HTML_Size width, HTML_Size height, String name_of_HTML_file), 
    actioner              (Actioner_Connection, Actioner_Target, Actioner_Aspect, 
                           WEB_Action_Name action_name, List((String,String)) extra_ops, 
                           List(Actioner_Local_Action)), 
@@ -472,7 +472,7 @@ public type HTML_Off_Form:
                            List(JS_File)    /*js_files*/,
                            HTML_Body        /*body*/),
   partial               (HTML_Partial_Content),
-  progress              (List(CoreAttrs), Int value, Int max),
+  //progress              (List(CoreAttrs), Int value, Int max),
   i                     (List(CoreAttrs), String text),
   html_tag              (String tag_name, List(CoreAttrs), List(HTML_Off_Form) content),
   html_void_tag         (String tag_name, List(CoreAttrs))
--
libgit2 0.21.4