[Aimmath-commit] AIM/WEB-INF/maple AutoConf.mpl,1.9,1.10 ManualConfig.dist,1.5,1.6 SafeParse.mpl,1.8,1.9

[Jon B. <bre...@us...>]

Update of /cvsroot/aimmath/AIM/WEB-INF/maple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28978/WEB-INF/maple

Modified Files:
	AutoConf.mpl ManualConfig.dist SafeParse.mpl 
Log Message:
Second attempt at committing

Index: AutoConf.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/AutoConf.mpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AutoConf.mpl	11 Apr 2004 07:08:12 -0000	1.9
--- AutoConf.mpl	21 May 2004 14:12:27 -0000	1.10
***************
*** 426,429 ****
--- 426,430 ----
    "Env"  = "CATALINA_HOME",
    "Def"  = ["/usr/local","tomcat"],
+   "Def"  = ["/Library","Tomcat"]
    "Def"  = ["/usr/local","jakarta-tomcat"],
    "Def"  = ["/usr/local","jakarta-tomcat-*"],
***************
*** 472,480 ****
    "Conf"  = 'MapleProgram',
    "Def"   = "/bin/maple",
-   "Def"   = "/Applications/Maple 9.app/Contents/MacOS/bin/maple",
    "Def"   = "/usr/bin/maple",
    "Def"   = "/usr/local/bin/maple",
    "Def"   = "/usr/local/maple/bin/maple",
    "Def"   = "/usr/local/maple_su/bin/maple",
    "Path"  = "maple",
    "Check" = ["-c quit;","Waterloo"]
--- 473,482 ----
    "Conf"  = 'MapleProgram',
    "Def"   = "/bin/maple",
    "Def"   = "/usr/bin/maple",
    "Def"   = "/usr/local/bin/maple",
    "Def"   = "/usr/local/maple/bin/maple",
    "Def"   = "/usr/local/maple_su/bin/maple",
+   "Def"   = "/Applications/'Maple 9.5'/'Maple 9.5.app'/Contents/MacOS/bin/maple",
+   "Def"   = "/Applications/'Maple 9.app'/Contents/MacOS/bin/maple",
    "Path"  = "maple",
    "Check" = ["-c quit;","Waterloo"]
***************
*** 791,795 ****
  # Look for TtH
  
! if os_os = "Linux" or os_os = "OS X" then
   Config['TtHProgram'] :=
   look_for_prog(
--- 793,797 ----
  # Look for TtH
  
! if os_os = "Linux" then
   Config['TtHProgram'] :=
   look_for_prog(
***************
*** 800,803 ****
--- 802,814 ----
    "Check" = ["-r < tthtest.tex","TtH is OK"]
   ):
+  elif os_os = "OS X" then
+  Config['TtHProgram'] :=
+  look_for_prog(
+   "TtH",
+   "Conf"  = 'TtHProgram',
+   "Path"  = "tth",
+   "Def"   = cat(Config['WebAppDir'],"/bin/tth_exe/OSX/tth"),
+   "Check" = ["-r < tthtest.tex","TtH is OK"]
+  ):
  else
   Config['TtHProgram'] :=

Index: ManualConfig.dist
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/ManualConfig.dist,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ManualConfig.dist	13 Apr 2004 08:55:16 -0000	1.5
--- ManualConfig.dist	21 May 2004 14:12:27 -0000	1.6
***************
*** 23,27 ****
  # Config['BLATProgram'] := "C:\\Tomcat\\webapps\\AiM\\bin\\blat\\blat.exe":
  
! # The absolute path to the sendmail program, used under Linux
  # Config['SendmailProgram'] := "/usr/lib/sendmail":
  
--- 23,27 ----
  # Config['BLATProgram'] := "C:\\Tomcat\\webapps\\AiM\\bin\\blat\\blat.exe":
  
! # The absolute path to the sendmail program, used under Linux and OS X
  # Config['SendmailProgram'] := "/usr/lib/sendmail":
  
***************
*** 32,35 ****
--- 32,36 ----
  # Config['JavaHome'] := "/usr/java/jdk":
  # Config['JavaHome'] := "C:\\j2sdk1.4.2":
+ # Config['JavaHome'] := "/Library/Java/Home":
  
  
***************
*** 46,49 ****
--- 47,51 ----
  # Config['MapleProgram']    := "/usr/bin/maple":
  # Config['MapleProgram']    := "C:\\Program Files\\Maple 8\\bin.win\\cmaple8.exe":
+ # Config['MapleProgram']    := "/Applications/Maple 9.app/Contents/MacOS/bin/maple":
  
  
***************
*** 51,56 ****
  # The absolute path to the tth program (used to convert LaTeX to HTML).
  # The recommended locations are as follows:
! # Config['TtHProgram'] := "/usr/local/tomcat/webapps/aim/bin/tth/tth":
! # Config['TtHProgram'] := "C:\\Tomcat\\webapps\\AiM\\bin\\tth\\tth.exe":
  
  
--- 53,59 ----
  # The absolute path to the tth program (used to convert LaTeX to HTML).
  # The recommended locations are as follows:
! # Config['TtHProgram'] := "/usr/local/tomcat/webapps/aim/bin/tth_exe/tth":
! # Config['TtHProgram'] := "C:\\Tomcat\\webapps\\AiM\\bin\\tth_exe\\tth.exe":
! # Config['TtHProgram'] := "/usr/local/tomcat/webapps/aim/bin/tth_exe/OSX/tth":
  
  

Index: SafeParse.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/SafeParse.mpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SafeParse.mpl	15 Apr 2004 08:53:27 -0000	1.8
--- SafeParse.mpl	21 May 2004 14:12:27 -0000	1.9
***************
*** 676,679 ****
--- 676,712 ----
  ######################################################################
  
+ 
+ if os_os = "OS X" then
+ `Package/Assign`(
+  `aim/SafeParse/WordsToString`::string,
+  "Convert a list of 4-byte integers to a string.  The bytes are
+   interpreted as ASCII characters, with less-significant bytes
+   referring to earlier characters.  This is the internal coding
+   used by Maple for names.",
+  proc(d::list(integer))
+ 
+   local nam,blk,i,w,c;
+ 
+   nam := NULL;
+   for i from 1 to nops(d) do
+   blk := NULL;
+    w := d[i];
+    c := irem(w,256);
+    if (c <> 0) then blk := c,blk; fi;
+    w := iquo(w,256);
+    c := irem(w,256);
+    if (c <> 0) then blk := c,blk; fi;
+    w := iquo(w,256);
+    c := irem(w,256);
+    if (c <> 0) then blk := c,blk; fi;
+    w := iquo(w,256);
+    c := irem(w,256);
+    if (c <> 0) then blk := c,blk; fi;
+    nam := nam,blk;
+   od;
+   RETURN(convert([nam],'bytes'));
+  end
+ ):
+ else
  `Package/Assign`(
   `aim/SafeParse/WordsToString`::string,
***************
*** 704,707 ****
--- 737,741 ----
   end
  ):
+ fi: