version 1.218, 2004/05/26 15:33:45
|
version 1.229, 2004/07/15 15:13:52
|
Line 1133 sub end_p {
|
Line 1133 sub end_p {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
if ($$tagstack[-1] eq 'p') { |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
if ($align eq 'center') { |
if ($align eq 'center') { |
$currentstring .= '\end{center}'; |
$currentstring .= '\end{center}'; |
} elsif ($align eq 'right') { |
} elsif ($align eq 'right') { |
$currentstring .= '}}'; |
$currentstring .= '}}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$currentstring .= '}\hfill}'; |
$currentstring .= '}\hfill}'; |
|
} |
|
} |
} |
} |
} |
return $currentstring; |
return $currentstring; |
Line 1154 sub start_br {
|
Line 1152 sub start_br {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
if ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') { |
my @tempo=@$tagstack; |
$currentstring .= '\vskip 0.2 mm '; |
my $signal=0; |
|
for (my $i=$#tempo;$i>=0;$i--) { |
|
if (($tempo[$i] eq 'b') || ($tempo[$i] eq 'strong') || |
|
($tempo[$i] eq 'ol') || ($tempo[$i] eq 'ul')) { |
|
$signal=1; |
|
last; |
|
} |
|
} |
|
if ($signal) { |
|
$currentstring .= ' \vskip 0 mm '; |
|
} elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') { |
|
$currentstring .= '\strut \\\\ \strut '; |
} |
} |
} |
} |
return $currentstring; |
return $currentstring; |
Line 1531 sub start_ul {
|
Line 1540 sub start_ul {
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $TeXtype=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0); |
my $TeXtype=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0); |
if ($TeXtype eq 'disc') { |
if ($TeXtype eq 'disc') { |
$currentstring .= ' \renewcommand{\labelitemi}{$\bullet$} |
$currentstring .= '\renewcommand{\labelitemi}{$\bullet$}'. |
\renewcommand{\labelitemii}{$\bullet$} |
'\renewcommand{\labelitemii}{$\bullet$}'. |
\renewcommand{\labelitemiii}{$\bullet$} |
'\renewcommand{\labelitemiii}{$\bullet$}'. |
\renewcommand{\labelitemiv}{$\bullet$}'; |
'\renewcommand{\labelitemiv}{$\bullet$}'; |
} elsif ($TeXtype eq 'circle') { |
} elsif ($TeXtype eq 'circle') { |
$currentstring .= ' \renewcommand{\labelitemi}{$\circ$} |
$currentstring .= '\renewcommand{\labelitemi}{$\circ$}'. |
\renewcommand{\labelitemii}{$\circ$} |
'\renewcommand{\labelitemii}{$\circ$}'. |
\renewcommand{\labelitemiii}{$\circ$} |
'\renewcommand{\labelitemiii}{$\circ$}'. |
\renewcommand{\labelitemiv}{$\circ$}'; |
'\renewcommand{\labelitemiv}{$\circ$}'; |
} elsif ($TeXtype eq 'square') { |
} elsif ($TeXtype eq 'square') { |
$currentstring .= ' \renewcommand{\labelitemi}{$\diamond$} |
$currentstring .= '\renewcommand{\labelitemi}{$\diamond$}'. |
\renewcommand{\labelitemii}{$\diamond$} |
'\renewcommand{\labelitemii}{$\diamond$}'. |
\renewcommand{\labelitemiii}{$\diamond$} |
'\renewcommand{\labelitemiii}{$\diamond$}'. |
\renewcommand{\labelitemiv}{$\diamond$}'; |
'\renewcommand{\labelitemiv}{$\diamond$}'; |
} |
} |
$currentstring .= '\begin{itemize}'; |
$currentstring .= '\strut \begin{itemize}'; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1557 sub end_ul {
|
Line 1566 sub end_ul {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[2]; |
$currentstring = $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$currentstring = '\end{itemize} \renewcommand{\labelitemi}{$\bullet$} |
$currentstring = '\end{itemize} \renewcommand{\labelitemi}{$\bullet$}'. |
\renewcommand{\labelitemii}{$\bullet$} |
'\renewcommand{\labelitemii}{$\bullet$}'. |
\renewcommand{\labelitemiii}{$\bullet$} |
'\renewcommand{\labelitemiii}{$\bullet$}'. |
\renewcommand{\labelitemiv}{$\bullet$}'; |
'\renewcommand{\labelitemiv}{$\bullet$}\strut '; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1620 sub start_ol {
|
Line 1629 sub start_ol {
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0); |
my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0); |
if ($type eq '1') { |
if ($type eq '1') { |
$currentstring .= ' \renewcommand{\labelenumi}{\arabic{enumi}.} |
$currentstring .= '\renewcommand{\labelenumi}{\arabic{enumi}.}'. |
\renewcommand{\labelenumii}{\arabic{enumii}.} |
'\renewcommand{\labelenumii}{\arabic{enumii}.}'. |
\renewcommand{\labelenumiii}{\arabic{enumiii}.} |
'\renewcommand{\labelenumiii}{\arabic{enumiii}.}'. |
\renewcommand{\labelenumiv}{\arabic{enumiv}.}'; |
'\renewcommand{\labelenumiv}{\arabic{enumiv}.}'; |
} elsif ($type eq 'A') { |
} elsif ($type eq 'A') { |
$currentstring .= ' \renewcommand{\labelenumi}{\Alph{enumi}.} |
$currentstring .= '\renewcommand{\labelenumi}{\Alph{enumi}.}'. |
\renewcommand{\labelenumii}{\Alph{enumii}.} |
'\renewcommand{\labelenumii}{\Alph{enumii}.}'. |
\renewcommand{\labelenumiii}{\Alph{enumiii}.} |
'\renewcommand{\labelenumiii}{\Alph{enumiii}.}'. |
\renewcommand{\labelenumiv}{\Alph{enumiv}.}'; |
'\renewcommand{\labelenumiv}{\Alph{enumiv}.}'; |
} elsif ($type eq 'a') { |
} elsif ($type eq 'a') { |
$currentstring .= ' \renewcommand{\labelenumi}{\alph{enumi}.} |
$currentstring .= '\renewcommand{\labelenumi}{\alph{enumi}.}'. |
\renewcommand{\labelenumii}{\alph{enumii}.} |
'\renewcommand{\labelenumii}{\alph{enumii}.}'. |
\renewcommand{\labelenumiii}{\alph{enumiii}.} |
'\renewcommand{\labelenumiii}{\alph{enumiii}.}'. |
\renewcommand{\labelenumiv}{\alph{enumiv}.} '; |
'\renewcommand{\labelenumiv}{\alph{enumiv}.}'; |
} elsif ($type eq 'i') { |
} elsif ($type eq 'i') { |
$currentstring .= ' \renewcommand{\labelenumi}{\roman{enumi}.} |
$currentstring .= '\renewcommand{\labelenumi}{\roman{enumi}.}'. |
\renewcommand{\labelenumii}{\roman{enumii}.} |
'\renewcommand{\labelenumii}{\roman{enumii}.}'. |
\renewcommand{\labelenumiii}{\roman{enumiii}.} |
'\renewcommand{\labelenumiii}{\roman{enumiii}.}'. |
\renewcommand{\labelenumiv}{\roman{enumiv}.} '; |
'\renewcommand{\labelenumiv}{\roman{enumiv}.}'; |
} elsif ($type eq 'I') { |
} elsif ($type eq 'I') { |
$currentstring .= ' \renewcommand{\labelenumi}{\Roman{enumi}.} |
$currentstring .= '\renewcommand{\labelenumi}{\Roman{enumi}.}'. |
\renewcommand{\labelenumii}{\Roman{enumii}.} |
'\renewcommand{\labelenumii}{\Roman{enumii}.}'. |
\renewcommand{\labelenumiii}{\Roman{enumiii}.} |
'\renewcommand{\labelenumiii}{\Roman{enumiii}.}'. |
\renewcommand{\labelenumiv}{\Roman{enumiv}.} '; |
'\renewcommand{\labelenumiv}{\Roman{enumiv}.}'; |
} |
} |
$currentstring .= '\begin{enumerate}'; |
$currentstring .= '\strut \begin{enumerate}'; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1656 sub end_ol {
|
Line 1665 sub end_ol {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[2]; |
$currentstring = $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$currentstring = '\end{enumerate} \renewcommand{\labelenumi}{\arabic{enumi}.} |
$currentstring = '\end{enumerate}\renewcommand{\labelenumi}{\arabic{enumi}.}'. |
\renewcommand{\labelenumii}{\arabic{enumii}.} |
'\renewcommand{\labelenumii}{\arabic{enumii}.}'. |
\renewcommand{\labelenumiii}{\arabic{enumiii}.} |
'\renewcommand{\labelenumiii}{\arabic{enumiii}.}'. |
\renewcommand{\labelenumiv}{\arabic{enumiv}.}'; |
'\renewcommand{\labelenumiv}{\arabic{enumiv}.}\strut '; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1783 sub start_table {
|
Line 1792 sub start_table {
|
my $aa = {}; |
my $aa = {}; |
push @Apache::londefdef::table, $aa; |
push @Apache::londefdef::table, $aa; |
$Apache::londefdef::table[-1]{'row_number'} = -1; |
$Apache::londefdef::table[-1]{'row_number'} = -1; |
#table's width |
#maximum table's width (default coincides with text line length) |
#default coincides with text line length |
|
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*)/; |
Line 1795 sub start_table {
|
Line 1803 sub start_table {
|
$textwidth=$Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}]; |
$textwidth=$Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}]; |
} else { |
} else { |
#try to use all space not used before (minus 5% for LaTeX table internal) - rather silly |
#try to use all space not used before (minus 5% for LaTeX table internal) - rather silly |
my $textwidth=$Apache::londefdef::table[-2]{'width'}; |
$textwidth=$Apache::londefdef::table[-2]{'width'}; |
for (my $i=0;$i<$Apache::londefdef::table[-2]{'counter_columns'};$i++) { |
for (my $i=0;$i<$Apache::londefdef::table[-2]{'counter_columns'};$i++) { |
$textwidth=$textwidth-$Apache::londefdef::table[-2]{'TeXlen'}[0][$i]; |
$textwidth=$textwidth-$Apache::londefdef::table[-2]{'TeXlen'}[0][$i]; |
} |
} |
Line 1816 sub start_table {
|
Line 1824 sub start_table {
|
$TeXwidth=~/(\d+)/; |
$TeXwidth=~/(\d+)/; |
$Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100; |
$Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100; |
} else { |
} else { |
|
$Apache::londefdef::table[-1]{'forcetablewidth'}=1; |
$Apache::londefdef::table[-1]{'width'}=$TeXwidth; |
$Apache::londefdef::table[-1]{'width'}=$TeXwidth; |
} |
} |
#table's border |
#table's border |
Line 1837 sub start_table {
|
Line 1846 sub start_table {
|
$Apache::londefdef::table[-1]{'output'}.=' \noindent \begin{tabular} '; |
$Apache::londefdef::table[-1]{'output'}.=' \noindent \begin{tabular} '; |
$Apache::londefdef::table[-1]{'TeXlen'}=[]; |
$Apache::londefdef::table[-1]{'TeXlen'}=[]; |
$Apache::londefdef::table[-1]{'objectlen'}=[]; |
$Apache::londefdef::table[-1]{'objectlen'}=[]; |
|
$Apache::londefdef::table[-1]{'objectsignal'}=[]; |
$Apache::londefdef::table[-1]{'maxlen'}=[]; |
$Apache::londefdef::table[-1]{'maxlen'}=[]; |
$Apache::londefdef::table[-1]{'minlen'}=[]; |
$Apache::londefdef::table[-1]{'minlen'}=[]; |
$Apache::londefdef::table[-1]{'content'}=[]; |
$Apache::londefdef::table[-1]{'content'}=[]; |
Line 1865 sub end_table {
|
Line 1875 sub end_table {
|
} |
} |
#free space and number of empty columns |
#free space and number of empty columns |
my ($available_space,$empty_columns)=($Apache::londefdef::table[-1]{'width'},0); |
my ($available_space,$empty_columns)=($Apache::londefdef::table[-1]{'width'},0); |
## &Apache::lonnet::logthis("Available space $Apache::londefdef::table[-1]{'width'}"); |
if ($#Apache::londefdef::table ne 0) {$available_space=0.9*$available_space;} |
for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) { |
for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) { |
if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]==0) { |
if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]==0) { |
$empty_columns++; |
$empty_columns++; |
Line 1896 sub end_table {
|
Line 1906 sub end_table {
|
$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;}#object size is bigger |
if ($max_len[$jn]<$localmin) { |
if ($min_len[$jn]<$localmin) {$min_len[$jn]=$localmin;}#object size is bigger |
$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) { |
if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]!=0) { |
$min_len[$jn]=0; |
$min_len[$jn]=0; |
$max_len[$jn]=0; |
$max_len[$jn]=0; |
Line 1930 sub end_table {
|
Line 1946 sub end_table {
|
$fwidth[$jn]=$min_len[$jn]; |
$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_neeeded-$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 { |
} else { |
#step 3. adjustment over minimal + corrections |
#step 3. adjustment over minimal + corrections |
my $enlarge_coef=$available_space/$space_neeeded; |
my $enlarge_coef=$available_space/$space_neeeded; |
Line 1957 sub end_table {
|
Line 2003 sub end_table {
|
$fwidth[$jn]=$adjust[$jn]; |
$fwidth[$jn]=$adjust[$jn]; |
} |
} |
} |
} |
|
} else { |
|
for (my $jn=0;$jn<=$#min_len;$jn++) { |
|
$fwidth[$jn]=$adjust[$jn]; |
|
} |
} |
} |
} |
} |
} |
} |
#recalculation for the use of all available width if width is defined in % |
#use all available width if it is defined in % or as TeXwidth |
if ($Apache::londefdef::table[-1]{'percent'}==1) { |
if (($Apache::londefdef::table[-1]{'percent'}==1) || ($Apache::londefdef::table[-1]{'forcetablewidth'}==1)) { |
my $current=0; |
my $current=0; |
for (my $i=0;$i<=$#fwidth;$i++) { |
for (my $i=0;$i<=$#fwidth;$i++) { |
$current+=$fwidth[$i]; |
$current+=$fwidth[$i]; |
Line 2000 sub end_table {
|
Line 2050 sub end_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++) { |
for (my $jn=0;$jn<=$#fwidth;$jn++) { |
for (my $jn=0;$jn<=$#fwidth;$jn++) { |
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { |
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { |
$output.='\begin{center}'; |
$output.='\vspace*{-6 mm}\begin{center}'; |
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { |
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { |
$output.=' \hfill \llap{' |
$output.=' \hfill \llap{' |
} |
} |
$output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn]; |
$output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn]; |
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { |
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { |
$output.='\end{center}'; |
$output.='\end{center}\vspace*{-6 mm}'; |
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { |
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { |
$output.='} '; |
$output.='} '; |
} |
} |
Line 2164 sub end_td_tex {
|
Line 2214 sub end_td_tex {
|
$current_length=2.5*&LATEX_length($data); |
$current_length=2.5*&LATEX_length($data); |
my @words=split(/ /,$data); |
my @words=split(/ /,$data); |
foreach my $word (@words) { |
foreach my $word (@words) { |
my $lengthword=2.5*&LATEX_length($word); |
my $lengthword=2*&LATEX_length($word); |
if ($min_length<$lengthword) {$min_length=$lengthword;} |
if ($min_length<$lengthword) {$min_length=$lengthword;} |
} |
} |
} |
} |
Line 2256 sub start_img {
|
Line 2306 sub start_img {
|
undef,1); |
undef,1); |
if (not $src and ($target eq 'web' or $target eq 'tex')) { |
if (not $src and ($target eq 'web' or $target eq 'tex')) { |
my $inside = &Apache::lonxml::get_all_text("/img",$parser); |
my $inside = &Apache::lonxml::get_all_text("/img",$parser); |
&Apache::lonnet::logthis("inside was $inside"); |
|
return ''; |
return ''; |
} |
} |
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src; |
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src; |
Line 3607 sub LATEX_length {
|
Line 3656 sub LATEX_length {
|
$garbage=~s|\\(\w+)\\|\\|g; |
$garbage=~s|\\(\w+)\\|\\|g; |
$garbage=~s|\\(\w+)(\s*)|$2|g; |
$garbage=~s|\\(\w+)(\s*)|$2|g; |
$garbage=~s|\+|11|g; |
$garbage=~s|\+|11|g; |
|
|
&Apache::lonnet::logthis("garbage was just $garbage"); |
|
my $value=length($garbage); |
my $value=length($garbage); |
return $value; |
return $value; |
} |
} |