From 2010af29eb3014154ff05685f2fd888653bdb995 Mon Sep 17 00:00:00 2001 From: dscott Date: Tue, 26 Jan 2016 04:51:23 +0000 Subject: [PATCH] Minor changes to vignettes. Also added documentation for flat tables. git-svn-id: svn://scm.r-forge.r-project.org/svnroot/xtable@99 edb9625f-4e0d-4859-8d74-9fd3b1da38cb --- pkg/DESCRIPTION | 2 +- pkg/R/xtableFtable.R | 7 +++-- pkg/man/xtable-internal.Rd | 4 +-- pkg/vignettes/OtherPackagesGallery.Rnw | 40 ++++++++++++++++++++++++++ pkg/vignettes/xtableGallery.Rnw | 30 +++++++++++++++++++ 5 files changed, 77 insertions(+), 6 deletions(-) diff --git a/pkg/DESCRIPTION b/pkg/DESCRIPTION index eabc9e2..26f8851 100644 --- a/pkg/DESCRIPTION +++ b/pkg/DESCRIPTION @@ -5,7 +5,7 @@ Title: Export Tables to LaTeX or HTML Author: David B. Dahl Maintainer: David Scott Imports: stats, utils -Suggests: knitr, lsmeans, spdep, splm, sphet, plm +Suggests: knitr, lsmeans, spdep, splm, sphet, plm, zoo, survival VignetteBuilder: knitr Description: Coerce data to LaTeX and HTML tables. URL: http://xtable.r-forge.r-project.org/ diff --git a/pkg/R/xtableFtable.R b/pkg/R/xtableFtable.R index 46c7f7b..4c5f709 100644 --- a/pkg/R/xtableFtable.R +++ b/pkg/R/xtableFtable.R @@ -1,7 +1,7 @@ ### ftable objects, requested by Charles Roosen ### Feature request #2248, 2/9/2012 xtableFtable <- function(x, caption = NULL, label = NULL, align = NULL, - digits = NULL, display = NULL, + digits = 0, display = NULL, quote = FALSE, method = c("non.compact", "row.compact", "col.compact", "compact"), @@ -155,7 +155,10 @@ print.xtableFtable <- function(x, } - print.xtable(fmtFtbl, hline.after = c(-1, nCharRows, dim(fmtFtbl)[1]), + if(is.null(hline.after)) { + hline.after <- c(-1, nCharRows, dim(fmtFtbl)[1]) + } + print.xtable(fmtFtbl, hline.after = hline.after, include.rownames = FALSE, include.colnames = FALSE, booktabs = booktabs, sanitize.text.function = function(x){x}) diff --git a/pkg/man/xtable-internal.Rd b/pkg/man/xtable-internal.Rd index 4d86df2..0e9b337 100644 --- a/pkg/man/xtable-internal.Rd +++ b/pkg/man/xtable-internal.Rd @@ -2,8 +2,6 @@ \alias{xtableList} \alias{print.xtableList} \alias{xtableLSMeans} -\alias{xtableFtable} -\alias{print.xtableFtable} \title{Internal xtable Functions} \description{ @@ -13,4 +11,4 @@ Functions which are either not intended to be called by the user or are waiting to be documented. } -\keyword{ internal } \ No newline at end of file +\keyword{ internal } diff --git a/pkg/vignettes/OtherPackagesGallery.Rnw b/pkg/vignettes/OtherPackagesGallery.Rnw index 145982f..d23db16 100644 --- a/pkg/vignettes/OtherPackagesGallery.Rnw +++ b/pkg/vignettes/OtherPackagesGallery.Rnw @@ -46,6 +46,7 @@ library(xtable) options(xtable.floating = FALSE) options(xtable.timestamp = "") options(width = 60) +set.seed(1234) @ \section{The packages \pkg{spdep}, \pkg{splm}, and \pkg{sphet}} @@ -270,4 +271,43 @@ xtable(res.gstsls) xtable(imp.gstsls) @ %def +\section{The \pkg{zoo} package} +\label{sec:pkgzoo-package} + + +<>= +library(zoo) +xDate <- as.Date("2003-02-01") + c(1, 3, 7, 9, 14) - 1 +as.ts(xDate) +x <- zoo(rnorm(5), xDate) +xtable(x) +@ %def + + +\p + +<>= +tempTs <- ts(cumsum(1 + round(rnorm(100), 0)), + start = c(1954, 7), frequency = 12) +tempTable <- xtable(tempTs, digits = 0) +tempTable +tempZoo <- as.zoo(tempTs) +xtable(tempZoo, digits = 0) +@ %def + + +\section{The \pkg{survival} package} +\label{sec:pkgsurvival-package} + + +<>= +library(survival) +test1 <- list(time=c(4,3,1,1,2,2,3), + status=c(1,1,1,0,1,1,0), + x=c(0,2,1,1,1,0,0), + sex=c(0,0,0,0,1,1,1)) +coxFit <- coxph(Surv(time, status) ~ x + strata(sex), test1) +xtable(coxFit) +@ %def + \end{document} diff --git a/pkg/vignettes/xtableGallery.Rnw b/pkg/vignettes/xtableGallery.Rnw index 721b78e..f56fb74 100644 --- a/pkg/vignettes/xtableGallery.Rnw +++ b/pkg/vignettes/xtableGallery.Rnw @@ -85,6 +85,36 @@ fm2b <- lm(tlimth ~ ethnicty, data = tli) xtable(anova(fm2b, fm2)) @ +\subsubsection{Anova list} + +<>= +Block <- gl(8, 4) +A <- factor(c(0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1, + 0,1,0,1,0,1,0,1,0,1,0,1)) +B <- factor(c(0,0,1,1,0,0,1,1,0,1,0,1,1,0,1,0,0,0,1,1, + 0,0,1,1,0,0,1,1,0,0,1,1)) +C <- factor(c(0,1,1,0,1,0,0,1,0,0,1,1,0,0,1,1,0,1,0,1, + 1,0,1,0,0,0,1,1,1,1,0,0)) +Yield <- c(101, 373, 398, 291, 312, 106, 265, 450, 106, 306, 324, 449, + 272, 89, 407, 338, 87, 324, 279, 471, 323, 128, 423, 334, + 131, 103, 445, 437, 324, 361, 302, 272) +aovdat <- data.frame(Block, A, B, C, Yield) + +old <- getOption("contrasts") +options(contrasts = c("contr.helmert", "contr.poly")) +(fit <- aov(Yield ~ A*B*C + Error(Block), data = aovdat)) +class(fit) +summary(fit) +options(contrasts = old) +@ + +\p + +<>= +xtable(fit) +@ + + \newpage \subsection{glm} <>= -- 2.39.2