alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

org: compatibility with org 8

Browse source 
* doc/org/init.el.in: Add compatibility with org 8.
* NEWS: Mention it.
This commit is contained in:
Alexandre Duret-Lutz 2014-10-24 10:47:49 +02:00
parent c7f98fd7f7
commit 09242d3f78
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -16,6 +16,10 @@ New in spot 1.2.5a (not yet released)
state labels. state labels.
- the acceptance specification in the HOA format output have been - the acceptance specification in the HOA format output have been
adjusted to match recent changes in the format specifications. adjusted to match recent changes in the format specifications.
- the build rules for documentation have been made compatible with
version 8.0 of Org-mode. (This was only a problem if you build
from the git repository, or if you want to edit the
documentation.)
New in spot 1.2.5 (2014-08-21) New in spot 1.2.5 (2014-08-21)

9
doc/org/init.el.in
View file

@ -1,6 +1,7 @@
;; htmlize is not always in the load-path. On Debian it can be found here. ;; htmlize is not always in the load-path. On Debian it can be found here.
(setq load-path (cons "/usr/share/emacs/site-lisp/emacs-goodies-el" load-path)) (setq load-path (cons "/usr/share/emacs/site-lisp/emacs-goodies-el" load-path))
(require 'org-publish) (or (require 'org-publish nil t) ; Org 7
(require 'ox-publish)) ; Org 8
(require 'org-install) (require 'org-install)
(print (concat "Org " (org-version))) (print (concat "Org " (org-version)))
@ -29,12 +30,14 @@
</div>") </div>")
(setq org-publish-project-alist (setq org-publish-project-alist
'(("spot-html" `(("spot-html"
:base-directory "@abs_top_srcdir@/doc/org/" :base-directory "@abs_top_srcdir@/doc/org/"
:base-extension "org" :base-extension "org"
:publishing-directory "@abs_top_srcdir@/doc/userdoc/" :publishing-directory "@abs_top_srcdir@/doc/userdoc/"
:recursive t :recursive t
:publishing-function org-publish-org-to-html :publishing-function
,(if (require 'org-publish nil t) 'org-publish-org-to-html ; Org 7
'org-html-publish-to-html) ; Org 8
:style "\n<link rel=\"stylesheet\" type=\"text/css\" href=\"syntax.css\" />\n<link rel=\"stylesheet\" type=\"text/css\" href=\"http://spot.lip6.fr/css/spot-zenburn.css\" />" :style "\n<link rel=\"stylesheet\" type=\"text/css\" href=\"syntax.css\" />\n<link rel=\"stylesheet\" type=\"text/css\" href=\"http://spot.lip6.fr/css/spot-zenburn.css\" />"
:auto-preamble t) :auto-preamble t)
("spot-static" ("spot-static"