--- a/software.org Wed May 11 13:28:50 2011 +0530
+++ b/software.org Tue May 17 00:15:17 2011 +0530
@@ -19,28 +19,53 @@
replacement for the proprietary software packages listed in column 1.
|------------------------------------------------------+-----------------------------+----------------|
-| Commercial Software | Recommended FOSS Equivalent | Other Packages |
+| Commercial Software / Usage | Recommended FOSS Equivalent | Other Packages |
|------------------------------------------------------+-----------------------------+----------------|
| MATLAB | [[file:matlab.org::sec-1][Scilab]] | [[file:matlab.org::sec-3][Octave]] |
| | [[file:matlab.org::sec-2][SciPy]] | |
-| Mathematica | [[file:mathematica.org::sec-1][Sage]] | [[file:mathematica.org::sec-2][Maxima]] |
-| Maple | [[file:mathematica.org::sec-1][Sage]] | [[file:mathematica.org::sec-2][Maxima]] |
-| Turbo C | [[file:turboc.org::sec-1][GCC]] | |
-| Microsoft Office | Open Office | LaTeX |
-| | | Libre Office |
-| Microsoft Windows | GNU/Linux | |
-| MS OFFICE Plotting tools | Xmgrace, XFIG, GNUPLOT | |
-| Cadence pSpice | ngspice | |
-| Pro/E | BRL-CAD | |
-| MASM | NASM, FASM | |
-| Code composer Studio, IAR Workbench | GNU Binutils | |
-| VxWORKS | RTLinux, RTAI | |
-| KEIL 8051 | SDCC | |
-| synopsis-CosmosSE, Mentor-Icstudio, Cadence-Virtuoso | Xcircuit | |
-| Mentor-ICstation, Cadence-Virtuoso | Magic | |
-| Modelsim | ghdl, freehdl | |
+|------------------------------------------------------+-----------------------------+----------------|
+| Mathematica, Maple | [[file:mathematica.org::sec-1][Sage]] | [[file:mathematica.org::sec-2][Maxima]] |
+|------------------------------------------------------+-----------------------------+----------------|
+| Turbo C, Borland C | [[file:turboc.org::sec-1][GCC]] | |
+|------------------------------------------------------+-----------------------------+----------------|
+| Microsoft Office / Office Suite | [[file:office.org::sec-1][Open Office]] / [[file:office.org::sec-2][Libre Office]] | [[file:office.org::sec-3][LaTeX]] |
+|------------------------------------------------------+-----------------------------+----------------|
| S-Plus | R | |
-| AutoCad | /no recommendations/ | [[file:autocad.org::sec-1][KiCAD]] |
+|------------------------------------------------------+-----------------------------+----------------|
+| IDL | [[file:matlab.org::sec-2][SciPy]] | |
+|------------------------------------------------------+-----------------------------+----------------|
+| Microsoft Windows | [[file:windows.org::sec-1][GNU/Linux]] | |
+|------------------------------------------------------+-----------------------------+----------------|
+| Tally | GNU Khata | |
+|------------------------------------------------------+-----------------------------+----------------|
+| AutoCAd | /no recommendations/ | [[file:autocad.org::sec-1][KiCAD]] |
| | | [[file:autocad.org::sec-2][Freecad]] |
|------------------------------------------------------+-----------------------------+----------------|
+| Plotting tools | | GNUPLOT |
+| | /no recommendations/ | Xmgrace |
+| | | XFIG |
+|------------------------------------------------------+-----------------------------+----------------|
+| Cadence pSpice | /no recommendations/ | ngspice |
+|------------------------------------------------------+-----------------------------+----------------|
+| Pro/E | /no recommendations/ | [[file:proe.org::sec-1][BRL-CAD]] |
+|------------------------------------------------------+-----------------------------+----------------|
+| MASM | /no recommendations/ | NASM |
+| | | FASM |
+|------------------------------------------------------+-----------------------------+----------------|
+| Code composer Studio, IAR Workbench | /no recommendations/ | GNU Binutils |
+|------------------------------------------------------+-----------------------------+----------------|
+| VxWORKS | /no recommendations/ | RTLinux |
+| | | RTAI |
+|------------------------------------------------------+-----------------------------+----------------|
+| KEIL 8051, MPLAB | /no recommendations/ | [[file:keil.org::sec-1][SDCC]] |
+| KEIL ARM | | [[file:keil.org::sec-2][GNU ARM]] |
+|------------------------------------------------------+-----------------------------+----------------|
+| synopsis-CosmosSE, Mentor-Icstudio, Cadence-Virtuoso | /no recommendations/ | Xcircuit |
+|------------------------------------------------------+-----------------------------+----------------|
+| Mentor-ICstation, Cadence-Virtuoso | /no recommendations/ | Magic |
+|------------------------------------------------------+-----------------------------+----------------|
+| Modelsim | /no recommendations/ | ghdl |
+| | | freehdl |
+|------------------------------------------------------+-----------------------------+----------------|
+