Merge branch 'JAL-1378_jb2.1cli' into RNAalifold

[jalview.git] / src / jalview / io / NewickFile.java

diff --git a/src/jalview/io/NewickFile.java b/src/jalview/io/NewickFile.java
index d653811..9ed1491 100755 (executable)
--- a/src/jalview/io/NewickFile.java
+++ b/src/jalview/io/NewickFile.java
@@ -357,6 +357,10 @@ public class NewickFile extends FileParse
           int nl = qnodename.stringMatched().length();
           nodename = new String(qnodename.stringMatched().substring(1,
                   nl - 1));
+          // unpack any escaped colons
+          com.stevesoft.pat.Regex xpandquotes = com.stevesoft.pat.Regex.perlCode("s/''/'/");
+          String widernodename = xpandquotes.replaceAll(nodename);
+          nodename=widernodename;
           // jump to after end of quoted nodename
           nextcp = fcp + nl + 1;
           parsednodename=true;