version 1.70, 2002/07/11 18:20:00
|
version 1.72, 2002/07/11 20:05:44
|
Line 1311 EDITBUTTON
|
Line 1311 EDITBUTTON
|
chop $output; |
chop $output; |
$output .= ' \\\\ '; |
$output .= ' \\\\ '; |
} |
} |
|
my @length = split(/,/,$Apache::londefdef::table[-1]{'length'}); |
|
my $how_many_columns = $#length+1; |
|
my $parboxlength = '(\textwidth'; |
|
for (my $io=0; $io<=$#length;$io++) { |
|
if ($length[$io] ne '') { |
|
$parboxlength .= ' - '.$length[$io].' '; |
|
} |
|
} |
|
$parboxlength .= ')/'.$how_many_columns.' - 7 mm'; |
|
$output =~ s/\\parbox{}/\\parbox{$parboxlength}/g; |
$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm '; |
$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm '; |
if ($#Apache::londefdef::table > 0) { |
if ($#Apache::londefdef::table > 0) { |
$inmemory = $Apache::londefdef::table[-1]{'output'}; |
$inmemory = $Apache::londefdef::table[-1]{'output'}; |
Line 1340 EDITBUTTON
|
Line 1350 EDITBUTTON
|
} |
} |
push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'}); |
push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'}); |
$Apache::londefdef::table[-1]{'counter_columns'} = -1; |
$Apache::londefdef::table[-1]{'counter_columns'} = -1; |
|
$Apache::londefdef::table[-1]{'length'} = ''; #just added |
|
|
} |
} |
return $currentstring; |
return $currentstring; |
Line 1380 EDITBUTTON
|
Line 1391 EDITBUTTON
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $current_row = $Apache::londefdef::table[-1]{'row_number'}; |
my $current_row = $Apache::londefdef::table[-1]{'row_number'}; |
my $data=&Apache::lonxml::endredirection(); |
my $data=&Apache::lonxml::endredirection(); |
@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= $data.' '.$Apache::londefdef::table[-1]{'vinc'}; |
if ($data=~m/width\s*=\s*(\d+\.*\d*\s*(mm|cm))/) { #just added |
|
$Apache::londefdef::table[-1]{'length'} .= $1.','; #just added |
|
} #just added |
|
@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$1.'}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'}; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1410 EDITBUTTON
|
Line 1424 EDITBUTTON
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $current_row = $Apache::londefdef::table[-1]{'row_number'}; |
my $current_row = $Apache::londefdef::table[-1]{'row_number'}; |
my $data=&Apache::lonxml::endredirection(); |
my $data=&Apache::lonxml::endredirection(); |
@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\bf{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'}; |
if ($data=~m/width\s*=\s*(\d+\.*\d*\s*(mm|cm))/) { #just added |
|
$Apache::londefdef::table[-1]{'length'} .= $1.','; #just added |
|
} #just added |
|
@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$1.'}{\textbf{'.$data.'}} '.$Apache::londefdef::table[-1]{'vinc'}; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |