Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add encoding for read md file #482

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

add encoding for read md file #482

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
270e963
add encoding for read md file
Feb 27, 2016
2bdc8ce
change some codes
Feb 28, 2016
b69a3da
fix bugs
Feb 28, 2016
71a6d6e
fix bugs
Feb 28, 2016
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
54 changes: 29 additions & 25 deletions R/process.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
#' Split document into metadata and slides
#'
#' @param doc path to source file
#' @return list with metadata and slides
#' @keywords internal
#' @noRd
to_deck <- function(doc){
txt = str_split_fixed(read_file(doc), '\n---', 2)
meta = yaml.load(gsub("^---\n+", '', txt[1]))
cfile = ifelse(is.null(meta$config), 'config.yml', meta$config)
deck = modifyList(get_config(cfile), c(meta, slides = txt[2]))
deck$standalone = ifelse(deck$mode == "standalone", TRUE, FALSE)
return(deck)
}

#' Split slides into individual slides
#'
#' Slides are separated by a newline followed by three horizontal dashes.
#' An empty new line SHOULD precede the three horizontal dashes, otherwise
#' it will not be treated as a slide separator
#' @keywords internal
#' @noRd
split_slides <- function(slides, pat = '\n\n---'){
str_split(slides, pattern = pat)[[1]]
}
#' Split document into metadata and slides
#'
#' @param doc path to source file
#' @return list with metadata and slides
#' @keywords internal
#' @noRd
to_deck <- function(doc){
txt = str_split_fixed(read_file(doc), '\n---', 2)
meta = yaml.load(gsub("^---\n+", '', txt[1]))
meta = lapply(meta,function(x){
if(class(x)=="list" | length(x)!=1) return(x)
return(iconv(x,"UTF-8","UTF-8"))
})
cfile = ifelse(is.null(meta$config), 'config.yml', meta$config)
deck = modifyList(get_config(cfile), c(meta, slides = txt[2]))
deck$standalone = ifelse(deck$mode == "standalone", TRUE, FALSE)
return(deck)
}

#' Split slides into individual slides
#'
#' Slides are separated by a newline followed by three horizontal dashes.
#' An empty new line SHOULD precede the three horizontal dashes, otherwise
#' it will not be treated as a slide separator
#' @keywords internal
#' @noRd
split_slides <- function(slides, pat = '\n\n---'){
str_split(slides, pattern = pat)[[1]]
}
288 changes: 145 additions & 143 deletions R/render.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,143 +1,145 @@
#' Render a slide
#'
#' @param slide list containing elements of the parsed slide
#' @param layouts list of layouts
#' @param payload list containing site and page, useful for blogs
#' @noRd
# TOTHINK: Should partials also be passed along?
render_slide <- function(slide, layouts, payload){
default = "{{{slide.header}}}\n{{{slide.content}}}"
layout = layouts[[slide$tpl %||% 'slide']] %||% slide$tpl2 %||% default
payload = modifyList(payload, list(slide = slide))
slide$rendered = whisker.render(layout, payload, partials = layouts) %|% update_classes
raw_slide = !is.null(slide$class) && grepl('RAW', slide$class)
if (!(raw_slide)){
slide$rendered = whisker.render(slide$rendered, payload, partials = layouts)
}

return(slide)
}

#' Render slides
#' @noRd
render_slides <- function(slides, layouts, payload){
lapply(slides, render_slide, layouts = layouts, payload = payload)
}


