--- loncom/homework/default_homework.lcpm	2012/11/21 23:22:43	1.162
+++ loncom/homework/default_homework.lcpm	2014/06/16 16:52:50	1.164
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # used by lonxml::xmlparse() as input variable $safeinit to Apache::run::run()
 #
-# $Id: default_homework.lcpm,v 1.162 2012/11/21 23:22:43 raeburn Exp $
+# $Id: default_homework.lcpm,v 1.164 2014/06/16 16:52:50 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1033,6 +1033,17 @@ sub format_significant_figures {
     $number = abs($number);
     # needed to correct for a number greater than 1 (or
     my $power = ($number < 1) ? 0 : 1;
+    if ($power && $number =~ /^\d+$/) {
+        my $nonzeros = $number;
+        $nonzeros =~ s/0+$//;
+        if (length($number) - length($nonzeros) > 1) {
+            # convert to exponential form
+            my $n = $sig-1;
+            my $numSig = sprintf('%.' . $n . 'E', $number);
+            # return number with sign
+            return $sign.$numSig;
+        }
+    }
     # could round up. Take the integer part of log10.
     my $x10 = int(log($number)/log(10));
     # find number with values left of decimal pt = # of sign figs.
@@ -1197,10 +1208,18 @@ sub sec {
 }
 
 sub submission {
-   my ($partid,$responseid,$subnumber)=@_;
+   my ($partid,$responseid,$subnumber,$encode)=@_;
    my $sub='';
    if ($subnumber) { $sub=$subnumber.':'; }
-   return &EXT('user.resource.'.$sub.'resource.'.$partid.'.'.$responseid.'.submission');
+   my $output =
+       &EXT('user.resource.'.$sub.'resource.'.$partid.'.'.$responseid.'.submission');
+   if ($encode) {
+       $output =~ s/&/&amp;/g;
+       $output =~ s/</&lt;/g;
+       $output =~ s/>/&gt;/g;
+       $output =~ s/"/&quot;/g;
+   };
+   return $output;
 }
 
 sub currentpart {