emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: gregory@dynapse.com (Gregory J. Grubbs)
To: emacs-orgmode@gnu.org
Subject: Re: Display inline images patch
Date: Thu, 10 Jun 2010 17:59:11 -0500	[thread overview]
Message-ID: <yj68w6m1olc.fsf@dynapse.com> (raw)
In-Reply-To: 029e01cb07de$79d75380$6d85fa80$@com

"Colin Fraizer" <orgmode@cfraizer.com> writes:

> I use org-mode on Windows 7. It seems that the regexp for image files
> excludes the ":" (colon) character. Could it be added to this:
> "[-+./_0-9a-zA-Z]+"
> to make this
> "[-+./:_0-9a-zA-Z]+"
> ?
>

I use a regexp for image files that adds characters often found in
Windows paths, as shown in the following patch in function
org-toggle-inline-images:


--8<---------------cut here---------------start------------->8---
diff --git a/lisp/org.el b/lisp/org.el
old mode 100644
new mode 100755
index ba4ea63..ef8a06c
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -15923,7 +15923,7 @@ BEG and END default to the buffer boundaries."
       (widen)
       (setq beg (or beg (point-min)) end (or end (point-max)))
       (goto-char (point-min))
-      (let ((re (concat "\\[\\[\\(\\(file:\\)\\|\\([./~]\\)\\)\\([-+~./_0-9a-zA-Z]+"
+      (let ((re (concat "\\[\\[\\(\\(file:\\)\\|\\([./~]\\)\\)\\([-+~.:/\\_0-9a-zA-Z ]+"
 			(substring (org-image-file-name-regexp) 0 -2)
 			"\\)\\]" (if include-linked "" "\\]")))
 	    old file ov img)

--8<---------------cut here---------------end--------------->8---

It adds ':', space and backslash to the set of characters, so that things like
the following work (org-insert-link sometimes inserts mixed back and forward slashes): 

--8<---------------cut here---------------start------------->8---

  [[file:c:/cygwin/usr/share/pixmaps/xterm-color_48x48.xpm]]
  [[~/projects/appointment-soon.png]]
  [[file:c:\Documents and Settings\ggrubbs\projects/appointment-soon.png]]

--8<---------------cut here---------------end--------------->8---




> -----Original Message-----
> From: emacs-orgmode-bounces+orgmode=cfraizer.com@gnu.org
> [mailto:emacs-orgmode-bounces+orgmode=cfraizer.com@gnu.org] On Behalf Of
> Carsten Dominik
> Sent: Tuesday, June 01, 2010 9:37 AM
> To: Russell Adams
> Cc: emacs-orgmode
> Subject: Re: [Orgmode] Display inline images patch
>
> Hi Russel,
>
> looks like you are not running the latest version, I think this is  
> already fixed....
>
>
> - Carsten
>
> On May 31, 2010, at 9:30 PM, Russell Adams wrote:
>
>> I got irritated by my point jumping to the end of the buffer every
>> time I toggled inline image display, so lets save excursion. ;]
>>
>> $ diff -Narub org.el~ org.el
>> --- org.el~   2010-05-20 10:12:45.000000000 -0500
>> +++ org.el    2010-05-31 14:28:21.000000000 -0500
>> @@ -15489,6 +15489,7 @@
>> is how it will work for export.  When INCLUDE-LINKED is set, also
>> links
>> with a description part will be inlined."
>>   (interactive "P")
>> +  (save-excursion
>>   (org-remove-inline-images)
>>   (goto-char (point-min))
>>   (let ((re (concat "\\[\\[\\(file:\\|\\./\\)\\(~?"
>>   "[-+./_0-9a-zA-Z]+"
>> @@ -15501,7 +15502,7 @@
>>       (setq ov (make-overlay (match-beginning 0) (match-end 0)))
>>       (overlay-put ov 'display (create-image file))
>>       (overlay-put ov 'face 'default)
>> -      (push ov org-inline-image-overlays)))))
>> +          (push ov org-inline-image-overlays))))))
>>
>> (defun org-remove-inline-images ()
>>   "Remove inline display of images."
>>
>>
>>
>>
>>
>>
>> ------------------------------------------------------------------
>> Russell Adams                            RLAdams@AdamsInfoServ.com
>>
>> PGP Key ID:     0x1160DCB3           http://www.adamsinfoserv.com/
>>
>> Fingerprint:    1723 D8CA 4280 1EC9 557F  66E8 1154 E018 1160 DCB3
>>
>> _______________________________________________
>> 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
>
> - Carsten
>
>
>
>
> _______________________________________________
> 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
>
>
> _______________________________________________
> 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-06-10 22:59 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-31 19:30 Display inline images patch Russell Adams
2010-06-01 13:36 ` Carsten Dominik
2010-06-09 14:17   ` Colin Fraizer
2010-06-10 22:59     ` Gregory J. Grubbs [this message]
2010-06-16 14:29       ` Bastien

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=yj68w6m1olc.fsf@dynapse.com \
    --to=gregory@dynapse.com \
    --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).