--- loncom/xml/londefdef.pm 2007/01/22 11:28:08 1.353 +++ loncom/xml/londefdef.pm 2013/09/26 22:03:36 1.447 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.353 2007/01/22 11:28:08 foxr Exp $ +# $Id: londefdef.pm,v 1.447 2013/09/26 22:03:36 raeburn Exp $ # # # Copyright Michigan State University Board of Trustees @@ -42,10 +42,12 @@ 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(); @@ -53,24 +55,11 @@ 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 = (); @@ -106,13 +95,13 @@ 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='
'.&HTML::Entities::encode($Apache::lontexconvert::errorstring,'<>&"').'
occured while attempting to convert this TeX:
';
+	    my $errormsg='
'.&HTML::Entities::encode($Apache::lontexconvert::errorstring,'<>&"').'
occurred while attempting to convert this TeX:
';
 	    $tex = &HTML::Entities::encode($tex,'<>&"');
 	    my ($linenumber) =
 		($Apache::lontexconvert::errorstring =~ /Line (\d+)/);
@@ -128,6 +117,7 @@ sub start_m {
 	#&Apache::lonxml::debug("M is ends with:$currentstring:");
 	$Apache::lonxml::post_evaluate=0;
     } elsif ($target eq 'tex') {
+
 	$currentstring = $inside;
 	my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
 	if ($eval eq 'on') {
@@ -135,11 +125,13 @@ sub start_m {
 	}
 	if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';}
 	# detect simple math mode entry exits, and convert them
-        # to use \ensuremath
-	if ($currentstring=~/^\s*\$[^\$].*[^\$]\$\s*$/) {
-	    $currentstring=~s/^(\s*)\$/$1/;
-	    $currentstring=~s/\$(\s*)$/$1/;
-	    $currentstring='\ensuremath{'.$currentstring.'}';
+        # to use \ensuremath ... unless there's a \verb inside.
+	if (! ($currentstring=~/\\verb/)) {
+	    if ($currentstring=~/^\s*\$[^\$].*\$\s*$/) {
+		$currentstring=~s/^(\s*)\$/$1/;
+		$currentstring=~s/\$(\s*)$/$1/;
+		$currentstring='\ensuremath{'.$currentstring.'}';
+	    }
 	}
 	$Apache::lonxml::post_evaluate=0;
     }
@@ -184,28 +176,8 @@ sub start_html {
     if ($target eq 'web' || $target eq 'edit' || $target eq 'webgrade' ) {
 	# start_body() takes care of emitting the  
     } elsif ($target eq 'tex') {
-	$currentstring .= 
-	    '\documentclass[letterpaper,twoside]{article}\raggedbottom';
-	if (($env{'form.latex_type'}=~'batchmode') ||
-            (!$env{'request.role.adv'})) {$currentstring .='\batchmode';} 
-	$currentstring .= '\newcommand{\keephidden}[1]{}'.
-                          '\renewcommand{\deg}{$^{\circ}$}'.
-			  '\usepackage{multirow}'.
-                          '\usepackage{longtable}'.
-                          '\usepackage{textcomp}'.
-                          '\usepackage{makeidx}'.
-                          '\usepackage[dvips]{graphicx}'.
-			  '\usepackage{wrapfig}'.
-			  '\usepackage{picins}'.
-                          '\usepackage{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}}';
+
+	$currentstring .= &latex_header();
     }
     return $currentstring;
 }
@@ -411,6 +383,9 @@ 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)) {
@@ -445,6 +420,16 @@ 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;
 }
@@ -468,23 +453,64 @@ sub end_meta {
     return $currentstring;
 }
 
+sub insert_meta {
+    return '
+    ';
+}
+
+#--  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) = @_;
     my $currentstring = '';
