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

 CHANGES IN VERSION 1.3.15

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

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

  o geom_tiplab and geom_tiplab2 support using geom_label2 by passing geom="label" <2016-04-07, Thu>

  o geom_label2 that support subsetting <2016-04-07, Thu>

  o geom_tiplab2 for adding tip label of circular layout <2016-04-06, Wed>

@@ -38,7 +38,7 @@ geom_tiplab <- function(mapping=NULL, hjust = 0, align = FALSE, linetype = "dott

     if (align && (!is.na(linetype) && !is.null(linetype))) {

         dot_mapping <- aes(xend=x+diff(range(x, na.rm=TRUE))/200, x=max(x, na.rm=TRUE), y=y, yend=y, subset=isTip)

         if (!is.null(mapping)) {

-            dot_mapping <- modifyList(dot_mapping, mapping)

+            dot_mapping <- modifyList(mapping, dot_mapping)

         }

     } 

@@ -63,12 +63,13 @@ geom_tiplab <- function(mapping=NULL, hjust = 0, align = FALSE, linetype = "dott

 ##' 

 ##' @title geom_tiplab2

 ##' @param mapping aes mapping

+##' @param hjust horizontal adjustment

 ##' @param ... additional parameter, see geom_tiplab

 ##' @return tip label layer

 ##' @export

 ##' @author Guangchuang Yu

 ##' @references \url{https://groups.google.com/forum/#!topic/bioc-ggtree/o35PV3iHO-0}

-geom_tiplab2 <- function(mapping=NULL, ...) {

+geom_tiplab2 <- function(mapping=NULL, hjust=0, ...) {

     angle <- NULL

     m1 <- aes(subset=(abs(angle) < 90), angle=angle)

@@ -79,7 +80,7 @@ geom_tiplab2 <- function(mapping=NULL, ...) {

         m2 <- modifyList(mapping, m2)

     }

-    list(geom_tiplab(m1, ...),

-         geom_tiplab(m2, hjust=1, ...)

+    list(geom_tiplab(m1, hjust=hjust, ...),

+         geom_tiplab(m2, hjust=1-hjust, ...)

          )

 }

@@ -4,11 +4,13 @@

 \alias{geom_tiplab2}

 \title{geom_tiplab2}

 \usage{

-geom_tiplab2(mapping = NULL, ...)

+geom_tiplab2(mapping = NULL, hjust = 0, ...)

 }

 \arguments{

 \item{mapping}{aes mapping}

+\item{hjust}{horizontal adjustment}

+

 \item{...}{additional parameter, see geom_tiplab}

 }

 \value{