From: <ha...@us...> - 2009-06-17 15:00:09
|
Revision: 11041 http://jmol.svn.sourceforge.net/jmol/?rev=11041&view=rev Author: hansonr Date: 2009-06-17 15:00:08 +0000 (Wed, 17 Jun 2009) Log Message: ----------- version=11.7.42_dev # new feature: support for extended inline if: x = (a ? this : b ? that : c) Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Jmol.properties trunk/Jmol/src/org/jmol/viewer/ScriptMathProcessor.java Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2009-06-16 21:33:42 UTC (rev 11040) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2009-06-17 15:00:08 UTC (rev 11041) @@ -3,6 +3,7 @@ version=11.7.42_dev +# new feature: support for extended inline if: x = (a ? this : b ? that : c) # default change: load trajectory "myfile.top" COORD {first,last,stride} "mdcrd::myfile.trj" defaults to last = -1 ("load all trajectories") not "load one trajectory" # bug fix: gzipped gzip file not read properly. (Jmol-FAH files) # new feature: {*}.modelindex Modified: trunk/Jmol/src/org/jmol/viewer/ScriptMathProcessor.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/ScriptMathProcessor.java 2009-06-16 21:33:42 UTC (rev 11040) +++ trunk/Jmol/src/org/jmol/viewer/ScriptMathProcessor.java 2009-06-17 15:00:08 UTC (rev 11041) @@ -436,7 +436,10 @@ case Token.opIf: // System.out.println("---------IF---------"); boolean isFirst = ScriptVariable.bValue(getX()); - putOp(Token.tokenColon); + if (tok0 == Token.colon) + ifPt--; + else + putOp(Token.tokenColon); putIf(isFirst ? 'T' : 'F'); skipping = !isFirst; wasX = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |