From e5bebf0ad92bc44a6a468ce99e691d3ffa7811b3 Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Mon, 1 Aug 2016 14:49:55 -0700
Subject: [PATCH] use grid:: and Cairo::

---
 R/bookmarks.R            | 4 ++--
 R/raster_plots.R         | 2 +-
 man/make.pdf.bookmark.Rd | 2 +-
 man/start_rasterplot.Rd  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/R/bookmarks.R b/R/bookmarks.R
index 30bd12f..c1d5281 100644
--- a/R/bookmarks.R
+++ b/R/bookmarks.R
@@ -19,7 +19,7 @@ CairoHacks.env$current_page <- 0
 ##' @author Don Armstrong <don@@donarmstrong.com>
 ##' @export
 ##' @examples
-##' CairoPDF(file="example.pdf",onefile=TRUE)
+##' Cairo::CairoPDF(file="example.pdf",onefile=TRUE)
 ##' plot(y~x,data.frame(x=1:5,y=1:5))
 ##' bookmarks <- make.pdf.bookmark("First plot")
 ##' plot(y~x,data.frame(x=1:5,y=1:5))
@@ -28,7 +28,7 @@ CairoHacks.env$current_page <- 0
 ##' write.pdf.bookmarks(file="example.pdf",bookmarks)
 make.pdf.bookmark <- function(text,level=1,page=NULL) {
     if (!CairoHacks.env$device_set_up) {
-        Cairo.onSave(device = grDevices::dev.cur(),
+        Cairo::Cairo.onSave(device = grDevices::dev.cur(),
                      onSave=function(device,page){
                          ch <- getNamespace("CairoHacks")
                          print(ls(envir=ch))
diff --git a/R/raster_plots.R b/R/raster_plots.R
index 419c5de..87c19cc 100644
--- a/R/raster_plots.R
+++ b/R/raster_plots.R
@@ -27,7 +27,7 @@
 ##'             data=data.frame(y=rnorm(1E4),
 ##'                             x=rnorm(1E4))))
 ##' raster.image <- stop_rasterplot(plot=FALSE)
-##' grid.raster(raster.image)
+##' grid::grid.raster(raster.image)
 start_rasterplot <- function(width=NULL,height=NULL) {
     x.y.ratio <- grid::convertX(grid::unit(1,"npc"),"mm",valueOnly=TRUE)/
         grid::convertY(grid::unit(1,"npc"),"mm",valueOnly=TRUE)
diff --git a/man/make.pdf.bookmark.Rd b/man/make.pdf.bookmark.Rd
index 0621ab6..705186f 100644
--- a/man/make.pdf.bookmark.Rd
+++ b/man/make.pdf.bookmark.Rd
@@ -26,7 +26,7 @@ Make a bookmark for a PDF for later saving to the pdf with
 \code{write.pdf.bookmarks}
 }
 \examples{
-CairoPDF(file="example.pdf",onefile=TRUE)
+Cairo::CairoPDF(file="example.pdf",onefile=TRUE)
 plot(y~x,data.frame(x=1:5,y=1:5))
 bookmarks <- make.pdf.bookmark("First plot")
 plot(y~x,data.frame(x=1:5,y=1:5))
diff --git a/man/start_rasterplot.Rd b/man/start_rasterplot.Rd
index b14e5a1..a1cb815 100644
--- a/man/start_rasterplot.Rd
+++ b/man/start_rasterplot.Rd
@@ -36,7 +36,7 @@ print(plot(y~x,
             data=data.frame(y=rnorm(1E4),
                             x=rnorm(1E4))))
 raster.image <- stop_rasterplot(plot=FALSE)
-grid.raster(raster.image)
+grid::grid.raster(raster.image)
 }
 \author{
 Don Armstrong
-- 
2.39.2