diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index b542e234..091012fd 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -39,7 +39,6 @@ jobs: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} - name: Check testthat - if: runner.os != 'Windows' id: check_check run: | error_num=$(Rscript --vanilla '.github/workflows/check_testthat.R') diff --git a/.github/workflows/check_testthat.R b/.github/workflows/check_testthat.R index 7f338808..831d1d2b 100644 --- a/.github/workflows/check_testthat.R +++ b/.github/workflows/check_testthat.R @@ -8,21 +8,38 @@ library(magrittr) # Find .git root directory root_dir <- rprojroot::find_root(rprojroot::has_dir(".git")) +# Read in the testthat results out_file <- list.files(pattern = "testthat.Rout$|Rout.fail$", file.path(root_dir, "check"), recursive = TRUE, full.names = TRUE) -check_content <- readLines(out_file) -test_result <- grep("\\[ FAIL", check_content, value = TRUE)[1] -test_result <- unlist(strsplit(test_result, "\\||\\[|\\]")) +# Extract testhat results +testthat_check_content <- readLines(out_file) +testthat_result <- grep("\\[ FAIL", testthat_check_content, value = TRUE)[1] +testthat_result <- unlist(strsplit(testthat_result, "\\||\\[|\\]")) + +# Read in standard check results +check_content <- readLines(file.path(root_dir, "check", "ottrpal.Rcheck", "00check.log")) + +# Extract standard check results +check_result <- grep("Status\\:", check_content, value = TRUE) +check_result <- unlist(strsplit(check_result, ",")) +check_result <- stringr::str_remove(check_result, "Status:| ") # Format the data into a dataframe -test_result_df <- data.frame(result = trimws(test_result)) %>% +testthat_result_df <- data.frame(result = trimws(testthat_result)) %>% dplyr::filter(result != "") %>% tidyr::separate(result, sep = " ", into = c("test_name", "num")) %>% dplyr::mutate(num = as.numeric(num)) -fail_num <- test_result_df %>% - dplyr::filter(test_name %in% c("FAIL", "WARN")) %>% +# Do the same for the check results +check_result_df <- data.frame(result = trimws(check_result)) %>% + tidyr::separate(result, sep = " ", into = c("num", "test_name")) %>% + dplyr::mutate(num = as.numeric(num)) %>% + dplyr::select("test_name", "num") + +# We only want warnings or errors or fails +fail_num <- dplyr::bind_rows(check_result_df, testthat_result_df) %>% + dplyr::filter(test_name %in% c("FAIL", "WARN", "WARNINGs", "ERROR")) %>% dplyr::summarize(total = sum(num)) fail_num <- as.character(fail_num$total) diff --git a/DESCRIPTION b/DESCRIPTION index f0fb1eb9..efbdf960 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -23,7 +23,6 @@ Imports: curl, dplyr, fs, - glue, httr, jsonlite, knitr (>= 1.33), diff --git a/NAMESPACE b/NAMESPACE index 6d54d6f2..9746629a 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -4,12 +4,6 @@ export("%>%") export(auth_from_secret) export(authorize) export(bad_quiz_path) -export(bookdown_destination) -export(bookdown_file) -export(bookdown_path) -export(bookdown_rmd_files) -export(bookdown_to_book_txt) -export(bookdown_to_embed_leanpub) export(check_all_questions) export(check_question) export(check_quiz) @@ -18,14 +12,12 @@ export(check_quiz_question_attributes) export(check_quizzes) export(convert_coursera_quizzes) export(convert_quiz) -export(convert_utube_link) +export(course_path) +export(course_to_book_txt) export(download_ottr_template) -export(example_repo_cleanup) -export(example_repo_setup) export(extract_meta) export(extract_object_id) export(extract_quiz) -export(get_bookdown_spec) export(get_chapters) export(get_gs_pptx) export(get_image_from_slide) @@ -33,29 +25,27 @@ export(get_image_link_from_slide) export(get_object_id_notes) export(get_slide_id) export(get_slide_page) +export(get_yaml_spec) export(good_quiz_path) export(gs_id_from_slide) export(gs_png_download) export(gs_png_url) export(include_slide) -export(leanpub_check) export(make_embed_markdown) +export(output_destination) export(parse_q_tag) export(parse_quiz) export(parse_quiz_df) export(pptx_notes) export(pptx_slide_note_df) export(pptx_slide_text_df) -export(remove_yaml_header) +export(qrmd_files) export(render_without_toc) -export(replace_html) -export(replace_single_html) export(set_knitr_image_path) export(set_up_leanpub) -export(simple_references) export(unzip_pptx) +export(website_to_embed_leanpub) export(xml_notes) -importFrom(fs,dir_copy) importFrom(httr,GET) importFrom(httr,accept_json) importFrom(httr,config) diff --git a/R/coursera_and_leanpub.R b/R/coursera_and_leanpub.R index df478e85..2cb7c4dc 100644 --- a/R/coursera_and_leanpub.R +++ b/R/coursera_and_leanpub.R @@ -197,9 +197,10 @@ convert_coursera_quizzes <- function(input_quiz_dir = "quizzes", ) } -#' Create TOC-less Bookdown for use in Coursera +#' Create TOC-less course website for use in Coursera or Leanpub #' -#' Create a version of Leanpub that does not have a TOC and has quizzes in the Coursera yaml format. Requires Bookdown output files including "assets", "resources", and "libs". +#' Create a version of the course that does not have a TOC and has quizzes in the Coursera yaml format. +#' This is only needed to be used on Bookdown courses. Quarto has a simple command for this. #' #' @param output_dir A folder (existing or not) that the TOC-less Bookdown for Coursera files should be saved. By default is file.path("docs", "coursera") #' @param output_yaml A output.yml file to be provided to bookdown. By default is "_output.yml" @@ -220,8 +221,8 @@ render_without_toc <- function(output_dir = file.path("docs", "no_toc"), input_quiz_dir = "quizzes", output_quiz_dir = "coursera_quizzes", verbose = TRUE) { - # Find root directory by finding `_bookdown.yml` file - root_dir <- bookdown_path() + # Find root directory by finding `.git` folder + root_dir <- course_path() # Output files: output_dir <- file.path(root_dir, output_dir) diff --git a/R/data.R b/R/data.R index 0751e9cc..c0d1c2f0 100644 --- a/R/data.R +++ b/R/data.R @@ -47,6 +47,38 @@ download_ottr_template <- function(dir = "inst/extdata", type = "rmd") { return(output_dir) } + +#' Path to good example quiz +#' +#' @export +#' @return The file path to an example good quiz included in the package that should pass the quiz checks. +#' +good_quiz_path <- function() { + list.files( + pattern = "quiz_good.md$", + recursive = TRUE, + system.file("extdata", package = "ottrpal"), + full.names = TRUE + ) +} + +#' Path to bad example quiz +#' +#' @export +#' @return The file path to an example bad quiz included in the package that will fail the quiz checks. +#' +#' @examples +#' +#' quiz_path <- bad_quiz_path() +bad_quiz_path <- function() { + list.files( + pattern = "quiz_bad.md$", + recursive = TRUE, + system.file("extdata", package = "ottrpal"), + full.names = TRUE + ) +} + #' Get file path to an key encryption RDS key_encrypt_creds_path <- function() { list.files( diff --git a/R/example_data.R b/R/example_data.R deleted file mode 100644 index 1af693f5..00000000 --- a/R/example_data.R +++ /dev/null @@ -1,89 +0,0 @@ -# C. Savonen 2021 - -#' Path to good example quiz -#' -#' @export -#' @return The file path to an example good quiz included in the package that will pass the quiz checks. -#' @examples -#' -#' quiz_path <- good_quiz_path() -#' -good_quiz_path <- function() { - list.files( - pattern = "quiz_good.md$", - recursive = TRUE, - system.file("extdata", package = "ottrpal"), - full.names = TRUE - ) -} - -#' Path to bad example quiz -#' -#' @export -#' @return The file path to an example bad quiz included in the package that will fail the quiz checks. -#' -#' @examples -#' -#' quiz_path <- bad_quiz_path() -bad_quiz_path <- function() { - list.files( - pattern = "quiz_bad.md$", - recursive = TRUE, - system.file("extdata", package = "ottrpal"), - full.names = TRUE - ) -} - -#' Set up example repo files -#' -#' @param dest_dir The destination directory you would like the example repo files to be placed. By default is current directory. -#' @return Sets up example files that can be used to test 'ottrpal' functions. -#' -#' @export -#' -#' @importFrom fs dir_copy -#' @examples \dontrun{ -#' -#' # Run this to get the files we need -#' example_files <- ottrpal::example_repo_setup() -#' } -example_repo_setup <- function(dest_dir = tempdir()) { - bookdown_path <- list.files( - pattern = "_bookdown.yml$", - system.file("extdata/", package = "ottrpal"), - full.names = TRUE - ) - - # Copy over whole directory - fs::dir_copy(dirname(bookdown_path), dest_dir, overwrite = TRUE) - - copied_files <- list.files(dirname(bookdown_path), full.names = TRUE) - - return(copied_files) -} - -#' Clean up example repo files -#' -#' @param files_to_remove List of example files to delete. -#' @param verbose TRUE/FALSE would you like progress messages? -#' @return Will delete example files copied from [ottrpal::example_repo_setup()] function -#' @export -#' -#' @examples \dontrun{ -#' -#' # Run this to get the files we need -#' example_files <- ottrpal::example_repo_setup() -#' -#' # Run this to delete them -#' example_repo_cleanup(files_to_remove = basename(example_files)) -#' } -example_repo_cleanup <- function(files_to_remove, verbose = FALSE) { - message("Cleaning up and removing example repo files") - - lapply(files_to_remove, function(file2remove, verbose = verbose) { - if (file.exists(file2remove)) { - message(paste0("Removing: ", file2remove)) - file.remove(file2remove) - } - }) -} diff --git a/R/bookdown_to_leanpub.R b/R/iframe_leanpub.R similarity index 93% rename from R/bookdown_to_leanpub.R rename to R/iframe_leanpub.R index 5afbc0f4..cd226b74 100644 --- a/R/bookdown_to_leanpub.R +++ b/R/iframe_leanpub.R @@ -1,6 +1,6 @@ -#' Convert Bookdown to Leanpub +#' Convert Website Course to Leanpub #' -#' @param path path to the bookdown book, must have a `_bookdown.yml` file +#' @param path path to the bookdown or quarto course repository, must have a `_bookdown.yml` or `_quarto.yml` file #' @param chapt_img_key File path to a TSV whose contents are the chapter urls (`url`), #' the chapter titles (`chapt_title`), the file path to the image to be used for the chapter (`img_path`). #' Column names `url`, `chapt_title`, and `img_path` must be used. @@ -17,13 +17,11 @@ #' @param remove_resources_start remove the word `resources/` at the front #' of any image path. #' @param run_quiz_checks TRUE/FALSE run quiz checks -#' @param make_book_txt Should [ottrpal::bookdown_to_book_txt()] be run +#' @param make_book_txt Should [ottrpal::course_to_book_txt()] be run #' to create a `Book.txt` in the output directory? #' @param quiz_dir directory that contains the quiz .md files that should be #' checked and incorporated into the Book.txt file. If you don't have quizzes, #' set this to NULL -#' @param clean_up TRUE/FALSE the old output directory should be deleted and -#' everything created fresh. #' @param footer_text Optionally can add a bit of text that will be added to the #' end of each file before the references section. #' @@ -32,19 +30,18 @@ #' #' @examples \dontrun{ #' -#' ottrpal::bookdown_to_embed_leanpub( +#' ottrpal::website_to_embed_leanpub( #' base_url = "https://jhudatascience.org/OTTR_Template/", #' make_book_txt = TRUE, #' quiz_dir = NULL #' ) #' } -bookdown_to_embed_leanpub <- function(path = ".", +website_to_embed_leanpub <- function(path = ".", chapt_img_key = NULL, + render = NULL, html_page = file.path(base_url, "index.html"), base_url = NULL, - clean_up = FALSE, default_img = NULL, - render = TRUE, output_dir = "manuscript", make_book_txt = FALSE, quiz_dir = "quizzes", @@ -55,8 +52,6 @@ bookdown_to_embed_leanpub <- function(path = ".", # Run the set up set_up_leanpub( path = path, - embed = TRUE, - clean_up = clean_up, render = render, output_dir = output_dir, make_book_txt = make_book_txt, @@ -110,10 +105,10 @@ bookdown_to_embed_leanpub <- function(path = ".", ####################### Book.txt creation #################################### out <- NULL if (make_book_txt) { - if (verbose) message("Running bookdown_to_book_txt") + if (verbose) message("Running course_to_book_txt") md_files <- basename(unlist(md_output_files)) - bookdown_to_book_txt( + course_to_book_txt( md_files = md_files, output_dir = output_dir, quiz_dir = quiz_dir, @@ -149,7 +144,7 @@ bookdown_to_embed_leanpub <- function(path = ".", #' Create Book.txt file from files existing in quiz directory #' -#' @param path path to the bookdown book, must have a `_bookdown.yml` file +#' @param path path to the bookdown or quarto course repository, must have a `_bookdown.yml` or `_quarto.yml` file #' @param md_files vector of file path of the md's to be included #' @param output_dir output directory to put files. It should likely be #' relative to path @@ -159,7 +154,7 @@ bookdown_to_embed_leanpub <- function(path = ".", #' @return A list of quiz and chapter files in order in a file called Book.txt -- How Leanpub wants it. #' @export #' -bookdown_to_book_txt <- function(path = ".", +course_to_book_txt <- function(path = ".", md_files = NULL, output_dir = "manuscript", quiz_dir = "quizzes", @@ -167,12 +162,12 @@ bookdown_to_book_txt <- function(path = ".", # If md_files are not specified, then try to get them if (is.null(md_files)) { # Establish path - path <- bookdown_path(path) + path <- course_path(path) rmd_regex <- "[.][R|r]md$" # Extract the names of the Rmd files (the chapters) - md_files <- bookdown_rmd_files(path = path) + md_files <- qrmd_files(path = path) } if (!is.null(quiz_dir)) { diff --git a/R/leanpub_checks.R b/R/leanpub_checks.R deleted file mode 100644 index 6f32e1ac..00000000 --- a/R/leanpub_checks.R +++ /dev/null @@ -1,206 +0,0 @@ -#' Check Leanpub Course or Book -#' -#' @param path path to the Leanpub book/course -#' @param verbose print diagnostic messages -#' -#' @return A list of output files and diagnostics -#' @export -#' -leanpub_check <- function(path = ".", - verbose = TRUE) { - if (verbose) { - message("Checking the Book.txt files") - } - check_book_txt(path = path) - extra_book_result <- check_extra_md_files(path = path) - - if (verbose) { - message("Checking if HTML is present") - } - html_result <- full_html_check(path = path) - attribute_result <- full_attribute_check(path = path) - - files <- get_md_files(path) - - L <- list( - extra_book_result = extra_book_result, - html_result = html_result, - attribute_result = attribute_result - ) - return(L) -} - -check_book_txt <- function(path = ".") { - file <- file.path(path, "Book.txt") - # if Book.txt not there, fail - stopifnot(file.exists(file)) - x <- readLines(file, warn = FALSE) - files <- file.path(path, x) - fe <- file.exists(files) - if (!all(fe)) { - msg <- paste(x[fe], collapse = ", ") - msg <- paste0("Book.txt has files specified, but missing: ", msg) - stop(msg) - } - return(NULL) -} -get_md_files <- function(path) { - files <- list.files(pattern = ".md$", ignore.case = TRUE, path = path) - files -} - -check_extra_md_files <- function(path = ".") { - files <- get_md_files(path) - bn <- basename(files) - file <- file.path(path, "Book.txt") - # if Book.txt not there, fail - stopifnot(file.exists(file)) - x <- readLines(file, warn = FALSE) - sd <- setdiff(files, x) - if (length(sd) > 0) { - sd <- paste(sd, collapse = ", ") - warning( - "Markdown files exist in path but are not in Book.txt, may be left out ", - sd - ) - return(FALSE) - } - return(FALSE) -} - -full_html_check <- function(path = ".") { - files <- get_md_files(path) - out <- lapply(files, check_html) - names(out) <- basename(files) - html_result <- any(sapply(out, function(x) x$result)) - if (any(html_result)) { - tag_list <- mapply(function(x, name) { - if (!x$result) { - return(NULL) - } - paste0("file ", name, ": ", paste(x$tags_found, collapse = ", ")) - }, SIMPLIFY = FALSE) - tag_list <- c(unlist(tag_list)) - tag_list <- paste(tag_list, collapse = "\n\n") - message(tag_list) - warning(tag_list) - return(FALSE) - } - return(TRUE) -} - -check_html <- function(x) { - if (length(x) == 1 && file.exists(x)) { - x <- readLines(x, warn = FALSE) - } - # taken from dput(names(shiny::tags)) - tags_to_check <- c( - "a", "abbr", "address", "animate", "animateMotion", "animateTransform", - "area", "article", "aside", "audio", "b", "base", "bdi", "bdo", - "blockquote", "body", "br", "button", "canvas", "caption", "circle", - "cite", "clipPath", "code", "col", "colgroup", "color-profile", - "command", "data", "datalist", "dd", "defs", "del", "desc", "details", - "dfn", "dialog", "discard", "div", "dl", "dt", "ellipse", "em", - "embed", "eventsource", "feBlend", "feColorMatrix", "feComponentTransfer", - "feComposite", "feConvolveMatrix", "feDiffuseLighting", "feDisplacementMap", - "feDistantLight", "feDropShadow", "feFlood", "feFuncA", "feFuncB", - "feFuncG", "feFuncR", "feGaussianBlur", "feImage", "feMerge", - "feMergeNode", "feMorphology", "feOffset", "fePointLight", "feSpecularLighting", - "feSpotLight", "feTile", "feTurbulence", "fieldset", "figcaption", - "figure", "filter", "footer", "foreignObject", "form", "g", "h1", - "h2", "h3", "h4", "h5", "h6", "hatch", "hatchpath", "head", "header", - "hgroup", "hr", "html", "i", "iframe", "image", "img", "input", - "ins", "kbd", "keygen", "label", "legend", "li", "line", "linearGradient", - "link", "main", "map", "mark", "marker", "mask", "menu", "meta", - "metadata", "meter", "mpath", "nav", "noscript", "object", "ol", - "optgroup", "option", "output", "p", "param", "path", "pattern", - "picture", "polygon", "polyline", "pre", "progress", "q", "radialGradient", - "rb", "rect", "rp", "rt", "rtc", "ruby", "s", "samp", "script", - "section", "select", "set", "slot", "small", "solidcolor", "source", - "span", "stop", "strong", "style", "sub", "summary", "sup", "svg", - "switch", "symbol", "table", "tbody", "td", "template", "text", - "textarea", "textPath", "tfoot", "th", "thead", "time", "title", - "tr", "track", "tspan", "u", "ul", "use", "var", "video", "view", - "wbr" - ) - agrepl <- function(...) { - any(grepl(...)) - } - start_strings <- paste("<\\s*", tags_to_check, ".*>") - start_res <- sapply(start_strings, function(pattern) { - agrepl(x = x, pattern = pattern) - }) - end_strings <- paste("<\\s*/", tags_to_check, ".*>") - end_res <- sapply(start_strings, function(pattern) { - agrepl(x = x, pattern = pattern) - }) - res <- start_res | end_res - tag_df <- tibble::tibble( - tag = tags_to_check, - start_present = start_res, - end_present = end_res, - present = res - ) - L <- list( - result = any(res), - tag_data = tag_df - ) - if (any(res)) { - L$tags_found <- tag_df$tag[tag_df$present] - } - L -} - -is_html_present <- function(x) { - out <- check_html(x) - out$result -} - - - -make_sure_attributes_above <- function(x) { - if (length(x) == 1 && file.exists(x)) { - x <- readLines(x, warn = FALSE) - } - index <- lag_attribute <- lag_trimmed <- trimmed <- link <- link_index <- NULL - rm(list = c( - "link_index", "link", "trimmed", "lag_trimmed", - "lag_attribute", "index" - )) - df <- tibble::tibble( - x = x, - index = 1:length(x), - trimmed = trimws(x) - ) %>% - dplyr::mutate( - link = grepl(trimmed, pattern = "^!\\s*\\[.*\\]\\s*\\("), - attributes = grepl(pattern = "^\\{", trimmed), - lag_trimmed = dplyr::lag(trimmed, n = 1), - lag_attribute = grepl(pattern = "^\\{", lag_trimmed) - ) - if (!any(df$link)) { - return(TRUE) - } - bad <- df %>% - dplyr::filter(link & !lag_attribute) - if (nrow(bad) > 0) { - bad_lines <- df %>% - dplyr::filter(index %in% c(bad$index, bad$index - 1)) %>% - dplyr::select(x, index) %>% - as.data.frame() - warning("Links without attributes in the last") - print(bad_lines) - return(FALSE) - } - return(TRUE) -} - -# See if any filenames are duplicated in resources/ and resources/images/ -# just PNGs -# list.files() -# if image specified, see if image actually exists *somewhere* - -full_attribute_check <- function(path = ".") { - files <- get_md_files(path) - out <- lapply(files, make_sure_attributes_above) -} diff --git a/R/remove_yaml.R b/R/remove_yaml.R deleted file mode 100644 index e98dde9d..00000000 --- a/R/remove_yaml.R +++ /dev/null @@ -1,51 +0,0 @@ -partition_yaml_front_matter <- function(input_lines) { - # taken from rmarkdown package - validate_front_matter <- function(delimiters) { - if (length(delimiters) >= 2 && (delimiters[2] - delimiters[1] > - 1) && grepl("^---\\s*$", input_lines[delimiters[1]])) { - if (delimiters[1] == 1) { - TRUE - } else { - all(grepl( - "^\\s*()?\\s*$", - input_lines[1:delimiters[1] - 1] - )) - } - } else { - FALSE - } - } - delimiters <- grep("^(---|\\.\\.\\.)\\s*$", input_lines) - if (validate_front_matter(delimiters)) { - front_matter <- input_lines[(delimiters[1]):(delimiters[2])] - input_body <- c() - if (delimiters[1] > 1) { - input_body <- c(input_body, input_lines[1:delimiters[1] - - 1]) - } - if (delimiters[2] < length(input_lines)) { - input_body <- c(input_body, input_lines[-(1:delimiters[2])]) - } - list(front_matter = front_matter, body = input_body) - } else { - list(front_matter = NULL, body = input_lines) - } -} - -#' Remove YAML header -#' -#' @param file file name of the markdown file -#' -#' @return A character vector of the text without the YAML header -#' @export -#' -#' @examples -#' file <- system.file("extdata/00_template.Rmd", package = "ottrpal") -#' out <- remove_yaml_header(file) -#' head(out) -remove_yaml_header <- function(file) { - file <- readLines(file, warn = FALSE) - out <- partition_yaml_front_matter(file) - out <- out$body - return(out) -} diff --git a/R/replace_html.R b/R/replace_html.R deleted file mode 100644 index 26026bc7..00000000 --- a/R/replace_html.R +++ /dev/null @@ -1,514 +0,0 @@ -#' Convert youtube link -#' -#' @param utube_link a link to a youtube video that may or may not be "www.youtube.com/embed" or "www.youtube.com/watch?v=" -#' format. -#' -#' @return Returns a youtube link in the "watch" format so it will render properly in Leanpub or Coursera-friendly files -#' @export -#' -convert_utube_link <- function(utube_link) { - # If it has a youtube embed link, switch to the watch format link - if (grepl("www.youtube.com/embed", utube_link)) { - utube_link <- paste0( - "https://www.youtube.com/watch?v=", - strsplit(utube_link, - split = "www.youtube.com/embed/" - )[[1]][2] - ) - } - return(utube_link) -} - - -get_html_element <- function(x, element = "img") { - x <- paste(x, collapse = "\n") - doc <- xml2::read_html(x) - nodes <- rvest::html_nodes(doc, xpath = paste0("//", element)) - nodes -} - - -get_figure_div <- function(x) { - div <- get_html_element(x, element = 'div[@class="figure"]') - types <- div %>% - rvest::html_elements(xpath = ".//img|.//iframe") %>% - rvest::html_name() - img <- div %>% - rvest::html_elements(xpath = ".//img|.//iframe") %>% - rvest::html_attrs() - # missing something - not a img or iframe - stopifnot(length(img) == length(div)) - div_aligns <- div %>% - rvest::html_attr(name = "style") - div_aligns <- trimws(sub("text-align: ", "", div_aligns)) - # markua - div_aligns[div_aligns == "center"] <- "middle" - div_aligns[is.na(div_aligns)] <- "middle" - captions <- div %>% - rvest::html_elements(xpath = './p[@class="caption"]') %>% - rvest::html_text() - img <- mapply(function(x, y) { - c(x, caption = y) - }, img, captions, SIMPLIFY = FALSE) - img <- mapply(function(x, y) { - c(x, element_type = y) - }, img, types, SIMPLIFY = FALSE) - img <- mapply(function(x, y) { - y[y %in% ""] <- NA_character_ - if (!all(is.na(y))) { - x <- c(x, align = y) - } - x - }, img, div_aligns, SIMPLIFY = FALSE) - - return(img) -} - - - -get_html_attr <- function(x, element = "img", name = "src") { - x <- get_html_element(x, element = element) - rvest::html_attr(x, name) -} - -get_iframe_attr <- function(x, name = "src") { - x <- get_html_attr(x, element = "iframe", name = name) -} - -get_img_attr <- function(x, name = "src") { - x <- get_html_attr(x, element = "img", name = name) -} - -get_iframe_src <- get_iframe_attr -get_img_src <- get_img_attr - -get_iframe_alt <- function(x) { - get_iframe_attr(x, name = "alt") -} - -get_img_alt <- function(x) { - get_img_attr(x, name = "alt") -} - - - - -find_figure_div <- function(x) { - regex <- paste0('
Version 3, 29 June 2007
Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
Version 3, 29 June 2007
Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-The GNU General Public License is a free, copyleft license for software and other kinds of works.
The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program–to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.
When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.
@@ -143,12 +73,10 @@Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and modification follow.
“This License” refers to version 3 of the GNU General Public License.
“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations.
@@ -158,9 +86,8 @@To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work.
A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
@@ -168,31 +95,26 @@The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
The Corresponding Source for a work in source code form is that same work.
All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work’s users, your or third parties’ legal rights to forbid circumvention of technological measures.
You may convey verbatim copies of the Program’s source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
-A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation’s users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
+A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation’s users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
-A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
+A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
-All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
+All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party’s predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor’s “contributor version”.
A contributor’s “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor’s essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
@@ -282,101 +193,90 @@A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.
If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy’s public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the “copyright” line and a pointer to where the full notice is found.
-<one line to give the program's name and a brief idea of what it does.>
-Copyright (C) 2018 John Muschelli
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
<one line to give the program's name and a brief idea of what it does.>
+Copyright (C) 2018 John Muschelli
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:
-Copyright (C) 2021 John Muschelli
- ottrpal for details type 'show w'.
- This program comes with ABSOLUTELY NO WARRANTY;
- This is free software, and you are welcome to redistribute it'show c' for details. under certain conditions; type
ottrpal Copyright (C) 2021 John Muschelli
+This program comes with ABSOLUTELY NO WARRANTY; for details type 'show w'.
+This is free software, and you are welcome to redistribute it
+under certain conditions; type 'show c' for details.
The hypothetical commands show w
and show c
should show the appropriate parts of the General Public License. Of course, your program’s commands might be different; for a GUI interface, you would use an “about box”.
You should also get your employer (if you work as a programmer) or school, if any, to sign a “copyright disclaimer” for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see <http://www.gnu.org/licenses/>.
-The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>.
+You should also get your employer (if you work as a programmer) or school, if any, to sign a “copyright disclaimer” for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see <http://www.gnu.org/licenses/>.
+The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>.