--- loncom/xml/londefdef.pm 2004/05/12 18:29:57 1.214 +++ loncom/xml/londefdef.pm 2004/07/12 16:11:30 1.225 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.214 2004/05/12 18:29:57 sakharuk Exp $ +# $Id: londefdef.pm,v 1.225 2004/07/12 16:11:30 sakharuk Exp $ # # # Copyright Michigan State University Board of Trustees @@ -156,15 +156,21 @@ sub start_html { @Apache::londefdef::table = (); $currentstring .= '\documentclass[letterpaper]{article}'; if ($ENV{'form.latex_type'}=~'batchmode') {$currentstring .='\batchmode';} - $currentstring .= '\newcommand{\keephidden}[1]{} - \renewcommand{\deg}{$^{\circ}$} - \usepackage{longtable} - \usepackage{textcomp} - \usepackage{makeidx} - \usepackage[dvips]{graphicx} - \usepackage{epsfig}\usepackage{calc} -\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}} -\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}'; + $currentstring .= '\newcommand{\keephidden}[1]{}'. + '\renewcommand{\deg}{$^{\circ}$}'. + '\usepackage{longtable}'. + '\usepackage{textcomp}'. + '\usepackage{makeidx}'. + '\usepackage[dvips]{graphicx}'. + '\usepackage{epsfig}'. + '\usepackage{calc}'. + '\usepackage{amsmath}'. + '\usepackage{amssymb}'. + '\usepackage{amsfonts}'. + '\usepackage{amsthm}'. + '\usepackage{amscd}'. + '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'. + '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}'; } return $currentstring; } @@ -1110,7 +1116,9 @@ sub start_p { $currentstring='\makebox['.$ENV{'form.textwidth'}.']{\hfill\llap{'; } elsif ($align eq 'left') { $currentstring='\noindent\makebox['.$ENV{'form.textwidth'}.']{\rlap{'; - } + } else { + $currentstring='\par '; + } my $signal=1;#

