From: <ha...@us...> - 2010-08-09 05:57:39
|
Revision: 13930 http://jmol.svn.sourceforge.net/jmol/?rev=13930&view=rev Author: hansonr Date: 2010-08-09 05:57:31 +0000 (Mon, 09 Aug 2010) Log Message: ----------- 12.0.5 VERSION # bug fix: SmilesGeneration stereochemistry error # bug fix: "CCCC".find("SMILES","CCCC") should return 1 (other returns 0 and -1) # bug fix: "CCCC".find("SMARTS","CCC") should return [1,5,8,11] (other returns [] and "?" # bug fix: proper "false AND"/"true OR" action where second operand is skipped Modified Paths: -------------- branches/v12_0/Jmol/src/org/jmol/adapter/readers/xtal/ShelxReader.java branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties Modified: branches/v12_0/Jmol/src/org/jmol/adapter/readers/xtal/ShelxReader.java =================================================================== --- branches/v12_0/Jmol/src/org/jmol/adapter/readers/xtal/ShelxReader.java 2010-08-09 04:59:56 UTC (rev 13929) +++ branches/v12_0/Jmol/src/org/jmol/adapter/readers/xtal/ShelxReader.java 2010-08-09 05:57:31 UTC (rev 13930) @@ -230,7 +230,7 @@ float x = parseFloat(tokens[2]); float y = parseFloat(tokens[3]); float z = parseFloat(tokens[4]); - if (elementIndex == Integer.MAX_VALUE || Float.isNaN(x) || Float.isNaN(y) || Float.isNaN(z)) { + if (Float.isNaN(x) || Float.isNaN(y) || Float.isNaN(z)) { Logger.error("skipping line " + line); return; } Modified: branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties 2010-08-09 04:59:56 UTC (rev 13929) +++ branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties 2010-08-09 05:57:31 UTC (rev 13930) @@ -2,7 +2,7 @@ # NOTE: Generally only bug fixes should be entered here. # NOTE: New features should be introduced in the trunk version 12.1.x -version=12.0.5_dev +version=12.0.5 # bug fix: SmilesGeneration stereochemistry error # bug fix: "CCCC".find("SMILES","CCCC") should return 1 (other returns 0 and -1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |