[LON-CAPA-cvs] cvs: loncom /xml lontexconvert.pm

[albertel]

albertel		Thu Feb 24 04:54:01 2005 EDT

  Modified files:              
    /loncom/xml	lontexconvert.pm 
  Log:
  - form gor int, int(3,a,b) integral from a to b of 3
  - simplify int( a dx) -> a
  
  
  
Index: loncom/xml/lontexconvert.pm
diff -u loncom/xml/lontexconvert.pm:1.54 loncom/xml/lontexconvert.pm:1.55
--- loncom/xml/lontexconvert.pm:1.54	Thu Feb 24 04:48:05 2005
+++ loncom/xml/lontexconvert.pm	Thu Feb 24 04:54:01 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Conversion Module
 #
-# $Id: lontexconvert.pm,v 1.54 2005/02/24 09:48:05 albertel Exp $
+# $Id: lontexconvert.pm,v 1.55 2005/02/24 09:54:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -254,6 +254,9 @@
     # 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;
@@ -264,10 +267,12 @@
     # 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;
 
-    # remove the extra () in the denominator of a \frac
-    $string =~s/\\frac{(.+?)}{\\left\((.+?)\\right\)}/\\frac{$1}{$2}/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;
 
-    
     &Apache::lonnet::logthis($string);
     return $string;
 }