emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* [PATCH] org babel execution and new exporter
@ 2013-02-14 17:17 Gregor Kappler
  2013-02-14 17:37 ` Eric Schulte
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Gregor Kappler @ 2013-02-14 17:17 UTC (permalink / raw)
  To: emacs-orgmode

[-- Attachment #1: Type: text/plain, Size: 273 bytes --]

Hi,

the new exporter currently does not respect `org-export-babel-evaluate' and evaluates babel src blocks always on export.  I did the tiniest change to ox.el as in the attached patch.
(This is my first patch sent - I hope it works and helps...).

Best regards,  Gregor


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0018-Export-Prevent-babel-src-blocks-from-being-evaluated.patch --]
[-- Type: text/x-diff, Size: 984 bytes --]

From a955c54f3ecda02b70933f6b98b8043a4f40d634 Mon Sep 17 00:00:00 2001
From: Gregor Kappler <gregor@alcedo.(none)>
Date: Thu, 14 Feb 2013 18:12:39 +0100
Subject: [PATCH] Export: Prevent babel src blocks from being evaluated
 if org-export-babel-evaluate is nil

* lisp/ox.el (org-export-as): Make sure org-export-babel-evaluate is not nil before calling `org-export-execute-babel-code'.

TINYCHANGE
---
 lisp/ox.el |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/ox.el b/lisp/ox.el
index 049dcc5..1ce900b 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -2810,7 +2810,10 @@ Return code as a string."
 	 ;; added some new ones.
 	 (org-macro-initialize-templates)
 	 (org-macro-replace-all org-macro-templates)
-	 (org-export-execute-babel-code)
+
+	 (when org-export-babel-evaluate
+	   (org-export-execute-babel-code))
+
 	 ;; Update radio targets since keyword inclusion might have
 	 ;; added some more.
 	 (org-update-radio-target-regexp)
-- 
1.7.10.4


[-- Attachment #3: Type: text/plain, Size: 247 bytes --]



-- 
Dr. Gregor Kappler

Fakultät für Psychologie 
Institut für Angewandte Psychologie: Gesundheit,
		Entwicklung, Förderung
Universität Wien
Liebiggasse 5
A-1010 Wien

http://www.univie.ac.at/Psychologie
tel: +43 1 4277 47276

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

* Re: [PATCH] org babel execution and new exporter
  2013-02-14 17:17 [PATCH] org babel execution and new exporter Gregor Kappler
@ 2013-02-14 17:37 ` Eric Schulte
  2013-02-14 17:59 ` Nicolas Goaziou
  2013-02-18 20:40 ` Nicolas Goaziou
  2 siblings, 0 replies; 4+ messages in thread
From: Eric Schulte @ 2013-02-14 17:37 UTC (permalink / raw)
  To: Gregor Kappler; +Cc: emacs-orgmode

Hi Gregor,

This patch looks good to me, but I'll leave the actual application of
anything dealing with the new export engine to Nicolas.

Thanks for contributing!

Gregor Kappler <gregor.kappler@univie.ac.at> writes:

> Hi,
>
> the new exporter currently does not respect
> org-export-babel-evaluate' and evaluates babel src blocks always on
> export.  I did the tiniest change to ox.el as in the attached patch.
> (This is my first patch sent - I hope it works and helps...).
>
> Best regards,  Gregor
>
>
> From a955c54f3ecda02b70933f6b98b8043a4f40d634 Mon Sep 17 00:00:00 2001
> From: Gregor Kappler <gregor@alcedo.(none)>
> Date: Thu, 14 Feb 2013 18:12:39 +0100
> Subject: [PATCH] Export: Prevent babel src blocks from being evaluated
>  if org-export-babel-evaluate is nil
>
> * lisp/ox.el (org-export-as): Make sure org-export-babel-evaluate is not nil before calling `org-export-execute-babel-code'.
>
> TINYCHANGE
> ---
>  lisp/ox.el |    5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/lisp/ox.el b/lisp/ox.el
> index 049dcc5..1ce900b 100644
> --- a/lisp/ox.el
> +++ b/lisp/ox.el
> @@ -2810,7 +2810,10 @@ Return code as a string."
>  	 ;; added some new ones.
>  	 (org-macro-initialize-templates)
>  	 (org-macro-replace-all org-macro-templates)
> -	 (org-export-execute-babel-code)
> +
> +	 (when org-export-babel-evaluate
> +	   (org-export-execute-babel-code))
> +
>  	 ;; Update radio targets since keyword inclusion might have
>  	 ;; added some more.
>  	 (org-update-radio-target-regexp)
> -- 
> 1.7.10.4

-- 
Eric Schulte
http://cs.unm.edu/~eschulte

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

* Re: [PATCH] org babel execution and new exporter
  2013-02-14 17:17 [PATCH] org babel execution and new exporter Gregor Kappler
  2013-02-14 17:37 ` Eric Schulte
@ 2013-02-14 17:59 ` Nicolas Goaziou
  2013-02-18 20:40 ` Nicolas Goaziou
  2 siblings, 0 replies; 4+ messages in thread
From: Nicolas Goaziou @ 2013-02-14 17:59 UTC (permalink / raw)
  To: Gregor Kappler; +Cc: emacs-orgmode

Hello,

Gregor Kappler <gregor.kappler@univie.ac.at> writes:

> the new exporter currently does not respect `org-export-babel-evaluate' and evaluates babel src blocks always on export.  I did the tiniest change to ox.el as in the attached patch.
> (This is my first patch sent - I hope it works and helps...).


Applied. Thank you.


Regards,

-- 
Nicolas Goaziou

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

* Re: [PATCH] org babel execution and new exporter
  2013-02-14 17:17 [PATCH] org babel execution and new exporter Gregor Kappler
  2013-02-14 17:37 ` Eric Schulte
  2013-02-14 17:59 ` Nicolas Goaziou
@ 2013-02-18 20:40 ` Nicolas Goaziou
  2 siblings, 0 replies; 4+ messages in thread
From: Nicolas Goaziou @ 2013-02-18 20:40 UTC (permalink / raw)
  To: Gregor Kappler; +Cc: emacs-orgmode

Hello,

Gregor Kappler <gregor.kappler@univie.ac.at> writes:

> the new exporter currently does not respect `org-export-babel-evaluate' and evaluates babel src blocks always on export.  I did the tiniest change to ox.el as in the attached patch.
> (This is my first patch sent - I hope it works and helps...).

I had to revert that patch as it introduces other problems. Would you
mind explaining again what was the original bug that motivated this
patch (if possible with an ECM)?

Thank you.


Regards,

-- 
Nicolas Goaziou

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

end of thread, other threads:[~2013-02-19  0:10 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-14 17:17 [PATCH] org babel execution and new exporter Gregor Kappler
2013-02-14 17:37 ` Eric Schulte
2013-02-14 17:59 ` Nicolas Goaziou
2013-02-18 20:40 ` Nicolas Goaziou

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).