tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Blocks: Apply Erics patch for indented blocks in org-exp-blocks.el

This commit is contained in:
Carsten Dominik 2009-06-17 18:19:19 +02:00
parent 0cd85674a5
commit 5406183319
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lisp/org-exp-blocks.el
View File

@ -180,7 +180,7 @@ specified in BLOCKS which default to the value of
(blocks org-export-blocks-witheld)
(case-fold-search t)
(types '())
type func start end)
indentation type func start end)
(flet ((interblock (start end type)
(save-match-data
(when (setf func (cadr (assoc type org-export-interblocks)))
@ -188,16 +188,22 @@ specified in BLOCKS which default to the value of
(goto-char (point-min))
(setf start (point))
(while (re-search-forward
"^#\\+begin_\\(\\S-+\\)[ \t]*\\(.*\\)?[\r\n]\\([^\000]*?\\)#\\+end_\\S-+.*" nil t)
(save-match-data (setf type (intern (match-string 1))))
"^\\([ \t]*\\)#\\+begin_\\(\\S-+\\)[ \t]*\\(.*\\)?[\r\n]\\([^\000]*?\\)[\r\n][ \t]*#\\+end_\\S-+.*" nil t)
(save-match-data (setq indentation (length (match-string 1))))
(save-match-data (setf type (intern (match-string 2))))
(unless (memq type types) (setf types (cons type types)))
(setf end (save-match-data (match-beginning 0)))
(interblock start end type)
(if (setf func (cadr (assoc type org-export-blocks)))
(replace-match (save-match-data
(if (memq type blocks)
""
(apply func (match-string 3) (split-string (match-string 2) " ")))) t t))
(progn
(replace-match (save-match-data
(if (memq type blocks)
""
(apply func (save-match-data (org-remove-indentation (match-string 4)))
(split-string (match-string 3) " ")))) t t)
;; indent the replaced match
(indent-region (match-beginning 0) (match-end 0) indentation)
))
(setf start (save-match-data (match-end 0))))
(mapcar (lambda (type)
(interblock start (point-max) type))