upstream/ipython Files · IPython/frontend/html/notebook/static/codemirror/README-IPython.rst

Merge pull request from minrk/image_garbage...

Merge pull request from minrk/image_garbage A few small patches to image handling

Matthias BUSSONNIER - - Load All Authors

File last commit:

r9702:df279816


                r10060:b4484c7a

Download file

             README-IPython.rst
        
                    58 lines
            
             | 2.2 KiB
            
                | text/x-rst
            
             |
                RstLexer
            
             / IPython / frontend / html / notebook / static / codemirror / README-IPython.rst
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Fernando Perez
    
Add a README with version and ipython-specific changes info.

              r4982
            
      =======================

       CodeMirror in IPython

      =======================

      We carry a mostly unmodified copy of CodeMirror.  The current version we use

      is (*please update this information when updating versions*)::

        Matthias BUSSONNIER
    
update codemirror instruction

              r8056
            
          CodeMirror2 4e244d252a26a2dba5446d44eb46adfb3c7f356a , tag : v2.32

        Fernando Perez
    
Add a README with version and ipython-specific changes info.

              r4982
            
        Bradley M. Froehle
    
Pressing Up while on the first line should move cursor to (0,0)...

              r8169
            
      The following CodeMirror commits have been cherry-picked into the source:

        * 4ec8a34 Pressing Up while on the first line should move cursor to (0,0)

        Matthias BUSSONNIER
    
=== Read this commit message if you rebase ===...

              r8061
            
      The current politics is not to ships the following folders of CodeMirrors :

        * doc/

        * demo/

        * test/

        Fernando Perez
    
Add a README with version and ipython-specific changes info.

              r4982
            
      The only changes we've applied so far are these::

        Matthias BUSSONNIER
    
=== Read this commit message if you rebase ===...

              r8061
            
          git show 271e17dd21f4f0c802a573b412e430998a70a78c

        Matthias BUSSONNIER
    
update codemirror instruction

              r8056
            
        Matthias BUSSONNIER
    
=== Read this commit message if you rebase ===...

              r8061
            
          commit 271e17dd21f4f0c802a573b412e430998a70a78c

        Matthias BUSSONNIER
    
update codemirror instruction

              r8056
            
          Author: Matthias BUSSONNIER <bussonniermatthias@gmail.com>

          Date:   Mon Jul 23 14:53:21 2012 +0200

              patch SingleOperator in CodeMirror2

          diff --git a/IPython/frontend/html/notebook/static/codemirror/mode/python/python.js b/IPython/frontend/html/notebook/static/code

          index d6888e8..201da51 100644

        Fernando Perez
    
Add a README with version and ipython-specific changes info.

              r4982
            
          --- a/IPython/frontend/html/notebook/static/codemirror/mode/python/python.js

          +++ b/IPython/frontend/html/notebook/static/codemirror/mode/python/python.js

        Matthias BUSSONNIER
    
