-
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merged PR 383: Chem4Word 2020 - Release 1 (V3.1.11)
* Set Transport Layer Security TLS 1.2 protocol to prevent https errors * Improved code handling updating of Content Control(s) * #70 - Improved look of Exterior Double Bond in ACME * Library now refreshes properly after add / remove; No longer any need to close and open MS Word * Isotope Labels now clear on change of element * Improvements to double bond handling in ACME * Added telemetry to ACME Related work items: #736, #751, #752, #755
- Loading branch information
1 parent
dbc5c3f
commit bfd7ea4
Showing
39 changed files
with
254 additions
and
279 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
src/Chem4WordTests/Resources/CML/Trimethylamine-MinusArrays.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<?xml version="1.0" encoding="utf-8" ?> | ||
<cml:cml xmlns:conventions="http://www.xml-cml.org/convention/" xmlns:cml="http://www.xml-cml.org/schema" xmlns:cmlDict="http://www.xml-cml.org/dictionary/cml/" xmlns:nameDict="http://www.xml-cml.org/dictionary/cml/name/" xmlns:c4w="http://www.chem4word.com/cml" conventions="convention:molecular"> | ||
<cml:molecule id="m1"> | ||
<cml:formula id="m1.f0" concise="C 3 H 9 N 1" /> | ||
<cml:atom id="a1" elementType="C" x2="482.679492" y2="390.0" /> | ||
<cml:atom id="a2" elementType="N" x2="500.0" y2="380.0" /> | ||
<cml:atom id="a3" elementType="C" x2="517.320508" y2="390.0" /> | ||
<cml:atom id="a4" elementType="C" x2="500.0" y2="360.0" /> | ||
<cml:bond id="b1" atomRefs2="a1 a2" order="S" /> | ||
<cml:bond id="b2" atomRefs2="a2 a3" order="S" /> | ||
<cml:bond id="b3" atomRefs2="a2 a4" order="S" /> | ||
</cml:molecule> | ||
</cml:cml> |
17 changes: 17 additions & 0 deletions
17
src/Chem4WordTests/Resources/CML/Trimethylamine-MinusNamespace.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
<?xml version="1.0" encoding="utf-8" ?> | ||
<cml xmlns:conventions="http://www.xml-cml.org/convention/" xmlns:cml="http://www.xml-cml.org/schema" xmlns:cmlDict="http://www.xml-cml.org/dictionary/cml/" xmlns:nameDict="http://www.xml-cml.org/dictionary/cml/name/" xmlns:c4w="http://www.chem4word.com/cml" conventions="convention:molecular"> | ||
<molecule id="m1"> | ||
<formula id="m1.f0" concise="C 3 H 9 N 1" /> | ||
<atomArray> | ||
<atom id="a1" elementType="C" x2="482.679492" y2="390.0" /> | ||
<atom id="a2" elementType="N" x2="500.0" y2="380.0" /> | ||
<atom id="a3" elementType="C" x2="517.320508" y2="390.0" /> | ||
<atom id="a4" elementType="C" x2="500.0" y2="360.0" /> | ||
</atomArray> | ||
<bondArray> | ||
<bond id="b1" atomRefs2="a1 a2" order="S" /> | ||
<bond id="b2" atomRefs2="a2 a3" order="S" /> | ||
<bond id="b3" atomRefs2="a2 a4" order="S" /> | ||
</bondArray> | ||
</molecule> | ||
</cml> |
15 changes: 15 additions & 0 deletions
15
src/Chem4WordTests/Resources/CML/Trimethylamine-MoleculeRoot.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
<?xml version="1.0" encoding="utf-8" ?> | ||
<molecule id="m1" xmlns:cml="http://www.xml-cml.org/schema"> | ||
<formula id="m1.f0" concise="C 3 H 9 N 1" /> | ||
<atomArray> | ||
<atom id="a1" elementType="C" x2="482.679492" y2="390.0" /> | ||
<atom id="a2" elementType="N" x2="500.0" y2="380.0" /> | ||
<atom id="a3" elementType="C" x2="517.320508" y2="390.0" /> | ||
<atom id="a4" elementType="C" x2="500.0" y2="360.0" /> | ||
</atomArray> | ||
<bondArray> | ||
<bond id="b1" atomRefs2="a1 a2" order="S" /> | ||
<bond id="b2" atomRefs2="a2 a3" order="S" /> | ||
<bond id="b3" atomRefs2="a2 a4" order="S" /> | ||
</bondArray> | ||
</molecule> |
17 changes: 17 additions & 0 deletions
17
src/Chem4WordTests/Resources/CML/Trimethylamine-Normal.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
<?xml version="1.0" encoding="utf-8" ?> | ||
<cml:cml xmlns:conventions="http://www.xml-cml.org/convention/" xmlns:cml="http://www.xml-cml.org/schema" xmlns:cmlDict="http://www.xml-cml.org/dictionary/cml/" xmlns:nameDict="http://www.xml-cml.org/dictionary/cml/name/" xmlns:c4w="http://www.chem4word.com/cml" conventions="convention:molecular"> | ||
<cml:molecule id="m1"> | ||
<cml:formula id="m1.f0" concise="C 3 H 9 N 1" /> | ||
<cml:atomArray> | ||
<cml:atom id="a1" elementType="C" x2="482.679492" y2="390.0" /> | ||
<cml:atom id="a2" elementType="N" x2="500.0" y2="380.0" /> | ||
<cml:atom id="a3" elementType="C" x2="517.320508" y2="390.0" /> | ||
<cml:atom id="a4" elementType="C" x2="500.0" y2="360.0" /> | ||
</cml:atomArray> | ||
<cml:bondArray> | ||
<cml:bond id="b1" atomRefs2="a1 a2" order="S" /> | ||
<cml:bond id="b2" atomRefs2="a2 a3" order="S" /> | ||
<cml:bond id="b3" atomRefs2="a2 a4" order="S" /> | ||
</cml:bondArray> | ||
</cml:molecule> | ||
</cml:cml> |
Oops, something went wrong.