#' Render page
#'
#' @param page list containing the parsed page
#' @param payload list containing site and pages
# TODO: Refactor by splitting code into smaller manageable chunks
render_page <- function(page, payload, return_page = FALSE, save_payload = FALSE){
in_dir(dirname(page$file), {
if (page$mode == 'selfcontained'){
page$url[['lib']] <- page$url[['lib']] %||% 'libraries'
with(page, copy_libraries(framework, highlighter, widgets, url$lib))
if (!is.null(page$ext_widgets)){
copy_external_widgets(page$ext_widgets, page$url$lib)
}
}

# add layouts, urls and stylesheets from frameworks, widgets and assets
page = page %|% add_urls %|% add_stylesheets %|% add_config_fr
if (!is.null(page$ext_widgets)){
page$widgets = c(page$widgets, basename(unlist(page$ext_widgets)))
}


widget_configs = read_configs(page$widgets, page$url$widgets)
widget_configs = modifyList(widget_configs, read_config('assets', "."))
widget_configs = modifyList(widget_configs, list(custom = page$assets))

if (page$onefile %?=% TRUE){
framework_config = read_config(page$framework, file.path(page$url$lib, 'frameworks'))
highlighter_config = read_config(page$highlighter,
file.path(page$url$lib, 'highlighters')
)
highlighter_config[[1]]$css = file.path(page$url$highlighters,
page$highlighter, "css", paste0(page$hitheme, '.css')
)
widget_configs = c(widget_configs, framework_config, highlighter_config)
}

page$assets = as.list(sapply(c('css', 'js', 'jshead', 'ready'), function(x){
return(get_assets(x, widget_configs, standalone = page$onefile))
}))

layouts = get_layouts(page$url$layouts)

# Quick Fix for Backward Compatibility with Older slidifyLibraries
path_to_partials = file.path(page$url$framework, 'partials')
if (file.exists(path_to_partials)){
partials = get_layouts(path_to_partials)
} else {
partials = get_layouts(file.path(page$url$framework, 'layouts'))
}
partials = modifyList(partials, list(javascripts = get_javascripts(page)))

payload = modifyList(payload, list(page = page))


page$slides = render_slides(page$slides, layouts, payload)
page$content = paste(lapply(page$slides, pluck('rendered')), collapse = '\n')
payload$page = page


# outputFile = gsub("*.[R]?md$", '.html', page$file)
outputFile = sprintf("%s.html", page$filename)
layout = layouts[[page$layout %||% 'deck']]
if (save_payload){
save(layout, payload, partials, file = "payload.RData")
}
cat(whisker.render(layout, payload, partials = partials), file = outputFile)

# create standalone deck if page mode is standalone
if (page$mode == 'standalone'){
outputFile = make_standalone(page, outputFile)
}

# Extract R Code from Page if purl = TRUE
if (page$purl %?=% TRUE) purl(page$file)
})
if (return_page){ return(page) }
}


#' Render pages
#'
#' @noRd
render_pages <- function(pages, site, tags, ...){
payload = list(site = site, pages = pages, tags = tags)
invisible(lapply(pages, render_page, payload = payload, ...))
}

#' Render deck using layouts
#'
#' @keywords internal
#' @noRd
# This function has been replaced by render_page and needs to be DEPRECATED
render_deck <- function(deck, layouts, partials){
#' Render a slide based on specified layout
render_slide <- function(slide){
tpl <- slide$tpl %||% 'slide'
slide2 <- modifyList(slide, list(deck = deck[names(deck) != 'slides']))
slide$rendered = whisker.render(layouts[tpl], slide) %|% update_classes
slide$rendered = whisker.render(slide$rendered, slide2)
return(slide)
}
#' Render slides based on specified layouts
render_slides <- function(slides){
lapply(slides, render_slide)
}
#' Render stylesheets based on mode
render_stylesheets <- function(){
tpl = '{{# css }}<link rel="stylesheet" href = "{{.}}">\n{{/ css}}'
whisker.render(tpl)
}
#' Render deck
deck$slides = deck$slides %|% render_slides
main = deck$layout %||% 'deck'
whisker.render(layouts[[main]], deck, partials = layouts)
}
#' Render a slide
#'
#' @param slide list containing elements of the parsed slide
#' @param layouts list of layouts
#' @param payload list containing site and page, useful for blogs
#' @noRd
# TOTHINK: Should partials also be passed along?
render_slide <- function(slide, layouts, payload){
default = "{{{slide.header}}}\n{{{slide.content}}}"
layout = layouts[[slide$tpl %||% 'slide']] %||% slide$tpl2 %||% default
payload = modifyList(payload, list(slide = slide))
slide$rendered = whisker.render(layout, payload, partials = layouts) %|% update_classes
raw_slide = !is.null(slide$class) && grepl('RAW', slide$class)
if (!(raw_slide)){
slide$rendered = whisker.render(slide$rendered, payload, partials = layouts)
}

return(slide)
}

#' Render slides
#' @noRd
render_slides <- function(slides, layouts, payload){
lapply(slides, render_slide, layouts = layouts, payload = payload)
}


