[Stack-cvs] stack-1-0/scripts/maxima stackmaxima.mac,1.43,1.44

[Chris S. <san...@us...>]

Update of /cvsroot/stack/stack-1-0/scripts/maxima
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17396/scripts/maxima

Modified Files:
	stackmaxima.mac 
Log Message:


Index: stackmaxima.mac
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/maxima/stackmaxima.mac,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** stackmaxima.mac	9 Nov 2005 12:22:42 -0000	1.43
--- stackmaxima.mac	9 Nov 2005 13:45:35 -0000	1.44
***************
*** 738,741 ****
--- 738,746 ----
      if listp(SBL) then (SB:SBL[1], v:SBL[2], quiet:SBL[3])  else
          return(StackReturnOb("false","0","ATFacForm_error_list",StackAddFeedback("","ATFacForm_error_list"))),
+ 
+     /* SA should be only an expression. */
+     if matrixp(SA) or listp(SA) or equationp(SA) or inequalityp(SA) or setp(SA) then
+         return(StackReturnOb("false","0","ATFacForm_SA_not_expression",StackAddFeedback("","ATAlgEquiv_SA_not_expression"))),
+ 
      /* If we don't have an atom as the teacher's variable, then we need to make a substitution */
      if atom(v)#TRUE then (SA:subst(facdum,v,SA),SB:subst(facdum,v,SB),v:facdum),
***************
*** 776,779 ****
--- 781,788 ----
      RawMark:0, FeedBack:"", AnswerNote:"",
      KEEPFLOAT:TRUE,               /* See pg 23 */
+     /* SA should be only an expression. */
+     if matrixp(SA) or listp(SA) or equationp(SA) or inequalityp(SA) or setp(SA) then
+         return(StackReturnOb("false","0","ATExpanded_SA_not_expression",StackAddFeedback("","ATAlgEquiv_SA_not_expression"))),
+ 
      if expandp(SA) then 
              return(StackReturnOb("true","1","Correct",""))
***************
*** 803,806 ****
--- 812,820 ----
      if listp(SBL) then (tExpr:SBL[1], wrt:SBL[2], quiet:SBL[3])  else
          return(StackReturnOb("false","0","ATFacForm_error_list",StackAddFeedback("","ATPartFrac_error_list"))),
+ 
+     /* SA should be only an expression. */
+     if matrixp(SA) or listp(SA) or equationp(SA) or inequalityp(SA) or setp(SA) then
+         return(StackReturnOb("false","0","ATPartFrac_SA_not_expression",StackAddFeedback("","ATAlgEquiv_SA_not_expression"))),
+ 
      /* If we don't have an atom as the teacher's variable, then we need to make a substitution */
      if atom(v)#TRUE then (SA:subst(facdum,wrt,SA),tExpr:subst(facdum,wrt,tExpr),wrt:facdum),
***************
*** 899,902 ****
--- 913,921 ----
      fb: StackAddFeedback("","AT_NOTIMPLEMENTED"),
      ansnote:"",
+ 
+     /* SA should be only an expression. */
+     if matrixp(sExpr) or listp(sExpr) or equationp(sExpr) or inequalityp(sExpr) or setp(sExpr) then
+         return(StackReturnOb("false","0","ATSingleFrac_SA_not_expression",StackAddFeedback("","ATAlgEquiv_SA_not_expression"))),
+ 
      if listp(TList) then 
      block