--- loncom/xml/lontexconvert.pm 2005/02/24 09:28:54 1.51 +++ loncom/xml/lontexconvert.pm 2005/02/24 09:58:31 1.56 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.51 2005/02/24 09:28:54 albertel Exp $ +# $Id: lontexconvert.pm,v 1.56 2005/02/24 09:58:31 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -254,10 +254,27 @@ sub postprocess_algebra { # sqrt(3,4) -> \sqrt\let{3,4\right}, which is annoying $string =~s/\\left\{/\{/g; $string =~s/\\right\}/\}/g; + + # remove the extra () in the denominator of a \frac + $string =~s/\\frac{(.+?)}{\\left\((.+?)\\right\)}/\\frac{$1}{$2}/gs; # sqrt(3,4) means the 4 root of 3 - $string =~s/\\sqrt{([^,]+),([^}]+)}/\\sqrt[$2]{$1}/gs; + $string =~s/\\sqrt{([^,]+),([^\}]+)}/\\sqrt[$2]{$1}/gs; + + # log(3,4) means the log base 4 of 3 + $string =~s/\\log\\left\((.+?),(.+?)\\right\)/\\log_{$2}\\left($1\\right)/gs; + + # log(3,4) means the log base 4 of 3 + $string =~s/\\((?:sin|cos|tan|sec|csc|cot)(?:h)?)\\left\((.+?),(.+?)\\right\)/\\$1^{$3}\\left($2\\right)/gs; + + # int(3,a,b) integral from a to b of 3 + $string =~s/\\int\\left\((.+?),(.+?),(.+?)\\right\)/\\int_{$2}^{$3}\\left($1\\right)/gs; + + # int( ... dx) -> ... + $string =~s/\\int\\left\((.+?)d[a-z]\\right\)/$1/gs; + # + $string =~s/\\lim\\left\((.+?),(.+?),(.+?)\\right\)/\\lim_{$2\\to $3}$1/gs; &Apache::lonnet::logthis($string); return $string; }