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.378 and 1.462

-version 1.378, 2007/09/20 21:39:13
+version 1.462, 2016/08/13 19:39:40
  Line 42  package Apache::londefdef;
  use Apache::lonnet;
  use strict;
  use Apache::lonxml;
- use Apache::File();
+ use Apache::lontable;
  use Image::Magick;
  use Apache::lonmenu();
  use Apache::lonmeta();
+ use Apache::lonlocal;
+ use Apache::loncommon();
  use Apache::Constants qw(:common);
  use File::Basename;
  use LONCAPA();
- Line 53  use LONCAPA();
+ Line 55  use LONCAPA();
  BEGIN {
-     &Apache::lonxml::register('Apache::londefdef',('a','abbr','acronym','accessrule','address','allow','applet','area','b','base','basefont','bgo','bgsound','big','blink','blockquote','blankspace','body','br','button','caption','center','cite','code','col','colgroup','dd','del','dfn','dir','div','dl','dt','em','embed','externallink','fieldset','font','form','frame','frameset','h1','h2','h3','h4','h5','h6','head','hr','html','i','iframe','img','input','ins','insert','isindex','kbd','keygen','label','layer','legend','li','link','m','map','marquee','menu','meta','multicol','nobr','noembed','noframes','nolayer','noscript','object','ol','optgroup','option','output','p','param','pre','q','s','samp','select','server','small','spacer','span','strike','strong','sub','sup','table','tbody','td','textarea','tfoot','th','thead','title','tr','tt','tthoption','u','ul','var','wbr','hideweboutput'));
+     &Apache::lonxml::register('Apache::londefdef',('a','abbr','acronym','accessrule','address','allow','applet','area','b','base','basefont','bgo','bgsound','big','blink','blockquote','blankspace','body','br','button','caption','center','cite','code','col','colgroup','dd','del','dfn','dir','div','dl','dt','em','embed','externallink','fieldset','font','form','frame','frameset','h1','h2','h3','h4','h5','h6','head','hr','html','i','iframe','img','input','ins','insert','isindex','kbd','keygen','label','layer','legend','li','link','m','map','marquee','menu','meta','multicol','nobr','noembed','noframes','nolayer','noscript','object','ol','optgroup','option','output','p','param','pre','q','s','samp','select','server','small','spacer','span','strike','strong','style','sub','sup','table','tbody','td','textarea','tfoot','th','thead','title','tr','tt','tthoption','u','ul','var','wbr','hideweboutput'));
  }
- #
- #   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 103  sub start_m {
+ Line 92  sub start_m {
      my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
      if ($target eq 'web' || $target eq 'analyze') {
  	&Apache::lonxml::debug("M is starting with:$inside:");
+         if (!($inside =~ /^\s*\$.*\$\s*$/ || $inside =~ /^\s*\\[([].*\\[)\]]\s*$/)) {
+             # Non-math LaTeX will not be rendered correctly with MathJax
+             # and it should be avoided anyway.
+             # On top of that, MathJax will render math without $, but
+             # it will fail with tth. This is worth a warning.
+             # (even though some people might just use latex for printing)
+             &Apache::lonxml::warning(&mt("Missing \$ in &lt;m&gt;."));
+         }
  	my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
  	if ($eval eq 'on') {
  	    $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
- 	    #&Apache::lonxml::debug("M is evaulated to:$inside:");
+ 	    #&Apache::lonxml::debug("M is evaluated to:$inside:");
  	}
  	my $tex = $inside;
  	my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);
  	$currentstring = &Apache::lontexconvert::converted(\$inside,$display);
  	if ($Apache::lontexconvert::errorstring) {
- 	    my $errormsg='<pre>'.&HTML::Entities::encode($Apache::lontexconvert::errorstring,'<>&"').'</pre> occured while attempting to convert this TeX: <pre>';
+ 	    my $errormsg='<pre>'.&HTML::Entities::encode($Apache::lontexconvert::errorstring,'<>&"').'</pre> occurred while attempting to convert this TeX: <pre>';
  	    $tex = &HTML::Entities::encode($tex,'<>&"');
  	    my ($linenumber) =
  		($Apache::lontexconvert::errorstring =~ /Line (\d+)/);
- Line 138  sub start_m {
+ Line 135  sub start_m {
  	# detect simple math mode entry exits, and convert them
          # to use \ensuremath ... unless there's a \verb inside.
  	if (! ($currentstring=~/\\verb/)) {
- 	    if ($currentstring=~/^\s*\$[^\$].*[^\$]\$\s*$/) {
+ 	    if ($currentstring=~/^\s*\$[^\$].*\$\s*$/) {
  		$currentstring=~s/^(\s*)\$/$1/;
  		$currentstring=~s/\$(\s*)$/$1/;
  		$currentstring='\ensuremath{'.$currentstring.'}';
- Line 187  sub start_html {
+ Line 184  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';
+ 	$currentstring .= &latex_header();
- 	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{epsfig}'.
-                           '\usepackage{calc}'.
-                           '\usepackage{amsmath}'.
-                           '\usepackage{amssymb}'.
-                           '\usepackage{amsfonts}'.
-                           '\usepackage{amsthm}'.
-                           '\usepackage{amscd}'.
-                           '\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}}';
      }
      return $currentstring;
  }
- Line 414  sub start_meta {
+ Line 391  sub start_meta {
  	} else {
  	    $currentstring = $token->[4];
  	}
+         if ($env{'form.grade_imsexport'}) {
+             $currentstring = '';
+         }
      } elsif ($target eq 'meta') {
  	unless (&Apache::lonxml::get_param
  		('http-equiv',$parstack,$safeeval,undef,1)) {
- Line 486  sub insert_meta {
+ Line 466  sub insert_meta {
      <meta />';
  }
+ #-- <start> tag
+ sub start_style {
+ 	my ($target, $token, $tagstack, $parstack, $parser, $safeeval, $style) = @_;
+ 	my $currentstring = '';
+ 	if ($target eq 'tex') {
+ 		Apache::lonxml::startredirection();
+ 	} else {
+ 		$currentstring = $token->[4];
+ 	}
+ 	return $currentstring;
+ }
+ sub end_style {
+ 	my ($target, $token, $tagstack, $parstack, $parser, $safeeval) = @_;
+ 	my $currentstring = '';
+ 	if ($target eq 'tex') {
+ 		Apache::lonxml::endredirection();
+ 	} else {
+ 		$currentstring = $token->[2];
+ 	}
+ 	return $currentstring;
+ }
  # accessrule
  sub start_accessrule {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
- Line 569  sub start_body {
+ Line 575  sub start_body {
  	my $extra_head = &generate_css_links();
+     # Breadcrumbs
+     &Apache::lonhtmlcommon::clear_breadcrumbs();
+     if ($env{'request.state'} eq 'construct') {
+         my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
+         &Apache::lonhtmlcommon::add_breadcrumb({
+             'text'  => 'Authoring Space',
+             'href'  => &Apache::loncommon::authorspace($url),
+         });
+         &Apache::lonhtmlcommon::add_breadcrumb({
+             'text'  => 'HTML Editor',
+             'href'  => '',
+         });
+         # breadcrumbs (and tools) will be created
+         # in start_page->bodytag->innerregister
+     } else {
+         # FIXME Where are we?
+     }
+         my $args = {'add_entries'    => $token->[2],
+                     'force_register' => 1,};
+         if ($target eq 'web') {
+             $args->{'print_suppress'} = 1;
+             if ($env{'request.use_absolute'}) {
+                 $args->{'use_absolute'} = $env{'request.use_absolute'};
+             }
+         }
  	$currentstring =
  	    &Apache::loncommon::start_page($Apache::londefdef::title,
  					   $Apache::londefdef::head
- 					      .$extra_head,
+ 					      .$extra_head,$args);
- 					   {'add_entries'    => $token->[2],
+         my $header = '';
- 					    'no_title'       => 1,
+         if ($env{'request.state'} ne 'published' &&
- 					    'force_register' => 1});
+             $env{'request.state'} ne 'construct') {
+             $header=&Apache::lonmenu::constspaceform();
- 	if ($env{'request.state'} ne 'published') {
+         }
- 	    $currentstring.=&Apache::lonmenu::constspaceform();
+         if ($env{'request.state'} ne 'published') {
- 	    $currentstring.=&Apache::londefdef::edit_controls();
+             unless ($env{'form.inhibitmenu'} eq 'yes') {
- 	}
+                 $header.=&edit_controls();
- 	$currentstring.=&Apache::lonxml::message_location();
+             }
+         }
+         if ($env{'request.state'} eq 'construct') {
+             unless ($env{'form.inhibitmenu'} eq 'yes') {
+                 $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 $result .= (<<EDITBUTTON);
+     my ($nochgview) = @_;
- <form method="post">
+     my $result .= '
- <input type="submit" name="editmode" accesskey="e" value="Edit" />
+ <form method="post" action="">
+ <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{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) {
+         my $uri = $env{'request.uri'};
+         my $daxeurl = '/daxepage'.$uri;
+         $result .= '<input type="button" value="'.&mt('Edit with Daxe').'" '.
+                   'onclick="window.open(\''.$daxeurl.'\',\'_blank\');" />';
+     }
+     if (($env{'request.course.id'}) && ($env{'form.forceedit'})) {
+         my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
+         if ($url =~ /\.html?$/i) {
+             my ($cdom,$cnum);
+             if ($env{'request.course.id'}) {
+                 $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                 $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                 if ($env{'request.filename'} =~ m{/userfiles/supplemental/default|\d+/}) {
+                     if (&Apache::lonnet::is_course_upload($env{'request.filename'},
+                                                           $cnum,$cdom)) {
+                         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                                                 ['folderpath','title']);
+                     }
+                 }
+             }
+             my ($symb,$itemtitle,$displayfile,$caller);
+             if ($url =~ m{^/uploaded/$cdom/$cnum/portfolio/syllabus/}) {
+                 $itemtitle = &mt('Syllabus');
+                 $caller = "/public/$cdom/$cnum/syllabus";
+             } else {
+                 $caller = $url;
+                 ($symb,$itemtitle,$displayfile) =
+                     &Apache::lonxml::get_courseupload_hierarchy($url,
+                                                                 $env{'form.folderpath'},
+                                                                 $env{'form.title'});
+             }
+             if (($symb ne '') || ($env{'httpref.'.$url} ne '') ||
+                 ($url =~ m{^/uploaded/$cdom/$cnum/portfolio/syllabus/})) {
+                   $result .= ('&nbsp;' x 3).
+                              &Apache::lonhtmlcommon::dependencies_button()."\n".
+                              &Apache::lonhtmlcommon::dependencycheck_js($symb,
+                                  $itemtitle,$url,$env{'form.folderpath'},$caller)."\n";
+             }
+         }
+     }
+     $result .= '</div>
+ </div>
  </form>
- <br />
+ ';
- EDITBUTTON
      return $result;
  }
- Line 1371  sub start_font {
+ Line 1467  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 1585  sub start_div {
+ Line 1677  sub start_div {
      }
      if ($target eq 'tex') {
  	# 4 possible alignments: left, right, center, and -missing-.
+         # If inside a table row, we must let the table logic
+ 	# do the alignment, however.
+ 	#
  	my $endstring = '';
- Line 1595  sub start_div {
+ Line 1690  sub start_div {
  	    $endstring      = '\end{center}';
  	    if (&is_inside_of($tagstack, "table")) {
  		$currentstring = &center_correction().$currentstring;
+ 		$endstring    .= &center_end_correction();
  	    }
  	}
  	elsif ($align eq 'right') {
- Line 1635  sub start_a {
+ Line 1731  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);
+                         } elsif ($env{'request.course.id'}) {
+                             my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                             my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                             if ($linkurl =~ m{^([^/]|/uploaded/$cdom/$cnum/(docs|supplemental)/)}) {
+                                 my $cleanhref = &clean_docs_httpref($linkurl,$url,$cdom,$cnum);
+                                 if ($cleanhref) {
+                                     &Apache::lonxml::extlink($cleanhref);
+                                 }
+                             }
+                         }
+                     }
+                 }
+             }
+         }
      }
      return $currentstring;
  }
- Line 1650  sub end_a {
+ Line 1775  sub end_a {
  	    &Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);
  	my $name =
  	    &Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);
- 	if ($href =~ /\S/) {
+         my $uriprint =
+             &Apache::lonxml::get_param('uriprint',$parstack,$safeeval,undef,1);
+         my $anchorprint =
+             &Apache::lonxml::get_param('anchorprint',$parstack,$safeeval,undef,1);
+ 	if (($href =~ /\S/) && ($uriprint=~/^on|uriprint|yes|1$/i)) {
  	    $href =~ s/([^\\])%/$1\\\%/g;
  	    # Substitute special symbols... and allow line breaks at each /
  	    #
  	    $href = &Apache::lonxml::latex_special_symbols($href);
  	    $href =~ s/\//\/\\-/g;              # Map / to /\- to allow hyphenation.
  	    $currentstring .= ' ({\tt URI:'.$href.'})';
- 	} elsif ($name =~ /\S/) {
+ 	} elsif (($name =~ /\S/) && ($anchorprint=~/^on|anchorprint|yes|1$/i)) {
  	    $currentstring .= ' ({\tt Anchor:'.&Apache::lonxml::latex_special_symbols($name).'})';
  	} else {
  	    $currentstring.='';
- Line 1948  sub end_dt {
+ Line 2077  sub end_dt {
  sub item_cleanup {
      my $item=&Apache::lonxml::endredirection();
-     $item=~s/\\begin{center}//g;
+     $item=~s/\\begin\{center}//g;
-     $item=~s/\\end{center}//g;
+     $item=~s/\\end\{center}//g;
      return $item;
  }
- Line 1992  sub end_dd {
+ Line 2121  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 2000  sub start_table {
+ Line 2130  sub start_table {
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
- 	push(@Apache::londefdef::table, {});
+ 	&disable_para();	# Can't have paras in a table.
- 	$Apache::londefdef::table[-1]{'row_number'} = -1;
-         #maximum table's width (default coincides with text line length)
+ 	#  Get the parameters that we can do something about:
- 	if ($#Apache::londefdef::table==0) {
- 	    $textwidth=&recalc($env{'form.textwidth'}); #result is always in mm
+ 	my $border = &Apache::lonxml::get_param('border', $parstack, $safeeval, undef, 0);
- 	    $textwidth=~/(\d+\.?\d*)/;
+ 	my $width  = &Apache::lonxml::get_param('TeXwidth', $parstack, $safeeval, undef, 0);
- 	    $textwidth=0.85*$1; #accounts "internal" LaTeX space for table frame
+ 	my $theme  = &Apache::lonxml::get_param('TeXtheme', $parstack, $safeeval, undef, 0);
- 	} else {
+ 	my $align  = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 0);
- 	    if ($Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}]=~/\d/) {
+ 	my $cell_border = &Apache::lonxml::get_param('rules', $parstack, $safeeval, undef, 0);
- 		#the maximum width of nested table is determined by LATeX width of parent cell
- 		$textwidth=$Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}];
+ 	# The only thing that needs any figuring out is the width.. and then only if it is
- 	    } else {
+ 	# a percent. If not it's assumed to be some valid TeX measurement unit e.g. 3.0cm
-               #try to use all space not used before (minus 5% for LaTeX table internal) - rather silly
+ 	#
- 		$textwidth=$Apache::londefdef::table[-2]{'width'};
- 		for (my $i=0;$i<$Apache::londefdef::table[-2]{'counter_columns'};$i++) {
+ 	my $table = new Apache::lontable();
- 		    $textwidth=$textwidth-$Apache::londefdef::table[-2]{'TeXlen'}[0][$i];
+ 	if ((defined $border) && ($border > 0)) {
- 		}
+ 	#    &Apache::lonnet::logthis("Turning on table borders: $border");
+ 	    $table->table_border(1);
+ 	    if (!defined $cell_border) {
+ 		$table->cell_border(1); # Default for rules is all if rules not defined.
  	    }
  	}
- 	# width either comes forced from the TeXwidth or the width parameters.
+ 	if ((defined $cell_border)) {
- 	# in either case it can be a percentage or absolute width.
+ 	    if ($cell_border eq 'all') {
- 	# in the width case we ignore absolute width
+ 		$table->cell_border(1);
- 	my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
+ 	    } elsif ($cell_border eq 'rows') {
- 	if (!defined($TeXwidth)) {
+ 		$table->cell_border(2);
- 	    my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,
+ 	    } elsif ($cell_border eq 'cols') {
- 						       $safeeval,undef,1);
+ 		$table->cell_border(3);
- 	    if ($htmlwidth =~ /%/) {
+ 	    } elsif($cell_border eq 'groups') {
- 		$TeXwidth = $htmlwidth;
+ 		$table->cell_border(4);
  	    } else {
- 		$TeXwidth = $textwidth;
+ 		$table->cell_border(0);
  	    }
  	}
- 	# if the width is specified as a % it is converted to an absolute width.
+ 	if (defined $theme) {
- 	# otherwise.. just plugged right in the hash
+ 	    $table->theme($theme);
+ 	}
+ 	if (defined $align) {
+ 	    $table->alignment($align);
+ 	}
- 	if ($TeXwidth=~/%/) {
+ 	# Missing width is most of page width
- 	    $TeXwidth=~/(\d+)/;
-             $Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;
+ 	if (!(defined $width)) {
- 	} else {
+ 	    $width = '70%';
- 	    $Apache::londefdef::table[-1]{'width'}=$TeXwidth;
  	}
-         #  In the end, however the table width cannot be wider than $textwidth...
+ 	# If a percentage, need to calculate what this means in terms of
+ 	# page width:
- 	if ($Apache::londefdef::table[-1]{'width'} > $textwidth) {
+ 	if ($width =~ /%$/) {
- 	    $Apache::londefdef::table[-1]{'width'} = $textwidth;
+ 	    my $textwidth = &recalc($env{'form.textwidth'});  # Page width in mm.
+ 	    $width =~ s/%//;
+ 	    $width = $width * $textwidth / 100.0;
+ 	    $width .= " mm";
+ 	    $table->width($width);
  	}
-         #table's border
- 	my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);
-         my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0);
- 	unless (defined $border) { $border = 0; }
- 	if ($border) {
- 	    $Apache::londefdef::table[-1]{'hinc'} = '\hline ';
- 	    $Apache::londefdef::table[-1]{'vinc'} = '&';
- 	    $Apache::londefdef::table[-1]{'vvinc'} = '|';
- 	} else {
- 	    $Apache::londefdef::table[-1]{'hinc'} = '';
- 	    $Apache::londefdef::table[-1]{'vinc'} = '&';
- 	    $Apache::londefdef::table[-1]{'vvinc'} = '';
- 	}
- 	if ($#Apache::londefdef::table==0) {
- 	    #    Note that \newline seems to destroy the alignment envs.
- 	    # $Apache::londefdef::table[-1]{'output'}='\strut\newline\strut\setlength{\tabcolsep}{1 mm}';
- 	    $Apache::londefdef::table[-1]{'output'}='\strut'.'\\\\'."\n".'\strut\setlength{\tabcolsep}{1 mm}';
- 	}
- 	$Apache::londefdef::table[-1]{'output'}.=' \noindent \begin{tabular} ';
-         $Apache::londefdef::table[-1]{'TeXlen'}=[];
-         $Apache::londefdef::table[-1]{'objectlen'}=[];
-         $Apache::londefdef::table[-1]{'objectsignal'}=[];
-         $Apache::londefdef::table[-1]{'maxlen'}=[];
-         $Apache::londefdef::table[-1]{'minlen'}=[];
-         $Apache::londefdef::table[-1]{'content'}=[];
-         $Apache::londefdef::table[-1]{'align'}=[];
-         $currentstring.=' \keephidden{NEW TABLE ENTRY}';
+ 	push(@Apache::londefdef::table, $table);
+         $currentstring.=' \keephidden{NEW TABLE ENTRY}';
      }
      return $currentstring;
- Line 2086  sub end_table {
+ Line 2203  sub end_table {
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
- 	my $border =  &Apache::lonxml::get_param('border',$parstack,$safeeval);
- 	my $inmemory = '';
- 	my $output = '';
+ 	my $table = pop(@Apache::londefdef::table);
- 	my $WARNING='';
+ 	my $t     = $table->generate();
-         #width of columns from TeXwidth attributes
+ 	# &Apache::lonnet::logthis("Generating string");
+ 	$currentstring = $t->generate_string();
- 	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
+ 	# &Apache::lonnet::logthis("Generated: $currentstring");
- 	    for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
+ 	&enable_para();
- 		if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]<$Apache::londefdef::table[-1]{'TeXlen'}[$in][$jn]) {
- 		    $Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]=$Apache::londefdef::table[-1]{'TeXlen'}[$in][$jn];
- 		}
- 	    }
- 	}
-         #free space and number of empty columns
- 	my ($available_space,$empty_columns)=($Apache::londefdef::table[-1]{'width'},0);
- 	if ($#Apache::londefdef::table ne 0) {$available_space=0.9*$available_space;}
- 	for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
- 	    if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]==0) {
- 		$empty_columns++;
- 	    } else {
- 		$available_space=$available_space-$Apache::londefdef::table[-1]{'TeXlen'}[0][$jn];
- 	    }
- 	}
-         #boundaries for contents columns
- 	my @min_len=();#columns can not be narrower
- 	my @max_len=();#maximum length of column
- 	my $avg_max;
- 	my $avg_min;
- 	my $counter_cols = $Apache::londefdef::table[-1]{'counter_columns'};
- 	for (my $jn=0;$jn<=$counter_cols; $jn++) {
- 		my ($localmin,$localmax)=(0,0);
- 		for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
- 		    if ($localmin<$Apache::londefdef::table[-1]{'minlen'}[$in][$jn]) {
- 			$localmin=$Apache::londefdef::table[-1]{'minlen'}[$in][$jn];
- 		    }
- 		    if ($localmax<$Apache::londefdef::table[-1]{'maxlen'}[$in][$jn]) {
- 			$localmax=$Apache::londefdef::table[-1]{'maxlen'}[$in][$jn];
- 		    }
- 		}
- 		push @min_len, $localmin;
- 		push @max_len, $localmax;
- 		$avg_max = $localmax + $avg_max;
- 		$avg_min = $localmin + $avg_min;
- 	}
- 	# Does not really matter what the average max/min are if there are no cols.
- 	# and this prevents div 0 in that case.
- 	if ($counter_cols != 0) {
- 	    $avg_max = $avg_max/$counter_cols;
- 	    $avg_min = $avg_min/$counter_cols;
- 	}
- 	#  I don't think the below is needed.. but just in case:
- 	if ($avg_min > $avg_max) {
- 	    my $temp = $avg_min;
- 	    $avg_min = $avg_max;
- 	    $avg_max = $temp;
- 	}
- 	for (my $jn=0;$jn<=$counter_cols;$jn++) {
- 	    my $localmin=0,;
- 	    for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
- 		if ($localmin<$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn]) {
- 		    $localmin=$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn];
- 		}
- 	    }
- 	    if ($max_len[$jn]<$localmin) {
- 		$max_len[$jn]=$localmin;
- 	    	$Apache::londefdef::table[-1]{'objectsignal'}[$jn]=1;
- 	    }#object size is bigger
- 	    if ($min_len[$jn]<$localmin) {
- 		$min_len[$jn]=$localmin;
- 		$Apache::londefdef::table[-1]{'objectsignal'}[$jn]=1;
- 	    }#object size is bigger
- 	    if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]!=0) {
- 		$min_len[$jn]=0;
- 		$max_len[$jn]=0;
- 	    }
- 	    #  Spans seem to be really bothered by max/min = 0.  So if we have one
- 	    #  make it an average joe max/min.
- 	    if ($max_len[$jn] == 0) {
- 		$max_len[$jn] = $avg_max;
- 	    }
- 	    if ($min_len[$jn] == 0) {
- 		$min_len[$jn] = $avg_min;
- 	    }
- 	}
-        #final adjustment of column width
- 	my @fwidth=@{$Apache::londefdef::table[-1]{'TeXlen'}[0]};#final width array
- 	my @adjust=();
-         #step 1. adjustment by maximum value
- 	my $space_needed=0;
- 	for (my $jn=0;$jn<=$#max_len;$jn++) {
- 	    $space_needed=$space_needed+$max_len[$jn];
- 	}
- 	if ($space_needed<=$available_space) {
- 	    for (my $jn=0;$jn<=$#max_len;$jn++) {
- 		if ($fwidth[$jn]==0) {
- 		    $fwidth[$jn]=$max_len[$jn];
- 		}
- 	    }
- 	} else {
-         #step 2. adjustment by minimum value (estimation)
- 	    $space_needed=0;
- 	    for (my $jn=0;$jn<=$#min_len;$jn++) {
- 		$space_needed+=$min_len[$jn];
- 	    }
- 	    if ($space_needed>$available_space) {
- 		$WARNING=' \textbf{NOT ENOUGH SPACE FOR TABLE} ';
- 		for (my $jn=0;$jn<=$#max_len;$jn++) {
- 		    if ($fwidth[$jn]==0) {
- 			$fwidth[$jn]=$min_len[$jn];
- 		    }
- 		}
- 		#check if we have objects which can be scaled
- 		my $how_many_to_scale=0;
- 		my @to_scale=();
- 		for (my $jn=0;$jn<=$#max_len;$jn++) {
- 		    if ($Apache::londefdef::table[-1]{'objectsignal'}[$jn] eq '1') {
- 			$how_many_to_scale++;
- 			push @to_scale, $jn;
- 		    }
- 		}
- 		if ($how_many_to_scale>0) {
- 		    my $space_to_adjust=($space_needed-$available_space)/$how_many_to_scale;
- 		    foreach my $jn (@to_scale) {
- 			for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
- 			    $Apache::londefdef::table[-1]{'content'}[$in][$jn]=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/;
- 			    if ($1 ne '') {
- 				my $current_length=&recalc($1);
- 				$current_length=~/(\d+\.?\d*)/;
- 				$current_length=$current_length-$space_to_adjust;
- 				$Apache::londefdef::table[-1]{'content'}[$in][$jn]=~s/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/width=$current_length mm/;
- 			    }
- 			    $Apache::londefdef::table[-1]{'content'}[$in][$jn]=~m/\[(\d+\.?\d*)\s*mm\]/;
- 			    if ($1 ne '') {
- 				my $current_length=$1;
- 				$current_length=$current_length-$space_to_adjust;
- 				$Apache::londefdef::table[-1]{'content'}[$in][$jn]=~s/\[(\d+\.?\d*)\s*mm\]/\[$current_length mm\]/;
- 			    }
- 			}
- 			$fwidth[$jn]=$fwidth[$jn]-$space_to_adjust;
- 		    }
- 		}
- 	    } else {
- 	      #step 3. adjustment over minimal + corrections
- 		my $enlarge_coef=$available_space/$space_needed;
- 		my $acsessive=0;
- 		for (my $jn=0;$jn<=$#min_len;$jn++) {
- 		    $adjust[$jn]=$min_len[$jn]*$enlarge_coef;
- 		    if ($adjust[$jn]>$max_len[$jn]) {
- 			$fwidth[$jn]=$max_len[$jn];
- 			$acsessive=$acsessive+$adjust[$jn]-$max_len[$jn];
- 			$adjust[$jn]=0;
- 		    }
- 		}
- 		if ($acsessive>0) {
- 		#we have an excess of space and can redistribute it
- 		    my $notempty_columns=0;
- 		    for (my $jn=0;$jn<=$#min_len;$jn++) {
- 			if ($adjust[$jn]!=0) {
- 			    $notempty_columns++;
- 			}
- 		    }
- 		    my $per_column=$acsessive/$notempty_columns;
- 		    for (my $jn=0;$jn<=$#min_len;$jn++) {
- 			if ($adjust[$jn]!=0) {
- 			    $adjust[$jn]+=$per_column;
- 			    $fwidth[$jn]=$adjust[$jn];
- 			}
- 		    }
- 		} else {
- 		    for (my $jn=0;$jn<=$#min_len;$jn++) {
- 			$fwidth[$jn]=$adjust[$jn];
- 		    }
- 		}
- 	    }
- 	}
-         # use all available width or specified width as if not specified,
- 	# the specified width gets defaulted to the available width.
- 	my $current=0;
- 	for (my $i=0;$i<=$#fwidth;$i++) {
- 	    $current+=$fwidth[$i];
- 	}
- 	if ($current == 0) {
-             $current = $Apache::londefdef::table[-1]{'width'};
-         }
- 	my $coef=$Apache::londefdef::table[-1]{'width'}/$current;
- 	for (my $i=0;$i<=$#fwidth;$i++) {
- 	    $fwidth[$i]*=$coef;
- 	}
-         #removing of empty columns if allowed
-         my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0);
- 	if ($permission eq 'yes') {
- 	    my @cleaned_table=();
-             my @cleaned_header=();
- 	    my $colind=0;
- 	    for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
- 		if ($fwidth[$jn]!=0) {
- 		    #we need to copy column
- 		    for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
- 			$cleaned_table[$in][$colind]=$Apache::londefdef::table[-1]{'content'}[$in][$jn];
- 			$cleaned_header[$colind]=$fwidth[$jn];
- 		    }
- 		    $colind++;
- 		}
- 	    }
- 	    $Apache::londefdef::table[-1]{'content'}=\@cleaned_table;
- 	    @fwidth=@cleaned_header;
- 	}
- 	#construct header of the table
- 	my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};
- 	for (my $in=0;$in<=$#fwidth;$in++) {
- 	    $header_of_table.='p{'.$fwidth[$in].' mm}'.$Apache::londefdef::table[-1]{'vvinc'};
- 	}
- 	$header_of_table .= '}';
- 	#fill the table
- 	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
- 	    my $have_rowspan = 0;
- 	    for (my $jn=0;$jn<=$#fwidth;$jn++) {
- 		#-----------------------------------------------------------
-                 #   I think this order of doing things will ensure that
- 		#   single rowspan, columspan and combined row/colspans will
-                 #   work correctly.  LaTeX is delicate here.
- 		#    RF.
- 		# Start a rowspan if necessary:
- 		my $primary_col_width = $fwidth[$jn]; # Width of primary column.
- 		my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn];
- 		my $colspan = $Apache::londefdef::table[-1]{'colspan'}[$in][$jn];
- 		#
- 		#  Do the appropriate magic if this has a colspan
- 		#
- 		my $border_char = "";
- 		if ($border) {
- 		    $border_char = "|";
- 		}
- 		my $spanwidth = 0;
- 		if ($colspan > 1) {
- 		    for (my $spancol = $jn; $spancol < $jn + $colspan; $spancol++) {
- 			$spanwidth += $fwidth[$spancol];
- 		    }
- 		    $output .= '\multicolumn{'.
- 			$colspan
- 			."}";
- 		    if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
- 			$output .= '{'.$border_char.'c'.$border_char.'}{';
- 		    } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
- 			$output .= '{'.$border_char.'r'.$border_char.'}{';
- 		    }
- 		    else {
- 			$output .= '{'.$border_char."p{$spanwidth mm}".$border_char.'}{';
- 		    }
- 		} else {
- 		    $spanwidth = $primary_col_width; # If no span width will be just colwidth
- 		}
- 		# Rowspan... if colspan is 1, and there's an alignment we'll need
- 		# to kick in a multicolumn in order to get the alignment spec.
- 		# this must precede the multirow or LaTex gets quite upset.
- 		# Naturally if colspan > 1 we've already done that above ^
- 		#
- 		my $multirow_aligned = 0;
- 		if ($rowspan > 1) {
- 		    if ($colspan == 1) {
- 			if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
- 			    $output .= '\multicolumn{1}{'.$border_char.'c'.$border_char.'}{';
- 			    $multirow_aligned = 1;
- 			} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
- 			    $output .= '\multicolumn{1}{'.$border_char.'r'.$border_char.'}{';
- 			    $multirow_aligned = 1;
- 			}
- 		    }
- 		    $have_rowspan++;
- 		    if ($multirow_aligned) {
- 			$output .= '\multirow{'.$rowspan.'}[0]{*}{';
- 		    } else {
- 			$output .= '\multirow{'.$rowspan."}[0]{$spanwidth mm}{";
- 		    }
- 		    $Apache::londefdef::table[-1]{'content'}[$in][$jn] =~
- 			s{^\s*\\par\s*}{};
- 		    $Apache::londefdef::table[-1]{'content'}[$in][$jn] =~
- 			s{\s*\\vskip\s*0pt\s*$}{};
- 		    #
- 		    # If we did not throw in a multicolumn to align, then add
- 		    # an extra {
- 		    # so we close correctly without having to keep additional state
- 		    # around
- 		    #
- 		    if (!$multirow_aligned) {
- 			$output .= '{';
- 		    }
- 		}
- 		if (($rowspan eq '^') || ($rowspan eq '_')) {
- 		    $have_rowspan++;
- 		}
- 		    #--------------------------------------------------------------
- 		# For right and center alignment of single cells.
- 		# we are going to use a multicolumn with a span of 1 to specify alignment.
- 		#
- 		if ($colspan == 1  && $rowspan == 1) {
- 		    if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
- 			$output .= '\multicolumn{1}{'.$border_char.'c'.$border_char.'}{';
- 		    } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
- 			$output .= '\multicolumn{1}{'.$border_char.'r'.$border_char.'}{';
- 		    }
- 		}
- 		$output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn];
- 		if (($colspan == 1 && $rowspan == 1)   &&
- 		    (($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') ||
- 		     ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r'))) {
- 		    $output .= '}';
- 		}
- 		# Close off any open multirow:
- 		if ($rowspan > 1) {
- 		    $output .= '}}';
- 		}
- 		#  Close off the colspan...
- 		#
- 		if ($colspan > 1)  {
- 		    $output .= '}';
- 		    $jn += $colspan-1; # Adjust for number of rows really left.
- 		}
-                 if ($jn!=$#fwidth) {$output.=' '.$Apache::londefdef::table[-1]{'vinc'};}
- 	    }
- 	    #  If have_rowspan > 0, and borders are on, then
- 	    #  we need to do more than put an \hline at the bottom of row.
- 	    #  we need to do the appropriate \cline to ensure that
- 	    #  the spanned rows don't have \hlines through them.
- 	    if (($Apache::londefdef::table[-1]{'hinc'} =~ /\\hline/) && $have_rowspan) {
- 		$output .= ' \\\\ ';
- 		for (my $jn=0; $jn<=$#fwidth;$jn++) {
- 		    my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn];
- 		    if ($rowspan ne "^") {
- 			if (($rowspan <= 1) || ($rowspan eq '_')) {
- 			    my $column = $jn+1;
- 			    $output .= '\cline{'.$column.'-'.$column.'} ';
- 			}
- 		    }
- 		}
- 	    } else {
- 		$output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' ';
- 	    }
- 	}
- 	# Note that \newline destroys alignment env's produced  by e.g. <div>
- 	# $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut\newline\strut ';
- 	$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut'.'\\\\'."\n".'\strut ';
- 	if ($#Apache::londefdef::table > 0) {
- 	    my $inmemory = $Apache::londefdef::table[-1]{'output'};
- 	    # Figure out max/and min width  by summing us and then
- 	    # apply that to the current column of the table we nest in
- 	    # if it's larger than the current width or the current width
- 	    # is undefined.
- 	    #
- 	    my $min_nested_width = 0;
- 	    my $max_nested_width = 0;
- 	    for (my $col = 0; $col <= $Apache::londefdef::table[-1]{'counter_columns'}; $col++) {
- 		$min_nested_width +=  $min_len[$col];
- 		$max_nested_width +=  $max_len[$col];
- 	    }
- 	    # Fudge in an extra 5 mm for borders etc:
- 	    $min_nested_width += 5;
- 	    $max_nested_width += 5;
- 	    my $outer_column = $Apache::londefdef::table[-2]{'counter_columns'};
- 	    my $outer_row    = $Apache::londefdef::table[-2]{'row_number'};
- 	    if ($min_nested_width > $Apache::londefdef::table[-2]{'minlen'}[$outer_row][$outer_column]) {
- 		$Apache::londefdef::table[-2]{'minlen'}[$outer_row][$outer_column] = $min_nested_width;
- 	    }
- 	    if ($max_nested_width > $Apache::londefdef::table[-2]{'maxlen'}[$outer_row][$outer_column]) {
- 		$Apache::londefdef::table[-2]{'maxlen'}[$outer_row][$outer_column] = $max_nested_width;
- 	    }
- 	    pop @Apache::londefdef::table;
- 	    push @{$Apache::londefdef::table[-1]{'include'}}, $inmemory;
- 	} else {
- 	    $currentstring .= $Apache::londefdef::table[-1]{'output'};
- 	    pop @Apache::londefdef::table;
- 	    undef @Apache::londefdef::table;
- 	}
      }
      return $currentstring;
  }
