Re: [O] [PATCH] Font-lock: allow hiding of brackets surrounding macros

[Bastien]

Hi Florian,

Bastien b...@gnu.org writes:

 Florian Beck f...@miszellen.de writes:

 I gave it a try. Well, I spend most of my time on formatting this
 patch. Hope it works.

 Works well, thanks.  Unless someone is against this change, I'll apply
 it next week.

This is now in master -- thanks!

-- 
 Bastien

Re: [O] [PATCH] Font-lock: allow hiding of brackets surrounding macros

[Sebastien Vauban]

Hello Florian and Bastien,

Bastien wrote:
 Bastien b...@gnu.org writes:
 Florian Beck f...@miszellen.de writes:

 I gave it a try. Well, I spend most of my time on formatting this
 patch. Hope it works.

 Works well, thanks.  Unless someone is against this change, I'll apply
 it next week.

 This is now in master -- thanks!

I just tested it.

I think that I would have left one pair of {} visible around macro calls
(for making it clear that it's something special, even if we can play
with the face `org-macro'); but, anyway, I find this to be a nice
improvement. Thanks for it!

Best regards,
  Seb

-- 
Sebastien Vauban

Re: [O] [PATCH] Font-lock: allow hiding of brackets surrounding macros

[Bastien]

Hi Sébastien,

Sebastien Vauban sva-news-D0wtAvR13HarG/idocf...@public.gmane.org
writes:

 I think that I would have left one pair of {} visible around macro calls
 (for making it clear that it's something special, even if we can play
 with the face `org-macro');

Playing with the face is the right thing to do I guess.

-- 
 Bastien

[O] [PATCH] Font-lock: allow hiding of brackets surrounding macros

[Florian Beck]

Hi,

I gave it a try. Well, I spend most of my time on formatting this patch. 
Hope it works.


--
Florian Beck
From 7980ee3ab9e048c1bdeddfaa6f7dbe984c469171 Mon Sep 17 00:00:00 2001
From: Florian Beck f...@miszellen.de
Date: Fri, 31 Jan 2014 22:42:04 +0100
Subject: [PATCH] Font-lock: allow hiding of brackets surrounding macros

* lisp/org.el (org-hide-macro-markers): new option
  (org-fontify-macros): new function
  (org-set-font-lock-defaults): call `org-fontify-macros'

* doc/org.texi: Document user option `org-hide-macro-markers'

TINYCHANGE
---
 doc/org.texi |  3 +++
 lisp/org.el  | 21 -
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/doc/org.texi b/doc/org.texi
index 9c7a6a7..792315c 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -10019,6 +10019,9 @@ and to the modification time of the file being exported, respectively.
 @var{FORMAT} should be a format string understood by
 @code{format-time-string}.
 
+The surrounding brackets can be made invisible by setting 
+@code{org-hide-macro-markers} to @code{t}.
+
 Macro expansion takes place during export.
 
 
diff --git a/lisp/org.el b/lisp/org.el
index 20dcb92..5844daf 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -4145,6 +4145,11 @@ following symbols:
   :group 'org-appearance
   :type 'boolean)
 
+(defcustom org-hide-macro-markers nil
+  Non-nil mean font-lock should hide the brackets marking macro calls.
+  :group 'org-appearance
+  :type 'boolean)
+
 (defcustom org-pretty-entities nil
   Non-nil means show entities as UTF8 characters.
 When nil, the \\name form remains in the buffer.
@@ -5949,6 +5954,20 @@ by a #.
 (org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0))
 t))
 
+  (defun org-fontify-macros (limit)
+Fontify macros.
+(when (re-search-forward \\({{{\\).+?\\(}}}\\) limit t)
+  (add-text-properties
+   (match-beginning 0) (match-end 0)
+   '(font-lock-fontified t face org-macro))
+  (when org-hide-macro-markers
+(add-text-properties (match-end 2) (match-beginning 2)
+ '(invisible t))
+(add-text-properties (match-beginning 1) (match-end 1)
+ '(invisible t)))
+  (org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0))
+  t))
+
 (defun org-activate-angle-links (limit)
   Run through the buffer and add overlays to links.
   (if (and (re-search-forward org-angle-link-re limit t)
@@ -6260,7 +6279,7 @@ needs to be inserted at a specific position in the font-lock sequence.)
 	   ;; Diary sexps.
 	   '(^?%%(.*\\|%%([^\n]*? (0 'org-sexp-date t))
 	   ;; Macro
-	   '({{{.+?}}} (0 'org-macro t))
+	   '(org-fontify-macros)
 	   '(org-hide-wide-columns (0 nil append))
 	   ;; TODO keyword
 	   (list (format org-heading-keyword-regexp-format
-- 
1.8.3.2

Re: [O] [PATCH] Font-lock: allow hiding of brackets surrounding macros

[Bastien]

Hi Florian,

Florian Beck f...@miszellen.de writes:

 I gave it a try. Well, I spend most of my time on formatting this
 patch. Hope it works.

Works well, thanks.  Unless someone is against this change, I'll apply
it next week.

-- 
 Bastien