update

Author: strengejacke

R/display.R

@@ -216,7 +216,8 @@ display.parameters_sem <- function(object,
     digits = digits,
     ci_digits = ci_digits,
     p_digits = p_digits,
-    ci_brackets = ci_brackets
+    ci_brackets = ci_brackets,
+    engine = ifelse(format == "tt", "tt", "gt")
   )
 
   if (format %in% c("html", "tt")) {
@@ -234,7 +235,7 @@ display.parameters_sem <- function(object,
 #' @export
 display.parameters_efa_summary <- function(object, format = "markdown", digits = 3, ...) {
   format <- insight::validate_argument(format, c("markdown", "html", "md", "tt"))
-  fun_args <- list(x = object, digits = digits)
+  fun_args <- list(x = object, digits = digits, engine = ifelse(format == "tt", "tt", "gt"))
 
   if (format %in% c("html", "tt")) {
     do.call(print_html, c(fun_args, list(...)))
@@ -261,7 +262,8 @@ display.parameters_efa <- function(object, format = "markdown", digits = 2, sort
     digits = digits,
     sort = sort,
     threshold = threshold,
-    labels = labels
+    labels = labels,
+    engine = ifelse(format == "tt", "tt", "gt")
   )
 
   if (format %in% c("html", "tt")) {

R/print_html.R

@@ -186,7 +186,7 @@ print_html.compare_parameters <- function(x,
     select <- attributes(x)$output_style
   }
 
-  # markdown engine?
+  # which engine?
   engine <- insight::validate_argument(
     getOption("easystats_html_engine", engine),
     c("gt", "default", "tt")
@@ -291,6 +291,12 @@ print_html.parameters_efa <- function(x,
                                       labels = NULL,
                                       engine = "gt",
                                       ...) {
+  # which engine?
+  engine <- insight::validate_argument(
+    getOption("easystats_html_engine", engine),
+    c("gt", "default", "tt")
+  )
+
   # extract attributes
   if (is.null(threshold)) {
     threshold <- attributes(x)$threshold
@@ -299,7 +305,7 @@ print_html.parameters_efa <- function(x,
     x,
     threshold = threshold,
     sort = sort,
-    format = engine,
+    format = ifelse(identical(engine, "tt"), "tt", "html"),
     digits = digits,
     labels = labels,
     ...

R/print_md.R

@@ -98,7 +98,6 @@ print_md.parameters_model <- function(x,
     }
   }
 
-
   insight::export_table(
     formatted_table,
     format = "markdown",
@@ -134,7 +133,6 @@ print_md.compare_parameters <- function(x,
                                         ci_brackets = c("(", ")"),
                                         zap_small = FALSE,
                                         groups = NULL,
-                                        engine = "tt",
                                         ...) {
   # check if user supplied digits attributes
   if (missing(digits)) {
@@ -155,9 +153,6 @@ print_md.compare_parameters <- function(x,
     groups <- attributes(x)$parameter_groups
   }
 
-  # markdown engine?
-  engine <- insight::validate_argument(engine, c("tt", "default"))
-
   formatted_table <- format(
     x,
     select = select,
@@ -169,8 +164,7 @@ print_md.compare_parameters <- function(x,
     ci_brackets = ci_brackets,
     format = "markdown",
     zap_small = zap_small,
-    groups = groups,
-    engine = engine
+    groups = groups
   )
 
   # replace brackets by parenthesis
@@ -179,36 +173,13 @@ print_md.compare_parameters <- function(x,
     formatted_table$Parameter <- gsub("]", ci_brackets[2], formatted_table$Parameter, fixed = TRUE)
   }
 
-  if (identical(engine, "tt")) {
-    # retrieve output format - print_md() may be called from print_html()
-    dots <- list(...)
-    if (identical(dots$outformat, "html")) {
-      outformat <- "html"
-    } else {
-      outformat <- "markdown"
-    }
-
-    col_names <- gsub("(.*) \\((.*)\\)$", "\\2", colnames(formatted_table))
-    col_groups <- sapply(attributes(x)$model_names, function(i) which(i == col_names), simplify = FALSE)
-    colnames(formatted_table) <- gsub("(.*) \\((.*)\\)$", "\\1", colnames(formatted_table))
-
-    insight::export_table(
-      formatted_table,
-      format = "tt",
-      caption = caption,
-      subtitle = subtitle,
-      footer = footer,
-      column_groups = col_groups
-    )
-  } else {
-    insight::export_table(
-      formatted_table,
-      format = "markdown",
-      caption = caption,
-      subtitle = subtitle,
-      footer = footer
-    )
-  }
+  insight::export_table(
+    formatted_table,
+    format = "markdown",
+    caption = caption,
+    subtitle = subtitle,
+    footer = footer
+  )
 }
 
 
@@ -317,11 +288,13 @@ print_md.parameters_omega <- print_md.parameters_efa
 # Equivalence test ----------------------------
 
 #' @export
-print_md.equivalence_test_lm <- function(x,
-                                         digits = 2,
-                                         ci_brackets = c("(", ")"),
-                                         zap_small = FALSE,
-                                         ...) {
+print_md.equivalence_test_lm <- function(
+  x,
+  digits = 2,
+  ci_brackets = c("(", ")"),
+  zap_small = FALSE,
+  ...
+) {
   rule <- attributes(x)$rule
   rope <- attributes(x)$rope
 
@@ -363,8 +336,19 @@ print_md.equivalence_test_lm <- function(x,
   }
 
   if (!is.null(rope)) {
-    names(formatted_table)[names(formatted_table) == "% in ROPE"] <- sprintf("%% in ROPE (%.*f, %.*f)", digits, rope[1], digits, rope[2]) # nolint
+    names(formatted_table)[names(formatted_table) == "% in ROPE"] <- sprintf(
+      "%% in ROPE (%.*f, %.*f)",
+      digits,
+      rope[1],
+      digits,
+      rope[2]
+    ) # nolint
   }
 
-  insight::export_table(formatted_table, format = "markdown", caption = table_caption, align = "firstleft")
+  insight::export_table(
+    formatted_table,
+    format = "markdown",
+    caption = table_caption,
+    align = "firstleft"
+  )
 }

R/utils_pca_efa.R

@@ -426,8 +426,8 @@ print.parameters_omega_summary <- function(x, ...) {
   }
 
   # set engine for html format
-  if (format == "html") {
-    format <- ifelse(identical(engine, "tt"), "tt", "html")
+  if (format == "html" && identical(engine, "tt")) {
+    format <- "tt"
   }
 
   insight::export_table(