Add two columns layout and more styles (#82)
Co-authored-by: Atsushi Yasumoto <atsushi@hacarus.com>
Co-authored-by: christophe dervieux <christophe.dervieux@gmail.com>
diff --git a/DESCRIPTION b/DESCRIPTION
index b665124..5a8a41b 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Type: Package
Package: revealjs
Title: R Markdown Format for 'reveal.js' Presentations
-Version: 0.9.1.9003
+Version: 0.9.1.9004
Date: 2017-03-13
Authors@R:
c(person(given = "Hakim",
diff --git a/NEWS.md b/NEWS.md
index 8f15e08..d349c98 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,7 @@
# revealjs (development version)
+- Fix template to add the necessary CSS to format [columns layout](https://pandoc.org/MANUAL.html#columns) and other Pandoc's features (thanks, @atusy, #82).
+
- Fix an issue with some configurations keys for chalkboard plugin - multiple value are now correctly passed to Pandoc's template (thanks, @grayknight2, @atusy, #62, #88).
- Fix issues with quoting of options when passed as variables to Pandoc. This was caused by a change in Pandoc 2.14.0.3 which now sets some default value for reveal.js options (thanks, @iain-palmer, #72).
diff --git a/inst/rmarkdown/templates/revealjs_presentation/resources/default.html b/inst/rmarkdown/templates/revealjs_presentation/resources/default.html
index 7fa2f49..55b4703 100644
--- a/inst/rmarkdown/templates/revealjs_presentation/resources/default.html
+++ b/inst/rmarkdown/templates/revealjs_presentation/resources/default.html
@@ -25,11 +25,47 @@
<script src="$highlightjs$/highlight.js"></script>
$endif$
-$if(highlighting-css)$
-<style type="text/css">
-$highlighting-css$
-</style>
-$endif$
+ <style type="text/css">
+ code{white-space: pre-wrap;}
+ span.smallcaps{font-variant: small-caps;}
+ span.underline{text-decoration: underline;}
+ div.column{display: inline-block; vertical-align: top; width: 50%;}
+ div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
+ ul.task-list{list-style: none;}
+ $if(quotes)$
+ q { quotes: "“" "”" "‘" "’"; }
+ $endif$
+ $if(highlighting-css)$
+ $highlighting-css$
+ $endif$
+ $if(displaymath-css)$
+ .display.math{display: block; text-align: center; margin: 0.5rem auto;}
+ $endif$
+ $if(csl-css)$
+ div.csl-bib-body { }
+ div.csl-entry {
+ clear: both;
+ $if(csl-entry-spacing)$
+ margin-bottom: $csl-entry-spacing$;
+ $endif$
+ }
+ .hanging div.csl-entry {
+ margin-left:2em;
+ text-indent:-2em;
+ }
+ div.csl-left-margin {
+ min-width:2em;
+ float:left;
+ }
+ div.csl-right-inline {
+ margin-left:2em;
+ padding-left:1em;
+ }
+ div.csl-indent {
+ margin-left: 2em;
+ }
+ $endif$
+ </style>
$if(theme)$
<link rel="stylesheet" href="$revealjs-url$/css/theme/$theme$.css" id="theme">
@@ -100,13 +136,9 @@
</style>
- <style type="text/css">code{white-space: pre;}</style>
-
-$if(css)$
$for(css)$
<link rel="stylesheet" href="$css$"/>
$endfor$
-$endif$
<!-- Printing and PDF exports -->
<script id="paper-css" type="application/dynamic-css">
diff --git a/inst/rmarkdown/templates/revealjs_presentation/skeleton/skeleton.Rmd b/inst/rmarkdown/templates/revealjs_presentation/skeleton/skeleton.Rmd
index b580385..ec391ce 100644
--- a/inst/rmarkdown/templates/revealjs_presentation/skeleton/skeleton.Rmd
+++ b/inst/rmarkdown/templates/revealjs_presentation/skeleton/skeleton.Rmd
@@ -27,3 +27,23 @@
plot(cars)
```
+## Slide with two columns layout
+
+Main content
+
+:::: columns
+
+::: column
+
+Showing an [underline text]{.underline} on the left
+
+:::
+
+::: column
+
+and a text in [smallcap]{.smallcaps} on the right
+
+:::
+
+::::
+