emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: "David O'Toole" <dto1138@gmail.com>
To: Dan Davison <davison@stats.ox.ac.uk>
Cc: emacs-orgmode Mailinglist <emacs-orgmode@gnu.org>
Subject: Re: [PATCH] Mode-specific fontification of babel source blocks
Date: Wed, 4 Aug 2010 01:55:49 -0400	[thread overview]
Message-ID: <AANLkTinSgDBeB6CWD31HKdynDpDPx3Nmov5EtM=7aTFn@mail.gmail.com> (raw)
In-Reply-To: <8739uvw0hg.fsf@stats.ox.ac.uk>

Hi, I don't have much more to do on the patch. I suspect it could be
slow with larger files, perhaps it could be programmed to only
refontify changed blocks (i.e. use the caching mechanism for block
results to prevent redundant fontifying. Perhaps someone who knows
about babel internals can help?

On Tue, Aug 3, 2010 at 10:55 PM, Dan Davison <davison@stats.ox.ac.uk> wrote:
> "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. Do you want to host this somewhere while it evolves? I've
> put my commits in branch src-block-display of
> git://repo.or.cz/org-mode/babel.git for the moment.
>
> --8<---------------cut here---------------start------------->8---
> diff --git a/lisp/org.el b/lisp/org.el
> index 843e4fe..ad8b7f9 100644
> --- a/lisp/org.el
> +++ b/lisp/org.el
> @@ -5012,14 +5012,13 @@ will be prompted for."
>   "Fontify #+ lines and blocks, in the correct ways."
>   (let ((case-fold-search t))
>     (if (re-search-forward
> -        "^\\([ \t]*#\\+\\(\\([a-zA-Z]+:?\\| \\|$\\)\\(_\\([a-zA-Z]+\\)\\)?\\)\\(.*\\)\\) ?\\(\\(\\w\\|-\\)*\\)"
> +        ;;  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))
>               (block-start (match-end 0))
>               (block-end nil)
> -              (language (downcase (if (stringp (match-string 6))
> -                                      (match-string 6)
> -                                      "AAAAAAAAAA")))
> +              (language (match-string 6))
>               (beg1 (line-beginning-position 2))
>               (dc1 (downcase (match-string 2)))
>               (dc3 (downcase (match-string 3)))
> @@ -5053,9 +5052,10 @@ will be prompted for."
>              (add-text-properties beg beg1 '(face org-meta-line))
>              (add-text-properties end1 end '(face org-meta-line))
>              (cond
> -               (org-src-fontify-natively
> -                (when (and (stringp language) (> (length language) 1))
> -                  (let* ((mode-command (intern (concat (substring language 1) "-mode")))
> +               ((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
> @@ -5073,7 +5073,7 @@ will be prompted for."
>                       (goto-char block-start)
>                       (delete-region block-start block-end)
>                       (insert fontified-output)
> -                      (set-buffer-modified-p modified)))))
> +                      (set-buffer-modified-p modified))))
>                (quoting
>                (add-text-properties beg1 end1 '(face org-block)))
>               ((not org-fontify-quote-and-verse-blocks))
> --8<---------------cut here---------------end--------------->8---
>
>
>> Anyone up for an icons theme standard
>> discussion?
>
> Yes.
>
> Dan
>
>>
>> _______________________________________________
>> 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
>

  reply	other threads:[~2010-08-04  5:55 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 [this message]
2010-08-09 21:35   ` Dan Davison
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='AANLkTinSgDBeB6CWD31HKdynDpDPx3Nmov5EtM=7aTFn@mail.gmail.com' \
    --to=dto1138@gmail.com \
    --cc=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).