From b3f7a7ae5a913a64f1d562f44705f6cf65f27a01 Mon Sep 17 00:00:00 2001 From: rocky Date: Mon, 14 Sep 2020 23:19:45 -0400 Subject: [PATCH] Go over gallery and docs --- mathics/doc/documentation/1-Manual.mdoc | 11 +++--- mathics/doc/documentation/A-License.mdoc | 4 +-- mathics/doc/tex/Makefile | 2 +- mathics/web/media/js/inout.js | 43 ++++++++++++++---------- 4 files changed, 36 insertions(+), 24 deletions(-) diff --git a/mathics/doc/documentation/1-Manual.mdoc b/mathics/doc/documentation/1-Manual.mdoc index db5f184147..0606ce7482 100644 --- a/mathics/doc/documentation/1-Manual.mdoc +++ b/mathics/doc/documentation/1-Manual.mdoc @@ -1,6 +1,6 @@ -\Mathics---to be pronounced like "Mathematics" without the "emat"---is a general-purpose computer algebra system (CAS). It is meant to be a free, light-weight alternative to \Mathematica. It is free both as in "free beer" and as in "freedom". There are various online mirrors running \Mathics but it is also possible to run \Mathics locally. A list of mirrors can be found at the \Mathics homepage, http://mathics.github.io. +\Mathics---to be pronounced like "Mathematics" without the "emat"---is a general-purpose computer algebra system (CAS). It is meant to be a free, open-source alternative to \Mathematica. It is free both as in "free beer" and as in "freedom". There are various online mirrors running \Mathics but it is also possible to run \Mathics locally. A list of mirrors can be found at the \Mathics homepage, http://mathics.github.io. The programming language of \Mathics is meant to resemble \Wolfram\'s famous \Mathematica as much as possible. However, \Mathics is in no way affiliated or supported by \Wolfram. \Mathics will probably never have the power to compete with \Mathematica in industrial applications; yet, it might be an interesting alternative for educational purposes. @@ -66,7 +66,10 @@ Furthermore, SQLite support is needed. Debian/Ubuntu provides the package l (as super-user, i.e. either after having issued su or by preceding the command with sudo). -On Mac OS X, consider using Fink (http://www.finkproject.org) and install the sqlite3-dev package. +On Mac OS X + +# brew install sqlite3 + If you are on Windows, please figure out yourself how to install SQLite. @@ -78,9 +81,9 @@ Simply run: # python setup.py install -In addition to installing \Mathics, this will download the required Python packages sympy, mpmath, django, and pysqlite and install them in your Python site-packages directory (usually /usr/lib/python2.x/site-packages on Debian or /Library/Frameworks/Python.framework/Versions/2.x/lib/python2.x/site-packages on Mac OS X). +In addition to installing \Mathics, this will download the required Python packages sympy, mpmath, django, and pysqlite and install them in your Python site-packages directory (usually /usr/lib/python3.x/site-packages on Debian or /Library/Frameworks/Python.framework/Versions/3.x/lib/python3.x/site-packages on Mac OS X). -Two executable files will be created in a binary directory on your PATH (usually /usr/bin on Debian or /Library/Frameworks/Python.framework/Versions/2.x/bin on Mac OS X): mathics and mathicsserver. +Two executable files will be created in a binary directory on your PATH (usually /usr/bin on Debian or /Library/Frameworks/Python.framework/Versions/3.x/bin on Mac OS X): mathics and mathicsserver.
diff --git a/mathics/doc/documentation/A-License.mdoc b/mathics/doc/documentation/A-License.mdoc index 17350f8a23..811750860c 100644 --- a/mathics/doc/documentation/A-License.mdoc +++ b/mathics/doc/documentation/A-License.mdoc @@ -343,7 +343,7 @@ limitations under the License.
-Copyright © 2010-2012 Three.js authors. +Copyright © 2010-2020 Three.js authors. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -398,7 +398,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Copyright © 2001, 2002 Enthought, Inc. All rights reserved. -Copyright © 2003-2013 SciPy Developers. +Copyright © 2003-2019 SciPy Developers. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/mathics/doc/tex/Makefile b/mathics/doc/tex/Makefile index d385feafb8..b2109bc6c7 100644 --- a/mathics/doc/tex/Makefile +++ b/mathics/doc/tex/Makefile @@ -19,7 +19,7 @@ logo-heptatom.pdf logo-text-nodrop.pdf: documentation.tex: (cd ../.. && $(PYTHON) test.py -o && $(PYTHON) test.py -t) -#: Same as +#: Same as mathics.pdf latex: mathics.pdf #: Remove all auto-generated files diff --git a/mathics/web/media/js/inout.js b/mathics/web/media/js/inout.js index 4e0b1ee036..750ec59071 100644 --- a/mathics/web/media/js/inout.js +++ b/mathics/web/media/js/inout.js @@ -187,22 +187,31 @@ function loadLink() { function showGallery() { setQueries([ - '1 + 2 - x * 3 x / y', - 'Sin[Pi]', - 'Graphics3D[Sphere[{0, 0, 0}, 1]]', - 'Plot[{Sin[x], Cos[x], Tan[x]}, {x, -3Pi, 3Pi}]', - 'BarChart[{{1, 2, 3}, {2, 3, 4}}]', - 'Plot[{Abs[Sin[x]], Abs[Cos[x]]}, {x,0,4 Pi}, Mesh->Full]', - 'Plot3D[Exp[x] Cos[y], {x, -2, 1}, {y, -Pi, 2 Pi}, PlotPoints->31]', - 'Plot3D[Sin[x y], {x, -2, 2}, {y, -2, 2}, Mesh->Full, PlotPoints->21]', - 'Graph[{1 <-> 2, 2 <-> 3, 5 <-> 2, 3 <-> 4, 5 <-> 3}]', - 'N[E, 30]', - 'D[Sin[2x] + Log[x] ^ 2, x]', - 'Integrate[Tan[x] ^ 5, x]', - 'A = {{1, 2, 3}, {4, 5, 6}, {7, 8, 9}}; MatrixForm[A]', - 'LinearSolve[A, {1, 1, 1}] // MatrixForm', - 'Eigenvalues[A]', - '# ^ 2 & /@ Range[10]', - 'Graphics[Table[{EdgeForm[{GrayLevel[0, 0.5]}], Hue[(-11+q+10r)/72, 1, 1, 0.6], Disk[(8-r){Cos[2Pi q/12], Sin [2Pi q/12]}, (8-r)/3]}, {r, 6}, {q, 12}]]' + '1 + 2 - x * 3 x / y', + 'Apart[1 / (x^2 + 5x + 6)]', + 'Cancel[x / x ^ 2]', + 'Expand[(x + y)^ 3]', + 'Factor[x ^ 2 + 2 x + 1]', + 'Sin[Pi]', + 'Simplify[5*Sin[x]^2 + 5*Cos[x]^2]', + 'Graphics3D[Sphere[{0, 0, 0}, 1]]', + 'Plot[{Sin[x], Cos[x], Tan[x]}, {x, -3Pi, 3Pi}]', + 'BarChart[{{1, 2, 3}, {2, 3, 4}}]', + 'Plot[{Abs[Sin[x]], Abs[Cos[x]]}, {x,0,4 Pi}, Mesh->Full]', + 'Plot3D[Exp[x] Cos[y], {x, -2, 1}, {y, -Pi, 2 Pi}, PlotPoints->21]', + 'Plot3D[Sin[x y], {x, -2, 2}, {y, -2, 2}, Mesh->Full, PlotPoints->21]', + 'N[E, 30]', + 'D[Sin[2x] + Log[x] ^ 2, x]', + 'Integrate[Tan[x] ^ 5, x]', + 'A = {{1, 2, 3}, {4, 5, 6}, {7, 8, 9}}; MatrixForm[A]', + 'LinearSolve[A, {1, 1, 1}] // MatrixForm', + 'Eigenvalues[A]', + '# ^ 2 & /@ Range[10]', + 'Graphics[Table[{EdgeForm[{GrayLevel[0, 0.5]}], Hue[(-11+q+10r)/72, 1, 1, 0.6], Disk[(8-r){Cos[2Pi q/12], Sin [2Pi q/12]}, (8-r)/3]}, {r, 6}, {q, 12}]]', + 'ElementData[74]', + 'ElementData["He", "AbsoluteBoilingPoint"]', + 'ListLinePlot[Table[Sin[x], {x,-5, 5, 0.5}], Filling->Axis]', + 'Graphics3D[Polygon[{{0,0,0}, {0,1,1}, {1,0,0}}]]', + 'Graphics[Line[AnglePath[Table[1.7, {50}]]]]' ]); }