fix issue with missing embedded fonts for beige, league, and solarized themes.
diff --git a/DESCRIPTION b/DESCRIPTION
index e98ee51..c605416 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: revealjs
Type: Package
Title: R Markdown Format for 'reveal.js' Presentations
-Version: 0.5.0
+Version: 0.5.1
Date: 2016-01-30
Authors@R: c(
person("Hakim", "El Hattab", role = c("aut", "cph"),
diff --git a/inst/NEWS b/inst/NEWS
new file mode 100644
index 0000000..4b1c335
--- /dev/null
+++ b/inst/NEWS
@@ -0,0 +1,12 @@
+
+Version 0.6 (unreleased)
+-----------------------------------------------------------------------
+
+- Fix issue with missing embedded fonts for beige, league, and
+ solarized themes.
+
+
+Version 0.5
+-----------------------------------------------------------------------
+
+- Initial relase to CRAN
\ No newline at end of file
diff --git a/inst/reveal.js-3.2.0/css/theme/beige.css b/inst/reveal.js-3.2.0/css/theme/beige.css
index b009339..e49a215 100644
--- a/inst/reveal.js-3.2.0/css/theme/beige.css
+++ b/inst/reveal.js-3.2.0/css/theme/beige.css
@@ -30,8 +30,8 @@
*/
@font-face {
font-family: 'League Gothic';
- src: url("../../lib/font/league_gothic-webfont.eot");
- src: url("../../lib/font/league_gothic-webfont.eot?#iefix") format("embedded-opentype"), url("../../lib/font/league_gothic-webfont.woff") format("woff"), url("../../lib/font/league_gothic-webfont.ttf") format("truetype"), url("../../lib/font/league_gothic-webfont.svg#LeagueGothicRegular") format("svg");
+ src: url("../../lib/font/league-gothic/league-gothic.eot");
+ src: url("../../lib/font/league-gothic/league-gothic.eot?#iefix") format("embedded-opentype"), url("../../lib/font/league-gothic/league-gothic.woff") format("woff"), url("../../lib/font/league-gothic/league-gothic.ttf") format("truetype");
font-weight: normal;
font-style: normal; }
diff --git a/inst/reveal.js-3.2.0/css/theme/league.css b/inst/reveal.js-3.2.0/css/theme/league.css
index 0213c6d..d7ff503 100644
--- a/inst/reveal.js-3.2.0/css/theme/league.css
+++ b/inst/reveal.js-3.2.0/css/theme/league.css
@@ -29,13 +29,14 @@
*
* Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se
*/
- @font-face {
+@font-face {
font-family: 'League Gothic';
- src: url("../../lib/font/league_gothic-webfont.eot");
- src: url("../../lib/font/league_gothic-webfont.eot?#iefix") format("embedded-opentype"), url("../../lib/font/league_gothic-webfont.woff") format("woff"), url("../../lib/font/league_gothic-webfont.ttf") format("truetype"), url("../../lib/font/league_gothic-webfont.svg#LeagueGothicRegular") format("svg");
+ src: url("../../lib/font/league-gothic/league-gothic.eot");
+ src: url("../../lib/font/league-gothic/league-gothic.eot?#iefix") format("embedded-opentype"), url("../../lib/font/league-gothic/league-gothic.woff") format("woff"), url("../../lib/font/league-gothic/league-gothic.ttf") format("truetype");
font-weight: normal;
font-style: normal; }
+
/*********************************************
* GLOBAL STYLES
*********************************************/
diff --git a/inst/reveal.js-3.2.0/css/theme/solarized.css b/inst/reveal.js-3.2.0/css/theme/solarized.css
index d444304..b021521 100644
--- a/inst/reveal.js-3.2.0/css/theme/solarized.css
+++ b/inst/reveal.js-3.2.0/css/theme/solarized.css
@@ -30,12 +30,11 @@
@font-face {
font-family: 'League Gothic';
- src: url("../../lib/font/league_gothic-webfont.eot");
- src: url("../../lib/font/league_gothic-webfont.eot?#iefix") format("embedded-opentype"), url("../../lib/font/league_gothic-webfont.woff") format("woff"), url("../../lib/font/league_gothic-webfont.ttf") format("truetype"), url("../../lib/font/league_gothic-webfont.svg#LeagueGothicRegular") format("svg");
+ src: url("../../lib/font/league-gothic/league-gothic.eot");
+ src: url("../../lib/font/league-gothic/league-gothic.eot?#iefix") format("embedded-opentype"), url("../../lib/font/league-gothic/league-gothic.woff") format("woff"), url("../../lib/font/league-gothic/league-gothic.ttf") format("truetype");
font-weight: normal;
font-style: normal; }
-
/**
* Solarized colors by Ethan Schoonover
*/
diff --git a/man/revealjs_presentation.Rd b/man/revealjs_presentation.Rd
index 21c059b..0651e67 100644
--- a/man/revealjs_presentation.Rd
+++ b/man/revealjs_presentation.Rd
@@ -68,9 +68,9 @@
"zenburn", and "haddock". Pass \code{NULL} to prevent syntax highlighting.}
\item{mathjax}{Include mathjax. The "default" option uses an https URL from
-the official MathJax CDN. The "local" option uses a local version of
-MathJax (which is copied into the output directory). You can pass an
-alternate URL or pass \code{NULL} to exclude MathJax entirely.}
+the official MathJax CDN. The "local" option uses a local version of MathJax
+(which is copied into the output directory). You can pass an alternate URL
+or pass \code{NULL} to exclude MathJax entirely.}
\item{template}{Pandoc template to use for rendering. Pass "default" to use
the rmarkdown package default template; pass \code{NULL} to use pandoc's
@@ -87,8 +87,8 @@
\item{keep_md}{Keep the markdown file generated by knitting.}
\item{lib_dir}{Directory to copy dependent HTML libraries (e.g. jquery,
-bootstrap, etc.) into. By default this will be the name of the document
-with \code{_files} appended to it.}
+bootstrap, etc.) into. By default this will be the name of the document with
+\code{_files} appended to it.}
\item{pandoc_args}{Additional command line options to pass to pandoc}
diff --git a/tests/testthat/test_themes.R b/tests/testthat/test_themes.R
index a3c3898..63a3f2e 100644
--- a/tests/testthat/test_themes.R
+++ b/tests/testthat/test_themes.R
@@ -26,7 +26,9 @@
capture.output({
output_file <- tempfile(fileext = ".html")
output_format <- revealjs_presentation(theme = theme)
- rmarkdown::render(testdoc, output_file = output_file)
+ rmarkdown::render(testdoc,
+ output_format = output_format,
+ output_file = output_file)
expect_true(file.exists(output_file))
})
})