From: Rasmus <rasmus@gmx.us>
To: emacs-orgmode@gnu.org
Subject: Re: [patch] better(?) indention for cdlatex-environment
Date: Wed, 18 Feb 2015 02:06:01 +0100 [thread overview]
Message-ID: <87k2zg2fly.fsf@gmx.us> (raw)
In-Reply-To: 87mw4cm4sq.fsf@nicolasgoaziou.fr
[-- Attachment #1: Type: text/plain, Size: 1699 bytes --]
Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:
> Rasmus <rasmus@gmx.us> writes:
>
>> Perhaps there are clever ways to figure it out. I say there are too many
>> dynamics and "fixes" in the code to get cdlatex-environment to work
>> already. Just consider this example where | is cursor
>>
>> - foo | bar
>>
>> Midway through, when ENV is reinserted, but before indentation the
>> end-marker will be *after* bar which is a line after \end{ENV}...
>
> This is exactly what we want: indent (non empty) lines starting in
> [BEG ; END[. Or am I missing something?
Maybe I'm missing something.
Bar is already indented through ord-return-indent. So it would get double
indented. I could use "normal" return or "\n", but then I think I would
not get a good metric for indentation.
>> Anyway it reminded me that I missed "re-implementing" one feature of
>> cdlatex, namely moving the cursor to the right place. I refind this
>> place do it by inserting a funny string and replacing it. A poor man's
>> marker, I guess...
>
> Another option: when ENV is inserted the first time, store (e.g., in N)
> how many (forward-line -1) are needed to go back to BEG. At the end of
> the process, move to BEG then (forward-line n). I assume point is always
> left on an empty lines. If it is not the case, you also need to store
> current column, relatively to end of line.
Cdlatex inserts a "random" amount of newlines which I remove with trim
(depending mostly on bolp). Then I insert 0 or 1 newlines based on
context. It can probably be done, but I don't know if it's as robust.
> BTW, You didn't update the patch.
Ups. The old new patch is attached.
--
Together we'll stand, divided we'll fall
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-org.el-Change-indention-for-cdlatex-environments.patch --]
[-- Type: text/x-diff, Size: 3060 bytes --]
From 0a639d79f67a2aceadf6edbb334a4e6d9d16c88e Mon Sep 17 00:00:00 2001
From: rasmus <rasmus@gmx.us>
Date: Tue, 10 Feb 2015 12:02:59 +0100
Subject: [PATCH] org.el: Change indention for cdlatex environments
* org.el (org-cdlatex-environment-indent): Use different indent
algorithm based on content above the new latex-environment.
---
lisp/org.el | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 50 insertions(+), 6 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index 4f047b2..8ea8b28 100755
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -18645,13 +18645,57 @@ Revert to the normal definition outside of these fragments."
(call-interactively (key-binding (vector last-input-event))))))
(defun org-cdlatex-environment-indent (&optional environment item)
- "Execute `cdlatex-environment' and indent the inserted environment."
- (interactive)
- (cdlatex-environment environment item)
- (let ((element (org-element-at-point)))
- (org-indent-region (org-element-property :begin element)
- (org-element-property :end element))))
+ "Execute `cdlatex-environment' and indent the inserted environment.
+
+ENVIRONMENT and ITEM are passed to `cdlatex-environment'.
+The inserted environment is indented to current indentation
+unless point is at the beginning of the line, in which the
+environment remains unintended."
+ (interactive)
+ ;; 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))
+ (pointstr "*?*")
+ (env (progn (ignore-errors (cdlatex-environment environment item))
+ (when (> end beg) (insert pointstr))
+ (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 (progn (skip-chars-forward " \t") (eolp))
+ (delete-region beg (point)))))))
+ (bol (progn (skip-chars-backward " \t") (bolp))))
+ ;; 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
+ (when (and (skip-chars-forward " \t") (not (eolp)))
+ "\n")))
+ (unless (zerop ind)
+ (let* ((elm (org-element-at-point))
+ (elm-beg (org-element-property :begin elm))
+ (elm-end (copy-marker
+ (save-excursion
+ (goto-char (org-element-property :end elm))
+ (skip-chars-backward " \t\n\r")
+ (point)))))
+ (save-excursion
+ (goto-char elm-beg)
+ (while (< (point) elm-end)
+ (unless (eolp) (org-indent-to-column ind))
+ (forward-line)))
+ (set-marker elm-end nil))))
+ (goto-char beg)
+ (search-forward pointstr)
+ (replace-match ""))
+ (set-marker beg nil)
+ (set-marker end nil)))
\f
;;;; LaTeX fragments
--
2.3.0
next prev parent reply other threads:[~2015-02-18 1:06 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
2015-02-17 21:19 ` Rasmus
2015-02-18 0:39 ` Nicolas Goaziou
2015-02-18 1:06 ` Rasmus [this message]
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=87k2zg2fly.fsf@gmx.us \
--to=rasmus@gmx.us \
--cc=emacs-orgmode@gnu.org \
/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).