-    my $eff=&Apache::lonxml::get_param
-	('effect',$parstack,$safeeval,undef,1);
-    my $realm=&Apache::lonxml::get_param
-	('realm',$parstack,$safeeval,undef,1);
-    my $role=&Apache::lonxml::get_param
-	('role',$parstack,$safeeval,undef,1);
-    $realm=~s/\s+//g;
-    $realm=~s/\//\_/g;
-    $realm=~s/^\_//;
-    $realm=~s/\W/\;/g;
-    $role=~s/\s+//g;
-    $role=~s/\//\_/g;
-    $role=~s/\W/\;/g;
+    my $eff  =&Apache::lonxml::get_param('effect',$parstack,$safeeval,undef,1);
+    my $realm=&Apache::lonxml::get_param('realm', $parstack,$safeeval,undef,1);
+    my $role =&Apache::lonxml::get_param('role',  $parstack,$safeeval,undef,1);
+    my $type =&Apache::lonxml::get_param('type',  $parstack,$safeeval,undef,1);
+
+    my ($dom,$crs,$sec,$separator);
+    if ($type eq 'user') {
+	($dom,$crs,$sec)=split(m{/},$realm);
+	$crs = &LONCAPA::clean_username($crs);
+	$separator = '/';
+    } else {
+	($dom,$crs,$sec)=split(/\_/,$realm);
+	$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]; }
@@ -495,7 +521,7 @@ sub start_accessrule {
 	}
     }
     if ($target eq 'meta') {
-	$currentstring=''.$eff.':'.$realm.':'.$role.'';
+	$currentstring=''.$eff.':'.$realm.':'.$role.':'.$type.'';
     }
     return $currentstring;
 }
@@ -513,6 +539,17 @@ 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 .= 
+	    '';
+    }
+    return $links;
+}
+
 #--  tag (end tag required)
 sub start_body {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
@@ -527,29 +564,118 @@ 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') {
+        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?
+    }
+
 	$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::lonmenu::constspaceform();
-	    $currentstring.=(<
-
-
-
-EDITBUTTON - } - $currentstring.=&Apache::lonxml::message_location(); + my $header = ''; + if ($env{'request.state'} ne 'published' && + $env{'request.state'} ne 'construct') { + $header=&Apache::lonmenu::constspaceform(); + } + if ($env{'request.state'} ne 'published') { + unless ($env{'form.inhibitmenu'} eq 'yes') { + $header.=&edit_controls(); + } + } + 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 ($nochgview) = @_; + my $result .= ' +
+
'; + unless ($nochgview) { + $result .= ' +
'. +&Apache::lonxml::renderingoptions().' + +
'; + } + $result .= ' +
'; + 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 .= (' ' x 3). + &Apache::lonhtmlcommon::dependencies_button()."\n". + &Apache::lonhtmlcommon::dependencycheck_js($symb, + $itemtitle,$url,$env{'form.folderpath'},$caller)."\n"; + } + } + } + $result .= '
+
+
+'; + return $result; +} + sub end_body { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = &end_p(); # Close off unclosed

