Re: [O] [patch] better(?) indention for cdlatex-environment

[Rasmus]

Nicolas Goaziou <address@hidden> writes:

> 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.

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}...  I think
playing the "deterministic" card is non-trivial to get right in all cases
and org-cdlatex-environment-indent is already longer than
cdlatex-environment.

> Also you shouldn't apply `org-indent-to-column' when line is empty.

I don't see why not, but OK...  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...

—Rasmus

-- 
I hear there's rumors on the, uh, Internets. . .

>From 7381526412dc6e36e2c5c1b4e92cb102dda8c965 Mon Sep 17 00:00:00 2001
From: rasmus <address@hidden>
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 | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index 4f047b2..6de53f1 100755
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -18645,12 +18645,54 @@ 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."
+  "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 environment item)
-  (let ((element (org-element-at-point)))
-    (org-indent-region (org-element-property :begin element)
-                      (org-element-property :end element))))
+  ;; 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))
+                  ""))))
+    (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)))))))
+           (bol (and (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
+                       (and (skip-chars-forward " \t") (not (eolp)) "\n")))
+       (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)))))
+    (set-marker beg nil)
+    (set-marker end nil)))
 
 
 ;;;; LaTeX fragments
-- 
2.3.0