Revision: 21251
          http://sourceforge.net/p/jmol/code/21251
Author:   hansonr
Date:     2016-09-21 12:39:02 +0000 (Wed, 21 Sep 2016)
Log Message:
-----------
Jmol.___JmolVersion="14.6.3_2016.09.21"

bug fix: print compare({1.1}, {2.1}, "MAP", "H") broken in 14.6.0_2016.06.14

Modified Paths:
--------------
    branches/v14_6/Jmol/src/org/jmol/smiles/SmilesMatcher.java
    branches/v14_6/Jmol/src/org/jmol/viewer/Jmol.properties
    trunk/Jmol/src/org/jmol/smiles/SmilesMatcher.java
    trunk/Jmol/src/org/jmol/viewer/Jmol.properties

Modified: branches/v14_6/Jmol/src/org/jmol/smiles/SmilesMatcher.java
===================================================================
--- branches/v14_6/Jmol/src/org/jmol/smiles/SmilesMatcher.java  2016-09-19 
01:16:37 UTC (rev 21250)
+++ branches/v14_6/Jmol/src/org/jmol/smiles/SmilesMatcher.java  2016-09-21 
12:39:02 UTC (rev 21251)
@@ -194,6 +194,7 @@
     InvalidSmilesException.clear();
     target = SmilesParser.cleanPattern(target);
     pattern = SmilesParser.cleanPattern(pattern);
+    // search flags will be set in findPriv
     SmilesSearch search = SmilesParser.newSearch(target, false, true); /// 
smiles chirality is fixed here
     int[][] array = (int[][]) findPriv(pattern, search, flags, MODE_MAP);
     for (int i = array.length; --i >= 0;) {
@@ -496,7 +497,7 @@
         return search.atropKeys;
       case MODE_MAP:
         search.getMaps = true;
-        search.setFlags(flags); // important for COMPARE command - no 
stereochem
+        search.setFlags(flags | search.flags); // important for COMPARE 
command - no stereochem
         Lst<int[]> vl = (Lst<int[]>) search.search();
         return vl.toArray(AU.newInt2(vl.size()));
       }

Modified: branches/v14_6/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_6/Jmol/src/org/jmol/viewer/Jmol.properties     2016-09-19 
01:16:37 UTC (rev 21250)
+++ branches/v14_6/Jmol/src/org/jmol/viewer/Jmol.properties     2016-09-21 
12:39:02 UTC (rev 21251)
@@ -6,7 +6,12 @@
 
 # see also http://chemapps.stolaf.edu/jmol/zip for daily updates       
 
+Jmol.___JmolVersion="14.6.3_2016.09.21"
+
+bug fix: print compare({1.1}, {2.1}, "MAP", "H") broken in 14.6.0_2016.06.14
+
 Jmol.___JmolVersion="14.6.3_2016.09.18"
+released
 
 bug fix: write MENU broken for non-English language (UTF-8 strings not 
correctly encoded using base64)
 bug fix: write PNGJ should not store "#_DOCACHE_" in PNGJ file

Modified: trunk/Jmol/src/org/jmol/smiles/SmilesMatcher.java
===================================================================
--- trunk/Jmol/src/org/jmol/smiles/SmilesMatcher.java   2016-09-19 01:16:37 UTC 
(rev 21250)
+++ trunk/Jmol/src/org/jmol/smiles/SmilesMatcher.java   2016-09-21 12:39:02 UTC 
(rev 21251)
@@ -497,7 +497,7 @@
         return search.atropKeys;
       case MODE_MAP:
         search.getMaps = true;
-        search.setFlags(flags); // important for COMPARE command - no 
stereochem
+        search.setFlags(flags | search.flags); // important for COMPARE 
command - no stereochem
         Lst<int[]> vl = (Lst<int[]>) search.search();
         return vl.toArray(AU.newInt2(vl.size()));
       }

Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties      2016-09-19 01:16:37 UTC 
(rev 21250)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties      2016-09-21 12:39:02 UTC 
(rev 21251)
@@ -47,8 +47,12 @@
  -- sets the echo offset to a specific screen pixel offset
  -- TODO not saved in state
  
+Jmol.___JmolVersion="14.7.3_2016.09.21"
+
+bug fix: print compare({1.1}, {2.1}, "MAP", "H") broken in 14.6.0_2016.06.14
+
 Jmol.___JmolVersion="14.7.3_2016.09.18"
-
+released
 new feature: show chemical formula reads formula from CIF
 
 bug fix: write MENU broken for non-English language (UTF-8 strings not 
correctly encoded using base64)

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

Reply via email to