From 7695b7b58e16b6a9a6472f66c286212dbcd6c142 Mon Sep 17 00:00:00 2001
From: Yujie Wen <yjwen.ty@gmail.com>
Date: Mon, 26 Oct 2015 15:08:43 +0800
Subject: [PATCH] Add CSS when using highlight.js. Fixed #151

---
 Readme.org   | 34 ++++++++++++++++++++++++++--------
 ox-reveal.el | 26 +++++++++++++++++++-------
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/Readme.org b/Readme.org
index 55088ce..11b91e6 100755
--- a/Readme.org
+++ b/Readme.org
@@ -14,7 +14,7 @@
 #+REVEAL_HLEVEL: 2
 #+REVEAL_HEAD_PREAMBLE: <meta name="description" content="Org-Reveal Introduction.">
 #+REVEAL_POSTAMBLE: <p> Created by yjwen. </p>
-#+REVEAL_PLUGINS: (highlight markdown notes)
+#+REVEAL_PLUGINS: (markdown notes)
 #+REVEAL_EXTRA_CSS: ./local.css
 
 * Reveal.js and Org-Reveal
@@ -421,21 +421,39 @@ $ git clone https://github.com/yjwen/org-reveal.git
       =org-reveal-history=, =org-reveal-center=, =org-reveal-rolling-links=, =org-reveal-keyboard=, =org-reveal-overview=
 
     For an example, please refer to the heading part of this document.
-** Source Codes
+** Highlight Source Code
 
-   Org-reveal use Org-Babel to highlight source codes.
+   There are two ways to highlight source code.
+   1. Use your Emacs theme
+   2. Use highlight.js
 
-   Codes copied from [[http://www.haskell.org/haskellwiki/The_Fibonacci_sequence][Haskell Wiki]].
-#+BEGIN_SRC haskell
+      
+   To Use your Emacs theme, please make sure ~htmlize.el~ is
+   installed. Then no more setup is necessary.  
 
-fibs = 0 : 1 : next fibs
+   Below is an example. Codes are copied from [[http://www.haskell.org/haskellwiki/The_Fibonacci_sequence][Haskell Wiki]].
+   #+BEGIN_SRC haskell
+   fibs = 0 : 1 : next fibs
        where next (a : t@(b:_)) = (a+b) : next t
-#+END_SRC
+   #+END_SRC
 
    If you saw odd indentation, please set variable =org-html-indent=
    to =nil= and export again.
 
-   If code is not highlighted, please make sure =htmlize.el= is installed.
+*** Using highlight.js
+
+    You can also use [[http://hightlightjs.org][highlight.js]], by adding ~highlight~ to the Reveal.js
+    plugin list. 
+    #+BEGIN_SRC org
+      ,#+REVEAL_PLUGINS: (highlight)
+    #+END_SRC
+
+    The default highlighting theme is ~zenburn.css~ brought with
+    Reveal.js. To use other themes, please specify the CSS file name by
+    ~#+REVEAL_HIGHLIGHT_CSS~ or the variable ~org-reveal-highlight-css~.
+    
+    The "%r" in the given CSS file name will be replaced by Reveal.js'
+    URL.
 
 ** MathJax
   :PROPERTIES:
diff --git a/ox-reveal.el b/ox-reveal.el
index ed09bb1..d0d90da 100755
--- a/ox-reveal.el
+++ b/ox-reveal.el
@@ -83,6 +83,7 @@
     (:reveal-default-frag-style "REVEAL_DEFAULT_FRAG_STYLE" nil org-reveal-default-frag-style t)
     (:reveal-single-file nil "reveal_single_file" org-reveal-single-file t)
     (:reveal-init-script "REVEAL_INIT_SCRIPT" nil org-reveal-init-script space)
+    (:reveal-highlight-css "REVEAL_HIGHLIGHT_CSS" nil org-reveal-highlight-css nil)
     )
 
   :translate-alist
@@ -333,6 +334,11 @@ content."
   :group 'org-export-reveal
   :type 'string)
 
+(defcustom org-reveal-highlight-css "%r/lib/css/zenburn.css"
+  "Hightlight.js CSS file."
+  :group 'org-export-reveal
+  :type 'string)
+
 (defcustom org-reveal-note-key-char "n"
   "If not nil, org-reveal-note-key-char's value is registered as
   the key character to Org-mode's structure completion for
@@ -500,7 +506,13 @@ using custom variable `org-reveal-root'."
                "<link rel=\"stylesheet\" href=\"" theme-css "\" id=\"theme\"/>\n"))
      ;; extra css
      (let ((extra-css (plist-get info :reveal-extra-css)))
-       (if extra-css (format "<link rel=\"stylesheet\" href=\"%s\"/>" extra-css) ""))
+       (if (string= extra-css "") ""
+         (format "<link rel=\"stylesheet\" href=\"%s\"/>\n" extra-css)))
+     ;; Include CSS for highlight.js if necessary
+     (if (org-reveal--using-highlight.js info)
+         (format "<link rel=\"stylesheet\" href=\"%s\"/>" 
+                 (format-spec (plist-get info :reveal-highlight-css)
+                              `((?r . ,(directory-file-name root-path))))))
      ;; print-pdf
      (if in-single-file ""
        (format "
@@ -871,18 +883,18 @@ holding contextual information."
   ;; Just return the contents. No "<div>" tags.
   contents)
 
+(defun org-reveal--using-highlight.js (info)
+  "Check whether highlight.js plugin is enabled."
+  (memq 'highlight (or (car (read-from-string (plist-get info :reveal-plugins)))
+                       org-reveal-plugins)))
+
 (defun org-reveal-src-block (src-block contents info)
   "Transcode a SRC-BLOCK element from Org to Reveal.
 CONTENTS holds the contents of the item.  INFO is a plist holding
 contextual information."
   (if (org-export-read-attribute :attr_html src-block :textarea)
       (org-html--textarea-block src-block)
-    (let* ((buffer-plugins (plist-get info :reveal-plugins))
-           (use-highlight (memq 'highlight
-                                (cond
-                                 ((string= buffer-plugins "") nil)
-                                 (buffer-plugins (car (read-from-string buffer-plugins)))
-                                 (t org-reveal-plugins))))
+    (let* ((use-highlight (org-reveal--using-highlight.js info))
            (lang (org-element-property :language src-block))
            (caption (org-export-get-caption src-block))
            (code (if (not use-highlight)