daniel/emacs
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

pkg update and first config fix

Browse Source 
org-brain not working, add org-roam
This commit is contained in:
Daniel Weschke
2022-12-19 23:02:34 +01:00
parent 02b3e07185
commit 82f05baffe
885 changed files with 356098 additions and 36993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
lisp/ox-reveal.el
View File

@@ -5,8 +5,8 @@
;; Author: Yujie Wen <yjwen.ty at gmail dot com>
;; Created: 2013-04-27
;; Version: 1.0
;; Package-Version: 20220410.1533
;; Package-Commit: 862b41df7734f57019543f6bd82ff7dad7183358
;; Package-Version: 20221127.814
;; Package-Commit: f55c851bf6aeb1bb2a7f6cf0f2b7bd0e79c4a5a0
;; Package-Requires: ((org "8.3"))
;; Keywords: outlines, hypermedia, slideshow, presentation
@@ -92,6 +92,8 @@
(:reveal-preamble "REVEAL_PREAMBLE" nil org-reveal-preamble t)
(:reveal-head-preamble "REVEAL_HEAD_PREAMBLE" nil org-reveal-head-preamble newline)
(:reveal-postamble "REVEAL_POSTAMBLE" nil org-reveal-postamble t)
(:reveal-prologue "REVEAL_PROLOGUE" nil org-reveal-prologue t)
(:reveal-epilogue "REVEAL_EPILOGUE" nil org-reveal-epilogue t)
(:reveal-multiplex-id "REVEAL_MULTIPLEX_ID" nil org-reveal-multiplex-id nil)
(:reveal-multiplex-secret "REVEAL_MULTIPLEX_SECRET" nil org-reveal-multiplex-secret nil)
(:reveal-multiplex-url "REVEAL_MULTIPLEX_URL" nil org-reveal-multiplex-url nil)
@@ -246,6 +248,16 @@ embedded into Reveal.initialize()."
:group 'org-export-reveal
:type 'string)
(defcustom org-reveal-prologue nil
"Prologue contents to be inserted between opening <div reveal> and <div slides>."
:group 'org-export-reveal
:type 'string)
(defcustom org-reveal-epilogue nil
"Prologue contents to be inserted between closing <div reveal> and <div slides>."
:group 'org-export-reveal
:type 'string)
(defcustom org-reveal-slide-header nil
"HTML content used as Reveal.js slide header"
:group 'org-export-reveal
@@ -334,7 +346,7 @@ Example:
:group 'org-export-reveal
:type 'list)
(defcustom org-reveal-highlight-css "%r/lib/css/zenburn.css"
(defcustom org-reveal-highlight-css "%r/plugin/highlight/zenburn.css"
"Highlight.js CSS file."
:group 'org-export-reveal
:type 'string)
@@ -640,10 +652,15 @@ using custom variable `org-reveal-root'."
(version (org-reveal--get-reveal-js-version info))
(reveal-css (org-reveal--choose-path root-path version "dist/reveal.css" "css/reveal.css"))
(theme (plist-get info :reveal-theme))
(theme-css (org-reveal--choose-path root-path
version
(concat "dist/theme/" theme ".css")
(concat "css/theme/" theme ".css")))
(theme-css (if (or (string-prefix-p "http://" theme)
(string-prefix-p "https://" theme)
(string-prefix-p "file://" theme))
;; theme is just the URL to a custom theme CSS
theme
(org-reveal--choose-path root-path
version
(concat "dist/theme/" theme ".css")
(concat "css/theme/" theme ".css"))))
(extra-css (plist-get info :reveal-extra-css))
(in-single-file (plist-get info :reveal-single-file)))
(concat
@@ -810,26 +827,27 @@ custom variable `org-reveal-root'."
(init-options (plist-get info :reveal-init-options))
(multiplex-statement
;; multiplexing - depends on defvar 'client-multiplex'
(when (memq 'multiplex plugins)
(concat
(format "multiplex: {
(let ((multiplex-id (plist-get info :reveal-multiplex-id)))
(when (not (string-empty-p multiplex-id)) ;Multiplex setup found
(concat
(format "multiplex: {
secret: %s, // null if client
id: '%s', // id, obtained from socket.io server
url: '%s' // Location of socket.io server
},\n"
(if (eq client-multiplex nil)
(format "'%s'" (plist-get info :reveal-multiplex-secret))
(format "null"))
(plist-get info :reveal-multiplex-id)
(plist-get info :reveal-multiplex-url))
(let ((url (plist-get info :reveal-multiplex-url)))
(format "dependencies: [ { src: '%s/socket.io/socket.io.js', async: true }, { src: '%s/%s', async: true } ]"
url url
(if client-multiplex "client.js"
(progn
(setq client-multiplex t)
"master.js")))))
))
(if (eq client-multiplex nil)
(format "'%s'" (plist-get info :reveal-multiplex-secret))
(format "null"))
multiplex-id
(plist-get info :reveal-multiplex-url))
(let ((url (plist-get info :reveal-multiplex-url)))
(format "dependencies: [ { src: '%s/socket.io/socket.io.js', async: true }, { src: '%s/%s', async: true } ]"
url url
(if client-multiplex "client.js"
(progn
(setq client-multiplex t)
"master.js")))))
)))
(extra-initial-js-statement (plist-get info :reveal-extra-initial-js))
(legacy-dependency-statement
(unless (or in-single-file (eq version 4))
@@ -951,7 +969,11 @@ Reveal.initialize({
;; Second value of the tuple, a list of Reveal plugin
;; initialization statements
(format "plugins: [%s]"
(mapconcat 'symbol-name plugins ", ")))
(mapconcat 'symbol-name
;; Remove multiplex from plugins, as
;; the multiplex plugin has been moved
;; out of reveal.js.
(seq-filter (lambda (p) (not (eq p 'multiplex))) plugins) ", ")))
;; No available plugin info found. Perhaps wrong plugin
;; names are given
(cons nil nil)))
@@ -1393,8 +1415,9 @@ info is a plist holding export options."
"</head>
<body>\n"
(org-reveal--build-pre/postamble 'preamble info)
"<div class=\"reveal\">
<div class=\"slides\">\n"
"<div class=\"reveal\">\n"
(org-reveal--build-pre/postamble 'prologue info)
"<div class=\"slides\">\n"
;; Title slides
(let ((title-slide (plist-get info :reveal-title-slide)))
(when (and title-slide (not (plist-get info :reveal-subtree)))
@@ -1435,8 +1458,9 @@ info is a plist holding export options."
(when footer (format "<div class=\"slide-footer\">%s</div>\n" footer))))
"</section>\n"))))
contents
"</div>
</div>\n"
"</div>\n"
(org-reveal--build-pre/postamble 'epilogue info)
"</div>\n"
(org-reveal--build-pre/postamble 'postamble info)
(org-reveal-scripts info)
"</body>