[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/viewer/script Eval.java,1.71,1.72

[Michael T H. <mic...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29180/src/org/openscience/jmol/viewer/script

Modified Files:
	Eval.java 
Log Message:
added 'spacefill ionic', changed simple reader to support charges, added LABEL formatting extensions

Index: Eval.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/script/Eval.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- Eval.java	21 Jan 2004 15:11:12 -0000	1.71
+++ Eval.java	28 Jan 2004 11:51:23 -0000	1.72
@@ -1622,7 +1622,7 @@
   }
 
   void cpk() throws ScriptException {
-    short mar = -999;
+    short mar = 0;
     int tok = Token.on;
     if (statement.length > 1) {
       tok = statement[1].tok;
@@ -1638,7 +1638,6 @@
       mar = -100; // cpk with no args goes to 100%
       break;
     case Token.off:
-      mar = 0;
       break;
     case Token.integer:
       int radiusRasMol = statement[1].intValue;
@@ -1663,6 +1662,13 @@
     case Token.temperature:
       mar = -1000;
       break;
+    case Token.identifier:
+      String t = (String)statement[1].value;
+      if (t.equalsIgnoreCase("ionic")) {
+        mar = -1001;
+        break;
+      }
+
     default:
       booleanOrNumberExpected();
     }