Merge pull request #316 from Alex-Jordan/image-aspect-ratio

allow omission of height from image subroutine and preserve aspect ratio
openwebwork · Aug 2, 2017 · a140ed5 · a140ed5
2 parents f5957ff + 27e1f7c
commit a140ed5
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/macros/PGbasicmacros.pl b/macros/PGbasicmacros.pl
@@ -2689,7 +2689,7 @@ sub image {
 	my %in_options = @opt;
 	my %known_options = (
 		width    => 100,
-		height   => 100,
+		height   => '',
 		tex_size => 800,
 		extra_html_tags => '',
 	);
@@ -2709,6 +2709,11 @@ sub image {
 	my $width_ratio = $tex_size*(.001);
 	my @image_list  = ();
 
+    # if height was explicitly given, create string for height attribute to be used in HTML, LaTeX2HTML
+    # otherwise omit a height attribute and allow the browser to use aspect ratio preservation
+    my $height_attrib = '';
+    $height_attrib = qq{height = "$height"} if ($height);
+
  	if (ref($image_ref) =~ /ARRAY/ ) {
 		@image_list = @{$image_ref};
  	} else {
@@ -2741,7 +2746,7 @@ sub image {
 			}
 		} elsif ($displayMode eq 'Latex2HTML') {
 			my $wid = ($envir->{onTheFlyImageSize} || 0)+ 30;
-			$out = qq!\\begin{rawhtml}\n<A HREF= "$imageURL" TARGET="_blank" onclick="window.open(this.href,this.target, 'width=$wid,height=$wid,scrollbars=yes,resizable=on'); return false;"><IMG SRC="$imageURL"  WIDTH="$width" HEIGHT="$height"></A>\n
+			$out = qq!\\begin{rawhtml}\n<A HREF= "$imageURL" TARGET="_blank" onclick="window.open(this.href,this.target, 'width=$wid,height=$wid,scrollbars=yes,resizable=on'); return false;"><IMG SRC="$imageURL"  WIDTH="$width" $height_attrib></A>\n
 			\\end{rawhtml}\n !
  		} elsif ($displayMode eq 'HTML_MathJax'
 	 || $displayMode eq 'HTML_dpng'
@@ -2754,7 +2759,7 @@ sub image {
 			my $wid = ($envir->{onTheFlyImageSize} || 0) +30;
  			$out = qq!<A HREF= "$imageURL" TARGET="_blank" 
  			         onclick="window.open(this.href,this.target, 'width=$wid,height=$wid,scrollbars=yes,resizable=on'); return false;">
- 			         <IMG SRC="$imageURL"  WIDTH="$width" HEIGHT="$height" $out_options{extra_html_tags} >
+ 			         <IMG SRC="$imageURL"  WIDTH="$width" $height_attrib $out_options{extra_html_tags} >
  			         </A>
  			!
  		} else {