Skip to content

Commit

Permalink
Release preparations.
Browse files Browse the repository at this point in the history
  • Loading branch information
crsh committed Dec 18, 2018
1 parent 0fc1161 commit 3cbf6fd
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
^CRAN-RELEASE$
^.*\.Rproj$
^\.Rproj\.user$

^inst/images/*
^README\.Rmd$
^README_files$
^\.travis\.yml$

^cran-comments\.md$
8 changes: 5 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
YEAR: 2016
YEAR: 2018
COPYRIGHT HOLDER: Frederik Aust
8 changes: 6 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -12,4 +16,4 @@

# citr 0.1.0

Initial release.
Initial release.
2 changes: 1 addition & 1 deletion R/insert_citation.R
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions R/md_cite.R
Original file line number Diff line number Diff line change
Expand Up @@ -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]"}).
#'
Expand Down Expand Up @@ -92,4 +92,4 @@ append_bib_entries <- function(x, bib_file, encoding) {
} else {
RefManageR::WriteBib(x, file = bib_file)
}
}
}
2 changes: 1 addition & 1 deletion R/md_cite_zotero.R
Original file line number Diff line number Diff line change
Expand Up @@ -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]"}).
#'
Expand Down
2 changes: 1 addition & 1 deletion R/query_bib.R
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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`.


Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

Expand Down
20 changes: 8 additions & 12 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -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 <frederik.aust@uni-koeln.de>'

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.
Binary file modified tools/images/dependency_plot-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 3cbf6fd

Please sign in to comment.