diff options
| author | Hakim El Hattab <hakim.elhattab@gmail.com> | 2016-01-08 10:48:10 +0100 |
|---|---|---|
| committer | Hakim El Hattab <hakim.elhattab@gmail.com> | 2016-01-08 10:48:10 +0100 |
| commit | c3919756f1a50fe696d7b690c64f0c9e7f5f6c62 (patch) | |
| tree | be10f480b169c4e6f66861163856dfc70f66ff1f | |
| parent | 2a8646543476bf39475606aa9d5aef622675f302 (diff) | |
| parent | d6d4c68013f2d77d7eb4c967c6500885c333955e (diff) | |
| download | fosdem-2018-presentation-c3919756f1a50fe696d7b690c64f0c9e7f5f6c62.tar fosdem-2018-presentation-c3919756f1a50fe696d7b690c64f0c9e7f5f6c62.tar.gz | |
resolve conflict
| -rw-r--r-- | README.md | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -590,15 +590,18 @@ Reveal.addEventListener( 'fragmenthidden', function( event ) { ### Code syntax highlighting +<<<<<<< HEAD By default, Reveal is configured with [highlight.js](https://highlightjs.org/) for code syntax highlighting. Below is an example with clojure code that will be syntax highlighted. When the `data-trim` attribute is present surrounding whitespace is automatically removed. +======= +By default, Reveal is configured with [highlight.js](https://highlightjs.org/) for code syntax highlighting. Below is an example with clojure code that will be syntax highlighted. When the `data-trim` attribute is present, surrounding whitespace is automatically removed. HTML will be escaped by default. To avoid this, for example if you are using `<mark>` to call out a line of code, add the `data-noescape` attribute to the `<code>` element. ```html <section> - <pre><code data-trim> + <pre><code data-trim data-noescape> (def lazy-fib (concat [0 1] - ((fn rfib [a b] + <mark>((fn rfib [a b]</mark> (lazy-cons (+ a b) (rfib b (+ a b)))) 0 1))) </code></pre> </section> |