version 0.4-11

cran · Aug 22, 2013 · f01ac37 · f01ac37
1 parent 577bafe
commit f01ac37
Show file tree

Hide file tree

Showing 32 changed files with 64 additions and 631 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,18 +1,17 @@
 Package: rtf
-Version: 0.4-10
+Version: 0.4-11
 Depends: R (>= 2.10.1)
 Imports: R.oo, R.methodsS3
 Suggests: ggplot2, lattice, grid, xtable, gsubfn
-Date: 2013-08-20
+Date: 2013-08-22
 Title: Rich Text Format (RTF) Output
-Authors@R: c(person("Michael", "Schaffer", role=c("aut", "cre", "cph"),
-                                          email = "mschaff@gmail.com"))
-Author: Michael E. Schaffer
-Maintainer: Michael E. Schaffer <mschaff@gmail.com>
+Authors@R: c(person(c("Michael","E."), "Schaffer", role=c("aut", "cre", "cph"), email = "mschaff@gmail.com"))
 Description: A set of R functions to output Rich Text Format (RTF) files with high resolution tables and graphics that may be edited with a standard word processor such as Microsoft Word.
 License: GPL (>= 2)
 LazyLoad: TRUE
-Packaged: 2013-08-20 23:08:01 UTC; mschaff
+Packaged: 2013-11-12 12:21:59 UTC; mschaff
 NeedsCompilation: no
 Repository: CRAN
-Date/Publication: 2013-08-21 06:47:33
+Date/Publication: 2013-11-12 14:19:04
+Author: Michael E. Schaffer [aut, cre, cph]
+Maintainer: Michael E. Schaffer <mschaff@gmail.com>
diff --git a/MD5 b/MD5
@@ -1,39 +1,38 @@
-921b4f2b4d08982192f90f00c19c0442 *DESCRIPTION
+eab2f611c34479463b255138733b4206 *DESCRIPTION
 5d6ee6f3954cb58f7d21960208eaec8d *NAMESPACE
-1216e133ec8fb53e6ec0067ad864ed1e *NEWS
+9457c4ccd1a19958bf5bfad76ce2bd66 *NEWS
 c70b4f49da19d10a1caa5eea5a0b1646 *R/000.R
 5b3829e46dfdaab40048f81006bc223f *R/999.NonDocumentedObjects.R
 e8a3d5d61e56d96501584618f59e23c0 *R/999.package.R
 43df9ca89bfd981ea655b4e217c46fd9 *R/forest.plot.R
-ad176ce0707f79783e99dbd69b91a29e *R/rtf.R
+e852554da9d32f5f05588298494362bc *R/rtf.R
+093acfad4a4f867aeec7370383806dc3 *build/vignette.rds
 d011ae55f424f023ae6fbef4ff694983 *inst/doc/rtf.R
 34575410fff43c3fc819104cda716036 *inst/doc/rtf.Rnw
 e87236d58389319d01a7002d26601d5b *inst/doc/rtf.pdf