update codemirror instruction

              r8056
            
          @@ -4,8 +4,11 @@ CodeMirror.defineMode("python", function(conf, parserConf) {

               function wordRegexp(words) {

                   return new RegExp("^((" + words.join(")|(") + "))\\b");

               }

          -

        Fernando Perez
    
Add a README with version and ipython-specific changes info.

              r4982
            
          -    var singleOperators = new RegExp("^[\\+\\-\\*/%&|\\^~<>!]");

        Matthias BUSSONNIER
    
update codemirror instruction

              r8056
            
          +

        Fernando Perez
    
Add a README with version and ipython-specific changes info.

              r4982
            
          +    // IPython-specific changes: add '?' as recognized character.

          +    var singleOperators = new RegExp("^[\\+\\-\\*/%&|\\^~<>!\\?]");

          +    // End IPython changes.

        Matthias BUSSONNIER
    
update codemirror instruction

              r8056
            
          +

               var singleDelimiters = new RegExp('^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]');

               var doubleOperators = new RegExp("^((==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))");

               var doubleDelimiters = new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");

        Matthias BUSSONNIER
    
=== Read this commit message if you rebase ===...

              r8061
            
      In practice it's just a one-line change, adding `\\?` to singleOperators,

      surrounded by a comment. 

      that you should be able to apply after updating codemirror with

        Matthias BUSSONNIER
    
move CM IPython theme out of codemirror folder

              r9702
            
      git cherry-pick 271e17

        Matthias BUSSONNIER
    
=== Read this commit message if you rebase ===...

              r8061
            
      We'll turn this into a proper patchset if it ever gets more complicated than

      this, but for now this note should be enough.

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Fernando Perez Add a README with version and ipython-specific changes info.	r4982	=======================
		CodeMirror in IPython
		=======================

		We carry a mostly unmodified copy of CodeMirror. The current version we use
		is (please update this information when updating versions)::

Matthias BUSSONNIER update codemirror instruction	r8056	CodeMirror2 4e244d252a26a2dba5446d44eb46adfb3c7f356a , tag : v2.32
Fernando Perez Add a README with version and ipython-specific changes info.	r4982
Bradley M. Froehle Pressing Up while on the first line should move cursor to (0,0)...	r8169	The following CodeMirror commits have been cherry-picked into the source:

		* 4ec8a34 Pressing Up while on the first line should move cursor to (0,0)

Matthias BUSSONNIER === Read this commit message if you rebase ===...	r8061	The current politics is not to ships the following folders of CodeMirrors :

		* doc/
		* demo/
		* test/


Fernando Perez Add a README with version and ipython-specific changes info.	r4982	The only changes we've applied so far are these::

Matthias BUSSONNIER === Read this commit message if you rebase ===...	r8061	git show 271e17dd21f4f0c802a573b412e430998a70a78c
Matthias BUSSONNIER update codemirror instruction	r8056
Matthias BUSSONNIER === Read this commit message if you rebase ===...	r8061	commit 271e17dd21f4f0c802a573b412e430998a70a78c
Matthias BUSSONNIER update codemirror instruction	r8056	Author: Matthias BUSSONNIER <bussonniermatthias@gmail.com>
		Date: Mon Jul 23 14:53:21 2012 +0200

		patch SingleOperator in CodeMirror2

		diff --git a/IPython/frontend/html/notebook/static/codemirror/mode/python/python.js b/IPython/frontend/html/notebook/static/code
		index d6888e8..201da51 100644
Fernando Perez Add a README with version and ipython-specific changes info.	r4982	--- a/IPython/frontend/html/notebook/static/codemirror/mode/python/python.js
		+++ b/IPython/frontend/html/notebook/static/codemirror/mode/python/python.js
Matthias BUSSONNIER update codemirror instruction	r8056	@@ -4,8 +4,11 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
		function wordRegexp(words) {
		return new RegExp("^((" + words.join(")\|(") + "))\\b");
		}
		-
Fernando Perez Add a README with version and ipython-specific changes info.	r4982	- var singleOperators = new RegExp("^[\\+\\-\\*/%&\|\\^~<>!]");
Matthias BUSSONNIER update codemirror instruction	r8056	+
Fernando Perez Add a README with version and ipython-specific changes info.	r4982	+ // IPython-specific changes: add '?' as recognized character.
		+ var singleOperators = new RegExp("^[\\+\\-\\*/%&\|\\^~<>!\\?]");
		+ // End IPython changes.
Matthias BUSSONNIER update codemirror instruction	r8056	+
		var singleDelimiters = new RegExp('^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]');
		var doubleOperators = new RegExp("^((==)\|(!=)\|(<=)\|(>=)\|(<>)\|(<<)\|(>>)\|(//)\|(\\\\))");
		var doubleDelimiters = new RegExp("^((\\+=)\|(\\-=)\|(\\*=)\|(%=)\|(/=)\|(&=)\|(\\\|=)\|(\\^=))");

Matthias BUSSONNIER === Read this commit message if you rebase ===...	r8061	In practice it's just a one-line change, adding `\\?` to singleOperators,
		surrounded by a comment.

		that you should be able to apply after updating codemirror with

Matthias BUSSONNIER move CM IPython theme out of codemirror folder	r9702	git cherry-pick 271e17
Matthias BUSSONNIER === Read this commit message if you rebase ===...	r8061
		We'll turn this into a proper patchset if it ever gets more complicated than
		this, but for now this note should be enough.