Revision: 20814
          http://sourceforge.net/p/jmol/code/20814
Author:   hansonr
Date:     2015-10-09 22:32:46 +0000 (Fri, 09 Oct 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.16_2015.10.09"

bug fix:  print 'CCC'.find("SMILES") should through a ScriptException, not a 
Java exception

Modified Paths:
--------------
    trunk/Jmol/appletweb/jsmol.zip
    trunk/Jmol/src/org/jmol/scriptext/MathExt.java
    trunk/Jmol/src/org/jmol/viewer/Jmol.properties

Modified: trunk/Jmol/appletweb/jsmol.zip
===================================================================
(Binary files differ)

Modified: trunk/Jmol/src/org/jmol/scriptext/MathExt.java
===================================================================
--- trunk/Jmol/src/org/jmol/scriptext/MathExt.java      2015-10-09 21:24:05 UTC 
(rev 20813)
+++ trunk/Jmol/src/org/jmol/scriptext/MathExt.java      2015-10-09 22:32:46 UTC 
(rev 20814)
@@ -1144,7 +1144,7 @@
         switch (x1.tok) {
         case T.string:
           String smiles = SV.sValue(x1);
-          if (bs2 != null)
+          if (bs2 != null || isSmiles && args.length == 1)
             return false;
           if (flags.equalsIgnoreCase("mf")) {
             ret = vwr.getSmilesMatcher().getMolecularFormula(smiles, isSMARTS);

Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties      2015-10-09 21:24:05 UTC 
(rev 20813)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties      2015-10-09 22:32:46 UTC 
(rev 20814)
@@ -64,9 +64,10 @@
 
 Jmol.___JmolVersion="14.3.16_2015.10.09"
 
+bug fix:  print 'CCC'.find("SMILES") should through a ScriptException, not a 
Java exception
+
 new feature: Gaussian log file reader reads spin density scalars as 
property_spin
 
-
 JmolVersion="14.3.16_2015.10.06"
 
 new feature: print within(distance, point, array_of_points)

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits

Reply via email to