ready for version 0.7.

wilkelab · Oct 27, 2016 · 56fcee4 · 56fcee4
1 parent 73a65ab
commit 56fcee4
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 17 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: cowplot
 Title: Streamlined Plot Theme and Plot Annotations for 'ggplot2'
-Version: 0.6.9990
+Version: 0.7.0
 Authors@R: c( person("Claus O.", "Wilke", role = c("aut", "cre"), email =
     "wilke@austin.utexas.edu"), person("Hadley", "Wickham", role = c("cph"),
     email = "h.wickham@gmail.com") )
@@ -13,7 +13,7 @@ Description: Some helpful extensions and modifications to the 'ggplot2'
 URL: https://github.com/wilkelab/cowplot
 Depends:
     R (>= 3.3.0),
-    ggplot2 (>= 2.0.0),
+    ggplot2 (>= 2.1.0),
 Imports:
     grid (>= 3.0.0),
     gtable (>= 0.1.2),

diff --git a/NEWS b/NEWS
@@ -1,6 +1,6 @@
-cowplot 0.6.9990
+cowplot 0.7.0
 ----------------------------------------------------------------
-- The development version of cowplot is being prepared for the upcoming release of ggplot2 2.2.0. As a result of this upcoming switch, the function switch_axis_position() has been deprecated. Alternative axes will be natively supported by ggplot2 2.2.0.
+- This version of cowplot has been prepared for the upcoming release of ggplot2 2.2.0. As a result of this upcoming switch, the function switch_axis_position() has been removed. Alternative axes will be natively supported by ggplot2 2.2.0.
 - As of this version, cowplot requires R >= 3.3.0. This dependency was added because R 3.3 fixes a critical problem with lists of units.
 
 cowplot 0.6.3

diff --git a/R/themes.R b/R/themes.R
@@ -38,6 +38,9 @@ theme_cowplot <- function(font_size = 14, font_family = "", line_size = .5) {
       ),
       axis.ticks        = element_line(colour = "black", size = line_size),
       axis.line         = element_line(colour = "black", size = line_size),
+      # the following two lines are not needed for ggplot2 2.2.0 or later
+      axis.line.x         = element_line(colour = "black", size = line_size),
+      axis.line.y         = element_line(colour = "black", size = line_size),
       legend.key        = element_blank(),
       legend.key.size   = grid::unit(1, "lines"),
       legend.text       = element_text(size = rel(small_rel)),

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,7 +1,7 @@
-Fixed the URL in README.md and replaced the word "library" with "package" in DESCRIPTION.
+This submission prepares cowplot for the upcoming ggplot2 2.2.0 release.
 
 ## Test environments
-* R 3.3.1 on win-builder [ via devtools::build_win() ]
+* R devel and R 3.3.1 on win-builder [ via devtools::build_win() ]
 * local OS X install x86_64-apple-darwin13.4.0 (64-bit), R 3.3.1
 
 ## R CMD check results
@@ -20,7 +20,7 @@ All clear, according to devtools::revdep_check():
 Checked IncucyteDRC : 0 errors | 0 warnings | 0 notes
 Checked JWileymisc  : 0 errors | 0 warnings | 0 notes
 Checked poppr       : 0 errors | 0 warnings | 0 notes
+Checked preText     : 0 errors | 0 warnings | 1 note 
 Checked rnrfa       : 0 errors | 0 warnings | 0 notes
 Checked tadaatoolbox: 0 errors | 0 warnings | 1 note 
 
-The note for the last package is unrelated to cowplot.
diff --git a/inst/doc/introduction.html b/inst/doc/introduction.html
diff --git a/inst/doc/plot_annotations.Rmd b/inst/doc/plot_annotations.Rmd
@@ -14,7 +14,7 @@ vignette: >
 library(cowplot)
 ```
 
-The **cowplot** package provides a variety of functions to annotate plots, including annotations underneath the plot, mathematical expressions inside plots, and joint titles for combined plots.
+The **cowplot** package provides a variety of functions to annotate plots, including annotations underneath the plot, mathematical expressions inside plots, and joint titles for combined plots. Note that as **ggplot2** gains more of this functionality natively (e.g. as of version 2.2.0), we recommend to use the **ggplot2** methods rather than the **cowplot** methods. Any functionality that is duplicated between **ggplot2** and **cowplot** may be removed from future versions of **cowplot**.
 
 ## Annotations underneath plots
 

diff --git a/inst/doc/plot_annotations.html b/inst/doc/plot_annotations.html
@@ -74,7 +74,7 @@ <h4 class="date"><em>2016-10-26</em></h4>
 
 
 
-<p>The <strong>cowplot</strong> package provides a variety of functions to annotate plots, including annotations underneath the plot, mathematical expressions inside plots, and joint titles for combined plots.</p>
+<p>The <strong>cowplot</strong> package provides a variety of functions to annotate plots, including annotations underneath the plot, mathematical expressions inside plots, and joint titles for combined plots. Note that as <strong>ggplot2</strong> gains more of this functionality natively (e.g. as of version 2.2.0), we recommend to use the <strong>ggplot2</strong> methods rather than the <strong>cowplot</strong> methods. Any functionality that is duplicated between <strong>ggplot2</strong> and <strong>cowplot</strong> may be removed from future versions of <strong>cowplot</strong>.</p>
 <div id="annotations-underneath-plots" class="section level2">
 <h2>Annotations underneath plots</h2>
 <p>The function <code>add_sub()</code> can be used to add annotation text underneath a plot. To demonstrate its use, we first make a plot:</p>

diff --git a/inst/doc/shared_legends.html b/inst/doc/shared_legends.html
diff --git a/vignettes/plot_annotations.Rmd b/vignettes/plot_annotations.Rmd
@@ -14,7 +14,7 @@ vignette: >
 library(cowplot)
 ```
 
-The **cowplot** package provides a variety of functions to annotate plots, including annotations underneath the plot, mathematical expressions inside plots, and joint titles for combined plots.
+The **cowplot** package provides a variety of functions to annotate plots, including annotations underneath the plot, mathematical expressions inside plots, and joint titles for combined plots. Note that as **ggplot2** gains more of this functionality natively (e.g. as of version 2.2.0), we recommend to use the **ggplot2** methods rather than the **cowplot** methods. Any functionality that is duplicated between **ggplot2** and **cowplot** may be removed from future versions of **cowplot**.
 
 ## Annotations underneath plots