Added support for spdep, splm and sphet summary tables

git-svn-id: svn://scm.r-forge.r-project.org/svnroot/xtable@80 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

diff --git a/pkg/NAMESPACE b/pkg/NAMESPACE
index 7b559b005844912ed198f9a24c883b49c8119a04..3ba56cb85423be67279c159c36c0e411e968f939 100644 (file)
--- a/pkg/NAMESPACE
+++ b/pkg/NAMESPACE
@@ -5,7 +5,7 @@ importFrom("utils", "packageDescription")
 export("caption<-", "caption", "label", "label<-",
        "align<-", "align", "digits<-", "digits", "display<-",
        "display", "xtable",
-       "xtableMatharray","xtableList", "xtablelsmeans",
+       "xtableMatharray","xtableList", "xtableLSMeans",
        "print.xtable", "print.xtableMatharray", "print.xtableList",
        "toLatex.xtable",
        "autoformat", "xalign", "xdigits", "xdisplay")
@@ -53,4 +53,5 @@ S3method("xtable", "splm")
 S3method("xtable", "summary.splm")
 S3method("xtable", "sphet")
 S3method("xtable", "summary.sphet")
-
+S3method("xtable", "spautolm")
+S3method("xtable", "summary.spautolm")

diff --git a/pkg/R/xtable.R b/pkg/R/xtable.R
index 65473da3422b4fc1b77ce6b0cb6dfea235bbaaa2..647276d704205a90b81783466933d99d59a80485 100644 (file)
--- a/pkg/R/xtable.R
+++ b/pkg/R/xtable.R
@@ -305,7 +305,9 @@ xtable.zoo <- function(x, ...) {
   return(xtable(as.ts(x), ...))
 }
 
