Merge pull request #86 from vsimko/master

CITATION uses fields from DESCRIPTION file

Author: vsimko

.travis.yml

@@ -1,6 +1,11 @@
 language: r
 # see also https://docs.travis-ci.com/user/languages/r
 
+# see also https://docs.travis-ci.com/user/multi-os/
+os:
+  - linux
+  - osx
+
 # Using the package cache to store R package dependencies can significantly
 # speed up build times and is recommended for most builds.
 cache:

README.md

@@ -13,7 +13,11 @@ This package is licensed under GPL, and available on CRAN:
 <http://cran.r-project.org/package=corrplot>.
 
 ## How to cite
-To cite corrplot properly, call the R built-in command `citation("corrplot")` as follows:
+The R core development team and the very active community of package authors
+have invested a lot of time and effort in creating R as it is today. Please give
+credit where credit is due and cite R and R packages when you use them for data
+analysis. To cite `corrplot` properly, call the R built-in command
+`citation("corrplot")` as follows:
 ```r
 library(corrplot)
 citation("corrplot")

inst/CITATION

@@ -1,14 +1,21 @@
+PKG <- "corrplot"
+VERSION <- packageVersion(PKG)
+TITLE <- packageDescription(PKG, fields = "Title")
+AUTHORS <- packageDescription(PKG, fields = "Author")
+URL <- packageDescription(PKG, fields = "URL")
+YEAR <- strftime(packageDescription(PKG, fields = "Date"), "%Y")
+
 bibentry("Manual",
-	title="R package 'corrplot': Visualization of a correlation matrix",
-	author="Taiyun Wei and Viliam Simko",
-	year="2017",
-	note="(Version 0.82)",
-	url="https://github.com/taiyun/corrplot",
+	title = sprintf("R package \"%s\": %s", PKG, TITLE),
+	author = AUTHORS,
+	year = YEAR,
+	note = sprintf("(Version %s)", VERSION),
+	url = URL,
 
-	textVersion =
-  	paste("T. Wei and V. Simko (2016). ",
-  			"R package 'corrplot': Visualization of a correlation matrix (Version 0.82). ",
-  			"Available from https://github.com/taiyun/corrplot",
-  			sep=""),
+	mheader = sprintf("To cite %s in publications use:", PKG),
 
-	mheader = "To cite corrplot in publications use:")
+	textVersion = sprintf(
+    "%s (%s). R package \"%s\": %s (Version %s). Available from %s",
+    AUTHORS, YEAR, PKG, TITLE, VERSION, URL
+	)
+)