@@ -1225,13 +1351,10 @@ sub start_br { $signal = 1; } } - if ($signal eq 1) { - $currentstring .= ' \vskip 0 mm '; - } elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') { + if ($signal != 1) { $currentstring .= '\strut \\\\ \strut '; - } else { # Honor break in simple - $currentstring .= '}} \strut \\\\ \strut \ensuremath{^{'; } + } return $currentstring; } @@ -1326,10 +1449,6 @@ 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); @@ -1413,7 +1532,7 @@ sub start_sub { if ($target eq 'web' || $target eq 'webgrade') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring .= '\ensuremath{_{'; + $currentstring .= '\raisebox{-\smallskipamount}{\scriptsize{'; } return $currentstring; } @@ -1436,7 +1555,7 @@ sub start_sup { if ($target eq 'web' || $target eq 'webgrade') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring .= '\ensuremath{^{'; + $currentstring .= '\raisebox{\smallskipamount}{\scriptsize{'; } return $currentstring; } @@ -1459,6 +1578,27 @@ sub start_hr { if ($target eq 'web' || $target eq 'webgrade') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { + + #


can't be inside of thank you LaTeX. + # + my $restart_sub = 0; + my $restart_sup = 0; + + # Since and are simple tags it's ok to turn off/on + # using the start_ stop_ functions.. those tags only care about + # $target. + + if (&is_inside_of($tagstack, "sub")) { + $restart_sub = 1; + $currentstring .= &end_sub($target, $token, $tagstack, + $parstack, $parser, $safeeval); + } + if (&is_inside_of($tagstack, "sup")) { + $restart_sup = 1; + $currentstring .= &end_sup($target, $token, $tagstack, + $parstack, $parser, $safeeval); + } + my $LaTeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); if (defined $LaTeXwidth) { if ($LaTeXwidth=~/^%/) { @@ -1479,6 +1619,16 @@ sub start_hr { } $currentstring .= ' \vskip 0 mm \noindent\makebox['.$LaTeXwidth.']{'.$pre.'\makebox['. $LaTeXwidth.'][b]{\hrulefill}'.$post.'}\vskip 0 mm '; + # Turn stuff back on that we can't be inside of. + + if ($restart_sub) { + $currentstring .= &start_sub($target, $token, $tagstack, + $parstack, $parser, $safeeval); + } + if ($restart_sup) { + $currentstring .= &start_sup($target, $token, $tagstack, + $parstack, $parser, $safeeval); + } } return $currentstring; } @@ -1509,6 +1659,9 @@ 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 = ''; @@ -1519,6 +1672,7 @@ sub start_div { $endstring = '\end{center}'; if (&is_inside_of($tagstack, "table")) { $currentstring = ¢er_correction().$currentstring; + $endstring .= ¢er_end_correction(); } } elsif ($align eq 'right') { @@ -1559,6 +1713,35 @@ 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/)}) { + my $cleanhref = &Apache::londefdef::clean_docs_httpref($linkurl,$url,$cdom,$cnum); + if ($cleanhref) { + &Apache::lonxml::extlink($cleanhref); + } + } + } + } + } + } + } } return $currentstring; } @@ -1574,10 +1757,18 @@ 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).'})'; - } elsif ($name =~ /\S/) { + # 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/) && ($anchorprint=~/^on|anchorprint|yes|1$/i)) { $currentstring .= ' ({\tt Anchor:'.&Apache::lonxml::latex_special_symbols($name).'})'; } else { $currentstring.=''; @@ -1912,7 +2103,8 @@ sub end_dd { # only way I could think of to allow

in # 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 = ''; @@ -1920,88 +2112,68 @@ sub start_table { if ($target eq 'web' || $target eq 'webgrade') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - push(@Apache::londefdef::table, {}); - $Apache::londefdef::table[-1]{'row_number'} = -1; - #maximum table's width (default coincides with text line length) - if ($#Apache::londefdef::table==0) { - $textwidth=&recalc($env{'form.textwidth'}); #result is always in mm - $textwidth=~/(\d+\.?\d*)/; - $textwidth=0.95*$1; #accounts "internal" LaTeX space for table frame - } else { - if ($Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}]=~/\d/) { - #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'}]; - } else { - #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++) { - $textwidth=$textwidth-$Apache::londefdef::table[-2]{'TeXlen'}[0][$i]; - } + &disable_para(); # Can't have paras in a table. + + # Get the parameters that we can do something about: + + my $border = &Apache::lonxml::get_param('border', $parstack, $safeeval, undef, 0); + my $width = &Apache::lonxml::get_param('TeXwidth', $parstack, $safeeval, undef, 0); + my $theme = &Apache::lonxml::get_param('TeXtheme', $parstack, $safeeval, undef, 0); + my $align = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 0); + my $cell_border = &Apache::lonxml::get_param('rules', $parstack, $safeeval, undef, 0); + + # The only thing that needs any figuring out is the width.. and then only if it is + # a percent. If not it's assumed to be some valid TeX measurement unit e.g. 3.0cm + # + + my $table = new Apache::lontable(); + if ((defined $border) && ($border > 0)) { + # &Apache::lonnet::logthis("Turning on table borders: $border"); + $table->table_border(1); + if (!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. - # in either case it can be a percentage or absolute width. - # in the width case we ignore absolute width - my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); - if (!defined($TeXwidth)) { - my $htmlwidth = &Apache::lonxml::get_param('width',$parstack, - $safeeval,undef,1); - if ($htmlwidth =~ /%/) { - $TeXwidth = $htmlwidth; - } else { - $TeXwidth = $textwidth; + if ((defined $cell_border)) { + if ($cell_border eq 'all') { + $table->cell_border(1); + } elsif ($cell_border eq 'rows') { + $table->cell_border(2); + } elsif ($cell_border eq 'cols') { + $table->cell_border(3); + } elsif($cell_border eq 'groups') { + $table->cell_border(4); + } else { + $table->cell_border(0); } - } else { - $Apache::londefdef::table[-1]{'forcedtablewidth'} = 1; } - if ($TeXwidth=~/%/) { - $Apache::londefdef::table[-1]{'percent'}=1; - $TeXwidth=~/(\d+)/; - $Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100; - } else { - $Apache::londefdef::table[-1]{'width'}=$TeXwidth; + if (defined $theme) { + $table->theme($theme); } - # In the end, however the table width cannot be wider than $textwidth... - - if ($Apache::londefdef::table[-1]{'width'} > $textwidth) { - $Apache::londefdef::table[-1]{'width'} = $textwidth; + if (defined $align) { + $table->alignment($align); } - #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'}=[]; - if (&is_inside_of($tagstack, 'sup')) { - $currentstring .= '}} \\\\ \ensuremath{^{ '; + # Missing width is most of page width + + if (!(defined $width)) { + $width = '70%'; } - if (&is_inside_of($tagstack, 'sub')) { - $currentstring .= '}} \\\\ \ensuremath{_{ '; + + # 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); } - $currentstring.=' \keephidden{NEW TABLE ENTRY}'; + push(@Apache::londefdef::table, $table); + $currentstring.=' \keephidden{NEW TABLE ENTRY}'; } return $currentstring; @@ -2013,360 +2185,15 @@ sub end_table { if ($target eq 'web' || $target eq 'webgrade') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - my $inmemory = ''; - my $output = ''; - my $WARNING=''; - #width of columns from TeXwidth attributes - - 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]) { - $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 - for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$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; - } - for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$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; - } - } - #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_neeeded=0; - for (my $jn=0;$jn<=$#max_len;$jn++) { - $space_neeeded=$space_neeeded+$max_len[$jn]; - } - if ($space_neeeded<=$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_neeeded=0; - for (my $jn=0;$jn<=$#min_len;$jn++) { - $space_neeeded+=$min_len[$jn]; - } - if ($space_neeeded>$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_neeeded-$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_neeeded; - 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 if it is defined in % or as TeXwidth - if (($Apache::londefdef::table[-1]{'percent'}==1) || ($Apache::londefdef::table[-1]{'forcetablewidth'}==1)) { - my $current=0; - for (my $i=0;$i<=$#fwidth;$i++) { - $current+=$fwidth[$i]; - } - 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 $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 - # - - if ($colspan > 1) { - my $spanwidth = 0; - 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 .= '{|c|}{'; - } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { - $output .= '{|r|}{'; - } - else { - $output .= "{|p{$spanwidth mm}|}{"; - } - - } - - # 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}{|c|}{'; - $multirow_aligned = 1; - } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { - $output .= '\multicolumn{1}{|r|}{'; - $multirow_aligned = 1; - } - } - $have_rowspan++; - $output .= '\multirow{'.$rowspan.'}[0]{*}{'; - - $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}{|c|}{'; - } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { - $output .= '\multicolumn{1}{|r|}{'; - } - } - - $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.

- # $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; - } + + + my $table = pop(@Apache::londefdef::table); + my $t = $table->generate(); + # &Apache::lonnet::logthis("Generating string"); + $currentstring = $t->generate_string(); + # &Apache::lonnet::logthis("Generated: $currentstring"); + &enable_para(); + } return $currentstring; } @@ -2378,6 +2205,19 @@ 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 '') { @@ -2396,6 +2236,7 @@ sub start_tr { push @ {$Apache::londefdef::table[-1]{'minlen'}}, []; push @ {$Apache::londefdef::table[-1]{'maxlen'}}, []; push @ {$Apache::londefdef::table[-1]{'content'}}, []; + } } return $currentstring; } @@ -2406,6 +2247,19 @@ sub end_tr { if ($target eq 'web' || $target eq 'webgrade') { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { + + # In case the user is missing a or 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); } @@ -2414,7 +2268,7 @@ 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'}; } - + } } @@ -2450,9 +2304,59 @@ 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]; @@ -2465,11 +2369,22 @@ 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'}; @@ -2518,9 +2433,11 @@ sub end_td_tex { my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); if (defined $TeXwidth) { - push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; - push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; - push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + for (my $c = 0; $c < $colspan; $c++) { + push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + } } else { if (($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) or ($data=~m/\[(\d+\.?\d*)\s*mm\]/)) { my $garbage_data=$data; @@ -2536,10 +2453,12 @@ sub end_td_tex { if ($fwidth<$current_length) {$fwidth=$current_length;} $garbage_data=~s/\[(\d+\.?\d*)\s*mm\]//; } - push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; - push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth; - push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; - push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + for (my $c = 0; $c < $colspan; $c++) { + push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth; + push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + } } elsif ($data=~/\\parbox\{\s*\d+\.?\d*\s*(mm|cm|in|pc|pt)*\s*\}/ or $data=~/\\epsfxsize\s*=\s*\d+\.?\d*\s*(mm|cm|in|pc|pt)*/) { my $garbage_data=$data; my $fwidth=0; @@ -2555,10 +2474,12 @@ sub end_td_tex { if ($fwidth<$1) {$fwidth=$1;} $garbage_data=~s/\\epsfxsize\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)//; } - push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; - push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth; - push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; - push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + for (my $c = 0; $c < $colspan; $c++) { + push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth; + push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + } $data=~s/\\\\\s*$//; } else { $data=~s/^\s+(\S.*)/$1/; @@ -2586,10 +2507,12 @@ sub end_td_tex { if ($min_length<$lengthword) {$min_length=$lengthword;} } } - push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; - push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; - push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$current_length; - push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length; + for (my $c = 0; $c < $colspan; $c++) { + push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$current_length; + push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length; + } } } # Substitute all of the tables nested in this cell in their appropriate places. @@ -2626,7 +2549,7 @@ sub end_td_tex { } - + } return ''; } @@ -2675,6 +2598,24 @@ 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]; @@ -2687,12 +2628,26 @@ 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 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); @@ -2757,6 +2712,7 @@ sub end_th_tex { #make data bold $data='\textbf{'.$data.'}'; push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data; + } return''; } @@ -2800,24 +2756,13 @@ sub start_img { # Render unto browsers that which are the browser's... if ($target eq 'web' || $target eq 'webgrade') { - if ($env{'browser.imagesuppress'} ne 'on') { - my $enc = ('yes' eq - lc(&Apache::lonxml::get_param('encrypturl',$parstack, - $safeeval))); - $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}, - $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 + my $enc = ('yes' eq + lc(&Apache::lonxml::get_param('encrypturl',$parstack, + $safeeval))); + $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}, + $enc); + # and render unto TeX that which is LaTeX } elsif ($target eq 'tex') { # # The alignment will require some superstructure to be put around @@ -2858,7 +2803,7 @@ 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"); @@ -2879,9 +2824,13 @@ sub start_img { $size=~s/,$/]/; $currentstring .= '\graphicspath{{'.$path.'}}' .'\includegraphics'.$size.'{'.$file.'} '; - $currentstring = &align_latex_image($align, $latex_rendering, - $currentstring, - $width_param, $height_param); + my $closure; + ($currentstring, $closure) = &align_latex_image($align, + $latex_rendering, + $currentstring, + $width_param, + $height_param); + $currentstring .= $closure; } else { &Apache::lonxml::debug("$src does not exist"); @@ -2898,9 +2847,10 @@ 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').'
'; $currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'
'; $currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5); @@ -2911,19 +2861,29 @@ 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.='
'.&mt('Warning: the description "[_1]" will be available, even for encrypted URL',$alt).'
'; + } $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); - - $currentstring .= ''.$alt.'[2]{'src'}=~/\$/) { + $currentstring.=&mt('Variable image source'); + } elsif ($token->[2]{'src'}=~/\S/) { + $currentstring .= ''.$alt.'[2]{'src'},$token->[2]{'width'},$token->[2]{'height'}); @@ -2991,21 +2951,30 @@ sub start_applet { &Apache::lonxml::extlink($archive); my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - if ($env{'browser.appletsuppress'} ne 'on') { - $currentstring = &Apache::lonenc::encrypt_ref($token, - {'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.']'; - } + $currentstring = $token->[4]; } elsif ($target eq 'tex') { + # Turn off some stuff we can't be inside thank you LaTeX + + my $restart_sub = 0; + my $restart_sup = 0; + + # Since and are simple tags it's ok to turn off/on + # using the start_ stop_ functions.. those tags only care about + # $target. + + if (&is_inside_of($tagstack, "sub")) { + $restart_sub = 1; + $currentstring .= &end_sub($target, $token, $tagstack, + $parstack, $parser, $safeeval); + } + if (&is_inside_of($tagstack, "sup")) { + $restart_sup = 1; + $currentstring .= &end_sup($target, $token, $tagstack, + $parstack, $parser, $safeeval); + } + + # Now process the applet; just replace it with its alt attribute. + my $alttag= &Apache::lonxml::get_param('alt',$parstack, $safeeval,undef,1); unless ($alttag) { @@ -3016,6 +2985,17 @@ sub start_applet { } $currentstring.='\begin{center} \fbox{Java Applet: '.$alttag. '.}\end{center}'; + + # Turn stuff back on that we can't be inside of. + + if ($restart_sub) { + $currentstring .= &start_sub($target, $token, $tagstack, + $parstack, $parser, $safeeval); + } + if ($restart_sup) { + $currentstring .= &start_sup($target, $token, $tagstack, + $parstack, $parser, $safeeval); + } } return $currentstring; } @@ -3037,16 +3017,7 @@ 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}); - } 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.']'; - } + $currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}); } elsif ($target eq 'tex') { } return $currentstring; @@ -3056,31 +3027,57 @@ sub end_embed { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } elsif ($target eq 'tex') { - } + $currentstring = $token->[2]; + } elsif ($target eq 'tex') { + # ./. + } return $currentstring; } #-- tag (end tag forbidden) sub start_param { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; - if (&Apache::lonxml::get_param('name',$parstack, - $safeeval,undef,1)=~/^cabbase$/i) { + my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval, + 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); @@ -3137,7 +3134,7 @@ 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,}); @@ -3477,13 +3474,34 @@ sub end_col { return $currentstring; } -#-- tag (end tag optional) +#-- [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; } @@ -3496,12 +3514,16 @@ sub end_colgroup { return $currentstring; } + #-- 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; } @@ -3510,7 +3532,10 @@ sub end_del { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; + } elsif ($target eq 'tex') { + &enable_para(); + $currentstring = '}'; } return $currentstring; } @@ -3558,8 +3583,64 @@ 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 = '