From: Dan Davison <davison@stats.ox.ac.uk>
To: emacs-orgmode Mailinglist <emacs-orgmode@gnu.org>
Subject: Re: [PATCH] Mode-specific fontification of babel source blocks
Date: Mon, 09 Aug 2010 17:35:07 -0400 [thread overview]
Message-ID: <87vd7j1nck.fsf@stats.ox.ac.uk> (raw)
In-Reply-To: <8739uvw0hg.fsf@stats.ox.ac.uk> (Dan Davison's message of "Tue, 03 Aug 2010 22:55:07 -0400")
[-- Attachment #1: Type: text/plain, Size: 770 bytes --]
Dan Davison <davison@stats.ox.ac.uk> writes:
> "David O'Toole" <dto1138@gmail.com> writes:
>
>> I've got a preliminary patch that adds optional "native" fontification
>> for source blocks. It uses the block's declared mode to fontify the
>> block text. So now blocks look the way they should, and this opens the
>> way to further enhancements.
>
> Hi David,
>
> This is great! Here's a patch which allows the src blocks to have
> switches and header args, and also uses `org-src-lang-modes' to find the
> major mode.
I'm resending this as a match against the current master branch, and as
an attachment so that it goes into the patchwork system. I am keeping
this line of patches in branch `src-block-fontification' at
git://github.com/dandavison/org-devel.git
Dan
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: src-block-fontification.diff --]
[-- Type: text/x-diff, Size: 2985 bytes --]
diff --git a/lisp/org.el b/lisp/org.el
index af4f793..ef6e769 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5017,17 +5017,24 @@ will be prompted for."
'(display t invisible t intangible t))
t)))
+(defvar org-src-fontify-natively nil
+ "When non-nil, fontify source blocks like their major mode would.")
+
(defun org-fontify-meta-lines-and-blocks (limit)
"Fontify #+ lines and blocks, in the correct ways."
(let ((case-fold-search t))
(if (re-search-forward
- "^\\([ \t]*#\\+\\(\\([a-zA-Z]+:?\\| \\|$\\)\\(_\\([a-zA-Z]+\\)\\)?\\)\\(.*\\)\\)"
+ ;; 1 2 3 3 4 5 5 4 2 6 6 7 7 1
+ "^\\([ \t]*#\\+\\(\\([a-zA-Z]+:?\\| \\|$\\)\\(_\\([a-zA-Z]+\\)\\)?\\)[ \t]*\\([^ \t\n]*\\)[ \t]*\\(.*\\)\\)"
limit t)
- (let ((beg (match-beginning 0))
- (beg1 (line-beginning-position 2))
- (dc1 (downcase (match-string 2)))
- (dc3 (downcase (match-string 3)))
- end end1 quoting block-type)
+ (let* ((beg (match-beginning 0))
+ (block-start (match-end 0))
+ (block-end nil)
+ (language (match-string 6))
+ (beg1 (line-beginning-position 2))
+ (dc1 (downcase (match-string 2)))
+ (dc3 (downcase (match-string 3)))
+ end end1 quoting block-type)
(cond
((member dc1 '("html:" "ascii:" "latex:" "docbook:"))
;; a single line of backend-specific content
@@ -5047,6 +5054,7 @@ will be prompted for."
(concat "^[ \t]*#\\+end" (match-string 4) "\\>.*")
nil t) ;; on purpose, we look further than LIMIT
(setq end (match-end 0) end1 (1- (match-beginning 0)))
+ (setq block-end (match-beginning 0))
(when quoting
(remove-text-properties beg end
'(display t invisible t intangible t)))
@@ -5056,6 +5064,28 @@ will be prompted for."
(add-text-properties beg beg1 '(face org-meta-line))
(add-text-properties end1 end '(face org-meta-line))
(cond
+ ((and org-src-fontify-natively language)
+ (let* ((lang-mode
+ (or (cdr (assoc language org-src-lang-modes)) (intern language)))
+ (mode-command (intern (concat (symbol-name lang-mode) "-mode")))
+ (string (buffer-substring-no-properties block-start block-end))
+ (modified (buffer-modified-p))
+ (fontified-output
+ (with-temp-buffer
+ (insert string)
+ (message language)
+ (funcall mode-command)
+ (font-lock-fontify-buffer)
+ (add-text-properties
+ (point-min) (point-max)
+ '(font-lock-fontified t fontified t font-lock-multiline t))
+ (buffer-substring (point-min) (point-max)))))
+ (when fontified-output
+ (assert (stringp fontified-output))
+ (goto-char block-start)
+ (delete-region block-start block-end)
+ (insert fontified-output)
+ (set-buffer-modified-p modified))))
(quoting
(add-text-properties beg1 end1 '(face org-block)))
((not org-fontify-quote-and-verse-blocks))
[-- Attachment #3: Type: text/plain, Size: 201 bytes --]
_______________________________________________
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
next prev parent reply other threads:[~2010-08-09 21:35 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-03 23:12 [PATCH] Mode-specific fontification of babel source blocks David O'Toole
2010-08-03 23:14 ` David O'Toole
2010-08-03 23:23 ` Erik Iverson
2010-08-04 2:55 ` Dan Davison
2010-08-04 5:55 ` David O'Toole
2010-08-09 21:35 ` Dan Davison [this message]
2010-09-02 15:51 ` Org now fontifies code blocks Dan Davison
2010-09-02 17:04 ` Erik Iverson
2010-09-02 19:06 ` Native TAB in code blocks [WAS Re: Org now fontifies code blocks] Dan Davison
2010-09-02 19:18 ` Carsten Dominik
2010-09-02 20:36 ` Native TAB in code blocks Dan Davison
2010-09-03 8:11 ` Julien Fantin
2010-09-02 20:26 ` Org now fontifies " Sébastien Vauban
2010-09-03 17:30 ` Eric S Fraga
2010-09-03 19:10 ` Thomas S. Dye
2010-09-06 16:49 ` David O'Toole
2010-09-07 13:23 ` Dan Davison
2010-09-07 13:55 ` Richard Riley
2010-09-07 16:05 ` Thomas S. Dye
2010-09-08 16:36 ` Darlan Cavalcante Moreira
2010-09-08 17:41 ` Dan Davison
2010-09-09 13:02 ` Darlan Cavalcante Moreira
2010-09-09 21:40 ` Thomas S. Dye
2010-09-09 22:35 ` Dan Davison
2010-09-09 23:03 ` Thomas S. Dye
2010-10-28 11:10 ` Dan Davison
2010-10-28 12:08 ` Jules Bean
2010-10-28 12:47 ` Jambunathan K
2010-10-28 13:35 ` Dan Davison
2010-10-28 16:24 ` Thomas S. Dye
2010-09-06 16:59 ` Richard Riley
2010-09-06 17:53 ` David O'Toole
2010-09-06 18:30 ` Bastien
2010-09-06 18:52 ` David O'Toole
2010-09-06 18:59 ` Richard Riley
2010-09-07 13:43 ` Dan Davison
2010-09-07 14:22 ` Carsten Dominik
2010-09-07 14:33 ` Bastien
2010-09-07 14:37 ` Carsten Dominik
2010-09-07 14:41 ` Sebastian Rose
2010-09-07 16:20 ` Dan Davison
2010-09-07 15:03 ` Sébastien Vauban
2010-09-07 16:54 ` Dan Davison
2010-09-08 16:30 ` Bastien
2010-09-08 18:35 ` Sébastien Vauban
2010-09-08 18:42 ` Erik Iverson
2010-09-08 19:17 ` Dan Davison
2010-09-07 14:24 ` Bastien
2010-09-07 14:33 ` Tom Short
2010-09-07 14:47 ` Richard Riley
2010-09-06 17:59 ` Erik Iverson
2010-09-06 18:23 ` Dan Davison
2010-09-06 18:49 ` Richard Riley
2010-09-07 13:33 ` Dan Davison
2010-09-07 7:24 ` Sébastien Vauban
2010-08-15 6:33 ` [PATCH] Mode-specific fontification of babel source blocks Dan Davison
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=87vd7j1nck.fsf@stats.ox.ac.uk \
--to=davison@stats.ox.ac.uk \
--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).