@@ -17,3 +17,5 @@ ggtree_sticker.R

 site_src

 ggtree.png

 ^CONDUCT\.md$

+CONTRIBUTORS.md

+CONTRIBUTING.md

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

 # Bradley Jones

-

++ ape unrooted layout

+  - <https://github.com/YuLab-SMU/ggtree/issues/272>

 + `ggdensitree` function

   - <https://github.com/YuLab-SMU/ggtree/pull/253>

 + made data usable with treedata in 'equal_angle' and 'daylight' layouts 

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

 Package: ggtree

 Type: Package

 Title: an R package for visualization of tree and annotation data

-Version: 2.1.1

+Version: 2.1.2

 Authors@R: c(

 	   person("Guangchuang", "Yu",     email = "guangchuangyu@gmail.com", role = c("aut", "cre", "cph"), comment = c(ORCID = "0000-0002-6485-8781")),

 	   person("Tommy Tsan-Yuk", "Lam", email = "tylam.tommy@gmail.com",   role = c("aut", "ths")),

@@ -1,3 +1,11 @@

+# ggtree 2.1.2

+

++ bug fixed of determined layout for `ggplot(tree) + geom_tiplab()` (2020-01-26, Sun)

+  - <https://github.com/YuLab-SMU/ggtree/issues/272>

++ set unrooted layout to use `coord_fixed` by default (2020-01-25, Sat)

++ if `layout = "ape"`, use ape unrooted layout 

+  - <https://github.com/YuLab-SMU/ggtree/issues/272>

+

 # ggtree 2.1.1

 + export `geom_highlight` as an alias of `geom_hilight` (2020-01-08, Wed)

@@ -63,6 +63,7 @@ fortify.phylo <- function(model, data,

     }

     res <- scaleY(as.phylo(model), res, yscale, layout, ...)

     class(res) <- c("tbl_tree", class(res))

+    attr(res, "layout") <- layout

     return(res)

 }

@@ -84,6 +85,7 @@ fortify.multiPhylo <-  function(model, data,

     df <- do.call("rbind", df.list)

     df$.id <- rep(names(df.list), times=sapply(df.list, nrow))

     df$.id <- factor(df$.id, levels=names(df.list))

+    attr(df, "layout") <- layout

     return(df)

 }

@@ -155,6 +155,9 @@ ggplot_add.facet_plot <- function(object, plot, object_name) {

 ##' @export

 ggplot_add.tiplab <- function(object, plot, object_name) {

     layout <- get("layout", envir = plot$plot_env)

+    if (!is(layout, "character")) {

+        layout <- attr(plot$data, "layout")

+    }

     if (layout == 'circular' || layout == 'fan') {

         ly <- do.call(geom_tiplab_circular, object)

     } else {

@@ -1189,8 +1189,9 @@ re_assign_ycoord_df <- function(df, currentNode) {

     return(df)

 }

+

 layoutApe <- function(model, branch.length="branch.length") {

-	tree <- as.phylo(model) %>% reorder("postorder")

+	tree <- as.phylo(model) %>% stats::reorder("postorder")

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

 		if (anyNA(tree$edge.length)) {