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

Diff for /loncom/xml/londefdef.pm between versions 1.52 and 1.55

version 1.52, 2002/04/08 15:17:01 version 1.55, 2002/04/26 18:25:56
Line 45 Line 45
   
 package Apache::londefdef;   package Apache::londefdef; 
   
   use Apache::lonnet;
 use strict;  use strict;
 use Apache::lonxml;  use Apache::lonxml;
   
   
 BEGIN {  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','td'));      &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','td'));
Line 114  sub end_m { Line 116  sub end_m {
               $currentstring = &Apache::lonxml::xmlbegin().                $currentstring = &Apache::lonxml::xmlbegin().
                                &Apache::lonxml::fontsettings();                                      &Apache::lonxml::fontsettings();     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
         @Apache::londefdef::table = ();
       $currentstring .= '\documentclass[letterpaper]{article}        $currentstring .= '\documentclass[letterpaper]{article}
                                  \newcommand{\keephidden}[1]{}                                              \newcommand{\keephidden}[1]{}           
                                  \usepackage[dvips]{graphicx}                                   \usepackage[dvips]{graphicx}
Line 1264  EDITBUTTON Line 1267  EDITBUTTON
             if ($target eq 'web') {              if ($target eq 'web') {
               $currentstring = $token->[4];                     $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
    my $aa = {};
    push @Apache::londefdef::table, $aa; 
    $Apache::londefdef::table[-1]{'row_number'} = -1;
    $Apache::londefdef::table[-1]{'output'} = '\begin{tabular} ';
  my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);   my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);
  unless (defined $border) { $border = 0; }   unless (defined $border) { $border = 0; }
  if ($border) {    if ($border) { 
     $Apache::londefdef::table{'hinc'} = '\hline ';       $Apache::londefdef::table[-1]{'hinc'} = '\hline '; 
     $Apache::londefdef::table{'vinc'} = '&';       $Apache::londefdef::table[-1]{'vinc'} = '&'; 
     $Apache::londefdef::table{'vvinc'} = '|';      $Apache::londefdef::table[-1]{'vvinc'} = '|';
  } else {   } else {
     $Apache::londefdef::table{'hinc'} = '';       $Apache::londefdef::table[-1]{'hinc'} = ''; 
     $Apache::londefdef::table{'vinc'} = '';       $Apache::londefdef::table[-1]{'vinc'} = ''; 
     $Apache::londefdef::table{'vvinc'} = '';      $Apache::londefdef::table[-1]{'vvinc'} = '';
  }   }
     }       } 
    return $currentstring;     return $currentstring;
Line 1284  EDITBUTTON Line 1291  EDITBUTTON
             if ($target eq 'web') {              if ($target eq 'web') {
               $currentstring = $token->[2];                     $currentstring = $token->[2];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
    my $inmemory = '';
  my $output = '';   my $output = '';
  my $header_of_table = '{'.$Apache::londefdef::table{'vvinc'};   my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};
  my $in;   my $in;
  for ($in=0;$in<$Apache::londefdef::table{'counter_columns'};$in++) {   for ($in=0;$in<=$Apache::londefdef::table[-1]{'counter_columns'};$in++) {
     $header_of_table .= @{ $Apache::londefdef::table{'columns'} }[$in].$Apache::londefdef::table{'vvinc'};      $header_of_table .= $Apache::londefdef::table[-1]{'columns'}[$in].$Apache::londefdef::table[-1]{'vvinc'};
     $output .=  $Apache::londefdef::table{'rowdata'}[$in];   }
    $header_of_table .= '}';
    for ($in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
       $output .=  $Apache::londefdef::table[-1]{'rowdata'}[$in];
     chop $output;      chop $output;
     $output .= ' \\\\ ';      $output .= ' \\\\ ';
  }   }
  $header_of_table .= '}';   $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}';
  $currentstring .= '\begin{tabular}'.$header_of_table.$output.$Apache::londefdef::table{'hinc'}.'\end{tabular}';   if ($#Apache::londefdef::table > 0) {
       $inmemory = $Apache::londefdef::table[-1]{'output'};
       pop @Apache::londefdef::table;
       $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}] .= $inmemory;
    } else {
       $currentstring = $Apache::londefdef::table[-1]{'output'};
       $currentstring =~ s/\\\\\s+\\\\/\\\\/g; 
       pop @Apache::londefdef::table;
    }
     }      }
    return $currentstring;     return $currentstring;
  }   }
