fix #969 (comment): support full URLs in cover-image

yihui · yihui · commit b3f11ba9daed · 2021-07-22T17:10:02.000-05:00
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: bookdown
 Type: Package
 Title: Authoring Books and Technical Documents with R Markdown
-Version: 0.22.13
+Version: 0.22.14
 Authors@R: c(
     person("Yihui", "Xie", role = c("aut", "cre"), email = "xie@yihui.name", comment = c(ORCID = "0000-0003-0645-5666")),
     person("JJ", "Allaire", role = "ctb"),
diff --git a/R/html.R b/R/html.R
@@ -490,6 +490,12 @@ clean_meta_tags = function(x) {
   x3 = sub(r, '\\3', x[i])
   x2 = gsub('<[^>]+>', '', x2)
   x[i] = paste0(x1, x2, x3)
+  # then fix URLs in meta: https://github.com/rstudio/bookdown/pull/969#issuecomment-885252698
+  r = '^(\\s*<meta (property="og:image"|name="twitter:image") content=")[^"]*?/(https?://[^"]+" />\\s*)$'
+  x = gsub(r, '\\1\\3', x)
+  # remove the unnecessary extra slash introduced in #969
+  r = '^(\\s*<meta (property="og:image"|name="twitter:image") content="https?://[^"]+?/)/([^"]+" />\\s*)$'
+  x = gsub(r, '\\1\\3', x)
   x
 }
 

Original file line number	Diff line number	Diff line change
`@@ -490,6 +490,12 @@ clean_meta_tags = function(x) {`
`490`	`490`	`x3 = sub(r, '\\3', x[i])`
`491`	`491`	`x2 = gsub('<[^>]+>', '', x2)`
`492`	`492`	`x[i] = paste0(x1, x2, x3)`
	`493`	`+ # then fix URLs in meta: https://github.com/rstudio/bookdown/pull/969#issuecomment-885252698`
	`494`	`+ r = '^(\\s<meta (property="og:image"\|name="twitter:image") content=")[^"]?/(https?://[^"]+" />\\s*)$'`
	`495`	`+ x = gsub(r, '\\1\\3', x)`
	`496`	`+ # remove the unnecessary extra slash introduced in #969`
	`497`	`+ r = '^(\\s<meta (property="og:image"\|name="twitter:image") content="https?://[^"]+?/)/([^"]+" />\\s)$'`
	`498`	`+ x = gsub(r, '\\1\\3', x)`
`493`	`499`	`x`
`494`	`500`	`}`
`495`	`501`