Changeset 5254:992f4b55d339

Timestamp:

07/01/07 19:28:36 (6 years ago)

Author:

William Stein <wstein@…>

Branch:

default

Parents:

5245:2b14ba7eb3fe (diff), 5253:4be54a6a85a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge in tom's code.

Files:

• sage/server/notebook/config.py (modified) (1 diff)
• sage/server/notebook/config.py (modified) (2 diffs)
• sage/server/notebook/js.py (modified) (4 diffs)
• sage/server/notebook/js.py (modified) (1 diff)
• sage/server/notebook/worksheet.py (modified) (1 diff)
• sage/server/notebook/worksheet.py (modified) (1 diff)
• setup.py (modified) (1 diff)
• setup.py (modified) (5 diffs)

sage/server/notebook/config.py

@@ -15 +15 @@
 
 js.keyhandler.add('request_introspections', key = "KEY_SPC",  ctrl=True)  # control space
-js.keyhandler.add('request_introspections', key = "KEY_TAB")  # tab
+js.keyhandler.add('request_introspections', key = "KEY_TAB", shift=False)  # tab
+js.keyhandler.add('indent', key = "KEY_TAB", shift=False)  # tab
+js.keyhandler.add('unindent', key = "KEY_TAB", shift=True)  # tab
 js.keyhandler.add('request_history',     key = "KEY_Q", ctrl=True)
 js.keyhandler.add('request_history',     key = "KEY_QQ", ctrl=True)

sage/server/notebook/config.py

@@ +1 @@
+"""nodoctest
+Customization of the Notebook
+"""
+
 #############################################################################
 #       Copyright (C) 2007 William Stein <wstein@gmail.com>
@@ -5 +9 @@
 #                  http://www.gnu.org/licenses/
 #############################################################################
-
-"""
-Customization of the Notebook
-"""
 
 #from js import JSKeyHandler

sage/server/notebook/js.py

@@ -211 +211 @@
 var function_pat = "([a-zA-Z_][a-zA-Z._0-9]*)\\([^()]*$"; 
 var one_word_pat = "([a-zA-Z_][a-zA-Z._0-9]*)";
-
+var unindent_pat = "^\\s{0,4}(.*)$";
 var whitespace_pat = "(\\s*)";
 
@@ -220 +220 @@
   one_word_pat = new RegExp(one_word_pat);
   whitespace_pat = new RegExp(whitespace_pat);
+  unindent_pat = new RegExp(unindent_pat);
 } catch(e){}
 
@@ -1415 +1416 @@
        evaluate_cell(id, 1);
        return false;
-    } else if (key_request_introspections(e)) {
+    } else if (key_unindent(e)) { //unfortunately, shift-tab needs to get caught before not-shift tab
+       unindent_cell(cell_input);
+       return false;
+    } else if (key_request_introspections(e) && cell_input.selectionStart == cell_input.selectionEnd) {
        // command introspection (tab completion, ?, ??)
        evaluate_cell(id, 2);
        focus_delay(id,true);
+       return false;
+    } else if (key_indent(e)) {
+       indent_cell(cell_input);
        return false;
     } else if (key_interrupt(e)) {
@@ -1522 +1529 @@
 }
 
