--- loncom/xml/londefdef.pm 2002/08/01 18:15:09 1.81 +++ loncom/xml/londefdef.pm 2002/08/30 17:57:32 1.86 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.81 2002/08/01 18:15:09 sakharuk Exp $ +# $Id: londefdef.pm,v 1.86 2002/08/30 17:57:32 sakharuk Exp $ # # # Copyright Michigan State University Board of Trustees @@ -52,7 +52,7 @@ use Image::Magick; BEGIN { - &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','allow','frameset','pre','insert','externallink','table','tr','th','td','blankspace','bubble','bubbles','bubbleline')); + &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','allow','frameset','pre','insert','div','externallink','table','tr','th','td','blankspace','bubble','bubbles','bubbleline')); } @@ -91,7 +91,7 @@ sub start_m { #&Apache::lonxml::debug("M is ends with:$currentstring:"); } elsif ($target eq 'tex') { $currentstring = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); - if ($currentstring=~/\s*\\\\\s*/) {$currentstring = ' \vskip 0 mm ';} + if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';} } else { my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); } @@ -126,7 +126,8 @@ sub end_m { \newcommand{\keephidden}[1]{} \renewcommand{\deg}{$^{\circ}$} \usepackage[dvips]{graphicx} - \usepackage{epsfig}\usepackage{calc}'; + \usepackage{epsfig}\usepackage{calc} + \newenvironment{choicelist}{\begin{enumerate}}{\end{enumerate}}'; } return $currentstring; } @@ -1039,7 +1040,7 @@ EDITBUTTON if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring .= '\vskip 0 mm \noindent\makebox[\textwidth - 8 mm][b]{\hrulefill}'; + $currentstring .= '\vskip 0 mm \noindent\makebox[\textwidth/2 ][b]{\hrulefill}\vskip 0 mm '; } return $currentstring; } @@ -1052,6 +1053,23 @@ EDITBUTTON } return $currentstring; } +#--
tag + sub start_div { + my ($target,$token) = @_; + my $currentstring = ''; + if ($target eq 'web') { + $currentstring .= $token->[4]; + } + return $currentstring; + } + sub end_div { + my ($target,$token) = @_; + my $currentstring = ''; + if ($target eq 'web') { + $currentstring .= $token->[2]; + } + return $currentstring; + } #-- tag sub start_a { my ($target,$token) = @_; @@ -1325,9 +1343,11 @@ EDITBUTTON my $filled_columns = 0; foreach my $tempo_length (@{ $Apache::londefdef::table[-1]{'lengthrow'} }) { my @length = split(/,/,$tempo_length); + my $nfilled_columns = 0; for (my $ico=0;$ico<$how_many_columns;$ico++) { - if (not $lengthforoutput[$ico]=~m/\s*0\s*/) {$filled_columns++;} + if (not $lengthforoutput[$ico]=~m/\s*0\s*/) {$nfilled_columns++;} } + if ($nfilled_columns > $filled_columns) {$filled_columns=$nfilled_columns;} } my $temp_file; my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.tbl"; @@ -1381,7 +1401,7 @@ EDITBUTTON for (my $io=0; $io<=$#lengthforoutput;$io++) { $parboxlength .= ' - '.$lengthforoutput[$io].' '; } - $parboxlength .= ')/($GLOBALnumberOFcolumns+1) - 1 mm'; + $parboxlength .= ')/($GLOBALnumberOFcolumns+1) - 3 mm'; $output =~ s/\\parbox{}{}/\\parbox{1 mm}{}/g; $output =~ s/\\parbox{}{(\\textbf{\w?\.?})}/\\parbox{5 mm}{$1}/g; #for stupid tables with empty columns $output =~ s/\\parbox{}/\\parbox{$parboxlength}/g; @@ -1465,17 +1485,25 @@ EDITBUTTON sub end_td { my ($target,$token) = @_; my $currentstring = ''; + my $tempolen = ''; if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { my $current_row = $Apache::londefdef::table[-1]{'row_number'}; my $data=&Apache::lonxml::endredirection(); - if ($data=~m/width\s*=\s*(\d+\.*\d*\s*(mm|cm))/) { - $Apache::londefdef::table[-1]{'length'} .= $1.','; + if ($data=~m/width\s*=\s*(\d+\.*\d*\s*(mm|cm|in|pc|pt))/) { + $Apache::londefdef::table[-1]{'length'} .= $1.','; + $tempolen = $1; } else { - $Apache::londefdef::table[-1]{'length'} .= '0 mm,'; + if (length($data)<5) { + $Apache::londefdef::table[-1]{'length'} .= '7 mm,'; + $tempolen = '5 mm'; + } else { + $Apache::londefdef::table[-1]{'length'} .= '0 mm,'; + $tempolen = ''; + } } - @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$1.'}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'}; + @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$tempolen.'}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'}; } return $currentstring; } @@ -1522,57 +1550,21 @@ EDITBUTTON my $currentstring = ''; my $width_param = ''; my $height_param = ''; - my $scaling = .3; + my $scaling = .3; if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval); $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); - if (-e $src) { #new one + #if original gif/jpg 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; - my $epssrc = $src; - $epssrc =~ s/(\.gif|\.jpg)$/\.eps/i; - if (not -e $epssrc) { - my $localfile = $epssrc; - $localfile =~ s/.*(\/res)/$1/; - my $file; - my $path; - if ($localfile =~ m!(.*)/([^/]*)$!) { - $file = $2; - $path = $1.'/'; - } - my $signal_eps = 0; - my @content_directory = &Apache::lonnet::dirlist($path); - for (my $iy=0;$iy<=$#content_directory;$iy++) { - my @tempo_array = split(/&/,$content_directory[$iy]); - $content_directory[$iy] = $tempo_array[0]; - if ($file eq $tempo_array[0]) { - $signal_eps = 1; - last; - } - } - if ($signal_eps) { - my $eps_file = &Apache::lonnet::getfile($localfile); - } else { - $localfile = $src; - $localfile =~ s/.*(\/res)/$1/; - my $as = &Apache::lonnet::getfile($src); - } - } - my $file; - my $path; - if ($src =~ m!(.*)/([^/]*)$!) { - $file = $2; - $path = $1.' /'; - } - my $newsrc = $src; - $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i; - $file=~s/(\.gif|\.jpg)$/\.eps/i; #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); @@ -1584,24 +1576,47 @@ EDITBUTTON } elsif ($width ne '') { $width_param = $width*$scaling; } + my $file; + my $path; + if ($src =~ m!(.*)/([^/]*)$!) { + $file = $2; + $path = $1.'/'; + } + my $newsrc = $src; + $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i; + $file=~s/(\.gif|\.jpg)$/\.eps/i; #where can we find the picture? if (-e $newsrc) { + #eps counterpart for image exist if ($path) { $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} '; } } else { - 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"; - $currentstring .= '\graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} '; + #there is no eps counterpart for image - check for ps one + $newsrc =~ s/\.eps$/\.ps/; + if (-e $newsrc) { + #ps counterpart for image exist + $file =~ s/\.eps$/\.ps/; + if ($path) { + $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\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"; + $currentstring .= '\graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} '; + } } } else { + #original image file doesn't exist so check the alt attribute my $alt = &Apache::lonxml::get_param('alt',$parstack,$safeeval); if ($alt) { $currentstring .= ' '.$alt.' '; } else { - $currentstring .= ' THE ORIGINAL PROBLEM CONTAINS EMPTY IMG TAG WITHOUT IMAGE '; + #there are no image and alt attribute + $currentstring .= ' THE ORIGINAL PROBLEM CONTAINS EMPTY IMG TAG WITHOUT IMAGE AND ALT ATTRIBUTE '; } } }