Merge branch 'master' of https://github.com/ipython-contrib/jupyter_contrib_nbextensions

Author: jfbercher

.travis.yml

@@ -38,7 +38,7 @@ matrix:
       env: TOXENV=condarecipe
     # linux, various python and notebook versions
     - os: linux
-      python: '3.4'
+      python: '2.7'
       env: TOXENV=py27-notebook
     - os: linux
       python: '3.3'
@@ -67,15 +67,6 @@ matrix:
     - os: linux
       python: '3.6'
       env: TOXENV=py36-notebook
-    # OSX tests, python 2 & 3
-    # Use generic language on osx, get python via terryfy during before_install
-    - os: osx
-      language: generic
-      env: OSX_PYTHON=2.7 TOXENV=py27-notebook
-    - os: osx
-      language: generic
-      env: OSX_PYTHON=3.5 TOXENV=py35-notebook
-    # finally, appveyor downloads from windows platform
     - os: linux
       python: '3.4'
       env: TOXENV=appveyorartifacts
@@ -91,19 +82,6 @@ before_install:
   - uname -a
   - id -un
   - id -Gn
-  # install python on osx
-  - 'if [[ ${OSX_PYTHON} ]]; then curl https://raw.githubusercontent.com/MacPython/terryfy/12a4641c4e922eb4a63c82732df8d0c5045430af/travis_tools.sh > travis_tools.sh; fi'
-  - 'if [[ ${OSX_PYTHON} ]]; then source travis_tools.sh; fi'
-  - 'if [[ ${OSX_PYTHON} ]]; then get_python_environment macpython $OSX_PYTHON venv; fi'
-  # install 3.4 as it's the default for tox environments like clean, check
-  - 'if [[ ${OSX_PYTHON} ]] && [[ ${OSX_PYTHON} != "3.4" ]]; then install_macpython 3.4; fi'
-  # check which python installs are present/active
-  - 'if [[ ${OSX_PYTHON} ]]; then echo "$PYTHON_EXE"; fi;'
-  - 'if [[ ${OSX_PYTHON} ]]; then if [[ $(which python   ) ]]; then ls -l $(which python   ); else echo "missing"; fi; fi'
-  - 'if [[ ${OSX_PYTHON} ]]; then if [[ $(which python2.7) ]]; then ls -l $(which python2.7); else echo "missing"; fi; fi'
-  - 'if [[ ${OSX_PYTHON} ]]; then if [[ $(which python3.3) ]]; then ls -l $(which python3.3); else echo "missing"; fi; fi'
-  - 'if [[ ${OSX_PYTHON} ]]; then if [[ $(which python3.4) ]]; then ls -l $(which python3.4); else echo "missing"; fi; fi'
-  - 'if [[ ${OSX_PYTHON} ]]; then if [[ $(which python3.5) ]]; then ls -l $(which python3.5); else echo "missing"; fi; fi'
   # stuff for conda recipe
   - 'if [[ ${TOXENV} == "condarecipe" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi'
   - 'if [[ ${TOXENV} == "condarecipe" ]]; then bash miniconda.sh -b -p $HOME/miniconda; fi'

CHANGELOG.md

