--- loncom/xml/londefdef.pm 2004/07/12 15:46:52 1.223 +++ loncom/xml/londefdef.pm 2004/07/12 17:19:13 1.226 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.223 2004/07/12 15:46:52 sakharuk Exp $ +# $Id: londefdef.pm,v 1.226 2004/07/12 17:19:13 sakharuk Exp $ # # # Copyright Michigan State University Board of Trustees @@ -1133,15 +1133,13 @@ sub end_p { if ($target eq 'web') { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { - if ($$tagstack[-1] eq 'p') { - my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); - if ($align eq 'center') { - $currentstring .= '\end{center}'; - } elsif ($align eq 'right') { - $currentstring .= '}}'; - } elsif ($align eq 'left') { - $currentstring .= '}\hfill}'; - } + my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); + if ($align eq 'center') { + $currentstring .= '\end{center}'; + } elsif ($align eq 'right') { + $currentstring .= '}}'; + } elsif ($align eq 'left') { + $currentstring .= '}\hfill}'; } } return $currentstring; @@ -1891,7 +1889,6 @@ sub end_table { } push @min_len, $localmin; push @max_len, $localmax; - &Apache::lonnet::logthis("TABLEOUTPUT1: $localmin><$localmax<<<"); } for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) { my $localmin=0,; @@ -1906,7 +1903,6 @@ sub end_table { $min_len[$jn]=0; $max_len[$jn]=0; } - &Apache::lonnet::logthis("TABLEOUTPUT2: $min_len[$jn]><$max_len[$jn]<<<"); } #final adjustment of column width my @fwidth=@{$Apache::londefdef::table[-1]{'TeXlen'}[0]};#final width array @@ -1921,7 +1917,6 @@ sub end_table { if ($fwidth[$jn]==0) { $fwidth[$jn]=$max_len[$jn]; } - &Apache::lonnet::logthis("TABLEOUTPUT3: $fwidth[$jn]<<<"); } } else { #step 2. adjustment by minimum value (estimation) @@ -1935,7 +1930,6 @@ sub end_table { if ($fwidth[$jn]==0) { $fwidth[$jn]=$min_len[$jn]; } - &Apache::lonnet::logthis("TABLEOUTPUT4: $fwidth[$jn]<<<"); } } else { #step 3. adjustment over minimal + corrections @@ -1948,8 +1942,6 @@ sub end_table { $acsessive=$acsessive+$adjust[$jn]-$max_len[$jn]; $adjust[$jn]=0; } - &Apache::lonnet::logthis("TABLEOUTPUT10: $adjust[$jn]<<<"); - &Apache::lonnet::logthis("TABLEOUTPUT10a: $acsessive<<<"); } if ($acsessive>0) { #we have an excess of space and can redistribute it @@ -1965,7 +1957,6 @@ sub end_table { $adjust[$jn]+=$per_column; $fwidth[$jn]=$adjust[$jn]; } - &Apache::lonnet::logthis("TABLEOUTPUT5: $fwidth[$jn]<<<"); } } else { for (my $jn=0;$jn<=$#min_len;$jn++) { @@ -2270,7 +2261,6 @@ sub start_img { undef,1); if (not $src and ($target eq 'web' or $target eq 'tex')) { my $inside = &Apache::lonxml::get_all_text("/img",$parser); - &Apache::lonnet::logthis("inside was $inside"); return ''; } $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src; @@ -3621,8 +3611,6 @@ sub LATEX_length { $garbage=~s|\\(\w+)\\|\\|g; $garbage=~s|\\(\w+)(\s*)|$2|g; $garbage=~s|\+|11|g; - - &Apache::lonnet::logthis("garbage was just $garbage"); my $value=length($garbage); return $value; }