FindSpannngTree: use layout style of parent graph

Author: rocky

mathicsscript/__main__.py

@@ -4,6 +4,7 @@
 import click
 import sys
 import os
+import re
 from pathlib import Path
 
 from mathicsscript.termshell import TerminalShell
@@ -24,6 +25,20 @@
 
 from mathicsscript.version import __version__
 
+wl_replace_dict = {"": "→", "": "↔"}
+wl_replace_dict_esc = dict((re.escape(k), v) for k, v in wl_replace_dict.items())
+wl_replace_pattern = re.compile("|".join(wl_replace_dict_esc.keys()))
+
+
+def replace_wl_to_unicode(wl_input: str) -> str:
+    """WL uses some non-unicode character for various things.
+    Replace them with the unicode equivalent.
+    Two known items are directed arrow and undirected arrow.
+    """
+    return wl_replace_pattern.sub(
+        lambda m: wl_replace_dict_esc[re.escape(m.group(0))], wl_input
+    )
+
 
 def ensure_settings():
     home = Path.home()
@@ -314,7 +329,8 @@ def main(
                 current_pos = GNU_readline.get_current_history_length()
                 for pos in range(last_pos, current_pos - 1):
                     GNU_readline.remove_history_item(pos)
-                GNU_readline.add_history(source_code.rstrip())
+                wl_input = replace_wl_to_unicode(source_code.rstrip())
+                GNU_readline.add_history(wl_input)
 
             if query is None:
                 continue

mathicsscript/format.py

@@ -269,9 +269,11 @@ def tree_layout(G):
     node_size = min_sep * 2000
     return pos
 
+
 def spiral_equidistant_layout(G, *args, **kwargs):
     return nx.spiral_layout(G, equidistant=True, *args, **kwargs)
 
+
 NETWORKX_LAYOUTS = {
     "circular": nx.circular_layout,
     "multipartite": nx.multipartite_layout,
@@ -285,11 +287,8 @@ def spiral_equidistant_layout(G, *args, **kwargs):
     "tree": tree_layout,
 }
 
-LAYOUT_DENSITY_EXPONENT = {
-    "circular": 0.9,
-    "spiral_equidistant": 0.7,
-    "spiral": 0.6,
-}
+LAYOUT_DENSITY_EXPONENT = {"circular": 0.9, "spiral_equidistant": 0.7, "spiral": 0.6}
+
 
 def clamp(value, min=-math.inf, max=math.inf):
     if value <= min:
@@ -315,7 +314,9 @@ def harmonize_parameters(G, draw_options: dict):
         draw_options["node_size"] = node_size
     elif graph_layout in ["circular", "spiral", "spiral_equidistant"]:
         exponent = LAYOUT_DENSITY_EXPONENT[graph_layout]
-        node_size = draw_options["node_size"] = (2 * DEFAULT_NODE_SIZE) / (len(G)+1) ** exponent
+        node_size = draw_options["node_size"] = (2 * DEFAULT_NODE_SIZE) / (
+            len(G) + 1
+        ) ** exponent
         # print("XX", node_size, exponent)
 
     if draw_options.get("with_labels", False):
@@ -325,6 +326,8 @@ def harmonize_parameters(G, draw_options: dict):
     if "width" not in draw_options:
         width = clamp(node_size / DEFAULT_NODE_SIZE, min=0.15)
         draw_options["width"] = width
+    print("width", draw_options["width"])
+    print("graph_layout", graph_layout)
 
     if "font_size" not in draw_options:
         # FIXME: should also take into consideration max width of label.