From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
To: Rasmus <rasmus@gmx.us>
Cc: emacs-orgmode@gnu.org
Subject: Re: [patch] better(?) indention for cdlatex-environment
Date: Tue, 17 Feb 2015 09:51:08 +0100 [thread overview]
Message-ID: <87egpox6o3.fsf@nicolasgoaziou.fr> (raw)
In-Reply-To: <87wq3hgyie.fsf@gmx.us> (rasmus@gmx.us's message of "Tue, 17 Feb 2015 01:41:45 +0100")
Rasmus <rasmus@gmx.us> writes:
> + ;; cdlatex-environment always return nil. Therefore, capture output
> + ;; first and determine if an environment was selected.
> + (let* ((beg (point-marker))
> + (end (copy-marker (point) t))
> + (env (org-trim
> + (or (progn (ignore-errors (cdlatex-environment environment item))
> + (delete-and-extract-region beg end))
> + ""))))
The `or' is not necessary: `delete-and-extract-region' already returns
the empty string when markers don't move.
(env (progn (ignore-errors (cdlatex-environment environment item))
(org-trim (delete-and-extract-region beg end)))
> + (when (org-string-nw-p env)
> + ;; Get indentation of next line unless at column 0.
> + (let ((ind (if (bolp) 0
> + (save-excursion
> + (org-return-indent)
> + (prog1 (org-get-indentation)
> + (when (and (skip-chars-forward " \t") (eolp))
> + (delete-region beg (point)))))))
Nitpick
(when (progn (skip-chars-forward " \") (eolp))
...)
since you're not really interested in the return value of
`skip-chars-forward' (which is always non-nil).
> + (bol (and (skip-chars-backward " \t") (bolp))))
Ditto.
> + ;; Insert a newline before environment unless at column zero
> + ;; to "escape" the current line. Insert a newline if
> + ;; something is one the same line as \end{ENVIRONMENT}.
> + (insert (concat (unless bol "\n")
> + env
> + (and (skip-chars-forward " \t") (not (eolp)) "\n")))
Ditto.
> + (unless (zerop ind)
> + (let* ((element (org-element-at-point))
> + (elm-beg (org-element-property :begin element))
> + (elm-end (copy-marker
> + (save-excursion
> + (goto-char (org-element-property :end element))
> + (skip-chars-backward " \t\n\r")
> + (point)))))
> + (save-excursion
> + (goto-char elm-beg)
> + (beginning-of-line)
> + (while (<= (point) elm-end)
> + (org-indent-to-column ind)
> + (forward-line)))
> + (set-marker elm-end nil)))))
I don't think you need `org-element-at-point' at all. You already have
BEG and END markers available. I didn't test it, but this should be
enough to indent the environment.
Also you shouldn't apply `org-indent-to-column' when line is empty.
Regards,
next prev parent reply other threads:[~2015-02-17 8:50 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-10 11:28 [patch] better(?) indention for cdlatex-environment Rasmus
2015-02-10 12:27 ` Rasmus
2015-02-10 22:35 ` Nicolas Goaziou
2015-02-11 11:26 ` Rasmus
2015-02-11 21:39 ` Nicolas Goaziou
2015-02-11 23:40 ` Rasmus
2015-02-13 22:10 ` Nicolas Goaziou
2015-02-13 23:13 ` Rasmus
2015-02-14 0:29 ` Rasmus
2015-02-14 21:20 ` Nicolas Goaziou
2015-02-15 0:08 ` Rasmus
2015-02-15 9:52 ` Nicolas Goaziou
2015-02-17 0:41 ` Rasmus
2015-02-17 8:51 ` Nicolas Goaziou [this message]
2015-02-17 21:19 ` Rasmus
2015-02-18 0:39 ` Nicolas Goaziou
2015-02-18 1:06 ` Rasmus
2015-02-19 0:22 ` Rasmus
2015-02-19 23:11 ` Rasmus
2015-02-19 23:23 ` Nicolas Goaziou
2015-02-19 23:32 ` Rasmus
2015-02-20 0:13 ` Nicolas Goaziou
2015-02-20 0:38 ` Rasmus
2015-02-20 10:16 ` Nicolas Goaziou
2015-02-20 10:35 ` Rasmus
2015-02-20 10:40 ` Nicolas Goaziou
2015-02-20 10:43 ` Rasmus
2015-02-20 10:49 ` Nicolas Goaziou
2015-02-20 10:54 ` Rasmus
2015-02-20 11:17 ` Nicolas Goaziou
2015-02-20 10:50 ` Rasmus
2015-02-14 1:10 ` Nicolas Goaziou
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=87egpox6o3.fsf@nicolasgoaziou.fr \
--to=mail@nicolasgoaziou.fr \
--cc=emacs-orgmode@gnu.org \
--cc=rasmus@gmx.us \
/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).