Line 1305  EDITBUTTON Line 1324  EDITBUTTON
             if ($target eq 'web') {              if ($target eq 'web') {
               $currentstring = $token->[4];                     $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  if (substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1) ne '') {   $Apache::londefdef::table[-1]{'row_number'}++;
     push @ {$Apache::londefdef::table{'rows'} }, substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);   my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
    if ($alignchar ne '') {
       push @ {$Apache::londefdef::table[-1]{'rows'} }, $alignchar;
  } else {   } else {
     push @ {$Apache::londefdef::table{'rows'} }, 'c';      push @ {$Apache::londefdef::table[-1]{'rows'} }, 'c';
  }   }
  push ( @{ $Apache::londefdef::table{'rowdata'} }, $Apache::londefdef::table{'hinc'});   push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});
  $Apache::londefdef::table{'counter_columns'} = 0;   $Apache::londefdef::table[-1]{'counter_columns'} = -1;
   
     }       } 
    return $currentstring;     return $currentstring;
Line 1322  EDITBUTTON Line 1343  EDITBUTTON
             if ($target eq 'web') {              if ($target eq 'web') {
  $currentstring = $token->[2];        $currentstring = $token->[2];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
   # $currentstring .= ' START ROW '. $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}].' END ROW ';
     }      }
    return $currentstring;     return $currentstring;
  }   }
Line 1334  EDITBUTTON Line 1356  EDITBUTTON
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);   my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
  if ($what_to_push eq '') {   if ($what_to_push eq '') {
     $what_to_push = substr($Apache::londefdef::table{'rows'}[0],0,1);;      $what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
  }   }
     push @{ $Apache::londefdef::table{'columns'} }, $what_to_push;      push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;
  $Apache::londefdef::table{'counter_columns'}++;   $Apache::londefdef::table[-1]{'counter_columns'}++;
  &Apache::lonxml::startredirection();   &Apache::lonxml::startredirection();
 ;  ;
     }       } 
Line 1349  EDITBUTTON Line 1371  EDITBUTTON
             if ($target eq 'web') {              if ($target eq 'web') {
  $currentstring = $token->[2];        $currentstring = $token->[2];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $current_row = $#{ $Apache::londedef::table{'rows'} };   my $current_row = $Apache::londefdef::table[-1]{'row_number'};
  my $data=&Apache::lonxml::endredirection();   my $data=&Apache::lonxml::endredirection();
  @{ $Apache::londefdef::table{'rowdata'} }[$current_row] .= $data.' '.$Apache::londefdef::table{'vinc'};   @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= $data.' '.$Apache::londefdef::table[-1]{'vinc'};
     }      }
    return $currentstring;     return $currentstring;
  }   }
Line 1366  EDITBUTTON Line 1388  EDITBUTTON
               $currentstring = $token->[4];                     $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
       my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);        my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
         $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
       my $file;        my $file;
       my $path;        my $path;
               if ($src =~ m!(.*)/([^/]*)$!) {                if ($src =~ m!(.*)/([^/]*)$!) {
  $file = $2;    $file = $2;
  $path = $1;    $path = $1; 
  if ($path=~m:^/:) {  
   $path = '/home/httpd/html'.$path;  
  } elsif ($path =~ /^\./) {  
   $path = $Apache::lonxml::pwd[-1].'/'.$path;  
  } else {  
   #else it is a full url don't print  
   $path = undef;  
  }  
       } else {        } else {
  $path = $Apache::lonxml::pwd[-1];    $path = $Apache::lonxml::pwd[-1];
  $file = $src;    $file = $src;
       }        }
       $file=~s/(\.gif|\.jpg)$/\.eps/;        $file=~s/(\.gif|\.jpg)$/\.eps/;
       if ($path) {        if ($path) {
  $currentstring = '\graphicspath{{'.$path.'/}}\fbox{\includegraphics{'.$file.'}}';   $currentstring .= '\graphicspath{{'.$path.'/}}\fbox{\includegraphics{'.$file.'}}';
       } else {        } else {
  $currentstring = 'See the image at \tt{'.$src.'}';   $currentstring .= 'See the image at \tt{'.$src.'}';
       }        }
     }      }
     return $currentstring;      return $currentstring;
Removed from v.1.52  
changed lines
  Added in v.1.55

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