--- loncom/homework/drawimage.pm	2006/05/30 12:45:36	1.9
+++ loncom/homework/drawimage.pm	2024/04/05 22:44:19	1.13
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # programatic image drawing
 #
-# $Id: drawimage.pm,v 1.9 2006/05/30 12:45:36 www Exp $
+# $Id: drawimage.pm,v 1.13 2024/04/05 22:44:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,7 +29,10 @@
 package Apache::drawimage;
 use strict;
 use Apache::loncommon;
+use Apache::lonnet;
+use Apache::lonxml;
 use lib '/home/httpd/lib/perl/';
+use Time::HiRes qw(gettimeofday);
 use LONCAPA;
  
 
@@ -54,17 +57,43 @@ sub start_drawimage {
 sub end_drawimage {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
+    # need to call rand everytime start_script would evaluate, as the
+    # safe space rand number generator and the global rand generator
+    # are not separate
+    my $randnumber;
+    if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
+        $target eq 'answer') {
+        $randnumber=int(rand(1000));
+    }
     if ($target eq 'web' || $target eq 'tex') {
 	my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval);
 	my $height =&Apache::lonxml::get_param('height',$parstack,$safeeval);
 	my $bgcolor =&Apache::lonxml::get_param('bgcolor',$parstack,$safeeval);
 	if (!$width) { $width=300; }
 	if (!$height) { $height=300; }
-	$result.="<img width='$width' height='$height'
+        $args{"cgi.$cgi_id.BGCOLOR"}=join(':',($bgcolor));
+        if ($target eq 'tex') {
+            my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1);
+            if (!$texwidth) { $texwidth='90'; }
+            $args{"cgi.$cgi_id.SIZE"}=join(':',($width,$height,$texwidth));
+            my $tmpdir = LONCAPA::tempdir(); # Where temporary files live:
+            ## Determine filename
+            my ($seconds, $microseconds) = gettimeofday;
+            my $filename = $env{'user.name'}.'_'.$env{'user.domain'}.
+                           '_'.$seconds.'_'.$microseconds.'_'.$$.$randnumber.'_drawimage.eps';
+            $args{"cgi.$cgi_id.EPSFILE"} = $env{'user.name'}.'_'.$env{'user.domain'}.
+                                           '_'.$seconds.'_'.$microseconds.'_'.$$.$randnumber.
+                                           '_drawimage.eps';
+            $result = "%DYNAMICIMAGE:$width:$height:$texwidth\n";
+            $result .= '\graphicspath{{'.$tmpdir.'}}'."\n";
+            $result .= '\includegraphics[width='.$texwidth.' mm]{'.$filename.'}';
+            &Apache::lonxml::register_ssi('/adm/randomlabel.png?token='.$cgi_id);
+        } else {
+	    $args{"cgi.$cgi_id.SIZE"}=join(':',($width,$height));
+	    $result.="<img width='$width' height='$height'
                            src='/adm/randomlabel.png?token=$cgi_id' />\n";
-	$args{"cgi.$cgi_id.SIZE"}=join(':',($width,$height));
-	$args{"cgi.$cgi_id.BGCOLOR"}=join(':',($bgcolor));
-	&Apache::lonnet::appenv(%args);
+        }
+	&Apache::lonnet::appenv(\%args);
 	if (@cgi_ids) {
 	    $cgi_id=pop(@cgi_ids);
 	} else {
@@ -98,11 +127,12 @@ sub end_text {
         my $font  = &Apache::lonxml::get_param('font',$parstack,$safeeval);
         my $color = &Apache::lonxml::get_param('color',$parstack,$safeeval);
         my $direction = &Apache::lonxml::get_param('direction',$parstack,$safeeval);
+        my $rotation = &Apache::lonxml::get_param('rotation',$parstack,$safeeval);
 	my $text  = &Apache::lonxml::endredirection();
         $text = &escape($text);
         $args{"cgi.$cgi_id.OBJTYPE"}.='LABEL:';
 	my $i=$args{"cgi.$cgi_id.OBJCOUNT"}++;
-	$args{"cgi.$cgi_id.OBJ$i"}=join(':',($x,$y,$text,$font,$color,$direction));
+	$args{"cgi.$cgi_id.OBJ$i"}=join(':',($x,$y,$text,$font,$color,$direction,$rotation));
     }
     return $result;
 }
@@ -210,7 +240,7 @@ sub start_polygon {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     &Apache::lonxml::register('Apache::drawimage',('point'));
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'tex') {
 	undef(@polygon);
     }
     return $result;
@@ -219,7 +249,7 @@ sub start_polygon {
 sub end_polygon {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;    
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'tex') {
 	my $color=&Apache::lonxml::get_param('color',$parstack,$safeeval);
 	my $filled=&Apache::lonxml::get_param('filled',$parstack,$safeeval);
 	my $open=&Apache::lonxml::get_param('open',$parstack,$safeeval);
@@ -237,7 +267,7 @@ sub end_polygon {
 sub start_point {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'tex') {
 	my $x = &Apache::lonxml::get_param('x',$parstack,$safeeval);
         my $y = &Apache::lonxml::get_param('y',$parstack,$safeeval);
 	push (@polygon,"($x,$y)");