Revision: 20737
http://sourceforge.net/p/jmol/code/20737
Author: hansonr
Date: 2015-08-25 21:22:58 +0000 (Tue, 25 Aug 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.16_2015.08.25b"
bug fix: {3/, 2/, 1/} notation broken
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/script/ScriptTokenParser.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: trunk/Jmol/src/org/jmol/script/ScriptTokenParser.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptTokenParser.java 2015-08-25
14:19:54 UTC (rev 20736)
+++ trunk/Jmol/src/org/jmol/script/ScriptTokenParser.java 2015-08-25
21:22:58 UTC (rev 20737)
@@ -1377,9 +1377,8 @@
/**
- * process /1 /1.1 /*
+ * process /1 /1.1 / * or just /
*
- * no longer accept just "/" here for implicit /1
*
* @return true if no error
*/
@@ -1394,11 +1393,12 @@
.valueOf(getToken().intValue)));
case T.decimal:
return generateResidueSpecCode(T.tv(T.spec_model,
fixModelSpec(getToken()), theValue));
-// case T.comma:
-// case T.rightbrace:
-// case T.nada:
-// return generateResidueSpecCode(T.o(T.spec_model, Integer
-// .valueOf(1)));
+ case T.comma:
+ case T.rightbrace:
+ case T.nada:
+ // these are necessary to allow for {1 1 1/} or {1/,1/,1} in fractional
coordinates
+ return generateResidueSpecCode(T.o(T.spec_model, Integer
+ .valueOf(1)));
}
return error(ERROR_invalidModelSpecification);
}
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-08-25 14:19:54 UTC
(rev 20736)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-08-25 21:22:58 UTC
(rev 20737)
@@ -59,8 +59,13 @@
TODO: image off stops JSmol
TODO: Rolf's errors in Safari due to move + zoomto
-Jmol.___JmolVersion="14.3.16_2015.08.25"
+Jmol.___JmolVersion="14.3.16_2015.08.25b"
+bug fix: {3/, 2/, 1/} notation broken
+
+JmolVersion="14.3.16_2015.08.25"
+
+
bug fix: JmolThread should use setTimeout in resumeEval
new feature: JmolSMILES $(.x:1,2,3,4,5,6,7,8)
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
