--- loncom/xml/londefdef.pm 2003/10/21 19:40:32 1.185 +++ loncom/xml/londefdef.pm 2004/04/01 15:18:06 1.205 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.185 2003/10/21 19:40:32 albertel Exp $ +# $Id: londefdef.pm,v 1.205 2004/04/01 15:18:06 albertel Exp $ # # # Copyright Michigan State University Board of Trustees @@ -50,8 +50,8 @@ use Apache::File(); use Image::Magick; use Apache::lonmenu(); use Apache::lonmeta(); +use Apache::Constants qw(:common); -$Apache::londefdef::TD_redirection=0; BEGIN { @@ -59,6 +59,15 @@ BEGIN { } +sub initialize_londefdef { + $Apache::londefdef::TD_redirection=0; + @Apache::londefdef::table = (); + $Apache::londefdef::select=0; + @Apache::londefdef::description=(); + $Apache::londefdef::DD_redirection=0; + $Apache::londefdef::DT_redirection=0; +} + #======================= TAG SUBROUTINES ===================== #-- sub start_output { @@ -73,11 +82,10 @@ sub end_output { } #-- tag sub start_m { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; my $currentstring = ''; - if ($target eq 'web') { - $Apache::lonxml::prevent_entity_encode++; - my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); + my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); + if ($target eq 'web' || $target eq 'analyze') { $inside ='\\documentstyle{article}'.$inside; &Apache::lonxml::debug("M is starting with:$inside:"); my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval); @@ -94,15 +102,13 @@ sub start_m { #&Apache::lonxml::debug("M is ends with:$currentstring:"); $Apache::lonxml::post_evaluate=0; } elsif ($target eq 'tex') { - $currentstring = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); + $currentstring = $inside; my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval); if ($eval eq 'on') { $currentstring=&Apache::run::evaluate($currentstring,$safeeval,$$parstack[-1]); } if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';} $Apache::lonxml::post_evaluate=0; - } else { - my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); } return $currentstring; } @@ -110,11 +116,8 @@ sub start_m { sub end_m { my ($target,$token) = @_; my $currentstring = ''; - if ($target eq 'web') { - $Apache::lonxml::prevent_entity_encode--; - } elsif ($target eq 'tex') { + if ($target eq 'tex') { $currentstring = ""; - } elsif ($target eq 'meta') { } return $currentstring; } @@ -144,22 +147,9 @@ sub end_tthoption { sub start_html { my ($target,$token) = @_; my $currentstring = ''; - if ($ENV{'browser.mathml'}) { - &tth::ttminit(); - if ($ENV{'browser.unicode'}) { - &tth::ttmoptions('-L -u1'); - } else { - &tth::ttmoptions('-L -u0'); - } - } else { - &tth::tthinit(); - if ($ENV{'browser.unicode'}) { - &tth::tthoptions('-L -u1'); - } else { - &tth::tthoptions('-L -u0'); - } - } - if ($target eq 'web') { + my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'}; + &Apache::lontexconvert::init_tth(); + if ($target eq 'web' || $target eq 'edit') { $currentstring = &Apache::lonxml::xmlbegin(). &Apache::lonxml::fontsettings(); } elsif ($target eq 'tex') { @@ -399,7 +389,7 @@ sub start_meta { my $display=&Apache::lonxml::get_param ('display',$parstack,$safeeval,undef,1); if ($display) { - $display=&HTML::Entities::encode($display); + $display=&HTML::Entities::encode($display,'<>&"'); $currentstring.='<'.$name.'.display>'.$display. ''; } @@ -541,12 +531,13 @@ sub start_body { if ($ENV{'request.state'} ne 'published') { $currentstring.=(< - + EDITBUTTON } else { $currentstring.=&Apache::lonmenu::menubuttons(undef,$target,1); } + $currentstring.=&Apache::lonxml::message_location(); } elsif ($target eq 'tex') { $currentstring = '\begin{document}'; } @@ -641,7 +632,7 @@ sub start_h1 { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { my $pre; - my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); + my $align=lc(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1)); if (($align eq 'center') || (not defined $align)) { $pre='\begin{center}'; } elsif ($align eq 'left') { @@ -1105,24 +1096,45 @@ sub end_q { } #--

tag (end tag optional) +#optional attribute - align="center|left|right" sub start_p { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - my $signal=1; - foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;}} - if ($signal) {$currentstring .= '\par ';} + my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); + if ($align eq 'center') { + $currentstring='\begin{center}\par'; + } elsif ($align eq 'right') { + $currentstring='\makebox['.$ENV{'form.textwidth'}.']{\hfill\llap{'; + } elsif ($align eq 'left') { + $currentstring='\noindent\makebox['.$ENV{'form.textwidth'}.']{\rlap{'; + } + my $signal=1;#

