diff --git a/mathics/builtin/box/__init__.py b/mathics/builtin/box/__init__.py index 29798d481..0a1faa519 100644 --- a/mathics/builtin/box/__init__.py +++ b/mathics/builtin/box/__init__.py @@ -5,7 +5,7 @@ Boxing information, like the class of expression to be worked on and \ its size, allow formatters, like :StandardForm: -/doc/reference-of-built-in-symbols/forms-of-input-and-output/printforms/standardform/ \ +/doc/reference-of-built-in-symbols/forms-of-input-and-output/general-purpose-forms/standardform/ \ to do their work without \ having to know more specific details and intricacies of expression to be formatted. diff --git a/mathics/builtin/drawing/__init__.py b/mathics/builtin/drawing/__init__.py index 12c56c163..292e61179 100644 --- a/mathics/builtin/drawing/__init__.py +++ b/mathics/builtin/drawing/__init__.py @@ -10,15 +10,15 @@ :'Circle': /doc/reference-of-built-in-symbols/drawing-graphics/circle and :'Cuboid': -/doc/reference-of-built-in-symbols/graphics-and-drawing/three-dimensional-graphics/cuboid/ \ +/doc/reference-of-built-in-symbols/plotting-graphing-and-drawing/three-dimensional-graphics/cuboid/ \ and place them in a coordinate space.
  • Compute the points of the space using a function. This is done using functions \ like :'Plot': - /doc/reference-of-built-in-symbols/graphics-and-drawing/plotting-data/plot \ + /doc/reference-of-built-in-symbols/plotting-graphing-and-drawing/general-graphical-plots/plot \ and :'ListPlot': - /doc/reference-of-built-in-symbols/graphics-and-drawing/plotting-data/listplot. + /doc/reference-of-built-in-symbols/plotting-graphing-and-drawing/list-plots/listplot. """ diff --git a/mathics/builtin/drawing/graphics3d.py b/mathics/builtin/drawing/graphics3d.py index 7e133e1c8..e167dafa1 100644 --- a/mathics/builtin/drawing/graphics3d.py +++ b/mathics/builtin/drawing/graphics3d.py @@ -70,7 +70,7 @@ class Graphics3D(Graphics):
    represents a three-dimensional graphic. See :Drawing Option and Option Values: - /doc/reference-of-built-in-symbols/graphics-and-drawing/drawing-options-and-option-values + /doc/reference-of-built-in-symbols/plotting-graphing-and-drawing/drawing-options-and-option-values for a list of Plot options. diff --git a/mathics/builtin/drawing/plot_listplot.py b/mathics/builtin/drawing/plot_listplot.py index 22fafa5f9..7ff1468eb 100644 --- a/mathics/builtin/drawing/plot_listplot.py +++ b/mathics/builtin/drawing/plot_listplot.py @@ -162,13 +162,13 @@ class ListPlot(_ListPlot): = -Graphics- Compare with :'Plot': - /doc/reference-of-built-in-symbols/graphics-and-drawing/plotting-data/plot/. + /doc/reference-of-built-in-symbols/plotting-graphing-and-drawing/general-graphical-plots/plot/. >> ListPlot[Table[n ^ 2, {n, 30}], Filling->Axis] = -Graphics- Compare with :'Plot': - /doc/reference-of-built-in-symbols/graphics-and-drawing/plotting-data/plot. + /doc/reference-of-built-in-symbols/plotting-graphing-and-drawing/general-graphical-plots/plot. """ options = Graphics.options.copy() @@ -405,7 +405,7 @@ class DiscretePlot(_ListPlot): = -Graphics- Compare with :'Plot': - /doc/reference-of-built-in-symbols/graphics-and-drawing/plotting-data/plot/. + /doc/reference-of-built-in-symbols/plotting-graphing-and-drawing/general-graphical-plots/plot/. """ attributes = A_HOLD_ALL | A_PROTECTED diff --git a/mathics/builtin/drawing/plot_plot3d.py b/mathics/builtin/drawing/plot_plot3d.py index 3e233d41d..f89dda6b1 100644 --- a/mathics/builtin/drawing/plot_plot3d.py +++ b/mathics/builtin/drawing/plot_plot3d.py @@ -150,7 +150,7 @@ class ComplexPlot3D(_Plot3D): $z_{max}$ with surface colored according to phase See :Drawing Option and Option Values: - /doc/reference-of-built-in-symbols/graphics-and-drawing/drawing-options-and-option-values + /doc/reference-of-built-in-symbols/plotting-graphing-and-drawing/drawing-options-and-option-values for a list of Plot options. @@ -173,7 +173,7 @@ class ComplexPlot(_Plot3D): $z_{max}$ colored according to phase See :Drawing Option and Option Values: - /doc/reference-of-built-in-symbols/graphics-and-drawing/drawing-options-and-option-values + /doc/reference-of-built-in-symbols/plotting-graphing-and-drawing/drawing-options-and-option-values for a list of Plot options. @@ -196,7 +196,7 @@ class ContourPlot(_Plot3D): $x$ ranging from $x_{min}$ to $x_{max}$ and $y$ ranging from $y_{min}$ to $y_{max}$. See :Drawing Option and Option Values: - /doc/reference-of-built-in-symbols/graphics-and-drawing/drawing-options-and-option-values + /doc/reference-of-built-in-symbols/plotting-graphing-and-drawing/drawing-options-and-option-values for a list of Plot options. @@ -253,7 +253,7 @@ class Plot3D(_Plot3D): $x_{max}$ and $y$ ranging from $y_{min}$ to $y_{max}$. See :Drawing Option and Option Values: - /doc/reference-of-built-in-symbols/graphics-and-drawing/drawing-options-and-option-values + /doc/reference-of-built-in-symbols/plotting-graphing-and-drawing/drawing-options-and-option-values for a list of Plot options. diff --git a/mathics/builtin/forms/__init__.py b/mathics/builtin/forms/__init__.py index 8900c1818..a4fdcc467 100644 --- a/mathics/builtin/forms/__init__.py +++ b/mathics/builtin/forms/__init__.py @@ -3,7 +3,7 @@ A Form specifies the way Mathics3 Expressions are formatted or displayed. -The variable :$OutputForms: +The variable :\$OutputForms: /doc/reference-of-built-in-symbols/forms-of-input-and-output/form-variables/\$outputforms/ \ has a list of Forms defined. diff --git a/mathics/builtin/forms/data.py b/mathics/builtin/forms/data.py index 6d042f27d..f9716af83 100644 --- a/mathics/builtin/forms/data.py +++ b/mathics/builtin/forms/data.py @@ -4,9 +4,9 @@ Some forms are specific to formatting certain kinds of data, like numbers, strings, or matrices. These are in contrast to the Forms like :OutputForm: -/doc/reference-of-built-in-symbols/forms-of-input-and-output/printforms/outputform/ \ +/doc/reference-of-built-in-symbols/forms-of-input-and-output/general-purpose-forms/outputform/ \ or :StandardForm: -/doc/reference-of-built-in-symbols/forms-of-input-and-output/printforms/standardform/, \ +/doc/reference-of-built-in-symbols/forms-of-input-and-output/general-purpose-forms/standardform/, \ which are intended to work over all kinds of data. """ from typing import Any, Callable, Dict, List, Optional diff --git a/mathics/builtin/forms/print.py b/mathics/builtin/forms/print.py index 01ca58e8f..cf730d17c 100644 --- a/mathics/builtin/forms/print.py +++ b/mathics/builtin/forms/print.py @@ -3,13 +3,12 @@ A number of forms are suitable for formatting any kind of \Mathics expression. -The variable :$PrintForms: -/doc/reference-of-built-in-symbols/forms-of-input-and-output/form-variables/$printforms/ \ +The variable :\$PrintForms:/doc/reference-of-built-in-symbols/forms-of-input-and-output/form-variables/\$printforms \ contains a list of Forms \ that are in this category. After formatting the \Mathics expression, these removing mention of the form. -While Forms that appear in '$PrintForms' can be altered at run time, \ -below are the functions that appear in '$PrintForms' at startup. +While Forms that appear in '\$PrintForms' can be altered at run time, \ +below are the functions that appear in '\$PrintForms' at startup. """ from mathics.builtin.box.layout import InterpretationBox, PaneBox, StyleBox diff --git a/mathics/builtin/kernel_sessions.py b/mathics/builtin/kernel_sessions.py index 8a2250242..78105c991 100644 --- a/mathics/builtin/kernel_sessions.py +++ b/mathics/builtin/kernel_sessions.py @@ -9,9 +9,9 @@ class Out(Builtin): r""" - :WMA: https://reference.wolfram.com/language/ref/\$Out + :WMA: https://reference.wolfram.com/language/ref/Out
    -
    '%$k$' or 'Out'[$k$] +
    '$\%k$' or 'Out'[$k$]
    gives the result of the $k$-th input line.
    '%' diff --git a/mathics/builtin/options.py b/mathics/builtin/options.py index 4e650bfbd..0d6e1aa13 100644 --- a/mathics/builtin/options.py +++ b/mathics/builtin/options.py @@ -58,10 +58,10 @@ class All(Predefined): In :Plot: - /doc/reference-of-built-in-symbols/graphics-and-drawing/plotting-data/plot, \ + /doc/reference-of-built-in-symbols/plotting-graphing-and-drawing/general-graphical-plots/plot, \ setting the :Mesh: -/doc/reference-of-built-in-symbols/graphics-and-drawing/drawing-options-and-option-values/mesh \ +/doc/reference-of-built-in-symbols/plotting-graphing-and-drawing/drawing-options-and-option-values/mesh \ option to 'All' will show the specific plot points: >> Plot[x^2, {x, -1, 1}, MaxRecursion->5, Mesh->All] @@ -182,7 +182,7 @@ class None_(Predefined): Plot3D shows the mesh grid between computed points by default. This the :Mesh: -/doc/reference-of-built-in-symbols/graphics-and-drawing/drawing-options-and-option-values/mesh \ +/doc/reference-of-built-in-symbols/plotting-graphing-and-drawing/drawing-options-and-option-values/mesh \ However, you hide the mesh by setting the 'Mesh' option value to 'None':