MaC OS/X version added.

diff --git a/html/index.htm b/html/index.htm
index 13cdafa29ea86124f4d38da0afa49ffd12958cff..6a2e0fe308158499a309b2fdab8e21126596e700 100644 (file)
--- a/html/index.htm
+++ b/html/index.htm
@@ -53,8 +53,9 @@ color="#00006A">) </font></h4>
 from Cross-longitudinal surveys. <em>Mathematical Population Studies</em>.- 10(4), pp. 211-248</a>\r
 </p>\r
 \r
-<h2><font color="#EC5E5E"><strong>New installation method</strong></font></h2>\r
+<h2><font color="#EC5E5E"><strong>Download and instructions for installation</strong></font></h2>\r
 \r
+<h3>On Windows (win9X, 2000, XP)</h3>\r
 <p> Until June 2004 the installation did consist in a zip file which\r
 had to be extracted in the directory of your choice. But with version\r
 0.97b IMaCh we are using a windows installer (Inno setup).  Both\r
@@ -116,6 +117,92 @@ the notepad editor or 'run' it with gnuplot (you need a recent version).<br>
         href="doc/imach.htm">doc/imach.htm</a></li>\r
 </ul>\r
 \r
+<br>\r
+Imach version 0.97b of June 21 2004 can be downloaded as a setup.exe file\r
+<a href=imach-0.97b-2-setup.exe">\r
+http://euroreves.ined.fr/imach/imach-0.97b-2-setup.exe</a>. The IMaCh\r
+program and gnuplot will be installed in the directory that you want\r
+(usually in Program Files).  We made some errors in the new setup and\r
+some erlier versions did not work. Please check the md5sum which is\r
+3cb42bf71396d531d4bc3d42fee46a52 imach-0.97b-2-setup.exe \r
+\r
+<br>We also changed the wordpad editor to notepad which is less useful\r
+but exists on most Windows installation.  <br> For people who are not\r
+allowed to modify the registry of their Windows installation here is a\r
+second setup <a\r
+href="imach-0.97b-2-noreg-setup.exe">imach-0.97b-2-noreg-setup.exe</a>.\r
+\r
+<p><a href="oldversion.html">Old Windows versions are accessible here.</a>\r
+<h3>On Mac OS/X</h3>\r
+\r
+IMaCh can be easily compiled with gcc 3.3 on MacIntosh as soon as\r
+XCode (free download from Apple) is intalled on your MaCIntosh.<p>\r
+\r
+It take a litle more time to get latest version of Gnuplot 4.0 for Mac\r
+OS/X and to compile it on a MaC. The main problem resides in finding\r
+the png library. Gif images are patented now and the replacement is\r
+png, but the development of the png library is growing on its own and\r
+you just have to find on Google where it is hosted now.\r
+\r
+<br>\r
+Gnuplot can be easily compiled on a MaC, but I don't know yet (July\r
+2004) which is default screen terminal driver for gnuplot. For sure if\r
+X11 is installed on your MaC (it is included on your installation CD\r
+or you can download it from the WEB), the you can do <tt>set ter\r
+X11</tt> and <tt>plot sin(x)</tt> to get a nice sin curve on an X11\r
+window of your Mac.\r
+\r
+<br> Let me add that for running IMaCh with all of its features, you don't\r
+need X11; the gnuplot program included in the distribution needs only\r
+to have the png terminal driver to output graphs and these graphs will\r
+be viewed by your browser.<br>\r
+\r
+You need X11 only if you want to modify and test the gnuplot code output by\r
+ImaCh, because it might be a more convenient way to view the graphs\r
+directly on the screen than writing images on a file and viewing them\r
+with a browser,\r
+\r
+<p>\r
+You can download a .pkg.paw file at <a\r
+       href="imach097b.pkg.pax">imach097b.pkg.pax</a>. Stuffit\r
+      Expander will expand compressed imach097b.pkg directory. Just\r
+      clicking on the directory will let you install ImaCh in a local\r
+      directory of your own. Two sub-directories are created\r
+      <tt>bin</tt> and <tt>html</tt> . In the bin subdirectory you\r
+      will find two executables <tt>imach</tt> itself and\r
+      <tt>gnuplot</tt>. \r
+\r
+<p>\r
+You need to click on <tt>imach</tt> and IMaCh will be launched in a\r
+      terminal window, asking you to enter a <tt>parameter</tt> file. A\r
+      parameter file is text file with an extension <tt>.imach</tt>\r
+      (but you can use a <tt>.txt</tt> extension if you want. Among\r
+      the parameters required, a data file name has to be entered. It\r
+      can be a relative file name like\r
+      <tt>../../data/data1.txt</tt>. It might also work if you use the\r
+      Windows backslash "<tt>\</tt>" syntax.\r
+<p>\r
+At the end of the run, and it order for the terminal window not to\r
+      disappear, the program prompt for a command like "<tt>e</tt>" for\r
+      edit or "<tt>q</tt>" for quit. The edit command might not work\r
+      on a MaC, or on Unix or even on recent Windows, because the program should know which\r
+      browser you are using and becauee the BROWSER environment\r
+      doesn't seem to be standard on a Mac and on some other OS too.\r
+\r
+<br> The consequence for you is just that you have to use your finder\r
+      or browser (there is no more difference now) and click on the\r
+      <tt>.html</tt> (or .htm) file created. The filename of this html\r
+      file is the same name as your parameter file, only the extension\r
+      .imach is changed to .html.\r
+\r
+<h3>On Linux</h3>\r
+There are various versions of Linux, gnuplot is distributed on most\r
+    distributions. Just verify that your version is more recent than\r
+    version 0.38i . I haven't had time to make a rpm yet, just ask us\r
+    for the CVS tree location (not completely GPL today), and compile\r
+    the sources. Remarks concerning the Linux versions are similar to\r
+    the Mac OS/X version.\r
+\r
 <p><a href="doc/imach.htm"><font color="#FF0000" size="6">Click\r
 here to access to the detailed documentation</font></a></p>\r
 \r
@@ -139,36 +226,6 @@ equivalent routines from the new GNU scientific library.
 \r
 <p>Latest documentation can be accessed at <a\r
 href="http://euroreves.ined.fr/imach">http://euroreves.ined.fr/imach</a><br>\r
-Imach version (0.63 of 16 march 2000) can be downloaded in zip file <a\r
-href="http://euroreves.ined.fr/imach/imach.zip">http://euroreves.ined.fr/imach/imach.zip</a>\r
-<br> Imach version 0.64 May 2001 can be downloaded in zip file <a\r
-href="http://euroreves.ined.fr/imach/imach-0-64.zip">http://euroreves.ined.fr/imach/imach-0-64.zip</a>\r
-<br>\r
-Imach version 0.8 March 2002 can be downloaded in zip file <a\r
-href="http://euroreves.ined.fr/imach/imach-08.zip">http://euroreves.ined.fr/imach/imach-08.zip</a>\r
-<br>\r
-Imach version 0.8a May 2002 can be downloaded in zip file <a\r
-href="http://euroreves.ined.fr/imach/imach-08a.zip">\r
-http://euroreves.ined.fr/imach/imach-08a.zip</a>\r
-<br>\r
-Imach version 0.96d February 2004 can be downloaded in zip file <a\r
-href="http://euroreves.ined.fr/imach/imach-096d.zip">\r
-http://euroreves.ined.fr/imach/imach-096d.zip</a>\r
-\r
-<br>\r
-Imach version 0.97b of June 21 2004 can be downloaded as a setup.exe file\r
-<a href=imach-0.97b-2-setup.exe">\r
-http://euroreves.ined.fr/imach/imach-0.97b-2-setup.exe</a>. The IMaCh\r
-program and gnuplot will be installed in the directory that you want\r
-(usually in Program Files).  We made some errors in the new setup and\r
-some erlier versions did not work. Please check the md5sum which is\r
-3cb42bf71396d531d4bc3d42fee46a52 imach-0.97b-2-setup.exe \r
-\r
-<br>We also changed the wordpad editor to notepad which is less useful\r
-but exists on most Windows installation.  <br> For people who are not\r
-allowed to modify the registry of their Windows installation here is a\r
-second setup <a\r
-href="imach-0.97b-2-noreg-setup.exe">imach-0.97b-2-noreg-setup.exe</a>.\r
 </p>\r
 \r
 <p> There is a public mailing list of IMaCh's users.  You can\r
@@ -180,6 +237,9 @@ href=mailto:imach-users-unsubscribe@listes.ined.fr>imach-users-unsubscribe@liste
 <br>$Id$<br>\r
 <!--  $State$\r
   $Log$\r
+  Revision 1.5  2004/06/22 11:18:20  brouard\r
+  Adding the noreg setup for users who don't have privileges to modify Windows registries.\r
+\r
   Revision 1.4  2004/06/16 23:49:33  brouard\r
   *** empty log message ***\r
 \r