- Line 2505  sub start_tr {
+ Line 2223  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 2523  sub start_tr {
+ Line 2254  sub start_tr {
  	push @ {$Apache::londefdef::table[-1]{'minlen'}}, [];
  	push @ {$Apache::londefdef::table[-1]{'maxlen'}}, [];
  	push @ {$Apache::londefdef::table[-1]{'content'}}, [];
+     }
      }
      return $currentstring;
  }
- Line 2533  sub end_tr {
+ Line 2265  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 2541  sub end_tr {
+ Line 2286  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 2577  sub tag_check {
+ Line 2322  sub tag_check {
      }
      return '';
  }
+ #
+ #  Factor out cell configuration hash generation:
+ #
+ sub cell_config_hash {
+     my ($align, $rowspan, $colspan, $width) = @_;
+     if ($rowspan ne '') {
+         $rowspan =~ s/^\s+|\s+$//g;
+     }
+     if ($colspan ne '') {
+         $colspan =~ s/^\s+|\s+$//g;
+     }
+     my %config;
+     if ($align ne '') {
+ 	$config{'halign'} = $align;
+     }
+     if (($colspan =~ /^\d+$/) && ($colspan > 0)) {
+ 	$config{'colspan'} = $colspan;
+     }
+     if (($rowspan =~ /^\d+$/) && ($rowspan > 0)) {
+ 	$config{'rowspan'} = $rowspan;
+     }
+     if ($width ne '') {
+ 	$config{'width'} = $width;
+     }
+     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);
+     my $rowspan = &Apache::lonxml::get_param('rowspan', $parstack, $safeeval);
+     my $colspan = &Apache::lonxml::get_param('colspan', $parstack, $safeeval);
+     my $width   = &Apache::lonxml::get_param('TeXwidth', $parstack, $safeeval);
+     my $config = &cell_config_hash($align, $rowspan, $colspan, $width);
+     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 2592  sub start_td_tex {
+ Line 2387  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 2761  sub end_td_tex {
+ Line 2567  sub end_td_tex {
      }
+     }
      return '';
  }
- Line 2810  sub tagg_check {
+ Line 2616  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 2822  sub start_th_tex {
+ Line 2646  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 2892  sub end_th_tex {
+ Line 2730  sub end_th_tex {
      #make data bold
      $data='\textbf{'.$data.'}';
      push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;
+     }
      return'';
  }
- Line 2928  sub start_img {
+ Line 2767  sub start_img {
  	my $inside = &Apache::lonxml::get_all_text("/img",$parser,$style);
  	return '';
      }
-     &Apache::lonxml::extlink($src);
+     unless ($src =~ m{^data\:image/gif;base64,}) {
+         &Apache::lonxml::extlink($src);
+     }
      my $currentstring = '';
      my $scaling = .3;
     # 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)));
+         unless ($src =~ m{^data\:image/gif;base64,}) {
- 	    $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 2993  sub start_img {
+ Line 2825  sub start_img {
  	# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src");
- 	#if original gif/jpg/png file exist do following:
+ 	#if original bmp/gif/jpg/png/svg file exist do following:
  	my $origsrc=$src;
  	my ($path,$file) = &get_eps_image($src);
  	# &Apache::lonnet::logthis("Image source: $src result: $path $file");
- Line 3040  sub start_img {
+ Line 2872  sub start_img {
          my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures'));
  	$currentstring .=&Apache::edit::tag_start($target,$token);
  	$currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70).
- 	    &Apache::edit::browse('src',undef,'alt',$only).' '.
+                          &Apache::edit::browse_or_search('src',undef,'alt',$only,undef,1).
- 	    &Apache::edit::search('src',undef,'alt').'<br />';
+                          '<br />';
  	$currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'<br />';
  	$currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5);
  	$currentstring .=&Apache::edit::text_arg('height (pixel):','height',$token,5).'<br />';
- Line 3051  sub start_img {
+ Line 2883  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);
+         my $element = &Apache::edit::get_element('src');
+         my $text;
- 	$currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
+         if ($token->[2]{'src'}=~/\$/) {
- 	if ($width) { $currentstring.=' width="'.$width.'" '; }
+            $text = &mt('Variable image source');
- 	if ($height) { $currentstring.=' height="'.$height.'" '; }
+         } elsif ($token->[2]{'src'}=~/\S/) {
- 	$currentstring .= ' />';
+ 	   $currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
+ 	   if ($width) { $currentstring.=' width="'.$width.'" '; }
+ 	   if ($height) { $currentstring.=' height="'.$height.'" '; }
+ 	   $currentstring .= ' id="previewimg_'.$element.'" />';
+         } else {
+            $text = &mt("No image source specified");
+         }
+         $currentstring .= ' <span id="showimg_'.$element.'">'.$text.'</span>';
      } elsif ($target eq 'modified') {
  	my ($osrc,$owidth,$oheight)=
  	    ($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});
- Line 3131  sub start_applet {
+ Line 2975  sub start_applet {
      &Apache::lonxml::extlink($archive);
      my $currentstring = '';
      if ($target eq 'web' || $target eq 'webgrade') {
- 	if ($env{'browser.appletsuppress'} ne 'on') {
+         $currentstring = $token->[4];
- 	    $currentstring = &Apache::lonenc::encrypt_ref($token,
- 							  {'code'=>$code,
- 							   '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 3211  sub start_embed {
+ Line 3041  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 3230  sub end_embed {
+ Line 3051  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;
  }
  #-- <param> tag (end tag forbidden)
  sub start_param {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-     if (&Apache::lonxml::get_param('name',$parstack,
+     my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval,
- 				   $safeeval,undef,1)=~/^cabbase$/i) {
+                                           undef,1);
+     if ($name =~/^cabbase$/i) {
  	my $value=&Apache::lonxml::get_param('value',$parstack,
  					     $safeeval,undef,1);
  	&Apache::lonxml::extlink($value);
-     }
+     } elsif ($name eq 'flashvars') {
+         if (lc(&Apache::lonxml::get_param('type',$parstack,$safeeval,-2,1))
+             eq 'application/x-shockwave-flash') {
+             my $launcher =
+                 &Apache::lonxml::get_param('data',$parstack,$safeeval,-2,1);
+             if ($launcher) {
+                 &Apache::lonxml::extlink($launcher);
+             }
+             my $flashvars=&Apache::lonxml::get_param('value',$parstack,
+                                                      $safeeval,undef,1);
+             if ($flashvars ne '') {
+                 foreach my $item (split(/\&/,$flashvars)) {
+                     my ($key,$value)=split(/=/,$item,2);
+                     if ($key eq 'content') {
+                         if ($value ne '') {
+                             my ($dir) = ($launcher =~ m{(.+/)[^/]+$});
+                             &Apache::lonxml::extlink($dir.$value);
+                         }
+                     } elsif ($key eq 'thumb') {
+                         if ($value ne '') {
+                             &Apache::lonxml::extlink($value);
+                         }
+                     }
+                 }
+             }
+         }
+     }
      my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
-     &Apache::lonxml::extlink($src);
+     if ($src ne '') {
+         &Apache::lonxml::extlink($src);
+     }
      my $currentstring = '';
      if ($target eq 'web' || $target eq 'webgrade') {
  	my %toconvert;
- 	my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
  	if ($src) { $toconvert{'src'}= $src; }
- 	my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval,
- 					    undef,1);
  	if ($name=~/^cabbase$/i) {
  	    $toconvert{'value'}=&Apache::lonxml::get_param('value',$parstack,
  							   $safeeval,undef,1);
- Line 3311  sub start_frameset {
+ Line 3158  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 3619  sub start_caption {
+ Line 3466  sub start_caption {
      my $currentstring = '';
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
- Line 3627  sub end_caption {
+ Line 3474  sub end_caption {
      my ($target,$token) = @_;
      my $currentstring = '';
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 3651  sub end_col {
+ Line 3498  sub end_col {
      return $currentstring;
  }
- #-- <colgroup> tag (end tag optional)
+ #-- <colgroup tag (end tag optional)
  sub start_colgroup {
-     my ($target,$token) = @_;
+     my ($target,$token,$tagstack, $parstack, $parser, $safeeval, $style) = @_;
      my $currentstring = '';
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
+     if ($target eq 'tex') {
+ 	# TODO: Ensure this tag is in a table:
+ 	# Fetch the attributes and build the hash for the
+ 	# call to define_colgroup.
+ 	my $span    = &Apache::lonxml::get_param('span',   $parstack, $safeeval);
+ 	my $halign  = &Apache::lonxml::get_param('halign', $parstack, $safeeval);
+ 	my %colgroup_params;
+ 	if ($span ne '') {
+ 	    $colgroup_params{'span'} = $span;
+ 	}
+ 	if ($halign ne '') {
+ 	    $colgroup_params{'halign'} = $halign;
+ 	}
+ 	my $table = $Apache::londefdef::table[-1];
+ 	$table->define_colgroup(\%colgroup_params);
+     }
      return $currentstring;
  }
- Line 3670  sub end_colgroup {
+ Line 3538  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 3684  sub end_del {
+ Line 3556  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 3732  sub start_iframe {
+ Line 3607  sub start_iframe {
      my ($target,$token) = @_;
      my $currentstring = '';
      if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring = $token->[4];
+         my ($src,$url,$query);
-     }
+         if ($token->[2]->{'src'}) {
+             $src = $token->[2]->{'src'};
+         } elsif ($token->[2]->{'SRC'}) {
+             $src = $token->[2]->{'SRC'};
+         }
+         if ($src) {
+             ($url,$query) = ($src =~ /^([^?]+)\??([^?]*)$/);
+             if ($query =~ /inhibitmenu=yes/) {
+                 $currentstring = $token->[4];
+             } else {
+                 my $inhibit;
+                 if ($url =~ m{^[^/.].*\.x?html?$}) {
+                     $inhibit = 1;
+                 } elsif ($url =~ m{^/(uploaded|res)/.*\.x?html?$}) {
+                     $inhibit = 1;
+                 }
+                 if ($inhibit) {
+                     $currentstring = '<iframe ';
+                     foreach my $attrib (@{$token->[3]}) {
+                         if (lc($attrib) eq 'src') {
+                             if ($query) {
+                                 $query.='&amp;inhibitmenu=yes';
+                             } else {
+                                 $query = 'inhibitmenu=yes';
+                             }
+                             $currentstring .= 'src="'.$url.'?'.$query.'" ';
+                         } else {
+                             $currentstring .= lc($attrib).'="'.$token->[2]->{$attrib}.'" ';
+                         }
+                     }
+                     $currentstring =~ s/\s+$//;
+                     if ($token->[4] =~ m{/>$}) {
+                         $currentstring .= ' />';
+                     } else {
+                         $currentstring .= '>';
+                     }
+                 } else {
+                     $currentstring = $token->[4];
+                 }
+             }
+             if (($url !~ m{^https?://}) && ($env{'request.course.id'})) {
+                 my $docuri = &Apache::lonnet::hreflocation('',$env{'request.filename'});
+                 my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                 my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                 if ($url =~ m{^([^/]|/uploaded/)}) {
+                     my $cleanhref = &clean_docs_httpref($url,$docuri,$cdom,$cnum);
+                     if ($cleanhref) {
+                         &Apache::lonxml::extlink($cleanhref);
+                     }
+                 } elsif (($url =~ m{/res/$LONCAPA::domain_re/}) && ($docuri =~ m{^\Q/uploaded/$cdom/$cnum/docs/\E})) {
+                     if (!&Apache::lonnet::allowed('bre',$url)) {
+                         if (&Apache::lonnet::is_on_map($url)) {
+                             &Apache::lonxml::extlink($url);
+                         }
+                     }
+                 }
+             }
+         } else {
+             $currentstring = $token->[4];
+         }
+     }
      return $currentstring;
  }
- Line 4144  sub start_tbody {
+ Line 4079  sub start_tbody {
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
+     if ($target eq 'tex') {
+ 	# TODO: Ensure this tag is within a table:
+ 	my $table = $Apache::londefdef::table[-1];
+ 	$table->start_body();
+     }
      return $currentstring;
  }
- Line 4153  sub end_tbody {
+ Line 4094  sub end_tbody {
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
+     if($target eq 'tex') {
+ 	# TODO: Ensure this tag is within a table:
+ 	my $table = $Apache::londefdef::table[-1];
+ 	$table->end_body();
+     }
      return $currentstring;
  }
- Line 4163  sub start_tfoot {
+ Line 4110  sub start_tfoot {
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
+     if ($target eq 'tex') {
+         # TODO: ensure this is within a table tag.
+ 	my $table = $Apache::londefdef::table[-1];
+ 	$table->start_foot();
+     }
      return $currentstring;
  }
- Line 4172  sub end_tfoot {
+ Line 4124  sub end_tfoot {
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
+     if ($target eq 'tex') {
+ 	#  TODO: Ensure this is in side a table
+ 	my $table = $Apache::londefdef::table[-1];
+ 	$table->end_foot();
+     }
      return $currentstring;
  }
- Line 4182  sub start_thead {
+ Line 4139  sub start_thead {
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
+     if ($target eq 'tex') {
+ 	# Assume we're in a table... TODO: Verify that and ignore tag if not.
+ 	my $table = $Apache::londefdef::table[-1];
+ 	$table->start_head();
+     }
      return $currentstring;
  }
- Line 4191  sub end_thead {
+ Line 4153  sub end_thead {
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
+     if ($target eq 'tex') {
+      	# TODO: Verify we are in a table and ignore tag if not.
+ 	my $table = $Apache::londefdef::table[-1];
+ 	$table->end_head();
+     }
      return $currentstring;
  }
- Line 4268  sub image_replication {
+ Line 4236  sub image_replication {
      }
      return '';
  }
- #
- #   Get correct sizing parameter for an image given
- #   it's initial ht. and wid.  This allows sizing of
- #   images that are generated on-the-fly (e.g. gnuplot)
- #   as well as serving as a utility for image_size.
- #
- #  Parameter:
- #        height_param
- #        width_param    - Initial picture dimensions.
- #        scaling        - A scale factor.
- #        parstack,      - the current stack of tag attributes
- #                         from the xml parser
- #        safeeval,      - pointer to the safespace
- #        depth,         - from what level in the stack to look for attributes
- #                         (assumes -1 if unspecified)
- #        cis            - look for attrubutes case insensitively
- #                         (assumes false)
- #
- # Returns:
- #   height, width   - new dimensions.
- #
  sub resize_image {
      my ($height_param, $width_param, $scaling,
  	$parstack, $safeeval, $depth, $cis) = @_;
- Line 4391  sub get_eps_image {
+ Line 4341  sub get_eps_image {
  	&Apache::lonnet::repcopy($orig_src); # Failure is not completely fatal.
      }
      &Apache::lonxml::debug("get_eps_image: Original image: $orig_src");
-     my ($spath, $sname, $sext) = &fileparse($src, qr/\.(gif|png|jpg|jpeg)/i);
+     my ($spath, $sname, $sext) = &fileparse($src, qr/\.(bmp|gif|png|jpg|jpeg|svg)/i);
-     $src=~s/\.(gif|png|jpg|jpeg)$/\.eps/i;
+     $src=~s/\.(bmp|gif|png|jpg|jpeg|svg)$/\.eps/i;
      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
      &Apache::lonxml::debug("Filelocation gives: $src");
      if (! -e $src) {
- Line 4411  sub get_eps_image {
+ Line 4361  sub get_eps_image {
  		#if replication failed try to produce eps file dynamically
  		$src=~s/\.ps$/\.eps/;
- 		my $temp_file;
+ 		if (open(FILE,">>/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat")) {
- 		open(FILE,">>/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat");
+ 		    my $newsrc=$orig_src;
- 		my $newsrc=$orig_src;
+ 		    $newsrc =~ s|(.*)/res/|/home/httpd/html/res/|;
- 		$newsrc =~ s|(.*)/res/|/home/httpd/html/res/|;
+ 		    &Apache::lonxml::debug("queueing $newsrc for dynamic eps production.");
- 		&Apache::lonxml::debug("queueing $newsrc for dynamic eps production.");
+ 		    print FILE ("$newsrc\n");
- 		print FILE ("$newsrc\n");
+ 		    close(FILE);
- 		close(FILE);
+                 }
  		$src=~s|/home/httpd/html/res|/home/httpd/prtspool|;
- 		$src=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
+ 		$src=~s|/home/httpd/html/priv/[^/]+/([^/]*)/|/home/httpd/prtspool/$1/|;
  		if ($sext ne "") {	 # Put the ext. back in to uniquify.
  		    $src =~ s/\.eps$/$sext.eps/;
  		}
- Line 4438  sub get_eps_image {
+ Line 4388  sub get_eps_image {
  	print FILE "$src\n";
  	close FILE;
  	$src=~s|/home/httpd/html/res|/home/httpd/prtspool|;
- 	$src=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
+ 	$src=~s|/home/httpd/html/priv/[^/]+/([^/]*)/|/home/httpd/prtspool/$1/|;
      }
      my ($path,$file)=($src=~m|(.*)/([^/]*)$|);
      $path =~ s/ /\_/g;
- Line 4450  sub get_eps_image {
+ Line 4400  sub get_eps_image {
  sub eps_generation {
      my ($src,$file,$width_param) = @_;
      my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat";
-     my $temp_file = Apache::File->new('>>'.$filename);
+     if (open(my $tmpfile,">>$filename")) {
-     print $temp_file "$src\n";
+         print $tmpfile "$src\n";
+         close($tmpfile);
+     }
      my $newsrc = $src;
-     $newsrc =~ s/(\.gif|\.jpg|\.jpeg)$/\.eps/i;
+     $newsrc =~ s/(\.bmp|\.gif|\.jpg|\.jpeg)$/\.eps/i;
      $newsrc=~s{/home/httpd/html/res}{};
-     $newsrc=~s{/home/($LONCAPA::username_re)/public_html/}{/$1/};
+     $newsrc=~s{/home/httpd/html/priv/[^/]+/($LONCAPA::username_re)/}{/$1/};
      $newsrc=~s{/\./}{/};
      $newsrc=~s{/([^/]+)\.(ps|eps)}{/};
      if ($newsrc=~m{/home/httpd/lonUsers/}) {
- Line 4478  sub file_path {
+ Line 4430  sub file_path {
      }
      return $file,$path;
  }
- #  Converts a measurement in to mm from any of
- #  the other valid LaTeX units of measure.
- #  If the units of measure are missing from the
- #  parameter, it is assumed to be in and returned
- #  with mm units of measure
  sub recalc {
      my $argument = shift;
      if (not $argument=~/(mm|cm|in|pc|pt)/) {return $argument.' mm';}
- Line 4507  sub LATEX_length {
+ Line 4456  sub LATEX_length {
      $garbage=~s/^\s+(\S.*)/$1/;#space before
      $garbage=~s/(.*\S)\s+$/$1/;#space after
      $garbage=~s/(\s)+/$1/;#only one space
-     $garbage=~s/(\\begin{([^\}]+)}|\\end{([^\}]+)})//g;#remove LaTeX \begin{...} and \end{...}
+     $garbage=~s/(\\begin\{([^\}]+)}|\\end\{([^\}]+)})//g;#remove LaTeX \begin{...} and \end{...}
-     $garbage=~s/(\$\_\{|\$\_|\$\^{|\$\^|\}\$)//g;#remove $_{,$_,$^{,$^,}$
+     $garbage=~s/(\$\_\{|\$\_|\$\^\{|\$\^|\}\$)//g;#remove $_{,$_,$^{,$^,}$
      $garbage=~s/([^\\])\$/$1/g;#$
-     $garbage=~s/(\\ensuremath\{\_\{|\\ensuremath\{\_|\\ensuremath\{\^{|\\ensuremath\{\^|\})//g;#remove \ensuremath{...}
+     $garbage=~s/(\\ensuremath\{\_\{|\\ensuremath\{\_|\\ensuremath\{\^\{|\\ensuremath\{\^|\})//g;#remove \ensuremath{...}
     $garbage=~s/(\\alpha|\\beta|\\gamma|\\delta|\\epsilon|\\verepsilon|\\zeta|\\eta|\\theta|\\vartheta|\\iota|\\kappa|\\lambda|\\mu|\\nu|\\xi|\\pi|\\varpi|\\rho|\\varrho|\\sigma|\\varsigma|\\tau|\\upsilon|\\phi|\\varphi|\\chi|\\psi|\\omega|\\Gamma|\\Delta|\\Theta|\\Lambda|\\Xi|\\Pi|\\Sigma|\\Upsilon|\\Phi|\\Psi|\\Omega)/1/g;
      $garbage=~s/(\\pm|\\mp|\\times|\\div|\\cdot|\\ast|\\star|\\dagger|\\ddagger|\\amalg|\\cap|\\cup|\\uplus|\\sqcap|\\sqcup|\\vee|\\wedge|\\oplus|\\ominus|\\otimes|\\circ|\\bullet|\\diamond|\\lhd|\\rhd|\\unlhd|\\unrhd|\\oslash|\\odot|\\bigcirc|\\Box|\\Diamond|\\bigtriangleup|\\bigtriangledown|\\triangleleft|\\triangleright|\\setminus|\\wr)/1/g;
      $garbage=~s/(\\le|\\ll|\\leq|\\ge|\\geq|\\gg|\\neq|\\doreq|\\sim|\\simeq|\\subset|\\subseteq|\\sqsubset|\\sqsubseteq|\\in|\\vdash|\\models|\\supset|\\supseteq|\\sqsupset|\\sqsupseteq|\\ni|\\dash|\\perp|\\approx|\\cong|\\equiv|\\propto|\\prec|\\preceq|\\parallel|\\asymp|\\smile|\\frown|\\bowtie|\\succ|\\succeq|\\mid)/1/g;
      $garbage=~s/(\\not<|\\\\not\\le|\\not\\prec|\\not\\preceq|\\not\\subset|\\not\\subseteq|\\not\\sqsubseteq|\\not\\in|\\not>|\\not\\ge|\\not\\succ|\\notsucceq|\\not\\supset|\\notsupseteq|\\not\\sqsupseteq|\\notin|\\not=|\\not\\equiv|\\not\\sim|\\not\\simeq|\\not\\approx|\\not\\cong|\\not\\asymp)/1/g;
      $garbage=~s/(\\leftarrow|\\gets|\\Leftarrow|\\rightarrow|\\to|\\Rightarrow|\\leftrightarrow|\\Leftrightarrow|\\mapsto|\\hookleftarrow|\\leftharpoonup|\\leftkarpoondown|\\rightleftharpoons|\\longleftarrow|\\Longleftarrow|\\longrightarrow|\\Longrightarrow|\\longleftrightarrow|\\Longleftrightarrow|\\longmapsto|\\hookrightarrow|\\rightharpoonup|\\rightharpoondown|\\uparrow|\\Uparrow|\\downarrow|\\Downarrow|\\updownarrow|\\Updownarrow|\\nearrow|\\searrow|\\swarrow|\\nwarrow)/11/g;
      $garbage=~s/(\\aleph|\\hbar|\\imath|\\jmath|\\ell|\\wp|\\Re|\\Im|\\mho|\\prime|\\emptyset|\\nabla|\\surd|\\partial|\\top|\\bot|\\vdash|\\dashv|\\forall|\\exists|\\neg|\\flat|\\natural|\\sharp|\\\||\\angle|\\backslash|\\Box|\\Diamond|\\triangle|\\clubsuit|\\diamondsuit|\\heartsuit|\\spadesuit|\\Join|\\infty)/11/g;
-     $garbage=~s/(\\hat{([^}]+)}|\\check{([^}]+)}|\\dot{([^}]+)}|\\breve{([^}]+)}|\\acute{([^}]+)}|\\ddot{([^}]+)}|\\grave{([^}]+)}|\\tilde{([^}]+)}|\\mathring{([^}]+)}|\\bar{([^}]+)}|\\vec{([^}]+)})/$1/g;
+     $garbage=~s/(\\hat\{([^}]+)}|\\check\{([^}]+)}|\\dot\{([^}]+)}|\\breve\{([^}]+)}|\\acute\{([^}]+)}|\\ddot\{([^}]+)}|\\grave\{([^}]+)}|\\tilde\{([^}]+)}|\\mathring\{([^}]+)}|\\bar\{([^}]+)}|\\vec\{([^}]+)})/$1/g;
      #remove some other LaTeX command
      $garbage=~s|\\(\w+)\\|\\|g;
      $garbage=~s|\\(\w+)(\s*)|$2|g;
- Line 4526  sub LATEX_length {
+ Line 4475  sub LATEX_length {
      return $value;
  }
- #   Wrap image 'stuff' inside of the LaTeX required to implement
- #   alignment:
- #     align_tex_image(align, latex_rendering, image)
- #   Where:
- #     align   - The HTML alignment specification.
- #     latex_rendering - rendering hint for latex.
- #     image   - The LaTeX needed to insert the image itsef.
- #     width,height - dimensions of the image.
- # Returns:
- #    The 1/2 wrapped image and the stuff required to close the
- #    wrappage.  This allows e.g. randomlabel to insert more stuff
- #    into the closure.
- #
  sub align_latex_image {
      my ($align, $latex_rendering, $image, $width, $height) = @_;
      my $currentstring;        # The 1/2 wrapped image.
      my $closure;              # The closure of the wrappage.
+     # if it's none just return it back
+     if ($latex_rendering eq 'none') {
+ 	return ($image,'');
+     }
      #    If there's an alignment specification we need to honor it here.
      #    For the horizontal alignments, we will also honor the
      #    value of the latex specfication.  The default is parbox,
- Line 4551  sub align_latex_image {
+ Line 4494  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 4594  sub align_latex_image {
+ Line 4537  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);
  }
- # is_inside_of $tagstack $tag
- #    This sub returns true if the current state of Xml processing
- #    is inside of the tag.
- # Parameters:
- #     tagstack   - The tagstack from the parser.
- #     tag        - The tag (without the <>'s.).
- # Sample usage:
- #     if (is_inside_of($tagstack "table")) {
- #          # I'm in a table....
- #      }
  sub is_inside_of {
      my ($tagstack, $tag) = @_;
      my @stack = @$tagstack;
- Line 4621  sub is_inside_of {
+ Line 4553  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}'."\n".
+ 	'\usepackage{longtable}'."\n".
+ 	'\usepackage{textcomp}'."\n".
+ 	'\usepackage{makeidx}'."\n".
+ 	'\usepackage[dvips]{graphicx}'."\n".
+ 	'\usepackage{wrapfig}'."\n".
+ 	'\usepackage{picins}'."\n".
+ 	'\usepackage[T1]{fontenc}'."\n".
+ 	'\usepackage{lmodern}'."\n".
+ 	'\usepackage[postscript]{ucs}'."\n".
+ 	'\usepackage[utf8x]{inputenc}'."\n".
+ 	'\usepackage{pifont}'."\n".
+ 	'\usepackage{latexsym}'."\n".
+ 	'\usepackage{epsfig}'."\n".
+ 	'\usepackage{xtab}'."\n".
+ 	'\usepackage{tabularx}'."\n".
+ 	'\usepackage{booktabs}'."\n".
+ 	'\usepackage{array}'."\n".
+ 	'\usepackage{colortbl}'."\n".
+ 	'\usepackage{xcolor}'."\n".
+ 	'\usepackage{calc}'."\n".
+ 	'\usepackage{amsmath}'."\n".
+ 	'\usepackage{soul}'."\n".
+ 	'\usepackage{amssymb}'."\n".
+ 	'\usepackage{amsfonts}'."\n".
+ 	'\usepackage{amsthm}'."\n".
+ 	'\usepackage{amscd}'."\n".
+ 	'\usepackage{actuarialangle}'."\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;
+ }
+ sub clean_docs_httpref {
+     my ($href,$docuri,$cdom,$cnum) = @_;
+     if ($docuri eq '') {
+         $docuri = &Apache::lonnet::hreflocation('',$env{'request.filename'});
+     }
+     if ($cdom eq '') {
+         $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     }
+     if ($cnum eq '') {
+         $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+     }
+     my $cleanhref;
+     if ($docuri =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/)(.+/)[^/]+$}) {
+         my $prefix = $1;
+         my $relpath = $2;
+         my ($hrefpath,$fname);
+         if ($href =~ m{^/}) {
+             if ($href =~ m{^\Q$prefix\E(.+/)([^/]+)$}) {
+                 $hrefpath = $1;
+                 $fname = $2;
+             } else {
+                 return $cleanhref;
+             }
+         } else {
+             if ($href =~ m{/}) {
+                 (my $path,$fname) = ($href =~ m{^(.*)/([^/]*)$});
+                 $hrefpath = $relpath.$path;
+                 if ($path eq '') {
+                     $hrefpath =~ s{/$}{};
+                 }
+             } else {
+                 $fname = $href;
+                 $hrefpath = $relpath;
+                 $hrefpath =~ s{/$}{};
+             }
+         }
+         if ($fname ne '') {
+             my $cleanrelpath;
+             foreach my $dir (split(/\//,$hrefpath)) {
+                 next if ($dir eq '.');
+                 if ($dir eq '..') {
+                     $cleanrelpath =~ s{([^/]+/)$}{};
+                 } else {
+                     $cleanrelpath .= $dir.'/';
+                 }
+             }
+             if ($cleanrelpath ne '') {
+                 $cleanhref = $prefix.$cleanrelpath.$fname;
+             } else {
+                 $cleanhref = $prefix.$fname;
+             }
+         }
+     }
+     return $cleanhref;
+ }
+ =pod
+ =head1 NAME
+ Apache::londefdef.pm
+ =head1 SYNOPSIS
+ Tags Default Definition Module
+ This is part of the LearningOnline Network with CAPA project
+ described at http://www.lon-capa.org.
+ =head1 NOTABLE SUBROUTINES
+ =over
+ =item start_hideweboutput()
+ =item end_hideweboutput()
+ =item image_replication()
+ =item resize_image()
+ 	Get correct sizing parameter for an image given
+ 	it's initial ht. and wid.  This allows sizing of
+ 	images that are generated on-the-fly (e.g. gnuplot)
+ 	as well as serving as a utility for image_size.
+ 	Parameter:
+         height_param
+         width_param    - Initial picture dimensions.
+         scaling        - A scale factor.
+         parstack,      - the current stack of tag attributes
+                          from the xml parser
+         safeeval,      - pointer to the safespace
+         depth,         - from what level in the stack to look for attributes
+                          (assumes -1 if unspecified)
+         cis            - look for attrubutes case insensitively
+                          (assumes false)
+ 	Returns:
+ 		height, width   - new dimensions.
+ =item image_size()
+ =item image_width()
+ =item image_height()
+ =item get_eps_image()
+ =item eps_generation()
+ =item file_path()
+ =item recalc()
+ 	Converts a measurement in to mm from any of
+ 	the other valid LaTeX units of measure.
+ 	If the units of measure are missing from the
+ 	parameter, it is assumed to be in and returned
+ 	with mm units of measure
+ =item LATEX_length()
+ =item align_latex_image()
+   	Wrap image 'stuff' inside of the LaTeX required to implement
+    	alignment:
+      	align_tex_image(align, latex_rendering, image)
+    	Where:
+      	align   - The HTML alignment specification.
+      	latex_rendering - rendering hint for latex.
+      	image   - The LaTeX needed to insert the image itsef.
+      	width,height - dimensions of the image.
+  	Returns:
+     	The 1/2 wrapped image and the stuff required to close the
+     	wrappage.  This allows e.g. randomlabel to insert more stuff
+     	into the closure.
+ =item is_inside_of($tagstack, $tag)
+    	This sub returns true if the current state of Xml processing is inside of the tag.
+ 	Parameters:
+     	tagstack   - The tagstack from the parser.
+     	tag        - The tag (without the <>'s.).
+ 	Sample usage:
+     	if (is_inside_of($tagstack "table")) {
+      	   I'm in a table....
+      	}
+ =item clean_docs_httpref($href,$docuri,$cdom,$cnum)
+         HTML pages uploaded to a course which contain dependencies either from iframes,
+         javascript files or objects (FlashPlayerSwf, MediaSrc, XMPSrc, ConfigurationSrc,
+         and PosterImageSrc) for which dependency is another file uploaded to the same
+         course.
+         Required input:
+         href - dependency (either a relative URL, or an absolute URL)
+         Optional inputs:
+         docuri - URL of HTML page containing the dependency
+         cdom - Course domain
+         cnum - CourseID
+         Output:
+         returns an absolute URL constructed from the href provided, and the calling context.
+         (this will be null, if the URL does not begin: /uploaded/$cdom/$cnum/docs/ or
+         /uploaded/$cdom/$cnum/supplemental/).
+ =back
+ =cut
 ;
  __END__

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

Removed from v.1.378
changed lines
	Added in v.1.462