diff --git a/NEWS b/NEWS
index 27b15d026..aba708710 100644
--- a/NEWS
+++ b/NEWS
@@ -60,6 +60,11 @@ New in spot 2.5.3.dev (not yet released)
options; there are demonstrated on the new
https://spot.lrde.epita.fr/ipynb/satmin.html page.
+ Python:
+
+ - New spot.jupyter package. This currently contains a function for
+ displaying several argument side by side in a Jupyter notebook.
+
Bugs fixed:
- print_dot() will correctly escape strings containing \n in HTML
diff --git a/python/Makefile.am b/python/Makefile.am
index 234701e9b..afd174655 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -1,5 +1,5 @@
## -*- coding: utf-8 -*-
-## Copyright (C) 2010, 2011, 2013-2017 Laboratoire de Recherche
+## Copyright (C) 2010, 2011, 2013-2018 Laboratoire de Recherche
## et Development de l'Epita (LRDE).
## Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
## département Systèmes Répartis Coopératifs (SRC), Université Pierre
@@ -41,6 +41,7 @@ nobase_python_PYTHON = \
spot/impl.py \
spot/ltsmin.py \
spot/gen.py \
+ spot/jupyter.py \
buddy.py
nobase_pyexec_LTLIBRARIES = _buddy.la spot/_impl.la \
spot/_ltsmin.la spot/_gen.la
diff --git a/python/spot/jupyter.py b/python/spot/jupyter.py
new file mode 100644
index 000000000..0c4dc5a76
--- /dev/null
+++ b/python/spot/jupyter.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2018 Laboratoire de Recherche et Développement de l'Epita
+# (LRDE).
+#
+# This file is part of Spot, a model checking library.
+#
+# Spot is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# Spot is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+"""
+Auxiliary functions for Spot's Python bindings.
+"""
+
+from IPython.display import display, HTML
+
+def display_inline(*args, per_row=None):
+ """
+ This is a wrapper around IPython's `display()` to display multiple
+ elements in a row, without forced line break between them.
+
+ If the `per_row` argument is given, at most `per_row` arguments are
+ displayed on each row, each one taking 1/per_row of the line width.
+ """
+ width = res = ''
+ if per_row:
+ width = 'width:{}%;'.format(100//per_row)
+ for arg in args:
+ dpy = 'inline-block'
+ if hasattr(arg, '_repr_svg_'):
+ rep = arg._repr_svg_()
+ elif hasattr(arg, '_repr_html_'):
+ rep = arg._repr_html_()
+ elif hasattr(arg, '_repr_latex_'):
+ rep = arg._repr_latex_()
+ if not per_row:
+ dpy = 'inline'
+ else:
+ rep = str(arg)
+ res += ("
{}
"
+ .format(dpy, width, rep))
+ display(HTML(res))
diff --git a/tests/python/product.ipynb b/tests/python/product.ipynb
index bd23df504..cfdd6e714 100644
--- a/tests/python/product.ipynb
+++ b/tests/python/product.ipynb
@@ -8,15 +8,9 @@
"source": [
"from IPython.display import display, HTML\n",
"import spot\n",
+ "from spot.jupyter import display_inline # display multiple arguments side-by-side\n",
"import buddy\n",
- "spot.setup(show_default='.tavb')\n",
- "\n",
- "def horiz(*args):\n",
- " \"\"\"Display multiple arguments side by side in a table.\"\"\"\n",
- " s = '