Revision: 20843
http://sourceforge.net/p/jmol/code/20843
Author: hansonr
Date: 2015-10-22 12:07:40 +0000 (Thu, 22 Oct 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.4.0_2015.10.22"
bug fix: CIF parser fails to read CIF files containing only a single (non-loop)
_struct_ref_seq_dif.align_id
bug fix: WRITE .... AS does not properly allow for unquoted file name
Modified Paths:
--------------
branches/v14_4/Jmol/src/javajs/util/CifDataParser.java
branches/v14_4/Jmol/src/org/jmol/script/ScriptCompiler.java
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/javajs/util/CifDataParser.java
===================================================================
--- branches/v14_4/Jmol/src/javajs/util/CifDataParser.java 2015-10-21
05:50:24 UTC (rev 20842)
+++ branches/v14_4/Jmol/src/javajs/util/CifDataParser.java 2015-10-22
12:07:40 UTC (rev 20843)
@@ -518,10 +518,8 @@
}
Integer iField = htFields.get(fixKey(key));
i = (iField == null ? NONE : iField.intValue());
- if ((col2key[pt] = i) != NONE) {
- key2col[i] = pt;
- columnData[i] = data;
- }
+ if ((col2key[pt] = i) != NONE)
+ columnData[key2col[i] = pt] = data;
if ((s = peekToken()) == null || !s.startsWith(str0))
break;
key = null;
Modified: branches/v14_4/Jmol/src/org/jmol/script/ScriptCompiler.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/script/ScriptCompiler.java 2015-10-21
05:50:24 UTC (rev 20842)
+++ branches/v14_4/Jmol/src/org/jmol/script/ScriptCompiler.java 2015-10-22
12:07:40 UTC (rev 20843)
@@ -1258,14 +1258,15 @@
return OK;
}
if (lookingAtImpliedString(true, true, true)) {
- int pt = cchToken;
String str = script.substring(ichToken, ichToken + cchToken);
+ int pt = str.indexOf(" as ");
+ if (pt > 0)
+ str = str.substring(0, cchToken = pt);
if (str.indexOf(" ") < 0 && str.indexOf(".") >= 0) {
addTokenToPrefix(T.o(T.string, str));
iHaveQuotedString = true;
return CONTINUE;
}
- cchToken = pt;
}
}
break;
Modified: branches/v14_4/Jmol/src/org/jmol/scriptext/CmdExt.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-10-21
05:50:24 UTC (rev 20842)
+++ branches/v14_4/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-10-22
12:07:40 UTC (rev 20843)
@@ -3657,11 +3657,12 @@
fileName = SV.sValue(tokenAt(pt, args));
if (fileName.equalsIgnoreCase("clipboard") ||
!vwr.haveAccess(ACCESS.ALL))
fileName = null;
- else if (isCommand && argCount != slen && tokAt(pt + 1) == T.per
- && pt + 3 == argCount) {
- pt += 2;
- fileName += "." + SV.sValue(tokenAt(pt, args));
- }
+// else if (isCommand && argCount != slen
+// && (tokAt(pt + 1) == T.per || tokAt(pt + 1) == T.colon)) {
+// fileName = "";
+// while (pt < argCount)
+// fileName += SV.sValue(tokenAt(pt++, args));
+// }
break;
default:
invArg();
Modified: branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2015-10-21
05:50:24 UTC (rev 20842)
+++ branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2015-10-22
12:07:40 UTC (rev 20843)
@@ -7,8 +7,17 @@
# see also http://chemapps.stolaf.edu/jmol/zip for daily updates
-Jmol.___JmolVersion="14.4.0_2015.10.20"
+Jmol.___JmolVersion="14.4.0_2015.10.22"
+bug fix: CIF parser fails to read CIF files containing only a single
(non-loop) _struct_ref_seq_dif.align_id
+bug fix: WRITE .... AS does not properly allow for unquoted file name
+
+JmolVersion="14.4.0_2015.10.21"
+
+bug fix: write c:/temp..... AS PNGJ does not work without quotes that way;
it should
+
+JmolVersion="14.4.0_2015.10.20"
+
bug fix: set platformSpeed 1 for pmesh fails
bug fix: polyhedron EDGES fails
bug fix: @{ {"hash":{0.1 0.1 0.1},...} } fails (attempts to turn "," into "OR")
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
