Просмотр исходного кода

Add deprecation tests; fix write_extra_css() pass through

tags/v0.3.0
Garrick Aden-Buie 6 лет назад
Родитель
Сommit
0a7cf8014b
3 измененных файлов: 28 добавлений и 15 удалений
  1. +14
    -14
      R/style_xaringan.R
  2. +1
    -1
      R/xaringanthemer-deprecated.R
  3. +13
    -0
      tests/testthat/test-xaringanthemer-deprecated.R

+ 14
- 14
R/style_xaringan.R Просмотреть файл

#' @param header_h1_font_size h1 Header Text Font Size. Defaults to 2.75rem. Modifies the `.remark-slide-content h1` class. #' @param header_h1_font_size h1 Header Text Font Size. Defaults to 2.75rem. Modifies the `.remark-slide-content h1` class.
#' @param header_h2_font_size h2 Header Text Font Size. Defaults to 2.25rem. Modifies the `.remark-slide-content h2` class. #' @param header_h2_font_size h2 Header Text Font Size. Defaults to 2.25rem. Modifies the `.remark-slide-content h2` class.
#' @param header_h3_font_size h3 Header Text Font Size. Defaults to 1.75rem. Modifies the `.remark-slide-content h3` class. #' @param header_h3_font_size h3 Header Text Font Size. Defaults to 1.75rem. Modifies the `.remark-slide-content h3` class.
#' @param header_background_auto Add background under slide title automatically for h1 header elements. If not enabled, use `class: header_background` to enable. Defaults to `FALSE`.
#' @param header_background_auto Add background under slide title automatically for h1 header elements. If not enabled, use `class: header_background` to enable. Defaults to `FALSE`.
#' @param header_background_color Background Color for h1 Header with Background. Defaults to `header_color`. Modifies the `.remark-slide-content h1` class. #' @param header_background_color Background Color for h1 Header with Background. Defaults to `header_color`. Modifies the `.remark-slide-content h1` class.
#' @param header_background_text_color Text Color for h1 Header with Background. Defaults to `background_color`. Modifies the `.remark-slide-content h1` class. #' @param header_background_text_color Text Color for h1 Header with Background. Defaults to `background_color`. Modifies the `.remark-slide-content h1` class.
#' @param header_background_padding Padding for h1 Header with Background. Defaults to `NULL`. Modifies the `.remark-slide-content h1` class. #' @param header_background_padding Padding for h1 Header with Background. Defaults to `NULL`. Modifies the `.remark-slide-content h1` class.
# set an is_google flag default of FALSE that is possibly overwritten later # set an is_google flag default of FALSE that is possibly overwritten later
eval(parse(text = paste0(sub("font_family$", "font_is_google", var), "<-0"))) eval(parse(text = paste0(sub("font_family$", "font_is_google", var), "<-0")))
} }
# Warn if base_font_size isn't absolute # Warn if base_font_size isn't absolute
css_abs_units <- c("cm", "mm", "Q", "in", "pc", "pt", "px") css_abs_units <- c("cm", "mm", "Q", "in", "pc", "pt", "px")
if (!grepl(paste(tolower(css_abs_units), collapse = "|"), tolower(base_font_size))) { if (!grepl(paste(tolower(css_abs_units), collapse = "|"), tolower(base_font_size))) {
immediate. = TRUE immediate. = TRUE
) )
} }
# Use font_..._google args to overwrite font args # Use font_..._google args to overwrite font args
for (var in f_args[grepl("font_google$", f_args)]) { for (var in f_args[grepl("font_google$", f_args)]) {
gf <- eval(parse(text = var)) gf <- eval(parse(text = var))
} }
eval(parse(text = paste0(group, "_font_is_google <- 1"))) eval(parse(text = paste0(group, "_font_is_google <- 1")))
} }
is_default <- function(type, suffix, reference = style_xaringan) { is_default <- function(type, suffix, reference = style_xaringan) {
var <- paste0(type, "_", suffix) var <- paste0(type, "_", suffix)
default_value <- formals(reference)[[var]] default_value <- formals(reference)[[var]]
if (suffix == "font_family") { if (suffix == "font_family") {
default_value <- quote_elements_w_spaces(default_value) default_value <- quote_elements_w_spaces(default_value)
} }
get(var, envir = parent.frame(2), inherits = FALSE) == default_value get(var, envir = parent.frame(2), inherits = FALSE) == default_value
} }
# the defaults are google fonts # the defaults are google fonts
for (var in c("text", "header", "code")) { for (var in c("text", "header", "code")) {
suffixes <- c("font_family", "font_weight", "font_url") suffixes <- c("font_family", "font_weight", "font_url")
eval(parse(text = paste0(var, "_font_is_google <- 1"))) eval(parse(text = paste0(var, "_font_is_google <- 1")))
} }
} }
extra_font_imports <- if (is.null(extra_fonts)) "" else list2fonts(extra_fonts) extra_font_imports <- if (is.null(extra_fonts)) "" else list2fonts(extra_fonts)
extra_font_imports <- paste(extra_font_imports, collapse = "\n") extra_font_imports <- paste(extra_font_imports, collapse = "\n")
# convert NA arguments to NULL # convert NA arguments to NULL
for (var in f_args) { for (var in f_args) {
val <- eval(parse(text = var)) val <- eval(parse(text = var))
is_na <- length(val) == 0 is_na <- length(val) == 0
if (is_na) assign(var, NULL) if (is_na) assign(var, NULL)
} }
# prepare variables for template # prepare variables for template
body_font_family <- paste(c(text_font_family, text_font_family_fallback, text_font_base), collapse = ", ") body_font_family <- paste(c(text_font_family, text_font_family_fallback, text_font_base), collapse = ", ")
background_size_fallback <- if (is.null(background_position)) "cover" else "100%" background_size_fallback <- if (is.null(background_position)) "cover" else "100%"
title_slide_background_image %??% "cover" title_slide_background_image %??% "cover"
) )
table_row_even_background_color <- table_row_even_background_color %||% background_color table_row_even_background_color <- table_row_even_background_color %||% background_color
# stash theme settings in package env # stash theme settings in package env
lapply(f_args, function(n) assign(n, get(n), envir = xaringanthemer_env)) lapply(f_args, function(n) assign(n, get(n), envir = xaringanthemer_env))
for (font_is_google in paste0(c("text", "code", "header"), "_font_is_google")) { for (font_is_google in paste0(c("text", "code", "header"), "_font_is_google")) {
envir = xaringanthemer_env envir = xaringanthemer_env
) )
} }
xaringanthemer_version <- utils::packageVersion("xaringanthemer") xaringanthemer_version <- utils::packageVersion("xaringanthemer")
# prepare header background object # prepare header background object
needs_leading_dot <- !grepl("^\\.", header_background_ignore_classes) needs_leading_dot <- !grepl("^\\.", header_background_ignore_classes)
header_background_ignore_classes[needs_leading_dot] <- paste0( header_background_ignore_classes[needs_leading_dot] <- paste0(
content_padding_top = header_background_content_padding_top, content_padding_top = header_background_content_padding_top,
ignore = header_background_ignore_classes ignore = header_background_ignore_classes
) )
colors <- prepare_colors(colors) colors <- prepare_colors(colors)
tf <- system.file("resources", "template.css", package = "xaringanthemer") tf <- system.file("resources", "template.css", package = "xaringanthemer")
template <- readLines(tf, warn = FALSE) template <- readLines(tf, warn = FALSE)
template <- paste(template, collapse = "\n") template <- paste(template, collapse = "\n")

