--- loncom/homework/chemresponse.pm	2003/10/16 20:16:42	1.16
+++ loncom/homework/chemresponse.pm	2003/10/18 07:24:35	1.19
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # chemical equation style response
 #
-# $Id: chemresponse.pm,v 1.16 2003/10/16 20:16:42 albertel Exp $
+# $Id: chemresponse.pm,v 1.19 2003/10/18 07:24:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -143,12 +143,10 @@ sub start_organicresponse {
 	$result .='</nobr><br />';
 	$result .=&Apache::edit::checked_arg('Options:','options',
 				    [ ['autoez','Auto E,Z sterochemistry'],
-				      ['multipart','MultiPart Structures'],
-				      ['hydrogens','Show Hydrogens'],
+				      ['multipart','Multipart Structures'],
 				      ['nostereo','No stereochemistry'],
 				      ['reaction','Is a reaction'],
-				      ['number','Able to number atoms'],
-				      ['border','Draw a border'] ],
+				      ['number','Able to number atoms'] ],
 					     ,$token);
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
@@ -207,19 +205,36 @@ sub start_organicstructure {
     my $result;
     if ($target eq 'web') {
 	my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
-	my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);
 	my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval);
 	my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval);
 	my $id=time.'_'.int(rand(1000));
-	$result="<img src='/cgi-bin/convertjme.pl?$id' />";
+	$result="<img src='/cgi-bin/convertjme.pl?$id'";
+	if ($options =~ /border/) { $result.= ' border="1"'; }
+	$result.=' />';
 	&Apache::lonnet::appenv(
             'cgi.'.$id.'.JME'   => &Apache::lonnet::escape($molecule),
+	    'cgi.'.$id.'.PNG' => 1,
 	    'cgi.'.$id.'.WIDTH' => $width );
-
+    } elsif ($target eq 'tex') {
+	my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,1);
+	if (!$texwidth) { $texwidth='90'; }
+	my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval);
+	my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval);
+	my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}.
+	    '_'.time.'_'.$$.int(rand(1000)).'_organicstructure';
+	my $id=$filename;
+	&Apache::lonnet::appenv(
+		     'cgi.'.$id.'.JME'   => &Apache::lonnet::escape($molecule),
+		     'cgi.'.$id.'.PS' => 1,
+		     'cgi.'.$id.'.WIDTH' => $texwidth );
+	$id=&Apache::lonnet::escape($id);
+	&Apache::lonxml::register_ssi("/cgi-bin/convertjme.pl?$id");
+	$result = '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$texwidth.' mm]{'.$filename.'.eps}';
     } elsif ($target eq 'edit') {
 	$result .=&Apache::edit::tag_start($target,$token);
 	$result .=&Apache::edit::text_arg('Width:','width',$token,5);
 	$result .=&Apache::edit::text_arg('Height:','height',$token,5);
+	$result .=&Apache::edit::text_arg('TeXwidth:','texwidth',$token,5);
 	$result .='<nobr>';
 	$result .=&Apache::edit::text_arg('Molecule:','molecule',$token,40);
 	my $molecule=&Apache::lonxml::get_param('molecule',$parstack,
@@ -235,8 +250,7 @@ sub start_organicstructure {
 				       $molecule,$options);
 	$result.="</nobr><br />";
 	$result .=&Apache::edit::checked_arg('Options:','options',
-					     [ ['hydrogens','Show Hydrogens'],
-					       ['reaction','Is a reaction'],
+					     [ ['reaction','Is a reaction'],
 					       ['border','Draw a border'] ],
 					     $token);
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
@@ -244,7 +258,7 @@ sub start_organicstructure {
 	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
 						     $safeeval,'molecule',
 						     'width','height',
-						     'options');
+						     'texwidth','options');
 	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }
     return $result;