diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index 19675f4..2eb8b0c 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -24,7 +24,6 @@ jobs: brew install llvm@9 python -m pip install --upgrade pip LLVM_CONFIG=/usr/local/Cellar/llvm@9/9.0.1_2/bin/llvm-config pip install llvmlite - python -m pip install -e git://github.com/mathics/Mathics.git#egg=Mathics3 - name: Install mathicsscript run: | make diff --git a/.gitignore b/.gitignore index 278b69b..4230c06 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,8 @@ /.cache /.coverage /.eggs +./mathicsscript/inputrc-no-unicode +./mathicsscript/inputrc-unicode /.mypy_cache /.pytest_cache /.python-version diff --git a/Makefile b/Makefile index d0c3eea..4ca14f8 100644 --- a/Makefile +++ b/Makefile @@ -9,13 +9,13 @@ PYTHON ?= python3 PIP ?= pip3 RM ?= rm -.PHONY: all build check clean develop dist doc pytest sdist test rmChangeLog +.PHONY: all build check clean inputrc develop dist doc pytest sdist test rmChangeLog #: Default target - same as "develop" all: develop #: build everything needed to install -build: +build: inputrc $(PYTHON) ./setup.py build #: Set up to run from the source tree @@ -31,13 +31,23 @@ runner: watchgod mathicsscript.__main__.main #: Install mathicsscript -install: +install: inputrc $(PYTHON) setup.py install #: Run tests. You can set environment variable "o" for pytest options -check: +check: inputrc py.test test $o +inputrc: mathicsscript/inputrc-unicode mathicsscript/inputrc-no-unicode + +mathicsscript/inputrc-unicode: + @echo "# GNU Readline input unicode translations\n# Autogenerated from mathics_scanner.generate.rl_inputrc on $$(date)\n" > $@ + $(PYTHON) -m mathics_scanner.generate.rl_inputrc inputrc-unicode >> $@ + +mathicsscript/inputrc-no-unicode: + @echo "# GNU Readline input ASCII translations\n# Autogenerated from mathics_scanner.generate.rl_inputrc on $$(date)\n" > $@ + $(PYTHON) -m mathics_scanner.generate.rl_inputrc inputrc-no-unicode >> $@ + # Check StructuredText long description formatting check-rst: $(PYTHON) setup.py --long-description | ./rst2html.py > mathicsscript.html @@ -45,6 +55,7 @@ check-rst: #: Remove derived files clean: @find . -name "*.pyc" -type f -delete + @rm mathicsscript/inputrc-no-unicode mathicsscript/inputrc-unicode || true #: Remove ChangeLog rmChangeLog: diff --git a/NEWS.md b/NEWS.md index 32d2498..825330e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,11 @@ -2.0.0 +1.2.0 +----- + +* All escape sequence for unicode and letter names added for GNU Readline +* Use Mathics Scanner package +* Support XDG-style configuration files + +1.1.2 ----- * Fix ``Settings`$ShowFullForm`` now that we use Mathics supports Booleans better diff --git a/admin-tools/make-dist.sh b/admin-tools/make-dist.sh index 3ff1460..462bc19 100755 --- a/admin-tools/make-dist.sh +++ b/admin-tools/make-dist.sh @@ -32,7 +32,6 @@ for pyversion in $PYVERSIONS; do python setup.py bdist_egg python setup.py bdist_wheel python setup.py bdist_wheel --universal - mv -v dist/${PACKAGE}-$VERSION-{py2.py3,py$first_two}-none-any.whl done python ./setup.py sdist diff --git a/mathicsscript/.gitignore b/mathicsscript/.gitignore new file mode 100644 index 0000000..a64afd5 --- /dev/null +++ b/mathicsscript/.gitignore @@ -0,0 +1,2 @@ +/inputrc-no-unicode +/inputrc-unicode diff --git a/mathicsscript/__init__.py b/mathicsscript/__init__.py index ab231c2..1f73734 100644 --- a/mathicsscript/__init__.py +++ b/mathicsscript/__init__.py @@ -2,6 +2,6 @@ """ mathicsscript is a command-line interface to Mathics. -Copyright 2020 The Mathics Team +Copyright 2020-2021 The Mathics Team """ from mathicsscript.version import __version__ diff --git a/mathicsscript/inputrc b/mathicsscript/inputrc deleted file mode 100644 index 118477b..0000000 --- a/mathicsscript/inputrc +++ /dev/null @@ -1,41 +0,0 @@ -# GNU Readline input translations (no unicode here) - -# Things we have don't have Unicode symbols in terminal. -# So we use the Mathics name - -"\e->\e": "\\[Rule]" -"\e|\e": "\\[VerticalSeparator]" -"\el\e": "\\[LeftBracketingBar]" -"\er\e": "\\[RightBracketingBar]" -"\edd\e": "\\[DifferentialD]" -# "\ede\e": "\\[DirectedEdge]" -"\eee\e": "\\[ExponentialE]" -"\eii\e": "\\[ImaginaryI]" -"\ejj\e": "\\[ImaginaryJ]" -"\esca\e": "\\[ScriptA]" -"\escb\e": "\\[ScriptB]" -"\escc\e": "\\[ScriptC]" -"\escd\e": "\\[ScriptD]" -"\esce\e": "\\[ScriptE]" -"\escf\e": "\\[ScriptF]" -"\escg\e": "\\[ScriptG]" -"\esch\e": "\\[ScriptH]" -"\esci\e": "\\[ScriptI]" -"\escj\e": "\\[ScriptJ]" -"\esck\e": "\\[ScriptK]" -"\escl\e": "\\[ScriptL]" -"\escm\e": "\\[ScriptM]" -"\escn\e": "\\[ScriptN]" -"\esco\e": "\\[ScriptO]" -"\escp\e": "\\[ScriptP]" -"\escq\e": "\\[ScriptQ]" -"\escr\e": "\\[ScriptR]" -"\escs\e": "\\[ScriptS]" -"\esct\e": "\\[ScriptT]" -"\escu\e": "\\[ScriptU]" -"\escv\e": "\\[ScriptV]" -"\escw\e": "\\[ScriptW]" -"\escx\e": "\\[ScriptX]" -"\escy\e": "\\[ScriptY]" -"\escz\e": "\\[ScriptZ]" -tab: complete diff --git a/mathicsscript/inputrc-no-unicode b/mathicsscript/inputrc-no-unicode deleted file mode 100644 index 4cf7459..0000000 --- a/mathicsscript/inputrc-no-unicode +++ /dev/null @@ -1,31 +0,0 @@ -# GNU Readline input translations - -# Note: the reader will insure that the current working directory is this -# one before reading this file. Therefore we can omit path directories. -$include "inputrc" - -# Lowercase TeX Greek characters -"\e\\alpha\e": "\\[Alpha]" -"\e\\beta\e": "\\[Beta]" -"\e\\gamma\e": "\\[Gama]" -"\e\\delta\e": "\\[Delta]" -"\e\\epsilon\e": "\\[Epsilon]" -"\e\\zeta\e": "\\[Zeta]" -"\e\\eta\e": "\\[Eta]" -"\e\\theta\e": "\\[Theta]" -"\e\\iota\e": "\\[Iota]" -"\e\\kappa\e": "\\[Kappa]" -"\e\\lambda\e": "\\[Lambda]" -"\e\\mu\e": "\\[Mu]" -"\e\\nu\e": "\\[Nu]" -"\e\\xi\e": "\\[Xi]" -"\e\\omicron\e": "\\[Omicron]" -"\e\\pi\e": "\\[Pi]" -"\e\\rho\e": "\\[Rho]" -"\e\\sigma\e": "\\[Sigma]" -"\e\\tau\e": "\\[Tau]" -"\e\\upsilon\e": "\\[Upsilon\]" -"\e\\phi\e": "\\[Phi]" -"\e\\chi\e": "\\[Chi]" -"\e\\psi\e": "\\Psi]" -"\e\\omega\e": "\\[Omega]" diff --git a/mathicsscript/inputrc-unicode b/mathicsscript/inputrc-unicode deleted file mode 100644 index a227671..0000000 --- a/mathicsscript/inputrc-unicode +++ /dev/null @@ -1,742 +0,0 @@ -# GNU Readline input translations - -# Note: the reader will insure that the current working directory is this -# one before reading this file. Therefore we can omit path directories. -$include "inputrc" - -# Lowercase TeX Greek characters -"\e\\alpha\e": "α" -"\e\\beta\e": "β" -"\e\\gamma\e": "γ" -"\e\\delta\e": "δ" -"\e\\epsilon\e": "ε" -"\e\\zeta\e": "ζ" -"\e\\eta\e": "η" -"\e\\theta\e": "θ" -"\e\\iota\e": "ι" -"\e\\kappa\e": "κ" -"\e\\lambda\e": "λ" -"\e\\mu\e": "μ" -"\e\\nu\e": "ν" -"\e\\xi\e": "ξ" -"\e\\omicron\e": "ο" -"\e\\pi\e": "π" -"\e\\rho\e": "ρ" -"\e\\varsigma\e": "ς" -"\e\\sigma\e": "σ" -"\e\\tau\e": "τ" -"\e\\upsilon\e": "υ" -"\e\\phi\e": "φ" -"\e\\chi\e": "χ" -"\e\\psi\e": "ψ" -"\e\\omega\e": "ω" - -# Autogenerated from https://github.com/Mathics3/mathics-development-guide/blob/master/resources/named-characters-data.csv -"\ea'\e": "á" -"\ea-\e": "ā" -"\eau\e": "ă" -"\ea\"\e": "ä" -"\eae\e": "æ" -"\ea`\e": "à" -"\ea^\e": "â" -"\eal\e": "ℵ" -"\eesc\e": "\\[EscapeKey]" -"\eam\e": "\\[AlignmentMarker]" -"\ea\e": "α" -"\ealt\e": "\\[AltKey]" -"\e&&\e": "∧" -"\eAng\e": "Å" -"\eao\e": "å" -"\ea~\e": "ã" -"\e\\e": "∖" -"\ebe\e": "ℶ" -"\eb\e": "β" -"\ebv\e": "˘" -"\ebu\e": "•" -"\ec'\e": "ć" -"\eA'\e": "Á" -"\eA-\e": "Ā" -"\eAu\e": "Ă" -"\eA\"\e": "Ä" -"\eAE\e": "Æ" -"\eA`\e": "À" -"\eA^\e": "Â" -"\eA\e": "Α" -"\eAo\e": "Å" -"\eA~\e": "Ã" -"\eB\e": "Β" -"\eC'\e": "Ć" -"\eC\e": "Ç" -"\eCv\e": "Č" -"\eCh\e": "Χ" -"\eD\e": "Δ" -"\eDv\e": "Ď" -"\eDD\e": "𝐷" -"\eDi\e": "Ϝ" -"\eE'\e": "É" -"\eE-\e": "Ē" -"\eEu\e": "Ĕ" -"\eE\"\e": "Ë" -"\eE`\e": "È" -"\eEv\e": "Ě" -"\eE^\e": "Ê" -"\eE\e": "Ε" -"\eEt\e": "Η" -"\eD-\e": "Ð" -"\eG\e": "Γ" -"\eI'\e": "Í" -"\eIu\e": "Ĭ" -"\eI\"\e": "Ï" -"\eI`\e": "Ì" -"\eI^\e": "Î" -"\eI\e": "Ι" -"\eK\e": "Κ" -"\eKo\e": "Ϟ" -"\eL\e": "Λ" -"\eL/\e": "Ł" -"\eM\e": "Μ" -"\eNv\e": "Ň" -"\eN~\e": "Ñ" -"\eN\e": "Ν" -"\eO'\e": "Ó" -"\eO''\e": "Ő" -"\eO\"\e": "Ö" -"\eOE\e": "Œ" -"\eO`\e": "Ò" -"\eO^\e": "Ô" -"\eO\e": "Ω" -"\eOm\e": "Ο" -"\eO/\e": "Ø" -"\eO~\e": "Õ" -"\ePh\e": "Φ" -"\eP\e": "Π" -"\ePs\e": "Ψ" -"\eRv\e": "Ř" -"\eR\e": "Ρ" -"\eSa\e": "Ϡ" -"\eSv\e": "Š" -"\eS\e": "Σ" -"\eSti\e": "Ϛ" -"\eT\e": "Τ" -"\eTv\e": "Ť" -"\eTh\e": "Θ" -"\eThn\e": "Þ" -"\eU'\e": "Ú" -"\eU''\e": "Ű" -"\eU\"\e": "Ü" -"\eU`\e": "Ù" -"\eU^\e": "Û" -"\eU\e": "Υ" -"\eUo\e": "Ů" -"\eX\e": "Ξ" -"\eY'\e": "Ý" -"\eZ\e": "Ζ" -"\eZv\e": "Ž" -"\ec\e": "ç" -"\ecd\e": "¸" -"\e.\e": "·" -"\ecent\e": "¢" -"\ecv\e": "č" -"\ech\e": "χ" -"\ec.\e": "⊙" -"\ec-\e": "⊖" -"\ec+\e": "⊕" -"\ec*\e": "⊗" -"\eccint\e": "∲" -"\e]\e": "\\[RightModified]" -"\e]'\e": "’" -"\ecl\e": "⌘" -"\e:\e": "∶" -"\ecmd\e": "⌘" -"\eErr:510\e": "⟹" -"\eco\e": "\\[Conjugate]" -"\ect\e": "\\[ConjugateTranspose]" -"\ecc\e": "𝕔" -"\econt\e": "⋱" -"\ecint\e": "∮" -"\ectrl\e": "\\[ControlKey]" -"\ecoprod\e": "∐" -"\ecccint\e": "∳" -"\ecross\e": "⨯" -"\ecU\e": "ϒ" -"\ece\e": "ε" -"\eck\e": "ϰ" -"\ej\e": "φ" -"\ecp\e": "ϖ" -"\ecr\e": "ϱ" -"\ecq\e": "ϑ" -"\edg\e": "†" -"\eda\e": "ℸ" -"\e-\e": "–" -"\edeg\e": "°" -"\edel\e": "∇" -"\ed\e": "δ" -"\edv\e": "ď" -"\edia\e": "⋄" -"\ediffd\e": "∆" -"\edd\e": "𝑑" -"\edi\e": "ϝ" -"\ede\e": "→" -"\edratio\e": "ϴ" -"\eshift\e": "\\[DiscreteShift]" -"\edhy\e": "\\[DiscretionaryHyphen]" -"\edlsep\e": "\\[DiscretionaryLineSeparator]" -"\edpba\e": "\\[DiscretionaryPageBreakAbove]" -"\edpbb\e": "\\[DiscretionaryPageBreakBelow]" -"\edpsep\e": "\\[DiscretionaryParagraphSeparator]" -"\edivides\e": "∣" -"\ediv\e": "÷" -"\e.=\e": "≐" -"\eddg\e": "‡" -"\egg\e": "ℽ" -"\epp\e": "ℼ" -"\e<=\e": "≤" -"\e<=>\e": "⇔" -"\e<==\e": "⟸" -"\e<==>\e": "⟺" -"\e''\e": "″" -"\e=>\e": "⇒" -"\edsa\e": "𝕒" -"\edsb\e": "𝕓" -"\edsc\e": "𝕔" -"\edsA\e": "𝔸" -"\edsB\e": "𝔹" -"\edsC\e": "ℂ" -"\edsD\e": "𝔻" -"\edsE\e": "𝔼" -"\edsF\e": "𝔽" -"\edsG\e": "𝔾" -"\edsH\e": "ℍ" -"\edsI\e": "𝕀" -"\edsJ\e": "𝕁" -"\edsK\e": "𝕂" -"\edsL\e": "𝕃" -"\edsM\e": "𝕄" -"\edsN\e": "ℕ" -"\edsO\e": "𝕆" -"\edsP\e": "ℙ" -"\edsQ\e": "ℚ" -"\edsR\e": "ℝ" -"\edsS\e": "𝕊" -"\edsT\e": "𝕋" -"\edsU\e": "𝕌" -"\edsV\e": "𝕍" -"\edsW\e": "𝕎" -"\edsX\e": "𝕏" -"\edsY\e": "𝕐" -"\edsZ\e": "ℤ" -"\edsd\e": "𝕕" -"\edse\e": "𝕖" -"\eds8\e": "𝟠" -"\edsf\e": "𝕗" -"\eds5\e": "𝟝" -"\eds4\e": "𝟜" -"\edsg\e": "𝕘" -"\edsh\e": "𝕙" -"\edsi\e": "𝕚" -"\edsj\e": "𝕛" -"\edsk\e": "𝕜" -"\edsl\e": "𝕝" -"\edsm\e": "𝕞" -"\edsn\e": "𝕟" -"\eds9\e": "𝟡" -"\edso\e": "𝕠" -"\eds1\e": "𝟙" -"\edsp\e": "𝕡" -"\edsq\e": "𝕢" -"\edsr\e": "𝕣" -"\edss\e": "𝕤" -"\eds7\e": "𝟟" -"\eds6\e": "𝟞" -"\edst\e": "𝕥" -"\eds3\e": "𝟛" -"\eds2\e": "𝟚" -"\edsu\e": "𝕦" -"\edsv\e": "𝕧" -"\edsw\e": "𝕨" -"\edsx\e": "𝕩" -"\edsy\e": "𝕪" -"\edsz\e": "𝕫" -"\eds0\e": "𝟘" -"\e|\e": "∨" -"\edbv\e": " ̑" -"\ed!\e": "¡" -"\ed?\e": "¿" -"\edT\e": "⊤" -"\ee'\e": "é" -"\ee-\e": "ē" -"\eeu\e": "ĕ" -"\ee\"\e": "ë" -"\ee`\e": "è" -"\eev\e": "ě" -"\ee^\e": "ê" -"\eel\e": "∈" -"\e...\e": "…" -"\eeci\e": "○" -"\ees\e": "∅" -"\eesci\e": "◦" -"\eessq\e": "◻" -"\eesq\e": "□" -"\eevssq\e": "▫" -"\eent\e": "\\[EnterKey]" -"\ee\e": "ϵ" -"\e==\e": "⩵" -"\e=~\e": "≂" -"\eequi\e": "⇌" -"\eequiv\e": "⇔" -"\eet\e": "η" -"\ed-\e": "ð" -"\eex\e": "∃" -"\eee\e": "ⅇ" -"\efci\e": "●" -"\efsci\e": "•" -"\efssq\e": "◼" -"\efsq\e": "■" -"\efvssq\e": "▪" -"\efs\e": "ς" -"\e*5\e": "★" -"\efa\e": "∀" -"\e.a\e": "ạ" -"\e.Alpha\e": "α̣" -"\e.b\e": "ḅ" -"\e.Beta\e": "β̣" -"\e.c\e": "c̣" -"\e.A\e": "Ạ" -"\e.CapitalAlpha\e": "Α̣" -"\e.B\e": "Ḅ" -"\e.CapitalBeta\e": "Β̣" -"\e.C\e": "C̣" -"\e.CapitalChi\e": "Χ̣" -"\e.D\e": "Ḍ" -"\e.CapitalDelta\e": "Δ̣" -"\e.CapitalDigamma\e": "Ϝ̣" -"\e.E\e": "Ẹ" -"\e.CapitalEpsilon\e": "Ε̣" -"\e.CapitalEta\e": "Η̣" -"\e.F\e": "F̣" -"\e.G\e": "G̣" -"\e.CapitalGamma\e": "Γ" -"\e.H\e": "Ḥ" -"\e.I\e": "Ị" -"\e.CapitalIota\e": "Ι̣" -"\e.J\e": "J̣" -"\e.K\e": "Ḳ" -"\e.CapitalKappa\e": "Κ̣" -"\e.CapitalKoppa\e": "Ϟ̣" -"\e.L\e": "Ḷ" -"\e.CapitalLambda\e": "Λ̣" -"\e.M\e": "Ṃ" -"\e.CapitalMu\e": "Μ̣" -"\e.N\e": "Ṇ" -"\e.CapitalNu\e": "Ν̣" -"\e.O\e": "Ọ" -"\e.CapitalOmega\e": "Ω̣" -"\e.CapitalOmicron\e": "Ο̣" -"\e.P\e": "P̣" -"\e.CapitalPhi\e": "Φ̣" -"\e.CapitalPi\e": "Π̣" -"\e.CapitalPsi\e": "Ψ̣" -"\e.Q\e": "Q̣" -"\e.R\e": "Ṛ" -"\e.CapitalRho\e": "Ρ̣" -"\e.S\e": "Ṣ" -"\e.CapitalSampi\e": "Ϡ̣" -"\e.CapitalSigma\e": "Σ̣" -"\e.CapitalStigma\e": "Ϛ̣" -"\e.T\e": "Ṭ" -"\e.CapitalTau\e": "Τ̣" -"\e.CapitalTheta\e": "Θ" -"\e.U\e": "Ụ" -"\e.CapitalUpsilon\e": "Υ̣" -"\e.V\e": "Ṿ" -"\e.W\e": "Ẉ" -"\e.X\e": "X̣" -"\e.CapitalXi\e": "Ξ̣" -"\e.Y\e": "Ỵ" -"\e.Z\e": "Ẓ" -"\e.CapitalZeta\e": "Ζ̣" -"\e.Chi\e": "χ̣" -"\e.CurlyCapitalUpsilon\e": "ϒ̣" -"\e.CurlyEpsilon\e": "ε̣" -"\e.CurlyKappa\e": "ϰ̣" -"\e.CurlyPhi\e": "φ̣" -"\e.CurlyPi\e": "ϖ̣" -"\e.CurlyRho\e": "ϱ̣" -"\e.CurlyTheta\e": "ϑ̣" -"\e.d\e": "ḍ" -"\e.Delta\e": "δ̣" -"\e.Digamma\e": "ϝ" -"\e.e\e": "ẹ" -"\e.Epsilon\e": "ϵ̣" -"\e.Eta\e": "η̣" -"\e.f\e": "f̣" -"\e.FinalSigma\e": "ς̣" -"\e.g\e": "g̣" -"\e.Gamma\e": "γ̣" -"\e.h\e": "ḥ" -"\e.i\e": "ị" -"\e.Iota\e": "Ι̣" -"\e.j\e": "j̣" -"\e.k\e": "ḳ" -"\e.Kappa\e": "κ̣" -"\e.Koppa\e": "ϟ̣" -"\e.l\e": "ḷ" -"\e.Lambda\e": "λ̣" -"\e.m\e": "ṃ" -"\e.Mu\e": "μ̣" -"\e.n\e": "ṇ" -"\e.Nu\e": "ν̣" -"\e.o\e": "ọ" -"\e.Omega\e": "ω̣" -"\e.Omicron\e": "ο̣" -"\e.p\e": "p̣" -"\e.Phi\e": "ϕ̣" -"\e.Pi\e": "π̣" -"\e.Psi\e": "ψ̣" -"\e.q\e": "q̣" -"\e.r\e": "ṛ" -"\e.Rho\e": "ρ̣" -"\e.s\e": "ṣ" -"\e.Sampi\e": "ϡ̣" -"\e.Sigma\e": "σ̣" -"\e.Stigma\e": "ϛ" -"\e.t\e": "ṭ" -"\e.Tau\e": "τ̣" -"\e.Theta\e": "θ̣" -"\e.u\e": "ụ" -"\e.Upsilon\e": "υ̣" -"\e.v\e": "ṿ" -"\e.w\e": "ẉ" -"\e.x\e": "x̣" -"\e.Xi\e": "ξ̣" -"\e.y\e": "ỵ" -"\e.z\e": "ẓ" -"\e.Zeta\e": "ζ̣" -"\e:-@\e": "\\[FreakedSmiley]" -"\e->\e": "→" -"\eg\e": "γ" -"\egi\e": "ℷ" -"\egoa\e": "𝔞" -"\egob\e": "𝔟" -"\egoc\e": "𝔠" -"\egoA\e": "𝔄" -"\egoB\e": "𝔅" -"\egoC\e": "ℭ" -"\egoD\e": "𝔇" -"\egoE\e": "𝔈" -"\egoF\e": "𝔉" -"\egoG\e": "𝔊" -"\egoH\e": "ℌ" -"\egoI\e": "ℑ" -"\egoJ\e": "𝔍" -"\egoK\e": "𝔎" -"\egoL\e": "𝔏" -"\egoM\e": "𝔐" -"\egoN\e": "𝔑" -"\egoO\e": "𝔒" -"\egoP\e": "𝔓" -"\egoQ\e": "𝔔" -"\egoR\e": "ℜ" -"\egoS\e": "𝔖" -"\egoT\e": "𝔗" -"\egoU\e": "𝔘" -"\egoV\e": "𝔙" -"\egoW\e": "𝔚" -"\egoX\e": "𝔛" -"\egoY\e": "𝔜" -"\egoZ\e": "ℨ" -"\egod\e": "𝔡" -"\egoe\e": "𝔢" -"\ego8\e": "\\[GothicEight]" -"\egof\e": "𝔣" -"\ego5\e": "\\[GothicFive]" -"\ego4\e": "\\[GothicFour]" -"\egog\e": "𝔤" -"\egoh\e": "𝔥" -"\egoi\e": "𝔦" -"\egoj\e": "𝔧" -"\egok\e": "𝔨" -"\egol\e": "𝔩" -"\egom\e": "𝔪" -"\egon\e": "𝔫" -"\ego9\e": "\\[GothicNine]" -"\egoo\e": "𝔬" -"\ego1\e": "\\[GothicOne]" -"\egop\e": "𝔭" -"\egoq\e": "𝔮" -"\egor\e": "𝔯" -"\egos\e": "𝔰" -"\ego7\e": "\\[GothicSeven]" -"\ego6\e": "\\[GothicSix]" -"\egot\e": "𝔱" -"\ego3\e": "\\[GothicThree]" -"\ego2\e": "\\[GothicTwo]" -"\egou\e": "𝔲" -"\egov\e": "𝔳" -"\egow\e": "𝔴" -"\egox\e": "𝔵" -"\egoy\e": "𝔶" -"\egoz\e": "𝔷" -"\ego0\e": "\\[GothicZero]" -"\egci\e": "●" -"\egsq\e": "■" -"\e>=\e": "≥" -"\e>/\e": "⩾" -"\e>~\e": "≳" -"\ehck\e": "ˇ" -"\e:)\e": "☺" -"\ehb\e": "ℏ" -"\ehc\e": "" -"\ehline\e": "─" -"\eh=\e": "≏" -"\ehy\e": "‐" -"\ei'\e": "í" -"\eiu\e": "ĭ" -"\ei\"\e": "ï" -"\ei`\e": "ì" -"\ei^\e": "î" -"\eii\e": "ⅈ" -"\ejj\e": "ⅉ" -"\e+\e": "\\[ImplicitPlus]" -"\einf\e": "∞" -"\eint\e": "∫" -"\einter\e": "⋂" -"\e@\e": "\\[InvisibleApplication]" -"\e-i\e": "\\[InvisiblePostfixScriptBase]" -"\ei-\e": "\\[InvisiblePrefixScriptBase]" -"\eis\e": "\\[InvisibleSpace]" -"\ei\e": "ι" -"\ek\e": "κ" -"\eko\e": "ϟ" -"\el\e": "λ" -"\e<\e": "〈" -"\e<-\e": "←" -"\e<|\e": "\\[LeftAssociation]" -"\el|\e": "|" -"\elc\e": "⌈" -"\e[[\e": "〚" -"\el||\e": "‖" -"\elf\e": "⌊" -"\eg<<\e": "«" -"\e[\e": "“" -"\e<->\e": "↔" -"\elT\e": "⊣" -"\e\e": "⟷" -"\e-->\e": "⟶" -"\el/\e": "ł" -"\emath\e": "\\[MathematicaIcon]" -"\emho\e": "℧" -"\emi\e": "µ" -"\e-+\e": "∓" -"\em\e": "μ" -"\enand\e": "⊼" -"\e- \e": "\\[NegativeMediumSpace]" -"\e- \e": "\\[NegativeThickSpace]" -"\e- \e": "\\[NegativeThinSpace]" -"\e- \e": "\\[NegativeVeryThinSpace]" -"\e:-|\e": "\\[NeutralSmiley]" -"\env\e": "ň" -"\enb\e": "\\[NoBreak]" -"\enbs\e": "\\[NonBreakingSpace]" -"\enor\e": "⊽" -"\e!===\e": "≢" -"\e!||\e": "∦" -"\e!el\e": "∉" -"\e!=\e": "≠" -"\e!=~\e": "\\[NotEqualTilde]" -"\e!ex\e": "∄" -"\e!>\e": "≯" -"\e!>=\e": "≱" -"\e!>/\e": "\\[NotGreaterSlantEqual]" -"\e!>~\e": "≵" -"\e!h=\e": "\\[NotHumpEqual]" -"\e!<=\e": "≰" -"\e!<\e": "≮" -"\e!\e": "\\[RightAssociation]" -"\er|\e": "|" -"\erc\e": "⌉" -"\e]]\e": "〛" -"\er||\e": "‖" -"\erf\e": "⌋" -"\eg>>\e": "»" -"\erT\e": "⊢" -"\evec\e": "⇀" -"\e:>\e": "⧴" -"\e:-(\e": "☹" -"\esa\e": "ϡ" -"\esca\e": "𝒶" -"\escb\e": "𝒷" -"\escc\e": "𝒸" -"\escA\e": "𝒜" -"\escB\e": "ℬ" -"\escC\e": "𝒞" -"\escD\e": "𝒟" -"\escE\e": "ℰ" -"\escF\e": "ℱ" -"\escG\e": "𝒢" -"\escH\e": "ℋ" -"\escI\e": "ℐ" -"\escJ\e": "𝒥" -"\escK\e": "𝒦" -"\escL\e": "ℒ" -"\escM\e": "ℳ" -"\escN\e": "𝒩" -"\escO\e": "𝒪" -"\escP\e": "𝒫" -"\escQ\e": "𝒬" -"\escR\e": "ℛ" -"\escS\e": "𝒮" -"\escT\e": "𝒯" -"\escU\e": "𝒰" -"\escV\e": "𝒱" -"\escW\e": "𝒲" -"\escX\e": "𝒳" -"\escY\e": "𝒴" -"\escZ\e": "𝒵" -"\escd\e": "𝒹" -"\esce\e": "ℯ" -"\esc8\e": "\\[ScriptEight]" -"\escf\e": "𝒻" -"\esc5\e": "\\[ScriptFive]" -"\esc4\e": "\\[ScriptFour]" -"\escg\e": "ℊ" -"\esch\e": "𝒽" -"\esci\e": "𝒾" -"\escj\e": "𝒿" -"\esck\e": "𝓀" -"\escl\e": "ℓ" -"\escm\e": "𝓂" -"\escn\e": "𝓃" -"\esc9\e": "\\[ScriptNine]" -"\esco\e": "ℴ" -"\esc1\e": "\\[ScriptOne]" -"\escp\e": "𝓅" -"\escq\e": "𝓆" -"\escr\e": "𝓇" -"\escs\e": "𝓈" -"\esc7\e": "\\[ScriptSeven]" -"\esc6\e": "\\[ScriptSix]" -"\esct\e": "𝓉" -"\esc3\e": "\\[ScriptThree]" -"\esc2\e": "\\[ScriptTwo]" -"\escu\e": "𝓊" -"\escv\e": "𝓋" -"\escw\e": "𝓌" -"\escx\e": "𝓍" -"\escy\e": "𝓎" -"\escz\e": "𝓏" -"\esc0\e": "\\[ScriptZero]" -"\espl\e": "\\[SelectionPlaceholder]" -"\esv\e": "š" -"\es\e": "σ" -"\e*6\e": "✶" -"\esc\e": "∘" -"\espace\e": "␣" -"\espc\e": "\\[SpaceKey]" -"\esfa\e": "⋮" -"\esfb\e": "⋱" -"\esfl\e": "⋯" -"\esqrt\e": "√" -"\esq\e": "▫" -"\estar\e": "⋆" -"\esti\e": "ϛ" -"\esub\e": "⊂" -"\esub=\e": "⊆" -"\est\e": "∍" -"\esum\e": "∑" -"\esup\e": "⊃" -"\esup=\e": "⊇" -"\esz\e": "ß" -"\etab\e": "\\[TabKey]" -"\et\e": "τ" -"\etv\e": "ť" -"\etf\e": "∴" -"\eth\e": "θ" -"\ethn\e": "þ" -"\e~\e": "∼" -"\e~=\e": "≃" -"\e~==\e": "≅" -"\e~~\e": "≈" -"\e*\e": "×" -"\etm\e": "™" -"\etr\e": "ᵀ" -"\eu'\e": "ú" -"\eu''\e": "ű" -"\eu\"\e": "ü" -"\eu`\e": "ù" -"\eu^\e": "û" -"\eu{\e": "︸" -"\eu[\e": "⎵" -"\eu(\e": "︶" -"\eue\e": "↔" -"\eun\e": "⋃" -"\eu\e": "υ" -"\euT\e": "⊥" -"\euo\e": "ů" -"\ev\e": "⋁" -"\evline\e": "│" -"\e^\e": "⋀" -"\ewp\e": "℘" -"\ewf\e": "\\[Wolf]" -"\ex\e": "ξ" -"\exnor\e": "\\[Xnor]" -"\exor\e": "⊻" -"\ey'\e": "ý" -"\ey\"\e": "ÿ" -"\ez\e": "ζ" -"\ezv\e": "ž" diff --git a/mathicsscript/version.py b/mathicsscript/version.py index db0ad9f..afef160 100644 --- a/mathicsscript/version.py +++ b/mathicsscript/version.py @@ -3,4 +3,4 @@ # This file is suitable for sourcing inside POSIX shell as # well as importing into Python. That's why there is no # space around "=" below. -__version__="1.1.2" # noqa +__version__="2.0.0.rc1" # noqa diff --git a/screenshots/mathicsscript.gif b/screenshots/mathicsscript.gif new file mode 100644 index 0000000..a461a95 Binary files /dev/null and b/screenshots/mathicsscript.gif differ diff --git a/setup.py b/setup.py index cf4eb38..546fb22 100644 --- a/setup.py +++ b/setup.py @@ -57,18 +57,17 @@ def read(*rnames): is_PyPy = platform.python_implementation() == "PyPy" setup( - maintainer="Rocky Bernstein", + maintainer="Mathics Group", + maintainer_email="mathic-devel@googlegroups.com", author_email="rb@dustyfeet.com", name="mathicsscript", version=__version__, # noqa packages=find_packages(), include_package_data=True, - package_data={ - "": ["inputrc", "inputrc-no-unicode", "inputrc-unicode", "settings/settings.m"] - }, + package_data={"": ["inputrc-no-unicode", "inputrc-unicode", "settings/settings.m"]}, install_requires=[ "Mathics_Scanner>=1.0.0,<1.1.0", - "Mathics3 >= 2.0.0dev", + "Mathics3 >= 2.0.0,<2.1.0", "click", "colorama", "columnize",