Re: [PATCH] ox-extra.el: Fix filtering of latex header blocks

[Sebastian Christ <rudolfo.christ@gmail.com>]

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

And of course,

the previous patch contains a bug. I should have tested it with multiple
latex header blocks. Sorry for the inconvenience. The attached patch
should (hopefully) fix that.

Best wishes,
Sebastian


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-ox-extra.el-Fix-filtering-of-latex-header-blocks.patch --]
[-- Type: text/x-patch, Size: 2653 bytes --]

From d9890ab84c92ec60e76913d2a1b3967353819500 Mon Sep 17 00:00:00 2001
From: Sebastian Christ <rudolfo.christ@gmail.com>
Date: Fri, 9 Oct 2015 17:37:39 +0200
Subject: [PATCH] ox-extra.el: Fix filtering of latex header blocks

* ox-extra.el (org-latex-header-blocks-filter): Use `org-element' API to
  find begin and end of latex header blocks.

`org-latex-header-blocks-filter' still called
`org-edit-src-find-region-and-lang' and raised an undefined function
error because the funtion was removed from org-mode. This is fixed by determining the
begin and end of the latex block via `org-element'.
---
 contrib/lisp/ox-extra.el | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/contrib/lisp/ox-extra.el b/contrib/lisp/ox-extra.el
index e6d45cc..669d54f 100644
--- a/contrib/lisp/ox-extra.el
+++ b/contrib/lisp/ox-extra.el
@@ -71,18 +71,24 @@
 		       (org-element-property :end block)
 		       (org-element-property :post-affiliated block)))))))
       (mapc (lambda (pos)
-	      (goto-char (nth 2 pos))
-	      (destructuring-bind
-		  (beg end &rest ignore)
-		  (org-edit-src-find-region-and-lang)
-		(let ((contents-lines (split-string
-				       (buffer-substring-no-properties beg end)
-				       "\n")))
-		  (delete-region (nth 0 pos) (nth 1 pos))
-		  (dolist (line contents-lines)
-		    (insert (concat "#+latex_header: "
-				    (replace-regexp-in-string "\\` *" "" line)
-				    "\n"))))))
+              (let* ((beg (first pos))
+                     (end (second pos))
+                     (post-affiliated (third pos))
+                     (contents-lines (split-string
+                                      (buffer-substring-no-properties beg
+                                                                      end)
+                                      "\n")))
+                (goto-char post-affiliated)
+                (delete-region beg end)
+                (dolist (line (remove-if (lambda (line)
+                                           (or
+                                            (string-prefix-p "#+HEADER:" line)
+                                            (string-prefix-p "#+BEGIN_LaTeX" line)
+                                            (string-prefix-p "#+END_LaTeX" line)))
+                                         contents-lines))
+                  (insert (concat "#+latex_header: "
+                                  (replace-regexp-in-string "\\` *" "" line)
+                                  "\n")))))
 	    ;; go in reverse, to avoid wrecking the numeric positions
 	    ;; earlier in the file
 	    (reverse positions)))))
-- 
2.6.1