Surround string output in double quotes.

Author: rocky

mathics/main.py

@@ -111,10 +111,28 @@ def read_line(self, prompt):
         return input(prompt)
 
     def print_result(self, result, no_out_prompt=False):
-        if result is not None and result.result is not None:
-            output = self.to_output(str(result.result))
-            mess = self.get_out_prompt() if not no_out_prompt else ""
-            print(mess + output + "\n")
+        if result is None:
+            # FIXME decide what to do here
+            return
+
+        last_eval = result.last_eval
+
+        if last_eval is not None:
+            try:
+                eval_type = last_eval.get_head_name()
+            except:
+                print(sys.exc_info()[1])
+                return
+
+        out_str = str(result.result)
+        if eval_type == "System`String":
+            out_str = '"' + out_str.replace('"', r'\"') + '"'
+        if eval_type == "System`Graph":
+            out_str = "-Graph-"
+
+        output = self.to_output(out_str)
+        mess = self.get_out_prompt() if not no_out_prompt else ""
+        print(mess + output + "\n")
 
     def rl_read_line(self, prompt):
         # Wrap ANSI colour sequences in \001 and \002, so readline
@@ -186,10 +204,9 @@ def main() -> int:
         prog="mathics",
         usage="%(prog)s [options] [FILE]",
         add_help=False,
-        description="Mathics is a general-purpose computer algebra system.",
-        epilog="""Please feel encouraged to contribute to Mathics! Create
-            your own fork, make the desired changes, commit, and make a pull
-            request.""",
+        description="A simple command-line interface to Mathics",
+        epilog="""For a more extensive command-line interface see "mathicsscript".
+Please contribute to Mathics!""",
     )
 
     argparser.add_argument(