[sagenb] 01/01: Update plot3d warning message to mention the existence of other viewers

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository sagenb.

commit bcc25a5d411f308a2b570407ce1c3a2eb211a885
Author: Ximin Luo <infinity0 at debian.org>
Date:   Sun Jan 22 00:47:05 2017 +0100

    Update plot3d warning message to mention the existence of other viewers
---
 debian/README.Debian                   | 16 +++++++++++-----
 debian/changelog                       |  7 +++++++
 debian/patches/debian-jmol-paths.patch |  8 +++-----
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 48b5394..ddffbd9 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,15 +1,21 @@
 3D Plots
 ========
 
-3D plots do not work because JSmol cannot currently be packaged for Debian. See
-the README.source of the jmol package for more details on this situation.
+Interactive 3D plots using the default viewer do not work in SageNB because
+JSmol cannot currently be packaged for Debian. See the README.source of the
+jmol package for more details on this situation.
 
-Upstream claims to support using the old Jmol applet instead of JSmol, but it
-does not work and it would be hard for us Debian folks to patch it in, see
-https://github.com/sagemath/sagenb/issues/415
+You can view an interactive plot with reduced functionality by giving the
+option `viewer='canvas3d'`, or a non-interactive plot by giving the option
+`viewer='tachyon'`. Also, interactive plots with Jmol do work from the SageMath
+command-line interface.
 
 3D plots do work from the SageMath command-line interface.
 
+(The upstream code claims to support using the old Jmol applet instead of
+JSmol, but this is just because it was not updated properly over the years, see
+https://github.com/sagemath/sagenb/issues/415)
+
 Secure Notebook
 ===============
 
diff --git a/debian/changelog b/debian/changelog
index 90f3919..bc80a3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sagenb (0.13+ds1-2) UNRELEASED; urgency=medium
+
+  * Update plot3d warning message to mention the existence of the tachyon and
+    canvas3d options. Update README.Debian to match.
+
+ -- Ximin Luo <infinity0 at debian.org>  Sun, 22 Jan 2017 00:46:05 +0100
+
 sagenb (0.13+ds1-1) unstable; urgency=low
 
   [ Felix Salfelder ]
diff --git a/debian/patches/debian-jmol-paths.patch b/debian/patches/debian-jmol-paths.patch
index 6003651..288c2a8 100644
--- a/debian/patches/debian-jmol-paths.patch
+++ b/debian/patches/debian-jmol-paths.patch
@@ -40,7 +40,7 @@ Forwarded: not-needed
  
 --- a/sagenb/data/sage/html/notebook/base.html
 +++ b/sagenb/data/sage/html/notebook/base.html
-@@ -136,12 +136,8 @@
+@@ -136,12 +136,6 @@
          <input type="checkbox" title="{{ gettext('Enable/disable pretty_printing') }}"
                 onchange="pretty_print_check(this.checked);"
                 class="worksheet" value="pretty_print" {{ "checked" if worksheet.pretty_print() else "" }} /> {{ gettext('Typeset') }}
@@ -50,8 +50,6 @@ Forwarded: not-needed
 -        <input id="3D_use_java", type="checkbox" title="{{ gettext('Use java for 3-D. Only applies to this running of worksheet.') }}"
 -               onchange="3D_use_java_check(this.checked);"
 -               class="worksheet" value="3D_use_java"/> {{ gettext('Use java for 3-D') }}
-+          (<span title="3D plots do not work because JSmol cannot currently be packaged for Debian. See the README.source of the jmol package for more details on this situation. They do work in the SageMath CLI." >3D
-+        plots are <strong>DISABLED</strong></span>)
           {% endif %}
      {% endif %} 
      </div>
@@ -61,9 +59,9 @@ Forwarded: not-needed
          script_name = os.path.join(self.url_to_self(), F)
          return textwrap.dedent("""
          <div id="sage_jmol_{id}" class="3DPlotDiv">
-+            <div>3D plots do not work in SageNB because JSmol cannot currently be packaged for Debian. See the README.source of the jmol package for more details on this situation.</div>
++            <div>Interactive 3D plots using the default viewer do not work in SageNB because JSmol cannot currently be packaged for Debian. See the README.source of the jmol package for more details on this situation.</div>
 +            <div> </div>
-+            <div>3D plots do work from the SageMath command-line interface.</div>
++            <div>You can view an interactive plot with reduced functionality by giving the option <code>viewer='canvas3d'</code>, or a non-interactive plot by giving the option <code>viewer='tachyon'</code>. Also, interactive plots with Jmol do work from the SageMath command-line interface.</div>
              <div id="loadJmol" style="display:none;">{id}</div>
              <div id="sage_jmol_size_{id}" style="display:none;">{size}</div>
              <div id="sage_jmol_img_{id}" style="display:none;">{image_name}.png?{timestamp}</div>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git