diff --git a/web/CXM_making_a_web_site.anubis b/web/CXM_making_a_web_site.anubis index e0f4a1c..6c221ea 100644 --- a/web/CXM_making_a_web_site.anubis +++ b/web/CXM_making_a_web_site.anubis @@ -3924,70 +3924,74 @@ define Printable_tree // The function below formats a datum of type 'HTML_Any($T)'. define Printable_tree - format - ( - CommonInfo cinfo, - String sn, // state_name - Var(Int) ic_v, - HTML_Any($T) element, - $T -> Printable_tree format_element, // able to format a datum of type $T - Bool is_https, - ) = - if cinfo is info(common_name,http_port,https_port,site_directory,secret) then - if element is - { - any_text(opts,t) then - ["",t,""], - any_preformated(opts,s) then - ["
",s,"
"], - //["
",s,"
"], - any_paragraph(opts,e) then - ["",format_element(e),"

\n"], - any_image(opts, url, alt) then - ["\"",alt,"\""], - any_image(opts, url, alt, w, h) then - ["\"",alt,"\""], - any_table(opts,h_row, rows, f_row) then - ["", - format(h_row, format_element), - "",format(rows,format_element),"", - format(f_row, format_element), - "\n"], - any_center(e) then - ["
",format_element(e),"
"], - any_mail_to(email,elem) then - ["",format_element(elem),""], - any_scroller(w,h,cw,ch,c) then - format_scroller(sn,w,h,cw,ch,new_idnum(ic_v),c,format_element), - any_fixed_size(w,h,c) then - with url = create_secondary_document(site_directory,secret,sn,format_element,c,w), - ["", - "secondary document", - ""], - any_fixed_size_2(w,h,fn) then - with url = fn+"?zauth="+make_authorization(site_directory,secret, - fn), - ["", - "secondary document", - ""], - any_actioner(c,t,a,an,eo,ja,fn) then - format_actioner(cinfo,sn,c,t,a,an,eo,ja,fn,is_https), - - any_foreign_link_new(target, aspect, url) then - format_foreign_link(target, aspect, url, is_https), - - any_foreign_link(options,url) then - [""], // IE7 doesn't support the form - any_foreign_link(options,url,name) then - ["",name,""], - any_private_download(url,name,extra_ext,action) then - format_private_download(cinfo,sn,url,name,extra_ext,action), - any_div(options, e) then - [format_div_option(options), format_element(e),"\n"], - any_div_empty(options) then - [format_div_option(options), "\n"], - any_coreattrs(attributs) then - [format_attrs(attributs)] + format + ( + CommonInfo cinfo, + String sn, // state_name + Var(Int) ic_v, + HTML_Any($T) element, + $T -> Printable_tree format_element, // able to format a datum of type $T + Bool is_https, + ) = + if cinfo is info(common_name,http_port,https_port,site_directory,secret) then + if element is + { + any_text(opts , t) then + if opts is + { + [] then [t], + [_ . _] then ["",t,""] + }, + any_preformated(opts,s) then + ["
",s,"
"], + //["
",s,"
"], + any_paragraph(opts,e) then + ["",format_element(e),"

\n"], + any_image(opts, url, alt) then + ["\"",alt,"\""], + any_image(opts, url, alt, w, h) then + ["\"",alt,"\""], + any_table(opts,h_row, rows, f_row) then + ["", + format(h_row, format_element), + "",format(rows,format_element),"", + format(f_row, format_element), + "\n"], + any_center(e) then + ["
",format_element(e),"
"], + any_mail_to(email,elem) then + ["",format_element(elem),""], + any_scroller(w,h,cw,ch,c) then + format_scroller(sn,w,h,cw,ch,new_idnum(ic_v),c,format_element), + any_fixed_size(w,h,c) then + with url = create_secondary_document(site_directory,secret,sn,format_element,c,w), + ["", + "secondary document", + ""], + any_fixed_size_2(w,h,fn) then + with url = fn+"?zauth="+make_authorization(site_directory,secret, + fn), + ["", + "secondary document", + ""], + any_actioner(c,t,a,an,eo,ja,fn) then + format_actioner(cinfo,sn,c,t,a,an,eo,ja,fn,is_https), + + any_foreign_link_new(target, aspect, url) then + format_foreign_link(target, aspect, url, is_https), + + any_foreign_link(options,url) then + [""], // IE7 doesn't support the form + any_foreign_link(options,url,name) then + ["",name,""], + any_private_download(url,name,extra_ext,action) then + format_private_download(cinfo,sn,url,name,extra_ext,action), + any_div(options, e) then + [format_div_option(options), format_element(e),"\n"], + any_div_empty(options) then + [format_div_option(options), "\n"], + any_coreattrs(attributs) then + [format_attrs(attributs)] }. -- libgit2 0.21.4