Mercurial > emacs
view lisp/ezimage.el @ 87828:41248ae03f06
(org-entry-properties): Include the CLOCKSUM special
property.
(org-columns-edit-value): Do not allow to edit the special
CLOCKSUM property.
(org-flag-drawer): Use the original value of `outline-regexp'.
(org-remember-handler): Add invisible-ok flag to call to
`org-end-of-subtree'
(org-agenda-highlight-todo): Respect
`org-agenda-todo-keyword-format'.
(org-agenda-todo-keyword-format): New option.
(org-infile-export-plist): No restriction while searching for
options.
(org-remember-handler): Remove comments at the end of the buffer.
(org-remember-use-refile-when-interactive): New option.
(org-table-sort-lines): Make sure sorting works on link
descritions only, and ignores the link.
(org-sort-entries-or-items): Make sure the end of the subtree is
included.
(org-refile-use-outline-path): New allowed values `file' and
`full-file-path'.
(org-get-refile-targets): Respect new values for
`org-refile-use-outline-path'.
(org-agenda-get-restriction-and-command): DEL goes back to initial
list.
(org-export-as-xoxo): Restore point when done.
(org-open-file): Allow multiple %s in command.
(org-clock-in-switch-to-state): New option.
(org-first-list-item-p): New function.
(org-last-remember-storage-locations): New variable.
(org-get-refile-targets): Interpret the new maxlevel setting.
(org-refile-targets): New option `:maxlevel'.
(org-copy-subtree): Include empty lines before but not after
subtree.
(org-back-over-empty-lines, org-skip-whitespace): New functions.
(org-move-item-down, org-move-item-up): Include empty lines before
but not after item.
(org-first-sibling-p): New function.
(org-remember-apply-template): Defaults, completions and history
for template prompts. Also, interpret new `%!' escape.
(org-context-choices): New constant.
(org-bound-and-true-p): New macro.
(org-imenu-depth): New option.
(org-imenu-markers): New variable.
(org-imenu-new-marker, org-imenu-get-tree)
(org-speedbar-set-agenda-restriction): New functions.
(org-agenda-set-restriction-lock)
(org-agenda-remove-restriction-lock, org-agenda-maybe-redo): New
functions.
(org-agenda-restriction-lock): New face.
(org-agenda-restriction-lock-overlay)
(org-speedbar-restriction-lock-overlay): New variables.
(org-open-at-point): Removed obsolete way to do redirection in
shell links.
(org-imenu-and-speedbar): New customization group.
(org-entry-properties): Return keyword-less time strings.
(org-clock-heading-function): New option.
(org-clock-in): Use `org-clock-heading-function'.
(org-calendar-holiday): Try to use `calendar-check-holidays'
instead of the obsolete `check-calendar-holidays'.
(org-export-html-special-string-regexps): New constant.
(org-massive-special-regexp): New variable.
(org-compute-latex-and-specials-regexp)
(org-do-latex-and-special-faces): New functions.
(org-latex-and-export-specials): New face.
(org-highlight-latex-fragments-and-specials): New option.
(org-link-escape-chars): Use characters instead of strings.
(org-link-escape-chars-browser, org-link-escape)
(org-link-unescape): Use characters instead of strings.
(org-export-html-convert-sub-super, org-html-do-expand): Check for
protected text.
(org-emphasis-alist): Additional `verbatim' flag.
(org-set-emph-re): Handle the verbatim flag and compute
`org-verbatim-re'.
(org-cleaned-string-for-export): Protect verbatim elements.
(org-verbatim-re): New variable.
(org-hide-emphasis-markers): New option.
(org-additional-option-like-keywords): Add new keywords.
(org-get-entry): Renamed from `org-get-cleaned-entry'.
(org-icalendar-cleanup-string): New function for quoting icalendar
text.
(org-agenda-skip-scheduled-if-done): New option.
(org-agenda-get-scheduled, org-agenda-get-blocks): Use
`org-agenda-skip-scheduled-if-done'.
(org-prepare-agenda-buffers): Allow buffers as arguments.
(org-entry-properties): Add CATEGORY as a special property.
(org-use-property-inheritance): Allow a list of properties as a
value.
(org-eval-in-calendar): No longer update the prompt.
(org-read-date-popup-calendar): Renamed from
`org-popup-calendar-for-date-prompt'.
(org-read-date-display-live): New variable.
(org-read-date-display): New function.
(org-read-date-analyze): New function.
(org-remember-apply-template): Define `remember-finalize' if it is
not yet defined.
(org-remember-insinuate): New function.
(org-read-date-prefer-future): New option.
(org-read-date): Respect the setting of
`org-read-date-prefer-future'. Use `org-read-date-analyze'.
(org-set-font-lock-defaults): Use `org-archive-tag' instead of a
hardcoded string.
(org-remember-apply-template): Use `remember-finalize' instead of
`remember-buffer'.
(org-columns-compute, org-column-number-to-string)
(org-columns-uncompile-format, org-columns-compile-format)
(org-columns-compile-format): Handle printf format specifier.
(org-columns-new, org-column-number-to-string)
(org-columns-uncompile-format, org-columns-compile-format):
Support for new currency summary type.
(org-tree-to-indirect-buffer): Do not kill old buffer when
`org-indirect-buffer-display' is `new-frame'.
(org-indirect-buffer-display): Document that `new-frame' leads to
indiret buffer proliferation.
(org-agenda-list): Use `org-extend-today-until'.
(org-extend-today-until): New option.
(org-format-org-table-html): Use lower-case for <col> tag.
(org-agenda-execute): New command.
(org-agenda-mode-map): Keybindings of "g" "G", "e" modified.
(org-select-remember-template): New function.
(org-remember-apply-template): Use `org-select-remember-template'.
(org-go-to-remember-target): New function.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Fri, 18 Jan 2008 15:07:17 +0000 |
parents | 73661ddc7ac7 |
children | ee5932bf781d |
line wrap: on
line source
;;; ezimage --- Generalized Image management ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> ;; Keywords: file, tags, tools ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 3, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; ;; A few routines for placing an image over text that will work for any ;; Emacs implementation without error. When images are not supported, then ;; they are just not displayed. ;; ;; The idea is that gui buffers (trees, buttons, etc) will have text ;; representations of the GUI elements. These routines will replace the text ;; with an image when images are available. ;; ;; This file requires the `image' package if it is available. (condition-case nil (require 'image) (error nil)) ;;; Code: (defcustom ezimage-use-images (and (or (fboundp 'defimage) ; emacs 21 (fboundp 'make-image-specifier)) ; xemacs (if (fboundp 'display-graphic-p) ; emacs 21 (display-graphic-p) window-system) ; old emacs & xemacs (or (not (fboundp 'image-type-available-p)) ; xemacs? (image-type-available-p 'xpm))) ; emacs 21 "*Non-nil if ezimage should display icons." :group 'ezimage :version "21.1" :type 'boolean) ;;; Create our own version of defimage (eval-and-compile (if (fboundp 'defimage) (progn (defmacro defezimage (variable imagespec docstring) "Define VARIABLE as an image if `defimage' is not available. IMAGESPEC is the image data, and DOCSTRING is documentation for the image." `(progn (defimage ,variable ,imagespec ,docstring) (put (quote ,variable) 'ezimage t))) ; (defalias 'defezimage 'defimage) ;; This hack is for the ezimage install which has an icons direcory for ;; the default icons to be used. ;; (add-to-list 'load-path ;; (concat (file-name-directory ;; (locate-library "ezimage.el")) ;; "icons")) ) (if (not (fboundp 'make-glyph)) (defmacro defezimage (variable imagespec docstring) "Don't bother loading up an image... Argument VARIABLE is the variable to define. Argument IMAGESPEC is the list defining the image to create. Argument DOCSTRING is the documentation for VARIABLE." `(defvar ,variable nil ,docstring)) ;; ELSE (with-no-warnings (defun ezimage-find-image-on-load-path (image) "Find the image file IMAGE on the load path." (let ((l (cons ;; In XEmacs, try the data directory first (for an ;; install in XEmacs proper.) Search the load ;; path next (for user installs) (locate-data-directory "ezimage") load-path)) (r nil)) (while (and l (not r)) (if (file-exists-p (concat (car l) "/" image)) (setq r (concat (car l) "/" image)) (if (file-exists-p (concat (car l) "/icons/" image)) (setq r (concat (car l) "/icons/" image)) )) (setq l (cdr l))) r)) );with-no-warnings (with-no-warnings (defun ezimage-convert-emacs21-imagespec-to-xemacs (spec) "Convert the Emacs21 image SPEC into an XEmacs image spec. The Emacs 21 spec is what I first learned, and is easy to convert." (let* ((sl (car spec)) (itype (nth 1 sl)) (ifile (nth 3 sl))) (vector itype ':file (ezimage-find-image-on-load-path ifile)))) );with-no-warnings (defmacro defezimage (variable imagespec docstring) "Define VARIABLE as an image if `defimage' is not available. IMAGESPEC is the image data, and DOCSTRING is documentation for the image." `(progn (defvar ,variable ;; The Emacs21 version of defimage looks just like the XEmacs image ;; specifier, except that it needs a :type keyword. If we line ;; stuff up right, we can use this cheat to support XEmacs specifiers. (condition-case nil (make-glyph (make-image-specifier (ezimage-convert-emacs21-imagespec-to-xemacs (quote ,imagespec))) 'buffer) (error nil)) ,docstring) (put ',variable 'ezimage t))) ))) (defezimage ezimage-directory ((:type xpm :file "ezimage/dir.xpm" :ascent center)) "Image used for empty directories.") (defezimage ezimage-directory-plus ((:type xpm :file "ezimage/dir-plus.xpm" :ascent center)) "Image used for closed directories with stuff in them.") (defezimage ezimage-directory-minus ((:type xpm :file "ezimage/dir-minus.xpm" :ascent center)) "Image used for open directories with stuff in them.") (defezimage ezimage-page-plus ((:type xpm :file "ezimage/page-plus.xpm" :ascent center)) "Image used for closed files with stuff in them.") (defezimage ezimage-page-minus ((:type xpm :file "ezimage/page-minus.xpm" :ascent center)) "Image used for open files with stuff in them.") (defezimage ezimage-page ((:type xpm :file "ezimage/page.xpm" :ascent center)) "Image used for files with nothing interesting in it.") (defezimage ezimage-tag ((:type xpm :file "ezimage/tag.xpm" :ascent center)) "Image used for tags.") (defezimage ezimage-tag-plus ((:type xpm :file "ezimage/tag-plus.xpm" :ascent center)) "Image used for closed tag groups.") (defezimage ezimage-tag-minus ((:type xpm :file "ezimage/tag-minus.xpm" :ascent center)) "Image used for open tags.") (defezimage ezimage-tag-gt ((:type xpm :file "ezimage/tag-gt.xpm" :ascent center)) "Image used for closed tags (with twist arrow).") (defezimage ezimage-tag-v ((:type xpm :file "ezimage/tag-v.xpm" :ascent center)) "Image used for open tags (with twist arrow).") (defezimage ezimage-tag-type ((:type xpm :file "ezimage/tag-type.xpm" :ascent center)) "Image used for tags that represent a data type.") (defezimage ezimage-box-plus ((:type xpm :file "ezimage/box-plus.xpm" :ascent center)) "Image of a closed box.") (defezimage ezimage-box-minus ((:type xpm :file "ezimage/box-minus.xpm" :ascent center)) "Image of an open box.") (defezimage ezimage-mail ((:type xpm :file "ezimage/mail.xpm" :ascent center)) "Image of an envelope.") (defezimage ezimage-checkout ((:type xpm :file "ezimage/checkmark.xpm" :ascent center)) "Image representing a checkmark. For files checked out of a VC.") (defezimage ezimage-object ((:type xpm :file "ezimage/bits.xpm" :ascent center)) "Image representing bits (an object file.)") (defezimage ezimage-object-out-of-date ((:type xpm :file "ezimage/bitsbang.xpm" :ascent center)) "Image representing bits with a ! in it. (An out of data object file.)") (defezimage ezimage-label ((:type xpm :file "ezimage/label.xpm" :ascent center)) "Image used for label prefix.") (defezimage ezimage-lock ((:type xpm :file "ezimage/lock.xpm" :ascent center)) "Image of a lock. Used for Read Only, or private.") (defezimage ezimage-unlock ((:type xpm :file "ezimage/unlock.xpm" :ascent center)) "Image of an unlocked lock.") (defezimage ezimage-key ((:type xpm :file "ezimage/key.xpm" :ascent center)) "Image of a key.") (defezimage ezimage-document-tag ((:type xpm :file "ezimage/doc.xpm" :ascent center)) "Image used to indicate documentation available.") (defezimage ezimage-document-plus ((:type xpm :file "ezimage/doc-plus.xpm" :ascent center)) "Image used to indicate closed documentation.") (defezimage ezimage-document-minus ((:type xpm :file "ezimage/doc-minus.xpm" :ascent center)) "Image used to indicate open documentation.") (defezimage ezimage-info-tag ((:type xpm :file "ezimage/info.xpm" :ascent center)) "Image used to indicate more information available.") (defvar ezimage-expand-image-button-alist '( ;; here are some standard representations ("<+>" . ezimage-directory-plus) ("<->" . ezimage-directory-minus) ("< >" . ezimage-directory) ("[+]" . ezimage-page-plus) ("[-]" . ezimage-page-minus) ("[?]" . ezimage-page) ("[ ]" . ezimage-page) ("{+}" . ezimage-box-plus) ("{-}" . ezimage-box-minus) ;; Some vaguely representitive entries ("*" . ezimage-checkout) ("#" . ezimage-object) ("!" . ezimage-object-out-of-date) ("%" . ezimage-lock) ) "List of text and image associations.") (defun ezimage-insert-image-button-maybe (start length &optional string) "Insert an image button based on text starting at START for LENGTH chars. If buttontext is unknown, just insert that text. If we have an image associated with it, use that image. Optional argument STRING is a string upon which to add text properties." (when ezimage-use-images (let* ((bt (buffer-substring start (+ length start))) (a (assoc bt ezimage-expand-image-button-alist))) ;; Regular images (created with `insert-image' are intangible ;; which (I suppose) make them more compatible with XEmacs 21. ;; Unfortunatly, there is a giant pile o code dependent on the ;; underlying text. This means if we leave it tangible, then I ;; don't have to change said giant piles o code. (if (and a (symbol-value (cdr a))) (ezimage-insert-over-text (symbol-value (cdr a)) start (+ start (length bt)))))) string) (defun ezimage-image-over-string (string &optional alist) "Insert over the text in STRING an image found in ALIST. Return STRING with properties applied." (if ezimage-use-images (let ((a (assoc string alist))) (if (and a (symbol-value (cdr a))) (ezimage-insert-over-text (symbol-value (cdr a)) 0 (length string) string) string)) string)) (defun ezimage-insert-over-text (image start end &optional string) "Place IMAGE over the text between START and END. Assumes the image is part of a GUI and can be clicked on. Optional argument STRING is a string upon which to add text properties." (when ezimage-use-images (if (featurep 'xemacs) (add-text-properties start end (list 'end-glyph image 'rear-nonsticky (list 'display) 'invisible t 'detachable t) string) (add-text-properties start end (list 'display image 'rear-nonsticky (list 'display)) string))) string) (defun ezimage-image-association-dump () "Dump out the current state of the Ezimage image alist. See `ezimage-expand-image-button-alist' for details." (interactive) (with-output-to-temp-buffer "*Ezimage Images*" (save-excursion (set-buffer "*Ezimage Images*") (goto-char (point-max)) (insert "Ezimage image cache.\n\n") (let ((start (point)) (end nil)) (insert "Image\tText\tImage Name") (setq end (point)) (insert "\n") (put-text-property start end 'face 'underline)) (let ((ia ezimage-expand-image-button-alist)) (while ia (let ((start (point))) (insert (car (car ia))) (insert "\t") (ezimage-insert-image-button-maybe start (length (car (car ia)))) (insert (car (car ia)) "\t" (format "%s" (cdr (car ia))) "\n")) (setq ia (cdr ia))))))) (defun ezimage-image-dump () "Dump out the current state of the Ezimage image alist. See `ezimage-expand-image-button-alist' for details." (interactive) (with-output-to-temp-buffer "*Ezimage Images*" (save-excursion (set-buffer "*Ezimage Images*") (goto-char (point-max)) (insert "Ezimage image cache.\n\n") (let ((start (point)) (end nil)) (insert "Image\tImage Name") (setq end (point)) (insert "\n") (put-text-property start end 'face 'underline)) (let ((ia (ezimage-all-images))) (while ia (let ((start (point))) (insert "cm") (ezimage-insert-over-text (symbol-value (car ia)) start (point)) (insert "\t" (format "%s" (car ia)) "\n")) (setq ia (cdr ia))))))) (defun ezimage-all-images () "Return a list of all variables containing ez images." (let ((ans nil)) (mapatoms (lambda (sym) (if (get sym 'ezimage) (setq ans (cons sym ans)))) ) (setq ans (sort ans (lambda (a b) (string< (symbol-name a) (symbol-name b))))) ans) ) (provide 'ezimage) ;; arch-tag: d4ea2d93-3c7a-4cb3-b5a6-c1b9178183aa ;;; sb-image.el ends here