emacs: lisp/textmodes/reftex-toc.el comparison

comparison lisp/textmodes/reftex-toc.el @ 90228:fa0da9b57058

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 542-553) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 116-121) - Merge from emacs--cvs-trunk--0 - Update from CVS

author	Miles Bader <miles@gnu.org>
date	Mon, 19 Sep 2005 10:20:33 +0000
parents	a3716f7538f2 253cad16882d
children	ee12d75eb214

comparison

equal deleted inserted replaced

-:10fe5fadaf89
+:fa0da9b57058
 ;;; reftex-toc.el --- RefTeX's table of contents mode
+;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
-;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004,
+;;  Free Software Foundation, Inc.
-;;   2005 Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
-;; Version: 4.28
+;; Version: VERSIONTAG
 ;; 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
 ;; 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,
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02110-1301, USA.
+;; Boston, MA 02111-1307, USA.
 ;;; Commentary:
 ;;; Code:
 (defvar reftex-toc-map (make-sparse-keymap)
 "Keymap used for *toc* buffer.")
 (defvar reftex-toc-menu)
-(defvar zmacs-regions)
+(eval-when-compile (defvar zmacs-regions))
+(defvar reftex-last-window-height nil)
+(defvar reftex-last-window-width nil)
 (defvar reftex-toc-include-labels-indicator nil)
 (defvar reftex-toc-include-index-indicator nil)
 (defvar reftex-toc-max-level-indicator nil)
 (defun reftex-toc-mode ()
 (make-local-hook 'pre-command-hook))
 (make-local-variable 'reftex-last-follow-point)
 (add-hook 'post-command-hook 'reftex-toc-post-command-hook nil t)
 (add-hook 'pre-command-hook  'reftex-toc-pre-command-hook nil t)
 (easy-menu-add reftex-toc-menu reftex-toc-map)
-(run-mode-hooks 'reftex-toc-mode-hook))
+(run-hooks 'reftex-toc-mode-hook))
 (defvar reftex-last-toc-file nil
 "Stores the file name from which `reftex-toc' was called.  For redo command.")
-(defvar reftex-last-window-height nil)
-(defvar reftex-last-window-width nil)
 (defvar reftex-toc-return-marker (make-marker)
 "Marker which makes it possible to return from toc to old position.")
 (defconst reftex-toc-help
 (unsplittable (if (fboundp 'frame-property)
 (frame-property (selected-frame) 'unsplittable)
 (frame-parameter (selected-frame) 'unsplittable)))
 offset toc-window)
 (if (setq toc-window (get-buffer-window
 "*toc*"
 (if reuse 'visible)))
 (select-window toc-window)
 (when (or (not reftex-toc-keep-other-windows)
 (< (window-height) (* 2 window-min-height)))
 (unless unsplittable
 (if reftex-toc-split-windows-horizontally
 (split-window-horizontally
 (floor (* (window-width)
 reftex-toc-split-windows-fraction)))
 (split-window-vertically
 (floor (* (window-height)
 reftex-toc-split-windows-fraction)))))
 (let ((default-major-mode 'reftex-toc-mode))
 (switch-to-buffer "*toc*")))
 reftex-toc-include-index-entries
 reftex-toc-include-file-boundaries
 reftex-toc-include-context
 nil ; counter
 nil ; commented
 here-I-am
 ""     ; xr-prefix
 t      ; a toc buffer
 ))
 (run-hooks 'reftex-display-copied-context-hook)
 (message "Building *toc* buffer...done.")
 (setq buffer-read-only t))
 (t
 ;; Only compute the offset
 (or (reftex-get-offset this-buf here-I-am
 (if reftex-toc-include-labels " " nil)
 t
 reftex-toc-include-index-entries
 reftex-toc-include-file-boundaries)
 (reftex-last-assoc-before-elt
 'toc here-I-am
 (symbol-value reftex-docstruct-symbol))))
 (put 'reftex-toc :reftex-line 3)
 (goto-line 3)
 (beginning-of-line)))
 (reftex-toc nil t)))
 (and (> (point) 1)
 (not (get-text-property (point) 'intangible))
 (memq reftex-highlight-selection '(cursor both))
 (reftex-highlight 2
 (or (previous-single-property-change
 (min (point-max) (1+ (point))) :data)
 (point-min))
 (or (next-single-property-change (point) :data)
 (point-max))))
 (select-window (get-buffer-window buf frame))))
 (enlarge-window
 (max 0 (- (or reftex-last-window-height (window-height))
 (window-height))))))
 (defun reftex-toc-dframe-p (&optional frame error)
 ;; Check if FRAME is the dedicated TOC frame.
 ;; If yes, and ERROR is non-nil, throw an error.
 (setq frame (or frame (selected-frame)))
 (let ((res (equal
 (if (fboundp 'frame-property)
 (frame-property frame 'name)
 (frame-parameter  frame 'name))
 "RefTeX TOC Frame")))
 (if (and res error)
 "Move to next selectable item."
 (interactive "p")
 (if (boundp 'zmacs-region-stays) (setq zmacs-region-stays t))
 (setq reftex-callback-fwd t)
 (or (eobp) (forward-char 1))
 (goto-char (or (next-single-property-change (point) :data)
 (point))))
 (defun reftex-toc-previous (&optional arg)
 "Move to previous selectable item."
 (interactive "p")
 (if (boundp 'zmacs-region-stays) (setq zmacs-region-stays t))
 (defun reftex-toc-toggle-labels (arg)
 "Toggle inclusion of labels in *toc* buffer.
 With prefix ARG, prompt for a label type and include only labels of
 that specific type."
 (interactive "P")
 (setq reftex-toc-include-labels
 (if arg (reftex-query-label-type)
 (not reftex-toc-include-labels)))
 (reftex-toc-revert))
 (defun reftex-toc-toggle-index (arg)
 "Toggle inclusion of index in *toc* buffer.
 ;; Rescanning the document and rebuilding the TOC buffer.
 (defun reftex-toc-rescan (&rest ignore)
 "Regenerate the *toc* buffer by reparsing file of section at point."
 (interactive)
 (if (and reftex-enable-partial-scans
 (null current-prefix-arg))
 (let* ((data (get-text-property (point) :data))
 (what (car data))
 (file (cond ((eq what 'toc) (nth 3 data))
 ((memq what '(eof bof file-error)) (nth 1 data))
 (reftex-toc)))
 (defun reftex-toc-revert (&rest ignore)
 "Regenerate the *toc* from the internal lists."
 (interactive)
 (let ((unsplittable
 (if (fboundp 'frame-property)
 (frame-property (selected-frame) 'unsplittable)
 (frame-parameter (selected-frame) 'unsplittable)))
 (reftex-rebuilding-toc t))
 (if unsplittable
 (concat "^ *" (number-to-string (if (numberp arg) arg 1)) " ")
 nil t)
 (beginning-of-line))
 ;; Promotion/Demotion stuff
+(defvar delta)
+(defvar mpos)
+(defvar pro-or-de)
+(defvar start-pos)
+(defvar start-line)
+(defvar mark-line)
 (defun reftex-toc-demote (&optional arg)
 "Demote section at point.  If region is active, apply to all in region."
 (interactive "p")
 (reftex-toc-do-promote 1))
 (setq entries (nreverse entries))
 ;; Get the relevant section numbers, for an informative message
 (goto-char start-pos)
 (setq sections (reftex-toc-extract-section-number (car entries)))
 (if (> (setq nsec (length entries)) 1)
 (setq sections
 (concat sections "-"
 (reftex-toc-extract-section-number
 (nth (1- nsec) entries)))))
 ;; Run through the list and prepare the changes.
 (setq entries (mapcar 'reftex-toc-promote-prepare entries))
 (mapcar 'reftex-toc-promote-action entries)
 ;; Rescan the document and rebuilt the toc buffer
 (save-window-excursion
 (reftex-toc-Rescan))
 (reftex-toc-restore-region start-line mark-line)
 (message "%d section%s %smoted"
 nsec (if (= 1 nsec) "" "s") pro-or-de)
 nil))
 (if msg (progn (ding) (message msg)))))
-(defvar delta)
-(defvar mpos)
-(defvar pro-or-de)
-(defvar start-pos)
-(defvar start-line)
-(defvar mark-line)
 (defun reftex-toc-restore-region (point-line &optional mark-line)
 (if mark-line
 (progn (goto-line mark-line)
 (setq mpos (point))))
 (set-mark mpos)
 (if (fboundp 'zmacs-activate-region)
 (zmacs-activate-region)
 (setq mark-active t
 deactivate-mark nil)))))
+(defvar name1)
+(defvar dummy)
+(defvar dummy2)
 (defun reftex-toc-promote-prepare (x)
 "Look at a toc entry and see if we could pro/demote it.
 Expects the level change DELTA to be dynamically scoped into this function.
 This function prepares everything for the changes, but does not do it.
 ;; OK, get the makro name
 (progn
 (beginning-of-line 1)
 (if (looking-at reftex-section-regexp)
 (setq name (reftex-match-string 2))
-(error "Something is wrong!  Contact maintainer!")))
+(error "Something is wrong! Contact maintainer!")))
 ;; Section has changed, request scan and loading
 ;; We use a variable to delay until after the safe-exc.
 ;; because otherwise we loose the region.
 (setq load t)))
 ;; Scan document and load all files, this exits command
 (label (car toc)) newlabel)
 (if (not (stringp label))
 (error "This is not a label entry."))
 (setq newlabel (read-string (format "Rename label \"%s\" to:" label)))
 (if (assoc newlabel (symbol-value reftex-docstruct-symbol))
 (if (not (y-or-n-p
 (format "Label '%s' exists. Use anyway? " label)))
 (error "Abort")))
 (save-excursion
 (save-window-excursion
 (reftex-toc-visit-location t)
 (condition-case nil
 (reftex-query-replace-document
 (concat "{" (regexp-quote label) "}")
 (format "{%s}" newlabel))
 (error t))))
 (reftex-toc-rescan)))
 (defun reftex-toc-visit-location (&optional final no-revisit)
 ;; Visit the tex file corresponding to the toc entry on the current line.
 (let* ((toc (get-text-property (point) :data))
 (toc-window (selected-window))
 show-window show-buffer match)
 (unless toc (error "Don't know which toc line to visit"))
 (cond
 ((eq (car toc) 'toc)
 ;; a toc entry
 (setq match (reftex-toc-find-section toc no-revisit)))
 ((eq (car toc) 'index)
 (setq match
 (let ((where (car toc))
 (file (nth 1 toc)))
 (if (or (not no-revisit) (reftex-get-buffer-visiting file))
 (progn
 (switch-to-buffer-other-window
 (reftex-get-file-buffer-force file nil))
 (goto-char (if (eq where 'bof) (point-min) (point-max))))
 (message reftex-no-follow-message) nil))))
 ((stringp (car toc))
 (or (looking-at (regexp-quote literal))
 (looking-at (reftex-make-regexp-allow-for-ctrl-m literal))
 (looking-at (reftex-make-desperate-section-regexp literal))
 (looking-at (concat "\\\\"
 (regexp-quote
 (car
 (rassq level
 reftex-section-levels-all)))
 "[[{]?"))))
 ((or (not no-revisit)
 (reftex-get-buffer-visiting file))
 ;; Marker is lost.  Use the backup method.
 (loop for key across "0123456789" do
 (define-key reftex-toc-map (vector (list key)) 'digit-argument))
 (define-key reftex-toc-map "-" 'negative-argument)
 (easy-menu-define
 reftex-toc-menu reftex-toc-map
 "Menu for Table of Contents buffer"
 '("TOC"
 ["Show Location" reftex-toc-view-line t]
 ["Go To Location" reftex-toc-goto-line t]
 ["Index Entries" reftex-toc-toggle-index :style toggle
 :selected reftex-toc-include-index-entries]
 ["Context" reftex-toc-toggle-context :style toggle
 :selected reftex-toc-include-context]
 "--"
 ["Follow Mode" reftex-toc-toggle-follow :style toggle
 :selected reftex-toc-follow-mode]
 ["Auto Recenter" reftex-toggle-auto-toc-recenter :style toggle
 :selected reftex-toc-auto-recenter-timer]
 ["Dedicated Frame" reftex-toc-toggle-dedicated-frame t])
 "--"

Mercurial > emacs

comparison lisp/textmodes/reftex-toc.el @ 90228:fa0da9b57058