Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/jeroenooms/commonmark
Browse files Browse the repository at this point in the history
  • Loading branch information
jeroen committed Dec 1, 2016
2 parents a062e5f + 34ddbeb commit d2070a3
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 10 deletions.
7 changes: 1 addition & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,15 @@ matrix:
sudo: false
- os: linux
dist: trusty
sudo: required
env: R_CODECOV=true
r_check_args: '--use-valgrind'
- os: osx
osx_image: xcode8
latex: false
- os: osx
osx_image: beta-xcode6.1
disable_homebrew: true

addons:
apt:
packages:
- valgrind

r_github_packages:
- jimhester/covr

Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: commonmark
Type: Package
Title: High Performance CommonMark and GitHub Markdown Rendering in R
Title: High Performance CommonMark and Github Markdown Rendering in R
Version: 1.0
Authors@R: c(
person("Jeroen", "Ooms", ,"[email protected]", role = c("aut", "cre")),
Expand All @@ -9,7 +9,7 @@ Authors@R: c(
URL: https://github.com/jeroenooms/commonmark http://commonmark.org/help/
BugReports: http://github.com/jeroenooms/commonmark/issues
Description: The CommonMark specification defines a rationalized version of markdown
syntax. This package uses the libcmark reference implementation for converting
syntax. This package uses the 'cmark' reference implementation for converting
markdown text into various formats including html, latex and groff man. In
addition it exposes the markdown parse tree in xml format. The latest version of
this package also adds support for Github extensions including tables, autolinks
Expand Down
2 changes: 1 addition & 1 deletion R/markdown.R
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#' @param smart Use smart punctuation. See details.
#' @param normalize Consolidate adjacent text nodes.
#' @param extensions Enables Github extensions. Can be `TRUE` (all) `FALSE` (none) or a character
#' vector with a subset of available [extensions][list_extension].
#' vector with a subset of available [extensions].
#' @param width Specify wrap width (default 0 = nowrap).
#' @examples md <- readLines(curl::curl("https://raw.githubusercontent.com/yihui/knitr/master/NEWS.md"))
#' html <- markdown_html(md)
Expand Down
2 changes: 1 addition & 1 deletion man/commonmark.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d2070a3

Please sign in to comment.