[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /xml londefdef.pm

raeburn raeburn@source.lon-capa.org
Tue, 02 Feb 2010 15:34:58 -0000


raeburn		Tue Feb  2 15:34:58 2010 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom/xml	londefdef.pm 
  Log:
  - Backport 1.414, 1.415.
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.403 loncom/xml/londefdef.pm:1.403.4.1
--- loncom/xml/londefdef.pm:1.403	Sat May  2 22:16:58 2009
+++ loncom/xml/londefdef.pm	Tue Feb  2 15:34:58 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.403 2009/05/02 22:16:58 foxr Exp $
+# $Id: londefdef.pm,v 1.403.4.1 2010/02/02 15:34:58 raeburn Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -4721,7 +4721,7 @@
     #    Even though we set a default alignment value, the user
     #    could have given us an illegal value.  In that case we
     #    just use the default alignment of bottom..
-    $currentstring = "\n% figurewrapping \n";
+    $currentstring = '';
     if      ($align eq "top")    {
 	$currentstring .= '\raisebox{-'.$height.'mm}{'.$image;
 	$closure = '}';
@@ -4764,8 +4764,6 @@
 	$currentstring .= "{$image";
 	$closure       = '}';
     }
-    $currentstring .= "\n% end wrappage\n";
-    $closure        = "\n% Begin closure\n".$closure."\n% End closure\n";
     return ($currentstring, $closure);
 }
 
@@ -4785,8 +4783,7 @@
 #
 #   This sub provides the typical LaTeX prefix matter for tex output:
 #
-sub latex_header
-{
+sub latex_header {
     my ($mode) = @_;
     my $currentstring = '';