-
+### Date: Fri, 29 May 2015 11:41:04 +0200
+### From: Martin G. <martin.gubri@framasoft.org>
+### Subject: [xtable] Code for spdep, splm and sphet objects outputs
 ### package spdep
 ### sarlm objects
 xtable.sarlm <- function(x, caption = NULL, label = NULL, align = NULL,
@@ -332,12 +334,32 @@ xtable.summary.sarlm <- function(x, caption = NULL, label = NULL, align = NULL,
   return(x)
 }
 
+### spautolm objects: added by David Scott, 6/1/2016, after suggestion by
+### Guido Schulz
+### Date: Wed, 29 Apr 2015 10:45:16 +0200
+### Guido Schulz <schulzgu@student.hu-berlin.de>
+xtable.spautolm <- function(x, caption = NULL, label = NULL, align = NULL,
+                            digits = NULL, display = NULL, auto = FALSE, ...) {
+  return(xtable.summary.sarlm(summary(x), caption = caption, label = label,
+                              align = align, digits = digits,
+                              display = display, auto = auto))
+}
+
+xtable.summary.spautolm <- function(x, caption = NULL, label = NULL,
+                                    align = NULL, digits = NULL,
+                                    display = NULL, auto = FALSE, ...) {
+  return(xtable.summary.sarlm(summary(x), caption = caption, label = label,
+                              align = align, digits = digits,
+                              display = display, auto = auto))
+}
+
+
 ### gmsar objects
 xtable.gmsar <- function(x, caption = NULL, label = NULL, align = NULL,
                          digits = NULL, display = NULL, auto = FALSE, ...) {
   return(xtable.summary.sarlm(summary(x), caption = caption, label = label,
                               align = align, digits = digits,
-                              display = display, auto = auto))
+                              display = display, auto = auto, ...))
 }
 
 xtable.summary.gmsar <- function(x, caption = NULL, label = NULL, align = NULL,
@@ -353,7 +375,7 @@ xtable.stsls <- function(x, caption = NULL, label = NULL, align = NULL,
                          digits = NULL, display = NULL, auto = FALSE, ...) {
   return(xtable.summary.sarlm(summary(x), caption = caption, label = label,
                               align = align, digits = digits,
-                              display = display, auto = auto))
+                              display = display, auto = auto, ...))
 }
 
 xtable.summary.stsls <- function(x, caption = NULL, label = NULL, align = NULL,

diff --git a/pkg/R/xtableList.R b/pkg/R/xtableList.R
index 4ed695cb496afae4644e3671571967a25d45ad0d..35736f0682fbe66896fe4b5bc31ac2951af758c3 100644 (file)
--- a/pkg/R/xtableList.R
+++ b/pkg/R/xtableList.R
@@ -27,7 +27,7 @@ xtableList <- function(x, caption = NULL, label = NULL, align = NULL,
   attr(xList, "message") <- attr(x, "message")\r
   attr(xList, "caption") <- caption\r
   attr(xList, "label") <- label\r
-  class(xList) <- c("xtableList", "data.frame")\r
+  class(xList) <- c("xtableList")\r
   return(xList)\r
 }\r
 \r
@@ -180,7 +180,7 @@ print.xtableList <- function(x,
 \r
 \r
 ### Uses xtableList\r
-xtablelsmeans <- function(x, caption = NULL, label = NULL,\r
+xtableLSMeans <- function(x, caption = NULL, label = NULL,\r
                            align = NULL, digits = NULL,\r
                            display = NULL, auto = FALSE,\r
                            ...){\r

diff --git a/pkg/man/xtable-internal.Rd b/pkg/man/xtable-internal.Rd
index 67f479f5b30f75c70d74f81b77b4fb7ea0b6c06e..1e0bd4dec7d1b6e7c82d242ef2306c16ba4befd5 100644 (file)
--- a/pkg/man/xtable-internal.Rd
+++ b/pkg/man/xtable-internal.Rd
@@ -2,7 +2,7 @@
 \alias{xtableMatharray}\r
 \alias{xtableList}\r
 \alias{print.xtableList}\r
-\alias{xtablelsmeans}\r
+\alias{xtableLSMeans}\r
 \r
 \title{Internal xtable Functions}\r
 \description{\r

diff --git a/pkg/man/xtable.Rd b/pkg/man/xtable.Rd
index 50f6a77684eb3bdfdeb6dfbbc7e4a2ab817eeb8c..9b41fb9090d66baf78af627131a575bf35fa1349 100644 (file)
--- a/pkg/man/xtable.Rd
+++ b/pkg/man/xtable.Rd
@@ -28,7 +28,8 @@
 \alias{xtable.summary.splm}
 \alias{xtable.sphet}
 \alias{xtable.summary.sphet}
-
+\alias{xtable.spautolm}
+\alias{xtable.summary.spautolm}
 
 
 \title{Create Export Tables}

diff --git a/pkg/vignettes/listOfTablesGallery.Rnw b/pkg/vignettes/listOfTablesGallery.Rnw
index be627e6861b78ce0918894e03b793e0206d6ecf2..e32d2835dbc907d47ee4d817be21bf5f9c544fa1 100644 (file)
--- a/pkg/vignettes/listOfTablesGallery.Rnw
+++ b/pkg/vignettes/listOfTablesGallery.Rnw
@@ -22,8 +22,8 @@
 \setcounter{tocdepth}{2}\r
 \begin{document}\r
 \r
-\title{The \code{xtableList} Gallery}\r
-\author{David J. Scott}\r
+\title{\bfseries\Large The \code{xtableList} Gallery}\r
+\author{\bfseries David J. Scott}\r
 \maketitle\r
 \r
 \tableofcontents\r
@@ -189,7 +189,9 @@ print.xtableList(xList, colnames.format = "multiple",
 \label{sec:lsmeans}\r
 \r
 Summaries from the \code{lsmeans} function from the \pkg{lsmeans}\r
-package can easily be produced.\r
+package can easily be produced using the function\r
+\code{xtableLSMeans}. This function produces a list of \pkg{xtable}\r
+objects.\r
 \r
 \r
 <<lsmeans>>=\r
@@ -197,7 +199,7 @@ library(lsmeans)
 warp.lm <- lm(breaks ~ wool*tension, data = warpbreaks)\r
 warp.lsm <- lsmeans(warp.lm, ~ tension | wool)\r
 warp.sum <- summary(warp.lsm, adjust = "mvt")\r
-warp.xtblList <- xtablelsmeans(warp.sum, digits = c(0,0,2,2,0,2,2))\r
+warp.xtblList <- xtableLSMeans(warp.sum, digits = c(0,0,2,2,0,2,2))\r
 str(warp.xtblList)\r
 @ %def\r
 \r