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

 Package: ggtree

 Type: Package

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

-Version: 1.3.15

+Version: 1.3.16

 Author: Guangchuang Yu and Tommy Tsan-Yuk Lam

 Maintainer: Guangchuang Yu <guangchuangyu@gmail.com>

 Description: ggtree extends the ggplot2 plotting system which implemented the

@@ -1,3 +1,8 @@

+CHANGES IN VERSION 1.3.16

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

+ o update fortify.phylo to work with phylo that has missing value of edge length <2016-04-21, Thu>

+   + https://github.com/GuangchuangYu/ggtree/issues/54

+ 

 CHANGES IN VERSION 1.3.15

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

  o geom_tiplab2 supports parameter hjust <2016-04-18, Mon>

@@ -16,7 +16,7 @@ read.nhx <- function(file) {

     }

     treetext %<>% gsub(" ", "",. )

-    phylo <- read.tree(file)

+    phylo <- read.tree(text=treetext)

     nnode <- phylo$Nnode + Ntip(phylo)

     nlab <- paste("X", 1:nnode, sep="")

     tree2 <- treetext

@@ -460,6 +460,13 @@ fortify.phylo <- function(model, data, layout="rectangular",

     } else {

         tree <- model

     }

+

+    if (! is.null(tree$edge.length)) {

+        if (any(is.na(tree$edge.length))) {

+            warning("'edge.length' contains NA values...\n## setting 'edge.length' to NULL automatically when plotting the tree...")

+            tree$edge.length <- NULL

+        }

+    }

     df <- as.data.frame(tree, layout=layout, ...)

     idx <- is.na(df$parent)

@@ -525,6 +532,7 @@ as.data.frame.phylo_ <- function(x, layout="rectangular",

     edge <- as.data.frame(x[["edge"]])

     colnames(edge) <- c("parent", "node")

+    

     if (! is.null(x$edge.length)) {

         edge$length <- x$edge.length

         if (branch.length == "none") {