[Stack-cvs] stack-1-0/scripts/maxima stackmaxima.mac,1.25,1.26

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

Update of /cvsroot/stack/stack-1-0/scripts/maxima
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24703/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.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** stackmaxima.mac	16 Aug 2005 12:34:14 -0000	1.25
--- stackmaxima.mac	17 Aug 2005 11:35:36 -0000	1.26
***************
*** 597,603 ****
          if factor( expand( sExpr ) ) = factor( expand( tExpr ) ) then
                  BLOCK(  
! 		    [topOp, list],
                      topOp: op( sExpr ), 
!                	    list: args( sExpr ),
                      if topOp = "//" then BLOCK(
                                      val: "false",
--- 597,603 ----
          if factor( expand( sExpr ) ) = factor( expand( tExpr ) ) then
                  BLOCK(  
!             [topOp, list],
                      topOp: op( sExpr ), 
!                     list: args( sExpr ),
                      if topOp = "//" then BLOCK(
                                      val: "false",
***************
*** 621,625 ****
                  ansnote : "ATPartFrac_diff_variables",
                  fb:StackAddFeedback("","ATPartFrac_diff_variables"),
! 		ret: StackReturnOb(val, rawmk, ansnote,fb)
              )
          else
--- 621,625 ----
                  ansnote : "ATPartFrac_diff_variables",
                  fb:StackAddFeedback("","ATPartFrac_diff_variables"),
!         ret: StackReturnOb(val, rawmk, ansnote,fb)
              )
          else
***************
*** 640,644 ****
                      )
                  else
! 		BLOCK(
                      if sDeg = 2 then
                          ret: quadTest(sExpr,tExpr,wrt)
--- 640,644 ----
                      )
                  else
!         BLOCK(
                      if sDeg = 2 then
                          ret: quadTest(sExpr,tExpr,wrt)
***************
*** 667,671 ****
  /*              True(0) otherwise                                       */
  /* ******************************************************************** */
! ATSingFrac(sExpr, TList):= BLOCK(
      [NEGDISTRIB, val, rawmk, fb, ansnote, tExpr, quiet, facdum],
      NEGDISTRIB: FALSE, val:"", rawmk:"1", 
--- 667,671 ----
  /*              True(0) otherwise                                       */
  /* ******************************************************************** */
! ATSingleFrac(sExpr, TList):= BLOCK(
      [NEGDISTRIB, val, rawmk, fb, ansnote, tExpr, quiet, facdum],
      NEGDISTRIB: FALSE, val:"", rawmk:"1", 
***************
*** 684,699 ****
          if factor( expand ( sExpr ) ) = factor( expand( tExpr ) ) then
          BLOCK
! 	(
              topOp: op(sExpr),
              if topOp = "//" then 
! 	    BLOCK
! 	    (
                  val:"true",
                  rawmk:"1",
! 	        ansnote: "ATSingFrac_true",
! 	        fb: StackAddFeedback("",ansnote)
! 	    )
! 	    else 
! 	    BLOCK
              (
                  val:"false",
--- 684,699 ----
          if factor( expand ( sExpr ) ) = factor( expand( tExpr ) ) then
          BLOCK
!     (
              topOp: op(sExpr),
              if topOp = "//" then 
!         BLOCK
!         (
                  val:"true",
                  rawmk:"1",
!             ansnote: "ATSingFrac_true",
!             fb: StackAddFeedback("",ansnote)
!         )
!         else 
!         BLOCK
              (
                  val:"false",
***************
*** 702,710 ****
                  fb: StackAddFeedback("",ansnote)
              ),
! 	ret: StackReturnOb(val,rawmk,ansnote,fb)
          )
          else if (sameVars(sExpr, tExpr) # true) then
          BLOCK
! 	(
              val:"false",
              rawmk:"0",
--- 702,710 ----
                  fb: StackAddFeedback("",ansnote)
              ),
!     ret: StackReturnOb(val,rawmk,ansnote,fb)
          )
          else if (sameVars(sExpr, tExpr) # true) then
          BLOCK
!     (
              val:"false",
              rawmk:"0",
***************
*** 722,726 ****
          else
          BLOCK
! 	(
              val:"true",
              rawmk:"0",
--- 722,726 ----
          else
          BLOCK
!     (
              val:"true",
              rawmk:"0",
***************
*** 729,734 ****
          ),
          ret: StackReturnOb(val,rawmk,ansnote,fb),
! 	if quiet # TRUE then fb:"",
! 	RETURN(ret)
      )
  )$
--- 729,734 ----
          ),
          ret: StackReturnOb(val,rawmk,ansnote,fb),
!     if quiet # TRUE then fb:"",
!     RETURN(ret)
      )
  )$