From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rasmus Subject: Re: [patch] better(?) indention for cdlatex-environment Date: Thu, 19 Feb 2015 01:22:29 +0100 Message-ID: <87r3tmsqbe.fsf@gmx.us> References: <87386e0zuy.fsf@gmx.us> <87wq3pwg29.fsf@nicolasgoaziou.fr> <87lhk48z9x.fsf@gmx.us> <87fvacw2jv.fsf@nicolasgoaziou.fr> <87mw4kyq2e.fsf@gmx.us> <87fva9tqdj.fsf@nicolasgoaziou.fr> <873869h0cd.fsf@gmx.us> <87twypgwt5.fsf@gmx.us> <87pp9cnq9w.fsf@nicolasgoaziou.fr> <874mqoc9zf.fsf@gmx.us> <87lhjzo611.fsf@nicolasgoaziou.fr> <87wq3hgyie.fsf@gmx.us> <87egpox6o3.fsf@nicolasgoaziou.fr> <877fvg44nw.fsf@gmx.us> <87mw4cm4sq.fsf@nicolasgoaziou.fr> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40599) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOEt2-0004NF-Rn for emacs-orgmode@gnu.org; Wed, 18 Feb 2015 19:22:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YOEsy-0007kX-Rx for emacs-orgmode@gnu.org; Wed, 18 Feb 2015 19:22:36 -0500 Received: from mout.gmx.net ([212.227.17.22]:62851) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOEsy-0007kB-Il for emacs-orgmode@gnu.org; Wed, 18 Feb 2015 19:22:32 -0500 Received: from W530 ([109.201.152.15]) by mail.gmx.com (mrgmx103) with ESMTPSA (Nemesis) id 0MYfJW-1Y2qOa2fr8-00VSxY for ; Thu, 19 Feb 2015 01:22:30 +0100 In-Reply-To: <87mw4cm4sq.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Wed, 18 Feb 2015 01:39:17 +0100") 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; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, Nicolas Goaziou 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? OK, the missing key is org-indent-line-to. It works better in this case and I can use end. >> 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. OK it now does this. =E2=80=94Rasmus --=20 Dung makes an excellent fertilizer --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-org.el-Change-indention-for-cdlatex-environments.patch >From a0dca50b09baede2e7c63ec6b9bedb976b3a3b96 Mon Sep 17 00:00:00 2001 From: rasmus 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 | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 4f047b2..e15e622 100755 --- a/lisp/org.el +++ b/lisp/org.el @@ -18645,12 +18645,61 @@ 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)) + (inserted (progn + (ignore-errors (cdlatex-environment environment item)) + (< beg end))) + ;; Figure out how many lines to move forward after the + ;; environment has been inserted. + (lines (when inserted + (save-excursion + (- (cl-loop while (< beg (point)) + with x = 0 + do (forward-line -1) + (cl-incf x) + finally return x) + (if (progn (goto-char beg) + (and (progn (skip-chars-forward " \t") (eolp)) + (progn (skip-chars-backward " \t") (bolp)))) + 1 0))))) + (env (org-trim (delete-and-extract-region beg end)))) + (when inserted + ;; 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) + (save-excursion + (goto-char beg) + (while (< (point) end) + (unless (eolp) (org-indent-line-to ind)) + (forward-line)))) + (goto-char beg) + (forward-line lines) + (org-indent-line-to ind))) + (set-marker beg nil) + (set-marker end nil))) ;;;; LaTeX fragments -- 2.3.0 --=-=-=--