+function indent_cell(input) {
+    if(browser_ie) {
+    } else {
+        var start = 1+input.value.lastIndexOf("\n", input.selectionStart);
+        var a = input.value.substring(0, start);
+        var b = input.value.substring(start, input.selectionEnd);
+        var c = input.value.substring(input.selectionEnd);
+        var lines = b.split("\n");
+        for(var i = 0; i < lines.length; i++)
+            lines[i] = "    "+lines[i];
+        b = lines.join("\n");
+        input.value = a+b+c;
+        input.selectionStart = a.length;
+        input.selectionEnd = a.length + b.length;;
+    }
+}
+
+function unindent_cell(input) {
+    if(browser_ie) {
+    } else {
+        var start = 1+input.value.lastIndexOf("\n", input.selectionStart);
+        var a = input.value.substring(0, start);
+        var b = input.value.substring(start, input.selectionEnd);
+        var c = input.value.substring(input.selectionEnd);
+        var lines = b.split("\n");
+        for(var i = 0; i < lines.length; i++)
+            lines[i] = unindent_pat.exec(lines[i])[1];  //square brackets pull the captured pattern
+        b = lines.join("\n");
+        input.value = a+b+c;
+        input.selectionStart = a.length;
+        input.selectionEnd = a.length + b.length;;
+    }
+}
+
 function worksheet_command(cmd) {
    return ('/home/' + worksheet_filename + '/' + cmd);

sage/server/notebook/js.py

@@ -1 @@
-r"""
+r"""nodoctest
 Javascript (AJAX) Component of SAGE Notebook
 

sage/server/notebook/worksheet.py

@@ -702 +702 @@
             cells = [self._new_cell()]
 
+        self.__cells = cells
+
+        # This *depends* on self.__cells being set!!
         self.set_cell_counter()
             
-        self.__cells = cells
 
 

sage/server/notebook/worksheet.py

@@ -1 @@
-"""
+"""nodoctest
 A Worksheet.
 

setup.py

@@ -876 +876 @@
                      'sage.matrix',
 #                     'sage.matrix.padics',
-                     
+                     'sage.media',
                      'sage.misc',
                      

setup.py

@@ -64 +64 @@
 #####################################################    
         
-ec =    Extension('sage.libs.ec.ec',
-              sources = ["sage/libs/ec/ec.pyx"] +  \
-                        ["sage/libs/ec/%s"%s for s in \
-                         ["analrank.c", "apcompute.c", "arderivs.c",
-                          "arintern.c", "arith.c", "artwists.c",
-                          "arutil.c", "checkit.c", "degphi.c", 
-                          "diskio.c", "docurve.c", "dodisk.c", 
-                          "equation.c", "exotic.c", "fixit.c", 
-                          "iisog2.c", "iisog3.c", "isog.c", "isog2.c",
-                          "isog23.c", "isog24.c", "isog3.c", "isog5.c",
-                          "isog52.c", "isog713.c", "isogNprime.c",
-                          "isoggen.c", "isogsort.c", "isogx0.c", 
-                          "isogx0branch.c", "isogx0branch1.c", 
-                          "isogx0branch2.c", "isogx0branch3.c",
-                          "isogx0branch4.c", "isogx0branch5.c", 
-                          "isogx0branch6.c", "isogx0getd.c", 
-                          "isogx0period.c", "readit.c",
-                          "special.c", "util.c"]], 
-              libraries = ["pari", "m"])
-
 hanke = Extension(name = "sage.libs.hanke.hanke",
               sources = ["sage/libs/hanke/hanke.pyx",
@@ -174 +154 @@
 libsingular = Extension('sage.libs.singular.singular',
                         sources = ['sage/libs/singular/singular.pyx'],
-                        libraries = ['gmp', 'm', 'readline', 'singular', 'singfac', 'singcf', 'omalloc'],
+                        libraries = ['gmp', 'm', 'readline', 'singular', 'singfac', 'singcf', 'omalloc', 'givaro', 'gmpxx'],
                         language="c++",
                         )
@@ -329 +309 @@
     #vector_rational_sparse,
 
-    ec, 
     pari, 
 
@@ -434 +413 @@
     Extension('sage.rings.polynomial.multi_polynomial_libsingular',
               sources = ['sage/rings/polynomial/multi_polynomial_libsingular.pyx'],
-              libraries = ['gmp', 'm', 'readline', 'singular', 'singcf', 'singfac', 'omalloc'],
+              libraries = ['gmp', 'm', 'readline', 'singular', 'singcf', 'singfac', 'omalloc', 'givaro', 'gmpxx'],
               language="c++",
               ), \
@@ -892 +871 @@
                      'sage.libs.mwrank',
                      'sage.libs.ntl',
-                     'sage.libs.ec',
                      'sage.libs.pari',
                      'sage.libs.singular',