diff --git a/web/making_a_web_site.anubis b/web/making_a_web_site.anubis
index 5ca4772..30134cd 100644
--- a/web/making_a_web_site.anubis
+++ b/web/making_a_web_site.anubis
@@ -4609,11 +4609,11 @@ define Printable_tree
}
.
-define Printable_tree // c'est le nôtre et c'est meilleur
- format
- (
- HTML_Meta m,
- ) =
+ define Printable_tree // c'est le nôtre et c'est meilleur
+ format
+ (
+ HTML_Meta m,
+ ) =
if m is
{
keywords(l) then ["\n"],
@@ -4663,6 +4663,8 @@ define Printable_tree
define Printable_tree
_format_html_head
(
+ CommonInfo cinfo,
+ Bool is_https,
List(HTML_Head_Tag) lwf,
Printable_tree so_far,
Dictionary(String, Word32) js_dict
@@ -4676,35 +4678,35 @@ define Printable_tree
if h is
{
meta(meta) then
- [format(meta) . _format_html_head(t, so_far, js_dict)],
+ [format(cinfo, meta, is_https) . _format_html_head(cinfo, is_https, t, so_far, js_dict)],
title(title) then
- ["
"+title+"\n" . _format_html_head(t, so_far, js_dict)],
+ [""+title+"\n" . _format_html_head(cinfo, is_https, t, so_far, js_dict)],
js(jsf) then
since jsf is js_file(filename, _),
if js_dict.get(filename) is
{
failure then
forget(js_dict.insert(filename, 0));
- [add_js_files([jsf]) . _format_html_head(t, so_far, js_dict)],
+ [add_js_files([jsf]) . _format_html_head(cinfo, is_https, t, so_far, js_dict)],
success(_) then
- _format_html_head(t, so_far, js_dict),
+ _format_html_head(cinfo, is_https, t, so_far, js_dict),
}
js_inline(jsi) then
if jsi is
{
script(type, _) then
- ["\n" . _format_html_head(t, so_far, js_dict)],
+ ["\n" . _format_html_head(cinfo, is_https, t, so_far, js_dict)],
}
css(cssf) then
since cssf is css_file(file_name, media),
- ["\n" . _format_html_head(t, so_far, js_dict)],
+ ["\n" . _format_html_head(cinfo, is_https, t, so_far, js_dict)],
css_inline(cssi) then
- ["\n" . _format_html_head(t, so_far, js_dict)]
+ ["\n" . _format_html_head(cinfo, is_https, t, so_far, js_dict)]
link(link_attrs) then
- ["\n" . _format_html_head(t, so_far, js_dict)]
+ ["\n" . _format_html_head(cinfo, is_https, t, so_far, js_dict)]
}
}
.
@@ -4712,19 +4714,23 @@ define Printable_tree
public define Printable_tree
format_html_head
(
+ CommonInfo cinfo,
+ Bool is_https,
List(HTML_Head_Tag) lwf,
String charset
)
=
- _format_html_head((List(HTML_Head_Tag))[ meta(http_equiv("content-type", "text/html; charset="+charset)) . lwf], [], make_dictionary((Word32)0, dictionaryComparerString)).
+ _format_html_head(cinfo, is_https, (List(HTML_Head_Tag))[ meta(http_equiv("content-type", "text/html; charset="+charset)) . lwf], [], make_dictionary((Word32)0, dictionaryComparerString)).
public define Printable_tree
format_html_head
(
+ CommonInfo cinfo,
+ Bool is_https,
List(HTML_Head_Tag) lwf
)
=
- _format_html_head(lwf, [], make_dictionary((Word32)0, dictionaryComparerString)).
+ _format_html_head(cinfo, is_https, lwf, [], make_dictionary((Word32)0, dictionaryComparerString)).
public type HTML_ajax_content:
@@ -4847,7 +4853,7 @@ public define AWP_Handler_Answer //Printable_tree
[doctype_w3c_header,
// html_header,
- "\n", format_html_head(head_tags + *p_content_head_tags, charset),"\n",
+ "\n", format_html_head(cinfo, is_https, head_tags + *p_content_head_tags, charset),"\n",
],
printable_tree([
"HTTP/1.1 " + status_string, crlf,
@@ -4866,7 +4872,7 @@ public define AWP_Handler_Answer //Printable_tree
with
answer_body_body = (Printable_tree)
[ "", // format body options
- format(cinfo,ic_v,element,is_https, var(0), p_content_head_tags),
+ format(cinfo, ic_v, element, is_https, var(0), p_content_head_tags),
"\n",
"