loncom/xml/londefdef.pm - diff

Return to londefdef.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/londefdef.pm between versions 1.397 and 1.421

-version 1.397, 2008/11/24 18:55:01
+version 1.421, 2010/08/16 15:56:08
  Line 42  package Apache::londefdef;
  use Apache::lonnet;
  use strict;
  use Apache::lonxml;
+ use Apache::lontable;
  use Apache::File();
  use Image::Magick;
  use Apache::lonmenu();
- Line 58  BEGIN {
+ Line 59  BEGIN {
  }
- #
- #   Dumps all elements of the table structure.
- #   Need this 'cause evidently when given an array, Data::Dumper only seems
- #   to dump element 0.
- #
- #sub debug_dump_table {
- #    my $lastrow = $#Apache::londefdef::table;
- #    &Apache::lonnet::logthis("Dumping table:  Last row index: $lastrow");
- #    my $row;
- #    for ($row =0; $row <= $lastrow; $row++ ) {
- #	my $text = Dumper($Apache::londefdef::table[$row]);
- #	&Apache::lonnet::logthis("table [ $row ]".$text);
- #    }
- #}
  sub initialize_londefdef {
      $Apache::londefdef::TD_redirection=0;
      @Apache::londefdef::table = ();
- Line 188  sub start_html {
+ Line 176  sub start_html {
      if ($target eq 'web' || $target eq 'edit' || $target eq 'webgrade' ) {
  	# start_body() takes care of emitting the <html>
      } elsif ($target eq 'tex') {
- 	$currentstring .=
- 	    '\documentclass[letterpaper,twoside]{article}\raggedbottom';
- 	if (($env{'form.latex_type'}=~'batchmode') ||
-             (!$env{'request.role.adv'})) {$currentstring .='\batchmode';}
- 	$currentstring .= '\newcommand{\keephidden}[1]{}'.
-                           '\renewcommand{\deg}{$^{\circ}$}'.
- 			  '\usepackage{multirow}'.
-                           '\usepackage{longtable}'.
-                           '\usepackage{textcomp}'.
-                           '\usepackage{makeidx}'.
-                           '\usepackage[dvips]{graphicx}'.
- 			  '\usepackage{wrapfig}'.
- 			  '\usepackage{picins}'.
- 			  '\usepackage[T1]{fontenc}'."\n".
-                           '\usepackage{lmodern}'."\n".
- 			  '\usepackage[postscript]{ucs}'."\n".
- 			  '\usepackage[utf8x]{inputenc}'."\n".
- 			  '\usepackage{pifont}' ."\n".
- 			  '\usepackage{latexsym}'."\n".
-                           '\usepackage{epsfig}'.
-                           '\usepackage{calc}'.
-                           '\usepackage{amsmath}'.
-                           '\usepackage{amssymb}'.
-                           '\usepackage{amsfonts}'.
-                           '\usepackage{amsthm}'.
-                           '\usepackage{amscd}';
-         if($env{'form.pdfFormFields'} eq 'yes') {
-             $currentstring .= '\usepackage{hyperref}'.
-                               '\usepackage{eforms}'.
-                               '\usepackage{tabularx}';
-         }
-         $currentstring .= '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'.
+ 	$currentstring .= &latex_header();
-                           '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}';
      }
      return $currentstring;
  }
- Line 583  sub start_body {
+ Line 538  sub start_body {
  	my $extra_head = &generate_css_links();
+     # Breadcrumbs
+     &Apache::lonhtmlcommon::clear_breadcrumbs();
+     if ($env{'request.state'} eq 'construct') {
+         &Apache::lonhtmlcommon::add_breadcrumb({
+             'text'  => 'Construction Space',
+             'href'  => &Apache::loncommon::authorspace(),
+         });
+         &Apache::lonhtmlcommon::add_breadcrumb({
+             'text'  => 'HTML Editor',
+             'href'  => '',
+         });
+         # breadcrumbs (and tools) will be created
+         # in start_page->bodytag->innerregister
+     } else {
+         # FIXME Where are we?
+     }
  	$currentstring =
  	    &Apache::loncommon::start_page($Apache::londefdef::title,
  					   $Apache::londefdef::head
  					      .$extra_head,
  					   {'add_entries'    => $token->[2],
- 					    'no_title'       => 1,
+ #					    'no_title'       => 1,
  					    'force_register' => 1});
- 	if ($env{'request.state'} ne 'published') {
+         my $header = '';
- 	    $currentstring.=&Apache::lonmenu::constspaceform();
+         if ($env{'request.state'} ne 'published' &&
- 	    $currentstring.=&Apache::londefdef::edit_controls();
+             $env{'request.state'} ne 'construct') {
- 	}
+             $header=&Apache::lonmenu::constspaceform();
- 	$currentstring.=&Apache::lonxml::message_location();
+         }
+         if ($env{'request.state'} ne 'published') {
+             $header.=&Apache::londefdef::edit_controls();
+         }
+         if ($env{'request.state'} eq 'construct') {
+             $currentstring.=&Apache::loncommon::head_subbox(
+                                 &Apache::loncommon::CSTR_pageheader()
+                                .$header);
+         } elsif ($env{'request.state'} eq 'edit') {
+             $currentstring.=&Apache::loncommon::head_subbox($header);
+         }
+         $currentstring.=&Apache::lonxml::message_location();
      } elsif ($target eq 'tex') {
- 	$currentstring = '\begin{document}';
+         $currentstring = '';   #  '\begin{document}' is in header.
      }
      return $currentstring;
  }
  sub edit_controls {
+     my ($nochgview) = @_;
      my $result .= '
  <form method="post">
- <div class="LC_edit_problem_header">
+ <div class="LC_edit_problem_header">';
+     unless ($nochgview) {
+         $result .= '
  <div class="LC_edit_problem_header_row1">'.
  &Apache::lonxml::renderingoptions().'
  <input type="submit" name="changeproblemmode" value="'.&mt('Change View').'" />
+ </div>';
+     }
+     $result .= '
+ <div><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" />';
+     if (($env{'request.course.id'}) && ($env{'form.forceedit'})) {
+         $result .= ('&nbsp;' x 3).'<input type="button" value="'.&mt('Course View').'" onclick="javascript:location.href=currentURL" />';
+     }
+     $result .= '</div>
  </div>
- <div class="LC_edit_problem_header_edit_row"><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" /></div></div>
  </form>
- <br />';
+ ';
      return $result;
  }
- Line 1389  sub start_font {
+ Line 1383  sub start_font {
      my $currentstring = '';
      if ($target eq 'web' || $target eq 'webgrade') {
  	my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
- 	if ($face!~/symbol/i) {
- 	    if (($env{'browser.fontenhance'} eq 'on') ||
- 		($env{'browser.blackwhite'} eq 'on')) { return ''; }
- 	}
  	$currentstring = $token->[4];
      }  elsif ($target eq 'tex') {
  	my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
- Line 1657  sub start_a {
+ Line 1647  sub start_a {
  	my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
  					    undef,1);
  	$currentstring=&Apache::lonenc::encrypt_ref($token,{'href'=>$href});
+         if ($href =~ /\S/) {
+             if ($href !~ m{^https?://}) {
+                 my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
+                 my $linkurl;
+                 if ($href =~ m{^/uploaded/}) {
+                     $linkurl = $href;
+                 } elsif ($href =~ m{^[^/]}) {
+                     my $path = $url;
+                     $path  =~ s{[^/]*$}{};
+                     $linkurl = $path.$href;
+                 }
+                 if ($linkurl =~ m{^/uploaded/}) {
+                     if (!&Apache::lonnet::allowed('bre',$linkurl)) {
+                         if (&Apache::lonnet::is_on_map($url)) {
+                             &Apache::lonxml::extlink($linkurl);
+                         }
+                     }
+                 }
+             }
+         }
      }
      return $currentstring;
  }
- Line 2018  sub end_dd {
+ Line 2028  sub end_dd {
  #               only way I could think of to allow <p> in
  #               <tr> <th> bodies
  #
- #list of supported attributes: border,width,TeXwidth
+ #list of supported attributes: border,width,TeXwidth,TeXtheme
+ #                              align
  sub start_table {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $textwidth = '';
- Line 2027  sub start_table {
+ Line 2038  sub start_table {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
  	&disable_para();	# Can't have paras in a table.
+ 	#  New table code:
+ 	#  Get the parameters that we can do something about:
+ 	my $border = &Apache::lonxml::get_param('border', $parstack, $safeeval, undef, 0);
+ 	my $width  = &Apache::lonxml::get_param('TeXwidth', $parstack, $safeeval, undef, 0);
+ 	my $theme  = &Apache::lonxml::get_param('TeXtheme', $parstack, $safeeval, undef, 0);
+ 	my $align  = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 0);
+ 	my $cell_border = &Apache::lonxml::get_param('rules', $parstack, $safeeval, undef, 0);
+ 	# The only thing that needs any figuring out is the width.. and then only if it is
+ 	# a percent. If not it's assumed to be some valid TeX measurement unit e.g. 3.0cm
+ 	#
+ 	my $table = new Apache::lontable();
+ 	if ((defined $border) && ($border > 0)) {
+ 	#    &Apache::lonnet::logthis("Turning on table borders: $border");
+ 	    $table->table_border(1);
+ 	    if ($cell_border ne 'none') {
+ 		$table->cell_border(1); # html specs that border turns on both...unless rules='none'.
+ 	    }
+ 	}
+ 	# Only all or nothing for cell borders for now:
+ 	if ((defined $cell_border) && ($cell_border ne 'none')) {
+ 	#    &Apache::lonnet::logthis("Turning on cell borders: $cell_border");
+ 	    $table->cell_border(1);
+ 	}
+ 	if (defined $theme) {
+ 	    $table->theme($theme);
+ 	}
+ 	if (defined $align) {
+ 	    $table->alignment($align);
+ 	}
+ 	# Missing width is most of page width
+ 	if (!(defined $width)) {
+ 	    $width = '70%';
+ 	}
+ 	# If a percentage, need to calculate what this means in terms of
+ 	# page width:
+ 	if ($width =~ /%$/) {
+ 	    my $textwidth = &recalc($env{'form.textwidth'});  # Page width in mm.
+ 	    $width =~ s/%//;
+ 	    $width = $width * $textwidth / 100.0;
+ 	    $width .= " mm";
+ 	    $table->width($width);
+ 	}
+ 	push(@Apache::londefdef::table, $table);
+         $currentstring.=' \keephidden{NEW TABLE ENTRY}';
+ 	#--------------------------------------------------------
+ 	#  Old table code here.
+ 	#--------------------------------------------------------
+ 	if (0) {
  	push(@Apache::londefdef::table, {});
  	$Apache::londefdef::table[-1]{'row_number'} = -1;
          #maximum table's width (default coincides with text line length)
- Line 2101  sub start_table {
+ Line 2175  sub start_table {
          $Apache::londefdef::table[-1]{'content'}=[];
          $Apache::londefdef::table[-1]{'align'}=[];
          $currentstring.=' \keephidden{NEW TABLE ENTRY}';
+     }
      }
      return $currentstring;
- Line 2113  sub end_table {
+ Line 2187  sub end_table {
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
+ 	#  New table code:
+ 	my $table = pop(@Apache::londefdef::table);
+ 	my $t     = $table->generate();
+ 	$currentstring = $t->generate_string();
+ 	&enable_para();
+ 	#--------------------------------------------------------------
+ 	#  Old table code:
+ 	#--------------------------------------------------------------
+ 	if (0) {
  	my $border =  &Apache::lonxml::get_param('border',$parstack,$safeeval);
  	my $inmemory = '';
  	my $output = '';
- Line 2528  sub end_table {
+ Line 2616  sub end_table {
  	}
  	&enable_para();
      }
+     }
      return $currentstring;
  }
- Line 2538  sub start_tr {
+ Line 2627  sub start_tr {
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      } elsif ($target eq 'tex') {
+ 	my $align = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 1);
+ 	$Apache::londefdef::table[-1]->start_row();
+ 	if ($align ne '') {
+ 	    $Apache::londefdef::table[-1]->configure_row({default_halign => $align});
+ 	}
+ 	#---------------------------------------------------------------
+ 	# Old table code.
+ 	#---------------------------------------------------------------
+ 	if (0) {
  	$Apache::londefdef::table[-1]{'row_number'}++;
  	my $alignchar=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
  	if ($alignchar ne '') {
- Line 2556  sub start_tr {
+ Line 2658  sub start_tr {
  	push @ {$Apache::londefdef::table[-1]{'minlen'}}, [];
  	push @ {$Apache::londefdef::table[-1]{'maxlen'}}, [];
  	push @ {$Apache::londefdef::table[-1]{'content'}}, [];
+     }
      }
      return $currentstring;
  }
- Line 2566  sub end_tr {
+ Line 2669  sub end_tr {
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
+ 	# In case the user is missing a </td> or </th> tag:
+ 	if ($Apache::londefdef::TD_redirection) {
+ 	    &end_td_tex($parstack,$parser,$safeeval);
+ 	}
+ 	$Apache::londefdef::table[-1]->end_row();
+ 	#-----------------------------------------------
+ 	# Old table code
+ 	#-----------------------------------------------
+ 	if (0) {
  	if ($Apache::londefdef::TD_redirection) {
  	    &end_td_tex($parstack,$parser,$safeeval);
  	}
- Line 2574  sub end_tr {
+ Line 2690  sub end_tr {
  	if ($Apache::londefdef::table[-1]{'prior_columns'} > $Apache::londefdef::table[-1]{'counter_columns'}) {
  	    $Apache::londefdef::table[-1]{'counter_columns'} = $Apache::londefdef::table[-1]{'prior_columns'};
  	}
+     }
      }
- Line 2610  sub tag_check {
+ Line 2726  sub tag_check {
      }
      return '';
  }
+ #
+ #  Factor out cell configuration hash generation:
+ #
+ sub cell_config_hash {
+     my ($align, $rowspan, $colspan) = @_;
+     my %config;
+     if ($align ne '') {
+ 	$config{'halign'} = $align;
+     }
+     if ($colspan ne "") {
+ 	$config{'colspan'} = $colspan;
+     }
+     if ($rowspan ne '') {
+ 	$config{'rowspan'} = $rowspan;
+     }
+     return \%config;
+ }
  sub start_td_tex {
      my ($parstack,$parser,$safeeval) = @_;
+     # At this stage, an empty cell is created with the
+     # appropriate rowspan/colspan and alignment
+     # attributes, but empty of text.  end_td_tex will
+     # fetch the contents from the recursive parse and
+     # fill the cell with them:
+     my $align   = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 1);
+     my $rowspan = &Apache::lonxml::get_param('rowspan', $parstack, $safeeval, undef, 1);
+     my $colspan = &Apache::lonxml::get_param('colspan', $parstack, $safeeval, undef, 1);
+     my $config = &cell_config_hash($align, $rowspan, $colspan);
+     my $table = $Apache::londefdef::table[-1];
+     $table->add_cell('', $config);
+     #------------------------------------------------
+     #  Old table code.
+     #------------------------------------------------
+     if (0) {
      my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
      if ($alignchar eq '') {
  	$alignchar = $Apache::londefdef::table[-1]{'rows'}[-1];
- Line 2625  sub start_td_tex {
+ Line 2782  sub start_td_tex {
  	$current_length=~/(\d+\.?\d*)/;
  	push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$1;
      }
+     }
      &Apache::lonxml::startredirection();
      return '';
  }
  sub end_td_tex {
+     my $text = &Apache::lonxml::endredirection();
+     my $table = $Apache::londefdef::table[-1];
+     $table->append_cell_text($text);
+     #-------------------------------------------------
+     # Old table code
+     #-------------------------------------------------
+     if (0) {
      my ($parstack,$parser,$safeeval) = @_;
      my $current_row    = $Apache::londefdef::table[-1]{'row_number'};
      my $current_column = $Apache::londefdef::table[-1]{'counter_columns'};
- Line 2794  sub end_td_tex {
+ Line 2962  sub end_td_tex {
      }
+     }
      return '';
  }
- Line 2843  sub tagg_check {
+ Line 3011  sub tagg_check {
  sub start_th_tex {
      my ($parstack,$parser,$safeeval) = @_;
+     my $alignment = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef,1);
+     my $rowspan  =  &Apache::lonxml::get_param('rowspan', $parstack, $safeeval, undef, 1);
+     my $colspan  =  &Apache::lonxml::get_param('colspan', $parstack, $safeeval, undef, 1);
+     my $config   = cell_config_hash($alignment, $rowspan, $colspan);
+     my $table    = $Apache::londefdef::table[-1];
+     $table->add_cell('\textbf{', $config);
+     #-------------------------------------------------------------------------------------
+     #
+     #  Old table code.
+     #
+     #--------------------------------------------------------------------------------------
+     if (0) {
      my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
      if ($alignchar eq '') {
  	$alignchar = $Apache::londefdef::table[-1]{'rows'}[-1];
- Line 2855  sub start_th_tex {
+ Line 3041  sub start_th_tex {
  	$current_length=~/(\d+\.?\d*)/;
  	push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$1;
      }
+     }
+     # Accept xml until the </th> tag.
      &Apache::lonxml::startredirection();
      return '';
  }
  sub end_th_tex {
      my ($parstack,$parser,$safeeval) = @_;
+     my $table = $Apache::londefdef::table[-1];
+     my $text  = &Apache::lonxml::endredirection();
+     $table->append_cell_text($text.'}');
+     #-----------------------------------------------------------------------------
+     #  Old table code:
+     #-----------------------------------------------------------------------------
+     if (0) {
      my $current_row = $Apache::londefdef::table[-1]{'row_number'};
      my $data=&Apache::lonxml::endredirection();
      my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
- Line 2925  sub end_th_tex {
+ Line 3125  sub end_th_tex {
      #make data bold
      $data='\textbf{'.$data.'}';
      push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;
+     }
      return'';
  }
- Line 2968  sub start_img {
+ Line 3169  sub start_img {
     # Render unto browsers that which are the browser's...
      if ($target eq 'web' || $target eq 'webgrade') {
- 	if ($env{'browser.imagesuppress'} ne 'on') {
+         my $enc = ('yes' eq
- 	    my $enc = ('yes' eq
+                    lc(&Apache::lonxml::get_param('encrypturl',$parstack,
- 		       lc(&Apache::lonxml::get_param('encrypturl',$parstack,
+                       $safeeval)));
- 						     $safeeval)));
+         $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src},
- 	    $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src},
+                          $enc);
- 							 $enc);
- 	} else {
- 	    my $alttag = &Apache::lonxml::get_param('alt',$parstack,$safeeval,
- 						    undef,1);
- 	    if (!$alttag) {
- 		$alttag = &Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],
- 						   $src);
- 	    }
- 	    $currentstring.='[IMAGE: '.$alttag.']';
- 	}
- 	# and render unto TeX that which is LaTeX
+     # and render unto TeX that which is LaTeX
      } elsif ($target eq 'tex') {
  	#
  	#  The alignment will require some superstructure to be put around
- Line 3084  sub start_img {
+ Line 3274  sub start_img {
  						   ['','bottom','middle','top','left','right'],$token,5);
  	$currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap',
  						   ['', 'none','parbox', 'parpic', 'wrapfigure'], $token, 2);
+         my $alt=    &Apache::lonxml::get_param('alt',$parstack,$safeeval);
+         my $enc=    &Apache::lonxml::get_param('encrypturl',$parstack,$safeeval);
  	$currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl',
  						   ['no','yes'], $token, 2);
+         if (($alt=~/\S/) && (lc($enc) eq 'yes')) {
+            $currentstring.='<br /><span class="LC_warning">'.&mt('Warning: the description "[_1]" will be available, even for encrypted URL',$alt).'</span><br />';
+         }
  	$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);
          if ($token->[2]{'src'}=~/\$/) {
-            $currentstring.='Variable image source';
+            $currentstring.=&mt('Variable image source');
-         } else {
+         } elsif ($token->[2]{'src'}=~/\S/) {
  	   $currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
  	   if ($width) { $currentstring.=' width="'.$width.'" '; }
  	   if ($height) { $currentstring.=' height="'.$height.'" '; }
  	   $currentstring .= ' />';
+         } else {
+            $currentstring.=&mt("No image source specified");
          }
      } elsif ($target eq 'modified') {
  	my ($osrc,$owidth,$oheight)=
- Line 3167  sub start_applet {
+ Line 3364  sub start_applet {
      &Apache::lonxml::extlink($archive);
      my $currentstring = '';
      if ($target eq 'web' || $target eq 'webgrade') {
- 	if ($env{'browser.appletsuppress'} ne 'on') {
+         $currentstring = &Apache::lonenc::encrypt_ref($token,
- 	    $currentstring = &Apache::lonenc::encrypt_ref($token,
+                                                       {'code'=>$code,
- 							  {'code'=>$code,
+                                                        'archive'=>$archive}
- 							   'archive'=>$archive}
+                                                      );
- 							  );
- 	} else {
- 	    my $alttag= &Apache::lonxml::get_param('alt',$parstack,
- 						   $safeeval,undef,1);
- 	    unless ($alttag) {
- 		$alttag=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],
- 						 $code);
- 	    }
- 	    $currentstring='[APPLET: '.$alttag.']';
- 	}
      } elsif ($target eq 'tex') {
- 	# Turn off some stuff we can't be inside thank you LaTeX
+         # Turn off some stuff we can't be inside thank you LaTeX
  	my $restart_sub = 0;
  	my $restart_sup = 0;
- Line 3247  sub start_embed {
+ Line 3433  sub start_embed {
      &Apache::lonxml::extlink($src);
      my $currentstring = '';
      if ($target eq 'web' || $target eq 'webgrade') {
- 	if ($env{'browser.embedsuppress'} ne 'on') {
+     $currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
- 	    $currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
- 	} else {
- 	    my $alttag=&Apache::lonxml::get_param
- 		('alt',$parstack,$safeeval,undef,1);
- 	    unless ($alttag) {
- 		$alttag=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src);
- 	    }
- 	    $currentstring='[EMBED: '.$alttag.']';
- 	}
      } elsif ($target eq 'tex') {
      }
      return $currentstring;
- Line 3266  sub end_embed {
+ Line 3443  sub end_embed {
      my ($target,$token) = @_;
      my $currentstring = '';
      if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring = $token->[2];
+         $currentstring = $token->[2];
      } elsif ($target eq 'tex') {
-     }
+         # ./.
+     }
      return $currentstring;
  }
- Line 3347  sub start_frameset {
+ Line 3525  sub start_frameset {
  	    &Apache::loncommon::start_page($Apache::londefdef::title,
  					   $Apache::londefdef::head,
  					   {'add_entries'    => $token->[2],
- 					    'no_title'       => 1,
+ #					    'no_title'       => 1,
  					    'force_register' => 1,
  					    'frameset'       => 1,});
- Line 3706  sub end_colgroup {
+ Line 3884  sub end_colgroup {
      return $currentstring;
  }
  #-- <del> tag (end tag required)
  sub start_del {
      my ($target,$token) = @_;
      my $currentstring = '';
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
+     } elsif ($target eq 'tex') {
+ 	&disable_para();
+ 	$currentstring .= '\st{';
      }
      return $currentstring;
  }
- Line 3720  sub end_del {
+ Line 3902  sub end_del {
      my ($target,$token) = @_;
      my $currentstring = '';
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
+     } elsif ($target eq 'tex') {
+ 	&enable_para();
+ 	$currentstring = '}';
      }
      return $currentstring;
  }
- Line 4560  sub align_latex_image {
+ Line 4745  sub align_latex_image {
      #    Even though we set a default alignment value, the user
      #    could have given us an illegal value.  In that case we
      #    just use the default alignment of bottom..
-     $currentstring = "\n% figurewrapping \n";
+     $currentstring = '';
      if      ($align eq "top")    {
  	$currentstring .= '\raisebox{-'.$height.'mm}{'.$image;
  	$closure = '}';
- Line 4603  sub align_latex_image {
+ Line 4788  sub align_latex_image {
  	$currentstring .= "{$image";
  	$closure       = '}';
      }
-     $currentstring .= "\n% end wrappage\n";
-     $closure        = "\n% Begin closure\n".$closure."\n% End closure\n";
      return ($currentstring, $closure);
  }
- Line 4621  sub is_inside_of {
+ Line 4804  sub is_inside_of {
  }
+ #
+ #   This sub provides the typical LaTeX prefix matter for tex output:
+ #
+ sub latex_header {
+     my ($mode) = @_;
+     my $currentstring = '';
+     $currentstring .=
+ 	"\n% &Apache::lonxml::londefdef \n" .
+ 	'\documentclass[letterpaper,twoside]{article}\raggedbottom';
+     if (($env{'form.latex_type'}=~'batchmode') ||
+ 	(!$env{'request.role.adv'}) ||
+ 	($mode eq 'batchmode')) {$currentstring .='\batchmode';}
+     $currentstring .= '\newcommand{\keephidden}[1]{}'.
+ 	'\renewcommand{\deg}{$^{\circ}$}'.
+ 	'\usepackage{multirow}'.
+ 	'\usepackage{longtable}'.
+ 	'\usepackage{textcomp}'.
+ 	'\usepackage{makeidx}'.
+ 	'\usepackage[dvips]{graphicx}'.
+ 	'\usepackage{wrapfig}'.
+ 	'\usepackage{picins}'.
+ 	'\usepackage[T1]{fontenc}'."\n".
+ 	'\usepackage{lmodern}'."\n".
+ 	'\usepackage[postscript]{ucs}'."\n".
+ 	'\usepackage[utf8x]{inputenc}'."\n".
+ 	'\usepackage{pifont}' ."\n".
+ 	'\usepackage{latexsym}'."\n".
+ 	'\usepackage{epsfig}'.
+ 	"\\usepackage{xtab}\n".
+ 	"\\usepackage{tabularx}\n".
+ 	"\\usepackage{booktabs}\n".
+ 	"\\usepackage{array}\n".
+ 	"\\usepackage{colortbl}\n".
+ 	"\\usepackage{xcolor}\n".
+ 	'\usepackage{calc}'.
+ 	'\usepackage{amsmath}'.
+     '\usepackage{soul}',
+ 	'\usepackage{amssymb}'.
+ 	'\usepackage{amsfonts}'.
+ 	'\usepackage{amsthm}'.
+ 	'\usepackage{amscd}'
+         .'\usepackage{picins}\usepackage{calc}'."\n". # From lonprintout.pm
+ 	'\usepackage[T1]{fontenc}'."\n".
+ 	'\usepackage{lmodern}'."\n".
+ 	'\usepackage[postscript]{ucs}'."\n".
+ 	'\usepackage[utf8x]{inputenc}'."\n".
+ 	'\usepackage{pifont}'  . "\n";
+     if($env{'form.pdfFormFields'} eq 'yes') {
+ 	$currentstring .= '\usepackage{hyperref}'.
+ 	    '\usepackage{eforms}'.
+ 	    '\usepackage{tabularx}';
+     }
+         $currentstring .= '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'.
+                           '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}';
+     $currentstring .= '\begin{document}';
+     return $currentstring;
+ }
  =pod
  =head1 NAME

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

Removed from v.1.397
changed lines
	Added in v.1.421