Fixed passing of arguments to print.xtableFtable

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

diff --git a/pkg/DESCRIPTION b/pkg/DESCRIPTION
index 26f88514299133998a0aa2a73745820322af3441..c6fac0d95b38c6e055378936313560bd29977773 100644 (file)
--- a/pkg/DESCRIPTION
+++ b/pkg/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: xtable
-Version: 1.8-2
-Date: 2016-01-08
+Version: 1.8-3
+Date: 2016-03-04
 Title: Export Tables to LaTeX or HTML
 Author: David B. Dahl <dahl@stat.byu.edu>
 Maintainer: David Scott <d.scott@auckland.ac.nz>

diff --git a/pkg/NEWS b/pkg/NEWS
index 9c2291e186f77db038e3306a36ec4bdca7618e1a..366728731b7ca939153e55725237a12994394767 100644 (file)
--- a/pkg/NEWS
+++ b/pkg/NEWS
@@ -1,4 +1,9 @@
-1.8-2 (NOT YET SUBMITTED TO CRAN)
+1.8-3 (NOT YET SUBMITTED TO CRAN)
+  * Corrected call to print.xtable inside print.xtableFtable included
+    arguments from call to print.xtableFtable. Absence of size
+    argumnet was advised by Lluis Ramon, email March 4, 2016
+  
+1.8-2 (2016-02-05)
   * Added function print.xtableMatharray to enable easy creation of
     LaTeX code to enable an array to be included in a document.
   * Added example to the gallery using sanitizing headings and row

diff --git a/pkg/R/xtableFtable.R b/pkg/R/xtableFtable.R
index 72964d86d9e75da88aba3497c8fd531538098792..3dc83d388bab6a7cc6bd8d7cfb68fb06a11314e8 100644 (file)
--- a/pkg/R/xtableFtable.R
+++ b/pkg/R/xtableFtable.R
@@ -110,7 +110,7 @@ print.xtableFtable <- function(x,
     nCharCols <- attr(x, "nChars")[2]
     nRowVars <- length(attr(x, "row.vars"))
     nColVars <- length(attr(x, "col.vars"))
-    
+
     ## change class so format method will find format.ftable
     ## even though format.ftable is not exported from 'stats'
     class(x) <- "ftable"
@@ -180,18 +180,31 @@ print.xtableFtable <- function(x,
     print.xtable(fmtFtbl, hline.after = hline.after,
                  include.rownames = FALSE, include.colnames = FALSE,
                  booktabs = booktabs,
-                 sanitize.text.function = as.is)
+                 sanitize.text.function = as.is,
+                 file = file,
+                 append = append,
+                 floating = floating,
+                 floating.environment = floating.environment,
+                 table.placement = table.placement,
+                 caption.placement = caption.placement,
+                 caption.width = caption.width,
+                 latex.environments = latex.environments,
+                 tabular.environment = tabular.environment,
+                 size = size,
+                 NA.string = NA.string,
+                 only.contents = only.contents,
+                 add.to.row = add.to.row,,
+                 math.style.negative = math.style.negative,
+                 math.style.exponents = math.style.exponents,
+                 print.results = print.results,
+                 format.args = format.args,
+                 scalebox = scalebox,
+                 width = width,
+                 comment = comment,
+                 timestamp = timestamp,
+                 ...)
   } else {
     stop("print.xtableFtable not yet implemented for this type")
   }
 }
 
-## format.xtableFtable <- function(x, quote = TRUE, digits = getOption("digits"),
-##                                 method = c("non.compact", "row.compact",
-##                                            "col.compact", "compact"),
-##                                 lsep = " | ", ...){
-##   class(x) <- "ftable"
-  
-##   format(x, quote = quote, digits = digits,
-##          method = method, lsep = lsep, ...)
-## }