version 1.209, 2004/04/15 17:37:04
|
version 1.212, 2004/05/10 18:33:31
|
Line 633 sub start_h1 {
|
Line 633 sub start_h1 {
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $pre; |
my $pre; |
my $align=lc(&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)) { |
if ($align eq 'center') { |
$pre='\begin{center}'; |
$pre='\begin{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$pre='\rlap{'; |
$pre='\rlap{'; |
Line 656 sub end_h1 {
|
Line 656 sub end_h1 {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $post; |
my $post='\vskip 0 mm '; |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
if (($align eq 'center') || (not defined $align)) { |
if ($align eq 'center') { |
$post='\end{center}'; |
$post='\end{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$post='} \hfill'.'\vskip 0 mm '; |
$post='} \hfill'.'\vskip 0 mm '; |
Line 682 sub start_h2 {
|
Line 682 sub start_h2 {
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $pre; |
my $pre; |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
if (($align eq 'center') || (not defined $align)) { |
if ($align eq 'center') { |
$pre='\begin{center}'; |
$pre='\begin{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$pre='\rlap{'; |
$pre='\rlap{'; |
Line 702 sub end_h2 {
|
Line 702 sub end_h2 {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $post; |
my $post='\vskip 0 mm '; |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
if (($align eq 'center') || (not defined $align)) { |
if ($align eq 'center') { |
$post='\end{center}'; |
$post='\end{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$post='} \hfill'.'\vskip 0 mm '; |
$post='} \hfill'.'\vskip 0 mm '; |
Line 725 sub start_h3 {
|
Line 725 sub start_h3 {
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $pre; |
my $pre; |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
if (($align eq 'center') || (not defined $align)) { |
if ($align eq 'center') { |
$pre='\begin{center}'; |
$pre='\begin{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$pre='\rlap{'; |
$pre='\rlap{'; |
Line 745 sub end_h3 {
|
Line 745 sub end_h3 {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $post; |
my $post='\vskip 0 mm '; |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
if (($align eq 'center') || (not defined $align)) { |
if ($align eq 'center') { |
$post='\end{center}'; |
$post='\end{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$post='} \hfill'.'\vskip 0 mm '; |
$post='} \hfill'.'\vskip 0 mm '; |
Line 768 sub start_h4 {
|
Line 768 sub start_h4 {
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $pre; |
my $pre; |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
if (($align eq 'center') || (not defined $align)) { |
if ($align eq 'center') { |
$pre='\begin{center}'; |
$pre='\begin{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$pre='\rlap{'; |
$pre='\rlap{'; |
Line 788 sub end_h4 {
|
Line 788 sub end_h4 {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $post; |
my $post='\vskip 0 mm '; |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
if (($align eq 'center') || (not defined $align)) { |
if ($align eq 'center') { |
$post='\end{center}'; |
$post='\end{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$post='} \hfill'.'\vskip 0 mm '; |
$post='} \hfill'.'\vskip 0 mm '; |
Line 811 sub start_h5 {
|
Line 811 sub start_h5 {
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $pre; |
my $pre; |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
if (($align eq 'center') || (not defined $align)) { |
if ($align eq 'center') { |
$pre='\begin{center}'; |
$pre='\begin{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$pre='\rlap{'; |
$pre='\rlap{'; |
Line 831 sub end_h5 {
|
Line 831 sub end_h5 {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $post; |
my $post='\vskip 0 mm '; |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
if (($align eq 'center') || (not defined $align)) { |
if ($align eq 'center') { |
$post='\end{center}'; |
$post='\end{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$post='} \hfill'.'\vskip 0 mm '; |
$post='} \hfill'.'\vskip 0 mm '; |
Line 854 sub start_h6 {
|
Line 854 sub start_h6 {
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $pre; |
my $pre; |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
if (($align eq 'center') || (not defined $align)) { |
if ($align eq 'center') { |
$pre='\begin{center}'; |
$pre='\begin{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$pre='\rlap{'; |
$pre='\rlap{'; |
Line 874 sub end_h6 {
|
Line 874 sub end_h6 {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $post; |
my $post='\vskip 0 mm '; |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
if (($align eq 'center') || (not defined $align)) { |
if ($align eq 'center') { |
$post='\end{center}'; |
$post='\end{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$post='} \hfill'.'\vskip 0 mm '; |
$post='} \hfill'.'\vskip 0 mm '; |
Line 2333 sub start_img {
|
Line 2333 sub start_img {
|
if ($height) { $currentstring.=' height="'.$height.'" '; } |
if ($height) { $currentstring.=' height="'.$height.'" '; } |
$currentstring .= ' />'; |
$currentstring .= ' />'; |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
my ($osrc,$owidth,$oheight)= |
$safeeval,'src','alt', |
($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'}); |
'TeXwidth','TeXheight', |
my $ctag=&Apache::edit::get_new_args($token,$parstack, |
'width','height'); |
$safeeval,'src','alt', |
$src=$token->[2]{'src'}; |
'TeXwidth','TeXheight', |
if (!$token->[2]{'width'} && !$token->[2]{'height'}) { |
'width','height'); |
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
my ($nsrc,$nwidth,$nheight)= |
&image_replication($src); |
($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'}); |
if (-e $src) { |
my $loc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$nsrc); |
my $image = Image::Magick->new; |
&image_replication($loc); |
$image->Read($src); |
my ($iwidth,$iheight); |
my ($width, $height) = ($image->Get('width'), |
if (-e $loc) { |
$image->Get('height')); |
my $image = Image::Magick->new; |
if ($width && $height) { |
$image->Read($loc); |
$token->[2]{'width'} =$width; |
($iwidth, $iheight) = ($image->Get('width'), |
$token->[2]{'height'}=$height; |
$image->Get('height')); |
$constructtag=1; |
} |
|
if ($osrc ne $nsrc || (!$nwidth && !$nheight)) { |
|
# changed image or no size specified, |
|
# if they didn't explicitly change the |
|
# width or height use the ones from the image |
|
if ($iwidth && $iheight) { |
|
if ($owidth == $nwidth || (!$nwidth && !$nheight)) { |
|
$token->[2]{'width'} = $iwidth;$ctag=1; |
|
} |
|
if ($oheight == $nheight || (!$nwidth && !$nheight)) { |
|
$token->[2]{'height'}=$iheight;$ctag=1; |
} |
} |
} |
} |
} |
} |
if ($constructtag) {$currentstring=&Apache::edit::rebuild_tag($token);} |
my ($cwidth,$cheight)=($token->[2]{'width'},$token->[2]{'height'}); |
|
# if we don't have a width or height |
|
if ($iwidth && $cwidth && !$cheight) { |
|
$token->[2]{'height'}=int(($cwidth/$iwidth)*$iheight);$ctag=1; |
|
} |
|
if ($iheight && $cheight && !$cwidth) { |
|
$token->[2]{'width'}=int(($cheight/$iheight)*$iwidth);$ctag=1; |
|
} |
|
if ($ctag) {$currentstring=&Apache::edit::rebuild_tag($token);} |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |