X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FNewickFile.java;h=813ac785e02f4aec76412f757197c72b7fdfee01;hb=f8039f1970f67a753809f451756cb1baa0e05d8d;hp=d6538113ce71a3299fdea3f666181c317cb9345d;hpb=e85b1902d37f75f3b4b68a5f4b8f21b8e7261b1d;p=jalview.git

diff --git a/src/jalview/io/NewickFile.java b/src/jalview/io/NewickFile.java
index d653811..813ac78 100755
--- a/src/jalview/io/NewickFile.java
+++ b/src/jalview/io/NewickFile.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -14,6 +14,7 @@
  * PURPOSE.  See the GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 // NewickFile.java
 // Tree I/O
@@ -357,6 +358,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;