@@ -34,6 +34,8 @@ New features and bugfixes:
  - Add preprocessor to embed images into a notebook
    [#1067](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1067)
    [@juhasch](https://github.com/juhasch)
+ - Fixed conflicts in collapsible_headings if keys are rebound.
+   [@rhilenova](https://github.com/rhilenova)
 
 
 0.4.0

docs/source/conf.py

@@ -11,8 +11,8 @@
 import os
 
 from jupyter_contrib_core.testing_utils import get_logger
-from recommonmark.transform import AutoStructify
 from recommonmark.parser import CommonMarkParser
+from recommonmark.transform import AutoStructify
 
 log = get_logger(name=os.path.basename(__file__), log_level=logging.INFO)
 

src/jupyter_contrib_nbextensions/nbconvert_support/__init__.py

@@ -9,8 +9,8 @@
 from .nbTranslate import NotebookLangExporter
 from .pp_highlighter import HighlighterPostProcessor, HighlighterPreprocessor
 from .pre_codefolding import CodeFoldingPreprocessor
-from .pre_pymarkdown import PyMarkdownPreprocessor
 from .pre_embedimages import EmbedImagesPreprocessor
+from .pre_pymarkdown import PyMarkdownPreprocessor
 from .pre_svg2pdf import SVG2PDFPreprocessor
 from .toc2 import TocExporter
 

src/jupyter_contrib_nbextensions/nbextensions/code_prettify/README_isort.md

@@ -35,6 +35,6 @@ All options are provided by the [KerneExecOnCells library](kernel_exec_on_cell.j
 
 Under the hood, this nbextension uses the [kerneexeconcells library](kernel_exec_on_cell.js), a shared library for creating Jupyter nbextensions which transform code cell text using calls to the active kernel.
 
-See the [shared README](REAME.md) and [kerneexeconcells library](kernel_exec_on_cell.js) for the internal model used by the nbextension.
+See the [shared README](README.md) and [kerneexeconcells library](kernel_exec_on_cell.js) for the internal model used by the nbextension.
 
 [fontawesome]: https://fontawesome.com/icons

src/jupyter_contrib_nbextensions/nbextensions/collapsible_headings/main.js

@@ -634,7 +634,7 @@
 
 				var kbm = Jupyter.keyboard_manager;
 
-				var action_up = kbm.actions.get(kbm.command_shortcuts.get_shortcut('up'));
+				var action_up = kbm.actions.get("jupyter-notebook:select-previous-cell");
 				var orig_up_handler = action_up.handler;
 				action_up.handler = function (env) {
 					for (var index = env.notebook.get_selected_index() - 1; (index !== null) && (index >= 0); index--) {
@@ -647,7 +647,7 @@
 					return orig_up_handler.apply(this, arguments);
 				};
 
-				var action_down = kbm.actions.get(kbm.command_shortcuts.get_shortcut('down'));
+				var action_down = kbm.actions.get("jupyter-notebook:select-next-cell");
 				var orig_down_handler = action_down.handler;
 				action_down.handler = function (env) {
 					var ncells = env.notebook.ncells();

src/jupyter_contrib_nbextensions/nbextensions/hide_input/readme.md

@@ -18,7 +18,7 @@ Exporting with nbconvert
 ------------------------
 
 See also the general docs for exporting using nbconvert at
-[jupyter-contrib-nbextensions.readthedocs.io](https://jupyter-contrib-nbextensions.readthedocs.io/en/latest).
+[jupyter-contrib-nbextensions.readthedocs.io](https://jupyter-contrib-nbextensions.readthedocs.io/en/latest/).
 
 To export a notebook with hidden cell inputs using nbconvert, you need to use a
 custom template.

src/jupyter_contrib_nbextensions/nbextensions/load_tex_macros/icon.png

@@ -0,0 +1,7 @@
+Type: Jupyter Notebook Extension
+Name: Load TeX macros
+Description: This extension automatically loads a set of latex commands from the file latexdefs.tex when a notebook is opened.
+Link: readme.md
+Icon: icon.png
+Main: main.js
+Compatibility: 4.x, 5.x

src/jupyter_contrib_nbextensions/nbextensions/load_tex_macros/load_tex_macros.yaml

@@ -0,0 +1,39 @@
+define(function(require, exports, module) {
+    var Jupyter = require('base/js/namespace');
+
+    function loadLatexUserDefs() { 
+        $.get('latexdefs.tex').done(function(data) {
+            data = data.replace(/^/gm, '\$\$\$').replace(/$/gm, '\$\$\$');
+            if ($('#latexdefs').length > 0) $('#latexdefs').remove();
+            $('body').append($('<div/>').attr('id', 'latexdefs').text(data));
+            console.log('latex_envs: loaded user LaTeX definitions latexdefs.tex');
+        }).fail(function() {
+            console.log('load_tex_macros: failed to load user LaTeX definitions latexdefs.tex')
+        });
+    }
+
+    function rerenderMaths() { // probably something like that
+            MathJax.Hub.Queue(
+              ["resetEquationNumbers",MathJax.InputJax.TeX],
+              ["PreProcess", MathJax.Hub],
+              ["Reprocess", MathJax.Hub]
+            );
+    }
+
+    function load_ipython_extension() {
+         "use strict";
+       
+        if (Jupyter.notebook._fully_loaded) {  
+            loadLatexUserDefs();       
+            rerenderMaths(); 
+        } else {
+            $([Jupyter.events]).on("notebook_loaded.Notebook", function() {
+                      loadLatexUserDefs();   
+                      rerenderMaths();  
+            })
+        }
+    }
+    return {
+            load_ipython_extension: load_ipython_extension,
+    };
+})