@@ -1,7 +1,7 @@

 Package: ggtree

 Type: Package

 Title: a phylogenetic tree viewer for different types of tree annotations

-Version: 0.99.21

+Version: 0.99.22

 Author: Guangchuang Yu

 Maintainer: Guangchuang Yu <guangchuangyu@gmail.com>

 Description: ggtree extends the ggplot2 plotting system which implemented the

@@ -1,3 +1,7 @@

+CHANGES IN VERSION 0.99.22

+------------------------

+ o remove quote in beast tip/node labels <2015-03-10, Tue>

+ 

 CHANGES IN VERSION 0.99.21

 ------------------------

  o fixed downloading png file in Windows platform, should explicitly setting mode="wb". <2015-03-03, Tue>

@@ -15,11 +15,19 @@ read.beast <- function(file) {

     stats <- read.stats_beast(file)

     fields <- sub("_lower|_upper", "", names(stats)) %>% unique

     fields %<>% `[`(.!="node")

+

+    phylo <- read.nexus(file)

+    if (!is.null(phylo$node.label)) {

+        phylo$node.label %<>% gsub("\"*'*", "", .)

+    }

+    if ( !is.null(phylo$tip.label)) {

+        phylo$tip.label %<>% gsub("\"*'*", "", .) 

+    }

     new("beast",

         fields      = fields,

         treetext    = read.treetext_beast(file),

-        phylo       = read.nexus(file),

+        phylo       = phylo,

         translation = read.trans_beast(file),

         stats       = stats,

         file        = file

@@ -124,7 +124,8 @@ fortify.beast <- function(model, data,

             len <- sapply(stats[,ii], length)

             if (any(len > 1)) {

                 stats[,ii] %<>% sapply(., function(x) {

-                    y <- unlist(x) %>% as.character %>% gsub("\"", "", .)

+                    y <- unlist(x) %>% as.character %>%

+                        gsub("\"", "", .) %>% gsub("'", "", .)

                     if (length(y) == 1) {

                         return(y)

                     } else {

@@ -132,7 +133,8 @@ fortify.beast <- function(model, data,

                     }

                 })

             } else {

-                stats[,ii] %<>% unlist %>% as.character %>% gsub("\"", "", .)

+                stats[,ii] %<>% unlist %>% as.character %>%

+                    gsub("\"", "", .) %>% gsub("'", "", .)

             }

             next

         }