Merge pull request #7 from Mathics3/unicode-option

Start to suport Unicode as a CLI option

mathicsscript/__main__.py

@@ -144,6 +144,11 @@ def out(self, out):
     default=True,
     help="GNU Readline line editing. enable tab completion",
 )
+@click.option(
+    "--unicode/--no-unicode",
+    default=True,
+    help="GNU Readline line editing. If this is off completion and command history are also turned off",
+)
 @click.option(
     "--pyextensions",
     "-l",
@@ -188,6 +193,7 @@ def main(
     quiet,
     readline,
     completion,
+    unicode,
     pyextensions,
     execute,
     initfile,
@@ -214,13 +220,13 @@ def main(
     # Then, it can be changed by the settings file (in WL)
     # and overwritten by the command line parameter.
     definitions.set_ownvalue(
-        "Settings`$ShowFullFormInput", from_python(1 if full_form else 0)
+        "Settings`$ShowFullFormInput", from_python(True if full_form else False)
     )
     definitions.set_ownvalue(
-        "Settings`$PygmentsShowTokens", from_python(1 if pygments_tokens else 0)
+        "Settings`$PygmentsShowTokens", from_python(True if pygments_tokens else False)
     )
 
-    shell = TerminalShell(definitions, style, readline, completion)
+    shell = TerminalShell(definitions, style, readline, completion, unicode)
     load_settings(shell)
     if initfile:
         with open(initfile, "r") as ifile:

mathicsscript/format.py

@@ -29,8 +29,8 @@ def format_output(obj, expr, format=None):
             expr = leaves[0]
     elif expr_type in ("System`Graphics", "System`Plot"):
         result = "-System Graphics-"
-        # result = Expression("StandardForm", expr).format(obj, "System`MathMLForm")
-        # ml_str = result.leaves[0].leaves[0]
+        result = Expression("StandardForm", expr).format(obj, "System`MathMLForm")
+        ml_str = result.leaves[0].leaves[0]
         # FIXME: not quite right. Need to parse out strings
         # display_svg(str(ml_str))
 
@@ -379,7 +379,6 @@ def format_graph(G):
         if graph_layout in ["circular", "spiral", "spiral_equidistant"]:
             plt.axes().set_aspect("equal")
 
-
     harmonize_parameters(G, draw_options)
 
     if layout_fn:

mathicsscript/inputrc

@@ -1,153 +1,4 @@
-# GNU Readline input translations
-
-# 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": "ω"
-
-# Lowercase named Greek characters
-"\ea\e": "α"
-"\eb\e": "β"
-"\eg\e": "γ"
-"\ed\e": "δ"
-"\ee\e": "ε"
-"\ez\e": "ζ"
-"\ee\e": "η"
-"\et\e": "θ"
-"\ei\e": "ι"
-"\ek\e": "κ"
-"\el\e": "λ"
-"\em\e": "μ"
-"\en\e": "ν"
-"\ex\e": "ξ"
-"\eo\e": "ω"
-"\ep\e": "π"
-"\er\e": "ρ"
-"\ev\e": "ς"
-"\es\e": "σ"
-"\et\e": "τ"
-"\eu\e": "υ"
-# "\e\\phi\e": "φ" # ?
-# "\e\\chi\e": "χ" # ?
-# "\e\\psi\e": "ψ" # ?
-
-# Uppercase TeX Greek symbols
-"\e\\Gamma\e": "Γ"
-"\e\\Delta\e": "Δ"
-"\e\\Theta\e": "Θ"
-"\e\\Lambda\e": "Λ"
-"\e\\Xi\e": "Ξ"
-"\e\\Pi\e": "Π"
-"\e\\Sigma\e": "Σ"
-"\e\\Upsilon\e": "Υ"
-"\e\\Phi\e": "Φ"
-"\e\\Psi\e": "Ψ"
-"\e\\Omega\e": "Ω"
-
-# Things we have Unicode symbols for
-"\e.a\e": "ạ"
-"\e$a\e": "ạ"
-"\e.A\e": "Ạ"
-"\e$A\e": "Ạ"
-"\e.B\e": "Ḅ"
-"\e$B\e": "Ḅ"
-"\e.b\e": "ḅ"
-"\e$b\e": "ḅ"
-"\e.D\e": "Ḍ"
-"\e$D\e": "Ḍ"
-"\e.d\e": "ḍ"
-"\e$d\e": "ḍ"
-"\e.E\e": "Ẹ"
-"\e$E\e": "Ẹ"
-"\e.e\e": "ẹ"
-"\e$e\e": "ẹ"
-"\e.H\e": "Ḥ"
-"\e$H\e": "Ḥ"
-"\e.h\e": "ḥ"
-"\e$h\e": "ḥ"
-"\e.I\e": "Ị"
-"\e$I\e": "Ị"
-"\e.i\e": "ị"
-"\e$i\e": "ị"
-"\e.K\e": "Ḳ"
-"\e$K\e": "Ḳ"
-"\e.k\e": "ḳ"
-"\e$k\e": "ḳ"
-"\e.L\e": "Ḷ"
-"\e$L\e": "Ḷ"
-"\e.l\e": "ḷ"
-"\e$l\e": "ḷ"
-"\e.M\e": "Ṃ"
-"\e$M\e": "Ṃ"
-"\e.m\e": "ṃ"
-"\e$m\e": "ṃ"
-"\e.N\e": "Ṇ"
-"\e$N\e": "Ṇ"
-"\e.n\e": "ṇ"
-"\e$n\e": "ṇ"
-"\e.O\e": "Ọ"
-"\e$O\e": "Ọ"
-"\e.o\e": "ọ"
-"\e$o\e": "ọ"
-"\e.R\e": "Ṛ"
-"\e$R\e": "Ṛ"
-"\e.r\e": "ṛ"
-"\e$r\e": "ṛ"
-"\e.S\e": "Ṣ"
-"\e$S\e": "Ṣ"
-"\e.s\e": "ṣ"
-"\e$s\e": "ṣ"
-"\e.T\e": "Ṭ"
-"\e$T\e": "Ṭ"
-"\e.t\e": "ṭ"
-"\e$t\e": "ṭ"
-"\e.U\e": "Ụ"
-"\e$U\e": "Ụ"
-"\e.u\e": "ụ"
-"\e$u\e": "ụ"
-"\e$V\e": "Ṿ"
-"\e.V\e": "Ṿ"
-"\e.v\e": "ṿ"
-"\e$v\e": "ṿ"
-"\e.W\e": "Ẉ"
-"\e$W\e": "Ẉ"
-"\e.w\e": "ẉ"
-"\e$w\e": "ẉ"
-"\e.Y\e": "Ỵ"
-"\e$Y\e": "Ỵ"
-"\e.y\e": "ỵ"
-"\e$y\e": "ỵ"
-"\e.Z\e": "Ẓ"
-"\e$Z\e": "Ẓ"
-"\e.Z\e": "ẓ"
-"\e$Z\e": "ẓ"
-"\einf\e": "∞"
-"\edeg\e": "°"
-"\e&&\e": "∧"
-"\eue\e": "↔"
-"\ede\e": "→"
+# GNU Readline input translations (no unicode here)
 
 # Things we have don't have Unicode symbols in terminal.
 # So we use the Mathics name
@@ -187,30 +38,4 @@
 "\escx\e": "\\[ScriptX]"
 "\escy\e": "\\[ScriptY]"
 "\escz\e": "\\[ScriptZ]"
-"\escA\e": "\\[ScriptCapitalA]"
-"\escB\e": "\\[ScriptCapitalB]"
-"\escC\e": "\\[ScriptCapitalC]"
-"\escD\e": "\\[ScriptCapitalD]"
-"\escE\e": "\\[ScriptCapitalE]"
-"\escF\e": "\\[ScriptCapitalF]"
-"\escG\e": "\\[ScriptCapitalG]"
-"\escH\e": "\\[ScriptCapitalH]"
-"\escI\e": "\\[ScriptCapitalI]"
-"\escJ\e": "\\[ScriptCapitalJ]"
-"\escK\e": "\\[ScriptCapitalK]"
-"\escL\e": "\\[ScriptCapitalL]"
-"\escM\e": "\\[ScriptCapitalM]"
-"\escN\e": "\\[ScriptCapitalN]"
-"\escO\e": "\\[ScriptCapitalO]"
-"\escP\e": "\\[ScriptCapitalP]"
-"\escQ\e": "\\[ScriptCapitalQ]"
-"\escR\e": "\\[ScriptCapitalR]"
-"\escS\e": "\\[ScriptCapitalS]"
-"\escT\e": "\\[ScriptCapitalT]"
-"\escU\e": "\\[ScriptCapitalU]"
-"\escV\e": "\\[ScriptCapitalV]"
-"\escW\e": "\\[ScriptCapitalW]"
-"\escX\e": "\\[ScriptCapitalX]"
-"\esCy\e": "\\[ScriptCapitalY]"
-"\esCz\e": "\\[ScriptCapitalZ]"
 tab: complete

mathicsscript/inputrc-no-unicode

@@ -0,0 +1,83 @@
+# 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]"
+
+# Lowercase named Greek characters
+"\ea\e": "\\[Alpha]""
+"\eb\e": "\\[Beta]"
+"\eg\e": "\\[Gama]"
+"\ed\e": "\\[Delta]"
+"\ee\e": "\\[Epsilon]"
+"\ez\e": "\\[Zeta]"
+"\ee\e": "\\[Nu]"
+"\et\e": "\\[Theta]"
+"\ei\e": "\\[Iota]"
+"\ek\e": "\\[Kappa]"
+"\el\e": "\\[Lambda]"
+"\em\e": "\\[Mu]"
+"\en\e": "\\[Nu]"
+"\ex\e": "\\[Eta]"
+"\eo\e": "\\[Omega]"
+"\ep\e": ""\\[Pi]"
+"\er\e": "\\[Rho]"
+"\es\e": "\\[Sigma]"
+"\et\e": "\\[Tau]"
+"\eu\e": "υ"
+# "\e\\phi\e": "φ" # ?
+# "\e\\chi\e": "χ" # ?
+# "\e\\psi\e": "ψ" # ?
+
+"\escA\e": "\\[ScriptCapitalA]"
+"\escB\e": "\\[ScriptCapitalB]"
+"\escC\e": "\\[ScriptCapitalC]"
+"\escD\e": "\\[ScriptCapitalD]"
+"\escE\e": "\\[ScriptCapitalE]"
+"\escF\e": "\\[ScriptCapitalF]"
+"\escG\e": "\\[ScriptCapitalG]"
+"\escH\e": "\\[ScriptCapitalH]"
+"\escI\e": "\\[ScriptCapitalI]"
+"\escJ\e": "\\[ScriptCapitalJ]"
+"\escK\e": "\\[ScriptCapitalK]"
+"\escL\e": "\\[ScriptCapitalL]"
+"\escM\e": "\\[ScriptCapitalM]"
+"\escN\e": "\\[ScriptCapitalN]"
+"\escO\e": "\\[ScriptCapitalO]"
+"\escP\e": "\\[ScriptCapitalP]"
+"\escQ\e": "\\[ScriptCapitalQ]"
+"\escR\e": "\\[ScriptCapitalR]"
+"\escS\e": "\\[ScriptCapitalS]"
+"\escT\e": "\\[ScriptCapitalT]"
+"\escU\e": "\\[ScriptCapitalU]"
+"\escV\e": "\\[ScriptCapitalV]"
+"\escW\e": "\\[ScriptCapitalW]"
+"\escX\e": "\\[ScriptCapitalX]"
+"\esCy\e": "\\[ScriptCapitalY]"
+"\esCz\e": "\\[ScriptCapitalZ]"