Skip to content
This repository has been archived by the owner on Nov 5, 2019. It is now read-only.

Maintenance for rmarkdown #18

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Maintenance for rmarkdown #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55e6e1a
Change code color area default
lcolladotor Nov 4, 2014
361feaa
Merge remote-tracking branch 'original/master'
lcolladotor Nov 4, 2014
7dc0378
Fix r fenced block that was changed in https://github.com/lcolladotor…
lcolladotor Nov 5, 2014
75f8729
Change knitrBootstrap command to make it more general by using rmarkd…
lcolladotor Nov 5, 2014
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
13 changes: 6 additions & 7 deletions ...nit to html with knitrBootstrap.tmCommand → Commands/knit with rmarkdown.tmCommand
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ cd "$TM_PROJECT_DIRECTORY"
cd "$DIR"

# Prepare output window.
html_header 'knit html result with knitrBootstrap' "$FILENAME"
echo '<h2>Kniting…</h2>'
html_header 'render with rmarkdown' "$FILENAME"
echo '<h2>Rendering…</h2>'

# Choose R from the TextMate TM_REXEC variable or default to R
if [ "$TM_REXEC" = "" ]
Expand All @@ -42,10 +42,9 @@ fi

# Define working dir
SW=${TM_SWEAVE_WD:=${TM_DIRECTORY}}
# Actually run knitrBoostrap
# More info at http://cran.at.r-project.org/web/packages/knitrBootstrap/index.html
# You might want to change the code style, which 'chooser's so show and whether you want to show the code, figures, etc.
echo -e "setwd('$SW');library(knitrBootstrap); if(packageVersion('knitrBootstrap') < '1.0.0') knit_bootstrap('$FILENAME', code_style='Brown Paper', chooser=c('boot', 'code'), show_code=FALSE) else library(rmarkdown); render('$FILENAME', bootstrap_document(theme.chooser=TRUE, highlight.chooser=TRUE, highlight='Brown Paper'))" | ${USE_THIS_R} --vanilla --quiet | pre
# Render with rmarkdown
# Specify proper YAML, more info at http://rmarkdown.rstudio.com/
echo -e "setwd('$SW'); library(rmarkdown); render('$FILENAME')" | ${USE_THIS_R} --vanilla --quiet | pre

# If there is output and it's newer than the current document, then we go directly to preview or link to it.

Expand All @@ -62,7 +61,7 @@ html_footer
<key>keyEquivalent</key>
<string>~t</string>
<key>name</key>
<string>knit to html with knitrBootstrap</string>
<string>knit to html with rmarkdown</string>
<key>outputCaret</key>
<string>afterOutput</string>
<key>outputFormat</key>
Expand Down
2 changes: 1 addition & 1 deletion Snippets/Fenced code block.tmSnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>content</key>
<string>\`\`\`${1|,css,js,javascript,coffee,coffeescript,elixir,r,bash,ruby,shell,haml,html|}
<string>\`\`\`${1|,css,js,javascript,coffee,coffeescript,elixir,{r},bash,ruby,shell,haml,html|}
${0:${TM_SELECTED_TEXT}}
\`\`\`
</string>
Expand Down