From 3c32401e0329a7436cc94871d0fca652bb500292 Mon Sep 17 00:00:00 2001
From: Edzer Pebesma <edzer.pebesma@uni-muenster.de>
Date: Sun, 15 Jul 2018 22:21:07 +0200
Subject: [PATCH] accomodate pillar 1.3.0

---
 DESCRIPTION        | 2 +-
 R/misc.R           | 3 ++-
 R/symbolic_units.R | 4 ++--
 man/tibble.Rd      | 4 +++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 6c583365..8a360d46 100644
--- 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
index d4fcbbcf..51975e07 100644
--- 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
index ff36ff0e..412ecb7d 100644
--- 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
index 85029a3c..5e2d076a 100644
--- a/man/tibble.Rd
+++ b/man/tibble.Rd
@@ -15,7 +15,7 @@
 \usage{
 type_sum.units(x, ...)
 
-format_type_sum.type_sum_units(x)
+format_type_sum.type_sum_units(x, width, ...)
 
 pillar_shaft.units(x, ...)
 
@@ -27,6 +27,8 @@ pillar_shaft.mixed_units(x, ...)
 \item{x}{see \link[pillar]{type_sum}}
 
 \item{...}{see \link[pillar]{type_sum}}
+
+\item{width}{ignored}
 }
 \description{
 type_sum function for units