Merge pull request #461 from ldecicco-USGS/master

Use travis R

Author: Lindsay Carr

.travis.yml

@@ -4,34 +4,32 @@
 # see the wiki:
 #   https://github.com/craigcitro/r-travis/wiki
 
-language: objective-c
-sudo: required
+language: r
+cache: packages
+sudo: false
+dist: trusty
+
+matrix:
+  include:
+    - os: linux
+      r: release
+    - os: linux
+      r: devel
 
 env:
    global:
-     - R_LIBS="http://cran.rstudio.com"
      - R_BUILD_ARGS="--no-build-vignettes --no-manual"
      - R_CHECK_ARGS="--no-build-vignettes --no-manual --as-cran"
-     - BOOTSTRAP_LATEX=""
      - NOT_CRAN="true"
+     
+warnings_are_errors: true
 
-before_install:
-  - curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh
-  - chmod 755 ./travis-tool.sh
-  - ./travis-tool.sh bootstrap
-
-install:
-  - ./travis-tool.sh install_deps
-  - ./travis-tool.sh install_r covr
-
-script: ./travis-tool.sh run_tests
+r_github_packages:
+  - jimhester/covr
 
 after_success:
   - Rscript -e 'covr::coveralls()'
-
-after_failure:
-  - ./travis-tool.sh dump_logs
-
+  
 notifications:
   email:
     on_success: change
@@ -40,3 +38,4 @@ notifications:
 
 
 
+

R/axis.R

@@ -4,11 +4,6 @@
 #'
 #' @param object gsplot object
 #' @param \dots Further graphical parameters may also be supplied as arguments. See 'Details'.
-#' @param n.minor number of minor ticks between major ticks
-#' @param tcl.minor tick length for minor ticks (used if \code{n.minor} > 0). Use NA (the default) to have this 
-#' calculated automatically as half of the value for \code{par('tcl')} at the time of rendering the axis. 
-#' @param reverse flip the orientation of the axis?
-#' @param append replace or append an existing axis for this side (logical)
 #' 
 #' 
 #' @details Additional graphical parameter inputs: 
@@ -70,6 +65,11 @@ axis <- function(object, ...) {
   override("graphics", "axis", object, ...)
 }
 
+#' @param n.minor number of minor ticks between major ticks
+#' @param tcl.minor tick length for minor ticks (used if \code{n.minor} > 0). Use NA (the default) to have this 
+#' calculated automatically as half of the value for \code{par('tcl')} at the time of rendering the axis. 
+#' @param reverse flip the orientation of the axis?
+#' @param append replace or append an existing axis for this side (logical)
 axis.gsplot <- function(object, ..., n.minor=0, tcl.minor=NA, reverse=NULL, append=FALSE) {
 
   fun.name <- "axis"