ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow Macros to span several lines. 

However, if you are using arguments, it is required that the opening
parenthesis is attached to the macro name, and that the closing
parenthesis is attached to the three closing braces.
This commit is contained in:
Carsten Dominik 2009-08-10 10:08:34 +02:00
parent b70a5e0357
commit 05ef736ac0
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2009-08-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-preprocess-apply-macros): Allow newlines
in macro calls.
2009-08-09 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-listings)

4
lisp/org-exp.el
View File

@ -2057,7 +2057,7 @@ TYPE must be a string, any of:
(goto-char (point-min))
(let (sy val key args args2 s n)
(while (re-search-forward
"{{{\\([a-zA-Z][-a-zA-Z0-9_]*\\)\\((\\(.*?\\))\\)?}}}"
"{{{\\([a-zA-Z][-a-zA-Z0-9_]*\\)\\((\\([^\000]*?\\))\\)?}}}"
nil t)
(setq key (downcase (match-string 1))
args (match-string 3))
@ -2067,7 +2067,7 @@ TYPE must be a string, any of:
(intern (concat ":" key)))))
(save-match-data
(when args
(setq args (org-split-string args ",[ \t]*") args2 nil)
(setq args (org-split-string args ",[ \t\n]*") args2 nil)
(while args
(while (string-match "\\\\\\'" (car args))
;; repair bad splits