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.364 and 1.411

-version 1.364, 2007/04/06 10:41:45
+version 1.411, 2009/10/01 15:31:24
  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();
  use Apache::lonmeta();
+ use Apache::lonlocal;
  use Apache::Constants qw(:common);
  use File::Basename;
  use LONCAPA();
- Line 57  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 106  sub start_m {
+ Line 95  sub start_m {
  	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 127  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 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';
+ 	$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 448  sub start_meta {
+ Line 417  sub start_meta {
  	if ((not defined $content) && (not defined $name)) {
  	    &Apache::lonxml::startredirection();
  	}
+     } elsif ($target eq 'edit') {
+ 	$currentstring .= &Apache::edit::tag_start($target,$token);
+ 	$currentstring .= &Apache::edit::text_arg('Name:','name',$token,30);
+ 	$currentstring .= &Apache::edit::text_arg('Content:','content',$token,70);
+ 	$currentstring .= &Apache::edit::end_row();
+     } elsif ($target eq 'modified') {
+ 	my $constructtag =
+ 	    &Apache::edit::get_new_args($token,$parstack,$safeeval,
+ 					'name','content');
+ 	if ($constructtag) { $currentstring = &Apache::edit::rebuild_tag($token); }
      }
      return $currentstring;
  }
- Line 471  sub end_meta {
+ Line 450  sub end_meta {
      return $currentstring;
  }
+ sub insert_meta {
+     return '
+     <meta />';
+ }
  # accessrule
  sub start_accessrule {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
      my $currentstring = '';
-     my $eff=&Apache::lonxml::get_param
+     my $eff  =&Apache::lonxml::get_param('effect',$parstack,$safeeval,undef,1);
- 	('effect',$parstack,$safeeval,undef,1);
+     my $realm=&Apache::lonxml::get_param('realm', $parstack,$safeeval,undef,1);
-     my $realm=&Apache::lonxml::get_param
+     my $role =&Apache::lonxml::get_param('role',  $parstack,$safeeval,undef,1);
- 	('realm',$parstack,$safeeval,undef,1);
+     my $type =&Apache::lonxml::get_param('type',  $parstack,$safeeval,undef,1);
-     my $role=&Apache::lonxml::get_param
- 	('role',$parstack,$safeeval,undef,1);
+     my ($dom,$crs,$sec,$separator);
-     $realm=~s/\s+//g;
+     if ($type eq 'user') {
-     $realm=~s/\//\_/g;
+ 	($dom,$crs,$sec)=split(m{/},$realm);
-     $realm=~s/^\_//;
+ 	$crs = &LONCAPA::clean_username($crs);
-     $realm=~s/\W/\;/g;
+ 	$separator = '/';
-     $role=~s/\s+//g;
+     } else {
-     $role=~s/\//\_/g;
+ 	($dom,$crs,$sec)=split(/\_/,$realm);
-     $role=~s/\W/\;/g;
+ 	$crs = &LONCAPA::clean_courseid($crs);
+ 	$separator = '_';
+     }
+     $dom = &LONCAPA::clean_domain($dom);
+     $sec =~s/\W//;
+     $realm = $dom;
+     if ($crs =~ /\S/) { $realm .= $separator.$crs; }
+     if ($sec =~ /\S/) { $realm .= $separator.$sec; }
+     $role=~s/\W//g;
      if ($target eq 'web') {
  	my $args='';
  	if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
- Line 498  sub start_accessrule {
+ Line 492  sub start_accessrule {
  	}
      }
      if ($target eq 'meta') {
- 	$currentstring='<rule>'.$eff.':'.$realm.':'.$role.'</rule>';
+ 	$currentstring='<rule>'.$eff.':'.$realm.':'.$role.':'.$type.'</rule>';
      }
      return $currentstring;
  }
- Line 516  sub end_accessrule {
+ Line 510  sub end_accessrule {
      return $currentstring;
  }
+ sub generate_css_links {
+     my $links;
+     my $css_href = &Apache::lonnet::EXT('resource.0.cssfile');
+     if ($css_href =~ /\S/) {
+ 	&Apache::lonxml::extlink($css_href);
+ 	$links .=
+ 	    '<link rel="stylesheet" type="text/css" href="'.$css_href.'" />';
+     }
+     return $links;
+ }
  #-- <body> tag (end tag required)
  sub start_body {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
- Line 530  sub start_body {
+ Line 535  sub start_body {
  	if (&is_inside_of($tagstack, "head")) {
  	    &end_head(@_);
  	}
+ 	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'  => '',
+         });
+     } else {
+         # FIXME Where are we?
+     }
  	$currentstring =
  	    &Apache::loncommon::start_page($Apache::londefdef::title,
- 					   $Apache::londefdef::head,
+ 					   $Apache::londefdef::head
+ 					      .$extra_head,
  					   {'add_entries'    => $token->[2],
- 					    'no_title'       => 1,
+ #					    'no_title'       => 1,
  					    'force_register' => 1});
- 	if ($env{'request.state'} ne 'published') {
+     $currentstring .= &Apache::lonhtmlcommon::breadcrumbs();
- 	    $currentstring.=&Apache::lonmenu::constspaceform();
- 	    $currentstring.=(<<EDITBUTTON);
+         my $header = '';
- <form method="post">
+         if ($env{'request.state'} ne 'published' &&
- <input type="submit" name="editmode" accesskey="e" value="Edit" />
+             $env{'request.state'} ne 'construct') {
- </form>
+             $header=&Apache::lonmenu::constspaceform();
- <br />
+         }
- EDITBUTTON
+         if ($env{'request.state'} ne 'published') {
- 	}
+             $header.=&Apache::londefdef::edit_controls();
- 	$currentstring.=&Apache::lonxml::message_location();
+         }
+         if ($env{'request.state'} eq 'construct') {
+             $currentstring.=&Apache::loncommon::head_subbox(
+                                 &Apache::loncommon::CSTR_pageheader()
+                                .$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">';
+     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').'" /></div>
+ </div>
+ </form>
+ ';
+     return $result;
+ }
  sub end_body {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = &end_p();	# Close off unclosed <p>
- Line 1228  sub start_br {
+ Line 1279  sub start_br {
  		$signal = 1;
  	    }
  	}
- 	if ($signal eq 1) {
+ 	if ($signal != 1) {
- 	    $currentstring .= ' \vskip 0 mm ';
- 	} else {
  	    $currentstring .= '\strut \\\\ \strut ';
  	}
- Line 1328  sub start_font {
+ Line 1377  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 1542  sub start_div {
+ Line 1587  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 1552  sub start_div {
+ Line 1600  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 1592  sub start_a {
+ Line 1641  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 1607  sub end_a {
+ Line 1676  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;
- 	    $currentstring .= ' ({\tt URI:'.&Apache::lonxml::latex_special_symbols($href).'})';
+ 	    # Substitute special symbols... and allow line breaks at each /
- 	} elsif ($name =~ /\S/) {
+ 	    #
+ 	    $href = &Apache::lonxml::latex_special_symbols($href);
+ 	    $href =~ s/\//\/\\-/g;              # Map / to /\- to allow hyphenation.
+ 	    $currentstring .= ' ({\tt URI:'.$href.'})';
+ 	} elsif (($name =~ /\S/) && ($anchorprint=~/^on|anchorprint|yes|1$/i)) {
  	    $currentstring .= ' ({\tt Anchor:'.&Apache::lonxml::latex_special_symbols($name).'})';
  	} else {
  	    $currentstring.='';
- Line 1945  sub end_dd {
+ Line 2022  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 1953  sub start_table {
+ Line 2031  sub start_table {
      if ($target eq 'web' || $target eq 'webgrade') {
  	$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);
+ 	# 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 ($border ne '') {
+ 	    $table->table_border(1);
+ 	    $table->cell_border(1);
+ 	}
+ 	if ($theme ne '') {
+ 	    $table->theme($theme);
+ 	}
+ 	if ($align ne '') {
+ 	    $table->alignment($align);
+ 	}
+ 	# Missing width is most of page width
+ 	if ($width eq "") {
+ 	    $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 2027  sub start_table {
+ Line 2159  sub start_table {
          $Apache::londefdef::table[-1]{'content'}=[];
          $Apache::londefdef::table[-1]{'align'}=[];
          $currentstring.=' \keephidden{NEW TABLE ENTRY}';
+     }
      }
      return $currentstring;
- Line 2039  sub end_table {
+ Line 2171  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 = '';
  	my $WARNING='';
          #width of columns from TeXwidth attributes
+ 	# Protect against unbalanced </table> tag.
+ 	if (scalar(@Apache::londefdef::table) > 0) {
  	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
  	    for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
  		if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]<$Apache::londefdef::table[-1]{'TeXlen'}[$in][$jn]) {
- Line 2135  sub end_table {
+ Line 2286  sub end_table {
  	my @fwidth=@{$Apache::londefdef::table[-1]{'TeXlen'}[0]};#final width array
  	my @adjust=();
          #step 1. adjustment by maximum value
- 	my $space_neeeded=0;
+ 	my $space_needed=0;
  	for (my $jn=0;$jn<=$#max_len;$jn++) {
- 	    $space_neeeded=$space_neeeded+$max_len[$jn];
+ 	    $space_needed=$space_needed+$max_len[$jn];
  	}
- 	if ($space_neeeded<=$available_space) {
+ 	if ($space_needed<=$available_space) {
  	    for (my $jn=0;$jn<=$#max_len;$jn++) {
  		if ($fwidth[$jn]==0) {
- Line 2148  sub end_table {
+ Line 2299  sub end_table {
  	    }
  	} else {
          #step 2. adjustment by minimum value (estimation)
- 	    $space_neeeded=0;
+ 	    $space_needed=0;
  	    for (my $jn=0;$jn<=$#min_len;$jn++) {
- 		$space_neeeded+=$min_len[$jn];
+ 		$space_needed+=$min_len[$jn];
  	    }
- 	    if ($space_neeeded>$available_space) {
+ 	    if ($space_needed>$available_space) {
  		$WARNING=' \textbf{NOT ENOUGH SPACE FOR TABLE} ';
  		for (my $jn=0;$jn<=$#max_len;$jn++) {
  		    if ($fwidth[$jn]==0) {
- Line 2169  sub end_table {
+ Line 2320  sub end_table {
  		    }
  		}
  		if ($how_many_to_scale>0) {
- 		    my $space_to_adjust=($space_neeeded-$available_space)/$how_many_to_scale;
+ 		    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)*)/;
- Line 2191  sub end_table {
+ Line 2342  sub end_table {
  		}
  	    } else {
  	      #step 3. adjustment over minimal + corrections
- 		my $enlarge_coef=$available_space/$space_neeeded;
+ 		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;
- Line 2231  sub end_table {
+ Line 2382  sub end_table {
  	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;
- Line 2283  sub end_table {
+ Line 2437  sub end_table {
  		#  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++) {
- Line 2292  sub end_table {
+ Line 2450  sub end_table {
  			$colspan
  			."}";
  		    if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
- 			$output .= '{|c|}{';
+ 			$output .= '{'.$border_char.'c'.$border_char.'}{';
  		    } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
- 			$output .= '{|r|}{';
+ 			$output .= '{'.$border_char.'r'.$border_char.'}{';
  		    }
  		    else {
- 			$output .= "{|p{$spanwidth mm}|}{";
+ 			$output .= '{'.$border_char."p{$spanwidth mm}".$border_char.'}{';
  		    }
  		} else {
- Line 2313  sub end_table {
+ Line 2471  sub end_table {
  		if ($rowspan > 1) {
  		    if ($colspan == 1) {
  			if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
- 			    $output .= '\multicolumn{1}{|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}{|r|}{';
+ 			    $output .= '\multicolumn{1}{'.$border_char.'r'.$border_char.'}{';
  			    $multirow_aligned = 1;
  			}
  		    }
- Line 2353  sub end_table {
+ Line 2511  sub end_table {
  		#
  		if ($colspan == 1  && $rowspan == 1) {
  		    if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
- 			$output .= '\multicolumn{1}{|c|}{';
+ 			$output .= '\multicolumn{1}{'.$border_char.'c'.$border_char.'}{';
  		    } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
- 			$output .= '\multicolumn{1}{|r|}{';
+ 			$output .= '\multicolumn{1}{'.$border_char.'r'.$border_char.'}{';
  		    }
  		}
- Line 2439  sub end_table {
+ Line 2597  sub end_table {
  	    pop @Apache::londefdef::table;
  	    undef @Apache::londefdef::table;
  	}
+ 	}
+ 	&enable_para();
+     }
      }
      return $currentstring;
  }
- Line 2450  sub start_tr {
+ Line 2611  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 2468  sub start_tr {
+ Line 2642  sub start_tr {
  	push @ {$Apache::londefdef::table[-1]{'minlen'}}, [];
  	push @ {$Apache::londefdef::table[-1]{'maxlen'}}, [];
  	push @ {$Apache::londefdef::table[-1]{'content'}}, [];
+     }
      }
      return $currentstring;
  }
- Line 2478  sub end_tr {
+ Line 2653  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 2486  sub end_tr {
+ Line 2674  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 2522  sub tag_check {
+ Line 2710  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 2537  sub start_td_tex {
+ Line 2766  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 2706  sub end_td_tex {
+ Line 2946  sub end_td_tex {
      }
+     }
      return '';
  }
- Line 2755  sub tagg_check {
+ Line 2995  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 2767  sub start_th_tex {
+ Line 3025  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 2837  sub end_th_tex {
+ Line 3109  sub end_th_tex {
      #make data bold
      $data='\textbf{'.$data.'}';
      push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;
+     }
      return'';
  }
- Line 2938  sub start_img {
+ Line 3211  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 file exist do following:
  	my $origsrc=$src;
  	my ($path,$file) = &get_eps_image($src);
  	# &Apache::lonnet::logthis("Image source: $src result: $path $file");
- Line 2982  sub start_img {
+ Line 3255  sub start_img {
  	# And here's where the semi-quote breaks down: allow the user
          # to edit the beast as well by rendering the problem for edit:
      } elsif ($target eq 'edit') {
+         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').' '.
+ 	    &Apache::edit::browse('src',undef,'alt',$only).' '.
  	    &Apache::edit::search('src',undef,'alt').'<br />';
  	$currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'<br />';
  	$currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5);
- Line 3003  sub start_img {
+ Line 3277  sub start_img {
  	my $width=  &Apache::lonxml::get_param('width',$parstack,$safeeval);
  	my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
+         if ($token->[2]{'src'}=~/\$/) {
- 	$currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
+            $currentstring.='Variable image source';
- 	if ($width) { $currentstring.=' width="'.$width.'" '; }
+         } else {
- 	if ($height) { $currentstring.=' height="'.$height.'" '; }
+ 	   $currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
- 	$currentstring .= ' />';
+ 	   if ($width) { $currentstring.=' width="'.$width.'" '; }
+ 	   if ($height) { $currentstring.=' height="'.$height.'" '; }
+ 	   $currentstring .= ' />';
+         }
      } elsif ($target eq 'modified') {
  	my ($osrc,$owidth,$oheight)=
  	    ($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});
- Line 3255  sub start_frameset {
+ Line 3532  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 4212  sub image_replication {
+ Line 4489  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 4335  sub get_eps_image {
+ Line 4594  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)/i);
-     $src=~s/\.(gif|png|jpg|jpeg)$/\.eps/i;
+     $src=~s/\.(bmp|gif|png|jpg|jpeg)$/\.eps/i;
      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
      &Apache::lonxml::debug("Filelocation gives: $src");
      if (! -e $src) {
- Line 4397  sub eps_generation {
+ Line 4656  sub eps_generation {
      my $temp_file = Apache::File->new('>>'.$filename);
      print $temp_file "$src\n";
      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{/\./}{/};
- Line 4422  sub file_path {
+ Line 4681  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 4470  sub LATEX_length {
+ Line 4726  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 4543  sub align_latex_image {
+ Line 4793  sub align_latex_image {
      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 4565  sub is_inside_of {
+ Line 4806  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{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
+ 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....
+      	}
+ =back
+ =cut
 ;
  __END__

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

Removed from v.1.364
changed lines
	Added in v.1.411