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

albertel lon-capa-cvs@mail.lon-capa.org
Thu, 09 Jun 2005 02:17:15 -0000


albertel		Wed Jun  8 22:17:15 2005 EDT

  Modified files:              
    /loncom/xml	lontexconvert.pm 
    /loncom/xml/algebra	AlgParser.pm 
  Log:
  - grabing update sto AlgParer.pm from WebWorK (revision 1.4)
  
  
Index: loncom/xml/lontexconvert.pm
diff -u loncom/xml/lontexconvert.pm:1.65 loncom/xml/lontexconvert.pm:1.66
--- loncom/xml/lontexconvert.pm:1.65	Thu Apr  7 02:56:27 2005
+++ loncom/xml/lontexconvert.pm	Wed Jun  8 22:17:11 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Conversion Module
 #
-# $Id: lontexconvert.pm,v 1.65 2005/04/07 06:56:27 albertel Exp $
+# $Id: lontexconvert.pm,v 1.66 2005/06/09 02:17:11 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -323,10 +323,6 @@
     # moodle had these and I don't know why, ignoring them for now
     # $string =~s/\\fun/ /g;
 
-    # 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;
     
Index: loncom/xml/algebra/AlgParser.pm
diff -u loncom/xml/algebra/AlgParser.pm:1.12 loncom/xml/algebra/AlgParser.pm:1.13
--- loncom/xml/algebra/AlgParser.pm:1.12	Fri Feb 25 01:42:35 2005
+++ loncom/xml/algebra/AlgParser.pm	Wed Jun  8 22:17:12 2005
@@ -588,7 +588,7 @@
   };
   /func1/ && do {
       my($p1,$p2);
-      if($args[0] eq "sqrt"){($p1,$p2)=qw{ \left{ \right} };}
+      if($args[0] eq "sqrt"){($p1,$p2)=('{','}');}
       else {($p1,$p2)=qw{ \left( \right) };}
 
       #