diff -p -up sage-4.4/spkg/build/sagenb-0.7.5.3/src/sagenb/sagenb/data/sage/html/notebook/base.html.orig sage-4.4/spkg/build/sagenb-0.7.5.3/src/sagenb/sagenb/data/sage/html/notebook/base.html --- sage-4.4/spkg/build/sagenb-0.7.5.3/src/sagenb/sagenb/data/sage/html/notebook/base.html.orig 2010-02-10 20:25:42.691018420 -0200 +++ sage-4.4/spkg/build/sagenb-0.7.5.3/src/sagenb/sagenb/data/sage/html/notebook/base.html 2010-02-10 20:26:08.044018261 -0200 @@ -42,7 +42,7 @@ INPUT: <!-- Jmol - embedded 3D graphics --> <script type="text/javascript" src="/java/jmol/appletweb/Jmol.js"></script> <!-- This must stay in head --> -<script>jmolInitialize("/java/jmol");jmolSetCallback("menuFile","/java/jmol/appletweb/SageMenu.mnu");</script> +<script>jmolInitialize("/java/jmol",1);</script> {% if JEDITABLE_TINYMCE and not worksheet.docbrowser() and not worksheet.is_published() %} <!-- TinyMCE and jEditable - in-place editing of text cells --> diff -p -up sage-4.4/spkg/build/sagenb-0.7.5.3/src/sagenb/sagenb/misc/misc.py.orig sage-4.4/spkg/build/sagenb-0.7.5.3/src/sagenb/sagenb/misc/misc.py --- sage-4.4/spkg/build/sagenb-0.7.5.3/src/sagenb/sagenb/misc/misc.py.orig 2010-02-10 20:26:22.757019736 -0200 +++ sage-4.4/spkg/build/sagenb-0.7.5.3/src/sagenb/sagenb/misc/misc.py 2010-02-10 20:26:45.351018350 -0200 @@ -158,7 +158,8 @@ def pad_zeros(s, size=3): """ return "0"*(size-len(str(s))) + str(s) -DATA = os.path.join(os.path.split(resource_filename(__name__, ''))[0], 'data') +import distutils.sysconfig +DATA = distutils.sysconfig.get_python_lib(plat_specific=1) + "/sagenb/data" if os.environ.has_key('DOT_SAGENB'): DOT_SAGENB = os.environ['DOT_SAGENB'] diff -p -up sage-4.4/spkg/build/sagenb-0.7.5.3/src/sagenb/sagenb/notebook/cell.py.orig sage-4.4/spkg/build/sagenb-0.7.5.3/src/sagenb/sagenb/notebook/cell.py --- sage-4.4/spkg/build/sagenb-0.7.5.3/src/sagenb/sagenb/notebook/cell.py.orig 2010-02-10 20:26:54.301017594 -0200 +++ sage-4.4/spkg/build/sagenb-0.7.5.3/src/sagenb/sagenb/notebook/cell.py 2010-02-10 20:27:53.326018396 -0200 @@ -19,7 +19,7 @@ import shutil from cgi import escape from jsmath import math_parse -from sagenb.misc.misc import (word_wrap, SAGE_DOC, strip_string_literals, +from sagenb.misc.misc import (word_wrap, SAGE_DOC, DOT_SAGENB, strip_string_literals, set_restrictive_permissions, unicode_str, encoded_str) @@ -2293,13 +2293,13 @@ class Cell(Cell_generic): jmol_script = jmol_file.read() jmol_file.close() - jmol_script = jmol_script.replace('defaultdirectory "', 'defaultdirectory "' + self.url_to_self() + '/') + jmol_script = jmol_script.replace('defaultdirectory "', 'defaultdirectory "' + DOT_SAGENB + '/sage_notebook.sagenb/' + self.url_to_self() + '/') jmol_file = open(jmol_name, 'w') jmol_file.write(jmol_script) jmol_file.close() - script = '<div><script>jmol_applet(%s, "%s?%d");</script></div>' % (size, url, time.time()) + script = '<div><script>jmol_applet(%s, "%s/sage_notebook.sagenb/%s?%d");</script></div>' % (size, DOT_SAGENB, url, time.time()) images.append(script) elif F.endswith('.jmol.zip'): pass # jmol data diff -p -up sage-4.4/spkg/build/sagenb-0.7.5.3/src/sagenb/sagenb/notebook/twist.py.orig sage-4.4/spkg/build/sagenb-0.7.5.3/src/sagenb/sagenb/notebook/twist.py --- sage-4.4/spkg/build/sagenb-0.7.5.3/src/sagenb/sagenb/notebook/twist.py.orig 2010-02-10 20:28:03.009071567 -0200 +++ sage-4.4/spkg/build/sagenb-0.7.5.3/src/sagenb/sagenb/notebook/twist.py 2010-02-10 20:28:27.293017066 -0200 @@ -53,7 +53,7 @@ HISTORY_MAX_OUTPUT = 92*5 HISTORY_NCOLS = 90 from sagenb.misc.misc import (SAGE_DOC, DATA, SAGE_VERSION, walltime, - tmp_filename, tmp_dir, is_package_installed, + tmp_filename, tmp_dir, jsmath_macros, encoded_str, unicode_str) css_path = os.path.join(DATA, "sage", "css") @@ -62,7 +62,7 @@ javascript_path = os.path.join(DATA sage_javascript_path = os.path.join(DATA, 'sage', 'js') java_path = os.path.join(DATA) -jsmath_image_fonts = is_package_installed("jsmath-image-fonts") +jsmath_image_fonts = True # the list of users waiting to register waiting = {}