does not work inside ... + foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;} + if (!$signal) {$currentstring = '';} + } } return $currentstring; } sub end_p { - my ($target,$token) = @_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web') { $currentstring .= $token->[2]; + } elsif ($target eq 'tex') { + if ($$tagstack[-1] eq 'p') { + my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); + if ($align eq 'center') { + $currentstring .= '\end{center}'; + } elsif ($align eq 'right') { + $currentstring .= '}}'; + } elsif ($align eq 'left') { + $currentstring .= '}\hfill}'; + } + } } return $currentstring; } @@ -1231,9 +1243,7 @@ sub start_font { my $currentstring = ''; if ($target eq 'web') { my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval); - if ($face=~/symbol/i) { - $Apache::lonxml::prevent_entity_encode++; - } else { + if ($face!~/symbol/i) { if (($ENV{'browser.fontenhance'} eq 'on') || ($ENV{'browser.blackwhite'} eq 'on')) { return ''; } } @@ -1251,8 +1261,6 @@ sub end_font { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $currentstring = ''; if ($target eq 'web') { - my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval); - if ($face=~/symbol/i) {$Apache::lonxml::prevent_entity_encode--;} $currentstring = $token->[2]; } elsif ($target eq 'tex') { my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval); @@ -1322,7 +1330,7 @@ sub start_sub { if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring .= "\$_{"; + $currentstring .= '\ensuremath{_{'; } return $currentstring; } @@ -1333,7 +1341,7 @@ sub end_sub { if ($target eq 'web') { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { - $currentstring .= "}\$"; + $currentstring .= '}}'; } return $currentstring; } @@ -1345,7 +1353,7 @@ sub start_sup { if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring .= "\$^{"; + $currentstring .= '\ensuremath{^{'; } return $currentstring; } @@ -1356,7 +1364,7 @@ sub end_sup { if ($target eq 'web') { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { - $currentstring .= "}\$"; + $currentstring .= '}}'; } return $currentstring; } @@ -1779,13 +1787,14 @@ sub start_table { if (not defined $TeXwidth) { my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,$safeeval,undef,1); if ($htmlwidth=~/%/) { + $Apache::londefdef::table[-1]{'percent'}=1; $htmlwidth=~/(\d+)/; - my $value=$1*$textwidth/100; - $Apache::londefdef::table[-1]{'width'}=$value; + $Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;; } else { $Apache::londefdef::table[-1]{'width'}=$textwidth; } } elsif ($TeXwidth=~/%/) { + $Apache::londefdef::table[-1]{'percent'}=1; $TeXwidth=~/(\d+)/; my $value=$1*$textwidth/100; $Apache::londefdef::table[-1]{'width'}=$value; @@ -1865,6 +1874,17 @@ sub end_table { $length_row_final[$jn]=0.9*$available_length/$needed; } } + #recalculation for the use of all available width if width is defined in % + if ($Apache::londefdef::table[-1]{'percent'}==1) { + my $current=0; + for (my $i=0;$i<=$#length_row_final;$i++) { + $current+=$length_row_final[$i]; + } + my $coef=$Apache::londefdef::table[-1]{'width'}/$current; + for (my $i=0;$i<=$#length_row_final;$i++) { + $length_row_final[$i]*=$coef; + } + } #fill the table for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) { for (my $jn=0;$jn<=$#length_row_final;$jn++) { @@ -2084,10 +2104,13 @@ sub start_img { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval, undef,1); + if (not $src and ($target eq 'web' or $target eq 'tex')) { + my $inside = &Apache::lonxml::get_all_text("/img",$parser); + &Apache::lonnet::logthis("inside was $inside"); + return ''; + } $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src; my $currentstring = ''; - my $width_param = ''; - my $height_param = ''; my $scaling = .3; if ($target eq 'web') { if ($ENV{'browser.imagesuppress'} ne 'on') { @@ -2103,38 +2126,11 @@ sub start_img { } } elsif ($target eq 'tex') { $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); - &image_replication($src); #if original gif/jpg/png file exist do following: - if (-e $src) { - #defines the default size of image - my $image = Image::Magick->new; - my $current_figure = $image->Read($src); - $width_param = $image->Get('width') * $scaling;; - $height_param = $image->Get('height') * $scaling;; - undef $image; - #do we have any specified size of the picture? - my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); - my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); - my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval, - undef,1); - if ($TeXwidth ne '') { - if ($TeXwidth=~/(\d+)\s*\%/) { - $width_param = $1*$ENV{'form.textwidth'}/100; - } else { - $width_param = $TeXwidth; - } - } elsif ($TeXheight ne '') { - $width_param = $TeXheight/$height_param*$width_param; - } elsif ($width ne '') { - $width_param = $width*$scaling; - } - if ($width_param > $ENV{'form.textwidth'}) {$width_param =0.95*$ENV{'form.textwidth'}} - my $file; - my $path; - if ($src =~ m!(.*)/([^/]*)$!) { - $file = $2; - $path = $1.'/'; - } + if (-e $src) { + #what is the image size? + my $width_param=&image_size($src,$scaling,$parstack,$safeeval); + my ($file,$path)=&file_path($src); my $newsrc = $src; $newsrc =~ s/\.(gif|jpg|png)$/.eps/i; $file=~s/\.(gif|jpg|png)$/.eps/i; @@ -2154,14 +2150,8 @@ sub start_img { $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; } } else { - #there aren't eps or ps - so create eps - my $temp_file; - my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat"; - $temp_file = Apache::File->new('>>'.$filename); - print $temp_file "$src\n"; - $newsrc=~s/\/home\/httpd\/html\/res//; - $newsrc=~s/\/([^\/]+)\.(ps|eps)/\//; - $currentstring .= '\vskip 1 mm \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; + #care about eps dynamical generation + $currentstring.='\vskip 1 mm '.&eps_generation($src,$file,$width_param); } } } else { @@ -2178,6 +2168,45 @@ sub start_img { # tag will care about replication } } + } elsif ($target eq 'edit') { + $currentstring .=&Apache::edit::tag_start($target,$token); + $currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70). + &Apache::edit::browse('src',undef,'alt').' '. + &Apache::edit::search('src',undef,'alt').'
'; + $currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'
'; + $currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5); + $currentstring .=&Apache::edit::text_arg('height (pixel):','height',$token,5).'
'; + $currentstring .=&Apache::edit::text_arg('TeXwidth (mm):','TeXwidth',$token,5); + $currentstring .=&Apache::edit::text_arg('TeXheight (mm):','TeXheight',$token,5); + $currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); + my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval); + my $alt=&Apache::lonxml::get_param('alt',$parstack,$safeeval); + my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval); + my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval); + $currentstring .= ''.$alt.'[2]{'src'}; + if (!$token->[2]{'width'} && !$token->[2]{'height'}) { + $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); + &image_replication($src); + if (-e $src) { + my $image = Image::Magick->new; + my ($width, $height, $size, $format) = $image->Ping($src); + if ($width && $height) { + $token->[2]{'width'} =$width; + $token->[2]{'height'}=$height; + $constructtag=1; + } + } + } + if ($constructtag) {$currentstring=&Apache::edit::rebuild_tag($token);} } return $currentstring; } @@ -3294,22 +3323,71 @@ sub end_hideweboutput { sub image_replication { my $src = shift; - if (not -e $src) { - #replicates image itself - &Apache::lonnet::repcopy($src); - #replicates eps or ps - my $newsrc = $src; - $newsrc =~ s/\.(gif|jpg|jpeg|png)$/.eps/i; - if (not -e $newsrc) { - if (&Apache::lonnet::repcopy($newsrc) ne 'OK') { - $newsrc =~ s/\.eps$/\.ps/; - &Apache::lonnet::repcopy($newsrc); - } - } + if (not -e $src) { &Apache::lonnet::repcopy($src); } + #replicates eps or ps + my $epssrc = my $pssrc = $src; + $epssrc =~ s/\.(gif|jpg|jpeg|png)$/.eps/i; + $pssrc =~ s/\.(gif|jpg|jpeg|png)$/.ps/i; + if (not -e $epssrc && not -e $pssrc) { + my $result=&Apache::lonnet::repcopy($epssrc); + if ($result ne OK) { &Apache::lonnet::repcopy($pssrc); } } return ''; } +sub image_size { + my ($src,$scaling,$parstack,$safeeval)=@_; + #size of image from gif/jpg/jpeg/png + my $image = Image::Magick->new; + my $current_figure = $image->Read($src); + my $width_param = $image->Get('width') * $scaling;; + my $height_param = $image->Get('height') * $scaling;; + undef $image; + #do we have any specified LaTeX size of the picture? + my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); + my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); + #do we have any specified web size of the picture? + my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval, + undef,1); + if ($TeXwidth ne '') { + if ($TeXwidth=~/(\d+)\s*\%/) { + $width_param = $1*$ENV{'form.textwidth'}/100; + } else { + $width_param = $TeXwidth; + } + } elsif ($TeXheight ne '') { + $width_param = $TeXheight/$height_param*$width_param; + } elsif ($width ne '') { + $width_param = $width*$scaling; + } + if ($width_param > $ENV{'form.textwidth'}) {$width_param =0.95*$ENV{'form.textwidth'}} + return $width_param; +} + +sub eps_generation { + my ($src,$file,$width_param) = @_; + my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat"; + my $temp_file = Apache::File->new('>>'.$filename); + print $temp_file "$src\n"; + my $newsrc = $src; + $newsrc =~ s/(\.gif|\.jpg|\.jpeg)$/\.eps/i; + $newsrc=~s/\/home\/httpd\/html\/res//; + $newsrc=~s/\/home\/([^\/]*)\/public_html\//\/$1\//; + $newsrc=~s/\/\.\//\//; + $newsrc=~s/\/([^\/]+)\.(ps|eps)/\//; + return ' \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; +} + +sub file_path { + my $src=shift; + my ($file,$path); + if ($src =~ m!(.*)/([^/]*)$!) { + $file = $2; + $path = $1.'/'; + } + return $file,$path; +} + sub recalc { my $argument = shift; if (not $argument=~/(mm|cm|in|pc|pt)/) {return $argument.' mm';}