[Aimmath-commit] AIM/WEB-INF/maple/aim Inert.mpl,1.6,1.7 TextQuestion.mpl,1.5,1.6

[<mo...@us...>]

Update of /cvsroot/aimmath/AIM/WEB-INF/maple/aim
In directory sc8-pr-cvs1:/tmp/cvs-serv18338

Modified Files:
	Inert.mpl TextQuestion.mpl 
Log Message:
bug fix (missing eval) and removed double quotes from teacher's answer display when it is a string

Index: Inert.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/aim/Inert.mpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Inert.mpl	19 Sep 2003 04:11:15 -0000	1.6
--- Inert.mpl	23 Sep 2003 21:35:32 -0000	1.7
***************
*** 493,497 ****
   `Package/Assign`(
   `Inert/Decimal`::Inert,
!  "This inert represents the identity map for reals. It formats a real constant as a floating point number to certain specifications. The first argument is the number to be formatted. The optional second argument is a formatting string suitable to be used as a first argument for @sprintf@. The default format is \"% 06.3f\"",
   `new/Inert`( proc(x) x end,   # Map (we ignore the formatting string)
                                 # TeX
--- 493,498 ----
   `Package/Assign`(
   `Inert/Decimal`::Inert,
!  "This inert represents the identity map for reals. It formats a real constant as a floating point number to certain specifications. The first argument is the number to be formatted. The optional second argument is a formatting string suitable to be used as a first argument for @sprintf@. If no format string is specified, @Decimal(r)@ will format the float @r@ in a 
!     \"reasonable\" manner.",
   `new/Inert`( proc(x) x end,   # Map (we ignore the formatting string)
                                 # TeX

Index: TextQuestion.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/aim/TextQuestion.mpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TextQuestion.mpl	20 Sep 2003 16:30:44 -0000	1.5
--- TextQuestion.mpl	23 Sep 2003 21:35:32 -0000	1.6
***************
*** 113,118 ****
     attempt := eval(`aim/Question/MakeAttempt`(x));
     attempt['Clear'];
! 
!    floatok := hastype({this['RightAnswer']},float);
     listok  := hastype({this['RightAnswer']},{list,table,indexed});
  
--- 113,120 ----
     attempt := eval(`aim/Question/MakeAttempt`(x));
     attempt['Clear'];
! # KM
! # WAS:   floatok := hastype({this['RightAnswer']},float);
!    floatok := hastype({eval(this['RightAnswer'])},float);
! # END KM
     listok  := hastype({this['RightAnswer']},{list,table,indexed});
  
***************
*** 311,315 ****
      __("The teacher's answer was: "),
      "\n<latex>\\[",
!     `aim/LaTeX`(rightans),
      "\\]</latex>\n<br/>\n");
  
--- 313,324 ----
      __("The teacher's answer was: "),
      "\n<latex>\\[",
! # KM  We don't need to surround the teacher's answer
! #     with quotes in this situation because the students
! #     don't type them anyway
! # WAS: `aim/LaTeX`(rightans),
!     `if`(type(rightans),string),
!          cat("\\mbox{",TeX(rightans),"}"),
!          `aim/LaTeX`(rightans)),
! # END KM      
      "\\]</latex>\n<br/>\n");