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

[raeburn]

raeburn		Wed Jul  3 22:44:22 2024 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/xml	londefdef.pm 
  Log:
  - For 2.11
    Backport 1.470, 1.471
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.456.2.6 loncom/xml/londefdef.pm:1.456.2.7
--- loncom/xml/londefdef.pm:1.456.2.6	Tue Dec 14 21:10:40 2021
+++ loncom/xml/londefdef.pm	Wed Jul  3 22:44:22 2024
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.456.2.6 2021/12/14 21:10:40 raeburn Exp $
+# $Id: londefdef.pm,v 1.456.2.7 2024/07/03 22:44:22 raeburn Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -3267,12 +3267,12 @@
     return $currentstring;
 }
 
-#-- <blankspace heigth="">
+#-- <blankspace height="">
 sub start_blankspace {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = &end_p();	# closes off any unclosed <p>
     if ($target eq 'tex') {
-	my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval,undef,1);
+	my $howmuch = &Apache::lonxml::get_param('height',$parstack,$safeeval,undef,1);
 	$currentstring .= '\vskip '.$howmuch.' ';
     }
     return $currentstring;
@@ -4278,10 +4278,10 @@
 	    $height_param=$TeXwidth/$old_width_param*$height_param;
 	}
     } elsif ($TeXheight) {
-	$height_param = $TeXheight;
 	if ($height_param) {
 	    $width_param  = $TeXheight/$height_param*$width_param;
 	}
+	$height_param = $TeXheight;
     } elsif ($width) {
 	my $old_width_param=$width_param;
 	$width_param = $width*$scaling;