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

diff --git a/pkg/DESCRIPTION b/pkg/DESCRIPTION
index eabc9e23a7b089e1311165ae4c5fc0f358ee14a8..26f88514299133998a0aa2a73745820322af3441 100644 (file)
--- a/pkg/DESCRIPTION
+++ b/pkg/DESCRIPTION
@@ -5,7 +5,7 @@ Title: Export Tables to LaTeX or HTML
 Author: David B. Dahl <dahl@stat.byu.edu>
 Maintainer: David Scott <d.scott@auckland.ac.nz>
 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 46c7f7b8d482c1a880a6f6415b600380ad790444..4c5f70976beb117b642292f4a62cde8081d95afd 100644 (file)
--- 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 4d86df2334e2c487a88a5469f565a90572784b24..0e9b33722ad048bac8483e5aed38cc51ffade193 100644 (file)
--- a/pkg/man/xtable-internal.Rd
+++ b/pkg/man/xtable-internal.Rd
@@ -2,8 +2,6 @@
 \alias{xtableList}\r
 \alias{print.xtableList}\r
 \alias{xtableLSMeans}\r
-\alias{xtableFtable}\r
-\alias{print.xtableFtable}\r
 \r
 \title{Internal xtable Functions}\r
 \description{\r
@@ -13,4 +11,4 @@
   Functions which are either not intended to be called by the user or\r
   are waiting to be documented.\r
 }\r
-\keyword{ internal }
\ No newline at end of file
+\keyword{ internal }\r

diff --git a/pkg/vignettes/OtherPackagesGallery.Rnw b/pkg/vignettes/OtherPackagesGallery.Rnw
index 145982fe6af3e64a36d760816ef28b5f6b38dd9e..d23db164c8848782ee75dc51808c938c5e95ca48 100644 (file)
--- a/pkg/vignettes/OtherPackagesGallery.Rnw
+++ b/pkg/vignettes/OtherPackagesGallery.Rnw
@@ -46,6 +46,7 @@ library(xtable)
 options(xtable.floating = FALSE)\r
 options(xtable.timestamp = "")\r
 options(width = 60)\r
+set.seed(1234)\r
 @\r
 \r
 \section{The packages \pkg{spdep}, \pkg{splm}, and \pkg{sphet}}\r
@@ -270,4 +271,43 @@ xtable(res.gstsls)
 xtable(imp.gstsls)\r
 @ %def\r
 \r
+\section{The \pkg{zoo} package}\r
+\label{sec:pkgzoo-package}\r
+\r
+ \r
+<<zoo, results = 'asis'>>=\r
+library(zoo)\r
+xDate <- as.Date("2003-02-01") + c(1, 3, 7, 9, 14) - 1\r
+as.ts(xDate)\r
+x <- zoo(rnorm(5), xDate)\r
+xtable(x)\r
+@ %def \r
+\r
+\r
+\p\r
+\r
+<<zoots, results = 'asis'>>=\r
+tempTs <- ts(cumsum(1 + round(rnorm(100), 0)),\r
+              start = c(1954, 7), frequency = 12)\r
+tempTable <- xtable(tempTs, digits = 0)\r
+tempTable\r
+tempZoo <- as.zoo(tempTs)\r
+xtable(tempZoo, digits = 0)\r
+@ %def \r
+\r
+\r
+\section{The \pkg{survival} package}\r
+\label{sec:pkgsurvival-package}\r
+\r
+ \r
+<<survival, results = 'asis'>>=\r
+library(survival)\r
+test1 <- list(time=c(4,3,1,1,2,2,3), \r
+              status=c(1,1,1,0,1,1,0), \r
+              x=c(0,2,1,1,1,0,0), \r
+              sex=c(0,0,0,0,1,1,1)) \r
+coxFit <- coxph(Surv(time, status) ~ x + strata(sex), test1) \r
+xtable(coxFit)\r
+@ %def \r
+\r
 \end{document}\r

diff --git a/pkg/vignettes/xtableGallery.Rnw b/pkg/vignettes/xtableGallery.Rnw
index 721b78ea7dc881ab4fce161389a8565946e63a75..f56fb74c7153c6a25fee8635e7395241fdc00ff9 100644 (file)
--- a/pkg/vignettes/xtableGallery.Rnw
+++ b/pkg/vignettes/xtableGallery.Rnw
@@ -85,6 +85,36 @@ fm2b <- lm(tlimth ~ ethnicty, data = tli)
 xtable(anova(fm2b, fm2))\r
 @\r
 \r
+\subsubsection{Anova list}\r
+\r
+<<aovlist>>=\r
+Block <- gl(8, 4)\r
+A <- factor(c(0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,\r
+              0,1,0,1,0,1,0,1,0,1,0,1))\r
+B <- factor(c(0,0,1,1,0,0,1,1,0,1,0,1,1,0,1,0,0,0,1,1,\r
+              0,0,1,1,0,0,1,1,0,0,1,1))\r
+C <- factor(c(0,1,1,0,1,0,0,1,0,0,1,1,0,0,1,1,0,1,0,1,\r
+              1,0,1,0,0,0,1,1,1,1,0,0))\r
+Yield <- c(101, 373, 398, 291, 312, 106, 265, 450, 106, 306, 324, 449,\r
+           272, 89, 407, 338, 87, 324, 279, 471, 323, 128, 423, 334,\r
+           131, 103, 445, 437, 324, 361, 302, 272)\r
+aovdat <- data.frame(Block, A, B, C, Yield)\r
+\r
+old <- getOption("contrasts")\r
+options(contrasts = c("contr.helmert", "contr.poly"))\r
+(fit <- aov(Yield ~ A*B*C + Error(Block), data = aovdat))\r
+class(fit)\r
+summary(fit)\r
+options(contrasts = old)\r
+@\r
+\r
+\p\r
+\r
+<<xtableaovlist, results='asis'>>=\r
+xtable(fit)\r
+@\r
+\r
+\r
 \newpage\r
 \subsection{glm}\r
 <<results='asis'>>=\r