version 1.209, 2004/04/15 17:37:04
|
version 1.249, 2004/12/29 11:39:25
|
Line 63 sub initialize_londefdef {
|
Line 63 sub initialize_londefdef {
|
$Apache::londefdef::TD_redirection=0; |
$Apache::londefdef::TD_redirection=0; |
@Apache::londefdef::table = (); |
@Apache::londefdef::table = (); |
$Apache::londefdef::select=0; |
$Apache::londefdef::select=0; |
@Apache::londefdef::description=(); |
undef(@Apache::londefdef::description); |
$Apache::londefdef::DD_redirection=0; |
@Apache::londefdef::DD=(0); |
$Apache::londefdef::DT_redirection=0; |
@Apache::londefdef::DT=(0); |
|
@Apache::londefdef::seenDT=(0); |
|
$Apache::londefdef::list_index=0; |
} |
} |
|
|
#======================= TAG SUBROUTINES ===================== |
#======================= TAG SUBROUTINES ===================== |
Line 150 sub start_html {
|
Line 152 sub start_html {
|
my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'}; |
my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'}; |
&Apache::lontexconvert::init_tth(); |
&Apache::lontexconvert::init_tth(); |
if ($target eq 'web' || $target eq 'edit') { |
if ($target eq 'web' || $target eq 'edit') { |
$currentstring = &Apache::lonxml::xmlbegin(). |
$currentstring = &Apache::lonxml::xmlbegin(); |
&Apache::lonxml::fontsettings(); |
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
@Apache::londefdef::table = (); |
@Apache::londefdef::table = (); |
$currentstring .= '\documentclass[letterpaper]{article}'; |
$currentstring .= '\documentclass[letterpaper]{article}'; |
if ($ENV{'form.latex_type'}=~'batchmode') {$currentstring .='\batchmode';} |
if ($ENV{'form.latex_type'}=~'batchmode') {$currentstring .='\batchmode';} |
$currentstring .= '\newcommand{\keephidden}[1]{} |
$currentstring .= '\newcommand{\keephidden}[1]{}'. |
\renewcommand{\deg}{$^{\circ}$} |
'\renewcommand{\deg}{$^{\circ}$}'. |
\usepackage{longtable} |
'\usepackage{longtable}'. |
\usepackage{textcomp} |
'\usepackage{textcomp}'. |
\usepackage{makeidx} |
'\usepackage{makeidx}'. |
\usepackage[dvips]{graphicx} |
'\usepackage[dvips]{graphicx}'. |
\usepackage{epsfig}\usepackage{calc} |
'\usepackage{picins}'. |
\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}} |
'\usepackage{epsfig}'. |
\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}}'; |
'\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; |
return $currentstring; |
} |
} |
|
|
sub end_html { |
sub end_html { |
my ($target,$token) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = &Apache::lonxml::xmlend(); |
$currentstring = &Apache::lonxml::xmlend($target,$parser); |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 183 sub start_head {
|
Line 191 sub start_head {
|
my ($target,$token) = @_; |
my ($target,$token) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[4]; |
$currentstring = $token->[4].&Apache::lonxml::fontsettings(); |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 472 sub end_accessrule {
|
Line 480 sub end_accessrule {
|
sub start_body { |
sub start_body { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
|
|
if ($target eq 'web') { |
if ($target eq 'web') { |
if ($Apache::lonhomework::parsing_a_problem) { |
if ($Apache::lonhomework::parsing_a_problem) { |
&Apache::lonxml::warning("<body> tag found inside of <problem> tag this can cause problems."); |
&Apache::lonxml::warning("<body> tag found inside of <problem> tag this can cause problems."); |
Line 523 sub start_body {
|
Line 532 sub start_body {
|
$token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents(). |
$token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents(). |
';'.$onUnload; |
';'.$onUnload; |
|
|
$currentstring .= '<'.$token->[1]; |
if ($ENV{'request.state'} ne 'construct') { |
|
$currentstring .= '<'.$token->[1]; |
|
} |
foreach (keys %{$token->[2]}) { |
foreach (keys %{$token->[2]}) { |
$currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"'; |
$currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"'; |
} |
} |
$currentstring.='>'; |
if ($ENV{'request.state'} ne 'construct') { |
|
$currentstring.='>'; |
|
} |
if ($ENV{'request.state'} ne 'published') { |
if ($ENV{'request.state'} ne 'published') { |
|
my $remote=($ENV{'environment.remote'} ne 'off'); |
|
$currentstring=&Apache::loncommon::bodytag(undef,undef, |
|
$currentstring,$remote); |
$currentstring.=(<<EDITBUTTON); |
$currentstring.=(<<EDITBUTTON); |
<form method="post"> |
<form method="post"> |
<input type="submit" name="editmode" accesskey="e" value="Edit" /> |
<input type="submit" name="editmode" accesskey="e" value="Edit" /> |
Line 633 sub start_h1 {
|
Line 649 sub start_h1 {
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $pre; |
my $pre; |
my $align=lc(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1)); |
my $align=lc(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1)); |
if (($align eq 'center') || (not defined $align)) { |
if ($align eq 'center') { |
$pre='\begin{center}'; |
$pre='\begin{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$pre='\rlap{'; |
$pre='\rlap{'; |
Line 656 sub end_h1 {
|
Line 672 sub end_h1 {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $post; |
my $post='\vskip 0 mm '; |
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') || (not defined $align)) { |
if ($align eq 'center') { |
$post='\end{center}'; |
$post='\end{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$post='} \hfill'.'\vskip 0 mm '; |
$post='} \hfill'.'\vskip 0 mm '; |
Line 682 sub start_h2 {
|
Line 698 sub start_h2 {
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $pre; |
my $pre; |
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') || (not defined $align)) { |
if ($align eq 'center') { |
$pre='\begin{center}'; |
$pre='\begin{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$pre='\rlap{'; |
$pre='\rlap{'; |
Line 702 sub end_h2 {
|
Line 718 sub end_h2 {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $post; |
my $post='\vskip 0 mm '; |
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') || (not defined $align)) { |
if ($align eq 'center') { |
$post='\end{center}'; |
$post='\end{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$post='} \hfill'.'\vskip 0 mm '; |
$post='} \hfill'.'\vskip 0 mm '; |
Line 725 sub start_h3 {
|
Line 741 sub start_h3 {
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $pre; |
my $pre; |
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') || (not defined $align)) { |
if ($align eq 'center') { |
$pre='\begin{center}'; |
$pre='\begin{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$pre='\rlap{'; |
$pre='\rlap{'; |
Line 745 sub end_h3 {
|
Line 761 sub end_h3 {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $post; |
my $post='\vskip 0 mm '; |
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') || (not defined $align)) { |
if ($align eq 'center') { |
$post='\end{center}'; |
$post='\end{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$post='} \hfill'.'\vskip 0 mm '; |
$post='} \hfill'.'\vskip 0 mm '; |
Line 768 sub start_h4 {
|
Line 784 sub start_h4 {
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $pre; |
my $pre; |
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') || (not defined $align)) { |
if ($align eq 'center') { |
$pre='\begin{center}'; |
$pre='\begin{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$pre='\rlap{'; |
$pre='\rlap{'; |
Line 788 sub end_h4 {
|
Line 804 sub end_h4 {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $post; |
my $post='\vskip 0 mm '; |
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') || (not defined $align)) { |
if ($align eq 'center') { |
$post='\end{center}'; |
$post='\end{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$post='} \hfill'.'\vskip 0 mm '; |
$post='} \hfill'.'\vskip 0 mm '; |
Line 811 sub start_h5 {
|
Line 827 sub start_h5 {
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $pre; |
my $pre; |
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') || (not defined $align)) { |
if ($align eq 'center') { |
$pre='\begin{center}'; |
$pre='\begin{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$pre='\rlap{'; |
$pre='\rlap{'; |
Line 831 sub end_h5 {
|
Line 847 sub end_h5 {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $post; |
my $post='\vskip 0 mm '; |
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') || (not defined $align)) { |
if ($align eq 'center') { |
$post='\end{center}'; |
$post='\end{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$post='} \hfill'.'\vskip 0 mm '; |
$post='} \hfill'.'\vskip 0 mm '; |
Line 854 sub start_h6 {
|
Line 870 sub start_h6 {
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $pre; |
my $pre; |
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') || (not defined $align)) { |
if ($align eq 'center') { |
$pre='\begin{center}'; |
$pre='\begin{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$pre='\rlap{'; |
$pre='\rlap{'; |
Line 874 sub end_h6 {
|
Line 890 sub end_h6 {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $post; |
my $post='\vskip 0 mm '; |
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') || (not defined $align)) { |
if ($align eq 'center') { |
$post='\end{center}'; |
$post='\end{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$post='} \hfill'.'\vskip 0 mm '; |
$post='} \hfill'.'\vskip 0 mm '; |
Line 1110 sub start_p {
|
Line 1126 sub start_p {
|
$currentstring='\makebox['.$ENV{'form.textwidth'}.']{\hfill\llap{'; |
$currentstring='\makebox['.$ENV{'form.textwidth'}.']{\hfill\llap{'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$currentstring='\noindent\makebox['.$ENV{'form.textwidth'}.']{\rlap{'; |
$currentstring='\noindent\makebox['.$ENV{'form.textwidth'}.']{\rlap{'; |
} |
} else { |
|
$currentstring='\par '; |
|
} |
my $signal=1;#<p> does not work inside <b>...</b> |
my $signal=1;#<p> does not work inside <b>...</b> |
foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;} |
foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;} |
if (!$signal) {$currentstring = '';} |
if (!$signal) {$currentstring = '';} |
Line 1125 sub end_p {
|
Line 1143 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 (not defined $align) { |
if ($align eq 'center') { |
$currentstring.='\strut\\\\\strut '; |
$currentstring .= '\end{center}'; |
} elsif ($align eq 'center') { |
} elsif ($align eq 'right') { |
$currentstring .= '\end{center}'; |
$currentstring .= '}}'; |
} elsif ($align eq 'right') { |
} elsif ($align eq 'left') { |
$currentstring .= '}}'; |
$currentstring .= '}\hfill}'; |
} elsif ($align eq 'left') { |
} |
$currentstring .= '}\hfill}'; |
} |
} |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1146 sub start_br {
|
Line 1164 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') || |
|
($tempo[$i] eq 'td') || ($tempo[$i] eq 'th')) { |
|
$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 1465 sub start_li {
|
Line 1495 sub start_li {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,1); |
my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0); |
if ($type=~/circle/) { |
my $value=&Apache::lonxml::get_param('value',$parstack,$safeeval,undef,0); |
$currentstring .= ' \item[o] '; |
#FIXME need to support types i and I |
|
if ($type=~/disc/) { |
|
$currentstring .= ' \item[$\bullet$] '; |
|
} elsif ($type=~/circle/) { |
|
$currentstring .= ' \item[$\circ$] '; |
} elsif ($type=~/square/) { |
} elsif ($type=~/square/) { |
$currentstring .= ' \item[$\Box$] '; |
$currentstring .= ' \item[$\diamond$] '; |
} elsif ($type ne '') { |
} elsif ($type eq '1') { |
$currentstring .= ' \item['.$type.'] '; |
$currentstring .= ' \item['.($Apache::londefdef::list_index+1).'.]'; |
|
} elsif ($type eq 'A') { |
|
$currentstring .= ' \item['.('A'..'Z')[$Apache::londefdef::list_index].'.]'; |
|
} elsif ($type eq 'a') { |
|
$currentstring .= ' \item['.('a'..'z')[$Apache::londefdef::list_index].'.]'; |
|
} elsif ($value ne '') { |
|
$currentstring .= ' \item['.$value.'] '; |
} else { |
} else { |
$currentstring .= ' \item '; |
$currentstring .= ' \item '; |
} |
} |
} |
$Apache::londefdef::list_index++; |
|
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
Line 1522 sub start_ul {
|
Line 1563 sub start_ul {
|
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} 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); |
|
$Apache::londefdef::list_index=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 1549 sub end_ul {
|
Line 1591 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 1610 sub start_ol {
|
Line 1652 sub start_ol {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
|
$Apache::londefdef::list_index=0; |
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 1648 sub end_ol {
|
Line 1691 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 1664 sub start_dl {
|
Line 1707 sub start_dl {
|
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$currentstring = '\begin{description}'; |
$currentstring = '\begin{description}'; |
@Apache::londefdef::description=(); |
$Apache::londefdef::DL++; |
$Apache::londefdef::DD_redirection=0; |
push(@Apache::londefdef::description,[]); |
$Apache::londefdef::DT_redirection=0; |
$Apache::londefdef::DD[$Apache::londefdef::DL]=0; |
|
$Apache::londefdef::DT[$Apache::londefdef::DL]=0; |
|
$Apache::londefdef::seenDT[$Apache::londefdef::DL]=0; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1677 sub end_dl {
|
Line 1722 sub end_dl {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[2]; |
$currentstring = $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
if ($Apache::londefdef::DT_redirection) { |
if ($Apache::londefdef::DT[-1]) { &end_dt(@_); } |
my $data=&item_cleanup; |
if ($Apache::londefdef::DD[-1]) { &end_dd(@_); } |
push @Apache::londefdef::description,'\item['.$data.']'; |
foreach my $element (@{$Apache::londefdef::description[-1]}) { |
$Apache::londefdef::DT_redirection=0; |
|
} elsif ($Apache::londefdef::DD_redirection) { |
|
$Apache::londefdef::description[-1].=&Apache::lonxml::endredirection(); |
|
} |
|
foreach my $element (@Apache::londefdef::description) { |
|
$currentstring.=' '.$element.' '; |
$currentstring.=' '.$element.' '; |
} |
} |
@Apache::londefdef::description=(); |
pop(@Apache::londefdef::description); |
$currentstring.='\end{description}'; |
$currentstring.='\end{description}'; |
|
delete($Apache::londefdef::DD[$Apache::londefdef::DL]); |
|
delete($Apache::londefdef::DT[$Apache::londefdef::DL]); |
|
delete($Apache::londefdef::seenDT[$Apache::londefdef::DL]); |
|
$Apache::londefdef::DL--; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1700 sub start_dt {
|
Line 1744 sub start_dt {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
if ($Apache::londefdef::DT_redirection) { |
if ($Apache::londefdef::DT[-1]) { &end_dt(@_); } |
my $data=&item_cleanup; |
if ($Apache::londefdef::DD[-1]) { &end_dd(@_); } |
push @Apache::londefdef::description,'\item['.$data.']'; |
|
$Apache::londefdef::DT_redirection=0; |
|
} elsif ($Apache::londefdef::DD_redirection) { |
|
$Apache::londefdef::description[-1].=&Apache::lonxml::endredirection(); |
|
$Apache::londefdef::DD_redirection=0; |
|
} |
|
&Apache::lonxml::startredirection(); |
&Apache::lonxml::startredirection(); |
$Apache::londefdef::DT_redirection=1; |
$Apache::londefdef::DT[-1]++; |
|
$Apache::londefdef::seenDT[-1]=1; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1720 sub end_dt {
|
Line 1759 sub end_dt {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[2]; |
$currentstring = $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $data=&item_cleanup; |
if ($Apache::londefdef::DT[-1]) { |
push @Apache::londefdef::description,'\item['.$data.']'; |
my $data=&item_cleanup(); |
$Apache::londefdef::DT_redirection=0; |
push(@{$Apache::londefdef::description[-1]},'\item['.$data.'] \strut \vskip 0mm'); |
|
$Apache::londefdef::DT[-1]--; |
|
} |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1741 sub start_dd {
|
Line 1782 sub start_dd {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
if ($Apache::londefdef::DT_redirection) { |
if ($Apache::londefdef::DT[-1]) { &end_dt(@_); } |
my $data=&item_cleanup; |
if ($Apache::londefdef::DD[-1]) { &end_dd(@_);} |
push @Apache::londefdef::description,'\item['.$data.']'; |
if (!$Apache::londefdef::seenDT[-1]) { |
$Apache::londefdef::DT_redirection=0; |
push(@{$Apache::londefdef::description[-1]},'\item[\strut] \strut \vskip 0mm '); |
} |
} |
$Apache::londefdef::DD_redirection=1; |
push(@{$Apache::londefdef::description[-1]},''); |
|
$Apache::londefdef::description[-1]->[-1].=' \strut '; |
|
$Apache::londefdef::DD[-1]++; |
&Apache::lonxml::startredirection(); |
&Apache::lonxml::startredirection(); |
} |
} |
return $currentstring; |
return $currentstring; |
Line 1758 sub end_dd {
|
Line 1801 sub end_dd {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[2]; |
$currentstring = $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$Apache::londefdef::description[-1].=&Apache::lonxml::endredirection(); |
$Apache::londefdef::description[-1]->[-1].= |
$Apache::londefdef::DD_redirection=0; |
&Apache::lonxml::endredirection().' \vskip 0mm '; |
|
$Apache::londefdef::DD[-1]--; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1775 sub start_table {
|
Line 1819 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 1787 sub start_table {
|
Line 1830 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 1808 sub start_table {
|
Line 1851 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 1824 sub start_table {
|
Line 1868 sub start_table {
|
$Apache::londefdef::table[-1]{'vvinc'} = ''; |
$Apache::londefdef::table[-1]{'vvinc'} = ''; |
} |
} |
if ($#Apache::londefdef::table==0) { |
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]{'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 1857 sub end_table {
|
Line 1902 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 1888 sub end_table {
|
Line 1933 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 1904 sub end_table {
|
Line 1955 sub end_table {
|
$space_neeeded=$space_neeeded+$max_len[$jn]; |
$space_neeeded=$space_neeeded+$max_len[$jn]; |
} |
} |
if ($space_neeeded<=$available_space) { |
if ($space_neeeded<=$available_space) { |
## &Apache::lonnet::logthis("I am in position 1: $space_neeeded <= $available_space"); |
|
for (my $jn=0;$jn<=$#max_len;$jn++) { |
for (my $jn=0;$jn<=$#max_len;$jn++) { |
if ($fwidth[$jn]==0) { |
if ($fwidth[$jn]==0) { |
$fwidth[$jn]=$max_len[$jn]; |
$fwidth[$jn]=$max_len[$jn]; |
Line 1917 sub end_table {
|
Line 1967 sub end_table {
|
$space_neeeded+=$min_len[$jn]; |
$space_neeeded+=$min_len[$jn]; |
} |
} |
if ($space_neeeded>$available_space) { |
if ($space_neeeded>$available_space) { |
## &Apache::lonnet::logthis("I am in position 2"); |
|
$WARNING=' \textbf{NOT ENOUGH SPACE FOR TABLE} '; |
$WARNING=' \textbf{NOT ENOUGH SPACE FOR TABLE} '; |
for (my $jn=0;$jn<=$#max_len;$jn++) { |
for (my $jn=0;$jn<=$#max_len;$jn++) { |
if ($fwidth[$jn]==0) { |
if ($fwidth[$jn]==0) { |
$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 |
## &Apache::lonnet::logthis("I am in position 3"); |
|
my $enlarge_coef=$available_space/$space_neeeded; |
my $enlarge_coef=$available_space/$space_neeeded; |
my $acsessive=0; |
my $acsessive=0; |
for (my $jn=0;$jn<=$#min_len;$jn++) { |
for (my $jn=0;$jn<=$#min_len;$jn++) { |
Line 1952 sub end_table {
|
Line 2030 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 1995 sub end_table {
|
Line 2077 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 2009 sub end_table {
|
Line 2091 sub end_table {
|
} |
} |
$output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' '; |
$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) { |
if ($#Apache::londefdef::table > 0) { |
my $inmemory = $Apache::londefdef::table[-1]{'output'}; |
my $inmemory = $Apache::londefdef::table[-1]{'output'}; |
pop @Apache::londefdef::table; |
pop @Apache::londefdef::table; |
Line 2137 sub end_td_tex {
|
Line 2219 sub end_td_tex {
|
push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth; |
push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth; |
push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; |
push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; |
push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; |
push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; |
|
} elsif ($data=~/\\parbox\{\s*\d+\.?\d*\s*(mm|cm|in|pc|pt)*\s*\}/ or $data=~/\\epsfxsize\s*=\s*\d+\.?\d*\s*(mm|cm|in|pc|pt)*/) { |
|
my $garbage_data=$data; |
|
my $fwidth=0; |
|
while ($garbage_data=~/\\parbox\{\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)\s*\}/) { |
|
my $current_length=&recalc($1); |
|
$current_length=~/(\d+\.?\d*)/; |
|
if ($fwidth<$1) {$fwidth=$1;} |
|
$garbage_data=~s/\\parbox\{\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)//; |
|
} |
|
while ($garbage_data=~/\\epsfxsize\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) { |
|
my $current_length=&recalc($1); |
|
$current_length=~/(\d+\.?\d*)/; |
|
if ($fwidth<$1) {$fwidth=$1;} |
|
$garbage_data=~s/\\epsfxsize\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)//; |
|
} |
|
push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; |
|
push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth; |
|
push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; |
|
push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; |
|
$data=~s/\\\\\s*$//; |
} else { |
} else { |
$data=~s/^\s+(\S.*)/$1/; |
$data=~s/^\s+(\S.*)/$1/; |
$data=~s/(.*\S)\s+$/$1/; |
$data=~s/(.*\S)\s+$/$1/; |
Line 2159 sub end_td_tex {
|
Line 2261 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 2195 sub start_th {
|
Line 2297 sub start_th {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1); |
$Apache::londefdef::TD_redirection = 1; |
if ($what_to_push eq '') { |
&tagg_check('tr','th',$tagstack,$parstack,$parser,$safeeval); |
$what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);; |
|
} |
|
push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push; |
|
$Apache::londefdef::table[-1]{'counter_columns'}++; |
|
&Apache::lonxml::startredirection(); |
|
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
|
sub tagg_check { |
|
my ($good_tag,$bad_tag,$tagstack,$parstack,$parser,$safeeval) = @_; |
|
my @ar=@$parstack; |
|
for (my $i=$#ar-1;$i>=0;$i--) { |
|
if (lc($$tagstack[$i]) eq $good_tag) { |
|
&start_th_tex($parstack,$parser,$safeeval); |
|
last; |
|
} elsif (lc($$tagstack[$i]) eq $bad_tag) { |
|
splice @ar, $i+1; |
|
&end_th_tex(\@ar,$parser,$safeeval); |
|
&start_th_tex($parstack,$parser,$safeeval); |
|
last; |
|
} |
|
} |
|
return ''; |
|
} |
|
|
|
sub start_th_tex { |
|
my ($parstack,$parser,$safeeval) = @_; |
|
my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1); |
|
if ($alignchar eq '') { |
|
$alignchar = $Apache::londefdef::table[-1]{'rows'}[-1]; |
|
} |
|
push @{ $Apache::londefdef::table[-1]{'align'}[$Apache::londefdef::table[-1]{'row_number'}] }, $alignchar; |
|
$Apache::londefdef::table[-1]{'counter_columns'}++; |
|
my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); |
|
if (defined $TeXwidth) { |
|
my $current_length=&recalc($TeXwidth); |
|
$current_length=~/(\d+\.?\d*)/; |
|
push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$1; |
|
} |
|
&Apache::lonxml::startredirection(); |
|
return ''; |
|
} |
|
|
|
sub end_th_tex { |
|
my ($parstack,$parser,$safeeval) = @_; |
|
my $current_row = $Apache::londefdef::table[-1]{'row_number'}; |
|
my $data=&Apache::lonxml::endredirection(); |
|
my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); |
|
if (defined $TeXwidth) { |
|
push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; |
|
push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; |
|
push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; |
|
} else { |
|
if (($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) or ($data=~m/\[(\d+\.?\d*)\s*mm\]/)) { |
|
my $garbage_data=$data; |
|
my $fwidth=0; |
|
while ($garbage_data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) { |
|
my $current_length=&recalc($1); |
|
$current_length=~/(\d+\.?\d*)/; |
|
if ($fwidth<$1) {$fwidth=$1;} |
|
$garbage_data=~s/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)//; |
|
} |
|
while ($garbage_data=~m/\[(\d+\.?\d*)\s*mm\]/) { |
|
my $current_length=$1; |
|
if ($fwidth<$current_length) {$fwidth=$current_length;} |
|
$garbage_data=~s/\[(\d+\.?\d*)\s*mm\]//; |
|
} |
|
push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; |
|
push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth; |
|
push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; |
|
push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; |
|
} else { |
|
$data=~s/^\s+(\S.*)/$1/; |
|
$data=~s/(.*\S)\s+$/$1/; |
|
$data=~s/(\s)+/$1/; |
|
my ($current_length,$min_length)=(0,0); |
|
if ($data=~/\\vskip/) { |
|
my $newdata=$data; |
|
$newdata=~s/\\vskip \d*\.?\d*\s*mm/THISISJUSTTEMPORARYSEPARATOR/g; |
|
my @newdata=split(/THISISJUSTTEMPORARYSEPARATOR/,$newdata); |
|
foreach my $elementdata (@newdata) { |
|
my $lengthnewdata=2.5*&LATEX_length($elementdata); |
|
if ($lengthnewdata>$current_length) {$current_length=$lengthnewdata;} |
|
my @words=split(/ /,$elementdata); |
|
foreach my $word (@words) { |
|
my $lengthword=2.5*&LATEX_length($word); |
|
if ($min_length<$lengthword) {$min_length=$lengthword;} |
|
} |
|
} |
|
} else { |
|
$current_length=2.5*&LATEX_length($data); |
|
my @words=split(/ /,$data); |
|
foreach my $word (@words) { |
|
my $lengthword=2*&LATEX_length($word); |
|
if ($min_length<$lengthword) {$min_length=$lengthword;} |
|
} |
|
} |
|
push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; |
|
push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; |
|
push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$current_length; |
|
push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length; |
|
} |
|
} |
|
for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) { |
|
$data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/; |
|
} |
|
#make data bold |
|
$data='\textbf{'.$data.'}'; |
|
push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data; |
|
return''; |
|
} |
|
|
sub end_th { |
sub end_th { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[2]; |
$currentstring = $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $current_row = $Apache::londefdef::table[-1]{'row_number'}; |
$Apache::londefdef::TD_redirection =0; |
my $data=&Apache::lonxml::endredirection(); |
&end_th_tex($parstack,$parser,$safeeval); |
my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); |
|
if (defined $TeXwidth) { |
|
my $current_length=&recalc($TeXwidth); |
|
$current_length=~/(\d+)/; |
|
$Apache::londefdef::table[-1]{'TeXlength'} .= $1.','; |
|
$Apache::londefdef::table[-1]{'length'} .= '0,'; |
|
} else { |
|
if ($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) { |
|
my $current_length=&recalc($1); |
|
$current_length=~/(\d+)/; |
|
$Apache::londefdef::table[-1]{'TeXlength'} .= $1.','; |
|
$Apache::londefdef::table[-1]{'length'} .= '0,'; |
|
} else { |
|
$data=~/^\s*(\S.*)/; |
|
$data=$1; |
|
$data=~/(.*\S)\s*$/; |
|
$data=$1; |
|
my $current_length=2*length($data); |
|
$Apache::londefdef::table[-1]{'length'} .= $current_length.','; |
|
$Apache::londefdef::table[-1]{'TeXlength'} .= '0,'; |
|
} |
|
} |
|
for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) { |
|
$data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/; |
|
} |
|
$data='\textbf{'.$data.'}'; |
|
@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{TOBECHANGEDONNUMBER}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'}; |
|
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
#-- <img> tag (end tag forbidden) |
#-- <img> tag (end tag forbidden) |
|
# |
|
# Render the <IMG> tag. |
|
# <IMG> has the following attributes (in addition to the |
|
# standard HTML ones: |
|
# TeXwrap - Governs how the tex target will try to wrap text around |
|
# horizontally aligned images. |
|
# TeXwidth - The width of the image when rendered for print (mm). |
|
# TeXheight - The height of the image when rendered for print (mm) |
|
# (Note there seems to also be support for this as a % of page size) |
|
# |
sub start_img { |
sub start_img { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval, |
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval, |
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; |
my $currentstring = ''; |
my $currentstring = ''; |
my $scaling = .3; |
my $scaling = .3; |
|
|
|
# Render unto browsers that which are the browser's... |
|
|
if ($target eq 'web') { |
if ($target eq 'web') { |
if ($ENV{'browser.imagesuppress'} ne 'on') { |
if ($ENV{'browser.imagesuppress'} ne 'on') { |
$currentstring.= $token->[4]; |
$currentstring.= $token->[4]; |
Line 2269 sub start_img {
|
Line 2456 sub start_img {
|
} |
} |
$currentstring.='[IMAGE: '.$alttag.']'; |
$currentstring.='[IMAGE: '.$alttag.']'; |
} |
} |
|
|
|
# and render unto TeX that which is LaTeX |
|
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
|
# |
|
# The alignment will require some superstructure to be put around |
|
# the \includegraphics stuff. At present we can only partially |
|
# simulate the alignments offered by html. |
|
# |
|
# |
|
my $align = lc(&Apache::lonxml::get_param('align', |
|
$parstack, |
|
$safeeval, |
|
undef,1)); |
|
if(!$align) { |
|
$align = "bottom"; # This is html's default so it's ours too. |
|
} |
|
# |
|
&Apache::lonxml::debug("Alignemnt = $align"); |
|
# LaTeX's image/text wrapping is really bad since it wants to |
|
# make figures float. |
|
# The user has the optional parameter (applicable only to l/r |
|
# alignment to use the picins/parpic directive to get wrapped text |
|
# this is also imperfect.. that's why we give them a choice... |
|
# so they can't yell at us for our choice. |
|
# |
|
my $latex_rendering = &Apache::lonxml::get_param('TeXwrap', |
|
$parstack, |
|
$safeeval, |
|
undef,0); |
|
&Apache::lonxml::debug("LaTeX rendering = $latex_rendering"); |
|
if(!$latex_rendering) { |
|
$latex_rendering = "parbox"; |
|
} |
|
&Apache::lonxml::debug("LaTeX rendering = $latex_rendering"); |
|
|
|
my $oldSRC=$src; |
|
$oldSRC=~s/\.(gif|jpg|png)$/\.eps/; |
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
#if original gif/jpg/png file exist do following: |
#if original gif/jpg/png file exist do following: |
if (-e $src) { |
if (-e $src) { |
#what is the image size? |
#what is the image size? |
my $width_param=&image_size($src,$scaling,$parstack,$safeeval); |
my $width_param=&image_width($src,$scaling,$parstack,$safeeval); |
|
my $height_param=&image_height($src,$scaling,$parstack,$safeeval); |
my ($file,$path)=&file_path($src); |
my ($file,$path)=&file_path($src); |
my $newsrc = $src; |
my $newsrc = $src; |
$newsrc =~ s/\.(gif|jpg|png)$/.eps/i; |
$newsrc =~ s/\.(gif|jpg|png)$/.eps/i; |
|
&Apache::lonnet::repcopy($oldSRC); |
$file=~s/\.(gif|jpg|png)$/.eps/i; |
$file=~s/\.(gif|jpg|png)$/.eps/i; |
#where can we find the picture? |
#where can we find the picture? |
if (-e $newsrc) { |
if (-e $newsrc) { |
#eps counterpart for image exist |
#eps counterpart for image exist |
if ($path) { |
if ($path) { |
$currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
$currentstring .= '\graphicspath{{'.$path.'}}' |
|
.'\includegraphics[width='.$width_param.' mm,height='.$height_param.'mm]{'.$file.'} '; |
} |
} |
} else { |
} else { |
#there is no eps counterpart for image - check for ps one |
#there is no eps counterpart for image - check for ps one |
Line 2292 sub start_img {
|
Line 2519 sub start_img {
|
#ps counterpart for image exist |
#ps counterpart for image exist |
$file =~ s/\.eps$/\.ps/; |
$file =~ s/\.eps$/\.ps/; |
if ($path) { |
if ($path) { |
$currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
$currentstring .= '\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
} |
} |
} else { |
} else { |
#care about eps dynamical generation |
#care about eps dynamical generation |
$currentstring.='\vskip 1 mm '.&eps_generation($src,$file,$width_param); |
$currentstring.=&eps_generation($src,$file,$width_param); |
} |
} |
} |
} |
|
# If there's an alignment specification we need to honor it here. |
|
# For the horizontal alignments, we will also honor the |
|
# value of the latex specfication. The default is parbox, |
|
# and that's used for illegal values too. |
|
# |
|
# Even though we set a default alignment value, the user |
|
# could have given us an illegal value. In that case we |
|
# just use the default alignment of bottom.. |
|
if ($align eq "top") { |
|
$currentstring = '\raisebox{-'.$height_param.'mm}{'.$currentstring.'}'; |
|
} elsif (($align eq "center") || ($align eq "middle")) { # Being kind |
|
my $offset = $height_param/2; |
|
$currentstring = '\raisebox{-'.$offset.'mm}{'.$currentstring.'}'; |
|
} elsif ($align eq "left") { |
|
if ($latex_rendering eq "parpic") { |
|
$currentstring = '\parpic[l]{'.$currentstring.'}'; |
|
} else { # parbox rendering |
|
$currentstring = '\newline'."\n".'\parbox{'.$width_param.'mm}{'.$currentstring.'}'; |
|
} |
|
} elsif ($align eq "right") { |
|
if ($latex_rendering eq "parpic") { |
|
$currentstring = '\parpic[r]{'.$currentstring.'}'; |
|
} else { # parbox rendering. |
|
$currentstring = '\parbox{'.$width_param.'mm}{\begin{flushright}' |
|
.$currentstring.'\end{flushright}} \newline'."\n"; |
|
} |
|
} else { # Bottom is also default. |
|
# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}'; |
|
} |
} else { |
} else { |
#original image file doesn't exist so check the alt attribute |
#original image file doesn't exist so check the alt attribute |
my $alt = |
my $alt = |
Line 2313 sub start_img {
|
Line 2569 sub start_img {
|
#<allow> tag will care about replication |
#<allow> tag will care about replication |
} |
} |
} |
} |
|
|
|
# And here's where the semi-quote breaks down: allow the user |
|
# to edit the beast as well by rendering the problem for edit: |
|
|
|
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$currentstring .=&Apache::edit::tag_start($target,$token); |
$currentstring .=&Apache::edit::tag_start($target,$token); |
$currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70). |
$currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70). |
Line 2323 sub start_img {
|
Line 2584 sub start_img {
|
$currentstring .=&Apache::edit::text_arg('height (pixel):','height',$token,5).'<br />'; |
$currentstring .=&Apache::edit::text_arg('height (pixel):','height',$token,5).'<br />'; |
$currentstring .=&Apache::edit::text_arg('TeXwidth (mm):','TeXwidth',$token,5); |
$currentstring .=&Apache::edit::text_arg('TeXwidth (mm):','TeXwidth',$token,5); |
$currentstring .=&Apache::edit::text_arg('TeXheight (mm):','TeXheight',$token,5); |
$currentstring .=&Apache::edit::text_arg('TeXheight (mm):','TeXheight',$token,5); |
|
$currentstring .=&Apache::edit::select_arg('Alignment:','align', |
|
['','bottom','middle','top','left','right'],$token,5); |
|
$currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap', |
|
['', 'parbox', 'parpic'], $token, 2); |
$currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
$currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval); |
my $src= &Apache::lonxml::get_param('src',$parstack,$safeeval); |
my $alt=&Apache::lonxml::get_param('alt',$parstack,$safeeval); |
my $alt= &Apache::lonxml::get_param('alt',$parstack,$safeeval); |
my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval); |
my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval); |
my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval); |
my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval); |
|
|
|
|
$currentstring .= '<img src="'.$src.'" alt="'.$alt.'" '; |
$currentstring .= '<img src="'.$src.'" alt="'.$alt.'" '; |
if ($width) { $currentstring.=' width="'.$width.'" '; } |
if ($width) { $currentstring.=' width="'.$width.'" '; } |
if ($height) { $currentstring.=' height="'.$height.'" '; } |
if ($height) { $currentstring.=' height="'.$height.'" '; } |
$currentstring .= ' />'; |
$currentstring .= ' />'; |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
my ($osrc,$owidth,$oheight)= |
$safeeval,'src','alt', |
($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'}); |
'TeXwidth','TeXheight', |
my $ctag=&Apache::edit::get_new_args($token,$parstack, |
'width','height'); |
$safeeval,'src','alt','align', |
$src=$token->[2]{'src'}; |
'TeXwidth','TeXheight', 'TeXwrap', |
if (!$token->[2]{'width'} && !$token->[2]{'height'}) { |
'width','height'); |
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
my ($nsrc,$nwidth,$nheight)= |
&image_replication($src); |
($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'}); |
if (-e $src) { |
my $loc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$nsrc); |
my $image = Image::Magick->new; |
&image_replication($loc); |
$image->Read($src); |
my ($iwidth,$iheight); |
my ($width, $height) = ($image->Get('width'), |
if (-e $loc) { |
$image->Get('height')); |
my $image = Image::Magick->new; |
if ($width && $height) { |
$image->Read($loc); |
$token->[2]{'width'} =$width; |
($iwidth, $iheight) = ($image->Get('width'), |
$token->[2]{'height'}=$height; |
$image->Get('height')); |
$constructtag=1; |
} |
|
if ($osrc ne $nsrc || (!$nwidth && !$nheight)) { |
|
# changed image or no size specified, |
|
# if they didn't explicitly change the |
|
# width or height use the ones from the image |
|
if ($iwidth && $iheight) { |
|
if ($owidth == $nwidth || (!$nwidth && !$nheight)) { |
|
$token->[2]{'width'} = $iwidth;$ctag=1; |
|
} |
|
if ($oheight == $nheight || (!$nwidth && !$nheight)) { |
|
$token->[2]{'height'}=$iheight;$ctag=1; |
} |
} |
} |
} |
} |
} |
if ($constructtag) {$currentstring=&Apache::edit::rebuild_tag($token);} |
my ($cwidth,$cheight)=($token->[2]{'width'},$token->[2]{'height'}); |
|
# if we don't have a width or height |
|
if ($iwidth && $cwidth && !$cheight) { |
|
$token->[2]{'height'}=int(($cwidth/$iwidth)*$iheight);$ctag=1; |
|
} |
|
if ($iheight && $cheight && !$cwidth) { |
|
$token->[2]{'width'}=int(($cheight/$iheight)*$iwidth);$ctag=1; |
|
} |
|
if ($ctag) {$currentstring=&Apache::edit::rebuild_tag($token);} |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 2485 sub start_allow {
|
Line 2770 sub start_allow {
|
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= |
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= |
&Apache::lonnet::clutter($src); |
&Apache::lonnet::clutter($src); |
&image_replication($src); |
if ($target eq 'tex') { &image_replication($src); } |
my $result; |
my $result; |
if ($target eq 'edit') { |
if ($target eq 'edit') { |
$result .=&Apache::edit::tag_start($target,$token); |
$result .=&Apache::edit::tag_start($target,$token); |
Line 3503 sub image_size {
|
Line 3788 sub image_size {
|
$width_param = $TeXwidth; |
$width_param = $TeXwidth; |
} |
} |
} elsif ($TeXheight ne '') { |
} elsif ($TeXheight ne '') { |
$width_param = $TeXheight/$height_param*$width_param; |
$height_param = $TeXheight; |
|
$width_param = $TeXheight/$height_param*$width_param; |
} elsif ($width ne '') { |
} elsif ($width ne '') { |
$width_param = $width*$scaling; |
$width_param = $width*$scaling; |
} |
} |
if ($width_param > $ENV{'form.textwidth'}) {$width_param =0.95*$ENV{'form.textwidth'}} |
if ($width_param > $ENV{'form.textwidth'}) {$width_param =0.95*$ENV{'form.textwidth'}} |
return $width_param; |
return ($height_param, $width_param); |
|
} |
|
|
|
sub image_width { |
|
my ($height, $width) = &image_size(@_); |
|
return $width; |
|
} |
|
# Not yet 100% sure this is correct in all circumstances.. |
|
# due to my uncertainty about mods to image_size. |
|
# |
|
sub image_height { |
|
my ($height, $width) = &image_size(@_); |
|
return $height; |
} |
} |
|
|
sub eps_generation { |
sub eps_generation { |
Line 3522 sub eps_generation {
|
Line 3820 sub eps_generation {
|
$newsrc=~s/\/home\/([^\/]*)\/public_html\//\/$1\//; |
$newsrc=~s/\/home\/([^\/]*)\/public_html\//\/$1\//; |
$newsrc=~s/\/\.\//\//; |
$newsrc=~s/\/\.\//\//; |
$newsrc=~s/\/([^\/]+)\.(ps|eps)/\//; |
$newsrc=~s/\/([^\/]+)\.(ps|eps)/\//; |
return ' \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
if ($newsrc=~/\/home\/httpd\/lonUsers\//) { |
|
$newsrc=~s/\/home\/httpd\/lonUsers//; |
|
$newsrc=~s/\/([^\/]+)\/(\w)\/(\w)\/(\w)\//\/$1\//; |
|
} |
|
if ($newsrc=~/\/userfiles\//) { |
|
return ' \graphicspath{{'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
|
} else { |
|
return ' \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
|
} |
} |
} |
|
|
sub file_path { |
sub file_path { |
Line 3574 sub LATEX_length {
|
Line 3880 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; |
} |
} |