From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sebastian Christ Subject: [PATCH] ox-extra.el: Fix filtering of latex header blocks Date: Fri, 09 Oct 2015 18:13:42 +0200 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZkaK7-0001wj-7Q for emacs-orgmode@gnu.org; Fri, 09 Oct 2015 12:15:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZkaK3-0003il-TF for emacs-orgmode@gnu.org; Fri, 09 Oct 2015 12:15:11 -0400 Received: from plane.gmane.org ([80.91.229.3]:33600) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZkaK3-0003ie-ND for emacs-orgmode@gnu.org; Fri, 09 Oct 2015 12:15:07 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1ZkaK0-0004OZ-Lm for emacs-orgmode@gnu.org; Fri, 09 Oct 2015 18:15:04 +0200 Received: from ip5f586b34.dynamic.kabel-deutschland.de ([95.88.107.52]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 09 Oct 2015 18:15:04 +0200 Received: from rudolfo.christ by ip5f586b34.dynamic.kabel-deutschland.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 09 Oct 2015 18:15:04 +0200 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain Hi group, I'd like to provide a patch to ox-extra.el. `org-latex-header-blocks-filter' still calls `org-edit-src-find-region-and-lang' and raises therefore an undefined function error. Best wishes, Sebastian --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-ox-extra.el-Fix-filtering-of-latex-header-blocks.patch >From 34b76e06bda5739e433c95b451915c8b804a1733 Mon Sep 17 00:00:00 2001 From: Sebastian Christ 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 | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/contrib/lisp/ox-extra.el b/contrib/lisp/ox-extra.el index e6d45cc..bb838fc 100644 --- a/contrib/lisp/ox-extra.el +++ b/contrib/lisp/ox-extra.el @@ -71,18 +71,22 @@ (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 (third pos)) + (end (second pos)) + (post-affiliated (first pos)) + (contents-lines + (cdr (butlast + (split-string + (buffer-substring-no-properties post-affiliated + end) + "\n") + 2)))) + (goto-char beg) + (delete-region beg end) + (dolist (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 --=-=-=--