Revision: 20373
http://sourceforge.net/p/jmol/code/20373
Author: hansonr
Date: 2015-03-09 19:38:50 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.2.13_2015.03.09"
bug fix: show state/xxxx does not work
Modified Paths:
--------------
branches/v14_2/Jmol/src/org/jmol/script/ScriptCompiler.java
branches/v14_2/Jmol/src/org/jmol/scriptext/CmdExt.java
branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: branches/v14_2/Jmol/src/org/jmol/script/ScriptCompiler.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/script/ScriptCompiler.java 2015-03-09
19:38:13 UTC (rev 20372)
+++ branches/v14_2/Jmol/src/org/jmol/script/ScriptCompiler.java 2015-03-09
19:38:50 UTC (rev 20373)
@@ -1886,10 +1886,6 @@
&& !(ch == '-' && ident.equals("=")))
checkUnquotedFileName();
break;
- case T.show:
- if (nTokens == 2 && tokAt(1) == T.state && theTok == T.divide)
- implicitString = true;
- break;
}
return OK;
}
Modified: branches/v14_2/Jmol/src/org/jmol/scriptext/CmdExt.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-03-09
19:38:13 UTC (rev 20372)
+++ branches/v14_2/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-03-09
19:38:50 UTC (rev 20373)
@@ -3972,9 +3972,9 @@
break;
}
name = paramAsStr(2);
- if (name.equals("/") && (len = slen) == 4) {
- name = paramAsStr(3).toLowerCase();
+ if (name.startsWith("/") && (len = slen) == 3) {
if (!chk) {
+ name = name.substring(1).toLowerCase();
String[] info = PT.split(vwr.getStateInfo(), "\n");
SB sb = new SB();
for (int i = 0; i < info.length; i++)
Modified: branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2015-03-09
19:38:13 UTC (rev 20372)
+++ branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2015-03-09
19:38:50 UTC (rev 20373)
@@ -4,7 +4,11 @@
# THIS IS THE RELEASE BRANCH
# BUG FIXES ONLY, PLEASE
-Jmol.___JmolVersion="14.2.13_2015.03.07"
+Jmol.___JmolVersion="14.2.13_2015.03.09"
+
+bug fix: show state/xxxx does not work
+
+JmolVersion="14.2.13_2015.03.07"
synchronized with 14.3.12_2015.03.07
released
@@ -12,7 +16,7 @@
bug fix: reading legacy mapped plane (2ptn-molecular_slice1.jvxl.txt) crashes
Jmol
bug fix: late discovery of mmCIF format does not load secondary structure
-Jmol.___JmolVersion="14.2.12_2015.02.28"
+JmolVersion="14.2.12_2015.02.28"
bug fix: {*}.find("~d~G:C") broken (find with bioSMARTS)
bug fix: reading PNGJ file saved after load with /dssr or /rna3d annotations
ignores annotations
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
