From 4a03bd71af4d5b4f5ec5f5ef02d7b50bd16acb56 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 21 Apr 2018 04:21:39 -0400 Subject: [PATCH 2/9] Unbundle fonts in ioslides. Signed-off-by: Elliott Sales de Andrade --- .../ioslides-13.5.1/fonts/OpenSans-Italic.ttf | 1 + .../ioslides-13.5.1/fonts/OpenSans-Regular.ttf | 1 + .../ioslides-13.5.1/fonts/OpenSans-Semibold.ttf | 1 + .../fonts/OpenSans-SemiboldItalic.ttf | 1 + .../ioslides/ioslides-13.5.1/fonts/OpenSans.ttf | Bin 36492 -> 0 bytes .../ioslides-13.5.1/fonts/OpenSansItalic.ttf | Bin 34416 -> 0 bytes .../ioslides-13.5.1/fonts/OpenSansSemibold.ttf | Bin 37568 -> 0 bytes .../fonts/OpenSansSemiboldItalic.ttf | Bin 34652 -> 0 bytes .../fonts/SourceCodePro-Regular.otf | 1 + .../ioslides-13.5.1/fonts/SourceCodePro.ttf | Bin 42380 -> 0 bytes .../ioslides/ioslides-13.5.1/fonts/fonts.css | 8 ++++---- 11 files changed, 9 insertions(+), 4 deletions(-) create mode 120000 inst/rmd/ioslides/ioslides-13.5.1/fonts/OpenSans-Italic.ttf create mode 120000 inst/rmd/ioslides/ioslides-13.5.1/fonts/OpenSans-Regular.ttf create mode 120000 inst/rmd/ioslides/ioslides-13.5.1/fonts/OpenSans-Semibold.ttf create mode 120000 inst/rmd/ioslides/ioslides-13.5.1/fonts/OpenSans-SemiboldItalic.ttf delete mode 100644 inst/rmd/ioslides/ioslides-13.5.1/fonts/OpenSans.ttf delete mode 100644 inst/rmd/ioslides/ioslides-13.5.1/fonts/OpenSansItalic.ttf delete mode 100644 inst/rmd/ioslides/ioslides-13.5.1/fonts/OpenSansSemibold.ttf delete mode 100644 inst/rmd/ioslides/ioslides-13.5.1/fonts/OpenSansSemiboldItalic.ttf create mode 120000 inst/rmd/ioslides/ioslides-13.5.1/fonts/SourceCodePro-Regular.otf delete mode 100644 inst/rmd/ioslides/ioslides-13.5.1/fonts/SourceCodePro.ttf diff --git a/inst/rmd/ioslides/ioslides-13.5.1/fonts/fonts.css b/inst/rmd/ioslides/ioslides-13.5.1/fonts/fonts.css index a949d32c..1315838e 100644 --- a/inst/rmd/ioslides/ioslides-13.5.1/fonts/fonts.css +++ b/inst/rmd/ioslides/ioslides-13.5.1/fonts/fonts.css @@ -8,23 +8,23 @@ font-family: 'Open Sans'; font-style: normal; font-weight: 600; - src: url(OpenSansSemibold.ttf) format('truetype'); + src: url(OpenSans-Semibold.ttf) format('truetype'); } @font-face { font-family: 'Open Sans'; font-style: italic; font-weight: 400; - src: url(OpenSansItalic.ttf) format('truetype'); + src: url(OpenSans-Italic.ttf) format('truetype'); } @font-face { font-family: 'Open Sans'; font-style: italic; font-weight: 600; - src: url(OpenSansSemiboldItalic.ttf) format('truetype'); + src: url(OpenSans-SemiboldItalic.ttf) format('truetype'); } @font-face { font-family: 'Source Code Pro'; font-style: normal; font-weight: 400; - src: url(SourceCodePro.ttf) format('truetype'); + src: url(SourceCodePro-Regular.otf) format('opentype'); } -- 2.17.1 From ae77b6224fadc16de118567a637cd8818d0173a5 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 21 Apr 2018 04:49:59 -0400 Subject: [PATCH 4/9] Unbundle jquery. Signed-off-by: Elliott Sales de Andrade --- R/html_dependencies.R | 4 +- inst/rmd/h/jquery-1.11.3/jquery.min.js | 5 - inst/rmd/h/jquery-AUTHORS.txt | 217 ------------------------- 3 files changed, 2 insertions(+), 224 deletions(-) delete mode 100644 inst/rmd/h/jquery-1.11.3/jquery.min.js delete mode 100644 inst/rmd/h/jquery-AUTHORS.txt diff --git a/R/html_dependencies.R b/R/html_dependencies.R index 34da0bc6..8d998ac3 100644 --- a/R/html_dependencies.R +++ b/R/html_dependencies.R @@ -15,8 +15,8 @@ NULL #' @export html_dependency_jquery <- function() { htmlDependency(name = "jquery", - version = "1.11.3", - src = rmarkdown_system_file("rmd/h/jquery-1.11.3"), + version = "1.12.4", + src = "/usr/share/javascript/jquery/1.12.4/", script = "jquery.min.js") } -- 2.17.1 From 73990b5053f0bf5ff7005e736456eceed8d1986c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 21 Apr 2018 05:10:52 -0400 Subject: [PATCH 5/9] Unbundle highlight.js. Signed-off-by: Elliott Sales de Andrade --- R/html_dependencies.R | 6 +++--- inst/rmd/h/highlightjs/default.css | 21 --------------------- inst/rmd/h/highlightjs/highlight.js | 2 -- inst/rmd/h/highlightjs/textmate.css | 19 ------------------- 4 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 inst/rmd/h/highlightjs/default.css delete mode 100644 inst/rmd/h/highlightjs/highlight.js delete mode 100644 inst/rmd/h/highlightjs/textmate.css diff --git a/R/html_dependencies.R b/R/html_dependencies.R index 8d998ac3..fc4fcb31 100644 --- a/R/html_dependencies.R +++ b/R/html_dependencies.R @@ -283,9 +283,9 @@ html_dependency_highlightjs <- function(highlight) { htmlDependency( "highlightjs", version = "9.12.0", - src = rmarkdown_system_file("rmd/h/highlightjs"), - script = "highlight.js", - stylesheet = paste0(highlight, ".css") + src = "/usr/share/javascript/highlight.js", + script = "highlight.pack.js", + stylesheet = paste0("styles/", highlight, ".css") ) } -- 2.17.1 From 9a9f83bb9ed5ad676ecb5093f85f5e67553e2e6d Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 21 Apr 2018 05:46:03 -0400 Subject: [PATCH 6/9] Unbundle fonts from bootstrap. Signed-off-by: Elliott Sales de Andrade --- inst/rmd/h/bootstrap-3.3.5/css/cosmo.min.css | 6 +- inst/rmd/h/bootstrap-3.3.5/css/fonts/Lato.ttf | Bin 81980 -> 38 bytes .../h/bootstrap-3.3.5/css/fonts/LatoBold.ttf | Bin 82368 -> 35 bytes .../bootstrap-3.3.5/css/fonts/LatoItalic.ttf | Bin 81332 -> 37 bytes .../h/bootstrap-3.3.5/css/fonts/OpenSans.ttf | Bin 34112 -> 47 bytes .../css/fonts/OpenSansBold.ttf | Bin 35760 -> 44 bytes .../css/fonts/OpenSansBoldItalic.ttf | Bin 33064 -> 50 bytes .../css/fonts/OpenSansItalic.ttf | Bin 32808 -> 46 bytes .../css/fonts/OpenSansLight.ttf | Bin 35340 -> 45 bytes .../css/fonts/OpenSansLightItalic.ttf | Bin 32680 -> 51 bytes .../css/fonts/Raleway-Bold.otf | 1 + .../css/fonts/Raleway-Regular.otf | 1 + .../h/bootstrap-3.3.5/css/fonts/Raleway.ttf | Bin 63796 -> 0 bytes .../bootstrap-3.3.5/css/fonts/RalewayBold.ttf | Bin 62224 -> 0 bytes .../h/bootstrap-3.3.5/css/fonts/Roboto.ttf | Bin 32652 -> 49 bytes .../bootstrap-3.3.5/css/fonts/RobotoBold.ttf | Bin 32500 -> 46 bytes .../bootstrap-3.3.5/css/fonts/RobotoLight.ttf | Bin 32664 -> 47 bytes .../css/fonts/RobotoMedium.ttf | Bin 32580 -> 48 bytes .../css/fonts/SourceSansPro-Bold.otf | 1 + .../css/fonts/SourceSansPro-It.otf | 1 + .../css/fonts/SourceSansPro-Light.otf | 1 + .../css/fonts/SourceSansPro-Regular.otf | 1 + .../css/fonts/SourceSansPro.ttf | Bin 35064 -> 0 bytes .../css/fonts/SourceSansProBold.ttf | Bin 34908 -> 0 bytes .../css/fonts/SourceSansProItalic.ttf | Bin 33864 -> 0 bytes .../css/fonts/SourceSansProLight.ttf | Bin 35368 -> 0 bytes inst/rmd/h/bootstrap-3.3.5/css/lumen.min.css | 8 +- .../h/bootstrap-3.3.5/css/readable.min.css | 4 +- .../fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes .../fonts/glyphicons-halflings-regular.svg | 288 ------------------ .../fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 70 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes 33 files changed, 15 insertions(+), 297 deletions(-) mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/Lato.ttf mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/LatoBold.ttf mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/LatoItalic.ttf mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/OpenSans.ttf mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/OpenSansBold.ttf mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/OpenSansBoldItalic.ttf mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/OpenSansItalic.ttf mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/OpenSansLight.ttf mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/OpenSansLightItalic.ttf create mode 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/Raleway-Bold.otf create mode 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/Raleway-Regular.otf delete mode 100644 inst/rmd/h/bootstrap-3.3.5/css/fonts/Raleway.ttf delete mode 100644 inst/rmd/h/bootstrap-3.3.5/css/fonts/RalewayBold.ttf mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/Roboto.ttf mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/RobotoBold.ttf mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/RobotoLight.ttf mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/RobotoMedium.ttf create mode 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/SourceSansPro-Bold.otf create mode 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/SourceSansPro-It.otf create mode 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/SourceSansPro-Light.otf create mode 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/SourceSansPro-Regular.otf delete mode 100644 inst/rmd/h/bootstrap-3.3.5/css/fonts/SourceSansPro.ttf delete mode 100644 inst/rmd/h/bootstrap-3.3.5/css/fonts/SourceSansProBold.ttf delete mode 100644 inst/rmd/h/bootstrap-3.3.5/css/fonts/SourceSansProItalic.ttf delete mode 100644 inst/rmd/h/bootstrap-3.3.5/css/fonts/SourceSansProLight.ttf delete mode 100644 inst/rmd/h/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.eot delete mode 100644 inst/rmd/h/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.svg mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.ttf delete mode 100644 inst/rmd/h/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff delete mode 100644 inst/rmd/h/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff2 diff --git a/inst/rmd/h/bootstrap-3.3.5/css/cosmo.min.css b/inst/rmd/h/bootstrap-3.3.5/css/cosmo.min.css index 23aaa5a8..7bfdac28 100644 --- a/inst/rmd/h/bootstrap-3.3.5/css/cosmo.min.css +++ b/inst/rmd/h/bootstrap-3.3.5/css/cosmo.min.css @@ -2,19 +2,19 @@ font-family: 'Source Sans Pro'; font-style: normal; font-weight: 300; - src: url(fonts/SourceSansProLight.ttf) format('truetype'); + src: url(fonts/SourceSansPro-Light.otf) format('opentype'); } @font-face { font-family: 'Source Sans Pro'; font-style: normal; font-weight: 400; - src: url(fonts/SourceSansPro.ttf) format('truetype'); + src: url(fonts/SourceSansPro-Regular.otf) format('opentype'); } @font-face { font-family: 'Source Sans Pro'; font-style: normal; font-weight: 700; - src: url(fonts/SourceSansProBold.ttf) format('truetype'); + src: url(fonts/SourceSansPro-Bold.otf) format('opentype'); } /*! diff --git a/inst/rmd/h/bootstrap-3.3.5/css/lumen.min.css b/inst/rmd/h/bootstrap-3.3.5/css/lumen.min.css index 2f221d7d..2e01c82a 100644 --- a/inst/rmd/h/bootstrap-3.3.5/css/lumen.min.css +++ b/inst/rmd/h/bootstrap-3.3.5/css/lumen.min.css @@ -2,26 +2,26 @@ font-family: 'Source Sans Pro'; font-style: normal; font-weight: 300; - src: url(fonts/SourceSansProLight.ttf) format('truetype'); + src: url(fonts/SourceSansPro-Light.otf) format('opentype'); } @font-face { font-family: 'Source Sans Pro'; font-style: normal; font-weight: 400; - src: url(fonts/SourceSansPro.ttf) format('truetype'); + src: url(fonts/SourceSansPro-Regular.otf) format('opentype'); } @font-face { font-family: 'Source Sans Pro'; font-style: normal; font-weight: 700; - src: url(fonts/SourceSansProBold.ttf) format('truetype'); + src: url(fonts/SourceSansPro-Bold.otf) format('opentype'); } @font-face { font-family: 'Source Sans Pro'; font-style: italic; font-weight: 400; - src: url(fonts/SourceSansProItalic.ttf) format('truetype'); + src: url(fonts/SourceSansPro-It.otf) format('opentype'); } /* diff --git a/inst/rmd/h/bootstrap-3.3.5/css/readable.min.css b/inst/rmd/h/bootstrap-3.3.5/css/readable.min.css index 8c0c7de7..ce148218 100644 --- a/inst/rmd/h/bootstrap-3.3.5/css/readable.min.css +++ b/inst/rmd/h/bootstrap-3.3.5/css/readable.min.css @@ -2,13 +2,13 @@ font-family: 'Raleway'; font-style: normal; font-weight: 400; - src: url(fonts/Raleway.ttf) format('truetype'); + src: url(fonts/Raleway.otf) format('opentype'); } @font-face { font-family: 'Raleway'; font-style: normal; font-weight: 700; - src: url(fonts/RalewayBold.ttf) format('truetype'); + src: url(fonts/Raleway-Bold.otf) format('opentype'); } /*! -- 2.17.1