--- loncom/xml/londefdef.pm 2020/09/10 00:33:39 1.456.2.5
+++ loncom/xml/londefdef.pm 2016/01/14 19:40:26 1.458
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.456.2.5 2020/09/10 00:33:39 raeburn Exp $
+# $Id: londefdef.pm,v 1.458 2016/01/14 19:40:26 damieng Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -98,7 +98,7 @@ sub start_m {
# 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 [_1].','<m>'));
+ &Apache::lonxml::warning(&mt("Missing \$ in <m>."));
}
my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
if ($eval eq 'on') {
@@ -646,6 +646,12 @@ sub edit_controls {
}
$result .= '
<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'})) {
my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
if ($url =~ /\.html?$/i) {
@@ -820,7 +826,7 @@ sub end_h1 {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
my $post='\vskip 0 mm ';
- my $align=lc(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1));
+ my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
if ($align eq 'center') {
$post='\end{center}';
} elsif ($align eq 'left') {
@@ -2071,8 +2077,8 @@ sub end_dt {
sub item_cleanup {
my $item=&Apache::lonxml::endredirection();
- $item=~s/\\begin\{center}//g;
- $item=~s/\\end\{center}//g;
+ $item=~s/\\begin{center}//g;
+ $item=~s/\\end{center}//g;
return $item;
}
@@ -4448,17 +4454,17 @@ sub LATEX_length {
$garbage=~s/^\s+(\S.*)/$1/;#space before
$garbage=~s/(.*\S)\s+$/$1/;#space after
$garbage=~s/(\s)+/$1/;#only one space
- $garbage=~s/(\\begin\{([^\}]+)}|\\end\{([^\}]+)})//g;#remove LaTeX \begin{...} and \end{...}
- $garbage=~s/(\$\_\{|\$\_|\$\^\{|\$\^|\}\$)//g;#remove $_{,$_,$^{,$^,}$
+ $garbage=~s/(\\begin{([^\}]+)}|\\end{([^\}]+)})//g;#remove LaTeX \begin{...} and \end{...}
+ $garbage=~s/(\$\_\{|\$\_|\$\^{|\$\^|\}\$)//g;#remove $_{,$_,$^{,$^,}$
$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/(\\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/(\\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/(\\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
$garbage=~s|\\(\w+)\\|\\|g;
$garbage=~s|\\(\w+)(\s*)|$2|g;
@@ -4560,34 +4566,40 @@ sub latex_header {
($mode eq 'batchmode')) {$currentstring .='\batchmode';}
$currentstring .= '\newcommand{\keephidden}[1]{}'.
'\renewcommand{\deg}{$^{\circ}$}'.
- '\usepackage{multirow}'."\n".
- '\usepackage{longtable}'."\n".
- '\usepackage{textcomp}'."\n".
- '\usepackage{makeidx}'."\n".
- '\usepackage[dvips]{graphicx}'."\n".
- '\usepackage{wrapfig}'."\n".
- '\usepackage{picins}'."\n".
+ '\usepackage{multirow}'.
+ '\usepackage{longtable}'.
+ '\usepackage{textcomp}'.
+ '\usepackage{makeidx}'.
+ '\usepackage[dvips]{graphicx}'.
+ '\usepackage{wrapfig}'.
+ '\usepackage{picins}'.
'\usepackage[T1]{fontenc}'."\n".
'\usepackage{lmodern}'."\n".
'\usepackage[postscript]{ucs}'."\n".
'\usepackage[utf8x]{inputenc}'."\n".
- '\usepackage{pifont}'."\n".
+ '\usepackage{pifont}' ."\n".
'\usepackage{latexsym}'."\n".
- '\usepackage{epsfig}'."\n".
- '\usepackage{xtab}'."\n".
- '\usepackage{tabularx}'."\n".
- '\usepackage{booktabs}'."\n".
- '\usepackage{array}'."\n".
- '\usepackage{colortbl}'."\n".
- '\usepackage{xcolor}'."\n".
- '\usepackage{calc}'."\n".
- '\usepackage{amsmath}'."\n".
- '\usepackage{soul}'."\n".
- '\usepackage{amssymb}'."\n".
- '\usepackage{amsfonts}'."\n".
- '\usepackage{amsthm}'."\n".
- '\usepackage{amscd}'."\n".
- '\usepackage{actuarialangle}'."\n";
+ '\usepackage{epsfig}'.
+ "\\usepackage{xtab}\n".
+ "\\usepackage{tabularx}\n".
+ "\\usepackage{booktabs}\n".
+ "\\usepackage{array}\n".
+ "\\usepackage{colortbl}\n".
+ "\\usepackage{xcolor}\n".
+ '\usepackage{calc}'.
+ '\usepackage{amsmath}'.
+ '\usepackage{soul}'.
+ '\usepackage{amssymb}'.
+ '\usepackage{amsfonts}'.
+ '\usepackage{amsthm}'.
+ '\usepackage{amscd}'
+ .'\usepackage{picins}\usepackage{calc}'."\n". # From lonprintout.pm
+ '\usepackage[T1]{fontenc}'."\n".
+ '\usepackage{lmodern}'."\n".
+ '\usepackage[postscript]{ucs}'."\n".
+ '\usepackage[utf8x]{inputenc}'."\n".
+ '\usepackage{pifont}' . "\n";
+
if($env{'form.pdfFormFields'} eq 'yes') {
$currentstring .= '\usepackage{hyperref}'.
'\usepackage{eforms}'.