From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rasmus Subject: Re: [patch] better(?) indention for cdlatex-environment Date: Tue, 17 Feb 2015 01:41:45 +0100 Message-ID: <87wq3hgyie.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> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNWEd-0001A2-0W for emacs-orgmode@gnu.org; Mon, 16 Feb 2015 19:41:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YNWEY-0003ox-0H for emacs-orgmode@gnu.org; Mon, 16 Feb 2015 19:41:54 -0500 Received: from mout.gmx.net ([212.227.15.19]:60420) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNWEX-0003od-M7 for emacs-orgmode@gnu.org; Mon, 16 Feb 2015 19:41:49 -0500 Received: from W530 ([109.201.154.147]) by mail.gmx.com (mrgmx002) with ESMTPSA (Nemesis) id 0Leux5-1XmqZv2qb9-00qjMh for ; Tue, 17 Feb 2015 01:41:48 +0100 In-Reply-To: <87lhjzo611.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Sun, 15 Feb 2015 10:52:58 +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, > Another idea: [...] Good trick. I used it in attached, which I think works well. =E2=80=94Rasmus --=20 With monopolies the cake is a lie! --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-org.el-Change-indention-for-cdlatex-environments.patch >From 4ab1df88e5bf87d01594e280af7887cc6cd0d3ca 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 | 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 --=-=-=--