-f9d6ad63bbc90c23c1342beefd9e720d *man/Non-documented_objects.Rd
-e1768177d2e606d16000324909250f2c *man/RTF.Rd
-f8c4d911c2b7b9f481883b2bb20c0a96 *man/addHeader.RTF.Rd
-b339f3c98b6042a27f37adc814dd9cf3 *man/addNewLine.RTF.Rd
-df527a403b0e2b69d79a5d437bf5ebba *man/addPageBreak.RTF.Rd
-a5ed1351b31ea20fbf634e6e4de5e9e5 *man/addParagraph.RTF.Rd
-0cd44d5c21b20f85a004de37d33c5b5e *man/addPlot.RTF.Rd
-062e99a753f29f0bb70893be912da423 *man/addPng.RTF.Rd
-d3eca50441d18a9912bc178054f36ce2 *man/addSessionInfo.RTF.Rd
-531b2828f9e6d36df7dab5d5140c82e0 *man/addTOC.RTF.Rd
-c9c620aea9f2128a9ea9c25d86325ff8 *man/addTable.RTF.Rd
-2eff3aa2adff7d08b377f3bc8cf4bcf2 *man/addText.RTF.Rd
-7c768d097f44cbb7b48fd827d9afdb21 *man/addTrellisObject.RTF.Rd
-086b986e5546bd2a2b5c87464081c3b7 *man/decreaseIndent.RTF.Rd
-c181430c6827969eacafb9ffa6bfa96a *man/done.RTF.Rd
-93416723c9e9f3aea1fc3bfb9af95028 *man/endParagraph.RTF.Rd
-e3ebc38838a4b9da8076ca7ac57c0199 *man/increaseIndent.RTF.Rd
-bef7b88a72a945a3387aec784a828152 *man/rtf-package.Rd
+3dc27d9397bf3d389a60b73d012e527a *man/Non-documented_objects.Rd
+d2e204d8d720b115c3a4d90eecc755fd *man/RTF.Rd
+bb6195f3c38920a8d13ab0d3767d8ffa *man/addHeader.RTF.Rd
+b263cbecb4eed4461f018f6faea8e3ec *man/addNewLine.RTF.Rd
+7b4b105758c9c165f1a3e6a0be7bd86b *man/addPageBreak.RTF.Rd
+617a00e0b7dd06a4c767862183bd66f8 *man/addParagraph.RTF.Rd
+e418b351739037a9b0b340c49852bb7b *man/addPlot.RTF.Rd
+1aac57dc611a986b5d47294c8dfa6d67 *man/addPng.RTF.Rd
+4915cd23f47330fa2bd95597e8142b78 *man/addSessionInfo.RTF.Rd
+b9d5cbd8b272d222d83fc75278b9e97d *man/addTOC.RTF.Rd
+52321e6c6d2dbbc3bd18df8abed9b715 *man/addTable.RTF.Rd
+6fee3cf84092ff04679757057662951c *man/addText.RTF.Rd
+40a69565ff7504e8b0361b27cf7ec903 *man/addTrellisObject.RTF.Rd
+a17f83c1f2442559a40ff02b804b5346 *man/decreaseIndent.RTF.Rd
+ad492798a2c2cbad46781e52d6dcee5a *man/done.RTF.Rd
+1db9200e377bc4973ac3dfe73c9bfeda *man/endParagraph.RTF.Rd
+b71c5f88c5bd2130adf6681e5ddadd60 *man/increaseIndent.RTF.Rd
+465ff3fe0b9f807f932da69470458287 *man/rtf-package.Rd
 97c50b2fa4a3c9a3adff35d52f6f1f8d *man/rtf.forest.plot.Rd
-523249c7594c1b9a900786ca8342a9e6 *man/setFontSize.RTF.Rd
-f964bfbda9caf24a913dfcaf54e148dc *man/startParagraph.RTF.Rd
-0eb4efb03be9fff1f8b24ce3b8651a3e *man/view.RTF.Rd
+d82b3c397c339f67c982b430523de204 *man/setFontSize.RTF.Rd
+215f129af18f2b3cf6900dcd472ef046 *man/startParagraph.RTF.Rd
+dcb400c9b1de65af049cf18dd74dbe74 *man/view.RTF.Rd
 2273e5f32ab901f9a00e568dd501e175 *tests/tests.R
+c49cdb7d09a0185ce0ce71d7ffdf6750 *vignettes/rtf-019.pdf
+7480ea252f69ac86fe79b0eb7f3d84f2 *vignettes/rtf-021.pdf
 34575410fff43c3fc819104cda716036 *vignettes/rtf.Rnw
-26e77bf298c80bfdcac8bfd107bd25c6 *vignettes/rtf.aux
-a041eb1c2c304b71da044690935d011e *vignettes/rtf.log
-a26e703f78d89953c6c64a5b0880bde3 *vignettes/rtf.out
-a8efdfffdbb8258a0674b3b245fb34d0 *vignettes/rtf.toc
diff --git a/NEWS b/NEWS
@@ -1,3 +1,7 @@
+CHANGES IN 0.4-11 (2013-11-12)
+-----------------------------
+Changed to author to use Authors@R
+
 CHANGES IN 0.4-10 (2013-08-20)
 -----------------------------
 Changed imports to include R.methodsS3.

