Diff for /loncom/xml/lontable.pm between versions 1.19 and 1.21

version 1.19, 2011/04/19 22:30:42 version 1.21, 2011/11/30 18:01:33
Line 1 Line 1
   
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 #  Generating TeX tables.  #  Generating TeX tables.
 #  #
Line 8 Line 7
 # Copyright Michigan State University Board of Trustees  # Copyright Michigan State University Board of Trustees
 #  #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).  # 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.  # (at your option) any later version.
 #  #
 # LON-CAPA is distributed in the hope that it will be useful,  # LON-CAPA is distributed in the hope that it will be useful,
Line 54  package Apache::lontable; Line 57  package Apache::lontable;
 use strict;  use strict;
 use Apache::lonlatextable;  use Apache::lonlatextable;
 use Apache::lonnet; # for trace logging.  use Apache::lonnet; # for trace logging.
 use Data::Dumper;  
   
 my $tracing = 0; # Set to 1 to enable log tracing. 2 for local sub tracing.  my $tracing = 0; # Set to 1 to enable log tracing. 2 for local sub tracing.
   
Line 1094  sub generate { Line 1096  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:  #  Private methods:
 #  #

Removed from v.1.19  
changed lines
  Added in v.1.21


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>