Revision: 20861
http://sourceforge.net/p/jmol/code/20861
Author: hansonr
Date: 2015-11-07 00:19:47 +0000 (Sat, 07 Nov 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.4.0_2015.11.06"
bug fix: restoring bonds to a model having fewer bonds than the model for which
they were saved throws an exception
bug fix: mCIF does not read incommensurately modulated mCIF files
bug fix: WRITE xxx.ZIP crashes Jmol
bug fix: POLYHEDRA ... {xxx} TO {yyy} not working
Modified Paths:
--------------
branches/v14_4/Jmol/src/org/jmol/scriptext/CmdExt.java
branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: branches/v14_4/Jmol/src/org/jmol/scriptext/CmdExt.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-11-07
00:19:29 UTC (rev 20860)
+++ branches/v14_4/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-11-07
00:19:47 UTC (rev 20861)
@@ -3269,10 +3269,10 @@
case T.to:
if (nAtomSets > 1)
invPO();
- if ((tokAt(++i) == T.bitset || tokAt(i) == T.expressionBegin)
- && !needsGenerating) {
+ nAtomSets = 3; // don't allow two of these
+ if (tokAt(++i) == T.bitset || tokAt(i) == T.expressionBegin) {
// select... polyhedron .... to ....
- propertyName = "toBitSet";
+ propertyName = (needsGenerating ? "to" : "toBitSet");
propertyValue = atomExpressionAt(i);
} else if (eval.isArrayParameter(i)) {
// select... polyhedron .... to [...]
@@ -3302,8 +3302,7 @@
}
propertyValue = atomExpressionAt(i);
i = eval.iToken;
- if (i + 1 == slen)
- needsGenerating = true;
+ needsGenerating |= (i + 1 == slen);
break;
case T.color:
case T.translucent:
Modified: branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2015-11-07
00:19:29 UTC (rev 20860)
+++ branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2015-11-07
00:19:47 UTC (rev 20861)
@@ -8,10 +8,12 @@
# see also http://chemapps.stolaf.edu/jmol/zip for daily updates
-Jmol.___JmolVersion="14.4.0_2015.11.05"
+Jmol.___JmolVersion="14.4.0_2015.11.06"
+bug fix: restoring bonds to a model having fewer bonds than the model for
which they were saved throws an exception
bug fix: mCIF does not read incommensurately modulated mCIF files
bug fix: WRITE xxx.ZIP crashes Jmol
+bug fix: POLYHEDRA ... {xxx} TO {yyy} not working
JmolVersion="14.4.0_2015.11.03"
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
