--- loncom/xml/lontable.pm	2011/04/19 22:30:42	1.19
+++ loncom/xml/lontable.pm	2014/12/15 00:52:40	1.22
@@ -1,13 +1,16 @@
-
 # The LearningOnline Network with CAPA
 #  Generating TeX tables.
 #
-# $Id: lontable.pm,v 1.19 2011/04/19 22:30:42 foxr Exp $
+# $Id: lontable.pm,v 1.22 2014/12/15 00:52:40 raeburn Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # LON-CAPA is distributed in the hope that it will be useful,
@@ -54,7 +57,6 @@ package Apache::lontable;
 use strict;
 use Apache::lonlatextable;
 use Apache::lonnet;		# for trace logging.
-use Data::Dumper;
 
 my $tracing = 0;		# Set to 1 to enable log tracing. 2 for local sub tracing.
 
@@ -274,7 +276,7 @@ sub new {
 
     };
 
-    foreach my $key (keys %$configuration) {
+    foreach my $key (keys(%$configuration)) {
 	$self->{$key} = $$configuration{$key};
     }
 
@@ -498,7 +500,7 @@ sub start_row {
     # Override the defaults if the config hash is present:
 
     if (defined($config)) {
-	foreach my $key  (keys %$config) {
+	foreach my $key  (keys(%$config)) {
 	    $row_hash->{$key} = $config->{$key};
 	}
     }
@@ -581,7 +583,7 @@ sub configure_row {
     }
     
     my $row = $self->{'rows'}->{$self->{'part'}}->[-1];
-    foreach my $config_item (keys %$config) {
+    foreach my $config_item (keys(%$config)) {
 	$row->{$config_item} = $config->{$config_item};
     }
 }
@@ -994,7 +996,7 @@ sub generate {
 
 	my $specified_width = 0.0;
 	my $specified_cols   = 0;
-	foreach my $col (keys %$colwidths) {
+	foreach my $col (keys(%$colwidths)) {
 	    $specified_width = $specified_width + $colwidths->{$col};
 	    $specified_cols++;
 	}
@@ -1024,7 +1026,7 @@ sub generate {
 	    $default_width = ($tablewidth/$unspecified_cols);                     # 'fair' default width.
 	    my $width_remaining = $tablewidth - $default_width*$unspecified_cols; # What's left for the specified cols.
 	    my $reduction       = $tablewidth/$width_remaining;                    # Reduction fraction for specified cols
-	    foreach my $col (keys %$colwidths) {
+	    foreach my $col (keys(%$colwidths)) {
 		$colwidths->{$col} = $colwidths->{$col}/$reduction;
 	    }
 	    
@@ -1094,32 +1096,6 @@ sub generate {
 
 
 #---------------------------------------------------------------------------
-#
-#  Private methods:
-#
-
-# 
-# Convert size with units -> size in cm.
-# The resulting size is floating point with no  units so that it can be used in
-# computation.  Note that an illegal or missing unit is treated silently as
-#  cm for now.
-#
-sub size_to_cm {
-    my ($this, $size_spec) = @_;
-    my ($size, $units) = split(/ /, $size_spec);
-    if (lc($units) eq 'mm') {
-	return $size / 10.0;
-    }
-    if (lc($units) eq 'in') {
-	return $size * 2.54;
-    }
-    
-    return $size;		# Default is cm.
-} 
-
-
-
-#---------------------------------------------------------------------------
 #
 #  Private methods:
 #