From f2f02e400315ea47a86161e9d46295272454fa98 Mon Sep 17 00:00:00 2001 From: John May Date: Thu, 22 Sep 2016 13:30:11 +0100 Subject: [PATCH] Organise and improve abbreviation tokens. --- .../standard/AbbreviationLabel.java | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/AbbreviationLabel.java b/display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/AbbreviationLabel.java index 9de86cb6fc0..f2060b48dc8 100644 --- a/display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/AbbreviationLabel.java +++ b/display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/AbbreviationLabel.java @@ -91,18 +91,21 @@ final class AbbreviationLabel { // OTHER DEALINGS IN THE SOFTWARE. // // For more information, please refer to - private final static String[] SYMBOL_LIST = new String[]{"acac", "Ace", "Acetyl", "Acyl", "Ad", "All", "Alloc", "Allyl", - "Amyl", "AOC", "BDMS", "Benzoyl", "Benzyl", "Bn", "BOC", - "Boc", "BOM", "Bromo", "Bs", "Bu", "But", "Butyl", "Bz", - "Bzl", "Cbz", "Chloro", "CoA", "D", "Dan", "Dansyl", - "DEIPS", "DEM", "Dip", "Dmb", "DPA", "DTBMS", "EE", "EOM", - "Et", "Ethyl", "Fluoro", "FMOC", "Fmoc", "Formyl", - "Heptyl", "Hexyl", "Iodo", "IPDMS", "Me", "MEM", "Mesityl", - "Mesyl", "Methoxy", "Methyl", "MOM", "Ms", "Nitro", "Oct", - "Octyl", "PAB", "Pentyl", "Ph", "Phenyl", "Pivaloyl", - "PMB", "Pro", "Propargyl", "Propyl", "Pv", "R", "SEM", "T", - "TBDMS", "TBDPS", "TES", "Tf", "THP", "THPO", "TIPS", - "TMS", "Tos", "Tosyl", "Tr", "Troc", "Vinyl", "Voc", "Z"}; + private final static String[] SYMBOL_LIST = new String[]{"acac", "Ace", "Acetyl", "Acyl", "Ad", "All", "Alloc", "Allyl", "Amyl", "AOC", + "BDMS", "Benzoyl", "Benzyl", "Bn", "BOC", "Boc", "BOM", "Bromo", "Bs", "Bu", "But", "Butyl", "Bz", "Bzl", + "Car", "Cbz", "Chloro", "CoA", "Cy", + "dppf", "dppp", "dba", "D", "Dan", "Dansyl", "DEIPS", "DEM", "Dip", "Dmb", "DPA", "DTBMS", + "EE", "EOM", "Et", "Ethyl", + "Fluoro", "FMOC", "Fmoc", "Formyl", + "Heptyl", "Hexyl", + "Iodo", "IPDMS", + "Me", "MEM", "Mesityl", "Mesyl", "Methoxy", "Methyl", "MOM", "Ms", + "Nitro", + "Oct", "Octyl", + "PAB", "Pentyl", "Ph", "Phenyl", "Pivaloyl", "PMB", "Pro", "Propargyl", "Propyl", "Pv", + "R", "SEM", + "T", "TBDMS", "TBDPS", "TES", "Tf", "THP", "THPO", "TIPS", "TMS", "Tos", "Tol", "Tosyl", "Tr", "Troc", + "Vinyl", "Voc", "Z"}; private static Trie PREFIX_TRIE = new Trie(); private static Trie ITAL_PREFIX_TRIE = new Trie();