adjust code according to grid 4.0.0

jokergoo · Mar 2, 2020 · 0a2c5a5 · 0a2c5a5
1 parent 47fad61
commit 0a2c5a5
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 9 deletions.
diff --git a/NEWS b/NEWS
@@ -1,6 +1,5 @@
 CHANGES in VERSION 2.3.2
 
-* support gridtext
 * `anno_simple()`: fixed a bug when pch are all NA in a slice
 
 ========================

diff --git a/R/is_abs_unit.R b/R/is_abs_unit.R
@@ -1,9 +1,23 @@
 
 # is_abs_unit = function(x) UseMethod("is_abs_unit")
 
+# grid::absolute.size() treats grobwidth and grobheight as non-absolute units,
+# thus, I write another function to test
 .is_abs_unit.unit = function(x) {
-	unit = attr(x, "valid.unit")
-	if(all(unit %in% c(1:4, 7:24))) {
+
+	if(getRversion() >= "4.0.0") {
+        unitType = get("unitType", envir = asNamespace("grid"))
+        unit = unitType(x)
+    } else {
+    	unit = attr(x, "unit")
+    }
+
+	if(all(unit %in% c("cm", "inches", "mm", "points", "picas", "bigpts", "dida", "cicero",
+		               "scaledpts", "lines", "char", "strwidth", "strheight", "grobwidth",
+		               "grobheight", "strascent", "strdescent", "mylines", "mychar", 
+		               "mystrwidth", "mystrheight", "centimetre", "centimetres", "centimeter",
+		               "centimeters", "in", "inch", "line", "millimetre", "millimetres",
+		               "millimeter", "millimeters", "point", "pt"))) {
 		return(TRUE)
 	} else {
 		return(FALSE)
@@ -54,7 +68,7 @@
 # == example
 # is_abs_unit(unit(1, "mm"))
 # is_abs_unit(unit(1, "npc"))
-# is_abs_unit(textGrob("foo"))
+# is_abs_unit(grobWidth(textGrob("foo")))
 # is_abs_unit(unit(1, "mm") + unit(1, "npc"))
 #
 is_abs_unit = function(u) {

diff --git a/R/utils.R b/R/utils.R
@@ -522,25 +522,34 @@ unit.c = function(...) {
 }
 
 ">.unit" = function(x, y) {
-    if(!identical(attr(x, "unit"), "mm")) {
+    if(!unit_in_mm(x)) {
         stop_wrap("x should be in mm unit")
     }
-    if(!identical(attr(y, "unit"), "mm")) {
+    if(!unit_in_mm(y)) {
         stop_wrap("y should be in mm unit")
     }
     x[[1]] > y[[1]]
 }
 
 "<.unit" = function(x, y) {
-    if(!identical(attr(x, "unit"), "mm")) {
+    if(!unit_in_mm(x)) {
         stop_wrap("x should be in mm unit")
     }
-    if(!identical(attr(y, "unit"), "mm")) {
+    if(!unit_in_mm(y)) {
         stop_wrap("y should be in mm unit")
     }
     x[[1]] < y[[1]]
 }
 
+unit_in_mm = function(x) {
+    if(getRversion() >= "4.0.0") {
+        unitType = get("unitType", envir = asNamespace("grid"))
+        identical(unitType(x), "mm")
+    } else {
+        identical(attr(x, "unit"), "mm")
+    }
+}
+
 normalize_graphic_param_to_mat = function(x, nc, nr, name) {
     if(is.matrix(x)) {
         if(nrow(x) == nr && ncol(x) == nc) {

diff --git a/man/is_abs_unit.Rd b/man/is_abs_unit.Rd
@@ -30,6 +30,6 @@ Zuguang Gu <[email protected]>
 \examples{
 is_abs_unit(unit(1, "mm"))
 is_abs_unit(unit(1, "npc"))
-is_abs_unit(textGrob("foo"))
+is_abs_unit(grobWidth(textGrob("foo")))
 is_abs_unit(unit(1, "mm") + unit(1, "npc"))
 }
diff --git a/tests/testthat/test-utiles.R b/tests/testthat/test-utiles.R
@@ -35,3 +35,9 @@ test_that("test ks_dist", {
 	expect_that(d2, is_identical_to(d3))
 })
 
+test_that("test is_absolute_unit", {
+	expect_that(is_abs_unit(unit(1, "mm")), is_identical_to(TRUE))
+	expect_that(is_abs_unit(unit(1, "npc")), is_identical_to(FALSE))
+	expect_that(is_abs_unit(grobWidth(textGrob("foo"))), is_identical_to(TRUE))
+	expect_that(is_abs_unit(unit(1, "mm") + unit(1, "npc")), is_identical_to(FALSE))
+})