Merge pull request #458 from cjber/patch-2
Improve spacing between table and footer
diff --git a/R/add_indent.R b/R/add_indent.R
index 25448b5..7f0a0e3 100644
--- a/R/add_indent.R
+++ b/R/add_indent.R
@@ -3,13 +3,14 @@
#' @param kable_input Output of `knitr::kable()` with `format` specified
#' @param positions A vector of numeric row numbers for the rows that need to
#' be indented.
+#' @param level_of_indent a numeric value for the indent level
#'
#' @examples x <- knitr::kable(head(mtcars), "html")
#' # Add indentations to the 2nd & 4th row
-#' add_indent(x, c(2, 4))
+#' add_indent(x, c(2, 4), level_of_indent = 1)
#'
#' @export
-add_indent <- function(kable_input, positions) {
+add_indent <- function(kable_input, positions, level_of_indent) {
if (!is.numeric(positions)) {
stop("Positions can only take numeric row numbers (excluding header rows).")
}
@@ -21,17 +22,19 @@
return(kable_input)
}
if (kable_format == "html") {
- return(add_indent_html(kable_input, positions))
+ return(add_indent_html(kable_input, positions, level_of_indent))
}
if (kable_format == "latex") {
- return(add_indent_latex(kable_input, positions))
+ return(add_indent_latex(kable_input, positions, level_of_indent))
}
}
# Add indentation for LaTeX
-add_indent_latex <- function(kable_input, positions) {
+add_indent_latex <- function(kable_input, positions, level_of_indent) {
table_info <- magic_mirror(kable_input)
out <- solve_enc(kable_input)
+ level_of_indent<-as.numeric(level_of_indent)
+
if (table_info$duplicated_rows) {
dup_fx_out <- fix_duplicated_rows_latex(out, table_info)
@@ -56,14 +59,18 @@
out <- structure(out, format = "latex", class = "knitr_kable")
attr(out, "kable_meta") <- table_info
return(out)
+
+
}
latex_indent_unit <- function(rowtext) {
- paste0("\\\\hspace\\{1em\\}", rowtext)
+ paste0("\\\\hspace\\{",level_of_indent,"em\\}", rowtext)
}
+
+
# Add indentation for HTML
-add_indent_html <- function(kable_input, positions) {
+add_indent_html <- function(kable_input, positions, level_of_indent) {
kable_attrs <- attributes(kable_input)
kable_xml <- read_kable_as_xml(kable_input)
@@ -79,7 +86,7 @@
node_to_edit <- xml_child(xml_children(kable_tbody)[[i]], 1)
if (!xml_has_attr(node_to_edit, "indentlevel")) {
xml_attr(node_to_edit, "style") <- paste(
- xml_attr(node_to_edit, "style"), "padding-left: 2em;"
+ xml_attr(node_to_edit, "style"), "padding-left: ",paste0(level_of_indent*2,"em;")
)
xml_attr(node_to_edit, "indentlevel") <- 1
} else {
diff --git a/R/save_kable.R b/R/save_kable.R
index 3c3a5fa..8238552 100644
--- a/R/save_kable.R
+++ b/R/save_kable.R
@@ -144,7 +144,7 @@
owd <- setwd(dirname(temp_tex_file))
- system(paste0("xelatex -interaction=batchmode ", temp_tex_file))
+ system(paste0('xelatex -interaction=batchmode "', temp_tex_file,'"'))
if (!keep_tex) {
temp_file_delete <- paste0(file_no_ext, c(".tex", ".aux", ".log"))
unlink(temp_file_delete)
diff --git a/README.md b/README.md
index 2ac66c2..b46a973 100644
--- a/README.md
+++ b/README.md
@@ -51,14 +51,14 @@
kable_styling(bootstrap_options = "striped",
full_width = F) %>%
add_header_above(c(" ", "Group 1" = 2, "Group 2[note]" = 2)) %>%
- add_footnote(c("table footnote"))
+ footnote(c("table footnote"))
# LaTeX Table
kable(dt, format = "latex", booktabs = T, caption = "Demo Table") %>%
kable_styling(latex_options = c("striped", "hold_position"),
full_width = F) %>%
add_header_above(c(" ", "Group 1" = 2, "Group 2[note]" = 2)) %>%
- add_footnote(c("table footnote"))
+ footnote(c("table footnote"))
```
### Results