accomodate pillar 1.3.0

r-quantities · Jul 15, 2018 · 3c32401 · 3c32401 · Enchufa2 · Jul 26, 2018
1 parent e13a1ab
commit 3c32401
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -19,7 +19,7 @@ Suggests:
     measurements,
     xml2,
     tibble,
-	pillar,
+	pillar (>= 1.3.0),
     knitr,
     testthat,
 	ggforce,

diff --git a/R/misc.R b/R/misc.R
@@ -118,7 +118,8 @@ type_sum.units <- function(x, ...) {
 }
 #' @export
 #' @name tibble
-format_type_sum.type_sum_units <- function(x) {
+#' @param width ignored
+format_type_sum.type_sum_units <- function(x, width, ...) {
   if (! requireNamespace("pillar", quietly = TRUE))
     stop("package pillar not available: install first?")
   pillar::style_subtle(x)

diff --git a/R/symbolic_units.R b/R/symbolic_units.R
@@ -139,8 +139,8 @@ to_base <- function(x) {  # https://github.com/r-quantities/units/issues/132
   	return(value)
   }
 
-  if (isTRUE(units_options("convert_to_base")))
-    return(to_base(value))
+#  if (isTRUE(units_options("convert_to_base")))
+#    return(to_base(value))
 
   # This is just a brute force implementation that takes each element in the
   # numerator and tries to find a value in the denominator that can be converted

diff --git a/man/tibble.Rd b/man/tibble.Rd