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

 Package: ggtree

 Type: Package

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

-Version: 1.1.9

+Version: 1.1.10

 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,10 @@

+CHANGES IN VERSION 1.1.10

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

+ o solve overlapping branches for layout = "fan" || "radial",

+   that are coord_polar-ized layouts.

+   see https://github.com/GuangchuangYu/ggtree/issues/6,

+   contributed by Vincent Bonhomme. <2015-07-22, Wed>

+

 CHANGES IN VERSION 1.1.9

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

  o update add_legend to align legend text <2015-07-06, Mon>

@@ -17,6 +17,7 @@

 ##' @importFrom ggplot2 ylab

 ##' @importFrom ggplot2 annotate

 ##' @importFrom ggplot2 scale_x_reverse

+##' @importFrom ggplot2 scale_y_continuous

 ##' @importFrom ggplot2 coord_flip

 ##' @importFrom ggplot2 coord_polar

 ##' @export

@@ -59,6 +60,8 @@ ggtree <- function(tr,

         p <- p + scale_x_reverse() + coord_flip()

     } else if (type == "fan" || type == "radial") {

         p <- p + coord_polar(theta = "y")

+        ## refer to: https://github.com/GuangchuangYu/ggtree/issues/6

+        p <- p + scale_y_continuous(limits=c(0, max(p$data$y)))

     } 

     if (showDistance == FALSE) {

@@ -97,13 +100,13 @@ geom_tree <- function(layout="phylogram", color="black", linetype="solid", size=

     lineend  = "round"

     if (layout == "phylogram" || layout == "fan") {

         if (length(color) != 1) {

-            color <- c(color, color)

+            color <- rep(color, 2) ## c(color, color)

         }

         if (length(linetype) != 1) {

-            linetype <- c(linetype, linetype)

+            linetype <- rep(linetype, 2) ## c(linetype, linetype)

         }

         if (length(size) != 1) {

-            size <- c(size, size)

+            size <- rep(size, 2) ## c(size, size)

         }

         geom_segment(aes(x    = c(x[parent], x[parent]),

                          xend = c(x,         x[parent]),