summarize:

- added argument "labels" - use \endhead if longtables are printed (fixes #20)
hofnerb · Nov 25, 2015 · 158e8a3 · 158e8a3
1 parent 4934840
commit 158e8a3
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/R/summarize.R b/R/summarize.R
@@ -3,7 +3,7 @@
 
 ## define summarize
 summarize <- summarise <- function(data, type = c("numeric", "factor"),
-    variables = names(data), variable.labels = NULL, group = NULL,
+    variables = names(data), variable.labels = labels, labels = NULL, group = NULL,
     test = !is.null(group), colnames = NULL, digits = NULL, digits.pval = 3,
     smallest.pval = 0.001, sep = NULL, sanitize = TRUE, drop = TRUE,
     show.NAs = any(is.na(data[, variables])), ...) {
@@ -62,7 +62,7 @@ latex.table.fac <- function(...,
 ################################################################################
 # LaTeX Tables with Descriptves for Continuous Variables
 summarize_numeric <- function(data, variables = names(data),
-                              variable.labels = NULL, group = NULL,
+                              variable.labels = labels, labels = NULL, group = NULL,
                               test = !is.null(group), colnames = NULL,
                               digits = 2, digits.pval = 3,
                               smallest.pval = 0.001, sep = !is.null(group),
@@ -299,7 +299,7 @@ prettify.summarize.numeric <- function(x,
 ################################################################################
 # LaTeX Tables with Descriptves for Factor Variables
 summarize_factor <- function(data, variables = names(data),
-                             variable.labels = NULL, group = NULL,
+                             variable.labels = labels, labels = NULL, group = NULL,
                              test = !is.null(group),
                              colnames = NULL, digits = 3, digits.pval = 3,
                              smallest.pval = 0.001, sep = TRUE, sanitize = TRUE,
@@ -571,6 +571,12 @@ print.xtable.summary <- function(x, rules = NULL, header = NULL,
                   "",  get_option(x, "header"))
     header <- ifelse(is.null(header), tmp, header)
 
+    ## add endhead for longtables
+    endhead <- ""
+    if ("tabular.environment" %in% names(list(...)) &&
+        list(...)$tabular.environment == "longtable")
+        endhead <- "\\endhead\n"
+
     ## sanitize object?
     if (is.logical(sanitize.text.function)) {
         if (!sanitize.text.function) {
@@ -586,10 +592,12 @@ print.xtable.summary <- function(x, rules = NULL, header = NULL,
         } else {
             pos.rules <- 0
         }
+        ## add endhead to first rule
+        midrules <- rep(rules, length(pos.rules))
+        midrules[1] <- paste(midrules[1], endhead)
         add.to.row <- list(pos = as.list(c(-1, -1, pos.rules, nrow(x))),
                            command = c("\\toprule\n", header,
-                                       rep(rules, length(pos.rules)),
-                                       "\\bottomrule\n"))
+                                       midrules, "\\bottomrule\n"))
     }
 
     print.xtable(x,

diff --git a/man/summarize.Rd b/man/summarize.Rd
@@ -11,7 +11,7 @@
 }
 \usage{
 summarize(data, type = c("numeric", "factor"),
-    variables = names(data), variable.labels = NULL,
+    variables = names(data), variable.labels = labels, labels = NULL,
     group = NULL, test = !is.null(group), colnames = NULL,
     digits = NULL, digits.pval = 3, smallest.pval = 0.001,
     sep = NULL, sanitize = TRUE, drop = TRUE,
@@ -31,10 +31,11 @@ summarize(data, type = c("numeric", "factor"),
     table. Per default, all numeric or factor variables of \code{data}
     are used, depending on \code{type}.
   }
-  \item{variable.labels}{
+  \item{variable.labels, labels}{
     labels for the variables. If \code{variable.labels = NULL} (default)
     \code{variables} is used as label. If \code{variable.labels = TRUE},
-    \code{labels(data, which = variables)} is used as labels.
+    \code{labels(data, which = variables)} is used as labels. Instead of
+    \code{variable.labels} one can also use \code{labels}.
   }
   \item{group}{
     character specifying a grouping factor. Per default no grouping is

diff --git a/man/summarize_factor.Rd b/man/summarize_factor.Rd
@@ -10,7 +10,7 @@
 }
 \usage{
 summarize_factor(data,
-    variables = names(data), variable.labels = NULL,
+    variables = names(data), variable.labels = labels, labels = NULL,
     group = NULL, test = !is.null(group), colnames = NULL,
     digits = 3, digits.pval = 3, smallest.pval = 0.001,
     sep = TRUE, sanitize = TRUE, drop = TRUE,
@@ -28,7 +28,7 @@ summarize_factor(data,
     variables that should be included in the table.
     For details see \code{\link{summarize}}.
   }
-  \item{variable.labels}{
+  \item{variable.labels, labels}{
     labels for the variables.
     For details see \code{\link{summarize}}.
   }

diff --git a/man/summarize_numeric.Rd b/man/summarize_numeric.Rd
@@ -10,7 +10,7 @@
 }
 \usage{
 summarize_numeric(data,
-    variables = names(data), variable.labels = NULL,
+    variables = names(data), variable.labels = labels, labels = NULL,
     group = NULL, test = !is.null(group), colnames = NULL,
     digits = 2, digits.pval = 3, smallest.pval = 0.001,
     sep = !is.null(group), sanitize = TRUE,
@@ -28,7 +28,7 @@ summarize_numeric(data,
     variables that should be included in the table.
     For details see \code{\link{summarize}}.
   }
-  \item{variable.labels}{
+  \item{variable.labels, labels}{
     labels for the variables.
     For details see \code{\link{summarize}}.
   }