version 1.243, 2004/10/18 22:02:02
|
version 1.249, 2004/12/29 11:39:25
|
Line 66 sub initialize_londefdef {
|
Line 66 sub initialize_londefdef {
|
undef(@Apache::londefdef::description); |
undef(@Apache::londefdef::description); |
@Apache::londefdef::DD=(0); |
@Apache::londefdef::DD=(0); |
@Apache::londefdef::DT=(0); |
@Apache::londefdef::DT=(0); |
|
@Apache::londefdef::seenDT=(0); |
$Apache::londefdef::list_index=0; |
$Apache::londefdef::list_index=0; |
} |
} |
|
|
Line 154 sub start_html {
|
Line 155 sub start_html {
|
$currentstring = &Apache::lonxml::xmlbegin(); |
$currentstring = &Apache::lonxml::xmlbegin(); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
@Apache::londefdef::table = (); |
@Apache::londefdef::table = (); |
$currentstring .= '\documentclass[letterpaper]{book}'; |
$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}$}'. |
Line 162 sub start_html {
|
Line 163 sub start_html {
|
'\usepackage{textcomp}'. |
'\usepackage{textcomp}'. |
'\usepackage{makeidx}'. |
'\usepackage{makeidx}'. |
'\usepackage[dvips]{graphicx}'. |
'\usepackage[dvips]{graphicx}'. |
|
'\usepackage{picins}'. |
'\usepackage{epsfig}'. |
'\usepackage{epsfig}'. |
'\usepackage{calc}'. |
'\usepackage{calc}'. |
'\usepackage{amsmath}'. |
'\usepackage{amsmath}'. |
Line 478 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 529 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 1701 sub start_dl {
|
Line 1711 sub start_dl {
|
push(@Apache::londefdef::description,[]); |
push(@Apache::londefdef::description,[]); |
$Apache::londefdef::DD[$Apache::londefdef::DL]=0; |
$Apache::londefdef::DD[$Apache::londefdef::DL]=0; |
$Apache::londefdef::DT[$Apache::londefdef::DL]=0; |
$Apache::londefdef::DT[$Apache::londefdef::DL]=0; |
|
$Apache::londefdef::seenDT[$Apache::londefdef::DL]=0; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1720 sub end_dl {
|
Line 1731 sub end_dl {
|
$currentstring.='\end{description}'; |
$currentstring.='\end{description}'; |
delete($Apache::londefdef::DD[$Apache::londefdef::DL]); |
delete($Apache::londefdef::DD[$Apache::londefdef::DL]); |
delete($Apache::londefdef::DT[$Apache::londefdef::DL]); |
delete($Apache::londefdef::DT[$Apache::londefdef::DL]); |
|
delete($Apache::londefdef::seenDT[$Apache::londefdef::DL]); |
$Apache::londefdef::DL--; |
$Apache::londefdef::DL--; |
} |
} |
return $currentstring; |
return $currentstring; |
Line 1736 sub start_dt {
|
Line 1748 sub start_dt {
|
if ($Apache::londefdef::DD[-1]) { &end_dd(@_); } |
if ($Apache::londefdef::DD[-1]) { &end_dd(@_); } |
&Apache::lonxml::startredirection(); |
&Apache::lonxml::startredirection(); |
$Apache::londefdef::DT[-1]++; |
$Apache::londefdef::DT[-1]++; |
|
$Apache::londefdef::seenDT[-1]=1; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1748 sub end_dt {
|
Line 1761 sub end_dt {
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
if ($Apache::londefdef::DT[-1]) { |
if ($Apache::londefdef::DT[-1]) { |
my $data=&item_cleanup(); |
my $data=&item_cleanup(); |
push(@{$Apache::londefdef::description[-1]},'\item['.$data.']'); |
push(@{$Apache::londefdef::description[-1]},'\item['.$data.'] \strut \vskip 0mm'); |
$Apache::londefdef::DT[-1]--; |
$Apache::londefdef::DT[-1]--; |
} |
} |
} |
} |
Line 1771 sub start_dd {
|
Line 1784 sub start_dd {
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
if ($Apache::londefdef::DT[-1]) { &end_dt(@_); } |
if ($Apache::londefdef::DT[-1]) { &end_dt(@_); } |
if ($Apache::londefdef::DD[-1]) { &end_dd(@_);} |
if ($Apache::londefdef::DD[-1]) { &end_dd(@_);} |
|
if (!$Apache::londefdef::seenDT[-1]) { |
|
push(@{$Apache::londefdef::description[-1]},'\item[\strut] \strut \vskip 0mm '); |
|
} |
push(@{$Apache::londefdef::description[-1]},''); |
push(@{$Apache::londefdef::description[-1]},''); |
$Apache::londefdef::description[-1]->[-1].=' \strut '; |
$Apache::londefdef::description[-1]->[-1].=' \strut '; |
$Apache::londefdef::DD[-1]++; |
$Apache::londefdef::DD[-1]++; |
Line 2404 sub end_th {
|
Line 2420 sub end_th {
|
} |
} |
|
|
#-- <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, |
Line 2415 sub start_img {
|
Line 2441 sub start_img {
|
$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 2427 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; |
my $oldSRC=$src; |
$oldSRC=~s/\.(gif|jpg|png)$/\.eps/; |
$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; |
Line 2444 sub start_img {
|
Line 2509 sub start_img {
|
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 2453 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 |
Line 2474 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 2486 sub start_img {
|
Line 2586 sub start_img {
|
$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', |
$currentstring .=&Apache::edit::select_arg('Alignment:','align', |
['','bottom','middle','top','left','right'],$token,5); |
['','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.'" '; } |
Line 2500 sub start_img {
|
Line 2604 sub start_img {
|
($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'}); |
($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'}); |
my $ctag=&Apache::edit::get_new_args($token,$parstack, |
my $ctag=&Apache::edit::get_new_args($token,$parstack, |
$safeeval,'src','alt','align', |
$safeeval,'src','alt','align', |
'TeXwidth','TeXheight', |
'TeXwidth','TeXheight', 'TeXwrap', |
'width','height'); |
'width','height'); |
my ($nsrc,$nwidth,$nheight)= |
my ($nsrc,$nwidth,$nheight)= |
($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'}); |
($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'}); |
Line 3684 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 { |