emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* Macro expansion in included files
@ 2011-03-01 21:59 Benny Simonsen
  2011-03-02 16:26 ` Benny Simonsen
  0 siblings, 1 reply; 11+ messages in thread
From: Benny Simonsen @ 2011-03-01 21:59 UTC (permalink / raw)
  To: emacs-orgmode

Hi

I would like to use macros in files that I include in another file.
The problem is that the macros don't expand in included files. Is
there something I have missed or?

Example
main.org:
= main.org START ========
#+TITLE: Mainpage
#+MACRO: MacM @<strong>$1@</strong>

{{{MacM(Main)}}}

#+INCLUDE: "sub.org"
= main.org END ========

= sub.org START ========
#+TITLE: Subpage
#+MACRO: Mac @<strong>$1@</strong>

{{{MacM(Sub)}}}

{{{Mac(Sub)}}}

* Subpage title
content
= sub.org END ========

I export to html e.g. via:
org-export-as-html-to-buffer on main.org

The result is
{{{MacM(Main)}}} is expanded as expected but the {{{Mac*(Sub)}}} isn't expanded.

Best regards
Benny

^ permalink raw reply	[flat|nested] 11+ messages in thread
* Macro expansion in included files
@ 2011-03-14 22:01 Benny Simonsen
  2011-04-08 10:36 ` Carsten Dominik
  0 siblings, 1 reply; 11+ messages in thread
From: Benny Simonsen @ 2011-03-14 22:01 UTC (permalink / raw)
  To: emacs-orgmode

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

Hi

Some time ago I was posting about a problem with macros in included
files - they will not expand.

Example with two files top.org and sub.org: macro in the included file
sub.org isn't expanded during export.
See the content of the example files below.

The patch fixes this so that the macro is expanded in both top.org and sub.org.

Setup:
org-mode: git master (head)
export top.org with org-export-as-html

I hope that the patch format is ok ("git diff" output) attached.

Best regards
Benny Simonsen

### top.org ############################################################
#+TITLE: Debug org file
#+MACRO: testmacro Expanded

{{{testmacro}}}

#+INCLUDE: "sub.org"
########################################################################

### sub.org ############################################################
#+TITLE: Included debug org file

{{{testmacro}}}
########################################################################

[-- Attachment #2: macro-expansion-in-included-files.patch --]
[-- Type: text/x-patch, Size: 565 bytes --]

diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 34f101d..d6b23a9 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -1083,6 +1083,10 @@ on this string to produce the exported version."
       ;; Call the hook
       (run-hooks 'org-export-preprocess-hook)
 
+      ;; Handle include files, and call a hook
+      (org-export-handle-include-files-recurse)
+      (run-hooks 'org-export-preprocess-after-include-files-hook)
+
       ;; Process the macros
       (org-export-preprocess-apply-macros)
       (run-hooks 'org-export-preprocess-after-macros-hook)

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

end of thread, other threads:[~2011-08-30 17:22 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-01 21:59 Macro expansion in included files Benny Simonsen
2011-03-02 16:26 ` Benny Simonsen
2011-03-03  9:10   ` Sébastien Vauban
2011-03-03 11:12     ` Benny Simonsen
2011-03-05  9:12   ` Benny Simonsen
2011-03-05 14:07     ` Sébastien Vauban
2011-03-05 17:55       ` Benny Simonsen
2011-06-30 16:29     ` Bastien
2011-08-30 17:22       ` Benny Simonsen
  -- strict thread matches above, loose matches on Subject: below --
2011-03-14 22:01 Benny Simonsen
2011-04-08 10:36 ` Carsten Dominik

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