Index: openacs-4/packages/acs-templating/acs-templating.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/acs-templating.info,v
diff -u -r1.56.2.18 -r1.56.2.19
--- openacs-4/packages/acs-templating/acs-templating.info	15 Nov 2016 10:44:15 -0000	1.56.2.18
+++ openacs-4/packages/acs-templating/acs-templating.info	13 Feb 2017 14:27:02 -0000	1.56.2.19
@@ -9,10 +9,10 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.9.1d8" url="http://openacs.org/repository/download/apm/acs-templating-5.9.1d8.apm">
+    <version name="5.9.1d9" url="http://openacs.org/repository/download/apm/acs-templating-5.9.1d9.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Templating library.</summary>
-        <release-date>2015-10-04</release-date>
+        <release-date>2016-11-15</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/html">The templating system provides the tag library and support routines
 that allow developers and graphic designers to work
@@ -27,8 +27,9 @@
         <license>GPL version 2</license>
         <maturity>3</maturity>
 
-        <provides url="acs-templating" version="5.9.1d8"/>
+        <provides url="acs-templating" version="5.9.1d9"/>
         <requires url="acs-kernel" version="5.9.0"/>
+        <requires url="acs-tcl" version="5.9.1d15"/>
 
         <callbacks>
             <callback type="before-upgrade"  proc="template::apm::before_upgrade"/>
Index: openacs-4/packages/acs-templating/tcl/currency-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/currency-procs.tcl,v
diff -u -r1.15.2.4 -r1.15.2.5
--- openacs-4/packages/acs-templating/tcl/currency-procs.tcl	27 Nov 2016 12:19:35 -0000	1.15.2.4
+++ openacs-4/packages/acs-templating/tcl/currency-procs.tcl	13 Feb 2017 14:27:02 -0000	1.15.2.5
@@ -199,7 +199,7 @@
 
     # Erase leading zeroes from the value, but make sure that 00
     # is not completely erased
-    set value [template::util::leadingTrim $value]
+    set value [util::trim_leading_zeros $value]
 
     set format [lindex $currency_list 5]
 
Index: openacs-4/packages/acs-templating/tcl/date-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/date-procs.tcl,v
diff -u -r1.49.2.5 -r1.49.2.6
--- openacs-4/packages/acs-templating/tcl/date-procs.tcl	3 Oct 2016 18:52:07 -0000	1.49.2.5
+++ openacs-4/packages/acs-templating/tcl/date-procs.tcl	13 Feb 2017 14:27:02 -0000	1.49.2.6
@@ -88,7 +88,7 @@
     Return the specified month name (short or long)
 } {
     # trim leading zeros to avoid octal problem
-    set month [template::util::leadingTrim $month]
+    set month [util::trim_leading_zeros $month]
     if {$length eq "long"} {
         return [lc_time_fmt "2002-[format "%02d" $month]-01" "%B"]
     } else {
@@ -147,7 +147,7 @@
 
   foreach v $now {
     # trim leading zeros to avoid octal problem
-    lappend today [template::util::leadingTrim $v]
+    lappend today [util::trim_leading_zeros $v]
   }
 
   return [create {*}$today]
@@ -160,7 +160,7 @@
   set today [list]
 
   foreach v $now {
-    lappend today [template::util::leadingTrim $v]
+    lappend today [util::trim_leading_zeros $v]
   }
 
     return [create {*}$today]
@@ -443,7 +443,7 @@
 
   switch $value {
     year - month - day - hour - minutes - seconds - short_year - short_hours - ampm {
-      set value [template::util::leadingTrim $value]
+      set value [util::trim_leading_zeros $value]
     }
   }
 
@@ -490,7 +490,7 @@
       set old_date [clock format $value -format "%Y %m %d %H %M %S"]
       set new_date [list]
       foreach field $old_date {
-        lappend new_date [template::util::leadingTrim $field]
+        lappend new_date [util::trim_leading_zeros $field]
       }
       lappend new_date [lindex $date 6]
       return $new_date
@@ -499,7 +499,7 @@
       set old_format [lindex $date 6]
       set new_date [list]
       foreach fragment $value {
-        lappend new_date [template::util::leadingTrim $fragment]
+        lappend new_date [util::trim_leading_zeros $fragment]
       }
       lappend new_date $old_format
       return $new_date
@@ -569,7 +569,7 @@
 } {
   set now [list]
   foreach v [clock format [clock seconds] -format "%Y %m %d %H %M %S"] {
-      lappend now [template::util::leadingTrim $v]
+      lappend now [util::trim_leading_zeros $v]
   }
     
   # manipulate the minute value so it rounds up to nearest minute interval
@@ -603,7 +603,7 @@
 } {
   set now [list]
   foreach v [clock format [clock seconds] -format "%Y %m %d %H %M %S"] {
-      lappend now [template::util::leadingTrim $v]
+      lappend now [util::trim_leading_zeros $v]
   }
     
   # manipulate the minute value so it rounds up to nearest minute interval
@@ -705,7 +705,7 @@
   if {$value eq ""} {
     return 0
   } else {
-    return [expr {[template::util::leadingTrim $value] < 0}]
+    return [expr {[util::trim_leading_zeros $value] < 0}]
   }
 }
 
@@ -805,16 +805,11 @@
 
 }  
 
-ad_proc -public template::util::leadingTrim { value } {
+ad_proc -public -deprecated template::util::leadingTrim { value } {
     Trim the leading zeroes from the value, but preserve the value
     as "0" if it is "00"
 } {
-  set empty [string equal $value ""]
-  set value [string trimleft $value 0]
-  if { !$empty && $value eq "" } {
-    set value 0
-  }
-  return $value
+    return [util::trim_leading_zeros $value]
 }
 
 # Create an html fragment to display a numeric range widget
@@ -870,7 +865,7 @@
   upvar $element_reference element
   
   set value [template::util::date::get_property $fragment $value]
-  set value [template::util::leadingTrim $value]
+  set value [util::trim_leading_zeros $value]
 
   if { $mode ne "edit" } {
     set output {}
@@ -1026,7 +1021,7 @@
    } {
     set value $element(value)
     foreach v $value {
-      lappend trim_value [template::util::leadingTrim $v]
+      lappend trim_value [util::trim_leading_zeros $v]
     }
     set value $trim_value
   } else {