Ticket #406: sage-406.patch

sage/server/notebook/js.py

@@ -1415 +1415 @@
     */
     with(theform) {
         var system = options[selectedIndex].value;
-        if (confirm("All cells will be evaluated using " + system + " until you change the system back.")) {
+        system_select(system);
+/*        if (confirm("All cells will be evaluated using " + system + " until you change the system back.")) {
             system_select(system);
         } else {
             options[original_system].selected = 1;
         }
+*/
     }
 }
 

sage/server/notebook/notebook.py

@@ -34 +34 @@
 
 
 SYSTEMS = ['sage', 'gap', 'gp', 'jsmath', 'html', 'latex', 'maxima', 'python', 'r', 'sage', 'sh', 'singular', 'axiom (optional)', 'kash (optional)', 'macaulay2 (optional)', 'magma (optional)', 'maple (optional)', 'mathematica (optional)', 'matlab (optional)', 'mupad (optional)', 'octave (optional)']
+
+# We also record the system names without (optional) since they are
+# used in some of the html menus, etc.
+SYSTEM_NAMES = [v.split()[0] for v in SYSTEMS]
 
 JSMATH = True
 
@@ -2038 +2042 @@
     def html_system_select_form_element(self, ws):
         system = ws.system()
         options = ''
-        i = SYSTEMS.index(system)
-        for S in SYSTEMS:
-            if S == system:
+        i = SYSTEM_NAMES.index(system)
+        for j, S in enumerate(SYSTEMS):
+            if i == j:
                 selected = "selected"
             else:
                 selected = ''
-            T = S.split()[0]
+            T = SYSTEM_NAMES[j]
             options += '<option title="Evaluate all input cells using %s" %s value="%s">%s</option>\n'%(T, selected, T,S)
         s = """<select  onchange="go_system_select(this, %s);" class="worksheet">
             %s

sage/server/notebook/worksheet.py

@@ -1855 +1855 @@
             i += 1
         if before_prompt.endswith('??'):
             input = self._get_last_identifier(before_prompt[:-2])
-            input = 'print _support_.source_code("%s", globals())'%input
+            input = 'print _support_.source_code("%s", globals(), system="%s")'%(input, self.system())
         elif before_prompt.endswith('?'):
             input = self._get_last_identifier(before_prompt[:-1])
-            input = 'print _support_.docstring("%s", globals())'%input
+            input = 'print _support_.docstring("%s", globals(), system="%s")'%(input, self.system())
         else:
             input = self._get_last_identifier(before_prompt)
             C._word_being_completed = input
-            input = 'print "\\n".join(_support_.completions("%s", globals()))'%(input)
+            input = 'print "\\n".join(_support_.completions("%s", globals(), system="%s"))'%(input, self.system())
         return input
         
     def preparse_nonswitched_input(self, input):
@@ -1954 +1954 @@
         return out
 
     def _get_last_identifier(self, s):
-        t = support.get_rightmost_identifier(s)
-        S = self.system()
-        # If we are tab completing in a worksheet for another
-        # system, e.g., mathematica, this is like typing mathematica.[tab].
-        # However, for Sage and Python, we want regular tab completion. 
-        if S and not (S in ['sage', 'python']):
-            t = S + '.' + t
-        return t
+        return support.get_rightmost_identifier(s)
 
     def preparse(self, s):
         if sage.misc.interpreter.do_preparse:

sage/server/support.py

@@ -76 +76 @@
     """
     Return a list of completions in the context of globs.
     """
+    if system not in ['sage', 'python']:
+        prepend = system + '.'
+        s = prepend + s
+    else:
+        prepend = ''
     n = len(s)
     if n == 0:
         return '(empty string)'
@@ -109 +114 @@
         v.sort()
     except Exception, msg:
         v = []
+
+    if prepend:
+        i = len(prepend)
+        v = [x[i:] for x in v]
+        
     if format:
         if len(v) == 0:
             return "No completions of '%s' currently defined"%s
@@ -116 +126 @@
             return tabulate(v, width)
     return v    
 
-def docstring(obj_name, globs):
+def docstring(obj_name, globs, system='sage'):
     r"""
     Format \var{obj_name}'s docstring for printing in \sage notebook.
     
@@ -124 +134 @@
         -- William Stein (but partly taken from IPython for use in \sage).
         -- Extensions by Nick Alexander
     """
+    if system not in ['sage', 'python']:
+        obj_name = system + '.' + obj_name
     try:
         obj = eval(obj_name, globs)
     except (AttributeError, NameError, SyntaxError):
@@ -144 +156 @@
     s += 'Docstring: \n%s\n'%sageinspect.sage_getdoc(obj, obj_name)
     return s.rstrip()
 
-def source_code(s, globs):
+def source_code(s, globs, system='sage'):
     r"""
     Format obj's source code for printing in \sage notebook.
     
@@ -152 +164 @@
         -- William Stein (but partly taken from IPython for use in \sage).
         -- Extensions by Nick Alexander
     """
+    if system not in ['sage', 'python']:
+        s = system + '.' + s
+
     try:
         obj = eval(s, globs)
     except NameError: