Revision: 20750
http://sourceforge.net/p/jmol/code/20750
Author: hansonr
Date: 2015-08-31 19:59:08 +0000 (Mon, 31 Aug 2015)
Log Message:
-----------
format fix for cfi
Modified Paths:
--------------
branches/nbo/Jmol/src/org/jmol/scriptext/MathExt.java
Modified: branches/nbo/Jmol/src/org/jmol/scriptext/MathExt.java
===================================================================
--- branches/nbo/Jmol/src/org/jmol/scriptext/MathExt.java 2015-08-31
18:04:43 UTC (rev 20749)
+++ branches/nbo/Jmol/src/org/jmol/scriptext/MathExt.java 2015-08-31
19:59:08 UTC (rev 20750)
@@ -1333,10 +1333,10 @@
// format("array", x)
SV x1 = (args.length < 2 || intValue == T.format ? mp.getX() : null);
String format = (args.length == 0 ? "%U" : args[0].tok == T.varray ? null
: SV.sValue(args[0]));
- if (!isLabel && args.length > 0 && x1 != null && format != null) {
+ if (!isLabel && args.length > 0 && x1 != null && x1.tok != T.bitset &&
format != null) {
// x1.format(["energy", "pointGroup"]);
// x1.format("%5.3f %5s", ["energy", "pointGroup"])
- // but not x1.format()
+ // but not x1.format() or {*}.format(....)
if (args.length == 2) {
Lst<SV> listIn = x1.getList();
Lst<SV> formatList = args[1].getList();
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
