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

 CHANGES IN VERSION 1.7.7

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

- o geom_cladelabel support parse="emoji" <2017-02-16, Thu>

+ o supports parse="emoji" in geom_cladelabel, geom_text2, geom_label2, geom_tiplab, geom_tiplab2 <2017-02-16, Thu>

  o aes(subset) now support logical vector contains NA <2017-02-16, Thu>

  o add legend transparency to theme_transparent <2017-02-13, Mon>

    + <https://github.com/GuangchuangYu/ggtree/pull/112>

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

 ##' @param data A layer specific dataset -

 ##'             only needed if you want to override he plot defaults.

 ##' @param ... other arguments passed on to 'layer'

+##' @param family sans by default, can be any supported font

 ##' @param parse if TRUE, the labels will be passd into expressions

 ##' @param nudge_x horizontal adjustment

 ##' @param nudge_y vertical adjustment

@@ -24,6 +25,7 @@

 ##' @author Guangchuang Yu

 geom_label2 <- function(mapping = NULL, data = NULL,

                         ...,

+                        family = "sans",

                         parse = FALSE,

                         nudge_x = 0,

                         nudge_y = 0,

@@ -51,6 +53,15 @@ geom_label2 <- function(mapping = NULL, data = NULL,

         mapping <- modifyList(mapping, default_aes)

     }

+    if (parse == "emoji") {

+        label_aes <- aes_string(label=paste0("suppressMessages(emoji(", as.list(mapping)$label,"))"))

+        mapping <- modifyList(mapping, label_aes)

+        emoji <- get_fun_from_pkg("emojifont", "emoji")

+        parse <- FALSE

+        family <- "OpenSansEmoji"

+    }

+

+

     layer(

         data = data,

         mapping = mapping,

@@ -61,6 +72,7 @@ geom_label2 <- function(mapping = NULL, data = NULL,

         inherit.aes = inherit.aes,

         params = list(

             parse = parse,

+            family = family,

             label.padding = label.padding,

             label.r = label.r,

             label.size = label.size,

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

 ##' @param data A layer specific dataset -

 ##'             only needed if you want to override he plot defaults.

 ##' @param position The position adjustment to use for overlapping points on this layer

+##' @param family sans by default, can be any supported font

 ##' @param parse if TRUE, the labels will be passd into expressions

 ##' @param na.rm logical

 ##' @param show.legend logical

@@ -17,13 +18,14 @@

 ##' @return text layer

 ##' @importFrom ggplot2 layer

 ##' @importFrom ggplot2 position_nudge

+##' @importFrom ggplot2 aes_string

 ##' @export

 ##' @seealso

 ##' \link[ggplot2]{geom_text}

 ##' @author Guangchuang Yu

 geom_text2 <- function(mapping = NULL, data = NULL,

-                       position = "identity", parse = FALSE, na.rm=TRUE, show.legend = NA,

-                       inherit.aes = TRUE,

+                       position = "identity", family="sans", parse = FALSE,

+                       na.rm=TRUE, show.legend = NA, inherit.aes = TRUE,

                        ..., nudge_x = 0, nudge_y = 0, check_overlap = FALSE) {

     if (!missing(nudge_x) || !missing(nudge_y)) {

@@ -41,6 +43,14 @@ geom_text2 <- function(mapping = NULL, data = NULL,

         mapping <- modifyList(mapping, default_aes)

     }

+    if (parse == "emoji") {

+        label_aes <- aes_string(label=paste0("suppressMessages(emoji(", as.list(mapping)$label,"))"))

+        mapping <- modifyList(mapping, label_aes)

+        emoji <- get_fun_from_pkg("emojifont", "emoji")

+        parse <- FALSE

+        family <- "OpenSansEmoji"

+    }

+

     layer(

         data = data,

         mapping = mapping,

@@ -50,10 +60,11 @@ geom_text2 <- function(mapping = NULL, data = NULL,

         show.legend = show.legend,

         inherit.aes = inherit.aes,

         params = list(

-          parse = parse,

-          check_overlap = check_overlap,

-          na.rm = na.rm,

-          ...

+            parse = parse,

+            family = family,

+            check_overlap = check_overlap,

+            na.rm = na.rm,

+            ...

         ),

         check.aes = FALSE

     )

@@ -4,10 +4,10 @@

 \alias{geom_label2}

 \title{geom_text2}

 \usage{

-geom_label2(mapping = NULL, data = NULL, ..., parse = FALSE,

-  nudge_x = 0, nudge_y = 0, label.padding = unit(0.25, "lines"),

-  label.r = unit(0.15, "lines"), label.size = 0.25, na.rm = TRUE,

-  show.legend = NA, inherit.aes = TRUE)

+geom_label2(mapping = NULL, data = NULL, ..., family = "sans",

+  parse = FALSE, nudge_x = 0, nudge_y = 0, label.padding = unit(0.25,

+  "lines"), label.r = unit(0.15, "lines"), label.size = 0.25,

+  na.rm = TRUE, show.legend = NA, inherit.aes = TRUE)

 }

 \arguments{

 \item{mapping}{the aesthetic mapping}

@@ -17,6 +17,8 @@ only needed if you want to override he plot defaults.}

 \item{...}{other arguments passed on to 'layer'}

+\item{family}{sans by default, can be any supported font}

+

 \item{parse}{if TRUE, the labels will be passd into expressions}

 \item{nudge_x}{horizontal adjustment}

@@ -5,8 +5,9 @@

 \title{geom_text2}

 \usage{

 geom_text2(mapping = NULL, data = NULL, position = "identity",

-  parse = FALSE, na.rm = TRUE, show.legend = NA, inherit.aes = TRUE,

-  ..., nudge_x = 0, nudge_y = 0, check_overlap = FALSE)

+  family = "sans", parse = FALSE, na.rm = TRUE, show.legend = NA,

+  inherit.aes = TRUE, ..., nudge_x = 0, nudge_y = 0,

+  check_overlap = FALSE)

 }

 \arguments{

 \item{mapping}{the aesthetic mapping}

@@ -16,6 +17,8 @@ only needed if you want to override he plot defaults.}

 \item{position}{The position adjustment to use for overlapping points on this layer}

+\item{family}{sans by default, can be any supported font}

+

 \item{parse}{if TRUE, the labels will be passd into expressions}

 \item{na.rm}{logical}