[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master a0c2217 110/177: Merge pull request #473 from npostavs/org
From: |
João Távora |
Subject: |
[elpa] master a0c2217 110/177: Merge pull request #473 from npostavs/org8 |
Date: |
Sat, 28 Mar 2015 15:41:17 +0000 |
branch: master
commit a0c221725c2e3ae21d84f86655bf207e80811d49
Merge: 8e7295b a4e04f9
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>
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
- [elpa] master 3744f92 098/177: avoid double choices reversing, (continued)
- [elpa] master 3744f92 098/177: avoid double choices reversing, João Távora, 2015/03/28
- [elpa] master 1fc858f 099/177: Remove experimental Changelog file, João Távora, 2015/03/28
- [elpa] master 4d220f7 100/177: Remove an obsolete hack notice, João Távora, 2015/03/28
- [elpa] master 4470110 101/177: display-fn isn't actually used for filtering, João Távora, 2015/03/28
- [elpa] master c07db05 102/177: yas-x-prompt: remove dead code, João Távora, 2015/03/28
- [elpa] master 43a501a 103/177: remove yas--x-pretty-prompt-templates, João Távora, 2015/03/28
- [elpa] master 8e7295b 108/177: Closes #403: more uniform behaviour for `yas-use-menu', João Távora, 2015/03/28
- [elpa] master 498cbe4 105/177: Closes #469: Don't use `yas--init-minor-keymap', João Távora, 2015/03/28
- [elpa] master e7599b9 104/177: Merge pull request #466 from npostavs/no-reverse, João Távora, 2015/03/28
- [elpa] master a4e04f9 109/177: update doc for org 8.x, João Távora, 2015/03/28
- [elpa] master a0c2217 110/177: Merge pull request #473 from npostavs/org8,
João Távora <=
- [elpa] master b36a4f7 107/177: Properly closes #469: Don't use `yas--init-minor-keymap', João Távora, 2015/03/28
- [elpa] master d809e88 106/177: Revert "Closes #469: Don't use `yas--init-minor-keymap'", João Távora, 2015/03/28
- [elpa] master 599a262 113/177: Closes #474: fix cc-mode fontification conflict, João Távora, 2015/03/28
- [elpa] master a80033d 115/177: Refactor yas-good-grace error handling, João Távora, 2015/03/28
- [elpa] master 4d9eee9 111/177: Simpler, more effective .travis file, João Távora, 2015/03/28
- [elpa] master 4473b4e 112/177: New test for cc-mode's fontification functions, João Távora, 2015/03/28
- [elpa] master 8ced5c7 117/177: Remove type, expand-env from new snippet value, João Távora, 2015/03/28
- [elpa] master 4ccf133 114/177: Merge pull request #476 from npostavs/cc-fontify2, João Távora, 2015/03/28
- [elpa] master f176027 118/177: Restore backquotes lost in rst -> org translation, João Távora, 2015/03/28
- [elpa] master 580e5c6 116/177: Don't lose error message when yas-good-grace is t, João Távora, 2015/03/28