diff --git a/lib/templates/www b/lib/templates/www index 4313d2a..9482ada 100755 --- a/lib/templates/www +++ b/lib/templates/www @@ -133,16 +133,15 @@ function __generate_html() { end=' ' } -function __update_html() { - html="$html" +function __before_write_html() { + doctype="$doctype" } function __write_html() { # $file et $mode doivent ĂȘtre initialisĂ©s check_overwrite "$1" || return estep "$(ppath "$file")" - echo >"$file" "${doctype:+$doctype -}$html + echo >"$file" "$doctype$html $head ${blueprint:+$blueprint }${jquery:+$jquery @@ -166,8 +165,7 @@ function generate_html() { local jquery="$jquery" local html head start startbp endbp end __generate_html - __update_html - + __before_write_html __write_html [ -n "$2" ] && array_add "$2" "$file" @@ -191,8 +189,7 @@ function generate_javadoc_package() { local jquery= local html head start startbp endbp end __generate_html - __update_html - + __before_write_html __write_html [ -n "$2" ] && array_add "$2" "$file" @@ -216,8 +213,7 @@ function generate_javadoc_overview() { local jquery= local html head start startbp endbp end __generate_html - __update_html - + __before_write_html __write_html [ -n "$2" ] && array_add "$2" "$file" @@ -238,8 +234,8 @@ function generate_php() { local html head start startbp endbp end __generate_html doctype="$doctype" - +?>${doctype:+$doctype +}" __write_html [ -n "$2" ] && array_add "$2" "$file"