diff --git a/R/rtf.R b/R/rtf.R
@@ -1104,11 +1104,14 @@ setMethodS3("addSessionInfo", "RTF", function(this, locale = TRUE, ...) {
 		# Total rows
 		ret<-paste(ret,.add.table.row(c("Total",paste(as.character(dat$col.margin),paste(" (",sprintf("%0.1f",dat$col.margin/grand.total*100),"%)",sep="")),as.character(grand.total)),col.widths,font.size=font.size,last.row=TRUE,indent=indent, space.before=space.before, space.after=space.after),sep="")
 
-	} else if ("matrix" %in% class(dat) & !is.null(attributes(dat)$"start cell")) { # handle etables
+	# handle etables (etables are just matrices with a 'start cell' defined)
+	} else if ("matrix" %in% class(dat) & !is.null(attributes(dat)$"start cell")) { 
 		start.row<-attributes(dat)$"start cell"[1]
 
 		# convert matrix to data frame
 		dat<-as.data.frame(dat,stringsAsFactors=FALSE)
+		dat[is.na(dat)] <- NA.string
+		dat[dat=="NA"] <- NA.string
 
 		# if no column widths are specified, then calculate optimal sizes that fit the page
 		if(is.null(col.widths) & !is.null(max.table.width)) {

diff --git a/build/vignette.rds b/build/vignette.rds
diff --git a/man/Non-documented_objects.Rd b/man/Non-documented_objects.Rd
@@ -44,7 +44,7 @@
   in reality.
 }
 
-\author{Michael Schaffer}
+\author{Michael E. Schaffer}
 
 
 \keyword{documentation}

diff --git a/man/RTF.Rd b/man/RTF.Rd
@@ -70,7 +70,7 @@ RTF(file="", width=8.5, height=11, omi=c(1, 1, 1, 1), font.size=10)
 
 
  \bold{Methods inherited from Object}:\cr
-$, $<-, [[, [[<-, as.character, attach, attachLocally, clearCache, clearLookupCache, clone, detach, equals, extend, finalize, gc, getEnvironment, getFieldModifier, getFieldModifiers, getFields, getInstantiationTime, getStaticInstance, hasField, hashCode, ll, load, objectSize, print, registerFinalizer, save
+$, $<-, [[, [[<-, as.character, attach, attachLocally, clearCache, clearLookupCache, clone, detach, equals, extend, finalize, gc, getEnvironment, getFieldModifier, getFieldModifiers, getFields, getInstantiationTime, getStaticInstance, hasField, hashCode, ll, load, objectSize, print, save
 
 
  }
@@ -109,7 +109,7 @@ $, $<-, [[, [[<-, as.character, attach, attachLocally, clearCache, clearLookupCa
  }
  }
 
- \author{Michael Schaffer}
+ \author{Michael E. Schaffer}
 
  \seealso{
  	For more information see \code{\link{RTF}}.

diff --git a/man/addHeader.RTF.Rd b/man/addHeader.RTF.Rd
@@ -30,7 +30,7 @@
  	\item{...}{Not used.}
  }
 
- \author{Michael Schaffer}
+ \author{Michael E. Schaffer}
 
  \seealso{
    For more information see \code{\link{RTF}}.

diff --git a/man/addNewLine.RTF.Rd b/man/addNewLine.RTF.Rd
@@ -27,7 +27,7 @@
  	\item{...}{Not used.}
  }
 
- \author{Michael Schaffer}
+ \author{Michael E. Schaffer}
 
  \seealso{
    For more information see \code{\link{RTF}}.

diff --git a/man/addPageBreak.RTF.Rd b/man/addPageBreak.RTF.Rd
@@ -35,7 +35,7 @@
  done(rtf)
  }
 
- \author{Michael Schaffer}
+ \author{Michael E. Schaffer}
 
  \seealso{
  	For more information see \code{\link{RTF}}.

diff --git a/man/addParagraph.RTF.Rd b/man/addParagraph.RTF.Rd
@@ -26,7 +26,7 @@
  	\item{...}{A character \code{\link[base]{vector}} of text to add.}
  }
 
- \author{Michael Schaffer}
+ \author{Michael E. Schaffer}
 
  \seealso{
    For more information see \code{\link{RTF}}.

diff --git a/man/addPlot.RTF.Rd b/man/addPlot.RTF.Rd
@@ -47,7 +47,7 @@
  done(rtf)
  }
 
- \author{Michael Schaffer}
+ \author{Michael E. Schaffer}
 
  \seealso{
    For more information see \code{\link{RTF}}.

diff --git a/man/addPng.RTF.Rd b/man/addPng.RTF.Rd
@@ -33,7 +33,7 @@
  	Add existing PNG file to RTF document.
  }
 
- \author{Michael Schaffer}
+ \author{Michael E. Schaffer}
 
  \seealso{
    For more information see \code{\link{RTF}}.

diff --git a/man/addSessionInfo.RTF.Rd b/man/addSessionInfo.RTF.Rd
@@ -37,7 +37,7 @@
  done(rtf)
  }
 
- \author{Michael Schaffer}
+ \author{Michael E. Schaffer}
 
  \seealso{
    For more information see \code{\link{RTF}}., \code{\link{sessionInfo}}.

diff --git a/man/addTOC.RTF.Rd b/man/addTOC.RTF.Rd
@@ -26,7 +26,7 @@
  	\item{...}{Not used.}
  }
 
- \author{Michael Schaffer}
+ \author{Michael E. Schaffer}
 
  \seealso{
    For more information see \code{\link{RTF}}.

diff --git a/man/addTable.RTF.Rd b/man/addTable.RTF.Rd
@@ -49,7 +49,7 @@
  done(rtf)
  }
 
- \author{Michael Schaffer}
+ \author{Michael E. Schaffer}
 
  \seealso{
  	For more information see \code{\link{RTF}}.

diff --git a/man/addText.RTF.Rd b/man/addText.RTF.Rd
@@ -28,7 +28,7 @@
  	\item{...}{Any number of character strings to concatenate.}
  }
 
- \author{Michael Schaffer}
+ \author{Michael E. Schaffer}
 
  \seealso{
    For more information see \code{\link{RTF}}.

diff --git a/man/addTrellisObject.RTF.Rd b/man/addTrellisObject.RTF.Rd
@@ -53,7 +53,7 @@
  }
  }
 
- \author{Michael Schaffer}
+ \author{Michael E. Schaffer}
 
  \seealso{
    For more information see \code{\link{RTF}}.

diff --git a/man/decreaseIndent.RTF.Rd b/man/decreaseIndent.RTF.Rd
@@ -26,7 +26,7 @@
  	\item{...}{Not used.}
  }
 
- \author{Michael Schaffer}
+ \author{Michael E. Schaffer}
 
  \seealso{
    For more information see \code{\link{RTF}}.

diff --git a/man/done.RTF.Rd b/man/done.RTF.Rd
@@ -26,7 +26,7 @@
  	\item{...}{Not used.}
  }
 
- \author{Michael Schaffer}
+ \author{Michael E. Schaffer}
 
  \seealso{
  	For more information see \code{\link{RTF}}.

diff --git a/man/endParagraph.RTF.Rd b/man/endParagraph.RTF.Rd
@@ -26,7 +26,7 @@
  	\item{...}{Not used.}
  }
 
- \author{Michael Schaffer}
+ \author{Michael E. Schaffer}
 
  \seealso{
    For more information see \code{\link{RTF}}.

diff --git a/man/increaseIndent.RTF.Rd b/man/increaseIndent.RTF.Rd
@@ -26,7 +26,7 @@
  	\item{...}{Not used.}
  }
 
- \author{Michael Schaffer}
+ \author{Michael E. Schaffer}
 
  \seealso{
    For more information see \code{\link{RTF}}.

diff --git a/man/rtf-package.Rd b/man/rtf-package.Rd
@@ -47,7 +47,7 @@
    For usage details \code{\link{RTF}}.
  }
 
- \author{Michael Schaffer}
+ \author{Michael E. Schaffer}
 
  \references{
  [1] \url{http://en.wikipedia.org/wiki/Rich_Text_Format}\cr

diff --git a/man/setFontSize.RTF.Rd b/man/setFontSize.RTF.Rd
@@ -27,7 +27,7 @@
  	\item{...}{Not used.}
  }
 
- \author{Michael Schaffer}
+ \author{Michael E. Schaffer}
 
  \seealso{
    For more information see \code{\link{RTF}}.

diff --git a/man/startParagraph.RTF.Rd b/man/startParagraph.RTF.Rd
@@ -26,7 +26,7 @@
  	\item{...}{Not used.}
  }
 
- \author{Michael Schaffer}
+ \author{Michael E. Schaffer}
 
  \seealso{
    For more information see \code{\link{RTF}}.

diff --git a/man/view.RTF.Rd b/man/view.RTF.Rd
@@ -30,7 +30,7 @@
  	Output the content of the object as RTF code.
  }
 
- \author{Michael Schaffer}
+ \author{Michael E. Schaffer}
 
  \seealso{
  	For more information see \code{\link{RTF}}.

diff --git a/vignettes/rtf-019.pdf b/vignettes/rtf-019.pdf
diff --git a/vignettes/rtf-021.pdf b/vignettes/rtf-021.pdf
diff --git a/vignettes/rtf.aux b/vignettes/rtf.aux