emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Aaron Ecay <aaronecay@gmail.com>
To: Sebastian Christ <rudolfo.christ@gmail.com>, emacs-orgmode@gnu.org
Subject: Re: [PATCH] ox-extra.el: Fix filtering of latex header blocks
Date: Tue, 10 Nov 2015 16:57:57 +0000	[thread overview]
Message-ID: <8737wdssfe.fsf@gmail.com> (raw)
In-Reply-To: <m2a8rskojt.fsf@gmail.com>

Hi Sebastian,

Thanks for the patch.  In addition to Kyle’s comments:

2015ko urriak 9an, Sebastian Christ-ek idatzi zuen:
> 
> 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
> 
> From 34b76e06bda5739e433c95b451915c8b804a1733 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 | 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))))

Here I think you should use (org-element-property :value X) to get the
contents-lines.  This means that it should be added to the list that’s
constructed from :begin, :end, and :post-affiliated higher up.  (And
then I think :post-affiliated can be dropped from that list.)

I’m not sure why I didn’t do it that way in the first place, actually.

-- 
Aaron Ecay

  parent reply	other threads:[~2015-11-10 16:58 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-09 16:13 [PATCH] ox-extra.el: Fix filtering of latex header blocks Sebastian Christ
2015-10-11  8:21 ` Sebastian Christ
2015-11-09  6:30 ` Kyle Meyer
2015-11-10  9:54   ` Sebastian Christ
2015-11-10 15:11     ` Kyle Meyer
2015-11-12 19:30       ` Sebastian Christ
2015-11-10 16:57 ` Aaron Ecay [this message]
2015-11-12 19:23   ` Sebastian Christ
2015-12-08 10:12     ` Sebastian Christ

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8737wdssfe.fsf@gmail.com \
    --to=aaronecay@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=rudolfo.christ@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).