Skip to content

Commit

Permalink
Merge branch 'jg-devel'
Browse files Browse the repository at this point in the history
* jg-devel:
  Ignore rmarkdown.Rproj file.
  Remove .Rproj file
  start the next version
  CRAN release v2.29
  no need to specify Maintainer separately (can be derived from Authors@R)
  get rid of the caniuse.com link since CRAN's check machines don't like it
  • Loading branch information
jonathan-g committed Dec 30, 2024
2 parents bf72a31 + 0069122 commit 5d095a5
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 25 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
rmarkdown.Rproj
.Rproj.user
.Rhistory
.RData
Expand Down
3 changes: 1 addition & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: rmarkdown
Title: Dynamic Documents for R
Version: 2.28.2.9000
Version: 2.29.1.9000
Authors@R: c(
person("JJ", "Allaire", , "[email protected]", role = "aut"),
person("Yihui", "Xie", , "[email protected]", role = c("aut", "cre"), comment = c(ORCID = "0000-0003-0645-5666")),
Expand Down Expand Up @@ -50,7 +50,6 @@ Authors@R: c(
person("Benct Philip", "Jonsson", role = c("ctb", "cph"), comment = "pagebreak Lua filter"),
person("Albert", "Krewinkel", role = c("ctb", "cph"), comment = "pagebreak Lua filter")
)
Maintainer: Yihui Xie <[email protected]>
Description: Convert R Markdown documents into a variety of formats.
License: GPL-3
URL: https://github.com/rstudio/rmarkdown, https://pkgs.rstudio.com/rmarkdown/
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
rmarkdown 2.30
================================================================================


rmarkdown 2.29
================================================================================

Expand Down
22 changes: 0 additions & 22 deletions rmarkdown.Rproj

This file was deleted.

2 changes: 1 addition & 1 deletion vignettes/lua-filters.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ and the style will be applied to this class from the CSS included in the chunk.

This customisation can also be achieved by setting the environnement variable `PANDOC_NEWPAGE_HTML_CLASS` in the R session that will render the document (or in `.Renviron` file for example)

Let's note that in this example we use [`break-after`](https://developer.mozilla.org/en-US/docs/Web/CSS/break-after) property instead of `page-break-after` as it is recommended now to use the former which is the replacement. The latter is kept around for [compatibility reason with browsers](https://caniuse.com/#search=page-break).
Let's note that in this example we use [`break-after`](https://developer.mozilla.org/en-US/docs/Web/CSS/break-after) property instead of `page-break-after` as it is recommended now to use the former which is the replacement. The latter is kept around for compatibility reason with browsers.

### Using with Word documents {#word}

Expand Down

0 comments on commit 5d095a5

Please sign in to comment.