@@ -1,8 +1,8 @@

 Package: ComplexHeatmap

 Type: Package

 Title: Make Complex Heatmaps

-Version: 2.3.1

-Date: 2019-10-22

+Version: 2.3.2

+Date: 2020-02-05

 Author: Zuguang Gu

 Maintainer: Zuguang Gu <z.gu@dkfz.de>

 Depends: R (>= 3.1.2), methods, grid, graphics, stats, grDevices

@@ -1,3 +1,9 @@

+CHANGES in VERSION 2.3.2

+

+* support gridtext

+

+========================

+

 CHANGES in VERSION 2.3.1

 * `anno_points()`: allows images as symbols.

@@ -2010,6 +2010,10 @@ anno_text = function(x, which = c("column", "row"), gp = gpar(),

 	offset = guess_location(), location = guess_location(),

 	width = NULL, height = NULL) {

+	if(inherits(x, "richtext_grob")) {

+		return(anno_richtext(x, which = which, width = width, height = height))

+	}

+

 	ef = function() NULL

 	if(is.null(.ENV$current_annotation_which)) {

 		which = match.arg(which)[1]

@@ -2142,6 +2146,81 @@ anno_text = function(x, which = c("column", "row"), gp = gpar(),

 	return(anno)

 }

+anno_richtext = function(x, which = c("column", "row"), width = NULL, height = NULL) {

+

+	ef = function() NULL

+	if(is.null(.ENV$current_annotation_which)) {

+		which = match.arg(which)[1]

+		dev.null()

+		ef = dev.off2

+	} else {

+		which = .ENV$current_annotation_which

+	}

+

+	on.exit(ef())

+

+	n = length(x)

+	

+	if(which == "column") {

+		if(missing(height)) {

+			height = grobHeight(x)

+			height = convertHeight(height, "mm")

+		}

+		if(missing(width)) {

+			width = unit(1, "npc")

+		}

+	}

+	if(which == "row") {

+		if(missing(width)) {

+			width = grobWidth(x)

+			width = convertWidth(width, "mm")

+		}

+		if(missing(height)) {

+			height = unit(1, "npc")

+		}

+	}

+

+	anno_size = list(width = width, height = height)

+

+	value = x

+

+	row_fun = function(index) {

+		n = length(index)

+		gb = value[index]

+		gb = update_xy(gb, y = unit((n - seq_along(index) + 0.5)/n, "native"))

+		grid.draw(gb)

+	}

+	column_fun = function(index, k = NULL, N = NULL, vp_name = NULL) {

+		n = length(index)

+		gb = value[index]

+		gb = update_xy(gb, x = unit((seq_along(index) - 0.5)/n, "native"))

+		grid.draw(gb)

+	}

+

+	if(which == "row") {

+		fun = row_fun

+	} else if(which == "column") {

+		fun = column_fun

+	}

+

+	anno = AnnotationFunction(

+		fun = fun,

+		fun_name = "anno_richtext",

+		which = which,

+		width = width,

+		height = height,

+		n = n,

+		var_import = list(value),

+		show_name = FALSE

+	)

+

+	anno@subset_rule$value = subset_vector

+

+	anno@subsetable = TRUE

+

+	return(anno)

+}

+

 # == title

 # Joyplot Annotation

 #

new file mode 100644

@@ -0,0 +1,106 @@

+`[.grob` = function(x, i) {

+	x2 = x

+	for(nm in SUBSETABLE_FIELDS[[ intersect(names(SUBSETABLE_FIELDS), class(x)) ]]) {

+		if(inherits(x2[[nm]], "gpar")) {

+			# change to the class defined here

+			class(x2[[nm]]) = "gpar"

+		}

+

+		if(length(x2[[nm]]) > 1) {

+			x2[[nm]] = x2[[nm]][i]

+		}

+	}

+	x2

+}

+

+`[.gpar` = function(x, i) {

+	lapply(x, function(y) {

+		if(length(y) > 1) {

+			y[i]

+		} else {

+			y

+		}

+	})

+}

+

+SUBSETABLE_FIELDS = list(

+	"text" = c("label", "x", "y", "gp"),

+	"richtext_grob" = c("gp", "children", "childrenOrder")

+)

+

+length.text = function(x) {

+	length(x$label)

+}

+

+length.richtext_grob = function(x) {

+	length(x$children)

+}

+

+update_xy = function (gb, x, y, ...) {

+	UseMethod("update_xy")

+}

+

+update_xy.text = function(gb, x, y, ...) {

+	n = length(gb$label)

+	if(!missing(x)) {

+		if(n > 1 & length(x) > 1 && n != length(x)) {

+			stop_wrap("Length of `x` should be the same as the length of labels.")

+		}

+		gb$x = x

+	}

+	if(!missing(y)) {

+		if(n > 1 & length(y) > 1 && n != length(y)) {

+			stop_wrap("Length of `y` should be the same as the length of labels.")

+		}

+		gb$y = y

+	}

+	gb

+}

+

+update_xy.richtext_grob = function(gb, x, y, ...) {

+	n = length(gb$children)

+

+	if(!missing(x)) {

+		if(n > 1 & length(x) > 1 && n != length(x)) {

+			stop_wrap("Length of `x` should be the same as the length of labels.")

+		}

+		for(i in 1:n) {

+			if(length(x) == 1) {

+				gb$children[[i]]$vp$x = x

+			} else {

+				gb$children[[i]]$vp$x = x[i]

+			}

+		}

+	}

+	if(!missing(y)) {

+		if(n > 1 & length(y) > 1 && n != length(y)) {

+			stop_wrap("Length of `y` should be the same as the length of labels.")

+		}

+		for(i in 1:n) {

+			if(length(y) == 1) {

+				gb$children[[i]]$vp$y = y

+			} else {

+				gb$children[[i]]$vp$y = y[i]

+			}

+		}

+	}

+	gb

+}

+

+textGrob = function(label, ...) {

+	if(inherits(label, "grob")) {

+		return(label)

+	} else {

+		grid::textGrob(label, ...)

+	}

+}

+

+grid.text = function(label, x = unit(0.5, "npc"), y = unit(0.5, "npc"), ...) {

+	if(inherits(label, "grob")) {

+		gb = label

+		gb = update_xy(gb, x, y)

+		grid.draw(gb)

+	} else {

+		grid::grid.text(label, x, y, ...)

+	}

+}

@@ -184,6 +184,12 @@ for(rot in seq(0, 360, by = 45)) {

 	draw(anno, test = paste0("rot =", rot))

 }

+##### test anno_richtext ####

+anno = anno_richtext(richtext_grob(month.name, box_gp = gpar(col = "red"), rot = 90, hjust = 1, y = unit(1, "npc")))

+draw(anno, test = "month names")

+anno = anno_richtext(richtext_grob(month.name, box_gp = gpar(col = "red"), hjust = 0, x = unit(0, "npc")), which = "row")

+draw(anno, test = "month names")

+

 ##### test anno_barplot #####