Skip to content

Commit 79f72eb

Browse files
committed
Make a pass over documents
Include deletion in conjunction of worksheets. Go over typographical setting in various new docs.
1 parent 15d8d63 commit 79f72eb

6 files changed

Lines changed: 19 additions & 15 deletions

File tree

CHANGES.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ Enhancements
2222
* Automatic detection for the best strategy to numeric evaluation of constants.
2323
* ``FileNameJoin`` - implement ``OperatingSystem`` option
2424
* Mathics functions are accepted by ``Compile[]``. The return value or type will be
25-
``Compiled[] and CompiledFunction[]`` every expression can have a compiled form,
25+
``Compile[] and CompiledFunction[]`` every expression can have a compiled form,
2626
as a Python function.
27-
* ``EqualQ[]`` now compares complex against other numbers properly.
27+
* ``Equal[]`` now compares complex against other numbers properly.
2828

2929

3030
Bug fixes

mathics/builtin/comparison.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -448,14 +448,16 @@ class Equal(_EqualityOperator, SympyComparison):
448448
= True
449449
450450
Strings are allowed:
451-
Equal["11", "11"]
451+
452+
>> Equal["11", "11"]
452453
= True
453454
454-
Equal["121", "11"]
455+
>> Equal["121", "11"]
455456
= False
456457
457458
Comparision to mismatched types is False:
458-
Equal[11, "11"]
459+
460+
>> Equal[11, "11"]
459461
= False
460462
461463
Lists are compared based on their elements:

mathics/builtin/compilation.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
class Compile(Builtin):
1818
"""
1919
<dl>
20-
<dt>'Compile[{x1, x2, ...}, expr_]'
20+
<dt>'Compile[{$x1$, $x2$, ...}, $expr$]'
2121
<dd>Compiles $expr$ assuming each $xi$ is a $Real$ number.
22-
<dt>'Compile[{{x1, t1} {x2, t1} ...}, expr_]'
22+
<dt>'Compile[{{$x1$, $t1$} {$x2$, $t1$} ...}, $expr$]'
2323
<dd>Compiles assuming each $xi$ matches type $ti$.
2424
</dl>
2525
@@ -51,7 +51,7 @@ class Compile(Builtin):
5151
#> cf[x + y]
5252
= CompiledFunction[{x, y}, Sin[x + y], -CompiledCode-][x + y]
5353
54-
Compile supports basic flow control
54+
Compile supports basic flow control:
5555
>> cf = Compile[{{x, _Real}, {y, _Integer}}, If[x == 0.0 && y <= 0, 0.0, Sin[x ^ y] + 1 / Min[x, 0.5]] + 0.5]
5656
= CompiledFunction[{x, y}, ..., -CompiledCode-]
5757
>> cf[3.5, 2]

mathics/builtin/numbertheory.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ class PartitionsP(SympyFunction):
674674
"""
675675
<dl>
676676
<dt>'PartitionsP[$n$]'
677-
<dd>return the number p(n) of unrestricted partitions of the integer $n$.
677+
<dd>return the number $p$($n$) of unrestricted partitions of the integer $n$.
678678
</dl>
679679
680680
>> Table[PartitionsP[k], {k, -2, 12}]

mathics/builtin/numeric.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -433,13 +433,13 @@ class NIntegrate(Builtin):
433433
>> NIntegrate[1 / z, {z, -1 - I, 1 - I, 1 + I, -1 + I, -1 - I}, Tolerance->1.*^-4]
434434
: Integration over a complex domain is not implemented yet
435435
= NIntegrate[1 / z, {z, -1 - I, 1 - I, 1 + I, -1 + I, -1 - I}, Tolerance -> 0.0001]
436-
# = 6.2832 I
436+
## = 6.2832 I
437437
438-
Integrate singularities with weak divergences
438+
Integrate singularities with weak divergences:
439439
>> Table[NIntegrate[x^(1./k-1.),{x,0,1.},Tolerance->1*^-6], {k,1,7.}]
440440
= {1., 2., 3., 4., 5., 6., 7.}
441441
442-
Iterated Integral
442+
Iterated Integral:
443443
>> NIntegrate[x * y,{x, 0, 1},{y, 0, 1}]
444444
= 0.25
445445
"""

mathics/doc/documentation/1-Manual.mdoc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -995,7 +995,7 @@ It looks like this:
995995
<imgpng src="menubar.png" title="Mathic Menu Bar" label="menubar">
996996

997997

998-
<section title="Saving and Loading Worksheets">
998+
<section title="Saving, Loading, and Deleting Worksheets">
999999

10001000
<subsection title="Saving Worksheets">
10011001

@@ -1005,14 +1005,16 @@ Worksheets exist in the browser window only and are not stored on the server, by
10051005

10061006
Depending on browser, desktop, and OS-settings, the "Ctrl+S" key combination may do the same thing.
10071007

1008-
<subsection title="Loading Worksheets">
1008+
<subsection title="Loading and Deleting Worksheets">
10091009

1010-
Saved worksheets can be loaded again using the <em>File Open</em> button which is the left-most button in the menu bar. It looks like this:
1010+
Saved worksheets can be loaded or deleted using the <em>File Open</em> button which is the left-most button in the menu bar. It looks like this:
10111011

10121012
<imgpng src="file-open-button.png" title="Mathic File Open Button" label="file-open-button">
10131013

10141014
Depending on browser, desktop, and OS-settings, the "Ctrl+O" key combination may do the same thing.
10151015

1016+
A popup menu should appear with the list of saved worksheets with an option to either load or delete the worksheet.
1017+
10161018
</section>
10171019

10181020
<section title="Persistence of Mathics Definitions in a Session">

0 commit comments

Comments
 (0)