[Aimmath-commit] AIM/WEB-INF/maple FullPackage.mpl,1.4,1.5

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

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

Modified Files:
	FullPackage.mpl 
Log Message:
fixed a bug in `Package/ConvertAt`

Index: FullPackage.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/FullPackage.mpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FullPackage.mpl	10 Oct 2003 09:49:31 -0000	1.4
--- FullPackage.mpl	22 Oct 2003 13:50:24 -0000	1.5
***************
*** 286,291 ****
      if (i > 0) then
       d := cat(substring(d,1..(i-1)),
! 	      sprintf("%a",val),
! 	      substring(d,(i+6)..-1));
      else
       break;
--- 286,291 ----
      if (i > 0) then
       d := cat(substring(d,1..(i-1)),
!        sprintf("%a",val),
!        substring(d,(i+6)..-1));
      else
       break;
***************
*** 586,590 ****
       i := i+j+1;
      else
!      k := searchtext("@",s,i+j..-1);
       if k = 0 then
        ERROR(
--- 586,606 ----
       i := i+j+1;
      else
! # KM - we need to worry about @@ occurring within @..@
!      while true do
!        k := searchtext("@",s,i+j..-1);
!        if k>0 and i+j+k<=length(s) and 
!           substring(s,(i+j+k-1)..(i+j+k)) = "@@" then
!           t := t,
!                substring(s,i..(i+j-2)),
!                "<font color='green'>",
!                `Package/HTMLEscape`(substring(s,(i+j)..(i+j+k-1))),
!                "</font>";
!           if i+j+k=length(s) then k:=0: break; fi:
!           i := i+j+k; j:=1;
!        else
!          break;
!        fi:
!      od:
! # END KM
       if k = 0 then
        ERROR(