[BACK]Return to londefdef.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/londefdef.pm between versions 1.122 and 1.124

version 1.122, 2003/03/18 15:32:15 version 1.124, 2003/04/10 14:31:09
Line 46  package Apache::londefdef; Line 46  package Apache::londefdef;
   
 use Apache::lonnet();  use Apache::lonnet();
 use strict;  use strict;
 use Apache::lonxml();  use Apache::lonxml;
 use Apache::File();  use Apache::File();
 use Image::Magick;  use Image::Magick;
 use Apache::lonmenu();  use Apache::lonmenu();
Line 394  sub start_accessrule { Line 394  sub start_accessrule {
  ('effect',$parstack,$safeeval,undef,1);   ('effect',$parstack,$safeeval,undef,1);
     my $realm=&Apache::lonxml::get_param      my $realm=&Apache::lonxml::get_param
  ('realm',$parstack,$safeeval,undef,1);   ('realm',$parstack,$safeeval,undef,1);
     my $cont=&Apache::lonxml::get_param      my $role=&Apache::lonxml::get_param
  ('content',$parstack,$safeeval,undef,1);   ('role',$parstack,$safeeval,undef,1);
     $cont=~s/\s+//g;      $realm=~s/\s+//g;
     $cont=~s/\W/\;/g;      $realm=~s/\//\_/g;
       $realm=~s/^\_//;
       $realm=~s/\W/\;/g;
       $role=~s/\s+//g;
       $role=~s/\//\_/g;
       $role=~s/\W/\;/g;
     if ($target eq 'web') {      if ($target eq 'web') {
  my $args='';   my $args='';
  if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }   if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
Line 408  sub start_accessrule { Line 413  sub start_accessrule {
  }   }
     }      }
     if ($target eq 'meta') {      if ($target eq 'meta') {
  $currentstring='<rule>'.$eff.':'.$realm.':'.$cont.'</rule>';   $currentstring='<rule>'.$eff.':'.$realm.':'.$role.'</rule>';
     }      }
     return $currentstring;      return $currentstring;
 }  }
Line 1197  sub end_sup { Line 1202  sub end_sup {
   
 #-- <hr> tag  #-- <hr> tag
 sub start_hr {  sub start_hr {
     my ($target,$token) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[4];   $currentstring .= $token->[4];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring .= '\vskip 0 mm \noindent\makebox[\textwidth/2 ][b]{\hrulefill}\vskip 0 mm ';   my $LaTeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval);
    if (defined $LaTeXwidth) {
       if ($LaTeXwidth=~/^%/) {
    substr($LaTeXwidth,0,1)='';
    $LaTeXwidth=($LaTeXwidth/100).'\textwidth';
       }
    } else {
       $LaTeXwidth ='0.95\textwidth';
    }
    my ($pre,$post);
    my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
    if (($align eq 'center') || (not defined $align)) {
       $pre=''; $post='';
    } elsif ($align eq 'left') {
       $pre='\rlap{'; $post='} \hfill';
    } elsif ($align eq 'right') {
       $pre=' \hfill \llap{'; $post='}';
    }
    $currentstring .= ' \vskip 0 mm \noindent\makebox[\textwidth]{'.$pre.'\makebox['.
                                       $LaTeXwidth.'][b]{\hrulefill}'.$post.'}\vskip 0 mm ';
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Removed from v.1.122  
changed lines
  Added in v.1.124

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>