#' Render page
#'
#' @param page list containing the parsed page
#' @param payload list containing site and pages
# TODO: Refactor by splitting code into smaller manageable chunks
render_page <- function(page, payload, return_page = FALSE, save_payload = FALSE){
in_dir(dirname(page$file), {
if (page$mode == 'selfcontained'){
page$url[['lib']] <- page$url[['lib']] %||% 'libraries'
with(page, copy_libraries(framework, highlighter, widgets, url$lib))
if (!is.null(page$ext_widgets)){
copy_external_widgets(page$ext_widgets, page$url$lib)
}
}

# add layouts, urls and stylesheets from frameworks, widgets and assets
page = page %|% add_urls %|% add_stylesheets %|% add_config_fr
if (!is.null(page$ext_widgets)){
page$widgets = c(page$widgets, basename(unlist(page$ext_widgets)))
}


widget_configs = read_configs(page$widgets, page$url$widgets)
widget_configs = modifyList(widget_configs, read_config('assets', "."))
widget_configs = modifyList(widget_configs, list(custom = page$assets))

if (page$onefile %?=% TRUE){
framework_config = read_config(page$framework, file.path(page$url$lib, 'frameworks'))
highlighter_config = read_config(page$highlighter,
file.path(page$url$lib, 'highlighters')
)
highlighter_config[[1]]$css = file.path(page$url$highlighters,
page$highlighter, "css", paste0(page$hitheme, '.css')
)
widget_configs = c(widget_configs, framework_config, highlighter_config)
}

page$assets = as.list(sapply(c('css', 'js', 'jshead', 'ready'), function(x){
return(get_assets(x, widget_configs, standalone = page$onefile))
}))

layouts = get_layouts(page$url$layouts)

# Quick Fix for Backward Compatibility with Older slidifyLibraries
path_to_partials = file.path(page$url$framework, 'partials')
if (file.exists(path_to_partials)){
partials = get_layouts(path_to_partials)
} else {
partials = get_layouts(file.path(page$url$framework, 'layouts'))
}
partials = modifyList(partials, list(javascripts = get_javascripts(page)))

payload = modifyList(payload, list(page = page))


page$slides = render_slides(page$slides, layouts, payload)
page$content = paste(lapply(page$slides, pluck('rendered')), collapse = '\n')
payload$page = page


# outputFile = gsub("*.[R]?md$", '.html', page$file)
outputFile = sprintf("%s.html", page$filename)
layout = layouts[[page$layout %||% 'deck']]
if (save_payload){
save(layout, payload, partials, file = "payload.RData")
}
writeLines(whisker.render(layout, payload, partials = partials),
con = outputFile,
useBytes = TRUE)

# create standalone deck if page mode is standalone
if (page$mode == 'standalone'){
outputFile = make_standalone(page, outputFile)
}

# Extract R Code from Page if purl = TRUE
if (page$purl %?=% TRUE) purl(page$file)
})
if (return_page){ return(page) }
}


#' Render pages
#'
#' @noRd
render_pages <- function(pages, site, tags, ...){
payload = list(site = site, pages = pages, tags = tags)
invisible(lapply(pages, render_page, payload = payload, ...))
}

#' Render deck using layouts
#'
#' @keywords internal
#' @noRd
# This function has been replaced by render_page and needs to be DEPRECATED
render_deck <- function(deck, layouts, partials){
#' Render a slide based on specified layout
render_slide <- function(slide){
tpl <- slide$tpl %||% 'slide'
slide2 <- modifyList(slide, list(deck = deck[names(deck) != 'slides']))
slide$rendered = whisker.render(layouts[tpl], slide) %|% update_classes
slide$rendered = whisker.render(slide$rendered, slide2)
return(slide)
}
#' Render slides based on specified layouts
render_slides <- function(slides){
lapply(slides, render_slide)
}
#' Render stylesheets based on mode
render_stylesheets <- function(){
tpl = '{{# css }}<link rel="stylesheet" href = "{{.}}">\n{{/ css}}'
whisker.render(tpl)
}
#' Render deck
deck$slides = deck$slides %|% render_slides
main = deck$layout %||% 'deck'
whisker.render(layouts[[main]], deck, partials = layouts)
}
Loading