[BACK]Return to londefdef.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/londefdef.pm between versions 1.305 and 1.306

version 1.305, 2005/12/23 00:12:32 version 1.306, 2005/12/26 19:01:25
Line 178  sub start_html { Line 178  sub start_html {
             (!$env{'request.role.adv'})) {$currentstring .='\batchmode';}               (!$env{'request.role.adv'})) {$currentstring .='\batchmode';} 
  $currentstring .= '\newcommand{\keephidden}[1]{}'.   $currentstring .= '\newcommand{\keephidden}[1]{}'.
                           '\renewcommand{\deg}{$^{\circ}$}'.                            '\renewcommand{\deg}{$^{\circ}$}'.
     '\usepackage{multirow}'.
                           '\usepackage{longtable}'.                            '\usepackage{longtable}'.
                           '\usepackage{textcomp}'.                            '\usepackage{textcomp}'.
                           '\usepackage{makeidx}'.                            '\usepackage{makeidx}'.
Line 2186  sub end_table { Line 2187  sub end_table {
  $header_of_table .= '}';   $header_of_table .= '}';
  #fill the table   #fill the table
  for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {   for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
       my $have_rowspan = 0;
     for (my $jn=0;$jn<=$#fwidth;$jn++) {      for (my $jn=0;$jn<=$#fwidth;$jn++) {
  #   #
  #  Do the appropriate magic if this has a colspan   #  Do the appropriate magic if this has a colspan
Line 2196  sub end_table { Line 2198  sub end_table {
  $colspan   $colspan
  .'}{|l|}{';   .'}{|l|}{';
  }   }
    my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn];
   
    # Start a rowspan if necessary:
   
    if ($rowspan > 1) {
       $have_rowspan++;
       $output .= '\multirow{'.$rowspan.'}[0]{'.$fwidth[$jn].'mm}{';
    }
    if (($rowspan eq '^') || ($rowspan eq '_')) {
       $have_rowspan++;
    }
   
  if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {   if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
     # $output.='\vspace*{-6 mm}\begin{center}';      # $output.='\vspace*{-6 mm}\begin{center}';
     $output.='\begin{center}';      $output.='\begin{center}';
Line 2209  sub end_table { Line 2223  sub end_table {
  } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {   } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
     $output.='} ';      $output.='} ';
  }   }
    # Close off any open multirow:
   
    if ($rowspan > 1) {
       $output .= '}';
    }
  #  Close off the colspan...   #  Close off the colspan...
  #   #
  if ($colspan > 1)  {   if ($colspan > 1)  {
Line 2217  sub end_table { Line 2236  sub end_table {
  }   }
                 if ($jn!=$#fwidth) {$output.=' '.$Apache::londefdef::table[-1]{'vinc'};}                  if ($jn!=$#fwidth) {$output.=' '.$Apache::londefdef::table[-1]{'vinc'};}
     }      }
     $output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' ';      #  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 <= 1) || ($rowspan eq '_')) {
    my $column = $jn+1;
    $output .= '\cline{'.$column.'-'.$column.'} ';
       }
    }
   
       } else {
    $output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' ';
       }
  }   }
  # Note that \newline destroys alignment env's produced  by e.g. <div>   # Note that \newline destroys alignment env's produced  by e.g. <div>
  # $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut\newline\strut ';   # $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut\newline\strut ';
Line 2368  sub end_td_tex { Line 2404  sub end_td_tex {
     #  The rowspan array of the table indicates which cells are part of a span.      #  The rowspan array of the table indicates which cells are part of a span.
     #  n indicates the start of a span set of n rows.      #  n indicates the start of a span set of n rows.
     #  ^ indicates a cell that continues a span set.      #  ^ indicates a cell that continues a span set.
       #  _ indicates the cell is at the bottom of a span set.
     #  If this and subsequent cells are part of a rowspan, we must      #  If this and subsequent cells are part of a rowspan, we must
     #  push along the row until we find one that is not.      #  push along the row until we find one that is not.
   
     while ((defined $Apache::londefdef::table[-1]{'rowspan'}[$current_row] [$current_column])       while ((defined $Apache::londefdef::table[-1]{'rowspan'}[$current_row] [$current_column]) 
    && $Apache::londefdef::table[-1]{'rowspan'}[$current_row][$current_column] eq '^') {     && ($Apache::londefdef::table[-1]{'rowspan'}[$current_row][$current_column] =~ /[\^\_]/)) {
  # Part of a span.   # Part of a span.
  push @ {$Apache::londefdef::table[-1]{'content'}[-1]}, '';   push @ {$Apache::londefdef::table[-1]{'content'}[-1]}, '';
  $current_column++;   $current_column++;
Line 2391  sub end_td_tex { Line 2428  sub end_td_tex {
     $Apache::londefdef::table[-1]{'rowspan'}[$current_row][$current_column] = $rowspan;      $Apache::londefdef::table[-1]{'rowspan'}[$current_row][$current_column] = $rowspan;
     for (my $i = 1; $i < $rowspan; $i++) {      for (my $i = 1; $i < $rowspan; $i++) {
  $Apache::londefdef::table[-1]{'rowspan'}[$current_row+$i][$current_column] = '^';   $Apache::londefdef::table[-1]{'rowspan'}[$current_row+$i][$current_column] = '^';
    if ($i == ($rowspan-1)) {
       $Apache::londefdef::table[-1]{'rowspan'}[$current_row+$i][$current_column] = '_';
    }
     }      }
   
     my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);      my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
Removed from v.1.305  
changed lines
  Added in v.1.306

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