Index: openacs-4/packages/xotcl-core/xotcl-core.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/xotcl-core.info,v
diff -u -r1.92.2.16 -r1.92.2.17
--- openacs-4/packages/xotcl-core/xotcl-core.info	31 Aug 2016 11:55:53 -0000	1.92.2.16
+++ openacs-4/packages/xotcl-core/xotcl-core.info	10 Sep 2016 10:05:06 -0000	1.92.2.17
@@ -10,10 +10,10 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xotcl</auto-mount>
 
-    <version name="0.149" url="http://media.wu-wien.ac.at/download/xotcl-core-0.149.apm">
+    <version name="0.150" url="http://media.wu-wien.ac.at/download/xotcl-core-0.150.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>XOTcl library functionality (e.g. thread handling, online documentation, Generic Form and List Classes)</summary>
-        <release-date>2016-08-31</release-date>
+        <release-date>2016-09-10</release-date>
         <vendor url="http://wu.ac.at">WU Vienna</vendor>
         <description format="text/html">&lt;pre&gt;
 This component contains some core functionality for OpenACS
@@ -43,7 +43,7 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xotcl-core" version="0.149"/>
+        <provides url="xotcl-core" version="0.150"/>
 	<requires url="acs-kernel" version="5.9.0"/>
 	<requires url="acs-api-browser" version="5.9.1d1"/>
 	<requires url="acs-content-repository" version="5.9.1d10"/>
Index: openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl,v
diff -u -r1.57.2.6 -r1.57.2.7
--- openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl	25 May 2016 19:27:50 -0000	1.57.2.6
+++ openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl	10 Sep 2016 10:05:07 -0000	1.57.2.7
@@ -955,8 +955,6 @@
   #
   # templating and CSS
   #
-  set use_template_head 1
-
   Class create Page
   Page proc requireCSS {{-order 1} name} {
     set ::_xo_need_css($name) [expr {[array size ::_xo_need_css]+1000*$order}]
@@ -969,12 +967,7 @@
     set ::_xo_need_js($name)  1
   }
   Page proc requireLink {-rel -type -title -href} {
-    if {$::xo::use_template_head} {
-      template::head::add_link -rel $rel -href $href -type $type -title $title
-    } else {
-      set key "rel='[ns_quotehtml $rel]' type='[ns_quotehtml $type]' title='[ns_quotehtml $title]' href='[ns_quotehtml $href]'"
-      set ::_xo_need_link($key) 1
-    }
+    template::head::add_link -rel $rel -href $href -type $type -title $title
   }
   Page proc set_property {name element value} {
     set ::xo_property_${name}($element) $value
@@ -998,59 +991,31 @@
   }
 
   Page proc header_stuff {} {
-    set result ""
-    if {$::xo::use_template_head} {
-      foreach style [my sort_keys_by_value [array get ::_xo_need_style]] {
-        template::head::add_style -style $style
-      }
-      set count 10
-      foreach file [my sort_keys_by_value [array get ::_xo_need_css]] {
-        template::head::add_css -href $file -media all -order [incr count]
-      }
-      if {[info exists ::_xo_js_order]} {
-        set statements ""
-        set order 10
-        foreach file $::_xo_js_order {
-          if {[string match "*;*" $file]} {
-            # it is not a file, but some javascipt statements
-            #append statements [string map {< "&lt;" > "&gt;"} $file] \n
-            append statements $file \n
-          } else {
-            template::head::add_script -src $file -type text/javascript -order [incr order]
-          }
-        }
-        if {$statements ne ""} {
-          template::head::add_script -script $statements -type text/javascript -order [incr order]
-        }
-      }
 
-      
-    } else {
-      foreach link [array names ::_xo_need_link] {
-        append result "<link $link>\n"
-      }
-      foreach style [my sort_keys_by_value [array get ::_xo_need_style]] {
-        append result "<style type='text/css'>$style</style>\n"
-      }
-      foreach file [my sort_keys_by_value [array get ::_xo_need_css]] {
-        append result "<link type='text/css' rel='stylesheet' href='$file' media='all' >\n"
-      }
-      if {[info exists ::_xo_js_order]} {
-        set statements ""
-        foreach file $::_xo_js_order {
-          if {[string match "*;*" $file]} {
-            # it is not a file, but some javascipt statements
-            append statements $file \n
-          } else {
-            append result "<script src='$file' type='text/javascript'></script>\n"
-          }
+    foreach style [my sort_keys_by_value [array get ::_xo_need_style]] {
+      template::head::add_style -style $style
+    }
+    set count 10
+    foreach file [my sort_keys_by_value [array get ::_xo_need_css]] {
+      template::head::add_css -href $file -media all -order [incr count]
+    }
+    if {[info exists ::_xo_js_order]} {
+      set statements ""
+      set order 10
+      foreach file $::_xo_js_order {
+        if {[string match "*;*" $file]} {
+          # it is not a file, but some javascipt statements
+          #append statements [string map {< "&lt;" > "&gt;"} $file] \n
+          append statements $file \n
+        } else {
+          template::head::add_script -src $file -type text/javascript -order [incr order]
         }
-        if {$statements ne ""} {
-          append result \n "<script type='text/javascript' >$statements</script>\n"
-        }
       }
+      if {$statements ne ""} {
+        template::head::add_script -script $statements -type text/javascript -order [incr order]
+      }
     }
-    return $result
+    return ""
   }
 }
 ::xo::library source_dependent