Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 13 additions & 51 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
pull_request:
Expand All @@ -16,66 +16,28 @@ jobs:
fail-fast: false
matrix:
config:
- {os: macOS-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: macOS-latest, r: 'release'}
- {os: ubuntu-18.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
- {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
- {os: windows-latest, r: 'devel'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-latest, r: 'oldrel-1'}

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
RSPM: ${{ matrix.config.rspm }}
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@v1
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-pandoc@v1

- name: Query dependencies
run: |
install.packages('remotes')
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
shell: Rscript {0}

- name: Restore R package cache
if: runner.os != 'Windows'
uses: actions/cache@v2
- uses: r-lib/actions/setup-r-dependencies@v1
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-

- name: Install system dependencies
if: runner.os == 'Linux'
run: |
while read -r cmd
do
eval sudo $cmd
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
extra-packages: rcmdcheck

- name: Install dependencies
run: |
remotes::install_deps(dependencies = TRUE)
remotes::install_cran("rcmdcheck")
shell: Rscript {0}

- name: Check
env:
_R_CHECK_CRAN_INCOMING_REMOTE_: false
run: |
options(crayon.enabled = TRUE)
rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
shell: Rscript {0}

- name: Upload check results
if: failure()
uses: actions/upload-artifact@main
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
- uses: r-lib/actions/check-r-package@v1
7 changes: 4 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
Package: commonmark
Type: Package
Title: High Performance CommonMark and Github Markdown Rendering in R
Version: 1.7
Version: 1.8.0
Authors@R: c(
person("Jeroen", "Ooms", ,"jeroen@berkeley.edu", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-4035-0289")),
person("John MacFarlane", role = "cph", comment = "Author of cmark"))
URL: https://github.com/r-lib/commonmark (devel)
URL: https://docs.ropensci.org/commonmark (docs)
https://github.com/r-lib/commonmark (devel)
https://github.github.com/gfm/ (spec)
BugReports: https://github.com/r-lib/commonmark/issues
Description: The CommonMark specification defines a rationalized version of markdown
Expand All @@ -19,7 +20,7 @@ Suggests:
curl,
testthat,
xml2
RoxygenNote: 7.1.1
RoxygenNote: 7.1.2
Roxygen: list(markdown = TRUE)
Language: en-US
Encoding: UTF-8
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
1.8.0
- Update libcmark-gfm to 0.29.0.gfm.3

1.7
- Update libcmark-gfm to 0.28.3.gfm.19
- Hide internal symbols, fixes crash on rstudio in centos (#12)
Expand Down
11 changes: 6 additions & 5 deletions R/extensions.R
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
#'
#' Currently the following extensions are supported:
#'
#' - **table** support rendering of tables
#' - **strikethrough** via `~sometext~` syntax
#' - **autolink** automatically turn URLs into hyperlinks
#' - **table** support rendering of tables: [gfm-spec section 4.10](https://github.github.com/gfm/#tables-extension-)
#' - **strikethrough** via `~sometext~` syntax: [gfm-spec section 6.5](https://github.github.com/gfm/#strikethrough-extension-)
#' - **autolink** automatically turn URLs into hyperlinks: [gfm-spec section 6.9](https://github.github.com/gfm/#autolinks-extension-)
#' - **tagfilter** blacklist html tags: `title` `textarea` `style` `xmp` `iframe`
#' `noembed` `noframes` `script` `plaintext`.
#' `noembed` `noframes` `script` `plaintext`: [gfm-spec section 6.11](https://github.github.com/gfm/#disallowed-raw-html-extension-)
#' - **tasklist** turns certain list items into checkboxes: [gfm-spec section 5.3](https://github.github.com/gfm/#task-list-items-extension-)
#'
#' See also the spec for [GitHub Flavored Markdown](https://github.github.com/gfm/).
#' See the full spec for [GitHub Flavored Markdown](https://github.github.com/gfm/).
#'
#' @export
#' @name extensions
Expand Down
10 changes: 1 addition & 9 deletions readme.md → README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

[![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/commonmark)](https://cran.r-project.org/package=commonmark)
[![CRAN RStudio mirror downloads](http://cranlogs.r-pkg.org/badges/commonmark)](https://cran.r-project.org/package=commonmark)
[![Github Stars](https://img.shields.io/github/stars/r-lib/commonmark.svg?style=social&label=Github)](https://github.com/r-lib/commonmark)

The CommonMark specification defines a rationalized version of markdown
syntax. This package uses the 'cmark' reference implementation for converting
Expand All @@ -15,14 +14,7 @@ and strikethrough text.

## Documentation



About the R package:

- Blog post: [High Performance CommonMark and Github Markdown Rendering in R](https://ropensci.org/blog/blog/2016/12/02/commonmark)

Other resources:

- [commonmark R package](https://docs.ropensci.org/commonmark)
- [CommonMark specification for Markdown text](https://commonmark.org/help/)

## Basic Markdown
Expand Down
11 changes: 6 additions & 5 deletions man/extensions.Rd

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

73 changes: 0 additions & 73 deletions readme.Rmd

This file was deleted.

2 changes: 1 addition & 1 deletion src/Makevars
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ LIBCMARK = cmark/cmark.o cmark/node.o cmark/iterator.o cmark/blocks.o cmark/inli
cmark/html.o cmark/linked_list.o cmark/plugin.o cmark/registry.o cmark/syntax_extension.o \
cmark/plaintext.o cmark/footnotes.o cmark/map.o \
extensions/autolink.o extensions/core-extensions.o extensions/ext_scanners.o \
extensions/strikethrough.o extensions/table.o extensions/tagfilter.o
extensions/strikethrough.o extensions/table.o extensions/tagfilter.o extensions/tasklist.o

PKG_LIBS = -Lcmark -lstatcmark
STATLIB = cmark/libstatcmark.a
Expand Down
Loading