branch: master
commit a0c221725c2e3ae21d84f86655bf207e80811d49
Merge: 8e7295b a4e04f9
Author: João Távora <[email protected]>
Commit: João Távora <[email protected]>
Merge pull request #473 from npostavs/org8
update doc for org 8.x
---
doc/org-setup.inc | 2 ++
doc/yas-doc-helper.el | 15 +++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/doc/org-setup.inc b/doc/org-setup.inc
index 98f7c04..6ad09c9 100644
--- a/doc/org-setup.inc
+++ b/doc/org-setup.inc
@@ -6,4 +6,6 @@
#+OPTIONS: author:nil num:nil
#+AUTHOR:
+# org < 8.0 use +STYLE, after use +HTML_HEAD
#+STYLE: <link rel="stylesheet" type="text/css" href="stylesheets/manual.css"
/>
+#+HTML_HEAD: <link rel="stylesheet" type="text/css"
href="stylesheets/manual.css" />
diff --git a/doc/yas-doc-helper.el b/doc/yas-doc-helper.el
index 925e41b..f6e101c 100755
--- a/doc/yas-doc-helper.el
+++ b/doc/yas-doc-helper.el
@@ -27,9 +27,18 @@
(eval-when-compile
(require 'cl))
(require 'org)
-(require 'org-publish)
+(or (require 'org-publish nil t)
+ (require 'ox-publish))
(require 'yasnippet) ; docstrings must be loaded
+(defun yas--org-raw-html (tag content)
+ ;; in version 8.0 org-mode changed the export syntax, see
+ ;; http://orgmode.org/worg/org-8.0.html#sec-8-1
+ (format (if (version< org-version "8.0.0")
+ "@<%s>%s@</%s>" ; old: @<tag>
+ "@@html:<%s>@@%s@@html:</%s>@@") ; new: @@html:<tag>@@
+ tag content tag))
+
(defun yas--document-symbol (symbol level)
(flet ((concat-lines (&rest lines)
(mapconcat #'identity lines "\n")))
@@ -71,7 +80,8 @@
(prefix (downcase match1))
(suffix (match-string 2 match))
(fmt (cond
- ((member prefix args) "@<code>%s@</code>")
+ ((member prefix args)
+ (yas--org-raw-html "code" "%s"))
((null suffix) "/%s/"))))
(if fmt (format fmt prefix)
match1)))
@@ -125,6 +135,7 @@
(princ yas--version (current-buffer)))))
(proj-plist
(list
+ :publishing-function 'org-html-publish-to-html
:base-directory dir :publishing-directory dir
:html-preamble
(with-temp-buffer
