change add_footnote_adv to footnote
diff --git a/NAMESPACE b/NAMESPACE
index 0ae29ae..d32ccda 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -2,12 +2,12 @@
export("%>%")
export(add_footnote)
-export(add_footnote_adv)
export(add_header_above)
export(add_indent)
export(cell_spec)
export(collapse_rows)
export(column_spec)
+export(footnote)
export(group_rows)
export(kableExtra_latex_packages)
export(kable_as_image)
diff --git a/R/footnote.R b/R/footnote.R
index f502456..63caf6d 100644
--- a/R/footnote.R
+++ b/R/footnote.R
@@ -1,7 +1,7 @@
-#' Add advanced footnote
+#' Add footnote (new)
#'
#' @export
-add_footnote_adv <- function(kable_input,
+footnote <- function(kable_input,
general = NULL,
number = NULL,
alphabet = NULL,
@@ -45,10 +45,10 @@
kable_format, footnote_titles, footnote_contents
)
if (kable_format == "html") {
- return(add_footnote_adv_html(kable_input, footnote_table, footnote_as_chunk))
+ return(footnote_html(kable_input, footnote_table, footnote_as_chunk))
}
# if (kable_format == "latex") {
- # return(add_footnote_adv_latex(kable_input, footnote_table))
+ # return(footnote_latex(kable_input, footnote_table))
# }
}
@@ -94,12 +94,12 @@
}
# HTML
-add_footnote_adv_html <- function(kable_input, footnote_table,
+footnote_html <- function(kable_input, footnote_table,
footnote_as_chunk) {
kable_attrs <- attributes(kable_input)
kable_xml <- read_kable_as_xml(kable_input)
- new_html_footnote <- adv_html_tfoot_maker(footnote_table, footnote_as_chunk)
+ new_html_footnote <- html_tfoot_maker(footnote_table, footnote_as_chunk)
xml_add_child(kable_xml, new_html_footnote)
out <- as_kable_xml(kable_xml)
@@ -107,11 +107,11 @@
return(out)
}
-adv_html_tfoot_maker <- function(footnote_table, footnote_as_chunk) {
+html_tfoot_maker <- function(footnote_table, footnote_as_chunk) {
footnote_types <- names(footnote_table$contents)
footnote_text <- c()
for (i in footnote_types) {
- footnote_text <- c(footnote_text, adv_html_tfoot_maker_(
+ footnote_text <- c(footnote_text, html_tfoot_maker_(
footnote_table$contents[[i]], footnote_table$titles[[i]], i,
footnote_as_chunk))
}
@@ -122,8 +122,7 @@
return(xml_child(xml_child(footnote_node, 1), 1))
}
-adv_html_tfoot_maker_ <- function(ft_contents, ft_title, ft_type, ft_chunk) {
-
+html_tfoot_maker_ <- function(ft_contents, ft_title, ft_type, ft_chunk) {
footnote_text <- apply(ft_contents, 1, function(x) {
paste0('<sup>', x[1], '</sup> ', x[2])
})
@@ -139,10 +138,14 @@
} else {
footnote_text <- paste0(
'<tr><td style="padding: 0; border: 0;" colspan="100%">',
- paste0(footnote_text, collapse = ""),
+ paste0(footnote_text, collapse = " "),
'</td></tr>'
)
}
- # }
return(footnote_text)
}
+
+# LaTeX
+footnote_latex <- function() {
+
+}
diff --git a/R/footnote_marker.R b/R/footnote_marker.R
new file mode 100644
index 0000000..0b2dd8d
--- /dev/null
+++ b/R/footnote_marker.R
@@ -0,0 +1 @@
+#' Footnote marker
diff --git a/man/add_footnote_adv.Rd b/man/add_footnote_adv.Rd
deleted file mode 100644
index 6fb62d9..0000000
--- a/man/add_footnote_adv.Rd
+++ /dev/null
@@ -1,14 +0,0 @@
-% Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/footnote.R
-\name{add_footnote_adv}
-\alias{add_footnote_adv}
-\title{Add advanced footnote}
-\usage{
-add_footnote_adv(kable_input, general = NULL, number = NULL,
- alphabet = NULL, symbol = NULL, footnote_order = c("general", "number",
- "alphabet", "symbol"), general_title = "Note: ", number_title = "",
- alphabet_title = "", symbol_title = "")
-}
-\description{
-Add advanced footnote
-}
diff --git a/man/footnote.Rd b/man/footnote.Rd
new file mode 100644
index 0000000..1dddc7d
--- /dev/null
+++ b/man/footnote.Rd
@@ -0,0 +1,14 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/footnote.R
+\name{footnote}
+\alias{footnote}
+\title{Add footnote (new)}
+\usage{
+footnote(kable_input, general = NULL, number = NULL, alphabet = NULL,
+ symbol = NULL, footnote_order = c("general", "number", "alphabet",
+ "symbol"), footnote_as_chunk = FALSE, general_title = "Note: ",
+ number_title = "", alphabet_title = "", symbol_title = "")
+}
+\description{
+Add footnote (new)
+}
diff --git a/tests/visual_tests/add_footnote_adv_html.Rmd b/tests/visual_tests/add_footnote_adv_html.Rmd
index 407c9ab..bf8fd4e 100644
--- a/tests/visual_tests/add_footnote_adv_html.Rmd
+++ b/tests/visual_tests/add_footnote_adv_html.Rmd
@@ -12,7 +12,7 @@
mtcars[1:5, 1:5] %>%
kable("html") %>%
kable_styling() %>%
- add_footnote_adv("ccc", c("number 1", "number 2"), c("a 1", "a 2"), c("s 1", "s 2"),
+ footnote("ccc", c("number 1; ", "number 2. "), c("a 1; ", "a 2."), c("s 1; ", "s 2."),
number_title = "special: ", alphabet_title = "abc: ",
footnote_as_chunk = T)
```