From: <ha...@us...> - 2011-05-17 15:37:55
|
Revision: 15486 http://jmol.svn.sourceforge.net/jmol/?rev=15486&view=rev Author: hansonr Date: 2011-05-17 15:37:48 +0000 (Tue, 17 May 2011) Log Message: ----------- version=12.0.44_dev # bug fix: isosurface plane x=-1 (with no spaces) not accepted Modified Paths: -------------- branches/v12_0/Jmol/src/org/jmol/script/ScriptCompiler.java branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties Modified: branches/v12_0/Jmol/src/org/jmol/script/ScriptCompiler.java =================================================================== --- branches/v12_0/Jmol/src/org/jmol/script/ScriptCompiler.java 2011-05-17 15:37:20 UTC (rev 15485) +++ branches/v12_0/Jmol/src/org/jmol/script/ScriptCompiler.java 2011-05-17 15:37:48 UTC (rev 15486) @@ -1653,8 +1653,9 @@ case Token.pmesh: case Token.isosurface: // isosurface ... name.xxx + char ch = nextChar(); if (parenCount == 0 && bracketCount == 0 - && ".:/\\+-!?".indexOf(nextChar()) >= 0) + && ".:/\\+-!?".indexOf(ch) >= 0 && !(ch == '-' && ident.equals("="))) checkUnquotedFileName(); } return OK; Modified: branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties 2011-05-17 15:37:20 UTC (rev 15485) +++ branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties 2011-05-17 15:37:48 UTC (rev 15486) @@ -4,6 +4,7 @@ version=12.0.44_dev +# bug fix: isosurface plane x=-1 (with no spaces) not accepted # bug fix: x = write("VRML") should give VRML contents and not write to disk # bug fix: defined @ variables not indicating changes when models are deleted # bug fix: calculate structure RAMACHANDRAN broken in 12.0.18 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |