From 7226df68175e0b11ce35500a011d97ba6e6de0d6 Mon Sep 17 00:00:00 2001 From: dscott Date: Thu, 11 Sep 2014 22:32:17 +0000 Subject: [PATCH] Fixed email address for David Dahl git-svn-id: svn://scm.r-forge.r-project.org/svnroot/xtable@46 edb9625f-4e0d-4859-8d74-9fd3b1da38cb --- pkg/DESCRIPTION | 2 +- pkg/R/print.xtable.R | 2 +- pkg/R/table.attributes.R | 8 ++++---- pkg/R/toLatex.R | 2 +- pkg/R/xtable.R | 2 +- pkg/man/print.xtable.Rd | 28 ++++++++++++++-------------- pkg/man/string.Rd | 4 ++-- pkg/man/table.attributes.Rd | 2 +- pkg/man/xtable.Rd | 26 +++++++++++++------------- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/pkg/DESCRIPTION b/pkg/DESCRIPTION index d2884be..c0654e4 100644 --- a/pkg/DESCRIPTION +++ b/pkg/DESCRIPTION @@ -2,7 +2,7 @@ Package: xtable Version: 1.7-4 Date: 2014/08/17 Title: Export tables to LaTeX or HTML -Author: David B. Dahl +Author: David B. Dahl Maintainer: David Scott Description: Coerce data to LaTeX and HTML tables URL: http://xtable.r-forge.r-project.org/ diff --git a/pkg/R/print.xtable.R b/pkg/R/print.xtable.R index 8aec031..67f48d5 100644 --- a/pkg/R/print.xtable.R +++ b/pkg/R/print.xtable.R @@ -2,7 +2,7 @@ ### ### Produce LaTeX and HTML tables from R objects. ### -### Copyright 2000-2013 David B. Dahl +### Copyright 2000-2013 David B. Dahl ### ### Maintained by David Scott ### diff --git a/pkg/R/table.attributes.R b/pkg/R/table.attributes.R index ed3f9c0..718e41f 100644 --- a/pkg/R/table.attributes.R +++ b/pkg/R/table.attributes.R @@ -2,7 +2,7 @@ ### ### Produce LaTeX and HTML tables from R objects. ### -### Copyright 2000-2013 David B. Dahl +### Copyright 2000-2013 David B. Dahl ### ### This file is part of the `xtable' library for R and related languages. ### It is made available under the terms of the GNU General Public @@ -72,8 +72,8 @@ label.xtable <- function(x,...) { aString.Width <- c(aString.Width,thisWidth) } - alignAllowed <- c("l","r","p","c","|","X") - + alignAllowed <- c("l","r","p","c","|","X") + if (any( !(aString.Align %in% alignAllowed))) { warning("Nonstandard alignments in align string") } @@ -120,7 +120,7 @@ align.xtable <- function(x,...) { " ( nrow( x )" ) } } else { - if( length(value)==1 ) { value <- rep(value, ncol(x)+1) } + if( length(value)==1 ) { value <- rep(value, ncol(x)+1) } if( length( value ) >1 & length( value ) != ncol(x)+1 ) { stop( "if argument 'digits' is a vector of length more than one, it must have length equal", " to ", ncol(x)+1, " ( ncol(x) + 1 )" ) diff --git a/pkg/R/toLatex.R b/pkg/R/toLatex.R index a67934d..b0a2e16 100644 --- a/pkg/R/toLatex.R +++ b/pkg/R/toLatex.R @@ -2,7 +2,7 @@ ### ### Produce LaTeX and HTML tables from R objects. ### -### Copyright 2000-2013 David B. Dahl +### Copyright 2000-2013 David B. Dahl ### ### Maintained by Charles Roosen ### diff --git a/pkg/R/xtable.R b/pkg/R/xtable.R index 47af4d4..2afc43c 100644 --- a/pkg/R/xtable.R +++ b/pkg/R/xtable.R @@ -2,7 +2,7 @@ ### ### Produce LaTeX and HTML tables from R objects. ### -### Copyright 2000-2013 David B. Dahl +### Copyright 2000-2013 David B. Dahl ### ### This file is part of the `xtable' library for R and related languages. ### It is made available under the terms of the GNU General Public diff --git a/pkg/man/print.xtable.Rd b/pkg/man/print.xtable.Rd index 33a5f5d..aeda298 100644 --- a/pkg/man/print.xtable.Rd +++ b/pkg/man/print.xtable.Rd @@ -6,7 +6,7 @@ code associated with the supplied object of class \code{xtable}. } \usage{ -\method{print}{xtable}(x, +\method{print}{xtable}(x, type = getOption("xtable.type", "latex"), file = getOption("xtable.file", ""), append = getOption("xtable.append", FALSE), @@ -25,9 +25,9 @@ only.contents = getOption("xtable.only.contents", FALSE), add.to.row = getOption("xtable.add.to.row", NULL), sanitize.text.function = getOption("xtable.sanitize.text.function", NULL), - sanitize.rownames.function = getOption("xtable.sanitize.rownames.function", + sanitize.rownames.function = getOption("xtable.sanitize.rownames.function", sanitize.text.function), - sanitize.colnames.function = getOption("xtable.sanitize.colnames.function", + sanitize.colnames.function = getOption("xtable.sanitize.colnames.function", sanitize.text.function), math.style.negative = getOption("xtable.math.style.negative", FALSE), html.table.attributes = getOption("xtable.html.table.attributes", @@ -62,7 +62,7 @@ Default value is \code{TRUE}. } \item{floating.environment}{If \code{floating=TRUE} and \code{type="latex"}, the resulting table uses the specified floating - environment. Possible values include \code{"table"}, \code{"table*"}, + environment. Possible values include \code{"table"}, \code{"table*"}, and other floating environments defined in LaTeX packages. Default value is \code{"table"}.} \item{table.placement}{If \code{floating=TRUE} and @@ -165,14 +165,14 @@ \code{tabularx}. Note that table width specification is not supported with the \code{tabular} or \code{longtable} environments. } \item{comment}{If \code{TRUE}, the version and timestamp comment is - included. Default value is \code{TRUE}. } + included. Default value is \code{TRUE}. } \item{timestamp}{Timestamp to include in LaTeX comment. Set this - to \code{NULL} to exclude the timestamp. Default value is \code{date()}. } + to \code{NULL} to exclude the timestamp. Default value is \code{date()}. } \item{...}{Additional arguments. (Currently ignored.) } } \details{ This function displays or writes to disk the code to produce a table - associated with an object \code{x} of class \code{"xtable"}. + associated with an object \code{x} of class \code{"xtable"}. The resulting code is either a LaTeX or HTML table, depending on the value of \code{type}. The function also (invisibly) returns a character vector of the results (which can be helpful for @@ -181,15 +181,15 @@ Since version 1.4 the non default behavior of \code{hline.after} is changed. To obtain the same results as the previous versions add to the \code{hline.after} vector the vector \code{c(-1, 0, nrow(x))} - where \code{nrow(x)} is the numbers of rows of the object. + where \code{nrow(x)} is the numbers of rows of the object. From version 1.4-3, all non-numeric columns are sanitized, and all LaTeX special characters are sanitised for LaTeX output. See Section 3 of the \code{xtableGallery} vignette for an example of customising the sanitization. From version 1.4-4, the sanitization also applies to column names. To remove any text sanitization, specify - \code{sanitize.text.function=function(x){x}}. - + \code{sanitize.text.function=function(x){x}}. + From version 1.6-1 the default values for the arguments other than \code{x} are obtainined using \code{getOption()}. Hence the user can set the values once with \code{options()} rather than setting them in @@ -201,10 +201,10 @@ arguments. The recommended approach is to specify \code{digits} supply the argument \code{digits} to \code{xtable}, and to specify \code{format} supply the argument \code{display} to \code{xtable}. See - the examples. + the examples. } \author{ - David Dahl \email{dahl@stat.tamu.edu} with contributions and + David Dahl \email{dahl@stat.byu.edu} with contributions and suggestions from many others (see source code). } \references{ @@ -213,9 +213,9 @@ Web. \url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=longtab} } \seealso{ - \code{\link{xtable}}, \code{\link{caption}}, \code{\link{label}}, + \code{\link{xtable}}, \code{\link{caption}}, \code{\link{label}}, \code{\link{align}}, \code{\link{digits}}, \code{\link{display}}, - \code{\link{formatC}} + \code{\link{formatC}} } \examples{ diff --git a/pkg/man/string.Rd b/pkg/man/string.Rd index f07fcf3..c117fcf 100644 --- a/pkg/man/string.Rd +++ b/pkg/man/string.Rd @@ -7,7 +7,7 @@ \title{String handling functions} \description{Private functions for conveniently working with strings.} \usage{ - string(text,file="",append=FALSE) + string(text,file="",append=FALSE) \method{print}{string}(x,...) \method{+}{string}(x,y) as.string(x,file="",append=FALSE) @@ -25,6 +25,6 @@ These functions are private functions used by \code{print.xtable}. They are not intended to be used elsewhere. } -\author{David Dahl \email{dahl@stat.tamu.edu} with contributions and suggestions from many others (see source code).} +\author{David Dahl \email{dahl@stat.byu.edu} with contributions and suggestions from many others (see source code).} \seealso{\code{\link{print.xtable}}} \keyword{print} diff --git a/pkg/man/table.attributes.Rd b/pkg/man/table.attributes.Rd index c109207..d9da8a7 100644 --- a/pkg/man/table.attributes.Rd +++ b/pkg/man/table.attributes.Rd @@ -42,6 +42,6 @@ These functions retrieve or set table attributes of the object \code{x} of class \code{"xtable"}. See \code{xtable} for a description of the options. } -\author{David Dahl \email{dahl@stat.tamu.edu} with contributions and suggestions from many others (see source code).} +\author{David Dahl \email{dahl@stat.byu.edu} with contributions and suggestions from many others (see source code).} \seealso{\code{\link{xtable}}, \code{\link{print.xtable}}, \code{\link{formatC}}} \keyword{print} diff --git a/pkg/man/xtable.Rd b/pkg/man/xtable.Rd index 52d91b9..005382c 100644 --- a/pkg/man/xtable.Rd +++ b/pkg/man/xtable.Rd @@ -82,7 +82,7 @@ xtable(x, caption = NULL, label = NULL, align = NULL, digits = NULL, \item{...}{Additional arguments. (Currently ignored.)} } \details{ - + This function extracts tabular information from \code{x} and returns an object of class \code{"xtable"}. The nature of the table generated depends on the class of \code{x}. For example, \code{aov} objects @@ -108,9 +108,9 @@ xtable(x, caption = NULL, label = NULL, align = NULL, digits = NULL, } \value{An object of class \code{"xtable"} which inherits the \code{data.frame} class and contains several additional attributes - specifying the table formatting options. + specifying the table formatting options. } -\author{David Dahl \email{dahl@stat.tamu.edu} with contributions and +\author{David Dahl \email{dahl@stat.byu.edu} with contributions and suggestions from many others (see source code). } \seealso{\code{\link{print.xtable}}, \code{\link{caption}}, @@ -218,7 +218,7 @@ print(fm1.table, format.args = list(big.mark = "'", decimal.mark = ",")) ## Demonstration of "short caption" support. fm1sc <- aov(tlimth ~ sex + ethnicty + grade, data = tli) -fm1sc.table <- xtable(fm1sc, +fm1sc.table <- xtable(fm1sc, caption = c("ANOVA Model with Predictors Sex, Ethnicity, and Grade", "ANOVA: Sex, Ethnicity, Grade")) print(fm1sc.table) @@ -228,14 +228,14 @@ print(fm1sc.table) x <- matrix(rnorm(1000), ncol = 10) x.big <- xtable(x, label = 'tabbig', caption = 'Example of longtable spanning several pages') -print(x.big, tabular.environment = 'longtable', floating = FALSE) +print(x.big, tabular.environment = 'longtable', floating = FALSE) x <- x[1:30, ] x.small <- xtable(x, label = 'tabsmall', caption = 'regular table env') -print(x.small) # default, no longtable +print(x.small) # default, no longtable ## Demonstration of sidewaystable support. ## Remember to insert \usepackage{rotating} on your LaTeX preamble -print(x.small, floating.environment = 'sidewaystable') +print(x.small, floating.environment = 'sidewaystable') if(require(stats, quietly = TRUE)) { ## Demonstrate prcomp @@ -251,7 +251,7 @@ if(require(stats, quietly = TRUE)) { # print(xtable(pr2)) } -## Demonstrate include.rownames, include.colnames, +## Demonstrate include.rownames, include.colnames, ## only.contents and add.to.row arguments set.seed(2345) res <- matrix(sample(0:9, size = 6*9, replace = TRUE), ncol = 6, nrow = 9) @@ -266,7 +266,7 @@ print(xres, add.to.row = addtorow, include.rownames = FALSE, include.colnames = TRUE, only.contents = TRUE, hline.after = c(0, 0, 9, 9)) -## Demonstrate include.rownames, include.colnames, +## Demonstrate include.rownames, include.colnames, ## only.contents and add.to.row arguments in Rweave files \dontrun{ @@ -275,7 +275,7 @@ print(xres, add.to.row = addtorow, include.rownames = FALSE, \begin{longtable}{ <>= cat(paste(c('c', rep('cc', 34/2-1), 'c'), collapse = '@{\\hspace{2pt}}')) - @ + @ } \hline \endhead @@ -315,9 +315,9 @@ print(tli.table, print(tli.table, booktabs = TRUE) print(tli.table, booktabs = TRUE, hline.after = c(-1,0)) print(tli.table, booktabs = TRUE, hline.after = NULL) -print(tli.table, booktabs = TRUE, +print(tli.table, booktabs = TRUE, add.to.row = list(pos = list(2), command = c("\\vspace{2mm} \n"))) -print(tli.table, booktabs = TRUE, add.to.row = list(pos = list(2), +print(tli.table, booktabs = TRUE, add.to.row = list(pos = list(2), command = c("youhou\n")), tabular.environment = "longtable") \testonly{ @@ -378,7 +378,7 @@ print(tli.table, booktabs = TRUE, add.to.row = list(pos = list(2), print(temp.table, type = i, file = outFileName, append = TRUE, caption.placement = "bottom", table.placement = "htb") } -} +} } \keyword{file} -- 2.39.5