From 569a5bfbde36ec7dab6c24691147d84412c884af Mon Sep 17 00:00:00 2001 From: wkmor1 <1680870+wkmor1@users.noreply.github.com> Date: Sat, 24 Aug 2024 10:30:04 +0300 Subject: [PATCH 1/6] Remove slash from void elements --- R/tags.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/tags.R b/R/tags.R index 8848b393..5fd0cd0f 100644 --- a/R/tags.R +++ b/R/tags.R @@ -914,12 +914,12 @@ tagWrite <- function(tag, textWriter, indent=0, eol = "\n") { } } else { - # only self-close void elements + # close void elements # (see: http://dev.w3.org/html5/spec/single-page.html#void-elements) if (tag$name %in% c("area", "base", "br", "col", "command", "embed", "hr", "img", "input", "keygen", "link", "meta", "param", "source", "track", "wbr")) { - textWriter$write("/>") + textWriter$write(">") } else { textWriter$write(concat8(">")) From dae951cae71ccd0d5408007946dbac61302313dc Mon Sep 17 00:00:00 2001 From: wkmor1 <1680870+wkmor1@users.noreply.github.com> Date: Sat, 24 Aug 2024 10:31:52 +0300 Subject: [PATCH 2/6] Remove slash from void element --- tests/testthat/test-tags.r | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testthat/test-tags.r b/tests/testthat/test-tags.r index 195c1f86..8e683788 100644 --- a/tests/testthat/test-tags.r +++ b/tests/testthat/test-tags.r @@ -19,7 +19,7 @@ test_that("Basic tag writing works", { "one") expect_equal( as.character(tagList(tags$br(), "one")), - "
\none") + "
\none") }) test_that("Hanging commas don't break things", { From abd720a7632bc9587af4360c39784074c6abb97c Mon Sep 17 00:00:00 2001 From: wkmor1 <1680870+wkmor1@users.noreply.github.com> Date: Sat, 24 Aug 2024 10:42:50 +0300 Subject: [PATCH 3/6] Remove trailing slash from meta tag --- R/html_print.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/html_print.R b/R/html_print.R index c6943953..73d43fd2 100644 --- a/R/html_print.R +++ b/R/html_print.R @@ -112,7 +112,7 @@ save_html.default <- function(html, file, background = "white", libdir = "lib", html <- c("", sprintf('', lang), "", - "", + "", sprintf("", htmlEscape(background)), renderDependencies(deps, c("href", "file")), rendered$head, From 12b2338e182d959911b7edcc0f1086ce8d6c61e6 Mon Sep 17 00:00:00 2001 From: wkmor1 <1680870+wkmor1@users.noreply.github.com> Date: Sat, 24 Aug 2024 10:47:26 +0300 Subject: [PATCH 4/6] Remove slash from meta tag --- R/template.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/template.R b/R/template.R index 78989121..92c80b2f 100644 --- a/R/template.R +++ b/R/template.R @@ -118,7 +118,7 @@ renderDocument <- function(x, deps = NULL, processDep = identity) { # Put content in the section head_content <- paste0( - ' \n', + ' \n', sprintf(' \n', paste(result$singletons, collapse = ',') ), From dc71678522b73904382a657c10d2d4ca94b0327a Mon Sep 17 00:00:00 2001 From: wkmor1 <1680870+wkmor1@users.noreply.github.com> Date: Sat, 24 Aug 2024 10:48:52 +0300 Subject: [PATCH 5/6] Remove slashes from void elements --- R/html_dependency.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/html_dependency.R b/R/html_dependency.R index 9cb5a569..a9804e62 100644 --- a/R/html_dependency.R +++ b/R/html_dependency.R @@ -499,7 +499,7 @@ renderDependencies <- function(dependencies, if (length(dep$meta) > 0) { html <- c(html, paste( "", + htmlEscape(dep$meta), "\" >", sep = "" )) } @@ -509,7 +509,7 @@ renderDependencies <- function(dependencies, html <- c(html, paste( "", + "\" rel=\"stylesheet\" >", sep = "" )) } From a930a381d1c105b7f59b57a9f553ea1e0e5f3ba8 Mon Sep 17 00:00:00 2001 From: wkmor1 <1680870+wkmor1@users.noreply.github.com> Date: Sat, 24 Aug 2024 10:57:47 +0300 Subject: [PATCH 6/6] Update NEWS.md --- NEWS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.md b/NEWS.md index 628fbaaf..bcb5e29e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,7 @@ # htmltools (development version) +* Trailing slashes have been removed from void elements. (#436) + # htmltools 0.5.8 ## Improvements