Mark result of citeproc conversion as UTF-8 #2202
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pandoc will output UTF-8 content but on non default UTF-8 (like Windows), `system()` will return the result string in native encoding. We need to mark it before further processing. Another option would be to convert to a file and read it back into R.
previous `pandoc-citeproc` has issue on CI jgm/pandoc-citeproc#420
[skip ci]
jonathan-g
added a commit
to jonathan-g/rmarkdown
that referenced
this pull request
Sep 17, 2021
Merge remote-tracking branch 'rstudio_origin/main' into jg-tree-fix # By Yihui Xie (7) and others # Via Yihui Xie * rstudio_origin/main: import bslib (rstudio#2154) CRAN release v2.11 https://rmarkdown.rstudio.com/authoring_bibliographies_and_citations.html -> https://pandoc.org/MANUAL.html#citations Add a specific dirname for sass caching roxygenize and bump version export convert_ipynb() per suggestion of @acircleda use sass::output_template() instead of storing a copy in rmarkdown fix yihui/xaringan#331: respect relative paths in parent directories in the `css` argument of `html_document()` Bump version Prerender shiny rmd in separate environment (rstudio#2203) Mark result of citeproc conversion as UTF-8 (rstudio#2202) # Conflicts: # NEWS.md
jonathan-g
added a commit
to jonathan-g/rmarkdown
that referenced
this pull request
Sep 17, 2021
Merge branch 'jg-tree-fix' into jg-devel # By Yihui Xie (9) and others # Via Jonathan Gilligan (3) and Yihui Xie (1) * jg-tree-fix: import bslib (rstudio#2154) CRAN release v2.11 https://rmarkdown.rstudio.com/authoring_bibliographies_and_citations.html -> https://pandoc.org/MANUAL.html#citations Add a specific dirname for sass caching roxygenize and bump version export convert_ipynb() per suggestion of @acircleda use sass::output_template() instead of storing a copy in rmarkdown fix yihui/xaringan#331: respect relative paths in parent directories in the `css` argument of `html_document()` Bump version Prerender shiny rmd in separate environment (rstudio#2203) Mark result of citeproc conversion as UTF-8 (rstudio#2202) Fixed conflicts with rstudio main version. Update documentation for html_document. Add self (JG) as a contributor in DESCRIPTION. Resolve conflicts with new updates to RStudio main branch. pin the jquery version to 3: rstudio#2197 (comment) # Conflicts: # DESCRIPTION # NEWS.md
jonathan-g
added a commit
to jonathan-g/rmarkdown
that referenced
this pull request
Sep 27, 2021
* rstudio_origin/main: Add support for devtools loaded package in `draft()` (rstudio#2224) Fix typo in comment import bslib (rstudio#2154) CRAN release v2.11 https://rmarkdown.rstudio.com/authoring_bibliographies_and_citations.html -> https://pandoc.org/MANUAL.html#citations Add a specific dirname for sass caching roxygenize and bump version export convert_ipynb() per suggestion of @acircleda use sass::output_template() instead of storing a copy in rmarkdown fix yihui/xaringan#331: respect relative paths in parent directories in the `css` argument of `html_document()` Bump version Prerender shiny rmd in separate environment (rstudio#2203) Mark result of citeproc conversion as UTF-8 (rstudio#2202)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes #2195
Pandoc will output UTF-8 content but on non default UTF-8 (like Windows),
system()will return the result string in native encoding. We need to mark it before further processing.Another option would be to convert to a file and read it back into R.