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

 Package: ggtree

 Type: Package

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

-Version: 0.99.6

+Version: 0.99.7

 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.7

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

+ o add angle information for 'fan' layout <2015-01-29, Thu>

+

 CHANGES IN VERSION 0.99.6

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

  o read.beast now supports support values of sets such as {x, y, z} <2015-01-19, Mon>

@@ -23,7 +23,7 @@

 ggtree <- function(tr, showDistance=FALSE, layout="phylogram", ...) {

     d <- x <- y <- NULL

     if (layout == "fan") {

-        layout <- "phylogram"

+        ## layout <- "phylogram"

         type <- "fan"

     } else if (layout == "radial") {

         layout <- "cladogram"

@@ -66,7 +66,7 @@ ggtree <- function(tr, showDistance=FALSE, layout="phylogram", ...) {

 ##' ggplot(tr) + geom_tree()

 geom_tree <- function(layout="phylogram", ...) {

     x <- y <- parent <- NULL

-    if (layout == "phylogram") {

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

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

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

                          y=c(y, y[parent]),

@@ -480,6 +480,13 @@ as.data.frame.phylo_ <- function(x, layout="phylogram",

         res$length[is.na(res$length)] <- 0

     }

     res$branch[is.na(res$branch)] <- 0

+    

+    if (layout == "fan") {

+      idx <- match(1:N, order(res$y))

+      angle <- -360/N * 1:N

+      angle <- angle[idx]

+      res$angle <- angle

+    }

     return(res)

 }