version 1.357, 2007/03/09 17:10:33
|
version 1.360, 2007/03/13 15:05:19
|
Line 128 sub start_m {
|
Line 128 sub start_m {
|
#&Apache::lonxml::debug("M is ends with:$currentstring:"); |
#&Apache::lonxml::debug("M is ends with:$currentstring:"); |
$Apache::lonxml::post_evaluate=0; |
$Apache::lonxml::post_evaluate=0; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
|
|
$currentstring = $inside; |
$currentstring = $inside; |
my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval); |
my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval); |
if ($eval eq 'on') { |
if ($eval eq 'on') { |
Line 135 sub start_m {
|
Line 136 sub start_m {
|
} |
} |
if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';} |
if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';} |
# detect simple math mode entry exits, and convert them |
# detect simple math mode entry exits, and convert them |
# to use \ensuremath |
# to use \ensuremath ... unless there's a \verb inside. |
if ($currentstring=~/^\s*\$[^\$].*[^\$]\$\s*$/) { |
if (! ($currentstring=~/\\verb/)) { |
$currentstring=~s/^(\s*)\$/$1/; |
if ($currentstring=~/^\s*\$[^\$].*[^\$]\$\s*$/) { |
$currentstring=~s/\$(\s*)$/$1/; |
$currentstring=~s/^(\s*)\$/$1/; |
$currentstring='\ensuremath{'.$currentstring.'}'; |
$currentstring=~s/\$(\s*)$/$1/; |
|
$currentstring='\ensuremath{'.$currentstring.'}'; |
|
} |
} |
} |
$Apache::lonxml::post_evaluate=0; |
$Apache::lonxml::post_evaluate=0; |
} |
} |
Line 1925 sub start_table {
|
Line 1928 sub start_table {
|
if ($#Apache::londefdef::table==0) { |
if ($#Apache::londefdef::table==0) { |
$textwidth=&recalc($env{'form.textwidth'}); #result is always in mm |
$textwidth=&recalc($env{'form.textwidth'}); #result is always in mm |
$textwidth=~/(\d+\.?\d*)/; |
$textwidth=~/(\d+\.?\d*)/; |
$textwidth=0.95*$1; #accounts "internal" LaTeX space for table frame |
$textwidth=0.85*$1; #accounts "internal" LaTeX space for table frame |
} else { |
} else { |
if ($Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}]=~/\d/) { |
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 |
#the maximum width of nested table is determined by LATeX width of parent cell |
Line 2028 sub end_table {
|
Line 2031 sub end_table {
|
$available_space=$available_space-$Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]; |
$available_space=$available_space-$Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]; |
} |
} |
} |
} |
|
|
#boundaries for contents columns |
#boundaries for contents columns |
my @min_len=();#columns can not be narrower |
my @min_len=();#columns can not be narrower |
my @max_len=();#maximum length of column |
my @max_len=();#maximum length of column |
Line 2219 sub end_table {
|
Line 2223 sub end_table {
|
$Apache::londefdef::table[-1]{'content'}=\@cleaned_table; |
$Apache::londefdef::table[-1]{'content'}=\@cleaned_table; |
@fwidth=@cleaned_header; |
@fwidth=@cleaned_header; |
} |
} |
|
|
|
|
#construct header of the table |
#construct header of the table |
my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'}; |
my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'}; |
for (my $in=0;$in<=$#fwidth;$in++) { |
for (my $in=0;$in<=$#fwidth;$in++) { |