Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
2d98ca7
Merge remote-tracking branch 'origin/master' into mathml_tweaks
Jan 30, 2026
f513083
indentation
Jan 30, 2026
d26de0d
mathml indent
Jan 30, 2026
cbceb63
update docs
Jan 30, 2026
e556ec9
update tests. adjust more indentation
Jan 30, 2026
ada2900
Merge branch 'mathml_tweaks' into mathml_tweaks_indent
mmatera Jan 30, 2026
2951a17
restore Makefile
mmatera Jan 30, 2026
af48b42
Merge branch 'mathml_tweaks' into mathml_tweaks_indent
mmatera Jan 31, 2026
fb15ee6
Merge branch 'mathml_tweaks' into mathml_tweaks_indent
mmatera Feb 2, 2026
70f84ed
Improve processing of MathMLForm for Input and Output Form
mmatera Jan 29, 2026
5b89c3f
remove trailing print
mmatera Jan 29, 2026
e88108d
remove space from extra_operators, and add a comment
mmatera Jan 29, 2026
5295f48
add a comment about mathml multiline output. Give a more consistent o…
mmatera Jan 29, 2026
1831e6b
improve Expression.sameQ to deal with BoxExpressions. Add tests for B…
mmatera Feb 2, 2026
6c529bd
Add Box type annotations to render routines.
rocky Feb 3, 2026
3c53f98
Fix type errors found by mypy
rocky Feb 3, 2026
942752a
More mypy/type work.
rocky Feb 3, 2026
6d25078
Merge branch 'master' into mathml_tweaks
rocky Feb 3, 2026
b46ade2
Merge branch 'mathml_tweaks' into mathml_tweaks_indent
rocky Feb 3, 2026
940f921
merge
Feb 3, 2026
dd7d2a9
merge
Feb 3, 2026
483ecf6
merge
Feb 3, 2026
46d942a
self->box
rocky Feb 3, 2026
994551e
Merge branch 'mathml_tweaks_indent' of github.com:Mathics3/mathics-co…
rocky Feb 3, 2026
bddeb7a
merge
Feb 3, 2026
d2383b9
Merge branch 'mathml_tweaks' into mathml_tweaks_indent
mmatera Feb 3, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pyodide.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,5 @@ jobs:
python -m pip install --no-build-isolation -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner

pip install --no-build-isolation -e .
make mathics/data/op-tables.json mathics/data/operator-tables.json
make mathics/data/character-tables.json mathics/data/operator-tables.json
make -j3 check
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,17 @@ build:
# because pip install doesn't handle
# INSTALL_REQUIRES properly
#: Set up to run from the source tree
develop: mathics/data/op-tables.json mathics/data/operator-tables.json
develop: mathics/data/character-tables.json mathics/data/operator-tables.json
$(PIP) install -e .[dev]

# See note above on ./setup.py
#: Set up to run from the source tree with full dependencies
develop-full: mathics/data/op-tables.json mathics/data/operators.json
develop-full: mathics/data/character-tables.json mathics/data/operators.json
$(PIP) install -e .[dev,full]

# See note above on ./setup.py
#: Set up to run from the source tree with full dependencies and Cython
develop-full-cython: mathics/data/op-tables.json mathics/data/operators.json
develop-full-cython: mathics/data/character-tables.json mathics/data/operators.json
$(PIP) install -e .[dev,full,cython]


Expand Down Expand Up @@ -126,7 +126,7 @@ clean: clean-cython clean-cache
($(MAKE) -C "$$dir" clean); \
done; \
rm -f factorials || true; \
rm -f mathics/data/op-tables || true; \
rm -f mathics/data/character-tables.json || true; \
rm -rf build || true

mypy:
Expand Down Expand Up @@ -166,7 +166,7 @@ latexdoc texdoc doc:
(cd mathics/doc/latex && $(MAKE) doc)

#: Build JSON ASCII to unicode opcode table and operator table
mathics/data/operator-tables.json mathics/data/op-tables.json mathics/data/operators.json:
mathics/data/operator-tables.json mathics/data/character-tables.json mathics/data/operators.json:
$(BASH) ./admin-tools/make-JSON-tables.sh

#: Remove ChangeLog
Expand Down
11 changes: 1 addition & 10 deletions admin-tools/make-JSON-tables.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,7 @@ mydir=$(dirname $bs)
PYTHON=${PYTHON:-python}

cd $mydir/../mathics/data
mathics3-generate-json-table \
--field=latex-named-characters \
--field=unicode-to-latex \
--field=ascii-operator-to-symbol \
--field=ascii-operator-to-unicode \
--field=ascii-operator-to-wl-unicode \
--field=operator-to-ascii \
--field=operator-to-amslatex \
--field=operator-to-unicode \
-o op-tables.json
mathics3-generate-json-table -o character-tables.json
mathics3-generate-operator-json-table -o operator-tables.json
# tokenizer looks for the table in the default place...
mathics3-generate-operator-json-table
2 changes: 1 addition & 1 deletion mathics/builtin/atomic/strings.py
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ class ToString(Builtin):
>> "U" <> ToString[2]
= U2
>> ToString[Integrate[f[x],x], TeXForm]
= \\int f\\left(x\\right) \\, dx
= \\int f(x) \\, dx

"""

Expand Down
4 changes: 4 additions & 0 deletions mathics/builtin/box/expression.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ def __new__(cls, *elements, **kwargs):
instance._elements = None
return instance

def __init(self, *args, **kwargs):
super().__init(args, kwargs)
self.boxes = []

def do_format(self, evaluation, format):
return self

Expand Down
Loading