;;; tumme.el --- use dired to browse and manipulate your images
;;
-;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
;;
;; Version: 0.4.11
;; Keywords: multimedia
;; USAGE
;; =====
;;
-;; If you plan to use tumme much, setting up key bindings for it in
-;; dired is a good idea:
+;; This information has been moved to the manual. Type `C-h r' to open
+;; the Emacs manual and go to the node Thumbnails by typing `g
+;; Thumbnails RET'.
;;
-;; (tumme-setup-dired-keybindings)
-;;
-;; Next, do M-x tumme-dired RET. This will ask you for a directory
-;; where image files are stored, setup a useful window configuration
-;; and enable the two special modes that tumme provides. NOTE: If you
-;; do not want tumme to split your windows, call it with a prefix
-;; argument.
-;;
-;; Start viewing thumbnails by doing C-S-n and C-S-p to go up and down
-;; in the dired buffer while at the same time displaying a thumbnail
-;; image. The thumbnail images will be created on the fly, and
-;; cached. This means that the first time you browse your images, it
-;; will be a bit slow because the thumbnails are created. If you want
-;; to avoid this, you can pre-create the thumbnail images by marking
-;; all images in dired (% m \.jpg$ RET) and then do M-x
-;; tumme-create-thumbs.
-;;
-;; Next, try `tumme-display-thumbs' (C-t d). If no file is marked, a
-;; thumbnail for the file at point will show up in
-;; `tumme-thumbnail-buffer'. If one or more files are marked,
-;; thumbnails for those files will be displayed.
-;;
-;; Pressing TAB will switch to the window containing the
-;; `tumme-thumbnail-buffer' buffer. In there you can move between
-;; thumbnail images and display a semi-sized version in an Emacs
-;; buffer (RET), or the original image in an external viewer
-;; (C-RET). By pressing SPC or DEL you will navigate back and fort
-;; while at the same time displaying each image in Emacs. You can also
-;; navigate using arrow keys. Comment a file by pressing "c". Press
-;; TAB to get back to dired.
-;;
-;; While in dired mode, you can tag and comment files, you can tell
-;; `tumme' to mark files with a certain tag (using a regexp) etc.
-;;
-;; The easiest way to see the available commands is to use the Tumme
-;; menus added in tumme-thumbnail-mode and dired-mode.
+;; Quickstart: M-x tumme RET DIRNAME RET
;;
+;; where DIRNAME is a directory containing image files.
;;
;; LIMITATIONS
;; ===========
;; probably needs rewriting `tumme-display-thumbs' to be more general.
;;
;; * Find some way of toggling on and off really nice keybindings in
-;; dired (for example, using C-n or <down> instead of C-S-n). Richard
+;; dired (for example, using C-n or <down> instead of C-S-n). Richard
;; suggested that we could keep C-t as prefix for tumme commands as it
-;; is currently not used in dired. He also suggested that
+;; is currently not used in dired. He also suggested that
;; `dired-next-line' and `dired-previous-line' figure out if tumme is
;; enabled in the current buffer and, if it is, call
;; `tumme-dired-next-line' and `tumme-dired-previous-line',
-;; respectively. Update: This is partly done; some bindings have now
+;; respectively. Update: This is partly done; some bindings have now
;; been added to dired.
;;
;; * Enhanced gallery creation with basic CSS-support and pagination
(require 'dired)
(require 'format-spec)
+(require 'widget)
+
+(eval-when-compile
+ (require 'wid-edit))
(defgroup tumme nil
"Use dired to browse your images as thumbnails, and more."
:group 'multimedia)
(defcustom tumme-dir "~/.emacs.d/tumme/"
- "*Directory where thumbnail images are stored."
+ "Directory where thumbnail images are stored."
:type 'string
:group 'tumme)
(defcustom tumme-thumbnail-storage 'use-tumme-dir
- "*How to store tumme's thumbnail files.
+ "How to store tumme's thumbnail files.
Tumme can store thumbnail files in one of two ways and this is
controlled by this variable. \"Use tumme dir\" means that the
thumbnails are stored in a central directory. \"Per directory\"
means that each thumbnail is stored in a subdirectory called
\".tumme\" in the same directory where the image file is.
\"Thumbnail Managing Standard\" means that the thumbnails are
-stored and generated according to the Thumbnail Managing
-Standard."
+stored and generated according to the Thumbnail Managing Standard
+that allows sharing of thumbnails across different programs."
:type '(choice :tag "How to store thumbnail files"
(const :tag "Thumbnail Managing Standard" standard)
(const :tag "Use tumme-dir" use-tumme-dir)
:group 'tumme)
(defcustom tumme-db-file "~/.emacs.d/tumme/.tumme_db"
- "*Database file where file names and their associated tags are stored."
+ "Database file where file names and their associated tags are stored."
:type 'string
:group 'tumme)
(defcustom tumme-temp-image-file "~/.emacs.d/tumme/.tumme_temp"
- "*Name of temporary image file used by various commands."
+ "Name of temporary image file used by various commands."
:type 'string
:group 'tumme)
(defcustom tumme-gallery-dir "~/.emacs.d/tumme/.tumme_gallery"
- "*Directory to store generated gallery html pages.
+ "Directory to store generated gallery html pages.
This path needs to be \"shared\" to the public so that it can access
the index.html page that tumme creates."
:type 'string
(defcustom tumme-gallery-image-root-url
"http://your.own.server/tummepics"
- "*URL where the full size images are to be found.
+ "URL where the full size images are to be found.
Note that this path has to be configured in your web server. Tumme
expects to find pictures in this directory."
:type 'string
(defcustom tumme-gallery-thumb-image-root-url
"http://your.own.server/tummethumbs"
- "*URL where the thumbnail images are to be found.
+ "URL where the thumbnail images are to be found.
Note that this path has to be configured in your web server. Tumme
expects to find pictures in this directory."
:type 'string
(defcustom tumme-cmd-create-thumbnail-program
"convert"
- "*Executable used to create thumbnail.
+ "Executable used to create thumbnail.
Used together with `tumme-cmd-create-thumbnail-options'."
:type 'string
:group 'tumme)
(defcustom tumme-cmd-create-thumbnail-options
"%p -size %wx%h \"%f\" -resize %wx%h +profile \"*\" jpeg:\"%t\""
- "*Format of command used to create thumbnail image.
+ "Format of command used to create thumbnail image.
Available options are %p which is replaced by
`tumme-cmd-create-thumbnail-program', %w which is replaced by
`tumme-thumb-width', %h which is replaced by `tumme-thumb-height',
(defcustom tumme-cmd-create-temp-image-program
"convert"
- "*Executable used to create temporary image.
+ "Executable used to create temporary image.
Used together with `tumme-cmd-create-temp-image-options'."
:type 'string
:group 'tumme)
(defcustom tumme-cmd-create-temp-image-options
"%p -size %wx%h \"%f\" -resize %wx%h +profile \"*\" jpeg:\"%t\""
- "*Format of command used to create temporary image for display window.
+ "Format of command used to create temporary image for display window.
Available options are %p which is replaced by
`tumme-cmd-create-temp-image-program', %w and %h which is replaced by
the calculated max size for width and height in the image display window,
:group 'tumme)
(defcustom tumme-cmd-pngnq-program (executable-find "pngnq")
- "*The file name of the `pngnq' program.
+ "The file name of the `pngnq' program.
It quantizes colors of PNG images down to 256 colors."
:type '(choice (const :tag "Not Set" nil) string)
:group 'tumme)
(defcustom tumme-cmd-pngcrush-program (executable-find "pngcrush")
- "*The file name of the `pngcrush' program.
+ "The file name of the `pngcrush' program.
It optimizes the compression of PNG images. Also it adds PNG textual chunks
with the information required by the Thumbnail Managing Standard."
:type '(choice (const :tag "Not Set" nil) string)
"-text b \"Thumb::URI\" \"file://%f\" "
"%q %t"
" ; rm %q")))
- "*Command to create thumbnails according to the Thumbnail Managing Standard."
+ "Command to create thumbnails according to the Thumbnail Managing Standard."
:type 'string
:group 'tumme)
(defcustom tumme-cmd-rotate-thumbnail-program
"mogrify"
- "*Executable used to rotate thumbnail.
+ "Executable used to rotate thumbnail.
Used together with `tumme-cmd-rotate-thumbnail-options'."
:type 'string
:group 'tumme)
(defcustom tumme-cmd-rotate-thumbnail-options
"%p -rotate %d \"%t\""
- "*Format of command used to rotate thumbnail image.
+ "Format of command used to rotate thumbnail image.
Available options are %p which is replaced by
`tumme-cmd-rotate-thumbnail-program', %d which is replaced by the
number of (positive) degrees to rotate the image, normally 90 or 270
(defcustom tumme-cmd-rotate-original-program
"jpegtran"
- "*Executable used to rotate original image.
+ "Executable used to rotate original image.
Used together with `tumme-cmd-rotate-original-options'."
:type 'string
:group 'tumme)
(defcustom tumme-cmd-rotate-original-options
- "%p -rotate %d -copy all \"%o\" > %t"
- "*Format of command used to rotate original image.
+ "%p -rotate %d -copy all -outfile %t \"%o\""
+ "Format of command used to rotate original image.
Available options are %p which is replaced by
`tumme-cmd-rotate-original-program', %d which is replaced by the
number of (positive) degrees to rotate the image, normally 90 or
(defcustom tumme-temp-rotate-image-file
"~/.emacs.d/tumme/.tumme_rotate_temp"
- "*Temporary file for rotate operations."
+ "Temporary file for rotate operations."
:type 'string
:group 'tumme)
(defcustom tumme-cmd-write-exif-data-program
"exiftool"
- "*Program used to write EXIF data to image.
+ "Program used to write EXIF data to image.
Used together with `tumme-cmd-write-exif-data-options'."
:type 'string
:group 'tumme)
(defcustom tumme-cmd-write-exif-data-options
"%p -%t=\"%v\" \"%f\""
- "*Format of command used to write EXIF data.
+ "Format of command used to write EXIF data.
Available options are %p which is replaced by
`tumme-cmd-write-exif-data-program', %f which is replaced by the
image file name, %t which is replaced by the tag name and %v
(defcustom tumme-cmd-read-exif-data-program
"exiftool"
- "*Program used to read EXIF data to image.
+ "Program used to read EXIF data to image.
Used together with `tumme-cmd-read-exif-data-program-options'."
:type 'string
:group 'tumme)
(defcustom tumme-cmd-read-exif-data-options
"%p -s -s -s -%t \"%f\""
- "*Format of command used to read EXIF data.
+ "Format of command used to read EXIF data.
Available options are %p which is replaced by
`tumme-cmd-write-exif-data-options', %f which is replaced
by the image file name and %t which is replaced by the tag name."
(defcustom tumme-gallery-hidden-tags
(list "private" "hidden" "pending")
- "*List of \"hidden\" tags.
+ "List of \"hidden\" tags.
Used by `tumme-gallery-generate' to leave out \"hidden\" images."
:type '(repeat string)
:group 'tumme)
:group 'tumme)
(defcustom tumme-thumb-relief 2
- "*Size of button-like border around thumbnails."
+ "Size of button-like border around thumbnails."
:type 'integer
:group 'tumme)
(defcustom tumme-thumb-margin 2
- "*Size of the margin around thumbnails.
+ "Size of the margin around thumbnails.
This is where you see the cursor."
:type 'integer
:group 'tumme)
(defcustom tumme-line-up-method 'dynamic
- "*Default method for line-up of thumbnails in thumbnail buffer.
+ "Default method for line-up of thumbnails in thumbnail buffer.
Used by `tumme-display-thumbs' and other functions that needs to
line-up thumbnails. Dynamic means to use the available width of the
window containing the thumbnail buffer, Fixed means to use
:group 'tumme)
(defcustom tumme-thumbs-per-row 3
- "*Number of thumbnails to display per row in thumb buffer."
+ "Number of thumbnails to display per row in thumb buffer."
:type 'integer
:group 'tumme)
(defcustom tumme-display-window-width-correction 1
- "*Number to be used to correct image display window width.
+ "Number to be used to correct image display window width.
Change if the default (1) does not work (i.e. if the image does not
completely fit)."
:type 'integer
:group 'tumme)
(defcustom tumme-display-window-height-correction 0
- "*Number to be used to correct image display window height.
+ "Number to be used to correct image display window height.
Change if the default (0) does not work (i.e. if the image does not
completely fit)."
:type 'integer
:group 'tumme)
-(defcustom tumme-track-movement nil
+(defcustom tumme-track-movement t
"The current state of the tracking and mirroring.
For more information, see the documentation for
`tumme-toggle-movement-tracking'."
:group 'tumme)
(defcustom tumme-display-properties-format "%b: %f (%t): %c"
- "*Display format for thumbnail properties.
+ "Display format for thumbnail properties.
%b is replaced with associated dired buffer name, %f with file name
\(without path) of original image file, %t with the list of tags and %c
with the comment."
:group 'tumme)
(defcustom tumme-external-viewer
- ;; TODO: use mailcap, dired-guess-shell-alist-default, dired-view-command-alist
+ ;; TODO: Use mailcap, dired-guess-shell-alist-default,
+ ;; dired-view-command-alist.
(cond ((executable-find "display"))
((executable-find "xli"))
((executable-find "qiv") "qiv -t"))
- "*Name of external viewer.
+ "Name of external viewer.
Including parameters. Used when displaying original image from
`tumme-thumbnail-mode'."
:type 'string
:group 'tumme)
(defcustom tumme-main-image-directory "~/pics/"
- "*Name of main image directory, if any.
+ "Name of main image directory, if any.
Used by `tumme-copy-with-exif-file-name'."
:type 'string
:group 'tumme)
(defcustom tumme-show-all-from-dir-max-files 50
- "*Maximum number of files to show using`tumme-show-all-from-dir'.
+ "Maximum number of files to show using `tumme-show-all-from-dir'.
before warning the user."
:type 'integer
:group 'tumme)
(defun tumme-dir ()
- "Return the current thumbnails directory (from `tumme-dir').
+ "Return the current thumbnails directory (from variable `tumme-dir').
Create the thumbnails directory if it does not exist."
(let ((tumme-dir (file-name-as-directory
(expand-file-name tumme-dir))))
(file-name-extension f))))
((eq 'per-directory tumme-thumbnail-storage)
(let ((f (expand-file-name file)))
- (format "%s%s%s.thumb.%s"
- (format "%s.tumme/" (file-name-directory f))
+ (format "%s.tumme/%s.thumb.%s"
+ (file-name-directory f)
(file-name-sans-extension (file-name-nondirectory f))
(file-name-extension f))))))
(setq thumbnail-dir (file-name-directory thumbnail-file))))
(message "Creating thumbnail directory.")
(make-directory thumbnail-dir))
- (shell-command command nil)))
+ (call-process shell-file-name nil nil nil shell-command-switch command)))
;;;###autoload
(defun tumme-dired-insert-marked-thumbs ()
;; Can't use (overlays-at (point)), BUG?
(overlays-in (point) (1+ (point)))))
(put-image thumb-file image-pos)
- (setq overlay (car (delq nil (mapcar (lambda (o) (and (overlay-get o 'put-image) o))
- (overlays-in (point) (1+ (point)))))))
+ (setq
+ overlay
+ (car (delq nil (mapcar (lambda (o) (and (overlay-get o 'put-image) o))
+ (overlays-in (point) (1+ (point)))))))
(overlay-put overlay 'image-file image-file)
(overlay-put overlay 'thumb-file thumb-file)))
nil)
(interactive)
(dired-next-line 1)
(tumme-display-thumbs
- t (or tumme-append-when-browsing nil))
+ t (or tumme-append-when-browsing nil) t)
(if tumme-dired-disp-props
(tumme-dired-display-properties)))
(interactive)
(dired-previous-line 1)
(tumme-display-thumbs
- t (or tumme-append-when-browsing nil))
+ t (or tumme-append-when-browsing nil) t)
(if tumme-dired-disp-props
(tumme-dired-display-properties)))
(interactive)
(dired-mark 1)
(tumme-display-thumbs
- t (or tumme-append-when-browsing nil))
+ t (or tumme-append-when-browsing nil) t)
(if tumme-dired-disp-props
(tumme-dired-display-properties)))
(defun tumme-create-thumbnail-buffer ()
"Create thumb buffer and set `tumme-thumbnail-mode'."
(let ((buf (get-buffer-create tumme-thumbnail-buffer)))
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(setq buffer-read-only t)
(if (not (eq major-mode 'tumme-thumbnail-mode))
(tumme-thumbnail-mode)))
(defun tumme-create-display-image-buffer ()
"Create image display buffer and set `tumme-display-image-mode'."
(let ((buf (get-buffer-create tumme-display-image-buffer)))
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(setq buffer-read-only t)
(if (not (eq major-mode 'tumme-display-image-mode))
(tumme-display-image-mode)))
(message "No saved window configuration")))
;;;###autoload
-(defun tumme-display-thumbs (&optional arg append)
+(defun tumme-display-thumbs (&optional arg append do-not-pop)
"Display thumbnails of all marked files, in `tumme-thumbnail-buffer'.
If a thumbnail image does not exist for a file, it is created on the
fly. With prefix argument ARG, display only thumbnail for file at
`tumme-thumbnail-buffer' buffer in the right window.
With optional argument APPEND, append thumbnail to thumbnail buffer
-instead of erasing it first."
+instead of erasing it first.
+
+Option argument DO-NOT-POP controls if `pop-to-buffer' should be
+used or not. If non-nil, use `display-buffer' instead of
+`pop-to-buffer'. This is used from functions like
+`tumme-next-line-and-display' and
+`tumme-previous-line-and-display' where we do not want the
+thumbnail buffer to be selected."
(interactive "P")
(let ((buf (tumme-create-thumbnail-buffer))
curr-file thumb-name files count dired-buf beg)
(setq files (list (dired-get-filename)))
(setq files (dired-get-marked-files)))
(setq dired-buf (current-buffer))
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(let ((inhibit-read-only t))
(if (not append)
(erase-buffer)
nil)
(t
(tumme-line-up-dynamic))))
- (pop-to-buffer tumme-thumbnail-buffer)))
+ (if do-not-pop
+ (display-buffer tumme-thumbnail-buffer)
+ (pop-to-buffer tumme-thumbnail-buffer))))
+;;;###autoload
(defun tumme-show-all-from-dir (dir)
"Make a preview buffer for all images in DIR and display it.
If the number of files in DIR matching `image-file-name-regexp'
;;;###autoload
(defalias 'tumme 'tumme-show-all-from-dir)
-(defun tumme-write-tag (files tag)
- "For all FILES, writes TAG to the image database."
- (save-excursion
- (let (end buf)
- (setq buf (find-file tumme-db-file))
- (if (not (listp files))
- (if (stringp files)
- (setq files (list files))
- (error "Files must be a string or a list of strings!")))
- (mapcar
- (lambda (file)
- (goto-char (point-min))
- (if (search-forward-regexp
- (format "^%s" file) nil t)
- (progn
- (end-of-line)
- (setq end (point))
- (beginning-of-line)
- (if (not (search-forward (format ";%s" tag) end t))
- (progn
- (end-of-line)
- (insert (format ";%s" tag)))))
- (goto-char (point-max))
- (insert (format "\n%s;%s" file tag))))
- files)
- (save-buffer)
- (kill-buffer buf))))
+(defun tumme-write-tags (file-tags)
+ "Write file tags to database.
+Write each file and tag in FILE-TAGS to the database. FILE-TAGS
+is an alist in the following form:
+ ((FILE . TAG) ... )"
+ (let (end file tag)
+ (with-temp-file tumme-db-file
+ (insert-file-contents tumme-db-file)
+ (dolist (elt file-tags)
+ (setq file (car elt)
+ tag (cdr elt))
+ (goto-char (point-min))
+ (if (search-forward-regexp (format "^%s.*$" file) nil t)
+ (progn
+ (setq end (point))
+ (beginning-of-line)
+ (when (not (search-forward (format ";%s" tag) end t))
+ (end-of-line)
+ (insert (format ";%s" tag))))
+ (goto-char (point-max))
+ (insert (format "\n%s;%s" file tag)))))))
(defun tumme-remove-tag (files tag)
"For all FILES, remove TAG from the image database."
(mapcar
(lambda (file)
(goto-char (point-min))
- (if (search-forward-regexp
- (format "^%s" file) nil t)
- (progn
- (end-of-line)
- (setq end (point))
- (beginning-of-line)
- (if (search-forward-regexp (format "\\(;%s\\)" tag) end t)
- (progn
- (delete-region (match-beginning 1) (match-end 1))
- ;; Check if file should still be in the database. If
- ;; it has no tags or comments, it will be removed.
- (end-of-line)
- (setq end (point))
- (beginning-of-line)
- (if (not (search-forward ";" end t))
- (progn
- (kill-line 1)
- ;; If on empty line at end of buffer
- (if (and (eobp)
- (looking-at "^$"))
- (delete-backward-char 1)))))))))
+ (when (search-forward-regexp
+ (format "^%s" file) nil t)
+ (end-of-line)
+ (setq end (point))
+ (beginning-of-line)
+ (when (search-forward-regexp (format "\\(;%s\\)" tag) end t)
+ (delete-region (match-beginning 1) (match-end 1))
+ ;; Check if file should still be in the database. If
+ ;; it has no tags or comments, it will be removed.
+ (end-of-line)
+ (setq end (point))
+ (beginning-of-line)
+ (when (not (search-forward ";" end t))
+ (kill-line 1)
+ ;; If on empty line at end of buffer
+ (when (and (eobp)
+ (looking-at "^$"))
+ (delete-backward-char 1))))))
files)
(save-buffer)
(kill-buffer buf))))
(let (end buf (tags ""))
(setq buf (find-file tumme-db-file))
(goto-char (point-min))
- (if (search-forward-regexp
- (format "^%s" file) nil t)
- (progn
- (end-of-line)
- (setq end (point))
- (beginning-of-line)
- (if (search-forward ";" end t)
- (if (search-forward "comment:" end t)
- (if (search-forward ";" end t)
- (setq tags (buffer-substring (point) end)))
- (setq tags (buffer-substring (point) end))))))
+ (when (search-forward-regexp
+ (format "^%s" file) nil t)
+ (end-of-line)
+ (setq end (point))
+ (beginning-of-line)
+ (if (search-forward ";" end t)
+ (if (search-forward "comment:" end t)
+ (if (search-forward ";" end t)
+ (setq tags (buffer-substring (point) end)))
+ (setq tags (buffer-substring (point) end)))))
(kill-buffer buf)
(split-string tags ";"))))
(defun tumme-tag-files (arg)
"Tag marked file(s) in dired. With prefix ARG, tag file at point."
(interactive "P")
- (let ((tag (read-string "Tag to add: "))
+ (let ((tag (read-string "Tags to add (separate tags with a semicolon): "))
curr-file files)
(if arg
- (setq files (dired-get-filename))
+ (setq files (list (dired-get-filename)))
(setq files (dired-get-marked-files)))
- (tumme-write-tag files tag)))
+ (tumme-write-tags
+ (mapcar
+ (lambda (x)
+ (cons x tag))
+ files))))
(defun tumme-tag-thumbnail ()
"Tag current thumbnail."
(interactive)
- (let ((tag (read-string "Tag to add: ")))
- (tumme-write-tag (tumme-original-file-name) tag))
+ (let ((tag (read-string "Tags to add (separate tags with a semicolon): ")))
+ (tumme-write-tags (list (cons (tumme-original-file-name) tag))))
(tumme-update-property
'tags (tumme-list-tags (tumme-original-file-name))))
;;;###autoload
-(defun tumme-tag-remove (arg)
+(defun tumme-delete-tag (arg)
"Remove tag for selected file(s).
With prefix argument ARG, remove tag from file at point."
(interactive "P")
(let ((old-buf (current-buffer))
(dired-buf (tumme-associated-dired-buffer))
(file-name (tumme-original-file-name)))
- (if (and dired-buf file-name)
- (progn
- (setq file-name (file-name-nondirectory file-name))
- (set-buffer dired-buf)
- (goto-char (point-min))
- (if (not (search-forward file-name nil t))
- (message "Could not track file")
- (dired-move-to-filename)
- (set-window-point
- (tumme-get-buffer-window dired-buf) (point)))
- (set-buffer old-buf)))))
+ (when (and (buffer-live-p dired-buf) file-name)
+ (setq file-name (file-name-nondirectory file-name))
+ (set-buffer dired-buf)
+ (goto-char (point-min))
+ (if (not (search-forward file-name nil t))
+ (message "Could not track file")
+ (dired-move-to-filename)
+ (set-window-point
+ (tumme-get-buffer-window dired-buf) (point)))
+ (set-buffer old-buf))))
(defun tumme-toggle-movement-tracking ()
"Turn on and off `tumme-track-movement'.
(let ((file (dired-get-filename))
(old-buf (current-buffer))
prop-val found)
- (if (get-buffer tumme-thumbnail-buffer)
- (progn
- (set-buffer tumme-thumbnail-buffer)
- (goto-char (point-min))
- (while (and (not (eobp))
- (not found))
- (if (and (setq prop-val
- (get-text-property (point) 'original-file-name))
- (string= prop-val file))
- (setq found t))
- (if (not found)
- (forward-char 1)))
- (if found
- (progn
- (set-window-point
- (tumme-thumbnail-window) (point))
- (tumme-display-thumb-properties)))
- (set-buffer old-buf)))))
+ (when (get-buffer tumme-thumbnail-buffer)
+ (set-buffer tumme-thumbnail-buffer)
+ (goto-char (point-min))
+ (while (and (not (eobp))
+ (not found))
+ (if (and (setq prop-val
+ (get-text-property (point) 'original-file-name))
+ (string= prop-val file))
+ (setq found t))
+ (if (not found)
+ (forward-char 1)))
+ (when found
+ (set-window-point
+ (tumme-thumbnail-window) (point))
+ (tumme-display-thumb-properties))
+ (set-buffer old-buf))))
(defun tumme-dired-next-line (&optional arg)
"Call `dired-next-line', then track thumbnail.
(if tumme-track-movement
(tumme-track-thumbnail)))
-(defun tumme-forward-char ()
- "Move to next image and display properties."
- (interactive)
- ;; Before we move, make sure that there is an image two positions
- ;; forward.
- (if (save-excursion
- (forward-char 2)
- (tumme-image-at-point-p))
- (progn
- (forward-char)
- (while (and (not (eobp))
- (not (tumme-image-at-point-p)))
- (forward-char))
- (if tumme-track-movement
- (tumme-track-original-file))))
+(defun tumme-forward-image (&optional arg)
+ "Move to next image and display properties.
+Optional prefix ARG says how many images to move; default is one
+image."
+ (interactive "p")
+ (let (pos (steps (or arg 1)))
+ (dotimes (i steps)
+ (if (and (not (eobp))
+ (save-excursion
+ (forward-char)
+ (while (and (not (eobp))
+ (not (tumme-image-at-point-p)))
+ (forward-char))
+ (setq pos (point))
+ (tumme-image-at-point-p)))
+ (goto-char pos)
+ (error "At last image"))))
+ (when tumme-track-movement
+ (tumme-track-original-file))
(tumme-display-thumb-properties))
-(defun tumme-backward-char ()
- "Move to previous image and display properties."
- (interactive)
- (if (not (bobp))
- (progn
- (backward-char)
- (while (and (not (bobp))
- (not (tumme-image-at-point-p)))
- (backward-char))
- (if tumme-track-movement
- (tumme-track-original-file))))
+(defun tumme-backward-image (&optional arg)
+ "Move to previous image and display properties.
+Optional prefix ARG says how many images to move; default is one
+image."
+ (interactive "p")
+ (let (pos (steps (or arg 1)))
+ (dotimes (i steps)
+ (if (and (not (bobp))
+ (save-excursion
+ (backward-char)
+ (while (and (not (bobp))
+ (not (tumme-image-at-point-p)))
+ (backward-char))
+ (setq pos (point))
+ (tumme-image-at-point-p)))
+ (goto-char pos)
+ (error "At first image"))))
+ (when tumme-track-movement
+ (tumme-track-original-file))
(tumme-display-thumb-properties))
(defun tumme-next-line ()
(next-line 1)
;; If we end up in an empty spot, back up to the next thumbnail.
(if (not (tumme-image-at-point-p))
- (tumme-backward-char))
+ (tumme-backward-image))
(if tumme-track-movement
(tumme-track-original-file))
(tumme-display-thumb-properties))
;; thumbnail and did not refresh, so it is not very common. But we
;; can handle it in a good manner, so why not?
(if (not (tumme-image-at-point-p))
- (tumme-backward-char))
+ (tumme-backward-image))
(if tumme-track-movement
(tumme-track-original-file))
(tumme-display-thumb-properties))
(format-spec
tumme-display-properties-format
(list
- (cons ?b buf)
+ (cons ?b (or buf ""))
(cons ?f file)
(cons ?t (or (princ props) ""))
(cons ?c (or comment "")))))
(dired-buf (tumme-associated-dired-buffer)))
(if (not (and dired-buf file-name))
(message "No image, or image with correct properties, at point.")
- (save-excursion
+ (with-current-buffer dired-buf
(message file-name)
(setq file-name (file-name-nondirectory file-name))
- (set-buffer dired-buf)
(goto-char (point-min))
(if (search-forward file-name nil t)
(cond ((eq command 'mark) (dired-mark 1))
"Mark original image file in associated dired buffer."
(interactive)
(tumme-modify-mark-on-thumb-original-file 'mark)
- (tumme-forward-char))
+ (tumme-forward-image))
(defun tumme-unmark-thumb-original-file ()
"Unmark original image file in associated dired buffer."
(interactive)
(tumme-modify-mark-on-thumb-original-file 'unmark)
- (tumme-forward-char))
+ (tumme-forward-image))
(defun tumme-flag-thumb-original-file ()
"Flag original image file for deletion in associated dired buffer."
(interactive)
(tumme-modify-mark-on-thumb-original-file 'flag)
- (tumme-forward-char))
+ (tumme-forward-image))
(defun tumme-toggle-mark-thumb-original-file ()
"Toggle mark on original image file in associated dired buffer."
"Define keymap for `tumme-thumbnail-mode'."
;; Keys
- (define-key tumme-thumbnail-mode-map [right] 'tumme-forward-char)
- (define-key tumme-thumbnail-mode-map [left] 'tumme-backward-char)
+ (define-key tumme-thumbnail-mode-map [right] 'tumme-forward-image)
+ (define-key tumme-thumbnail-mode-map [left] 'tumme-backward-image)
(define-key tumme-thumbnail-mode-map [up] 'tumme-previous-line)
(define-key tumme-thumbnail-mode-map [down] 'tumme-next-line)
- (define-key tumme-thumbnail-mode-map "\C-f" 'tumme-forward-char)
- (define-key tumme-thumbnail-mode-map "\C-b" 'tumme-backward-char)
+ (define-key tumme-thumbnail-mode-map "\C-f" 'tumme-forward-image)
+ (define-key tumme-thumbnail-mode-map "\C-b" 'tumme-backward-image)
(define-key tumme-thumbnail-mode-map "\C-p" 'tumme-previous-line)
(define-key tumme-thumbnail-mode-map "\C-n" 'tumme-next-line)
(define-key tumme-thumbnail-mode-map "L" 'tumme-rotate-original-left)
(define-key tumme-thumbnail-mode-map "R" 'tumme-rotate-original-right)
- (define-key tumme-thumbnail-mode-map "D" 'tumme-thumbnail-set-image-description)
+ (define-key tumme-thumbnail-mode-map "D"
+ 'tumme-thumbnail-set-image-description)
(define-key tumme-thumbnail-mode-map "\C-d" 'tumme-delete-char)
(define-key tumme-thumbnail-mode-map " "
(define-key dired-mode-map "\C-td" 'tumme-display-thumbs)
(define-key dired-mode-map "\C-tt" 'tumme-tag-files)
- (define-key dired-mode-map "\C-tr" 'tumme-tag-remove)
+ (define-key dired-mode-map "\C-tr" 'tumme-delete-tag)
(define-key dired-mode-map [tab] 'tumme-jump-thumbnail-buffer)
- (define-key dired-mode-map "\C-ti" 'tumme-display-dired-image)
+ (define-key dired-mode-map "\C-ti" 'tumme-dired-display-image)
(define-key dired-mode-map "\C-tx" 'tumme-dired-display-external)
(define-key dired-mode-map "\C-ta" 'tumme-display-thumbs-append)
(define-key dired-mode-map "\C-t." 'tumme-display-thumb)
(define-key dired-mode-map [menu-bar tumme tumme-mark-tagged-files]
'("Mark tagged files" . tumme-mark-tagged-files))
- (define-key dired-mode-map [menu-bar tumme tumme-tag-remove]
- '("Remove tag from files" . tumme-tag-remove))
+ (define-key dired-mode-map [menu-bar tumme tumme-delete-tag]
+ '("Remove tag from files" . tumme-delete-tag))
(define-key dired-mode-map [menu-bar tumme tumme-tag-files]
'("Tag files" . tumme-tag-files))
[menu-bar tumme tumme-dired-display-external]
'("Display in external viewer" . tumme-dired-display-external))
(define-key dired-mode-map
- [menu-bar tumme tumme-display-dired-image]
- '("Display image" . tumme-display-dired-image))
+ [menu-bar tumme tumme-dired-display-image]
+ '("Display image" . tumme-dired-display-image))
(define-key dired-mode-map
[menu-bar tumme tumme-display-thumb]
'("Display this thumbnail" . tumme-display-thumb))
(defun tumme-display-thumbs-append ()
"Append thumbnails to `tumme-thumbnail-buffer'."
(interactive)
- (tumme-display-thumbs nil t))
+ (tumme-display-thumbs nil t t))
;;;###autoload
(defun tumme-display-thumb ()
- "Shorthard for `tumme-display-thumbs' with prefix argument."
+ "Shorthand for `tumme-display-thumbs' with prefix argument."
(interactive)
- (tumme-display-thumbs t))
+ (tumme-display-thumbs t nil t))
(defun tumme-line-up ()
"Line up thumbnails according to `tumme-thumbs-per-row'.
(insert "\n")
(insert " ")
(setq count (1+ count))
- (if (= count (- tumme-thumbs-per-row 1))
- (progn
- (forward-char)
- (insert "\n")
- (setq count 0))))))
+ (when (and (= count (- tumme-thumbs-per-row 1))
+ (not (eobp)))
+ (forward-char)
+ (insert "\n")
+ (setq count 0)))))
(goto-char (point-min))))
(defun tumme-line-up-dynamic ()
(defun tumme-thumbnail-display-external ()
"Display original image for thumbnail at point using external viewer."
-
(interactive)
(let ((file (tumme-original-file-name)))
(if (not (tumme-image-at-point-p))
(message "No thumbnail at point")
(if (not file)
(message "No original file name found")
- (shell-command (format "%s \"%s\""
- tumme-external-viewer
- file))))))
+ (call-process shell-file-name nil nil nil shell-command-switch
+ (format "%s \"%s\"" tumme-external-viewer file))))))
;;;###autoload
(defun tumme-dired-display-external ()
"Display file at point using an external viewer."
(interactive)
(let ((file (dired-get-filename)))
- (shell-command (format "%s \"%s\""
- tumme-external-viewer
- file))))
+ (call-process shell-file-name nil nil nil shell-command-switch
+ (format "%s \"%s\"" tumme-external-viewer file))))
(defun tumme-window-width-pixels (window)
"Calculate WINDOW width in pixels."
(defun tumme-display-image (file &optional original-size)
"Display image FILE in image buffer.
-Use this when you want to display the image, semi sized, in a window
-next to the thumbnail window - typically a three-window configuration
-with dired to the left, thumbnail window to the upper right and image
-window to the lower right. The image is sized to fit the display
-window (using a temporary file, don't worry). Because of this, it
-will not be as quick as opening it directly, but on most modern
-systems it should feel snappy enough.
+Use this when you want to display the image, semi sized, in a new
+window. The image is sized to fit the display window (using a
+temporary file, don't worry). Because of this, it will not be as
+quick as opening it directly, but on most modern systems it
+should feel snappy enough.
If optional argument ORIGINAL-SIZE is non-nil, display image in its
original size."
(cons ?h height)
(cons ?f file)
(cons ?t new-file))))
- (setq ret (shell-command command nil))
+ (setq ret (call-process shell-file-name nil nil nil
+ shell-command-switch command))
(if (not (= 0 ret))
(error "Could not resize image")))
(copy-file file new-file t))
- (save-excursion
- (set-buffer (tumme-create-display-image-buffer))
+ (with-current-buffer (tumme-create-display-image-buffer)
(let ((inhibit-read-only t))
(erase-buffer)
(clear-image-cache)
(message "No thumbnail at point")
(if (not file)
(message "No original file name found")
- (tumme-display-image file arg)
- (display-buffer tumme-display-image-buffer))))))
+ (tumme-create-display-image-buffer)
+ (display-buffer tumme-display-image-buffer)
+ (tumme-display-image file arg))))))
+
;;;###autoload
-(defun tumme-display-dired-image (&optional arg)
+(defun tumme-dired-display-image (&optional arg)
"Display current image file.
See documentation for `tumme-display-image' for more information.
With prefix argument ARG, display image in its original size."
(interactive "P")
+ (tumme-create-display-image-buffer)
+ (display-buffer tumme-display-image-buffer)
(tumme-display-image (dired-get-filename) arg))
(defun tumme-image-at-point-p ()
(cons ?p tumme-cmd-rotate-thumbnail-program)
(cons ?d degrees)
(cons ?t (expand-file-name file)))))
- (shell-command command nil)
+ (call-process shell-file-name nil nil nil shell-command-switch command)
;; Clear the cache to refresh image. I wish I could just refresh
;; the current file but I do not know how to do that. Yet...
(clear-image-cache))))
(cons ?d degrees)
(cons ?o (expand-file-name file))
(cons ?t tumme-temp-rotate-image-file))))
- (if (not (= 0 (shell-command command nil)))
+ (if (not (= 0 (call-process shell-file-name nil nil nil
+ shell-command-switch command)))
(error "Could not rotate image")
(tumme-display-image tumme-temp-rotate-image-file)
(if (or (and tumme-rotate-original-ask-before-overwrite
- (y-or-n-p "Rotate to temp file OK. Overwrite original image? "))
+ (y-or-n-p
+ "Rotate to temp file OK. Overwrite original image? "))
(not tumme-rotate-original-ask-before-overwrite))
(progn
(copy-file tumme-temp-rotate-image-file file t)
(format-time-string
"%Y:%m:%d %H:%M:%S"
(nth 5 (file-attributes (expand-file-name file))))))
- (setq data (tumme-get-exif-data (expand-file-name file) "DateTimeOriginal")))
+ (setq data (tumme-get-exif-data (expand-file-name file)
+ "DateTimeOriginal")))
(while (string-match "[ :]" data)
(setq data (replace-match "_" nil nil data)))
(format "%s%s%s" data
(old-value (tumme-get-exif-data file "ImageDescription")))
(if (eq 0
(tumme-set-exif-data file "ImageDescription"
- (read-string "Value of ImageDescription: " old-value)))
+ (read-string "Value of ImageDescription: "
+ old-value)))
(message "Successfully wrote ImageDescription tag.")
(error "Could not write ImageDescription tag")))))
(cons ?f (expand-file-name file))
(cons ?t tag-name)
(cons ?v tag-value))))
- (shell-command command nil)))
+ (call-process shell-file-name nil nil nil shell-command-switch command)))
(defun tumme-get-exif-data (file tag-name)
"From FILE, return EXIF tag TAG-NAME."
(cons ?p tumme-cmd-read-exif-data-program)
(cons ?f file)
(cons ?t tag-name))))
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(delete-region (point-min) (point-max))
- (if (not (eq (shell-command command buf) 0))
+ (if (not (eq (call-process shell-file-name nil t nil
+ shell-command-switch command) 0))
(error "Could not get EXIF tag")
(goto-char (point-min))
;; Clean buffer from newlines and carriage returns before
(defun tumme-display-next-thumbnail-original ()
"In thubnail buffer, move to next thumbnail and display the image."
(interactive)
- (tumme-forward-char)
+ (tumme-forward-image)
(tumme-display-thumbnail-original-image))
(defun tumme-display-previous-thumbnail-original ()
"Move to previous thumbnail and display image."
-
(interactive)
- (tumme-backward-char)
+ (tumme-backward-image)
(tumme-display-thumbnail-original-image))
-(defun tumme-write-comment (file comment)
- "For FILE, write comment COMMENT in database."
- (save-excursion
- (let (end buf comment-beg)
- (setq buf (find-file tumme-db-file))
- (goto-char (point-min))
- (if (search-forward-regexp
- (format "^%s" file) nil t)
- (progn
- (end-of-line)
- (setq end (point))
- (beginning-of-line)
- ;; Delete old comment, if any
- (cond ((search-forward ";comment:" end t)
- (setq comment-beg (match-beginning 0))
- ;; Any tags after the comment?
- (if (search-forward ";" end t)
- (setq comment-end (- (point) 1))
- (setq comment-end end))
- ;; Delete comment tag and comment
- (delete-region comment-beg comment-end)))
- ;; Insert new comment
- (beginning-of-line)
- (if (not (search-forward ";" end t))
- (progn
- (end-of-line)
- (insert ";")))
- (insert (format "comment:%s;" comment)))
- ;; File does not exist in databse - add it.
- (goto-char (point-max))
- (insert (format "\n%s;comment:%s" file comment)))
- (save-buffer)
- (kill-buffer buf))))
+(defun tumme-write-comments (file-comments)
+ "Write file comments to database.
+Write file comments to one or more files. FILE-COMMENTS is an alist on
+the following form:
+ ((FILE . COMMENT) ... )"
+ (let (end comment-beg-pos comment-end-pos file comment)
+ (with-temp-file tumme-db-file
+ (insert-file-contents tumme-db-file)
+ (dolist (elt file-comments)
+ (setq file (car elt)
+ comment (cdr elt))
+ (goto-char (point-min))
+ (if (search-forward-regexp (format "^%s.*$" file) nil t)
+ (progn
+ (setq end (point))
+ (beginning-of-line)
+ ;; Delete old comment, if any
+ (when (search-forward ";comment:" end t)
+ (setq comment-beg-pos (match-beginning 0))
+ ;; Any tags after the comment?
+ (if (search-forward ";" end t)
+ (setq comment-end-pos (- (point) 1))
+ (setq comment-end-pos end))
+ ;; Delete comment tag and comment
+ (delete-region comment-beg-pos comment-end-pos))
+ ;; Insert new comment
+ (beginning-of-line)
+ (unless (search-forward ";" end t)
+ (end-of-line)
+ (insert ";"))
+ (insert (format "comment:%s;" comment)))
+ ;; File does not exist in database - add it.
+ (goto-char (point-max))
+ (insert (format "\n%s;comment:%s" file comment)))))))
(defun tumme-update-property (prop value)
"Update text property PROP with value VALUE at point."
(defun tumme-dired-comment-files ()
"Add comment to current or marked files in dired."
(interactive)
- (let ((files (dired-get-marked-files))
- (comment (tumme-read-comment)))
- (mapcar
- (lambda (curr-file)
- (tumme-write-comment curr-file comment))
- files)))
+ (let ((comment (tumme-read-comment)))
+ (tumme-write-comments
+ (mapcar
+ (lambda (curr-file)
+ (cons curr-file comment))
+ (dired-get-marked-files)))))
(defun tumme-comment-thumbnail ()
"Add comment to current thumbnail in thumbnail buffer."
(interactive)
(let* ((file (tumme-original-file-name))
(comment (tumme-read-comment file)))
- (tumme-write-comment file comment)
+ (tumme-write-comments (list (cons file comment)))
(tumme-update-property 'comment comment))
(tumme-display-thumb-properties))
(defun tumme-get-comment (file)
"Get comment for file FILE."
(save-excursion
- (let (end buf comment-beg comment (base-name (file-name-nondirectory file)))
+ (let (end buf comment-beg-pos comment-end-pos comment)
(setq buf (find-file tumme-db-file))
(goto-char (point-min))
- (if (search-forward-regexp
- (format "^%s" base-name) nil t)
- (progn
- (end-of-line)
- (setq end (point))
- (beginning-of-line)
- (cond ((search-forward ";comment:" end t)
- (setq comment-beg (point))
- (if (search-forward ";" end t)
- (setq comment-end (- (point) 1))
- (setq comment-end end))
- (setq comment (buffer-substring
- comment-beg comment-end))))))
+ (when (search-forward-regexp
+ (format "^%s" file) nil t)
+ (end-of-line)
+ (setq end (point))
+ (beginning-of-line)
+ (cond ((search-forward ";comment:" end t)
+ (setq comment-beg-pos (point))
+ (if (search-forward ";" end t)
+ (setq comment-end-pos (- (point) 1))
+ (setq comment-end-pos end))
+ (setq comment (buffer-substring
+ comment-beg-pos comment-end-pos)))))
(kill-buffer buf)
comment)))
(setq file (tumme-original-file-name))
(if tumme-track-movement
(tumme-track-original-file))
+ (tumme-create-display-image-buffer)
+ (display-buffer tumme-display-image-buffer)
(tumme-display-image file)))
(defun tumme-mouse-select-thumbnail (event)
;; Insert thumbnail with link to full image
(insert
(format "<a href=\"%s/%s\"><img src=\"%s/%s\"%s></a>\n"
- tumme-gallery-image-root-url (file-name-nondirectory file)
+ tumme-gallery-image-root-url
+ (file-name-nondirectory file)
tumme-gallery-thumb-image-root-url
(file-name-nondirectory (tumme-thumb-name file)) file))
;; Insert comment, if any
(error nil))
(kill-buffer buffer)))
+(defvar tumme-widget-list nil
+ "List to keep track of meta data in edit buffer.")
+
+;;;###autoload
+(defun tumme-dired-edit-comment-and-tags ()
+ "Edit comment and tags of current or marked image files.
+Edit comment and tags for all marked image files in an
+easy-to-use form."
+ (interactive)
+ (setq tumme-widget-list nil)
+ ;; Setup buffer.
+ (let ((files (dired-get-marked-files)))
+ (switch-to-buffer "*Tumme Edit Meta Data*")
+ (kill-all-local-variables)
+ (make-local-variable 'widget-example-repeat)
+ (let ((inhibit-read-only t))
+ (erase-buffer))
+ (remove-overlays)
+ ;; Some help for the user.
+ (widget-insert
+"\nEdit comments and tags for each image. Separate multiple tags
+with a comma. Move forward between fields using TAB or RET.
+Move to the previous field using backtab (S-TAB). Save by
+activating the Save button at the bottom of the form or cancel
+the operation by activating the Cancel button.\n\n")
+ ;; Here comes all images and a comment and tag field for each
+ ;; image.
+ (let (thumb-file img comment-widget tag-widget)
+
+ (dolist (file files)
+
+ (setq thumb-file (tumme-thumb-name file)
+ img (create-image thumb-file))
+
+ (insert-image img)
+ (widget-insert "\n\nComment: ")
+ (setq comment-widget
+ (widget-create 'editable-field
+ :size 60
+ :format "%v "
+ :value (or (tumme-get-comment file) "")))
+ (widget-insert "\nTags: ")
+ (setq tag-widget
+ (widget-create 'editable-field
+ :size 60
+ :format "%v "
+ :value (or (mapconcat
+ (lambda (tag)
+ tag)
+ (tumme-list-tags file)
+ ",") "")))
+ ;; Save information in all widgets so that we can use it when
+ ;; the user saves the form.
+ (setq tumme-widget-list
+ (append tumme-widget-list
+ (list (list file comment-widget tag-widget))))
+ (widget-insert "\n\n")))
+
+ ;; Footer with Save and Cancel button.
+ (widget-insert "\n")
+ (widget-create 'push-button
+ :notify
+ (lambda (&rest ignore)
+ (tumme-save-information-from-widgets)
+ (bury-buffer)
+ (message "Done."))
+ "Save")
+ (widget-insert " ")
+ (widget-create 'push-button
+ :notify
+ (lambda (&rest ignore)
+ (bury-buffer)
+ (message "Operation canceled."))
+ "Cancel")
+ (widget-insert "\n")
+ (use-local-map widget-keymap)
+ (widget-setup)
+ ;; Jump to the first widget.
+ (widget-forward 1)))
+
+(defun tumme-save-information-from-widgets ()
+ "Save information found in `tumme-widget-list'.
+Use the information in `tumme-widget-list' to save comments and
+tags to their respective image file. Internal function used by
+`tumme-dired-edit-comment-and-tags'."
+ (let (file comment tag-string tag-list lst)
+ (tumme-write-comments
+ (mapcar
+ (lambda (widget)
+ (setq file (car widget)
+ comment (widget-value (cadr widget)))
+ (cons file comment))
+ tumme-widget-list))
+ (tumme-write-tags
+ (dolist (widget tumme-widget-list lst)
+ (setq file (car widget)
+ tag-string (widget-value (car (cddr widget)))
+ tag-list (split-string tag-string ","))
+ (dolist (tag tag-list)
+ (push (cons file tag) lst))))))
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;; TEST-SECTION ;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;