+ 1
- 1
R/xaringanthemer-deprecated.R Просмотреть файл

#' @rdname xaringanthemer-deprecated #' @rdname xaringanthemer-deprecated
write_extra_css <- function(...) { write_extra_css <- function(...) {
.Deprecated(msg = "write_extra_css() was renamed. Please use `style_extra_css()` instead.") .Deprecated(msg = "write_extra_css() was renamed. Please use `style_extra_css()` instead.")
style_xaringan(...)
style_extra_css(...)
} }





+ 13
- 0
tests/testthat/test-xaringanthemer-deprecated.R Просмотреть файл

test_that("deprecation warnings", {
expect_warning(write_xaringan_theme(outfile = NULL))
expect_warning(write_extra_css(list(.test = list(prop = 'value')), outfile = NULL))
expect_warning(mono_light(outfile = NULL))
expect_warning(mono_dark(outfile = NULL))
expect_warning(mono_accent(outfile = NULL))
expect_warning(mono_accent_inverse(outfile = NULL))
expect_warning(duo(outfile = NULL))
expect_warning(duo_accent(outfile = NULL))
expect_warning(duo_accent_inverse(outfile = NULL))
expect_warning(solarized_light(outfile = NULL))
expect_warning(solarized_dark(outfile = NULL))
})

Загрузка…
Отмена
Сохранить