--- loncom/xml/londefdef.pm 2010/10/19 19:33:21 1.424 +++ loncom/xml/londefdef.pm 2011/04/05 10:02:57 1.428 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.424 2010/10/19 19:33:21 raeburn Exp $ +# $Id: londefdef.pm,v 1.428 2011/04/05 10:02:57 foxr Exp $ # # # Copyright Michigan State University Board of Trustees @@ -47,6 +47,7 @@ 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(); @@ -588,7 +589,7 @@ sub start_body { sub edit_controls { my ($nochgview) = @_; my $result .= ' -
+
'; unless ($nochgview) { $result .= ' @@ -600,7 +601,12 @@ sub edit_controls { $result .= '
'; if (($env{'request.course.id'}) && ($env{'form.forceedit'})) { - $result .= (' ' x 3).''; + my $viewtext = &mt('Course View'); + if (&Apache::loncommon::course_type() eq 'Community') { + $viewtext = &mt('Community View'); + } + $result .= (' ' x 3).''; } $result .= '
@@ -2057,15 +2063,22 @@ sub start_table { if ((defined $border) && ($border > 0)) { # &Apache::lonnet::logthis("Turning on table borders: $border"); $table->table_border(1); - if ($cell_border ne 'none') { - $table->cell_border(1); # html specs that border turns on both...unless rules='none'. + if (!defined $cell_border) { + $table->cell_border(1); # Default for rules is all if rules not defined. } } # Only all or nothing for cell borders for now: - if ((defined $cell_border) && ($cell_border ne 'none')) { - # &Apache::lonnet::logthis("Turning on cell borders: $cell_border"); - $table->cell_border(1); + if ((defined $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); + } else { + $table->cell_border(0); + } } if (defined $theme) { $table->theme($theme); @@ -2186,437 +2199,17 @@ 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(); # &Apache::lonnet::logthis("Generating string"); $currentstring = $t->generate_string(); # &Apache::lonnet::logthis("Generated: $currentstring"); &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 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]) { - $Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]=$Apache::londefdef::table[-1]{'TeXlen'}[$in][$jn]; - } - } - } - #free space and number of empty columns - my ($available_space,$empty_columns)=($Apache::londefdef::table[-1]{'width'},0); - if ($#Apache::londefdef::table ne 0) {$available_space=0.9*$available_space;} - for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) { - if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]==0) { - $empty_columns++; - } else { - $available_space=$available_space-$Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]; - } - } - - #boundaries for contents columns - my @min_len=();#columns can not be narrower - my @max_len=();#maximum length of column - my $avg_max; - my $avg_min; - my $counter_cols = $Apache::londefdef::table[-1]{'counter_columns'}; - for (my $jn=0;$jn<=$counter_cols; $jn++) { - my ($localmin,$localmax)=(0,0); - for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) { - if ($localmin<$Apache::londefdef::table[-1]{'minlen'}[$in][$jn]) { - $localmin=$Apache::londefdef::table[-1]{'minlen'}[$in][$jn]; - } - if ($localmax<$Apache::londefdef::table[-1]{'maxlen'}[$in][$jn]) { - $localmax=$Apache::londefdef::table[-1]{'maxlen'}[$in][$jn]; - } - } - push @min_len, $localmin; - push @max_len, $localmax; - $avg_max = $localmax + $avg_max; - $avg_min = $localmin + $avg_min; - } - # Does not really matter what the average max/min are if there are no cols. - # and this prevents div 0 in that case. - - if ($counter_cols != 0) { - $avg_max = $avg_max/$counter_cols; - $avg_min = $avg_min/$counter_cols; - } - - - # I don't think the below is needed.. but just in case: - - if ($avg_min > $avg_max) { - my $temp = $avg_min; - $avg_min = $avg_max; - $avg_max = $temp; - } - - - for (my $jn=0;$jn<=$counter_cols;$jn++) { - my $localmin=0,; - for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) { - if ($localmin<$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn]) { - $localmin=$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn]; - } - } - if ($max_len[$jn]<$localmin) { - $max_len[$jn]=$localmin; - $Apache::londefdef::table[-1]{'objectsignal'}[$jn]=1; - }#object size is bigger - if ($min_len[$jn]<$localmin) { - $min_len[$jn]=$localmin; - $Apache::londefdef::table[-1]{'objectsignal'}[$jn]=1; - }#object size is bigger - if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]!=0) { - $min_len[$jn]=0; - $max_len[$jn]=0; - } - # Spans seem to be really bothered by max/min = 0. So if we have one - # make it an average joe max/min. - - if ($max_len[$jn] == 0) { - $max_len[$jn] = $avg_max; - } - if ($min_len[$jn] == 0) { - $min_len[$jn] = $avg_min; - } - - } - #final adjustment of column width - my @fwidth=@{$Apache::londefdef::table[-1]{'TeXlen'}[0]};#final width array - my @adjust=(); - #step 1. adjustment by maximum value - my $space_needed=0; - for (my $jn=0;$jn<=$#max_len;$jn++) { - $space_needed=$space_needed+$max_len[$jn]; - } - if ($space_needed<=$available_space) { - - for (my $jn=0;$jn<=$#max_len;$jn++) { - if ($fwidth[$jn]==0) { - $fwidth[$jn]=$max_len[$jn]; - } - } - } else { - #step 2. adjustment by minimum value (estimation) - $space_needed=0; - for (my $jn=0;$jn<=$#min_len;$jn++) { - $space_needed+=$min_len[$jn]; - } - if ($space_needed>$available_space) { - $WARNING=' \textbf{NOT ENOUGH SPACE FOR TABLE} '; - for (my $jn=0;$jn<=$#max_len;$jn++) { - if ($fwidth[$jn]==0) { - $fwidth[$jn]=$min_len[$jn]; - } - } - #check if we have objects which can be scaled - my $how_many_to_scale=0; - my @to_scale=(); - for (my $jn=0;$jn<=$#max_len;$jn++) { - if ($Apache::londefdef::table[-1]{'objectsignal'}[$jn] eq '1') { - $how_many_to_scale++; - push @to_scale, $jn; - } - } - if ($how_many_to_scale>0) { - my $space_to_adjust=($space_needed-$available_space)/$how_many_to_scale; - foreach my $jn (@to_scale) { - for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) { - $Apache::londefdef::table[-1]{'content'}[$in][$jn]=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/; - if ($1 ne '') { - my $current_length=&recalc($1); - $current_length=~/(\d+\.?\d*)/; - $current_length=$current_length-$space_to_adjust; - $Apache::londefdef::table[-1]{'content'}[$in][$jn]=~s/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/width=$current_length mm/; - } - $Apache::londefdef::table[-1]{'content'}[$in][$jn]=~m/\[(\d+\.?\d*)\s*mm\]/; - if ($1 ne '') { - my $current_length=$1; - $current_length=$current_length-$space_to_adjust; - $Apache::londefdef::table[-1]{'content'}[$in][$jn]=~s/\[(\d+\.?\d*)\s*mm\]/\[$current_length mm\]/; - } - } - $fwidth[$jn]=$fwidth[$jn]-$space_to_adjust; - } - } - } else { - #step 3. adjustment over minimal + corrections - my $enlarge_coef=$available_space/$space_needed; - my $acsessive=0; - for (my $jn=0;$jn<=$#min_len;$jn++) { - $adjust[$jn]=$min_len[$jn]*$enlarge_coef; - if ($adjust[$jn]>$max_len[$jn]) { - $fwidth[$jn]=$max_len[$jn]; - $acsessive=$acsessive+$adjust[$jn]-$max_len[$jn]; - $adjust[$jn]=0; - - } - } - if ($acsessive>0) { - #we have an excess of space and can redistribute it - my $notempty_columns=0; - for (my $jn=0;$jn<=$#min_len;$jn++) { - if ($adjust[$jn]!=0) { - $notempty_columns++; - } - } - my $per_column=$acsessive/$notempty_columns; - for (my $jn=0;$jn<=$#min_len;$jn++) { - if ($adjust[$jn]!=0) { - $adjust[$jn]+=$per_column; - $fwidth[$jn]=$adjust[$jn]; - } - } - } else { - for (my $jn=0;$jn<=$#min_len;$jn++) { - $fwidth[$jn]=$adjust[$jn]; - } - } - } - } - # use all available width or specified width as if not specified, - # the specified width gets defaulted to the available width. - - my $current=0; - for (my $i=0;$i<=$#fwidth;$i++) { - $current+=$fwidth[$i]; - } - if ($current == 0) { - $current = $Apache::londefdef::table[-1]{'width'}; - } - my $coef=$Apache::londefdef::table[-1]{'width'}/$current; - for (my $i=0;$i<=$#fwidth;$i++) { - $fwidth[$i]*=$coef; - } - #removing of empty columns if allowed - my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0); - if ($permission eq 'yes') { - my @cleaned_table=(); - my @cleaned_header=(); - my $colind=0; - for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) { - if ($fwidth[$jn]!=0) { - #we need to copy column - for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) { - $cleaned_table[$in][$colind]=$Apache::londefdef::table[-1]{'content'}[$in][$jn]; - $cleaned_header[$colind]=$fwidth[$jn]; - } - $colind++; - } - } - $Apache::londefdef::table[-1]{'content'}=\@cleaned_table; - @fwidth=@cleaned_header; - } - - - #construct header of the table - my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'}; - for (my $in=0;$in<=$#fwidth;$in++) { - $header_of_table.='p{'.$fwidth[$in].' mm}'.$Apache::londefdef::table[-1]{'vvinc'}; - } - $header_of_table .= '}'; - - #fill the table - for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) { - my $have_rowspan = 0; - for (my $jn=0;$jn<=$#fwidth;$jn++) { - - #----------------------------------------------------------- - # I think this order of doing things will ensure that - # single rowspan, columspan and combined row/colspans will - # work correctly. LaTeX is delicate here. - # RF. - - # Start a rowspan if necessary: - - my $primary_col_width = $fwidth[$jn]; # Width of primary column. - my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn]; - my $colspan = $Apache::londefdef::table[-1]{'colspan'}[$in][$jn]; - # - # Do the appropriate magic if this has a colspan - # - - my $border_char = ""; - if ($border) { - $border_char = "|"; - } - my $spanwidth = 0; - if ($colspan > 1) { - for (my $spancol = $jn; $spancol < $jn + $colspan; $spancol++) { - $spanwidth += $fwidth[$spancol]; - } - $output .= '\multicolumn{'. - $colspan - ."}"; - if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { - $output .= '{'.$border_char.'c'.$border_char.'}{'; - } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { - $output .= '{'.$border_char.'r'.$border_char.'}{'; - } - else { - $output .= '{'.$border_char."p{$spanwidth mm}".$border_char.'}{'; - } - - } else { - $spanwidth = $primary_col_width; # If no span width will be just colwidth - } - - # Rowspan... if colspan is 1, and there's an alignment we'll need - # to kick in a multicolumn in order to get the alignment spec. - # this must precede the multirow or LaTex gets quite upset. - # Naturally if colspan > 1 we've already done that above ^ - # - my $multirow_aligned = 0; - if ($rowspan > 1) { - if ($colspan == 1) { - if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { - $output .= '\multicolumn{1}{'.$border_char.'c'.$border_char.'}{'; - $multirow_aligned = 1; - } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { - $output .= '\multicolumn{1}{'.$border_char.'r'.$border_char.'}{'; - $multirow_aligned = 1; - } - } - $have_rowspan++; - if ($multirow_aligned) { - $output .= '\multirow{'.$rowspan.'}[0]{*}{'; - } else { - $output .= '\multirow{'.$rowspan."}[0]{$spanwidth mm}{"; - } - - $Apache::londefdef::table[-1]{'content'}[$in][$jn] =~ - s{^\s*\\par\s*}{}; - $Apache::londefdef::table[-1]{'content'}[$in][$jn] =~ - s{\s*\\vskip\s*0pt\s*$}{}; - - # - # If we did not throw in a multicolumn to align, then add - # an extra { - # so we close correctly without having to keep additional state - # around - # - if (!$multirow_aligned) { - $output .= '{'; - } - } - if (($rowspan eq '^') || ($rowspan eq '_')) { - $have_rowspan++; - } - #-------------------------------------------------------------- - - - # For right and center alignment of single cells. - # we are going to use a multicolumn with a span of 1 to specify alignment. - # - if ($colspan == 1 && $rowspan == 1) { - if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { - $output .= '\multicolumn{1}{'.$border_char.'c'.$border_char.'}{'; - } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { - $output .= '\multicolumn{1}{'.$border_char.'r'.$border_char.'}{'; - } - } - - $output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn]; - - if (($colspan == 1 && $rowspan == 1) && - (($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') || - ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r'))) { - $output .= '}'; - } - - # Close off any open multirow: - - if ($rowspan > 1) { - $output .= '}}'; - } - # Close off the colspan... - # - if ($colspan > 1) { - $output .= '}'; - $jn += $colspan-1; # Adjust for number of rows really left. - } - if ($jn!=$#fwidth) {$output.=' '.$Apache::londefdef::table[-1]{'vinc'};} - } - # If have_rowspan > 0, and borders are on, then - # we need to do more than put an \hline at the bottom of row. - # we need to do the appropriate \cline to ensure that - # the spanned rows don't have \hlines through them. - - if (($Apache::londefdef::table[-1]{'hinc'} =~ /\\hline/) && $have_rowspan) { - $output .= ' \\\\ '; - for (my $jn=0; $jn<=$#fwidth;$jn++) { - my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn]; - if ($rowspan ne "^") { - if (($rowspan <= 1) || ($rowspan eq '_')) { - my $column = $jn+1; - $output .= '\cline{'.$column.'-'.$column.'} '; - } - } - } - - } else { - $output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' '; - } - } - # Note that \newline destroys alignment env's produced by e.g.
- # $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; - } - } - &enable_para(); - } + } return $currentstring; } @@ -2733,17 +2326,26 @@ sub tag_check { # sub cell_config_hash { - my ($align, $rowspan, $colspan) = @_; + 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 ne "") { + if (($colspan =~ /^\d+$/) && ($colspan > 0)) { $config{'colspan'} = $colspan; } - if ($rowspan ne '') { + if (($rowspan =~ /^\d+$/) && ($rowspan > 0)) { $config{'rowspan'} = $rowspan; } + if ($width ne '') { + $config{'width'} = $width; + } return \%config; } @@ -2755,11 +2357,11 @@ sub start_td_tex { # 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 $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);