|
version 1.452, 2014/06/17 23:22:17
|
version 1.462, 2016/08/13 19:39:40
|
|
Line 92 sub start_m {
|
Line 92 sub start_m {
|
| my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); |
my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); |
| if ($target eq 'web' || $target eq 'analyze') { |
if ($target eq 'web' || $target eq 'analyze') { |
| &Apache::lonxml::debug("M is starting with:$inside:"); |
&Apache::lonxml::debug("M is starting with:$inside:"); |
| |
if (!($inside =~ /^\s*\$.*\$\s*$/ || $inside =~ /^\s*\\[([].*\\[)\]]\s*$/)) { |
| |
# Non-math LaTeX will not be rendered correctly with MathJax |
| |
# and it should be avoided anyway. |
| |
# On top of that, MathJax will render math without $, but |
| |
# it will fail with tth. This is worth a warning. |
| |
# (even though some people might just use latex for printing) |
| |
&Apache::lonxml::warning(&mt("Missing \$ in <m>.")); |
| |
} |
| my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval); |
my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval); |
| if ($eval eq 'on') { |
if ($eval eq 'on') { |
| $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); |
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); |
|
Line 638 sub edit_controls {
|
Line 646 sub edit_controls {
|
| } |
} |
| $result .= ' |
$result .= ' |
| <div><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" />'; |
<div><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" />'; |
| |
if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) { |
| |
my $uri = $env{'request.uri'}; |
| |
my $daxeurl = '/daxepage'.$uri; |
| |
$result .= '<input type="button" value="'.&mt('Edit with Daxe').'" '. |
| |
'onclick="window.open(\''.$daxeurl.'\',\'_blank\');" />'; |
| |
} |
| if (($env{'request.course.id'}) && ($env{'form.forceedit'})) { |
if (($env{'request.course.id'}) && ($env{'form.forceedit'})) { |
| my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'}); |
my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'}); |
| if ($url =~ /\.html?$/i) { |
if ($url =~ /\.html?$/i) { |
|
Line 1735 sub start_a {
|
Line 1749 sub start_a {
|
| } elsif ($env{'request.course.id'}) { |
} elsif ($env{'request.course.id'}) { |
| my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
| my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
| if ($linkurl =~ m{^([^/]|/uploaded/$cdom/$cnum/docs/)}) { |
if ($linkurl =~ m{^([^/]|/uploaded/$cdom/$cnum/(docs|supplemental)/)}) { |
| my $cleanhref = &clean_docs_httpref($linkurl,$url,$cdom,$cnum); |
my $cleanhref = &clean_docs_httpref($linkurl,$url,$cdom,$cnum); |
| if ($cleanhref) { |
if ($cleanhref) { |
| &Apache::lonxml::extlink($cleanhref); |
&Apache::lonxml::extlink($cleanhref); |
|
Line 2063 sub end_dt {
|
Line 2077 sub end_dt {
|
| |
|
| sub item_cleanup { |
sub item_cleanup { |
| my $item=&Apache::lonxml::endredirection(); |
my $item=&Apache::lonxml::endredirection(); |
| $item=~s/\\begin{center}//g; |
$item=~s/\\begin\{center}//g; |
| $item=~s/\\end{center}//g; |
$item=~s/\\end\{center}//g; |
| return $item; |
return $item; |
| } |
} |
| |
|
|
Line 2753 sub start_img {
|
Line 2767 sub start_img {
|
| my $inside = &Apache::lonxml::get_all_text("/img",$parser,$style); |
my $inside = &Apache::lonxml::get_all_text("/img",$parser,$style); |
| return ''; |
return ''; |
| } |
} |
| &Apache::lonxml::extlink($src); |
unless ($src =~ m{^data\:image/gif;base64,}) { |
| |
&Apache::lonxml::extlink($src); |
| |
} |
| my $currentstring = ''; |
my $currentstring = ''; |
| my $scaling = .3; |
my $scaling = .3; |
| |
|
|
Line 2763 sub start_img {
|
Line 2779 sub start_img {
|
| my $enc = ('yes' eq |
my $enc = ('yes' eq |
| lc(&Apache::lonxml::get_param('encrypturl',$parstack, |
lc(&Apache::lonxml::get_param('encrypturl',$parstack, |
| $safeeval))); |
$safeeval))); |
| $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}, |
unless ($src =~ m{^data\:image/gif;base64,}) { |
| $enc); |
$currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}, |
| |
$enc); |
| |
} |
| |
|
| # and render unto TeX that which is LaTeX |
# and render unto TeX that which is LaTeX |
| } elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
|
Line 2807 sub start_img {
|
Line 2825 sub start_img {
|
| |
|
| # &Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src"); |
# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src"); |
| |
|
| #if original bmp/gif/jpg/png file exist do following: |
#if original bmp/gif/jpg/png/svg file exist do following: |
| my $origsrc=$src; |
my $origsrc=$src; |
| my ($path,$file) = &get_eps_image($src); |
my ($path,$file) = &get_eps_image($src); |
| # &Apache::lonnet::logthis("Image source: $src result: $path $file"); |
# &Apache::lonnet::logthis("Image source: $src result: $path $file"); |
|
Line 2854 sub start_img {
|
Line 2872 sub start_img {
|
| my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures')); |
my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures')); |
| $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). |
| &Apache::edit::browse('src',undef,'alt',$only).' '. |
&Apache::edit::browse_or_search('src',undef,'alt',$only,undef,1). |
| &Apache::edit::search('src',undef,'alt').'<br />'; |
'<br />'; |
| $currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'<br />'; |
$currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'<br />'; |
| $currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5); |
$currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5); |
| $currentstring .=&Apache::edit::text_arg('height (pixel):','height',$token,5).'<br />'; |
$currentstring .=&Apache::edit::text_arg('height (pixel):','height',$token,5).'<br />'; |
|
Line 2877 sub start_img {
|
Line 2895 sub start_img {
|
| my $src= &Apache::lonxml::get_param('src',$parstack,$safeeval); |
my $src= &Apache::lonxml::get_param('src',$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); |
| |
my $element = &Apache::edit::get_element('src'); |
| |
my $text; |
| if ($token->[2]{'src'}=~/\$/) { |
if ($token->[2]{'src'}=~/\$/) { |
| $currentstring.=&mt('Variable image source'); |
$text = &mt('Variable image source'); |
| } elsif ($token->[2]{'src'}=~/\S/) { |
} elsif ($token->[2]{'src'}=~/\S/) { |
| $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 .= ' id="previewimg_'.$element.'" />'; |
| } else { |
} else { |
| $currentstring.=&mt("No image source specified"); |
$text = &mt("No image source specified"); |
| } |
} |
| |
$currentstring .= ' <span id="showimg_'.$element.'">'.$text.'</span>'; |
| } elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
| my ($osrc,$owidth,$oheight)= |
my ($osrc,$owidth,$oheight)= |
| ($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'}); |
($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'}); |
|
Line 3446 sub start_caption {
|
Line 3466 sub start_caption {
|
| my $currentstring = ''; |
my $currentstring = ''; |
| if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
| $currentstring = $token->[4]; |
$currentstring = $token->[4]; |
| } |
} |
| return $currentstring; |
return $currentstring; |
| } |
} |
| |
|
|
Line 3454 sub end_caption {
|
Line 3474 sub end_caption {
|
| my ($target,$token) = @_; |
my ($target,$token) = @_; |
| my $currentstring = ''; |
my $currentstring = ''; |
| if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
| $currentstring = $token->[2]; |
$currentstring = $token->[2]; |
| } |
} |
| return $currentstring; |
return $currentstring; |
| } |
} |
|
Line 4321 sub get_eps_image {
|
Line 4341 sub get_eps_image {
|
| &Apache::lonnet::repcopy($orig_src); # Failure is not completely fatal. |
&Apache::lonnet::repcopy($orig_src); # Failure is not completely fatal. |
| } |
} |
| &Apache::lonxml::debug("get_eps_image: Original image: $orig_src"); |
&Apache::lonxml::debug("get_eps_image: Original image: $orig_src"); |
| my ($spath, $sname, $sext) = &fileparse($src, qr/\.(bmp|gif|png|jpg|jpeg)/i); |
my ($spath, $sname, $sext) = &fileparse($src, qr/\.(bmp|gif|png|jpg|jpeg|svg)/i); |
| $src=~s/\.(bmp|gif|png|jpg|jpeg)$/\.eps/i; |
$src=~s/\.(bmp|gif|png|jpg|jpeg|svg)$/\.eps/i; |
| $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
| &Apache::lonxml::debug("Filelocation gives: $src"); |
&Apache::lonxml::debug("Filelocation gives: $src"); |
| if (! -e $src) { |
if (! -e $src) { |
|
Line 4436 sub LATEX_length {
|
Line 4456 sub LATEX_length {
|
| $garbage=~s/^\s+(\S.*)/$1/;#space before |
$garbage=~s/^\s+(\S.*)/$1/;#space before |
| $garbage=~s/(.*\S)\s+$/$1/;#space after |
$garbage=~s/(.*\S)\s+$/$1/;#space after |
| $garbage=~s/(\s)+/$1/;#only one space |
$garbage=~s/(\s)+/$1/;#only one space |
| $garbage=~s/(\\begin{([^\}]+)}|\\end{([^\}]+)})//g;#remove LaTeX \begin{...} and \end{...} |
$garbage=~s/(\\begin\{([^\}]+)}|\\end\{([^\}]+)})//g;#remove LaTeX \begin{...} and \end{...} |
| $garbage=~s/(\$\_\{|\$\_|\$\^{|\$\^|\}\$)//g;#remove $_{,$_,$^{,$^,}$ |
$garbage=~s/(\$\_\{|\$\_|\$\^\{|\$\^|\}\$)//g;#remove $_{,$_,$^{,$^,}$ |
| $garbage=~s/([^\\])\$/$1/g;#$ |
$garbage=~s/([^\\])\$/$1/g;#$ |
| $garbage=~s/(\\ensuremath\{\_\{|\\ensuremath\{\_|\\ensuremath\{\^{|\\ensuremath\{\^|\})//g;#remove \ensuremath{...} |
$garbage=~s/(\\ensuremath\{\_\{|\\ensuremath\{\_|\\ensuremath\{\^\{|\\ensuremath\{\^|\})//g;#remove \ensuremath{...} |
| $garbage=~s/(\\alpha|\\beta|\\gamma|\\delta|\\epsilon|\\verepsilon|\\zeta|\\eta|\\theta|\\vartheta|\\iota|\\kappa|\\lambda|\\mu|\\nu|\\xi|\\pi|\\varpi|\\rho|\\varrho|\\sigma|\\varsigma|\\tau|\\upsilon|\\phi|\\varphi|\\chi|\\psi|\\omega|\\Gamma|\\Delta|\\Theta|\\Lambda|\\Xi|\\Pi|\\Sigma|\\Upsilon|\\Phi|\\Psi|\\Omega)/1/g; |
$garbage=~s/(\\alpha|\\beta|\\gamma|\\delta|\\epsilon|\\verepsilon|\\zeta|\\eta|\\theta|\\vartheta|\\iota|\\kappa|\\lambda|\\mu|\\nu|\\xi|\\pi|\\varpi|\\rho|\\varrho|\\sigma|\\varsigma|\\tau|\\upsilon|\\phi|\\varphi|\\chi|\\psi|\\omega|\\Gamma|\\Delta|\\Theta|\\Lambda|\\Xi|\\Pi|\\Sigma|\\Upsilon|\\Phi|\\Psi|\\Omega)/1/g; |
| $garbage=~s/(\\pm|\\mp|\\times|\\div|\\cdot|\\ast|\\star|\\dagger|\\ddagger|\\amalg|\\cap|\\cup|\\uplus|\\sqcap|\\sqcup|\\vee|\\wedge|\\oplus|\\ominus|\\otimes|\\circ|\\bullet|\\diamond|\\lhd|\\rhd|\\unlhd|\\unrhd|\\oslash|\\odot|\\bigcirc|\\Box|\\Diamond|\\bigtriangleup|\\bigtriangledown|\\triangleleft|\\triangleright|\\setminus|\\wr)/1/g; |
$garbage=~s/(\\pm|\\mp|\\times|\\div|\\cdot|\\ast|\\star|\\dagger|\\ddagger|\\amalg|\\cap|\\cup|\\uplus|\\sqcap|\\sqcup|\\vee|\\wedge|\\oplus|\\ominus|\\otimes|\\circ|\\bullet|\\diamond|\\lhd|\\rhd|\\unlhd|\\unrhd|\\oslash|\\odot|\\bigcirc|\\Box|\\Diamond|\\bigtriangleup|\\bigtriangledown|\\triangleleft|\\triangleright|\\setminus|\\wr)/1/g; |
| $garbage=~s/(\\le|\\ll|\\leq|\\ge|\\geq|\\gg|\\neq|\\doreq|\\sim|\\simeq|\\subset|\\subseteq|\\sqsubset|\\sqsubseteq|\\in|\\vdash|\\models|\\supset|\\supseteq|\\sqsupset|\\sqsupseteq|\\ni|\\dash|\\perp|\\approx|\\cong|\\equiv|\\propto|\\prec|\\preceq|\\parallel|\\asymp|\\smile|\\frown|\\bowtie|\\succ|\\succeq|\\mid)/1/g; |
$garbage=~s/(\\le|\\ll|\\leq|\\ge|\\geq|\\gg|\\neq|\\doreq|\\sim|\\simeq|\\subset|\\subseteq|\\sqsubset|\\sqsubseteq|\\in|\\vdash|\\models|\\supset|\\supseteq|\\sqsupset|\\sqsupseteq|\\ni|\\dash|\\perp|\\approx|\\cong|\\equiv|\\propto|\\prec|\\preceq|\\parallel|\\asymp|\\smile|\\frown|\\bowtie|\\succ|\\succeq|\\mid)/1/g; |
| $garbage=~s/(\\not<|\\\\not\\le|\\not\\prec|\\not\\preceq|\\not\\subset|\\not\\subseteq|\\not\\sqsubseteq|\\not\\in|\\not>|\\not\\ge|\\not\\succ|\\notsucceq|\\not\\supset|\\notsupseteq|\\not\\sqsupseteq|\\notin|\\not=|\\not\\equiv|\\not\\sim|\\not\\simeq|\\not\\approx|\\not\\cong|\\not\\asymp)/1/g; |
$garbage=~s/(\\not<|\\\\not\\le|\\not\\prec|\\not\\preceq|\\not\\subset|\\not\\subseteq|\\not\\sqsubseteq|\\not\\in|\\not>|\\not\\ge|\\not\\succ|\\notsucceq|\\not\\supset|\\notsupseteq|\\not\\sqsupseteq|\\notin|\\not=|\\not\\equiv|\\not\\sim|\\not\\simeq|\\not\\approx|\\not\\cong|\\not\\asymp)/1/g; |
| $garbage=~s/(\\leftarrow|\\gets|\\Leftarrow|\\rightarrow|\\to|\\Rightarrow|\\leftrightarrow|\\Leftrightarrow|\\mapsto|\\hookleftarrow|\\leftharpoonup|\\leftkarpoondown|\\rightleftharpoons|\\longleftarrow|\\Longleftarrow|\\longrightarrow|\\Longrightarrow|\\longleftrightarrow|\\Longleftrightarrow|\\longmapsto|\\hookrightarrow|\\rightharpoonup|\\rightharpoondown|\\uparrow|\\Uparrow|\\downarrow|\\Downarrow|\\updownarrow|\\Updownarrow|\\nearrow|\\searrow|\\swarrow|\\nwarrow)/11/g; |
$garbage=~s/(\\leftarrow|\\gets|\\Leftarrow|\\rightarrow|\\to|\\Rightarrow|\\leftrightarrow|\\Leftrightarrow|\\mapsto|\\hookleftarrow|\\leftharpoonup|\\leftkarpoondown|\\rightleftharpoons|\\longleftarrow|\\Longleftarrow|\\longrightarrow|\\Longrightarrow|\\longleftrightarrow|\\Longleftrightarrow|\\longmapsto|\\hookrightarrow|\\rightharpoonup|\\rightharpoondown|\\uparrow|\\Uparrow|\\downarrow|\\Downarrow|\\updownarrow|\\Updownarrow|\\nearrow|\\searrow|\\swarrow|\\nwarrow)/11/g; |
| $garbage=~s/(\\aleph|\\hbar|\\imath|\\jmath|\\ell|\\wp|\\Re|\\Im|\\mho|\\prime|\\emptyset|\\nabla|\\surd|\\partial|\\top|\\bot|\\vdash|\\dashv|\\forall|\\exists|\\neg|\\flat|\\natural|\\sharp|\\\||\\angle|\\backslash|\\Box|\\Diamond|\\triangle|\\clubsuit|\\diamondsuit|\\heartsuit|\\spadesuit|\\Join|\\infty)/11/g; |
$garbage=~s/(\\aleph|\\hbar|\\imath|\\jmath|\\ell|\\wp|\\Re|\\Im|\\mho|\\prime|\\emptyset|\\nabla|\\surd|\\partial|\\top|\\bot|\\vdash|\\dashv|\\forall|\\exists|\\neg|\\flat|\\natural|\\sharp|\\\||\\angle|\\backslash|\\Box|\\Diamond|\\triangle|\\clubsuit|\\diamondsuit|\\heartsuit|\\spadesuit|\\Join|\\infty)/11/g; |
| $garbage=~s/(\\hat{([^}]+)}|\\check{([^}]+)}|\\dot{([^}]+)}|\\breve{([^}]+)}|\\acute{([^}]+)}|\\ddot{([^}]+)}|\\grave{([^}]+)}|\\tilde{([^}]+)}|\\mathring{([^}]+)}|\\bar{([^}]+)}|\\vec{([^}]+)})/$1/g; |
$garbage=~s/(\\hat\{([^}]+)}|\\check\{([^}]+)}|\\dot\{([^}]+)}|\\breve\{([^}]+)}|\\acute\{([^}]+)}|\\ddot\{([^}]+)}|\\grave\{([^}]+)}|\\tilde\{([^}]+)}|\\mathring\{([^}]+)}|\\bar\{([^}]+)}|\\vec\{([^}]+)})/$1/g; |
| #remove some other LaTeX command |
#remove some other LaTeX command |
| $garbage=~s|\\(\w+)\\|\\|g; |
$garbage=~s|\\(\w+)\\|\\|g; |
| $garbage=~s|\\(\w+)(\s*)|$2|g; |
$garbage=~s|\\(\w+)(\s*)|$2|g; |
|
Line 4548 sub latex_header {
|
Line 4568 sub latex_header {
|
| ($mode eq 'batchmode')) {$currentstring .='\batchmode';} |
($mode eq 'batchmode')) {$currentstring .='\batchmode';} |
| $currentstring .= '\newcommand{\keephidden}[1]{}'. |
$currentstring .= '\newcommand{\keephidden}[1]{}'. |
| '\renewcommand{\deg}{$^{\circ}$}'. |
'\renewcommand{\deg}{$^{\circ}$}'. |
| '\usepackage{multirow}'. |
'\usepackage{multirow}'."\n". |
| '\usepackage{longtable}'. |
'\usepackage{longtable}'."\n". |
| '\usepackage{textcomp}'. |
'\usepackage{textcomp}'."\n". |
| '\usepackage{makeidx}'. |
'\usepackage{makeidx}'."\n". |
| '\usepackage[dvips]{graphicx}'. |
'\usepackage[dvips]{graphicx}'."\n". |
| '\usepackage{wrapfig}'. |
'\usepackage{wrapfig}'."\n". |
| '\usepackage{picins}'. |
'\usepackage{picins}'."\n". |
| '\usepackage[T1]{fontenc}'."\n". |
'\usepackage[T1]{fontenc}'."\n". |
| '\usepackage{lmodern}'."\n". |
'\usepackage{lmodern}'."\n". |
| '\usepackage[postscript]{ucs}'."\n". |
'\usepackage[postscript]{ucs}'."\n". |
| '\usepackage[utf8x]{inputenc}'."\n". |
'\usepackage[utf8x]{inputenc}'."\n". |
| '\usepackage{pifont}' ."\n". |
'\usepackage{pifont}'."\n". |
| '\usepackage{latexsym}'."\n". |
'\usepackage{latexsym}'."\n". |
| '\usepackage{epsfig}'. |
'\usepackage{epsfig}'."\n". |
| "\\usepackage{xtab}\n". |
'\usepackage{xtab}'."\n". |
| "\\usepackage{tabularx}\n". |
'\usepackage{tabularx}'."\n". |
| "\\usepackage{booktabs}\n". |
'\usepackage{booktabs}'."\n". |
| "\\usepackage{array}\n". |
'\usepackage{array}'."\n". |
| "\\usepackage{colortbl}\n". |
'\usepackage{colortbl}'."\n". |
| "\\usepackage{xcolor}\n". |
'\usepackage{xcolor}'."\n". |
| '\usepackage{calc}'. |
'\usepackage{calc}'."\n". |
| '\usepackage{amsmath}'. |
'\usepackage{amsmath}'."\n". |
| '\usepackage{soul}'. |
'\usepackage{soul}'."\n". |
| '\usepackage{amssymb}'. |
'\usepackage{amssymb}'."\n". |
| '\usepackage{amsfonts}'. |
'\usepackage{amsfonts}'."\n". |
| '\usepackage{amsthm}'. |
'\usepackage{amsthm}'."\n". |
| '\usepackage{amscd}' |
'\usepackage{amscd}'."\n". |
| .'\usepackage{picins}\usepackage{calc}'."\n". # From lonprintout.pm |
'\usepackage{actuarialangle}'."\n"; |
| '\usepackage[T1]{fontenc}'."\n". |
|
| '\usepackage{lmodern}'."\n". |
|
| '\usepackage[postscript]{ucs}'."\n". |
|
| '\usepackage[utf8x]{inputenc}'."\n". |
|
| '\usepackage{pifont}' . "\n"; |
|
| |
|
| if($env{'form.pdfFormFields'} eq 'yes') { |
if($env{'form.pdfFormFields'} eq 'yes') { |
| $currentstring .= '\usepackage{hyperref}'. |
$currentstring .= '\usepackage{hyperref}'. |
| '\usepackage{eforms}'. |
'\usepackage{eforms}'. |
|
Line 4608 sub clean_docs_httpref {
|
Line 4622 sub clean_docs_httpref {
|
| $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
| } |
} |
| my $cleanhref; |
my $cleanhref; |
| if ($docuri =~ m{^(\Q/uploaded/$cdom/$cnum/docs/\E)(.+/)[^/]+$}) { |
if ($docuri =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/)(.+/)[^/]+$}) { |
| my $prefix = $1; |
my $prefix = $1; |
| my $relpath = $2; |
my $relpath = $2; |
| my ($hrefpath,$fname); |
my ($hrefpath,$fname); |
|
Line 4761 described at http://www.lon-capa.org.
|
Line 4775 described at http://www.lon-capa.org.
|
| |
|
| Output: |
Output: |
| returns an absolute URL constructed from the href provided, and the calling context. |
returns an absolute URL constructed from the href provided, and the calling context. |
| (this will be null, if the URL does not begin: /uploaded/$cdom/$cnum/docs/). |
(this will be null, if the URL does not begin: /uploaded/$cdom/$cnum/docs/ or |
| |
/uploaded/$cdom/$cnum/supplemental/). |
| |
|
| =back |
=back |
| |
|
![[BACK]](/icons/back.gif){kind=icon}
Return to londefdef.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / xml