does not work inside ... foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;} if (!$signal) {$currentstring = '';} @@ -1146,8 +1154,11 @@ sub start_br { if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - if ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') { - $currentstring .= '\vskip 0.2 mm '; + if (($$tagstack[-2] eq 'b') || ($$tagstack[-2] eq 'strong') || + ($$tagstack[-2] eq 'ol') || ($$tagstack[-2] eq 'ul')) { + $currentstring .= ' \vskip 0 mm '; + } elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') { + $currentstring .= '\strut \\\\ \strut '; } } return $currentstring; @@ -1523,22 +1534,22 @@ sub start_ul { } elsif ($target eq 'tex') { my $TeXtype=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0); if ($TeXtype eq 'disc') { - $currentstring .= ' \renewcommand{\labelitemi}{$\bullet$} - \renewcommand{\labelitemii}{$\bullet$} - \renewcommand{\labelitemiii}{$\bullet$} - \renewcommand{\labelitemiv}{$\bullet$}'; + $currentstring .= '\renewcommand{\labelitemi}{$\bullet$}'. + '\renewcommand{\labelitemii}{$\bullet$}'. + '\renewcommand{\labelitemiii}{$\bullet$}'. + '\renewcommand{\labelitemiv}{$\bullet$}'; } elsif ($TeXtype eq 'circle') { - $currentstring .= ' \renewcommand{\labelitemi}{$\circ$} - \renewcommand{\labelitemii}{$\circ$} - \renewcommand{\labelitemiii}{$\circ$} - \renewcommand{\labelitemiv}{$\circ$}'; + $currentstring .= '\renewcommand{\labelitemi}{$\circ$}'. + '\renewcommand{\labelitemii}{$\circ$}'. + '\renewcommand{\labelitemiii}{$\circ$}'. + '\renewcommand{\labelitemiv}{$\circ$}'; } elsif ($TeXtype eq 'square') { - $currentstring .= ' \renewcommand{\labelitemi}{$\diamond$} - \renewcommand{\labelitemii}{$\diamond$} - \renewcommand{\labelitemiii}{$\diamond$} - \renewcommand{\labelitemiv}{$\diamond$}'; + $currentstring .= '\renewcommand{\labelitemi}{$\diamond$}'. + '\renewcommand{\labelitemii}{$\diamond$}'. + '\renewcommand{\labelitemiii}{$\diamond$}'. + '\renewcommand{\labelitemiv}{$\diamond$}'; } - $currentstring .= '\begin{itemize}'; + $currentstring .= '\strut \begin{itemize}'; } return $currentstring; } @@ -1549,10 +1560,10 @@ sub end_ul { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = '\end{itemize} \renewcommand{\labelitemi}{$\bullet$} - \renewcommand{\labelitemii}{$\bullet$} - \renewcommand{\labelitemiii}{$\bullet$} - \renewcommand{\labelitemiv}{$\bullet$}'; + $currentstring = '\end{itemize} \renewcommand{\labelitemi}{$\bullet$}'. + '\renewcommand{\labelitemii}{$\bullet$}'. + '\renewcommand{\labelitemiii}{$\bullet$}'. + '\renewcommand{\labelitemiv}{$\bullet$}\strut '; } return $currentstring; } @@ -1612,32 +1623,32 @@ sub start_ol { } elsif ($target eq 'tex') { my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0); if ($type eq '1') { - $currentstring .= ' \renewcommand{\labelenumi}{\arabic{enumi}.} - \renewcommand{\labelenumii}{\arabic{enumii}.} - \renewcommand{\labelenumiii}{\arabic{enumiii}.} - \renewcommand{\labelenumiv}{\arabic{enumiv}.}'; + $currentstring .= '\renewcommand{\labelenumi}{\arabic{enumi}.}'. + '\renewcommand{\labelenumii}{\arabic{enumii}.}'. + '\renewcommand{\labelenumiii}{\arabic{enumiii}.}'. + '\renewcommand{\labelenumiv}{\arabic{enumiv}.}'; } elsif ($type eq 'A') { - $currentstring .= ' \renewcommand{\labelenumi}{\Alph{enumi}.} - \renewcommand{\labelenumii}{\Alph{enumii}.} - \renewcommand{\labelenumiii}{\Alph{enumiii}.} - \renewcommand{\labelenumiv}{\Alph{enumiv}.}'; + $currentstring .= '\renewcommand{\labelenumi}{\Alph{enumi}.}'. + '\renewcommand{\labelenumii}{\Alph{enumii}.}'. + '\renewcommand{\labelenumiii}{\Alph{enumiii}.}'. + '\renewcommand{\labelenumiv}{\Alph{enumiv}.}'; } elsif ($type eq 'a') { - $currentstring .= ' \renewcommand{\labelenumi}{\alph{enumi}.} - \renewcommand{\labelenumii}{\alph{enumii}.} - \renewcommand{\labelenumiii}{\alph{enumiii}.} - \renewcommand{\labelenumiv}{\alph{enumiv}.} '; + $currentstring .= '\renewcommand{\labelenumi}{\alph{enumi}.}'. + '\renewcommand{\labelenumii}{\alph{enumii}.}'. + '\renewcommand{\labelenumiii}{\alph{enumiii}.}'. + '\renewcommand{\labelenumiv}{\alph{enumiv}.}'; } elsif ($type eq 'i') { - $currentstring .= ' \renewcommand{\labelenumi}{\roman{enumi}.} - \renewcommand{\labelenumii}{\roman{enumii}.} - \renewcommand{\labelenumiii}{\roman{enumiii}.} - \renewcommand{\labelenumiv}{\roman{enumiv}.} '; + $currentstring .= '\renewcommand{\labelenumi}{\roman{enumi}.}'. + '\renewcommand{\labelenumii}{\roman{enumii}.}'. + '\renewcommand{\labelenumiii}{\roman{enumiii}.}'. + '\renewcommand{\labelenumiv}{\roman{enumiv}.}'; } elsif ($type eq 'I') { - $currentstring .= ' \renewcommand{\labelenumi}{\Roman{enumi}.} - \renewcommand{\labelenumii}{\Roman{enumii}.} - \renewcommand{\labelenumiii}{\Roman{enumiii}.} - \renewcommand{\labelenumiv}{\Roman{enumiv}.} '; + $currentstring .= '\renewcommand{\labelenumi}{\Roman{enumi}.}'. + '\renewcommand{\labelenumii}{\Roman{enumii}.}'. + '\renewcommand{\labelenumiii}{\Roman{enumiii}.}'. + '\renewcommand{\labelenumiv}{\Roman{enumiv}.}'; } - $currentstring .= '\begin{enumerate}'; + $currentstring .= '\strut \begin{enumerate}'; } return $currentstring; } @@ -1648,10 +1659,10 @@ sub end_ol { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = '\end{enumerate} \renewcommand{\labelenumi}{\arabic{enumi}.} - \renewcommand{\labelenumii}{\arabic{enumii}.} - \renewcommand{\labelenumiii}{\arabic{enumiii}.} - \renewcommand{\labelenumiv}{\arabic{enumiv}.}'; + $currentstring = '\end{enumerate}\renewcommand{\labelenumi}{\arabic{enumi}.}'. + '\renewcommand{\labelenumii}{\arabic{enumii}.}'. + '\renewcommand{\labelenumiii}{\arabic{enumiii}.}'. + '\renewcommand{\labelenumiv}{\arabic{enumiv}.}\strut '; } return $currentstring; } @@ -1775,8 +1786,7 @@ sub start_table { my $aa = {}; push @Apache::londefdef::table, $aa; $Apache::londefdef::table[-1]{'row_number'} = -1; - #table's width - #default coincides with text line length + #maximum table's width (default coincides with text line length) if ($#Apache::londefdef::table==0) { $textwidth=&recalc($ENV{'form.textwidth'}); #result is always in mm $textwidth=~/(\d+\.?\d*)/; @@ -1808,6 +1818,7 @@ sub start_table { $TeXwidth=~/(\d+)/; $Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100; } else { + $Apache::londefdef::table[-1]{'forcetablewidth'}=1; $Apache::londefdef::table[-1]{'width'}=$TeXwidth; } #table's border @@ -1824,7 +1835,7 @@ sub start_table { $Apache::londefdef::table[-1]{'vvinc'} = ''; } if ($#Apache::londefdef::table==0) { - $Apache::londefdef::table[-1]{'output'}='\newline\setlength{\tabcolsep}{1 mm}'; + $Apache::londefdef::table[-1]{'output'}='\strut\newline\strut\setlength{\tabcolsep}{1 mm}'; } $Apache::londefdef::table[-1]{'output'}.=' \noindent \begin{tabular} '; $Apache::londefdef::table[-1]{'TeXlen'}=[]; @@ -1949,11 +1960,15 @@ sub end_table { $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 % - if ($Apache::londefdef::table[-1]{'percent'}==1) { + #use all available width if it is defined in % or as TeXwidth + if (($Apache::londefdef::table[-1]{'percent'}==1) || ($Apache::londefdef::table[-1]{'forcetablewidth'}==1)) { my $current=0; for (my $i=0;$i<=$#fwidth;$i++) { $current+=$fwidth[$i]; @@ -2006,7 +2021,7 @@ sub end_table { } $output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' '; } - $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\vskip 0 mm '; + $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut\newline\strut '; if ($#Apache::londefdef::table > 0) { my $inmemory = $Apache::londefdef::table[-1]{'output'}; pop @Apache::londefdef::table; @@ -2248,7 +2263,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; @@ -2271,6 +2285,8 @@ sub start_img { #if uploaded restore the path if ($src=~/^\/uploaded\/([^\/]+)\/([^\/]+)\/simplepage\/([^\/]+)$/) { $src=&Apache::loncommon::propath($1,$2).'/userfiles/simplepage/'.$3; + } elsif ($src=~/^\/uploaded\/([^\/]+)\/([^\/]+)\/aboutme\/([^\/]+)$/) { + $src=&Apache::loncommon::propath($1,$2).'/userfiles/aboutme/'.$3; } #if original gif/jpg/png file exist do following: if (-e $src) { @@ -3597,8 +3613,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; }