emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* [PATCH] ox-s5: update to work with refactored html backedn
@ 2017-05-04 15:39 Łukasz Stelmach
  2017-05-05  8:37 ` Łukasz Stelmach
  0 siblings, 1 reply; 4+ messages in thread
From: Łukasz Stelmach @ 2017-05-04 15:39 UTC (permalink / raw)
  To: emacs-orgmode


* contrib/lisp/ox-s5.el: adapt to changes introduced by c9ca0b6d in the
way :html-divs/org-html-divs are passed to ox-html
---
It appears that for some reason the patch didn't make it to the list the
first time I sent it.

 contrib/lisp/ox-s5.el | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/lisp/ox-s5.el b/contrib/lisp/ox-s5.el
index 503bfd0..7a717fe 100644
--- a/contrib/lisp/ox-s5.el
+++ b/contrib/lisp/ox-s5.el
@@ -304,13 +304,13 @@ holding export options."
   "Return complete document string after HTML conversion.
 CONTENTS is the transcoded contents string.  INFO is a plist
 holding export options."
-  (let ((org-html-divs
-	 (if (equal (plist-get info :html-container) "li")
-	     (append '((content "ol" "content")) org-s5--divs)
-	   org-s5--divs))
-	 (info (plist-put
+  (let ((info (plist-put
+	       (plist-put
 		(plist-put info :html-preamble (plist-get info :s5-preamble))
-		:html-postamble (plist-get info :s5-postamble))))
+		:html-postamble (plist-get info :s5-postamble))
+	       :html-divs (if (equal (plist-get info :html-container) "li")
+			      (append '((content "ol" "content")) org-s5--divs)
+			    org-s5--divs))))
     (mapconcat
      'identity
      (list
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH] ox-s5: Update to work with refactored html backedn
@ 2017-05-04 18:01 Łukasz Stelmach
  2017-05-06  7:05 ` Nicolas Goaziou
  0 siblings, 1 reply; 4+ messages in thread
From: Łukasz Stelmach @ 2017-05-04 18:01 UTC (permalink / raw)
  To: emacs-orgmode; +Cc: Łukasz Stelmach

* contrib/lisp/ox-s5.el (org-s5-template): Adapt to changes introduced
by c9ca0b6d in the way :html-divs/org-html-divs are passed to ox-html.
---
 contrib/lisp/ox-s5.el | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/lisp/ox-s5.el b/contrib/lisp/ox-s5.el
index 503bfd0..7a717fe 100644
--- a/contrib/lisp/ox-s5.el
+++ b/contrib/lisp/ox-s5.el
@@ -304,13 +304,13 @@ holding export options."
   "Return complete document string after HTML conversion.
 CONTENTS is the transcoded contents string.  INFO is a plist
 holding export options."
-  (let ((org-html-divs
-	 (if (equal (plist-get info :html-container) "li")
-	     (append '((content "ol" "content")) org-s5--divs)
-	   org-s5--divs))
-	 (info (plist-put
+  (let ((info (plist-put
+	       (plist-put
 		(plist-put info :html-preamble (plist-get info :s5-preamble))
-		:html-postamble (plist-get info :s5-postamble))))
+		:html-postamble (plist-get info :s5-postamble))
+	       :html-divs (if (equal (plist-get info :html-container) "li")
+			      (append '((content "ol" "content")) org-s5--divs)
+			    org-s5--divs))))
     (mapconcat
      'identity
      (list
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] ox-s5: update to work with refactored html backedn
  2017-05-04 15:39 [PATCH] ox-s5: update " Łukasz Stelmach
@ 2017-05-05  8:37 ` Łukasz Stelmach
  0 siblings, 0 replies; 4+ messages in thread
From: Łukasz Stelmach @ 2017-05-05  8:37 UTC (permalink / raw)
  To: emacs-orgmode

It was <2017-05-04 czw 17:39>, when Łukasz Stelmach wrote:
> * contrib/lisp/ox-s5.el: adapt to changes introduced by c9ca0b6d in the
> way :html-divs/org-html-divs are passed to ox-html

Please don't apply this patch. I'll send it from another e-mail account.
-- 
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] ox-s5: Update to work with refactored html backedn
  2017-05-04 18:01 [PATCH] ox-s5: Update to work with refactored html backedn Łukasz Stelmach
@ 2017-05-06  7:05 ` Nicolas Goaziou
  0 siblings, 0 replies; 4+ messages in thread
From: Nicolas Goaziou @ 2017-05-06  7:05 UTC (permalink / raw)
  To: Łukasz Stelmach; +Cc: emacs-orgmode

Hello,

Łukasz Stelmach <stlman@poczta.fm> writes:

> * contrib/lisp/ox-s5.el (org-s5-template): Adapt to changes introduced
> by c9ca0b6d in the way :html-divs/org-html-divs are passed to ox-html.

Applied. Thank you.

Regards,

-- 
Nicolas Goaziou

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-05-06  7:05 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-04 18:01 [PATCH] ox-s5: Update to work with refactored html backedn Łukasz Stelmach
2017-05-06  7:05 ` Nicolas Goaziou
  -- strict thread matches above, loose matches on Subject: below --
2017-05-04 15:39 [PATCH] ox-s5: update " Łukasz Stelmach
2017-05-05  8:37 ` Łukasz Stelmach

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).