Fix #225: use bookdown-style captions in blogdown also.

NEWS.md

@@ -7,6 +7,7 @@
 * Bugfix: infinite loop with wide characters in `to_screen()`.
 * Bugfix: duplicate colnames when exporting `huxreg(..., error_pos = "right")`
   to flextable.
+* Bugfix: bookdown-style references weren't working in blogdown.
 
 
 # huxtable 5.4.0

R/bookdown.R

@@ -2,7 +2,7 @@
 # Functions relating to bookdown
 
 
-in_bookdown <- function () {
+use_bookdown_style_captions <- function () {
   if (! is.null(book_opt <- getOption("huxtable.bookdown", NULL))) return(book_opt)
 
   if (! requireNamespace("knitr", quietly = TRUE)) return(FALSE)
@@ -11,9 +11,10 @@ in_bookdown <- function () {
   if (is.null(input_path)) return(FALSE)
   rmd_of <- rmarkdown::default_output_format(input_path)$name
 
-  return(grepl("bookdown", rmd_of))
+  return(grepl("bookdown|blogdown", rmd_of))
 }
 
+
 make_caption <- function(ht, label, format = c("html", "latex", "md")) {
   format <- match.arg(format)
 
@@ -22,7 +23,7 @@ make_caption <- function(ht, label, format = c("html", "latex", "md")) {
   if (is.na(label) || label == "") {
     return(raw_cap)
   }
-  if (! in_bookdown()) {
+  if (! use_bookdown_style_captions()) {
     return(raw_cap)
   }
 

tests/testthat/bookdown-test.Rmd

@@ -12,7 +12,9 @@ library(huxtable)
 if( ! ((x <- guess_knitr_output_format()) %in% c('html', 'latex'))) {
   stop("guessed output is ", x)
 }
-if (! huxtable:::in_bookdown()) stop("huxtable:::in_bookdown() returned false")
+if (! huxtable:::use_bookdown_style_captions()) {
+  stop("huxtable:::use_bookdown_style_captions() returned false")
+} 
 ```
 
 My table is \@ref(tab:foo1). The other table