diff --git a/.Rbuildignore b/.Rbuildignore index a6ac472..5c69067 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,3 +1,4 @@ +^CRAN-RELEASE$ ^.*\.Rproj$ ^\.Rproj\.user$ @@ -5,5 +6,4 @@ ^README\.Rmd$ ^README_files$ ^\.travis\.yml$ - ^cran-comments\.md$ diff --git a/DESCRIPTION b/DESCRIPTION index 8785a6a..78507ed 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -3,11 +3,13 @@ Type: Package Title: 'RStudio' Add-in to Insert Markdown Citations Description: Functions and an 'RStudio' add-in that search a 'Bib(La)TeX'-file to create and insert formatted Markdown citations into the current document. -Version: 0.2.0.9055 -Date: 2017-12-17 +Version: 0.3.0 +Date: 2018-12-18 Authors@R: c( person("Frederik", "Aust", email = "frederik.aust@uni-koeln.de", role = c("aut", "cre"), comment = c(ORCID = "0000-0003-4900-788X")), - person("Yihui", "Xie", role = "ctb") + person("Yihui", "Xie", role = "ctb"), + person("Robin", "Lovelace", role = "ctb"), + person("Garrick", "Aden-Buie", role = "ctb") ) URL: https://github.com/crsh/citr BugReports: https://github.com/crsh/citr/issues diff --git a/LICENSE b/LICENSE index 17d9680..7be155f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,2 +1,2 @@ -YEAR: 2016 +YEAR: 2018 COPYRIGHT HOLDER: Frederik Aust diff --git a/NEWS.md b/NEWS.md index 87ca1a8..3c1bb21 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,11 @@ +# citr 0.3.0 - New function `tidy_bib_file()` removes duplicate and unneeded entries from a Bib(La)Tex-file. -- Added `encoding` option to functions that read Bib(La)TeX-files and a corresponding global option. Option is also used to read parent documents in `insert_citation()` (reported by @sammo3182 #11) +- Added `encoding` option to functions that read Bib(La)TeX-files and a corresponding global option. (reported by @sammo3182 #11) - Error message in `insert_citation()` are printed to the dialog instead of the console (reported by @sammo3182 #11) +- RStudio addin + - Access to Zotero group libraries (#9) + - New settings tab # citr 0.2.0 @@ -12,4 +16,4 @@ # citr 0.1.0 -Initial release. \ No newline at end of file +Initial release. diff --git a/R/insert_citation.R b/R/insert_citation.R index 0f70117..f04dc04 100644 --- a/R/insert_citation.R +++ b/R/insert_citation.R @@ -17,7 +17,7 @@ #' are reloaded. To manually reload a bibliography at an unchanged location click the #' action link. #' -#' @return Inserts selected Markdown citation(s) at currenct location. +#' @return Inserts selected Markdown citation(s) at current location. #' #' @examples #' \dontrun{ diff --git a/R/md_cite.R b/R/md_cite.R index a8bb409..62940f5 100644 --- a/R/md_cite.R +++ b/R/md_cite.R @@ -11,7 +11,7 @@ #' are imported from Zotero/Juris-M rather than from the Bib(La)TeX-file. The Bib(La)TeX-file #' is then updated to include the inserted reference. #' -#' @return If the bibliography contains exactly one match the formated citation is returned, otherwise +#' @return If the bibliography contains exactly one match the formatted citation is returned, otherwise #' returns \code{NULL}. \code{md_cite} returns an in-text citation (\code{"@foo2016"}), \code{md_cite} #' returns an in-parenthesis citation (\code{"[@foo2016]"}). #' @@ -92,4 +92,4 @@ append_bib_entries <- function(x, bib_file, encoding) { } else { RefManageR::WriteBib(x, file = bib_file) } -} \ No newline at end of file +} diff --git a/R/md_cite_zotero.R b/R/md_cite_zotero.R index 71f7af6..fde6676 100644 --- a/R/md_cite_zotero.R +++ b/R/md_cite_zotero.R @@ -8,7 +8,7 @@ #' \code{references.bib} when the package is loaded. Once the path is changed in the #' RStudio addin, the global option is updated. #' -#' @return If the bibliography contains exactly one match the formated citation is returned, otherwise +#' @return If the bibliography contains exactly one match the formatted citation is returned, otherwise #' returns \code{NULL}. \code{md_cite} returns an in-text citation (\code{"@foo2016"}), \code{md_cite} #' returns an in-parenthesis citation (\code{"[@foo2016]"}). #' diff --git a/R/query_bib.R b/R/query_bib.R index 71136a8..e1d97bf 100644 --- a/R/query_bib.R +++ b/R/query_bib.R @@ -8,7 +8,7 @@ #' @param cache Logical. If \code{cache = TRUE} cached bibliography is used, if available. If #' \code{cache = FALSE} bibliography is re-imported on every function call. #' @param use_betterbiblatex Logical. If \code{use_betterbiblatex = TRUE} references are imported from Zotero/Juris-M. -#' @param betterbiblatex_format Charcter. Bibliography format to export from Zotero/Juris-M. Can be either \code{"bibtex"} or \code{"biblatex"}. Ignored if \code{use_betterbiblatex = FALSE}. +#' @param betterbiblatex_format Character. Bibliography format to export from Zotero/Juris-M. Can be either \code{"bibtex"} or \code{"biblatex"}. Ignored if \code{use_betterbiblatex = FALSE}. #' Requires that the \href{https://github.com/retorquere/zotero-better-bibtex}{Better Bib(La)TeX} is installed and #' Zotero/Juris-M is running. #' @param exclude_betterbiblatex_library Character. A vector of Zotero/Juris-M library names not to query. diff --git a/README.Rmd b/README.Rmd index 655296f..1d47f9d 100644 --- a/README.Rmd +++ b/README.Rmd @@ -79,7 +79,7 @@ The Better Bib(La)TeX-plugin allows users to specify fields to omit: ![](tools/images/bbt_omit_abstract.png) -Once, the above error has occured, it may be neccessary to restart the R session. +Once, the above error has occurred, it may be necessary to restart the R session. Otherwise reading any other file may fail with `Error: lex fatal error: fatal flex scanner internal error--end of buffer missed`. diff --git a/README.md b/README.md index 7025c15..56d4971 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ omit: ![](tools/images/bbt_omit_abstract.png) -Once, the above error has occured, it may be neccessary to restart the R +Once, the above error has occurred, it may be necessary to restart the R session. Otherwise reading any other file may fail with `Error: lex fatal error: fatal flex scanner internal error--end of buffer missed`. diff --git a/cran-comments.md b/cran-comments.md index a69b3bd..ab4f749 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,19 +1,15 @@ ## Test environments -* local OS X 10.11 install, R 3.3.1 -* local Ubuntu 14.04 install, R 3.3.1 -* Ubuntu 12.04 (old release, release, and devel; on travis-ci) -* win-builder (devel and release) +* local OS X 10.12.6 install, R 3.5.1 +* Fedora Linux, R-devel, clang, gfortran (r-hub) +* Windows Server 2008 R2 SP1, R-devel, 32/64 bit (r-hub) +* Ubuntu Linux 16.04 LTS, R-release, GCC (r-hub) +* Windows Server 2008, R-release (win-builder) +* Windows Server 2008, R-devel (win-builder) ## R CMD check results -There were no ERRORs or WARNINGs but one NOTE: +There were no ERRORs, WARNINGs, or NOTEs. -Maintainer: 'Frederik Aust ' - -License components with restrictions and base license permitting such: - MIT + file LICENSE -File 'LICENSE': - YEAR: 2016 - COPYRIGHT HOLDER: Frederik Aust +r-hub CRAN check notes "Author field differs from that derived from Authors@R" due to the ORCID id auto-expansion to a URL. ## Downstream dependencies There are no downstream dependencies. diff --git a/tools/images/dependency_plot-1.png b/tools/images/dependency_plot-1.png index 91640ec..93200e6 100644 Binary files a/tools/images/dependency_plot-1.png and b/tools/images/dependency_plot-1.png differ