Mercurial > emacs
changeset 48856:e7aab76fa215
Avoid name conflicts with outline.el. Use 3 installments to keep
diffs understandable.
Change 1: Replace globally string "outline-" with string "allout-".
Replaced 1446 occurrences; there was no string "allout-" before the
change and there seems to be no dependency on outline.el.
| author | Markus Rost <rost@math.uni-bielefeld.de> |
|---|---|
| date | Mon, 16 Dec 2002 00:20:42 +0000 |
| parents | b2730a8dee9a |
| children | 8641226163f1 |
| files | lisp/allout.el |
| diffstat | 1 files changed, 1411 insertions(+), 1411 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/allout.el Sun Dec 15 22:40:03 2002 +0000 +++ b/lisp/allout.el Mon Dec 16 00:20:42 2002 +0000 @@ -5,7 +5,7 @@ ;; Author: Ken Manheimer <klm@python.org> ;; Maintainer: Ken Manheimer <klm@python.org> ;; Created: Dec 1991 - first release to usenet -;; Version: $Id: allout.el,v 1.33 2002/07/03 13:19:13 lektu Exp $|| +;; Version: $Id: allout.el,v 1.34 2002/08/30 11:03:28 lektu Exp $|| ;; Keywords: outlines mode wp languages ;; This file is part of GNU Emacs. @@ -41,18 +41,18 @@ ;; - incremental search with dynamic exposure and reconcealment of hidden text ;; - automatic topic-number maintenance ;; - "Hot-spot" operation, for single-keystroke maneuvering and -;; exposure control. (See the `outline-mode' docstring.) +;; exposure control. (See the `allout-mode' docstring.) ;; ;; and many other features. ;; ;; The outline menubar additions provide quick reference to many of -;; the features, and see the docstring of the variable `outline-init' +;; the features, and see the docstring of the variable `allout-init' ;; for instructions on priming your emacs session for automatic -;; activation of `outline-mode'. +;; activation of `allout-mode'. ;; -;; See the docstring of the variables `outline-layout' and -;; `outline-auto-activation' for details on automatic activation of -;; allout `outline-mode' as a minor mode. (It has changed since allout +;; See the docstring of the variables `allout-layout' and +;; `allout-auto-activation' for details on automatic activation of +;; allout `allout-mode' as a minor mode. (It has changed since allout ;; 3.x, for those of you that depend on the old method.) ;; ;; Note - the lines beginning with `;;;_' are outline topic headers. @@ -69,23 +69,23 @@ ;;;_* USER CUSTOMIZATION VARIABLES: (defgroup allout nil "Extensive outline mode for use alone and with other modes." - :prefix "outline-" + :prefix "allout-" :group 'outlines) ;;;_ + Layout, Mode, and Topic Header Configuration -;;;_ = outline-auto-activation -(defcustom outline-auto-activation nil - "*Regulates auto-activation modality of allout outlines - see `outline-init'. - -Setq-default by `outline-init' to regulate whether or not allout +;;;_ = allout-auto-activation +(defcustom allout-auto-activation nil + "*Regulates auto-activation modality of allout outlines - see `allout-init'. + +Setq-default by `allout-init' to regulate whether or not allout outline mode is automatically activated when the buffer-specific -variable `outline-layout' is non-nil, and whether or not the layout -dictated by `outline-layout' should be imposed on mode activation. +variable `allout-layout' is non-nil, and whether or not the layout +dictated by `allout-layout' should be imposed on mode activation. With value `t', auto-mode-activation and auto-layout are enabled. -\(This also depends on `outline-find-file-hooks' being installed in -`find-file-hooks', which is also done by `outline-init'.) +\(This also depends on `allout-find-file-hooks' being installed in +`find-file-hooks', which is also done by `allout-init'.) With value `ask', auto-mode-activation is enabled, and endorsement for performing auto-layout is asked of the user each time. @@ -96,26 +96,26 @@ With value `nil', neither auto-mode-activation nor auto-layout are enabled. -See the docstring for `outline-init' for the proper interface to +See the docstring for `allout-init' for the proper interface to this variable." :type '(choice (const :tag "On" t) (const :tag "Ask about layout" "ask") (const :tag "Mode only" "activate") (const :tag "Off" nil)) :group 'allout) -;;;_ = outline-layout -(defvar outline-layout nil +;;;_ = allout-layout +(defvar allout-layout nil "*Layout specification and provisional mode trigger for allout outlines. Buffer-specific. A list value specifies a default layout for the current buffer, to be -applied upon activation of allout `outline-mode'. Any non-nil value will -automatically trigger allout `outline-mode', provided `outline-init' +applied upon activation of allout `allout-mode'. Any non-nil value will +automatically trigger allout `allout-mode', provided `allout-init' has been called to enable it. -See the docstring for `outline-init' for details on setting up for -auto-mode-activation, and for `outline-expose-topic' for the format of +See the docstring for `allout-init' for details on setting up for +auto-mode-activation, and for `allout-expose-topic' for the format of the layout specification. You can associate a particular outline layout with a file by setting @@ -123,58 +123,58 @@ lines at the bottom of an Emacs Lisp file: ;;;Local variables: -;;;outline-layout: \(0 : -1 -1 0) +;;;allout-layout: \(0 : -1 -1 0) ;;;End: will, modulo the above-mentioned conditions, cause the mode to be activated when the file is visited, followed by the equivalent of -`\(outline-expose-topic 0 : -1 -1 0)'. \(This is the layout used for +`\(allout-expose-topic 0 : -1 -1 0)'. \(This is the layout used for the allout.el, itself.) Also, allout's mode-specific provisions will make topic prefixes default to the comment-start string, if any, of the language of the file. This -is modulo the setting of `outline-use-mode-specific-leader', which see.") -(make-variable-buffer-local 'outline-layout) -;;;_ = outline-show-bodies -(defcustom outline-show-bodies nil +is modulo the setting of `allout-use-mode-specific-leader', which see.") +(make-variable-buffer-local 'allout-layout) +;;;_ = allout-show-bodies +(defcustom allout-show-bodies nil "*If non-nil, show entire body when exposing a topic, rather than just the header." :type 'boolean :group 'allout) -(make-variable-buffer-local 'outline-show-bodies) - -;;;_ = outline-header-prefix -(defcustom outline-header-prefix "." +(make-variable-buffer-local 'allout-show-bodies) + +;;;_ = allout-header-prefix +(defcustom allout-header-prefix "." "*Leading string which helps distinguish topic headers. Outline topic header lines are identified by a leading topic header prefix, which mostly have the value of this var at their front. \(Level 1 topics are exceptions. They consist of only a single -character, which is typically set to the outline-primary-bullet. Many +character, which is typically set to the allout-primary-bullet. Many outlines start at level 2 to avoid this discrepancy." :type 'string :group 'allout) -(make-variable-buffer-local 'outline-header-prefix) -;;;_ = outline-primary-bullet -(defcustom outline-primary-bullet "*" +(make-variable-buffer-local 'allout-header-prefix) +;;;_ = allout-primary-bullet +(defcustom allout-primary-bullet "*" "Bullet used for top-level outline topics. Outline topic header lines are identified by a leading topic header prefix, which is concluded by bullets that includes the value of this -var and the respective outline-*-bullets-string vars. +var and the respective allout-*-bullets-string vars. The value of an asterisk (`*') provides for backwards compatibility -with the original emacs outline mode. See outline-plain-bullets-string -and outline-distinctive-bullets-string for the range of available +with the original emacs outline mode. See allout-plain-bullets-string +and allout-distinctive-bullets-string for the range of available bullets." :type 'string :group 'allout) -(make-variable-buffer-local 'outline-primary-bullet) -;;;_ = outline-plain-bullets-string -(defcustom outline-plain-bullets-string ".:,;" +(make-variable-buffer-local 'allout-primary-bullet) +;;;_ = allout-plain-bullets-string +(defcustom allout-plain-bullets-string ".:,;" "*The bullets normally used in outline topic prefixes. -See `outline-distinctive-bullets-string' for the other kind of +See `allout-distinctive-bullets-string' for the other kind of bullets. DO NOT include the close-square-bracket, `]', as a bullet. @@ -183,9 +183,9 @@ of this var to take effect." :type 'string :group 'allout) -(make-variable-buffer-local 'outline-plain-bullets-string) -;;;_ = outline-distinctive-bullets-string -(defcustom outline-distinctive-bullets-string "*+-=>([{}&!?#%\"X@$~_\\" +(make-variable-buffer-local 'allout-plain-bullets-string) +;;;_ = allout-distinctive-bullets-string +(defcustom allout-distinctive-bullets-string "*+-=>([{}&!?#%\"X@$~_\\" "*Persistent outline header bullets used to distinguish special topics. These bullets are used to distinguish topics from the run-of-the-mill @@ -203,35 +203,35 @@ `~' \"more or less\" ... just for example. (`#' typically has a special meaning to the -software, according to the value of `outline-numbered-bullet'.) - -See `outline-plain-bullets-string' for the selection of +software, according to the value of `allout-numbered-bullet'.) + +See `allout-plain-bullets-string' for the selection of alternating bullets. -You must run `set-outline-regexp' in order for outline mode to +You must run `set-allout-regexp' in order for outline mode to reconcile to changes of this value. DO NOT include the close-square-bracket, `]', on either of the bullet strings." :type 'string :group 'allout) -(make-variable-buffer-local 'outline-distinctive-bullets-string) - -;;;_ = outline-use-mode-specific-leader -(defcustom outline-use-mode-specific-leader t +(make-variable-buffer-local 'allout-distinctive-bullets-string) + +;;;_ = allout-use-mode-specific-leader +(defcustom allout-use-mode-specific-leader t "*When non-nil, use mode-specific topic-header prefixes. -Allout outline mode will use the mode-specific `outline-mode-leaders' +Allout outline mode will use the mode-specific `allout-mode-leaders' and/or comment-start string, if any, to lead the topic prefix string, so topic headers look like comments in the programming language. String values are used as they stand. -Value `t' means to first check for assoc value in `outline-mode-leaders' +Value `t' means to first check for assoc value in `allout-mode-leaders' alist, then use comment-start string, if any, then use default \(`.'). \(See note about use of comment-start strings, below.) -Set to the symbol for either of `outline-mode-leaders' or +Set to the symbol for either of `allout-mode-leaders' or `comment-start' to use only one of them, respectively. Value `nil' means to always use the default \(`.'). @@ -241,27 +241,27 @@ comment strings. comment-start strings that do end in spaces are not tripled, but an underscore is substituted for the space. [This presumes that the space is for appearance, not comment syntax. You -can use `outline-mode-leaders' to override this behavior, when +can use `allout-mode-leaders' to override this behavior, when incorrect.]" :type '(choice (const t) (const nil) string - (const outline-mode-leaders) + (const allout-mode-leaders) (const comment-start)) :group 'allout) -;;;_ = outline-mode-leaders -(defvar outline-mode-leaders '() - "Specific outline-prefix leading strings per major modes. +;;;_ = allout-mode-leaders +(defvar allout-mode-leaders '() + "Specific allout-prefix leading strings per major modes. Entries will be used instead or in lieu of mode-specific -comment-start strings. See also `outline-use-mode-specific-leader'. +comment-start strings. See also `allout-use-mode-specific-leader'. If you're constructing a string that will comment-out outline structuring so it can be included in program code, append an extra character, like an \"_\" underscore, to distinguish the lead string from regular comments that start at bol.") -;;;_ = outline-old-style-prefixes -(defcustom outline-old-style-prefixes nil - "*When non-nil, use only old-and-crusty outline-mode `*' topic prefixes. +;;;_ = allout-old-style-prefixes +(defcustom allout-old-style-prefixes nil + "*When non-nil, use only old-and-crusty allout-mode `*' topic prefixes. Non-nil restricts the topic creation and modification functions to asterix-padded prefixes, so they look exactly @@ -271,9 +271,9 @@ are always respected by the topic maneuvering functions." :type 'boolean :group 'allout) -(make-variable-buffer-local 'outline-old-style-prefixes) -;;;_ = outline-stylish-prefixes - alternating bullets -(defcustom outline-stylish-prefixes t +(make-variable-buffer-local 'allout-old-style-prefixes) +;;;_ = allout-stylish-prefixes - alternating bullets +(defcustom allout-stylish-prefixes t "*Do fancy stuff with topic prefix bullets according to level, etc. Non-nil enables topic creation, modification, and repositioning @@ -313,14 +313,14 @@ always respected by the topic maneuvering functions, regardless of this variable setting. -The setting of this var is not relevant when outline-old-style-prefixes +The setting of this var is not relevant when allout-old-style-prefixes is non-nil." :type 'boolean :group 'allout) -(make-variable-buffer-local 'outline-stylish-prefixes) - -;;;_ = outline-numbered-bullet -(defcustom outline-numbered-bullet "#" +(make-variable-buffer-local 'allout-stylish-prefixes) + +;;;_ = allout-numbered-bullet +(defcustom allout-numbered-bullet "#" "*String designating bullet of topics that have auto-numbering; nil for none. Topics having this bullet have automatic maintenance of a sibling @@ -329,138 +329,138 @@ disables numbering maintenance." :type '(choice (const nil) string) :group 'allout) -(make-variable-buffer-local 'outline-numbered-bullet) -;;;_ = outline-file-xref-bullet -(defcustom outline-file-xref-bullet "@" - "*Bullet signifying file cross-references, for `outline-resolve-xref'. +(make-variable-buffer-local 'allout-numbered-bullet) +;;;_ = allout-file-xref-bullet +(defcustom allout-file-xref-bullet "@" + "*Bullet signifying file cross-references, for `allout-resolve-xref'. Set this var to the bullet you want to use for file cross-references." :type '(choice (const nil) string) :group 'allout) -;;;_ = outline-presentation-padding -(defcustom outline-presentation-padding 2 +;;;_ = allout-presentation-padding +(defcustom allout-presentation-padding 2 "*Presentation-format white-space padding factor, for greater indent." :type 'integer :group 'allout) -(make-variable-buffer-local 'outline-presentation-padding) - -;;;_ = outline-abbreviate-flattened-numbering -(defcustom outline-abbreviate-flattened-numbering nil - "*If non-nil, `outline-flatten-exposed-to-buffer' abbreviates topic +(make-variable-buffer-local 'allout-presentation-padding) + +;;;_ = allout-abbreviate-flattened-numbering +(defcustom allout-abbreviate-flattened-numbering nil + "*If non-nil, `allout-flatten-exposed-to-buffer' abbreviates topic numbers to minimal amount with some context. Otherwise, entire numbers are always used." :type 'boolean :group 'allout) ;;;_ + LaTeX formatting -;;;_ - outline-number-pages -(defcustom outline-number-pages nil +;;;_ - allout-number-pages +(defcustom allout-number-pages nil "*Non-nil turns on page numbering for LaTeX formatting of an outline." :type 'boolean :group 'allout) -;;;_ - outline-label-style -(defcustom outline-label-style "\\large\\bf" +;;;_ - allout-label-style +(defcustom allout-label-style "\\large\\bf" "*Font and size of labels for LaTeX formatting of an outline." :type 'string :group 'allout) -;;;_ - outline-head-line-style -(defcustom outline-head-line-style "\\large\\sl " +;;;_ - allout-head-line-style +(defcustom allout-head-line-style "\\large\\sl " "*Font and size of entries for LaTeX formatting of an outline." :type 'string :group 'allout) -;;;_ - outline-body-line-style -(defcustom outline-body-line-style " " +;;;_ - allout-body-line-style +(defcustom allout-body-line-style " " "*Font and size of entries for LaTeX formatting of an outline." :type 'string :group 'allout) -;;;_ - outline-title-style -(defcustom outline-title-style "\\Large\\bf" +;;;_ - allout-title-style +(defcustom allout-title-style "\\Large\\bf" "*Font and size of titles for LaTeX formatting of an outline." :type 'string :group 'allout) -;;;_ - outline-title -(defcustom outline-title '(or buffer-file-name (current-buffer-name)) +;;;_ - allout-title +(defcustom allout-title '(or buffer-file-name (current-buffer-name)) "*Expression to be evaluated to determine the title for LaTeX formatted copy." :type 'sexp :group 'allout) -;;;_ - outline-line-skip -(defcustom outline-line-skip ".05cm" +;;;_ - allout-line-skip +(defcustom allout-line-skip ".05cm" "*Space between lines for LaTeX formatting of an outline." :type 'string :group 'allout) -;;;_ - outline-indent -(defcustom outline-indent ".3cm" +;;;_ - allout-indent +(defcustom allout-indent ".3cm" "*LaTeX formatted depth-indent spacing." :type 'string :group 'allout) ;;;_ + Miscellaneous customization -;;;_ = outline-command-prefix -(defcustom outline-command-prefix "\C-c" +;;;_ = allout-command-prefix +(defcustom allout-command-prefix "\C-c" "*Key sequence to be used as prefix for outline mode command key bindings." :type 'string :group 'allout) -;;;_ = outline-keybindings-list -;;; You have to reactivate outline-mode - `(outline-mode t)' - to +;;;_ = allout-keybindings-list +;;; You have to reactivate allout-mode - `(allout-mode t)' - to ;;; institute changes to this var. -(defvar outline-keybindings-list () - "*List of outline-mode key / function bindings, for outline-mode-map. - -String or vector key will be prefaced with outline-command-prefix, +(defvar allout-keybindings-list () + "*List of allout-mode key / function bindings, for allout-mode-map. + +String or vector key will be prefaced with allout-command-prefix, unless optional third, non-nil element is present.") -(setq outline-keybindings-list +(setq allout-keybindings-list '( ; Motion commands: - ("\C-n" outline-next-visible-heading) - ("\C-p" outline-previous-visible-heading) - ("\C-u" outline-up-current-level) - ("\C-f" outline-forward-current-level) - ("\C-b" outline-backward-current-level) - ("\C-a" outline-beginning-of-current-entry) - ("\C-e" outline-end-of-current-entry) + ("\C-n" allout-next-visible-heading) + ("\C-p" allout-previous-visible-heading) + ("\C-u" allout-up-current-level) + ("\C-f" allout-forward-current-level) + ("\C-b" allout-backward-current-level) + ("\C-a" allout-beginning-of-current-entry) + ("\C-e" allout-end-of-current-entry) ; Exposure commands: - ("\C-i" outline-show-children) - ("\C-s" outline-show-current-subtree) - ("\C-h" outline-hide-current-subtree) - ("\C-o" outline-show-current-entry) - ("!" outline-show-all) + ("\C-i" allout-show-children) + ("\C-s" allout-show-current-subtree) + ("\C-h" allout-hide-current-subtree) + ("\C-o" allout-show-current-entry) + ("!" allout-show-all) ; Alteration commands: - (" " outline-open-sibtopic) - ("." outline-open-subtopic) - ("," outline-open-supertopic) - ("'" outline-shift-in) - (">" outline-shift-in) - ("<" outline-shift-out) - ("\C-m" outline-rebullet-topic) - ("*" outline-rebullet-current-heading) - ("#" outline-number-siblings) - ("\C-k" outline-kill-line t) - ("\C-y" outline-yank t) - ("\M-y" outline-yank-pop t) - ("\C-k" outline-kill-topic) + (" " allout-open-sibtopic) + ("." allout-open-subtopic) + ("," allout-open-supertopic) + ("'" allout-shift-in) + (">" allout-shift-in) + ("<" allout-shift-out) + ("\C-m" allout-rebullet-topic) + ("*" allout-rebullet-current-heading) + ("#" allout-number-siblings) + ("\C-k" allout-kill-line t) + ("\C-y" allout-yank t) + ("\M-y" allout-yank-pop t) + ("\C-k" allout-kill-topic) ; Miscellaneous commands: - ;([?\C-\ ] outline-mark-topic) - ("@" outline-resolve-xref) - ("=c" outline-copy-exposed-to-buffer) - ("=i" outline-indented-exposed-to-buffer) - ("=t" outline-latexify-exposed) - ("=p" outline-flatten-exposed-to-buffer))) - -;;;_ = outline-isearch-dynamic-expose -(defcustom outline-isearch-dynamic-expose t + ;([?\C-\ ] allout-mark-topic) + ("@" allout-resolve-xref) + ("=c" allout-copy-exposed-to-buffer) + ("=i" allout-indented-exposed-to-buffer) + ("=t" allout-latexify-exposed) + ("=p" allout-flatten-exposed-to-buffer))) + +;;;_ = allout-isearch-dynamic-expose +(defcustom allout-isearch-dynamic-expose t "*Non-nil enable dynamic exposure of hidden incremental-search targets as they're encountered." :type 'boolean :group 'allout) -(make-variable-buffer-local 'outline-isearch-dynamic-expose) - -;;;_ = outline-use-hanging-indents -(defcustom outline-use-hanging-indents t +(make-variable-buffer-local 'allout-isearch-dynamic-expose) + +;;;_ = allout-use-hanging-indents +(defcustom allout-use-hanging-indents t "*If non-nil, topic body text auto-indent defaults to indent of the header. Ie, it is indented to be just past the header prefix. This is relevant mostly for use with indented-text-mode, or other situations @@ -470,10 +470,10 @@ lisp-archive package.\]" :type 'boolean :group 'allout) -(make-variable-buffer-local 'outline-use-hanging-indents) - -;;;_ = outline-reindent-bodies -(defcustom outline-reindent-bodies (if outline-use-hanging-indents +(make-variable-buffer-local 'allout-use-hanging-indents) + +;;;_ = allout-reindent-bodies +(defcustom allout-reindent-bodies (if allout-use-hanging-indents 'text) "*Non-nil enables auto-adjust of topic body hanging indent with depth shifts. @@ -487,17 +487,17 @@ :type '(choice (const nil) (const t) (const text) (const force)) :group 'allout) -(make-variable-buffer-local 'outline-reindent-bodies) - -;;;_ = outline-inhibit-protection -(defcustom outline-inhibit-protection nil +(make-variable-buffer-local 'allout-reindent-bodies) + +;;;_ = allout-inhibit-protection +(defcustom allout-inhibit-protection nil "*Non-nil disables warnings and confirmation-checks for concealed-text edits. Outline mode uses emacs change-triggered functions to detect unruly changes to concealed regions. Set this var non-nil to disable the protection, potentially increasing text-entry responsiveness a bit. -This var takes effect at outline-mode activation, so you may have to +This var takes effect at allout-mode activation, so you may have to deactivate and then reactivate the mode if you want to toggle the behavior." :type 'boolean @@ -507,76 +507,76 @@ ;;;_ #1 Internal Outline Formatting and Configuration ;;;_ : Version -;;;_ = outline-version -(defvar outline-version - (let ((rcs-rev "$Revision: 1.33 $")) +;;;_ = allout-version +(defvar allout-version + (let ((rcs-rev "$Revision: 1.34 $")) (condition-case err (save-match-data (string-match "Revision: \\([0-9]+\\.[0-9]+\\)" rcs-rev) (substring rcs-rev (match-beginning 1) (match-end 1))) ('error rcs-rev))) "Revision number of currently loaded outline package. \(allout.el)") -;;;_ > outline-version -(defun outline-version (&optional here) +;;;_ > allout-version +(defun allout-version (&optional here) "Return string describing the loaded outline version." (interactive "P") - (let ((msg (concat "Allout Outline Mode v " outline-version))) + (let ((msg (concat "Allout Outline Mode v " allout-version))) (if here (insert msg)) (message "%s" msg) msg)) ;;;_ : Topic header format -;;;_ = outline-regexp -(defvar outline-regexp "" +;;;_ = allout-regexp +(defvar allout-regexp "" "*Regular expression to match the beginning of a heading line. Any line whose beginning matches this regexp is considered a heading. This var is set according to the user configuration vars -by set-outline-regexp.") -(make-variable-buffer-local 'outline-regexp) -;;;_ = outline-bullets-string -(defvar outline-bullets-string "" +by set-allout-regexp.") +(make-variable-buffer-local 'allout-regexp) +;;;_ = allout-bullets-string +(defvar allout-bullets-string "" "A string dictating the valid set of outline topic bullets. -This var should *not* be set by the user - it is set by `set-outline-regexp', -and is produced from the elements of `outline-plain-bullets-string' -and `outline-distinctive-bullets-string'.") -(make-variable-buffer-local 'outline-bullets-string) -;;;_ = outline-bullets-string-len -(defvar outline-bullets-string-len 0 - "Length of current buffers' outline-plain-bullets-string.") -(make-variable-buffer-local 'outline-bullets-string-len) -;;;_ = outline-line-boundary-regexp -(defvar outline-line-boundary-regexp () - "Outline-regexp with outline-style beginning-of-line anchor. +This var should *not* be set by the user - it is set by `set-allout-regexp', +and is produced from the elements of `allout-plain-bullets-string' +and `allout-distinctive-bullets-string'.") +(make-variable-buffer-local 'allout-bullets-string) +;;;_ = allout-bullets-string-len +(defvar allout-bullets-string-len 0 + "Length of current buffers' allout-plain-bullets-string.") +(make-variable-buffer-local 'allout-bullets-string-len) +;;;_ = allout-line-boundary-regexp +(defvar allout-line-boundary-regexp () + "Allout-regexp with allout-style beginning-of-line anchor. \(Ie, C-j, *or* C-m, for prefixes of hidden topics). This is properly -set when outline-regexp is produced by `set-outline-regexp', so +set when allout-regexp is produced by `set-allout-regexp', so that (match-beginning 2) and (match-end 2) delimit the prefix.") -(make-variable-buffer-local 'outline-line-boundary-regexp) -;;;_ = outline-bob-regexp -(defvar outline-bob-regexp () - "Like outline-line-boundary-regexp, for headers at beginning of buffer. +(make-variable-buffer-local 'allout-line-boundary-regexp) +;;;_ = allout-bob-regexp +(defvar allout-bob-regexp () + "Like allout-line-boundary-regexp, for headers at beginning of buffer. \(match-beginning 2) and \(match-end 2) delimit the prefix.") -(make-variable-buffer-local 'outline-bob-regexp) -;;;_ = outline-header-subtraction -(defvar outline-header-subtraction (1- (length outline-header-prefix)) - "Outline-header prefix length to subtract when computing topic depth.") -(make-variable-buffer-local 'outline-header-subtraction) -;;;_ = outline-plain-bullets-string-len -(defvar outline-plain-bullets-string-len (length outline-plain-bullets-string) - "Length of outline-plain-bullets-string, updated by set-outline-regexp.") -(make-variable-buffer-local 'outline-plain-bullets-string-len) - - -;;;_ X outline-reset-header-lead (header-lead) -(defun outline-reset-header-lead (header-lead) +(make-variable-buffer-local 'allout-bob-regexp) +;;;_ = allout-header-subtraction +(defvar allout-header-subtraction (1- (length allout-header-prefix)) + "Allout-header prefix length to subtract when computing topic depth.") +(make-variable-buffer-local 'allout-header-subtraction) +;;;_ = allout-plain-bullets-string-len +(defvar allout-plain-bullets-string-len (length allout-plain-bullets-string) + "Length of allout-plain-bullets-string, updated by set-allout-regexp.") +(make-variable-buffer-local 'allout-plain-bullets-string-len) + + +;;;_ X allout-reset-header-lead (header-lead) +(defun allout-reset-header-lead (header-lead) "*Reset the leading string used to identify topic headers." (interactive "sNew lead string: ") - (setq outline-header-prefix header-lead) - (setq outline-header-subtraction (1- (length outline-header-prefix))) - (set-outline-regexp)) -;;;_ X outline-lead-with-comment-string (header-lead) -(defun outline-lead-with-comment-string (&optional header-lead) + (setq allout-header-prefix header-lead) + (setq allout-header-subtraction (1- (length allout-header-prefix))) + (set-allout-regexp)) +;;;_ X allout-lead-with-comment-string (header-lead) +(defun allout-lead-with-comment-string (&optional header-lead) "*Set the topic-header leading string to specified string. Useful when for encapsulating outline structure in programming @@ -586,29 +586,29 @@ (if (not (stringp header-lead)) (setq header-lead (read-string "String prefix for topic headers: "))) - (setq outline-reindent-bodies nil) - (outline-reset-header-lead header-lead) + (setq allout-reindent-bodies nil) + (allout-reset-header-lead header-lead) header-lead) -;;;_ > outline-infer-header-lead () -(defun outline-infer-header-lead () - "Determine appropriate `outline-header-prefix'. +;;;_ > allout-infer-header-lead () +(defun allout-infer-header-lead () + "Determine appropriate `allout-header-prefix'. Works according to settings of: `comment-start' - `outline-header-prefix' (default) - `outline-use-mode-specific-leader' -and `outline-mode-leaders'. - -Apply this via \(re)activation of `outline-mode', rather than + `allout-header-prefix' (default) + `allout-use-mode-specific-leader' +and `allout-mode-leaders'. + +Apply this via \(re)activation of `allout-mode', rather than invoking it directly." - (let* ((use-leader (and (boundp 'outline-use-mode-specific-leader) - (if (or (stringp outline-use-mode-specific-leader) - (memq outline-use-mode-specific-leader - '(outline-mode-leaders + (let* ((use-leader (and (boundp 'allout-use-mode-specific-leader) + (if (or (stringp allout-use-mode-specific-leader) + (memq allout-use-mode-specific-leader + '(allout-mode-leaders comment-start t))) - outline-use-mode-specific-leader + allout-use-mode-specific-leader ;; Oops - garbled value, equate with effect of 't: t))) (leader @@ -616,10 +616,10 @@ ((not use-leader) nil) ;; Use the explicitly designated leader: ((stringp use-leader) use-leader) - (t (or (and (memq use-leader '(t outline-mode-leaders)) + (t (or (and (memq use-leader '(t allout-mode-leaders)) ;; Get it from outline mode leaders? - (cdr (assq major-mode outline-mode-leaders))) - ;; ... didn't get from outline-mode-leaders... + (cdr (assq major-mode allout-mode-leaders))) + ;; ... didn't get from allout-mode-leaders... (and (memq use-leader '(t comment-start)) comment-start ;; Use comment-start, maybe tripled, and with @@ -635,34 +635,34 @@ "_"))))))) (if (not leader) nil - (if (string= leader outline-header-prefix) + (if (string= leader allout-header-prefix) nil ; no change, nothing to do. - (setq outline-header-prefix leader) - outline-header-prefix)))) -;;;_ > outline-infer-body-reindent () -(defun outline-infer-body-reindent () - "Determine proper setting for `outline-reindent-bodies'. - -Depends on default setting of `outline-reindent-bodies' \(which see) + (setq allout-header-prefix leader) + allout-header-prefix)))) +;;;_ > allout-infer-body-reindent () +(defun allout-infer-body-reindent () + "Determine proper setting for `allout-reindent-bodies'. + +Depends on default setting of `allout-reindent-bodies' \(which see) and presence of setting for `comment-start', to tell whether the file is programming code." - (if (and outline-reindent-bodies + (if (and allout-reindent-bodies comment-start - (not (eq 'force outline-reindent-bodies))) - (setq outline-reindent-bodies nil))) -;;;_ > set-outline-regexp () -(defun set-outline-regexp () + (not (eq 'force allout-reindent-bodies))) + (setq allout-reindent-bodies nil))) +;;;_ > set-allout-regexp () +(defun set-allout-regexp () "Generate proper topic-header regexp form for outline functions. -Works with respect to `outline-plain-bullets-string' and -`outline-distinctive-bullets-string'." +Works with respect to `allout-plain-bullets-string' and +`allout-distinctive-bullets-string'." (interactive) - ;; Derive outline-bullets-string from user configured components: - (setq outline-bullets-string "") - (let ((strings (list 'outline-plain-bullets-string - 'outline-distinctive-bullets-string - 'outline-primary-bullet)) + ;; Derive allout-bullets-string from user configured components: + (setq allout-bullets-string "") + (let ((strings (list 'allout-plain-bullets-string + 'allout-distinctive-bullets-string + 'allout-primary-bullet)) cur-string cur-len cur-char @@ -674,8 +674,8 @@ (setq cur-len (length (setq cur-string (symbol-value (car strings))))) (while (< index cur-len) (setq cur-char (aref cur-string index)) - (setq outline-bullets-string - (concat outline-bullets-string + (setq allout-bullets-string + (concat allout-bullets-string (cond ; Single dash would denote a ; sequence, repeated denotes @@ -689,33 +689,33 @@ (setq index (1+ index))) (setq strings (cdr strings))) ) - ;; Derive next for repeated use in outline-pending-bullet: - (setq outline-plain-bullets-string-len (length outline-plain-bullets-string)) - (setq outline-header-subtraction (1- (length outline-header-prefix))) - ;; Produce the new outline-regexp: - (setq outline-regexp (concat "\\(\\" - outline-header-prefix + ;; Derive next for repeated use in allout-pending-bullet: + (setq allout-plain-bullets-string-len (length allout-plain-bullets-string)) + (setq allout-header-subtraction (1- (length allout-header-prefix))) + ;; Produce the new allout-regexp: + (setq allout-regexp (concat "\\(\\" + allout-header-prefix "[ \t]*[" - outline-bullets-string + allout-bullets-string "]\\)\\|\\" - outline-primary-bullet + allout-primary-bullet "+\\|\^l")) - (setq outline-line-boundary-regexp - (concat "\\([\n\r]\\)\\(" outline-regexp "\\)")) - (setq outline-bob-regexp - (concat "\\(\\`\\)\\(" outline-regexp "\\)")) + (setq allout-line-boundary-regexp + (concat "\\([\n\r]\\)\\(" allout-regexp "\\)")) + (setq allout-bob-regexp + (concat "\\(\\`\\)\\(" allout-regexp "\\)")) ) ;;;_ : Key bindings -;;;_ = outline-mode-map -(defvar outline-mode-map nil "Keybindings for (allout) outline minor mode.") -;;;_ > produce-outline-mode-map (keymap-alist &optional base-map) -(defun produce-outline-mode-map (keymap-list &optional base-map) - "Produce keymap for use as outline-mode-map, from keymap-list. +;;;_ = allout-mode-map +(defvar allout-mode-map nil "Keybindings for (allout) outline minor mode.") +;;;_ > produce-allout-mode-map (keymap-alist &optional base-map) +(defun produce-allout-mode-map (keymap-list &optional base-map) + "Produce keymap for use as allout-mode-map, from keymap-list. Built on top of optional BASE-MAP, or empty sparse map if none specified. -See doc string for outline-keybindings-list for format of binding list." +See doc string for allout-keybindings-list for format of binding list." (let ((map (or base-map (make-sparse-keymap))) - (pref (list outline-command-prefix))) + (pref (list allout-command-prefix))) (mapcar (function (lambda (cell) (let ((add-pref (null (cdr (cdr cell)))) @@ -728,93 +728,93 @@ (car (cdr cell))))))) keymap-list) map)) -;;;_ = outline-prior-bindings - being deprecated. -(defvar outline-prior-bindings nil - "Variable for use in V18, with outline-added-bindings, for +;;;_ = allout-prior-bindings - being deprecated. +(defvar allout-prior-bindings nil + "Variable for use in V18, with allout-added-bindings, for resurrecting, on mode deactivation, bindings that existed before activation. Being deprecated.") -;;;_ = outline-added-bindings - being deprecated -(defvar outline-added-bindings nil - "Variable for use in V18, with outline-prior-bindings, for +;;;_ = allout-added-bindings - being deprecated +(defvar allout-added-bindings nil + "Variable for use in V18, with allout-prior-bindings, for resurrecting, on mode deactivation, bindings that existed before activation. Being deprecated.") ;;;_ : Menu bar -(defun produce-outline-mode-menubar-entries () +(defun produce-allout-mode-menubar-entries () (require 'easymenu) - (easy-menu-define outline-mode-exposure-menu - outline-mode-map + (easy-menu-define allout-mode-exposure-menu + allout-mode-map "Allout outline exposure menu." '("Exposure" - ["Show Entry" outline-show-current-entry t] - ["Show Children" outline-show-children t] - ["Show Subtree" outline-show-current-subtree t] - ["Hide Subtree" outline-hide-current-subtree t] - ["Hide Leaves" outline-hide-current-leaves t] + ["Show Entry" allout-show-current-entry t] + ["Show Children" allout-show-children t] + ["Show Subtree" allout-show-current-subtree t] + ["Hide Subtree" allout-hide-current-subtree t] + ["Hide Leaves" allout-hide-current-leaves t] "----" - ["Show All" outline-show-all t])) - (easy-menu-define outline-mode-editing-menu - outline-mode-map + ["Show All" allout-show-all t])) + (easy-menu-define allout-mode-editing-menu + allout-mode-map "Allout outline editing menu." '("Headings" - ["Open Sibling" outline-open-sibtopic t] - ["Open Subtopic" outline-open-subtopic t] - ["Open Supertopic" outline-open-supertopic t] + ["Open Sibling" allout-open-sibtopic t] + ["Open Subtopic" allout-open-subtopic t] + ["Open Supertopic" allout-open-supertopic t] "----" - ["Shift Topic In" outline-shift-in t] - ["Shift Topic Out" outline-shift-out t] - ["Rebullet Topic" outline-rebullet-topic t] - ["Rebullet Heading" outline-rebullet-current-heading t] - ["Number Siblings" outline-number-siblings t])) - (easy-menu-define outline-mode-navigation-menu - outline-mode-map + ["Shift Topic In" allout-shift-in t] + ["Shift Topic Out" allout-shift-out t] + ["Rebullet Topic" allout-rebullet-topic t] + ["Rebullet Heading" allout-rebullet-current-heading t] + ["Number Siblings" allout-number-siblings t])) + (easy-menu-define allout-mode-navigation-menu + allout-mode-map "Allout outline navigation menu." '("Navigation" - ["Next Visible Heading" outline-next-visible-heading t] + ["Next Visible Heading" allout-next-visible-heading t] ["Previous Visible Heading" - outline-previous-visible-heading t] + allout-previous-visible-heading t] "----" - ["Up Level" outline-up-current-level t] - ["Forward Current Level" outline-forward-current-level t] + ["Up Level" allout-up-current-level t] + ["Forward Current Level" allout-forward-current-level t] ["Backward Current Level" - outline-backward-current-level t] + allout-backward-current-level t] "----" ["Beginning of Entry" - outline-beginning-of-current-entry t] - ["End of Entry" outline-end-of-current-entry t] - ["End of Subtree" outline-end-of-current-subtree t])) - (easy-menu-define outline-mode-misc-menu - outline-mode-map + allout-beginning-of-current-entry t] + ["End of Entry" allout-end-of-current-entry t] + ["End of Subtree" allout-end-of-current-subtree t])) + (easy-menu-define allout-mode-misc-menu + allout-mode-map "Allout outlines miscellaneous bindings." '("Misc" - ["Version" outline-version t] + ["Version" allout-version t] "----" - ["Duplicate Exposed" outline-copy-exposed-to-buffer t] + ["Duplicate Exposed" allout-copy-exposed-to-buffer t] ["Duplicate Exposed, numbered" - outline-flatten-exposed-to-buffer t] + allout-flatten-exposed-to-buffer t] ["Duplicate Exposed, indented" - outline-indented-exposed-to-buffer t] + allout-indented-exposed-to-buffer t] "----" - ["Set Header Lead" outline-reset-header-lead t] - ["Set New Exposure" outline-expose-topic t]))) + ["Set Header Lead" allout-reset-header-lead t] + ["Set New Exposure" allout-expose-topic t]))) ;;;_ : Mode-Specific Variable Maintenance Utilities -;;;_ = outline-mode-prior-settings -(defvar outline-mode-prior-settings nil +;;;_ = allout-mode-prior-settings +(defvar allout-mode-prior-settings nil "Internal outline mode use; settings to be resumed on mode deactivation.") -(make-variable-buffer-local 'outline-mode-prior-settings) -;;;_ > outline-resumptions (name &optional value) -(defun outline-resumptions (name &optional value) - - "Registers or resumes settings over outline-mode activation/deactivation. +(make-variable-buffer-local 'allout-mode-prior-settings) +;;;_ > allout-resumptions (name &optional value) +(defun allout-resumptions (name &optional value) + + "Registers or resumes settings over allout-mode activation/deactivation. First arg is NAME of variable affected. Optional second arg is list -containing outline-mode-specific VALUE to be imposed on named +containing allout-mode-specific VALUE to be imposed on named variable, and to be registered. (It's a list so you can specify registrations of null values.) If no value is specified, the registered value is returned (encapsulated in the list, so the caller can distinguish nil vs no value), and the registration is popped from the list." - (let ((on-list (assq name outline-mode-prior-settings)) + (let ((on-list (assq name allout-mode-prior-settings)) prior-capsule ; By `capsule' i mean a list ; containing a value, so we can ; distinguish nil from no value. @@ -827,10 +827,10 @@ (if on-list nil ; Already preserved prior value - don't mess with it. ;; Register the old value, or nil if previously unbound: - (setq outline-mode-prior-settings + (setq allout-mode-prior-settings (cons (list name (if (boundp name) (list (symbol-value name)))) - outline-mode-prior-settings))) + allout-mode-prior-settings))) ; And impose the new value, locally: (progn (make-local-variable name) (set name (car value)))) @@ -849,91 +849,91 @@ (makunbound name)) ; Previously unbound - demolish var. ; Remove registration: (let (rebuild) - (while outline-mode-prior-settings - (if (not (eq (car outline-mode-prior-settings) + (while allout-mode-prior-settings + (if (not (eq (car allout-mode-prior-settings) on-list)) (setq rebuild - (cons (car outline-mode-prior-settings) + (cons (car allout-mode-prior-settings) rebuild))) - (setq outline-mode-prior-settings - (cdr outline-mode-prior-settings))) - (setq outline-mode-prior-settings rebuild))))) + (setq allout-mode-prior-settings + (cdr allout-mode-prior-settings))) + (setq allout-mode-prior-settings rebuild))))) ) ;;;_ : Mode-specific incidentals -;;;_ = outline-during-write-cue nil -(defvar outline-during-write-cue nil +;;;_ = allout-during-write-cue nil +(defvar allout-during-write-cue nil "Used to inhibit outline change-protection during file write. -See also `outline-post-command-business', `outline-write-file-hook', -`outline-before-change-protect', and `outline-post-command-business' +See also `allout-post-command-business', `allout-write-file-hook', +`allout-before-change-protect', and `allout-post-command-business' functions.") -;;;_ = outline-pre-was-isearching nil -(defvar outline-pre-was-isearching nil +;;;_ = allout-pre-was-isearching nil +(defvar allout-pre-was-isearching nil "Cue for isearch-dynamic-exposure mechanism, implemented in -outline-pre- and -post-command-hooks.") -(make-variable-buffer-local 'outline-pre-was-isearching) -;;;_ = outline-isearch-prior-pos nil -(defvar outline-isearch-prior-pos nil - "Cue for isearch-dynamic-exposure tracking, used by outline-isearch-expose.") -(make-variable-buffer-local 'outline-isearch-prior-pos) -;;;_ = outline-isearch-did-quit -(defvar outline-isearch-did-quit nil +allout-pre- and -post-command-hooks.") +(make-variable-buffer-local 'allout-pre-was-isearching) +;;;_ = allout-isearch-prior-pos nil +(defvar allout-isearch-prior-pos nil + "Cue for isearch-dynamic-exposure tracking, used by allout-isearch-expose.") +(make-variable-buffer-local 'allout-isearch-prior-pos) +;;;_ = allout-isearch-did-quit +(defvar allout-isearch-did-quit nil "Distinguishes isearch conclusion and cancellation. -Maintained by outline-isearch-abort \(which is wrapped around the real -isearch-abort), and monitored by outline-isearch-expose for action.") -(make-variable-buffer-local 'outline-isearch-did-quit) -;;;_ = outline-override-protect nil -(defvar outline-override-protect nil - "Used in outline-mode for regulate of concealed-text protection mechanism. +Maintained by allout-isearch-abort \(which is wrapped around the real +isearch-abort), and monitored by allout-isearch-expose for action.") +(make-variable-buffer-local 'allout-isearch-did-quit) +;;;_ = allout-override-protect nil +(defvar allout-override-protect nil + "Used in allout-mode for regulate of concealed-text protection mechanism. Allout outline mode regulates alteration of concealed text to protect against inadvertent, unnoticed changes. This is for use by specific, native outline functions to temporarily override that protection. It's automatically reset to nil after every buffer modification.") -(make-variable-buffer-local 'outline-override-protect) -;;;_ > outline-unprotected (expr) -(defmacro outline-unprotected (expr) - "Evaluate EXPRESSION with `outline-override-protect' let-bound `t'." - `(let ((outline-override-protect t)) +(make-variable-buffer-local 'allout-override-protect) +;;;_ > allout-unprotected (expr) +(defmacro allout-unprotected (expr) + "Evaluate EXPRESSION with `allout-override-protect' let-bound `t'." + `(let ((allout-override-protect t)) ,expr)) -;;;_ = outline-undo-aggregation -(defvar outline-undo-aggregation 30 +;;;_ = allout-undo-aggregation +(defvar allout-undo-aggregation 30 "Amount of successive self-insert actions to bunch together per undo. This is purely a kludge variable, regulating the compensation for a bug in the way that before-change-functions and undo interact.") -(make-variable-buffer-local 'outline-undo-aggregation) +(make-variable-buffer-local 'allout-undo-aggregation) ;;;_ = file-var-bug hack -(defvar outline-v18/19-file-var-hack nil +(defvar allout-v18/19-file-var-hack nil "Horrible hack used to prevent invalid multiple triggering of outline -mode from prop-line file-var activation. Used by outline-mode function +mode from prop-line file-var activation. Used by allout-mode function to track repeats.") -;;;_ > outline-write-file-hook () -(defun outline-write-file-hook () +;;;_ > allout-write-file-hook () +(defun allout-write-file-hook () "In outline mode, run as a local-write-file-hooks activity. -Currently just sets `outline-during-write-cue', so outline-change-protection +Currently just sets `allout-during-write-cue', so allout-change-protection knows to keep inactive during file write." - (setq outline-during-write-cue t) + (setq allout-during-write-cue t) nil) ;;;_ #2 Mode activation -;;;_ = outline-mode -(defvar outline-mode () "Allout outline mode minor-mode flag.") -(make-variable-buffer-local 'outline-mode) -;;;_ > outline-mode-p () -(defmacro outline-mode-p () - "Return t if outline-mode is active in current buffer." - 'outline-mode) -;;;_ = outline-explicitly-deactivated -(defvar outline-explicitly-deactivated nil - "Outline-mode was last deliberately deactivated. -So outline-post-command-business should not reactivate it...") -(make-variable-buffer-local 'outline-explicitly-deactivated) -;;;_ > outline-init (&optional mode) -(defun outline-init (&optional mode) - "Prime outline-mode to enable/disable auto-activation, wrt `outline-layout'. +;;;_ = allout-mode +(defvar allout-mode () "Allout outline mode minor-mode flag.") +(make-variable-buffer-local 'allout-mode) +;;;_ > allout-mode-p () +(defmacro allout-mode-p () + "Return t if allout-mode is active in current buffer." + 'allout-mode) +;;;_ = allout-explicitly-deactivated +(defvar allout-explicitly-deactivated nil + "Allout-mode was last deliberately deactivated. +So allout-post-command-business should not reactivate it...") +(make-variable-buffer-local 'allout-explicitly-deactivated) +;;;_ > allout-init (&optional mode) +(defun allout-init (&optional mode) + "Prime allout-mode to enable/disable auto-activation, wrt `allout-layout'. MODE is one of the following symbols: @@ -947,18 +947,18 @@ Use this function to setup your emacs session for automatic activation of allout outline mode, contingent to the buffer-specific setting of -the `outline-layout' variable. (See `outline-layout' and -`outline-expose-topic' docstrings for more details on auto layout). - -`outline-init' works by setting up (or removing) the outline-mode -find-file-hook, and giving `outline-auto-activation' a suitable +the `allout-layout' variable. (See `allout-layout' and +`allout-expose-topic' docstrings for more details on auto layout). + +`allout-init' works by setting up (or removing) the allout-mode +find-file-hook, and giving `allout-auto-activation' a suitable setting. To prime your emacs session for full auto-outline operation, include the following two lines in your emacs init file: \(require 'allout) -\(outline-init t)" +\(allout-init t)" (interactive) (if (interactive-p) @@ -976,8 +976,8 @@ (setq mode (intern-soft mode))))) (let ;; convenience aliases, for consistent ref to respective vars: - ((hook 'outline-find-file-hook) - (curr-mode 'outline-auto-activation)) + ((hook 'allout-find-file-hook) + (curr-mode 'allout-auto-activation)) (cond ((not mode) (setq find-file-hooks (delq hook find-file-hooks)) @@ -985,9 +985,9 @@ (message "Allout outline mode auto-activation inhibited."))) ((eq mode 'report) (if (not (memq hook find-file-hooks)) - (outline-init nil) + (allout-init nil) ;; Just punt and use the reports from each of the modes: - (outline-init (symbol-value curr-mode)))) + (allout-init (symbol-value curr-mode)))) (t (add-hook 'find-file-hooks hook) (set curr-mode ; `set', not `setq'! (cond ((eq mode 'activate) @@ -996,7 +996,7 @@ 'activate) ((eq mode 'report) ;; Return the current mode setting: - (outline-init mode)) + (allout-init mode)) ((eq mode 'ask) (message (concat "Outline mode auto-activation and " @@ -1006,28 +1006,28 @@ "Outline mode auto-activation and -layout enabled.") 'full))))))) -;;;_ > outline-setup-menubar () -(defun outline-setup-menubar () - "Populate the current buffer's menubar with allout outline-mode stuff." - (let ((menus (list outline-mode-exposure-menu - outline-mode-editing-menu - outline-mode-navigation-menu - outline-mode-misc-menu)) +;;;_ > allout-setup-menubar () +(defun allout-setup-menubar () + "Populate the current buffer's menubar with allout allout-mode stuff." + (let ((menus (list allout-mode-exposure-menu + allout-mode-editing-menu + allout-mode-navigation-menu + allout-mode-misc-menu)) cur) (while menus (setq cur (car menus) menus (cdr menus)) (easy-menu-add cur)))) -;;;_ > outline-mode (&optional toggle) +;;;_ > allout-mode (&optional toggle) ;;;_ : Defun: -(defun outline-mode (&optional toggle) +(defun allout-mode (&optional toggle) ;;;_ . Doc string: "Toggle minor mode for controlling exposure and editing of text outlines. Optional arg forces mode to re-initialize iff arg is positive num or symbol. Allout outline mode always runs as a minor mode. -Allout outline mode provides extensive outline-oriented formatting and +Allout outline mode provides extensive allout-oriented formatting and manipulation. It enables structural editing of outlines, as well as navigation and exposure. It also is specifically aimed at accommodating syntax-sensitive text like programming languages. \(For @@ -1041,73 +1041,73 @@ - incremental search with dynamic exposure and reconcealment of hidden text - automatic topic-number maintenance - \"Hot-spot\" operation, for single-keystroke maneuvering and - exposure control. \(See the outline-mode docstring.) + exposure control. \(See the allout-mode docstring.) and many other features. Below is a description of the bindings, and then explanation of -special outline-mode features and terminology. See also the outline +special allout-mode features and terminology. See also the outline menubar additions for quick reference to many of the features, and see -the docstring of the variable `outline-init' for instructions on -priming your emacs session for automatic activation of outline-mode. - - -The bindings are dictated by the `outline-keybindings-list' and -`outline-command-prefix' variables. +the docstring of the variable `allout-init' for instructions on +priming your emacs session for automatic activation of allout-mode. + + +The bindings are dictated by the `allout-keybindings-list' and +`allout-command-prefix' variables. Navigation: Exposure Control: ---------- ---------------- -C-c C-n outline-next-visible-heading | C-c C-h outline-hide-current-subtree -C-c C-p outline-previous-visible-heading | C-c C-i outline-show-children -C-c C-u outline-up-current-level | C-c C-s outline-show-current-subtree -C-c C-f outline-forward-current-level | C-c C-o outline-show-current-entry -C-c C-b outline-backward-current-level | ^U C-c C-s outline-show-all -C-c C-e outline-end-of-current-entry | outline-hide-current-leaves -C-c C-a outline-beginning-of-current-entry, alternately, goes to hot-spot +C-c C-n allout-next-visible-heading | C-c C-h allout-hide-current-subtree +C-c C-p allout-previous-visible-heading | C-c C-i allout-show-children +C-c C-u allout-up-current-level | C-c C-s allout-show-current-subtree +C-c C-f allout-forward-current-level | C-c C-o allout-show-current-entry +C-c C-b allout-backward-current-level | ^U C-c C-s allout-show-all +C-c C-e allout-end-of-current-entry | allout-hide-current-leaves +C-c C-a allout-beginning-of-current-entry, alternately, goes to hot-spot Topic Header Production: ----------------------- -C-c<SP> outline-open-sibtopic Create a new sibling after current topic. -C-c . outline-open-subtopic ... an offspring of current topic. -C-c , outline-open-supertopic ... a sibling of the current topic's parent. +C-c<SP> allout-open-sibtopic Create a new sibling after current topic. +C-c . allout-open-subtopic ... an offspring of current topic. +C-c , allout-open-supertopic ... a sibling of the current topic's parent. Topic Level and Prefix Adjustment: --------------------------------- -C-c > outline-shift-in Shift current topic and all offspring deeper. -C-c < outline-shift-out ... less deep. -C-c<CR> outline-rebullet-topic Reconcile bullets of topic and its offspring +C-c > allout-shift-in Shift current topic and all offspring deeper. +C-c < allout-shift-out ... less deep. +C-c<CR> allout-rebullet-topic Reconcile bullets of topic and its offspring - distinctive bullets are not changed, others alternated according to nesting depth. -C-c b outline-rebullet-current-heading Prompt for alternate bullet for +C-c b allout-rebullet-current-heading Prompt for alternate bullet for current topic. -C-c # outline-number-siblings Number bullets of topic and siblings - the +C-c # allout-number-siblings Number bullets of topic and siblings - the offspring are not affected. With repeat count, revoke numbering. Topic-oriented Killing and Yanking: ---------------------------------- -C-c C-k outline-kill-topic Kill current topic, including offspring. -C-k outline-kill-line Like kill-line, but reconciles numbering, etc. -C-y outline-yank Yank, adjusting depth of yanked topic to +C-c C-k allout-kill-topic Kill current topic, including offspring. +C-k allout-kill-line Like kill-line, but reconciles numbering, etc. +C-y allout-yank Yank, adjusting depth of yanked topic to depth of heading if yanking into bare topic heading (ie, prefix sans text). -M-y outline-yank-pop Is to outline-yank as yank-pop is to yank +M-y allout-yank-pop Is to allout-yank as yank-pop is to yank Misc commands: ------------- M-x outlineify-sticky Activate outline mode for current buffer, and establish a default file-var setting - for `outline-layout'. -C-c C-SPC outline-mark-topic -C-c = c outline-copy-exposed-to-buffer + for `allout-layout'. +C-c C-SPC allout-mark-topic +C-c = c allout-copy-exposed-to-buffer Duplicate outline, sans concealed text, to buffer with name derived from derived from that of current buffer - \"*XXX exposed*\". -C-c = p outline-flatten-exposed-to-buffer +C-c = p allout-flatten-exposed-to-buffer Like above 'copy-exposed', but convert topic prefixes to section.subsection... numeric format. -ESC ESC (outline-init t) Setup emacs session for outline mode +ESC ESC (allout-init t) Setup emacs session for outline mode auto-activation. HOT-SPOT Operation @@ -1115,12 +1115,12 @@ Hot-spot operation provides a means for easy, single-keystroke outline navigation and exposure control. -\\<outline-mode-map> +\\<allout-mode-map> When the text cursor is positioned directly on the bullet character of a topic, regular characters (a to z) invoke the commands of the -corresponding outline-mode keymap control chars. For example, \"f\" +corresponding allout-mode keymap control chars. For example, \"f\" would invoke the command typically bound to \"C-c C-f\" -\(\\[outline-forward-current-level] `outline-forward-current-level'). +\(\\[allout-forward-current-level] `allout-forward-current-level'). Thus, by positioning the cursor on a topic bullet, you can execute the outline navigation and manipulation commands with a single @@ -1128,9 +1128,9 @@ you can use them to get away from the hot-spot, and back to normal operation. -Note that the command `outline-beginning-of-current-entry' \(\\[outline-beginning-of-current-entry]\) +Note that the command `allout-beginning-of-current-entry' \(\\[allout-beginning-of-current-entry]\) will move to the hot-spot when the cursor is already located at the -beginning of the current entry, so you can simply hit \\[outline-beginning-of-current-entry] +beginning of the current entry, so you can simply hit \\[allout-beginning-of-current-entry] twice in a row to get to the hot-spot. Terminology @@ -1173,19 +1173,19 @@ PREFIX-LEAD: The string at the beginning of a topic prefix, normally a `.'. It can be customized by changing the setting of - `outline-header-prefix' and then reinitializing outline-mode. + `allout-header-prefix' and then reinitializing allout-mode. By setting the prefix-lead to the comment-string of a - programming language, you can embed outline-structuring in + programming language, you can embed allout-structuring in program code without interfering with the language processing - of that code. See `outline-use-mode-specific-leader' + of that code. See `allout-use-mode-specific-leader' docstring for more detail. PREFIX-PADDING: Spaces or asterisks which separate the prefix-lead and the bullet, according to the depth of the topic. BULLET: A character at the end of the topic prefix, it must be one of - the characters listed on `outline-plain-bullets-string' or - `outline-distinctive-bullets-string'. (See the documentation + the characters listed on `allout-plain-bullets-string' or + `allout-distinctive-bullets-string'. (See the documentation for these variables for more details.) The default choice of bullet when generating varies in a cycle with the depth of the topic. @@ -1208,7 +1208,7 @@ (interactive "P") (let* ((active (and (not (equal major-mode 'outline)) - (outline-mode-p))) + (allout-mode-p))) ; Massage universal-arg `toggle' val: (toggle (and toggle (or (and (listp toggle)(car toggle)) @@ -1220,14 +1220,14 @@ (or (symbolp toggle) (and (natnump toggle) (not (zerop toggle))))))) - ;; outline-mode already called once during this complex command? - (same-complex-command (eq outline-v18/19-file-var-hack + ;; allout-mode already called once during this complex command? + (same-complex-command (eq allout-v18/19-file-var-hack (car command-history))) do-layout ) ; See comments below re v19.18,.19 bug. - (setq outline-v18/19-file-var-hack (car command-history)) + (setq allout-v18/19-file-var-hack (car command-history)) (cond @@ -1237,7 +1237,7 @@ ;; off on second invocation, so we detect it as best we can, and ;; skip everything. ((and same-complex-command ; Still in same complex command - ; as last time outline-mode invoked. + ; as last time allout-mode invoked. active ; Already activated. (not explicit-activation) ; Prop-line file-vars don't have args. (string-match "^19.1[89]" ; Bug only known to be in v19.18 and @@ -1251,7 +1251,7 @@ ; requested, and either in ; active state or *de*activation ; specifically requested: - (setq outline-explicitly-deactivated t) + (setq allout-explicitly-deactivated t) (if (string-match "^18\." emacs-version) ; Revoke those keys that remain ; as we set them: @@ -1261,86 +1261,86 @@ (if (eq (lookup-key curr-loc (car cell)) (car (cdr cell))) (define-key curr-loc (car cell) - (assq (car cell) outline-prior-bindings))))) - outline-added-bindings) - (outline-resumptions 'outline-added-bindings) - (outline-resumptions 'outline-prior-bindings))) - - (if outline-old-style-prefixes + (assq (car cell) allout-prior-bindings))))) + allout-added-bindings) + (allout-resumptions 'allout-added-bindings) + (allout-resumptions 'allout-prior-bindings))) + + (if allout-old-style-prefixes (progn - (outline-resumptions 'outline-primary-bullet) - (outline-resumptions 'outline-old-style-prefixes))) - (outline-resumptions 'selective-display) + (allout-resumptions 'allout-primary-bullet) + (allout-resumptions 'allout-old-style-prefixes))) + (allout-resumptions 'selective-display) (if (and (boundp 'before-change-functions) before-change-functions) - (outline-resumptions 'before-change-functions)) + (allout-resumptions 'before-change-functions)) (setq local-write-file-hooks - (delq 'outline-write-file-hook + (delq 'allout-write-file-hook local-write-file-hooks)) - (outline-resumptions 'paragraph-start) - (outline-resumptions 'paragraph-separate) - (outline-resumptions (if (string-match "^18" emacs-version) + (allout-resumptions 'paragraph-start) + (allout-resumptions 'paragraph-separate) + (allout-resumptions (if (string-match "^18" emacs-version) 'auto-fill-hook 'auto-fill-function)) - (outline-resumptions 'outline-former-auto-filler) - (setq outline-mode nil)) + (allout-resumptions 'allout-former-auto-filler) + (setq allout-mode nil)) ;; Activation: ((not active) - (setq outline-explicitly-deactivated nil) - (if outline-old-style-prefixes + (setq allout-explicitly-deactivated nil) + (if allout-old-style-prefixes (progn ; Inhibit all the fancy formatting: - (outline-resumptions 'outline-primary-bullet '("*")) - (outline-resumptions 'outline-old-style-prefixes '(())))) - - (outline-infer-header-lead) - (outline-infer-body-reindent) - - (set-outline-regexp) + (allout-resumptions 'allout-primary-bullet '("*")) + (allout-resumptions 'allout-old-style-prefixes '(())))) + + (allout-infer-header-lead) + (allout-infer-body-reindent) + + (set-allout-regexp) ; Produce map from current version - ; of outline-keybindings-list: + ; of allout-keybindings-list: (if (boundp 'minor-mode-map-alist) (progn ; V19, and maybe lucid and ; epoch, minor-mode key bindings: - (setq outline-mode-map - (produce-outline-mode-map outline-keybindings-list)) - (produce-outline-mode-menubar-entries) - (fset 'outline-mode-map outline-mode-map) + (setq allout-mode-map + (produce-allout-mode-map allout-keybindings-list)) + (produce-allout-mode-menubar-entries) + (fset 'allout-mode-map allout-mode-map) ; Include on minor-mode-map-alist, ; if not already there: - (if (not (member '(outline-mode . outline-mode-map) + (if (not (member '(allout-mode . allout-mode-map) minor-mode-map-alist)) (setq minor-mode-map-alist - (cons '(outline-mode . outline-mode-map) + (cons '(allout-mode . allout-mode-map) minor-mode-map-alist)))) ; V18 minor-mode key bindings: ; Stash record of added bindings ; for later revocation: - (outline-resumptions 'outline-added-bindings - (list outline-keybindings-list)) - (outline-resumptions 'outline-prior-bindings + (allout-resumptions 'allout-added-bindings + (list allout-keybindings-list)) + (allout-resumptions 'allout-prior-bindings (list (current-local-map))) ; and add them: - (use-local-map (produce-outline-mode-map outline-keybindings-list + (use-local-map (produce-allout-mode-map allout-keybindings-list (current-local-map))) ) ; selective-display is the ; emacs conditional exposure ; mechanism: - (outline-resumptions 'selective-display '(t)) - (if outline-inhibit-protection + (allout-resumptions 'selective-display '(t)) + (if allout-inhibit-protection t - (outline-resumptions 'before-change-functions - '(outline-before-change-protect))) - (add-hook 'pre-command-hook 'outline-pre-command-business) - (add-hook 'post-command-hook 'outline-post-command-business) + (allout-resumptions 'before-change-functions + '(allout-before-change-protect))) + (add-hook 'pre-command-hook 'allout-pre-command-business) + (add-hook 'post-command-hook 'allout-post-command-business) ; Temporarily set by any outline ; functions that can be trusted to ; deal properly with concealed text. - (add-hook 'local-write-file-hooks 'outline-write-file-hook) + (add-hook 'local-write-file-hooks 'allout-write-file-hook) ; Custom auto-fill func, to support ; respect for topic headline, ; hanging-indents, etc: @@ -1348,49 +1348,49 @@ 'auto-fill-hook 'auto-fill-function)) (fill-func (symbol-value fill-func-var))) - ;; Register prevailing fill func for use by outline-auto-fill: - (outline-resumptions 'outline-former-auto-filler (list fill-func)) - ;; Register outline-auto-fill to be used if filling is active: - (outline-resumptions fill-func-var '(outline-auto-fill))) + ;; Register prevailing fill func for use by allout-auto-fill: + (allout-resumptions 'allout-former-auto-filler (list fill-func)) + ;; Register allout-auto-fill to be used if filling is active: + (allout-resumptions fill-func-var '(allout-auto-fill))) ;; Paragraphs are broken by topic headlines. (make-local-variable 'paragraph-start) - (outline-resumptions 'paragraph-start + (allout-resumptions 'paragraph-start (list (concat paragraph-start "\\|^\\(" - outline-regexp "\\)"))) + allout-regexp "\\)"))) (make-local-variable 'paragraph-separate) - (outline-resumptions 'paragraph-separate + (allout-resumptions 'paragraph-separate (list (concat paragraph-separate "\\|^\\(" - outline-regexp "\\)"))) - - (or (assq 'outline-mode minor-mode-alist) + allout-regexp "\\)"))) + + (or (assq 'allout-mode minor-mode-alist) (setq minor-mode-alist - (cons '(outline-mode " Outl") minor-mode-alist))) - - (outline-setup-menubar) - - (if outline-layout + (cons '(allout-mode " Outl") minor-mode-alist))) + + (allout-setup-menubar) + + (if allout-layout (setq do-layout t)) - (if (and outline-isearch-dynamic-expose - (not (fboundp 'outline-real-isearch-abort))) - (outline-enwrap-isearch)) - - (run-hooks 'outline-mode-hook) - (setq outline-mode t)) + (if (and allout-isearch-dynamic-expose + (not (fboundp 'allout-real-isearch-abort))) + (allout-enwrap-isearch)) + + (run-hooks 'allout-mode-hook) + (setq allout-mode t)) ;; Reactivation: ((setq do-layout t) - (outline-infer-body-reindent)) + (allout-infer-body-reindent)) ) ; cond (if (and do-layout - outline-auto-activation - (listp outline-layout) - (and (not (eq outline-auto-activation 'activate)) - (if (eq outline-auto-activation 'ask) + allout-auto-activation + (listp allout-layout) + (and (not (eq allout-auto-activation 'activate)) + (if (eq allout-auto-activation 'ask) (if (y-or-n-p (format "Expose %s with layout '%s'? " (buffer-name) - outline-layout)) + allout-layout)) t (message "Skipped %s layout." (buffer-name)) nil) @@ -1398,168 +1398,168 @@ (save-excursion (message "Adjusting '%s' exposure..." (buffer-name)) (goto-char 0) - (outline-this-or-next-heading) + (allout-this-or-next-heading) (condition-case err (progn - (apply 'outline-expose-topic (list outline-layout)) + (apply 'allout-expose-topic (list allout-layout)) (message "Adjusting '%s' exposure... done." (buffer-name))) ;; Problem applying exposure - notify user, but don't ;; interrupt, eg, file visit: (error (message "%s" (car (cdr err))) (sit-for 1))))) - outline-mode + allout-mode ) ; let* ) ; defun -;;;_ > outline-minor-mode +;;;_ > allout-minor-mode ;;; XXX released verion doesn't do this? -(defalias 'outline-minor-mode 'outline-mode) - -;;;_ #3 Internal Position State-Tracking - "outline-recent-*" funcs +(defalias 'allout-minor-mode 'allout-mode) + +;;;_ #3 Internal Position State-Tracking - "allout-recent-*" funcs ;;; All the basic outline functions that directly do string matches to ;;; evaluate heading prefix location set the variables -;;; `outline-recent-prefix-beginning' and `outline-recent-prefix-end' -;;; when successful. Functions starting with `outline-recent-' all +;;; `allout-recent-prefix-beginning' and `allout-recent-prefix-end' +;;; when successful. Functions starting with `allout-recent-' all ;;; use this state, providing the means to avoid redundant searches ;;; for just-established data. This optimization can provide ;;; significant speed improvement, but it must be employed carefully. -;;;_ = outline-recent-prefix-beginning -(defvar outline-recent-prefix-beginning 0 +;;;_ = allout-recent-prefix-beginning +(defvar allout-recent-prefix-beginning 0 "Buffer point of the start of the last topic prefix encountered.") -(make-variable-buffer-local 'outline-recent-prefix-beginning) -;;;_ = outline-recent-prefix-end -(defvar outline-recent-prefix-end 0 +(make-variable-buffer-local 'allout-recent-prefix-beginning) +;;;_ = allout-recent-prefix-end +(defvar allout-recent-prefix-end 0 "Buffer point of the end of the last topic prefix encountered.") -(make-variable-buffer-local 'outline-recent-prefix-end) -;;;_ = outline-recent-end-of-subtree -(defvar outline-recent-end-of-subtree 0 - "Buffer point last returned by outline-end-of-current-subtree.") -(make-variable-buffer-local 'outline-recent-end-of-subtree) -;;;_ > outline-prefix-data (beg end) -(defmacro outline-prefix-data (beg end) - "Register outline-prefix state data - BEGINNING and END of prefix. - -For reference by `outline-recent' funcs. Returns BEGINNING." - `(setq outline-recent-prefix-end ,end - outline-recent-prefix-beginning ,beg)) -;;;_ > outline-recent-depth () -(defmacro outline-recent-depth () +(make-variable-buffer-local 'allout-recent-prefix-end) +;;;_ = allout-recent-end-of-subtree +(defvar allout-recent-end-of-subtree 0 + "Buffer point last returned by allout-end-of-current-subtree.") +(make-variable-buffer-local 'allout-recent-end-of-subtree) +;;;_ > allout-prefix-data (beg end) +(defmacro allout-prefix-data (beg end) + "Register allout-prefix state data - BEGINNING and END of prefix. + +For reference by `allout-recent' funcs. Returns BEGINNING." + `(setq allout-recent-prefix-end ,end + allout-recent-prefix-beginning ,beg)) +;;;_ > allout-recent-depth () +(defmacro allout-recent-depth () "Return depth of last heading encountered by an outline maneuvering function. All outline functions which directly do string matches to assess -headings set the variables outline-recent-prefix-beginning and -outline-recent-prefix-end if successful. This function uses those settings +headings set the variables allout-recent-prefix-beginning and +allout-recent-prefix-end if successful. This function uses those settings to return the current depth." - '(max 1 (- outline-recent-prefix-end - outline-recent-prefix-beginning - outline-header-subtraction))) -;;;_ > outline-recent-prefix () -(defmacro outline-recent-prefix () - "Like outline-recent-depth, but returns text of last encountered prefix. + '(max 1 (- allout-recent-prefix-end + allout-recent-prefix-beginning + allout-header-subtraction))) +;;;_ > allout-recent-prefix () +(defmacro allout-recent-prefix () + "Like allout-recent-depth, but returns text of last encountered prefix. All outline functions which directly do string matches to assess -headings set the variables outline-recent-prefix-beginning and -outline-recent-prefix-end if successful. This function uses those settings +headings set the variables allout-recent-prefix-beginning and +allout-recent-prefix-end if successful. This function uses those settings to return the current depth." - '(buffer-substring outline-recent-prefix-beginning - outline-recent-prefix-end)) -;;;_ > outline-recent-bullet () -(defmacro outline-recent-bullet () - "Like outline-recent-prefix, but returns bullet of last encountered prefix. + '(buffer-substring allout-recent-prefix-beginning + allout-recent-prefix-end)) +;;;_ > allout-recent-bullet () +(defmacro allout-recent-bullet () + "Like allout-recent-prefix, but returns bullet of last encountered prefix. All outline functions which directly do string matches to assess -headings set the variables outline-recent-prefix-beginning and -outline-recent-prefix-end if successful. This function uses those settings +headings set the variables allout-recent-prefix-beginning and +allout-recent-prefix-end if successful. This function uses those settings to return the current depth of the most recently matched topic." - '(buffer-substring (1- outline-recent-prefix-end) - outline-recent-prefix-end)) + '(buffer-substring (1- allout-recent-prefix-end) + allout-recent-prefix-end)) ;;;_ #4 Navigation ;;;_ - Position Assessment ;;;_ : Location Predicates -;;;_ > outline-on-current-heading-p () -(defun outline-on-current-heading-p () +;;;_ > allout-on-current-heading-p () +(defun allout-on-current-heading-p () "Return non-nil if point is on current visible topics' header line. Actually, returns prefix beginning point." (save-excursion (beginning-of-line) - (and (looking-at outline-regexp) - (outline-prefix-data (match-beginning 0) (match-end 0))))) -;;;_ > outline-on-heading-p () -(defalias 'outline-on-heading-p 'outline-on-current-heading-p) -;;;_ > outline-e-o-prefix-p () -(defun outline-e-o-prefix-p () + (and (looking-at allout-regexp) + (allout-prefix-data (match-beginning 0) (match-end 0))))) +;;;_ > allout-on-heading-p () +(defalias 'allout-on-heading-p 'allout-on-current-heading-p) +;;;_ > allout-e-o-prefix-p () +(defun allout-e-o-prefix-p () "True if point is located where current topic prefix ends, heading begins." (and (save-excursion (beginning-of-line) - (looking-at outline-regexp)) - (= (point)(save-excursion (outline-end-of-prefix)(point))))) -;;;_ > outline-hidden-p () -(defmacro outline-hidden-p () + (looking-at allout-regexp)) + (= (point)(save-excursion (allout-end-of-prefix)(point))))) +;;;_ > allout-hidden-p () +(defmacro allout-hidden-p () "True if point is in hidden text." '(save-excursion (and (re-search-backward "[\n\r]" () t) (= ?\r (following-char))))) -;;;_ > outline-visible-p () -(defmacro outline-visible-p () +;;;_ > allout-visible-p () +(defmacro allout-visible-p () "True if point is not in hidden text." (interactive) - '(not (outline-hidden-p))) + '(not (allout-hidden-p))) ;;;_ : Location attributes -;;;_ > outline-depth () -(defsubst outline-depth () - "Like outline-current-depth, but respects hidden as well as visible topics." +;;;_ > allout-depth () +(defsubst allout-depth () + "Like allout-current-depth, but respects hidden as well as visible topics." (save-excursion - (if (outline-goto-prefix) - (outline-recent-depth) + (if (allout-goto-prefix) + (allout-recent-depth) (progn ;; Oops, no prefix, zero prefix data: - (outline-prefix-data (point)(point)) + (allout-prefix-data (point)(point)) ;; ... and return 0: 0)))) -;;;_ > outline-current-depth () -(defmacro outline-current-depth () +;;;_ > allout-current-depth () +(defmacro allout-current-depth () "Return nesting depth of visible topic most immediately containing point." '(save-excursion - (if (outline-back-to-current-heading) + (if (allout-back-to-current-heading) (max 1 - (- outline-recent-prefix-end - outline-recent-prefix-beginning - outline-header-subtraction)) + (- allout-recent-prefix-end + allout-recent-prefix-beginning + allout-header-subtraction)) 0))) -;;;_ > outline-get-current-prefix () -(defun outline-get-current-prefix () +;;;_ > allout-get-current-prefix () +(defun allout-get-current-prefix () "Topic prefix of the current topic." (save-excursion - (if (outline-goto-prefix) - (outline-recent-prefix)))) -;;;_ > outline-get-bullet () -(defun outline-get-bullet () + (if (allout-goto-prefix) + (allout-recent-prefix)))) +;;;_ > allout-get-bullet () +(defun allout-get-bullet () "Return bullet of containing topic (visible or not)." (save-excursion - (and (outline-goto-prefix) - (outline-recent-bullet)))) -;;;_ > outline-current-bullet () -(defun outline-current-bullet () + (and (allout-goto-prefix) + (allout-recent-bullet)))) +;;;_ > allout-current-bullet () +(defun allout-current-bullet () "Return bullet of current (visible) topic heading, or none if none found." (condition-case err (save-excursion - (outline-back-to-current-heading) - (buffer-substring (- outline-recent-prefix-end 1) - outline-recent-prefix-end)) + (allout-back-to-current-heading) + (buffer-substring (- allout-recent-prefix-end 1) + allout-recent-prefix-end)) ;; Quick and dirty provision, ostensibly for missing bullet: ('args-out-of-range nil)) ) -;;;_ > outline-get-prefix-bullet (prefix) -(defun outline-get-prefix-bullet (prefix) +;;;_ > allout-get-prefix-bullet (prefix) +(defun allout-get-prefix-bullet (prefix) "Return the bullet of the header prefix string PREFIX." ;; Doesn't make sense if we're old-style prefixes, but this just ;; oughtn't be called then, so forget about it... - (if (string-match outline-regexp prefix) + (if (string-match allout-regexp prefix) (substring prefix (1- (match-end 0)) (match-end 0)))) -;;;_ > outline-sibling-index (&optional depth) -(defun outline-sibling-index (&optional depth) +;;;_ > allout-sibling-index (&optional depth) +(defun allout-sibling-index (&optional depth) "Item number of this prospective topic among its siblings. If optional arg depth is greater than current depth, then we're @@ -1569,32 +1569,32 @@ (save-excursion (cond ((and depth (<= depth 0) 0)) - ((or (not depth) (= depth (outline-depth))) + ((or (not depth) (= depth (allout-depth))) (let ((index 1)) - (while (outline-previous-sibling (outline-recent-depth) nil) + (while (allout-previous-sibling (allout-recent-depth) nil) (setq index (1+ index))) index)) - ((< depth (outline-recent-depth)) - (outline-ascend-to-depth depth) - (outline-sibling-index)) + ((< depth (allout-recent-depth)) + (allout-ascend-to-depth depth) + (allout-sibling-index)) (0)))) -;;;_ > outline-topic-flat-index () -(defun outline-topic-flat-index () +;;;_ > allout-topic-flat-index () +(defun allout-topic-flat-index () "Return a list indicating point's numeric section.subsect.subsubsect... Outermost is first." - (let* ((depth (outline-depth)) - (next-index (outline-sibling-index depth)) + (let* ((depth (allout-depth)) + (next-index (allout-sibling-index depth)) (rev-sibls nil)) (while (> next-index 0) (setq rev-sibls (cons next-index rev-sibls)) (setq depth (1- depth)) - (setq next-index (outline-sibling-index depth))) + (setq next-index (allout-sibling-index depth))) rev-sibls) ) ;;;_ - Navigation macros -;;;_ > outline-next-heading () -(defsubst outline-next-heading () +;;;_ > allout-next-heading () +(defsubst allout-next-heading () "Move to the heading for the topic \(possibly invisible) before this one. Returns the location of the heading, or nil if none found." @@ -1602,35 +1602,35 @@ (if (and (bobp) (not (eobp))) (forward-char 1)) - (if (re-search-forward outline-line-boundary-regexp nil 0) - (outline-prefix-data ; Got valid location state - set vars: + (if (re-search-forward allout-line-boundary-regexp nil 0) + (allout-prefix-data ; Got valid location state - set vars: (goto-char (or (match-beginning 2) - outline-recent-prefix-beginning)) - (or (match-end 2) outline-recent-prefix-end)))) -;;;_ : outline-this-or-next-heading -(defun outline-this-or-next-heading () + allout-recent-prefix-beginning)) + (or (match-end 2) allout-recent-prefix-end)))) +;;;_ : allout-this-or-next-heading +(defun allout-this-or-next-heading () "Position cursor on current or next heading." - ;; A throwaway non-macro that is defined after outline-next-heading - ;; and usable by outline-mode. - (if (not (outline-goto-prefix)) (outline-next-heading))) -;;;_ > outline-previous-heading () -(defmacro outline-previous-heading () + ;; A throwaway non-macro that is defined after allout-next-heading + ;; and usable by allout-mode. + (if (not (allout-goto-prefix)) (allout-next-heading))) +;;;_ > allout-previous-heading () +(defmacro allout-previous-heading () "Move to the prior \(possibly invisible) heading line. Return the location of the beginning of the heading, or nil if not found." '(if (bobp) nil - (outline-goto-prefix) + (allout-goto-prefix) (if ;; searches are unbounded and return nil if failed: - (or (re-search-backward outline-line-boundary-regexp nil 0) - (looking-at outline-bob-regexp)) + (or (re-search-backward allout-line-boundary-regexp nil 0) + (looking-at allout-bob-regexp)) (progn ; Got valid location state - set vars: - (outline-prefix-data + (allout-prefix-data (goto-char (or (match-beginning 2) - outline-recent-prefix-beginning)) - (or (match-end 2) outline-recent-prefix-end)))))) + allout-recent-prefix-beginning)) + (or (match-end 2) allout-recent-prefix-end)))))) ;;;_ - Subtree Charting ;;;_ " These routines either produce or assess charts, which are @@ -1642,15 +1642,15 @@ ;;; for assessment or adjustment of the subtree, without redundant ;;; traversal of the structure. -;;;_ > outline-chart-subtree (&optional levels orig-depth prev-depth) -(defun outline-chart-subtree (&optional levels orig-depth prev-depth) +;;;_ > allout-chart-subtree (&optional levels orig-depth prev-depth) +(defun allout-chart-subtree (&optional levels orig-depth prev-depth) "Produce a location \"chart\" of subtopics of the containing topic. Optional argument LEVELS specifies the depth \(relative to start depth) for the chart. Subsequent optional args are not for public use. -Charts are used to capture outline structure, so that outline-altering +Charts are used to capture outline structure, so that allout-altering routines need assess the structure only once, and then use the chart for their elaborate manipulations. @@ -1671,9 +1671,9 @@ (if original ; Just starting? ; Register initial settings and ; position to first offspring: - (progn (setq orig-depth (outline-depth)) + (progn (setq orig-depth (allout-depth)) (or prev-depth (setq prev-depth (1+ orig-depth))) - (outline-next-heading))) + (allout-next-heading))) ;; Loop over the current levels' siblings. Besides being more ;; efficient than tail-recursing over a level, it avoids exceeding @@ -1684,26 +1684,26 @@ (while (and (not (eobp)) ; Still within original topic? - (< orig-depth (setq curr-depth (outline-recent-depth))) + (< orig-depth (setq curr-depth (allout-recent-depth))) (cond ((= prev-depth curr-depth) ;; Register this one and move on: (setq chart (cons (point) chart)) (if (and levels (<= levels 1)) ;; At depth limit - skip sublevels: - (or (outline-next-sibling curr-depth) + (or (allout-next-sibling curr-depth) ;; or no more siblings - proceed to ;; next heading at lesser depth: (while (and (<= curr-depth - (outline-recent-depth)) - (outline-next-heading)))) - (outline-next-heading))) + (allout-recent-depth)) + (allout-next-heading)))) + (allout-next-heading))) ((and (< prev-depth curr-depth) (or (not levels) (> levels 0))) ;; Recurse on deeper level of curr topic: (setq chart - (cons (outline-chart-subtree (and levels + (cons (allout-chart-subtree (and levels (1- levels)) orig-depth curr-depth) @@ -1725,24 +1725,24 @@ 1) '(?\n ?\r)) (forward-char -1)) - (setq outline-recent-end-of-subtree (point)))) + (setq allout-recent-end-of-subtree (point)))) chart ; (nreverse chart) not necessary, ; and maybe not preferable. )) -;;;_ > outline-chart-siblings (&optional start end) -(defun outline-chart-siblings (&optional start end) +;;;_ > allout-chart-siblings (&optional start end) +(defun allout-chart-siblings (&optional start end) "Produce a list of locations of this and succeeding sibling topics. -Effectively a top-level chart of siblings. See `outline-chart-subtree' +Effectively a top-level chart of siblings. See `allout-chart-subtree' for an explanation of charts." (save-excursion - (if (outline-goto-prefix) + (if (allout-goto-prefix) (let ((chart (list (point)))) - (while (outline-next-sibling) + (while (allout-next-sibling) (setq chart (cons (point) chart))) (if chart (setq chart (nreverse chart))))))) -;;;_ > outline-chart-to-reveal (chart depth) -(defun outline-chart-to-reveal (chart depth) +;;;_ > allout-chart-to-reveal (chart depth) +(defun allout-chart-to-reveal (chart depth) "Return a flat list of hidden points in subtree CHART, up to DEPTH. @@ -1754,7 +1754,7 @@ chart) (setq here (car chart)) (if (listp here) - (let ((further (outline-chart-to-reveal here (or (eq depth t) + (let ((further (allout-chart-to-reveal here (or (eq depth t) (1- depth))))) ;; We're on the start of a subtree - recurse with it, if there's ;; more depth to go: @@ -1765,8 +1765,8 @@ (setq result (cons here result))) (setq chart (cdr chart)))) result)) -;;;_ X outline-chart-spec (chart spec &optional exposing) -(defun outline-chart-spec (chart spec &optional exposing) +;;;_ X allout-chart-spec (chart spec &optional exposing) +(defun allout-chart-spec (chart spec &optional exposing) "Not yet \(if ever) implemented. Produce exposure directives given topic/subtree CHART and an exposure SPEC. @@ -1798,8 +1798,8 @@ ) ;;;_ - Within Topic -;;;_ > outline-goto-prefix () -(defun outline-goto-prefix () +;;;_ > allout-goto-prefix () +(defun allout-goto-prefix () "Put point at beginning of immediately containing outline topic. Goes to most immediate subsequent topic if none immediately containing. @@ -1812,24 +1812,24 @@ (while (and (not done) (re-search-backward "[\n\r]" nil 1)) (forward-char 1) - (if (looking-at outline-regexp) - (setq done (outline-prefix-data (match-beginning 0) + (if (looking-at allout-regexp) + (setq done (allout-prefix-data (match-beginning 0) (match-end 0))) (forward-char -1))) (if (bobp) - (cond ((looking-at outline-regexp) - (outline-prefix-data (match-beginning 0)(match-end 0))) - ((outline-next-heading)) + (cond ((looking-at allout-regexp) + (allout-prefix-data (match-beginning 0)(match-end 0))) + ((allout-next-heading)) (done)) done))) -;;;_ > outline-end-of-prefix () -(defun outline-end-of-prefix (&optional ignore-decorations) +;;;_ > allout-end-of-prefix () +(defun allout-end-of-prefix (&optional ignore-decorations) "Position cursor at beginning of header text. If optional IGNORE-DECORATIONS is non-nil, put just after bullet, otherwise skip white space between bullet and ensuing text." - (if (not (outline-goto-prefix)) + (if (not (allout-goto-prefix)) nil (let ((match-data (match-data))) (goto-char (match-end 0)) @@ -1839,161 +1839,161 @@ (if (and (not (eolp)) (looking-at "\\s-")) (forward-char 1))) (store-match-data match-data)) ;; Reestablish where we are: - (outline-current-depth))) -;;;_ > outline-current-bullet-pos () -(defun outline-current-bullet-pos () + (allout-current-depth))) +;;;_ > allout-current-bullet-pos () +(defun allout-current-bullet-pos () "Return position of current \(visible) topic's bullet." - (if (not (outline-current-depth)) + (if (not (allout-current-depth)) nil (1- (match-end 0)))) -;;;_ > outline-back-to-current-heading () -(defun outline-back-to-current-heading () +;;;_ > allout-back-to-current-heading () +(defun allout-back-to-current-heading () "Move to heading line of current topic, or beginning if already on the line." (beginning-of-line) - (prog1 (or (outline-on-current-heading-p) - (and (re-search-backward (concat "^\\(" outline-regexp "\\)") + (prog1 (or (allout-on-current-heading-p) + (and (re-search-backward (concat "^\\(" allout-regexp "\\)") nil 'move) - (outline-prefix-data (match-beginning 1)(match-end 1)))) - (if (interactive-p) (outline-end-of-prefix)))) -;;;_ > outline-back-to-heading () -(defalias 'outline-back-to-heading 'outline-back-to-current-heading) -;;;_ > outline-pre-next-preface () -(defun outline-pre-next-preface () + (allout-prefix-data (match-beginning 1)(match-end 1)))) + (if (interactive-p) (allout-end-of-prefix)))) +;;;_ > allout-back-to-heading () +(defalias 'allout-back-to-heading 'allout-back-to-current-heading) +;;;_ > allout-pre-next-preface () +(defun allout-pre-next-preface () "Skip forward to just before the next heading line. Returns that character position." - (if (re-search-forward outline-line-boundary-regexp nil 'move) + (if (re-search-forward allout-line-boundary-regexp nil 'move) (prog1 (goto-char (match-beginning 0)) - (outline-prefix-data (match-beginning 2)(match-end 2))))) -;;;_ > outline-end-of-current-subtree () -(defun outline-end-of-current-subtree () + (allout-prefix-data (match-beginning 2)(match-end 2))))) +;;;_ > allout-end-of-current-subtree () +(defun allout-end-of-current-subtree () "Put point at the end of the last leaf in the currently visible topic." (interactive) - (outline-back-to-current-heading) - (let ((level (outline-recent-depth))) - (outline-next-heading) + (allout-back-to-current-heading) + (let ((level (allout-recent-depth))) + (allout-next-heading) (while (and (not (eobp)) - (> (outline-recent-depth) level)) - (outline-next-heading)) + (> (allout-recent-depth) level)) + (allout-next-heading)) (and (not (eobp)) (forward-char -1)) (and (memq (preceding-char) '(?\n ?\r)) (memq (aref (buffer-substring (max 1 (- (point) 3)) (point)) 1) '(?\n ?\r)) (forward-char -1)) - (setq outline-recent-end-of-subtree (point)))) -;;;_ > outline-beginning-of-current-entry () -(defun outline-beginning-of-current-entry () + (setq allout-recent-end-of-subtree (point)))) +;;;_ > allout-beginning-of-current-entry () +(defun allout-beginning-of-current-entry () "When not already there, position point at beginning of current topic's body. If already there, move cursor to bullet for hot-spot operation. -\(See outline-mode doc string for details on hot-spot operation.)" +\(See allout-mode doc string for details on hot-spot operation.)" (interactive) (let ((start-point (point))) - (outline-end-of-prefix) + (allout-end-of-prefix) (if (and (interactive-p) (= (point) start-point)) - (goto-char (outline-current-bullet-pos))))) -;;;_ > outline-end-of-current-entry () -(defun outline-end-of-current-entry () + (goto-char (allout-current-bullet-pos))))) +;;;_ > allout-end-of-current-entry () +(defun allout-end-of-current-entry () "Position the point at the end of the current topics' entry." (interactive) - (outline-show-entry) - (prog1 (outline-pre-next-preface) + (allout-show-entry) + (prog1 (allout-pre-next-preface) (if (and (not (bobp))(looking-at "^$")) (forward-char -1)))) -;;;_ > outline-end-of-current-heading () -(defun outline-end-of-current-heading () +;;;_ > allout-end-of-current-heading () +(defun allout-end-of-current-heading () (interactive) - (outline-beginning-of-current-entry) + (allout-beginning-of-current-entry) (forward-line -1) (end-of-line)) -(defalias 'outline-end-of-heading 'outline-end-of-current-heading) +(defalias 'allout-end-of-heading 'allout-end-of-current-heading) ;;;_ - Depth-wise -;;;_ > outline-ascend-to-depth (depth) -(defun outline-ascend-to-depth (depth) +;;;_ > allout-ascend-to-depth (depth) +(defun allout-ascend-to-depth (depth) "Ascend to depth DEPTH, returning depth if successful, nil if not." - (if (and (> depth 0)(<= depth (outline-depth))) + (if (and (> depth 0)(<= depth (allout-depth))) (let ((last-good (point))) - (while (and (< depth (outline-depth)) + (while (and (< depth (allout-depth)) (setq last-good (point)) - (outline-beginning-of-level) - (outline-previous-heading))) - (if (= (outline-recent-depth) depth) - (progn (goto-char outline-recent-prefix-beginning) + (allout-beginning-of-level) + (allout-previous-heading))) + (if (= (allout-recent-depth) depth) + (progn (goto-char allout-recent-prefix-beginning) depth) (goto-char last-good) nil)) - (if (interactive-p) (outline-end-of-prefix)))) -;;;_ > outline-ascend () -(defun outline-ascend () + (if (interactive-p) (allout-end-of-prefix)))) +;;;_ > allout-ascend () +(defun allout-ascend () "Ascend one level, returning t if successful, nil if not." (prog1 - (if (outline-beginning-of-level) - (outline-previous-heading)) - (if (interactive-p) (outline-end-of-prefix)))) -;;;_ > outline-descend-to-depth (depth) -(defun outline-descend-to-depth (depth) + (if (allout-beginning-of-level) + (allout-previous-heading)) + (if (interactive-p) (allout-end-of-prefix)))) +;;;_ > allout-descend-to-depth (depth) +(defun allout-descend-to-depth (depth) "Descend to depth DEPTH within current topic. Returning depth if successful, nil if not." (let ((start-point (point)) - (start-depth (outline-depth))) + (start-depth (allout-depth))) (while - (and (> (outline-depth) 0) - (not (= depth (outline-recent-depth))) ; ... not there yet - (outline-next-heading) ; ... go further - (< start-depth (outline-recent-depth)))) ; ... still in topic - (if (and (> (outline-depth) 0) - (= (outline-recent-depth) depth)) + (and (> (allout-depth) 0) + (not (= depth (allout-recent-depth))) ; ... not there yet + (allout-next-heading) ; ... go further + (< start-depth (allout-recent-depth)))) ; ... still in topic + (if (and (> (allout-depth) 0) + (= (allout-recent-depth) depth)) depth (goto-char start-point) nil)) ) -;;;_ > outline-up-current-level (arg &optional dont-complain) -(defun outline-up-current-level (arg &optional dont-complain) +;;;_ > allout-up-current-level (arg &optional dont-complain) +(defun allout-up-current-level (arg &optional dont-complain) "Move out ARG levels from current visible topic. Positions on heading line of containing topic. Error if unable to ascend that far, or nil if unable to ascend but optional arg DONT-COMPLAIN is non-nil." (interactive "p") - (outline-back-to-current-heading) - (let ((present-level (outline-recent-depth)) + (allout-back-to-current-heading) + (let ((present-level (allout-recent-depth)) (last-good (point)) failed return) ;; Loop for iterating arg: - (while (and (> (outline-recent-depth) 1) + (while (and (> (allout-recent-depth) 1) (> arg 0) (not (bobp)) (not failed)) (setq last-good (point)) ;; Loop for going back over current or greater depth: - (while (and (not (< (outline-recent-depth) present-level)) - (or (outline-previous-visible-heading 1) + (while (and (not (< (allout-recent-depth) present-level)) + (or (allout-previous-visible-heading 1) (not (setq failed present-level))))) - (setq present-level (outline-current-depth)) + (setq present-level (allout-current-depth)) (setq arg (- arg 1))) (if (or failed (> arg 0)) (progn (goto-char last-good) - (if (interactive-p) (outline-end-of-prefix)) + (if (interactive-p) (allout-end-of-prefix)) (if (not dont-complain) (error "Can't ascend past outermost level") - (if (interactive-p) (outline-end-of-prefix)) + (if (interactive-p) (allout-end-of-prefix)) nil)) - (if (interactive-p) (outline-end-of-prefix)) - outline-recent-prefix-beginning))) + (if (interactive-p) (allout-end-of-prefix)) + allout-recent-prefix-beginning))) ;;;_ - Linear -;;;_ > outline-next-sibling (&optional depth backward) -(defun outline-next-sibling (&optional depth backward) - "Like outline-forward-current-level, but respects invisible topics. +;;;_ > allout-next-sibling (&optional depth backward) +(defun allout-next-sibling (&optional depth backward) + "Like allout-forward-current-level, but respects invisible topics. Traverse at optional DEPTH, or current depth if none specified. @@ -2003,33 +2003,33 @@ (if (and backward (bobp)) nil - (let ((start-depth (or depth (outline-depth))) + (let ((start-depth (or depth (allout-depth))) (start-point (point)) last-depth) (while (and (not (if backward (bobp) (eobp))) - (if backward (outline-previous-heading) - (outline-next-heading)) - (> (setq last-depth (outline-recent-depth)) start-depth))) + (if backward (allout-previous-heading) + (allout-next-heading)) + (> (setq last-depth (allout-recent-depth)) start-depth))) (if (and (not (eobp)) - (and (> (or last-depth (outline-depth)) 0) - (= (outline-recent-depth) start-depth))) - outline-recent-prefix-beginning + (and (> (or last-depth (allout-depth)) 0) + (= (allout-recent-depth) start-depth))) + allout-recent-prefix-beginning (goto-char start-point) - (if depth (outline-depth) start-depth) + (if depth (allout-depth) start-depth) nil)))) -;;;_ > outline-previous-sibling (&optional depth backward) -(defun outline-previous-sibling (&optional depth backward) - "Like outline-forward-current-level,but backwards & respect invisible topics. +;;;_ > allout-previous-sibling (&optional depth backward) +(defun allout-previous-sibling (&optional depth backward) + "Like allout-forward-current-level,but backwards & respect invisible topics. Optional DEPTH specifies depth to traverse, default current depth. Optional BACKWARD reverses direction. Return depth if successful, nil otherwise." - (outline-next-sibling depth (not backward)) + (allout-next-sibling depth (not backward)) ) -;;;_ > outline-snug-back () -(defun outline-snug-back () +;;;_ > allout-snug-back () +(defun allout-snug-back () "Position cursor at end of previous topic Presumes point is at the start of a topic prefix." @@ -2042,20 +2042,20 @@ (if (or (bobp) (not (memq (preceding-char) '(?\n ?\r)))) (forward-char -1))) (point)) -;;;_ > outline-beginning-of-level () -(defun outline-beginning-of-level () +;;;_ > allout-beginning-of-level () +(defun allout-beginning-of-level () "Go back to the first sibling at this level, visible or not." - (outline-end-of-level 'backward)) -;;;_ > outline-end-of-level (&optional backward) -(defun outline-end-of-level (&optional backward) + (allout-end-of-level 'backward)) +;;;_ > allout-end-of-level (&optional backward) +(defun allout-end-of-level (&optional backward) "Go to the last sibling at this level, visible or not." - (let ((depth (outline-depth))) - (while (outline-previous-sibling depth nil)) - (prog1 (outline-recent-depth) - (if (interactive-p) (outline-end-of-prefix))))) -;;;_ > outline-next-visible-heading (arg) -(defun outline-next-visible-heading (arg) + (let ((depth (allout-depth))) + (while (allout-previous-sibling depth nil)) + (prog1 (allout-recent-depth) + (if (interactive-p) (allout-end-of-prefix))))) +;;;_ > allout-next-visible-heading (arg) +(defun allout-next-visible-heading (arg) "Move to the next ARG'th visible heading line, backward if arg is negative. Move as far as possible in indicated direction \(beginning or end of @@ -2071,34 +2071,34 @@ (while (and (not (if backward (bobp)(eobp))) ; boundary condition ;; Move, skipping over all those concealed lines: (< -1 (forward-line step)) - (not (setq got (looking-at outline-regexp))))) + (not (setq got (looking-at allout-regexp))))) ;; Register this got, it may be the last: (if got (setq prev got)) (setq arg (1- arg))) (cond (got ; Last move was to a prefix: - (outline-prefix-data (match-beginning 0) (match-end 0)) - (outline-end-of-prefix)) + (allout-prefix-data (match-beginning 0) (match-end 0)) + (allout-end-of-prefix)) (prev ; Last move wasn't, but prev was: - (outline-prefix-data (match-beginning 0) (match-end 0))) + (allout-prefix-data (match-beginning 0) (match-end 0))) ((not backward) (end-of-line) nil)))) -;;;_ > outline-previous-visible-heading (arg) -(defun outline-previous-visible-heading (arg) +;;;_ > allout-previous-visible-heading (arg) +(defun allout-previous-visible-heading (arg) "Move to the previous heading line. With argument, repeats or can move forward if negative. -A heading line is one that starts with a `*' (or that outline-regexp +A heading line is one that starts with a `*' (or that allout-regexp matches)." (interactive "p") - (outline-next-visible-heading (- arg))) -;;;_ > outline-forward-current-level (arg) -(defun outline-forward-current-level (arg) + (allout-next-visible-heading (- arg))) +;;;_ > allout-forward-current-level (arg) +(defun allout-forward-current-level (arg) "Position point at the next heading of the same level. Takes optional repeat-count, goes backward if count is negative. Returns resulting position, else nil if none found." (interactive "p") - (let ((start-depth (outline-current-depth)) + (let ((start-depth (allout-current-depth)) (start-point (point)) (start-arg arg) (backward (> 0 arg)) @@ -2111,9 +2111,9 @@ (while (not (or (zerop arg) at-boundary)) (while (and (not (if backward (bobp) (eobp))) - (if backward (outline-previous-visible-heading 1) - (outline-next-visible-heading 1)) - (> (setq last-depth (outline-recent-depth)) start-depth))) + (if backward (allout-previous-visible-heading 1) + (allout-next-visible-heading 1)) + (> (setq last-depth (allout-recent-depth)) start-depth))) (if (and last-depth (= last-depth start-depth) (not (if backward (bobp) (eobp)))) (setq last-good (point) @@ -2121,32 +2121,32 @@ (setq at-boundary t))) (if (and (not (eobp)) (= arg 0) - (and (> (or last-depth (outline-depth)) 0) - (= (outline-recent-depth) start-depth))) - outline-recent-prefix-beginning + (and (> (or last-depth (allout-depth)) 0) + (= (allout-recent-depth) start-depth))) + allout-recent-prefix-beginning (goto-char last-good) (if (not (interactive-p)) nil - (outline-end-of-prefix) + (allout-end-of-prefix) (error "Hit %s level %d topic, traversed %d of %d requested" (if backward "first" "last") - (outline-recent-depth) + (allout-recent-depth) (- (abs start-arg) arg) (abs start-arg)))))) -;;;_ > outline-backward-current-level (arg) -(defun outline-backward-current-level (arg) - "Inverse of `outline-forward-current-level'." +;;;_ > allout-backward-current-level (arg) +(defun allout-backward-current-level (arg) + "Inverse of `allout-forward-current-level'." (interactive "p") (if (interactive-p) (let ((current-prefix-arg (* -1 arg))) - (call-interactively 'outline-forward-current-level)) - (outline-forward-current-level (* -1 arg)))) + (call-interactively 'allout-forward-current-level)) + (allout-forward-current-level (* -1 arg)))) ;;;_ #5 Alteration ;;;_ - Fundamental -;;;_ > outline-before-change-protect (beg end) -(defun outline-before-change-protect (beg end) +;;;_ > allout-before-change-protect (beg end) +(defun allout-before-change-protect (beg end) "Outline before-change hook, regulates changes to concealed text. Reveal concealed text that would be changed by current command, and @@ -2166,14 +2166,14 @@ in emacs 19 is run before any change to the buffer. Any functions which set [`this-command' to `undo', or which set] -`outline-override-protect' non-nil (as does, eg, outline-flag-chars) +`allout-override-protect' non-nil (as does, eg, allout-flag-chars) are exempt from this restriction." - (if (and (outline-mode-p) - ; outline-override-protect + (if (and (allout-mode-p) + ; allout-override-protect ; set by functions that know what ; they're doing, eg outline internals: - (not outline-override-protect) - (not outline-during-write-cue) + (not allout-override-protect) + (not allout-during-write-cue) (save-match-data ; Preserve operation position state. ; Both beginning and end chars must ; be exposed: @@ -2183,10 +2183,10 @@ (setq beg (1+ beg) end (1+ end))) (goto-char beg) - (or (outline-hidden-p) + (or (allout-hidden-p) (and (not (= beg end)) (goto-char end) - (outline-hidden-p)))))) + (allout-hidden-p)))))) (save-match-data (if (equal this-command 'undo) ;; Allow undo without inhibition. @@ -2197,12 +2197,12 @@ ;; - Undo may be users' only recourse in protection faults. ;; So, expose what getting changed: (progn (message "Undo! - exposing concealed target...") - (if (outline-hidden-p) - (outline-show-children)) + (if (allout-hidden-p) + (allout-show-children)) (message "Undo!")) (let (response - (rehide-completely (save-excursion (outline-goto-prefix) - (outline-hidden-p))) + (rehide-completely (save-excursion (allout-goto-prefix) + (allout-hidden-p))) rehide-place) (save-excursion @@ -2212,8 +2212,8 @@ ; Give them a peek where (save-excursion (if (eolp) (setq rehide-place - (outline-goto-prefix))) - (outline-show-entry)) + (allout-goto-prefix))) + (allout-show-entry)) ; Present the message, but... ; leave the cursor at the location ; until they respond: @@ -2246,38 +2246,38 @@ (save-excursion (if rehide-place (goto-char rehide-place)) (if rehide-completely - (outline-hide-current-entry-completely) - (outline-hide-current-entry))) - (if (outline-ascend-to-depth (1- (outline-recent-depth))) - (outline-show-children) - (outline-show-to-offshoot))) + (allout-hide-current-entry-completely) + (allout-hide-current-entry))) + (if (allout-ascend-to-depth (1- (allout-recent-depth))) + (allout-show-children) + (allout-show-to-offshoot))) ; Prevent: (if rehide-completely (save-excursion (if rehide-place (goto-char rehide-place)) - (outline-hide-current-entry-completely)) - (outline-hide-current-entry)) + (allout-hide-current-entry-completely)) + (allout-hide-current-entry)) (error (concat "Change within concealed region prevented."))))))) ) ; if ) ; defun -;;;_ = outline-post-goto-bullet -(defvar outline-post-goto-bullet nil - "Outline internal var, for `outline-pre-command-business' hot-spot operation. +;;;_ = allout-post-goto-bullet +(defvar allout-post-goto-bullet nil + "Outline internal var, for `allout-pre-command-business' hot-spot operation. When set, tells post-processing to reposition on topic bullet, and -then unset it. Set by outline-pre-command-business when implementing +then unset it. Set by allout-pre-command-business when implementing hot-spot operation, where literal characters typed over a topic bullet are mapped to the command of the corresponding control-key on the -outline-mode-map.") -(make-variable-buffer-local 'outline-post-goto-bullet) -;;;_ > outline-post-command-business () -(defun outline-post-command-business () +allout-mode-map.") +(make-variable-buffer-local 'allout-post-goto-bullet) +;;;_ > allout-post-command-business () +(defun allout-post-command-business () "Outline post-command-hook function. -- Null outline-override-protect, so it's not left open. - -- Implement (and clear) outline-post-goto-bullet, for hot-spot +- Null allout-override-protect, so it's not left open. + +- Implement (and clear) allout-post-goto-bullet, for hot-spot outline commands. - Massages buffer-undo-list so successive, standard character self-inserts are @@ -2285,14 +2285,14 @@ before-change-functions is used." ; Apply any external change func: - (if (not (outline-mode-p)) ; In outline-mode. + (if (not (allout-mode-p)) ; In allout-mode. nil - (setq outline-override-protect nil) - (if outline-isearch-dynamic-expose - (outline-isearch-rectification)) - (if outline-during-write-cue - ;; Was used by outline-before-change-protect, done with it now: - (setq outline-during-write-cue nil)) + (setq allout-override-protect nil) + (if allout-isearch-dynamic-expose + (allout-isearch-rectification)) + (if allout-during-write-cue + ;; Was used by allout-before-change-protect, done with it now: + (setq allout-during-write-cue nil)) ;; Undo bunching business: (if (and (listp buffer-undo-list) ; Undo history being kept. (equal this-command 'self-insert-command) @@ -2317,23 +2317,23 @@ (numberp (setq prev-from (car prev-cell))) (numberp (setq prev-to (cdr prev-cell))) ; Below threshold: - (> outline-undo-aggregation (- prev-to prev-from))) + (> allout-undo-aggregation (- prev-to prev-from))) (setq buffer-undo-list (cons (cons prev-from cur-to) (cdr (cdr (cdr buffer-undo-list)))))))) ;; Implement -post-goto-bullet, if set: (must be after undo business) - (if (and outline-post-goto-bullet - (outline-current-bullet-pos)) - (progn (goto-char (outline-current-bullet-pos)) - (setq outline-post-goto-bullet nil))) + (if (and allout-post-goto-bullet + (allout-current-bullet-pos)) + (progn (goto-char (allout-current-bullet-pos)) + (setq allout-post-goto-bullet nil))) )) -;;;_ > outline-pre-command-business () -(defun outline-pre-command-business () +;;;_ > allout-pre-command-business () +(defun allout-pre-command-business () "Outline pre-command-hook function for outline buffers. Implements special behavior when cursor is on bullet char. Self-insert characters are reinterpreted control-character references -into the outline-mode-map. The outline-mode post-command hook will +into the allout-mode-map. The allout-mode post-command hook will position a cursor that has moved as a result of such reinterpretation, on the destination topic's bullet, when the cursor wound up in the @@ -2343,16 +2343,16 @@ cursor-positioning command to relocate the cursor off of a bullet char." - (if (not (outline-mode-p)) - ;; Shouldn't be invoked if not in allout outline-mode, but just in case: + (if (not (allout-mode-p)) + ;; Shouldn't be invoked if not in allout allout-mode, but just in case: nil ;; Register isearch status: (if (and (boundp 'isearch-mode) isearch-mode) - (setq outline-pre-was-isearching t) - (setq outline-pre-was-isearching nil)) + (setq allout-pre-was-isearching t) + (setq allout-pre-was-isearching nil)) ;; Hot-spot navigation provisions: (if (and (eq this-command 'self-insert-command) - (eq (point)(outline-current-bullet-pos))) + (eq (point)(allout-current-bullet-pos))) (let* ((this-key-num (cond ((numberp last-command-char) last-command-char) @@ -2372,92 +2372,92 @@ (if (and (<= 64 this-key-num) (>= 96 this-key-num)) (setq mapped-binding - (lookup-key 'outline-mode-map - (concat outline-command-prefix + (lookup-key 'allout-mode-map + (concat allout-command-prefix (char-to-string (- this-key-num 64)))))) (if mapped-binding - (setq outline-post-goto-bullet t + (setq allout-post-goto-bullet t this-command mapped-binding))))))) -;;;_ > outline-find-file-hook () -(defun outline-find-file-hook () - "Activate outline-mode when `outline-auto-activation' & `outline-layout' are non-nil. - -See `outline-init' for setup instructions." - (if (and outline-auto-activation - (not (outline-mode-p)) - outline-layout) - (outline-mode t))) -;;;_ > outline-isearch-rectification -(defun outline-isearch-rectification () +;;;_ > allout-find-file-hook () +(defun allout-find-file-hook () + "Activate allout-mode when `allout-auto-activation' & `allout-layout' are non-nil. + +See `allout-init' for setup instructions." + (if (and allout-auto-activation + (not (allout-mode-p)) + allout-layout) + (allout-mode t))) +;;;_ > allout-isearch-rectification +(defun allout-isearch-rectification () "Rectify outline exposure before, during, or after isearch. -Called as part of outline-post-command-business." +Called as part of allout-post-command-business." (let ((isearching (and (boundp 'isearch-mode) isearch-mode))) - (cond ((and isearching (not outline-pre-was-isearching)) - (outline-isearch-expose 'start)) - ((and isearching outline-pre-was-isearching) - (outline-isearch-expose 'continue)) - ((and (not isearching) outline-pre-was-isearching) - (outline-isearch-expose 'final)) + (cond ((and isearching (not allout-pre-was-isearching)) + (allout-isearch-expose 'start)) + ((and isearching allout-pre-was-isearching) + (allout-isearch-expose 'continue)) + ((and (not isearching) allout-pre-was-isearching) + (allout-isearch-expose 'final)) ;; Not and wasn't isearching: - (t (setq outline-isearch-prior-pos nil) - (setq outline-isearch-did-quit nil))))) -;;;_ = outline-isearch-was-font-lock -(defvar outline-isearch-was-font-lock + (t (setq allout-isearch-prior-pos nil) + (setq allout-isearch-did-quit nil))))) +;;;_ = allout-isearch-was-font-lock +(defvar allout-isearch-was-font-lock (and (boundp 'font-lock-mode) font-lock-mode)) -;;;_ > outline-flag-region (from to flag) -(defmacro outline-flag-region (from to flag) +;;;_ > allout-flag-region (from to flag) +(defmacro allout-flag-region (from to flag) "Hide or show lines from FROM to TO, via emacs selective-display FLAG char. Ie, text following flag C-m \(carriage-return) is hidden until the next C-j (newline) char. Returns the endpoint of the region." `(let ((buffer-read-only nil) - (outline-override-protect t)) + (allout-override-protect t)) (subst-char-in-region ,from ,to (if (= ,flag ?\n) ?\r ?\n) ,flag t))) -;;;_ > outline-isearch-expose (mode) -(defun outline-isearch-expose (mode) +;;;_ > allout-isearch-expose (mode) +(defun allout-isearch-expose (mode) "Mode is either 'clear, 'start, 'continue, or 'final." - ;; outline-isearch-prior-pos encodes exposure status of prior pos: + ;; allout-isearch-prior-pos encodes exposure status of prior pos: ;; (pos was-vis header-pos end-pos) ;; pos - point of concern ;; was-vis - t, else 'topic if entire topic was exposed, 'entry otherwise ;; Do reclosure or prior pos, as necessary: (if (eq mode 'start) - (setq outline-isearch-was-font-lock (and (boundp 'font-lock-mode) + (setq allout-isearch-was-font-lock (and (boundp 'font-lock-mode) font-lock-mode) font-lock-mode nil) (if (eq mode 'final) - (setq font-lock-mode outline-isearch-was-font-lock)) - (if (and outline-isearch-prior-pos - (listp outline-isearch-prior-pos)) + (setq font-lock-mode allout-isearch-was-font-lock)) + (if (and allout-isearch-prior-pos + (listp allout-isearch-prior-pos)) ;; Conceal prior peek: - (outline-flag-region (car (cdr outline-isearch-prior-pos)) - (car (cdr (cdr outline-isearch-prior-pos))) + (allout-flag-region (car (cdr allout-isearch-prior-pos)) + (car (cdr (cdr allout-isearch-prior-pos))) ?\r))) - (if (outline-visible-p) - (setq outline-isearch-prior-pos nil) + (if (allout-visible-p) + (setq allout-isearch-prior-pos nil) (if (not (eq mode 'final)) - (setq outline-isearch-prior-pos (cons (point) (outline-show-entry))) - (if outline-isearch-did-quit + (setq allout-isearch-prior-pos (cons (point) (allout-show-entry))) + (if allout-isearch-did-quit nil - (setq outline-isearch-prior-pos nil) - (outline-show-children)))) - (setq outline-isearch-did-quit nil)) -;;;_ > outline-enwrap-isearch () -(defun outline-enwrap-isearch () - "Impose outline-mode isearch-abort wrapper for dynamic exposure in isearch. + (setq allout-isearch-prior-pos nil) + (allout-show-children)))) + (setq allout-isearch-did-quit nil)) +;;;_ > allout-enwrap-isearch () +(defun allout-enwrap-isearch () + "Impose allout-mode isearch-abort wrapper for dynamic exposure in isearch. The function checks to ensure that the rebinding is done only once." - (add-hook 'isearch-mode-end-hook 'outline-isearch-rectification) - (if (fboundp 'outline-real-isearch-abort) + (add-hook 'isearch-mode-end-hook 'allout-isearch-rectification) + (if (fboundp 'allout-real-isearch-abort) ;; nil ; Ensure load of isearch-mode: @@ -2471,56 +2471,56 @@ (car (cdr (cdr error)))) (sit-for 1) ;; Inhibit subsequent tries and return nil: - (setq outline-isearch-dynamic-expose nil)))) + (setq allout-isearch-dynamic-expose nil)))) ;; Isearch-mode loaded, encapsulate specific entry points for ;; outline dynamic-exposure business: (progn ;; stash crucial isearch-mode funcs under known, private ;; names, then register wrapper functions under the old ;; names, in their stead: - (fset 'outline-real-isearch-abort (symbol-function 'isearch-abort)) - (fset 'isearch-abort 'outline-isearch-abort))))) -;;;_ > outline-isearch-abort () -(defun outline-isearch-abort () - "Wrapper for outline-real-isearch-abort \(which see), to register + (fset 'allout-real-isearch-abort (symbol-function 'isearch-abort)) + (fset 'isearch-abort 'allout-isearch-abort))))) +;;;_ > allout-isearch-abort () +(defun allout-isearch-abort () + "Wrapper for allout-real-isearch-abort \(which see), to register actual quits." (interactive) - (setq outline-isearch-did-quit nil) + (setq allout-isearch-did-quit nil) (condition-case what - (outline-real-isearch-abort) - ('quit (setq outline-isearch-did-quit t) + (allout-real-isearch-abort) + ('quit (setq allout-isearch-did-quit t) (signal 'quit nil)))) ;;; Prevent unnecessary font-lock while isearching! (defvar isearch-was-font-locking nil) (defun isearch-inhibit-font-lock () "Inhibit font-lock while isearching - for use on isearch-mode-hook." - (if (and (outline-mode-p) (boundp 'font-lock-mode) font-lock-mode) + (if (and (allout-mode-p) (boundp 'font-lock-mode) font-lock-mode) (setq isearch-was-font-locking t font-lock-mode nil))) (add-hook 'isearch-mode-hook 'isearch-inhibit-font-lock) (defun isearch-reenable-font-lock () "Reenable font-lock after isearching - for use on isearch-mode-end-hook." (if (and (boundp 'font-lock-mode) font-lock-mode) - (if (and (outline-mode-p) isearch-was-font-locking) + (if (and (allout-mode-p) isearch-was-font-locking) (setq isearch-was-font-locking nil font-lock-mode t)))) (add-hook 'isearch-mode-end-hook 'isearch-reenable-font-lock) ;;;_ - Topic Format Assessment -;;;_ > outline-solicit-alternate-bullet (depth &optional current-bullet) -(defun outline-solicit-alternate-bullet (depth &optional current-bullet) +;;;_ > allout-solicit-alternate-bullet (depth &optional current-bullet) +(defun allout-solicit-alternate-bullet (depth &optional current-bullet) "Prompt for and return a bullet char as an alternative to the current one. Offer one suitable for current depth DEPTH as default." (let* ((default-bullet (or (and (stringp current-bullet) current-bullet) - (outline-bullet-for-depth depth))) - (sans-escapes (regexp-sans-escapes outline-bullets-string)) + (allout-bullet-for-depth depth))) + (sans-escapes (regexp-sans-escapes allout-bullets-string)) choice) (save-excursion - (goto-char (outline-current-bullet-pos)) + (goto-char (allout-current-bullet-pos)) (setq choice (solicit-char-in-string (format "Select bullet: %s ('%s' default): " sans-escapes @@ -2530,32 +2530,32 @@ (message "") (if (string= choice "") default-bullet choice)) ) -;;;_ > outline-distinctive-bullet (bullet) -(defun outline-distinctive-bullet (bullet) - "True if bullet is one of those on outline-distinctive-bullets-string." - (string-match (regexp-quote bullet) outline-distinctive-bullets-string)) -;;;_ > outline-numbered-type-prefix (&optional prefix) -(defun outline-numbered-type-prefix (&optional prefix) +;;;_ > allout-distinctive-bullet (bullet) +(defun allout-distinctive-bullet (bullet) + "True if bullet is one of those on allout-distinctive-bullets-string." + (string-match (regexp-quote bullet) allout-distinctive-bullets-string)) +;;;_ > allout-numbered-type-prefix (&optional prefix) +(defun allout-numbered-type-prefix (&optional prefix) "True if current header prefix bullet is numbered bullet." - (and outline-numbered-bullet - (string= outline-numbered-bullet + (and allout-numbered-bullet + (string= allout-numbered-bullet (if prefix - (outline-get-prefix-bullet prefix) - (outline-get-bullet))))) -;;;_ > outline-bullet-for-depth (&optional depth) -(defun outline-bullet-for-depth (&optional depth) + (allout-get-prefix-bullet prefix) + (allout-get-bullet))))) +;;;_ > allout-bullet-for-depth (&optional depth) +(defun allout-bullet-for-depth (&optional depth) "Return outline topic bullet suited to optional DEPTH, or current depth." ;; Find bullet in plain-bullets-string modulo DEPTH. - (if outline-stylish-prefixes - (char-to-string (aref outline-plain-bullets-string + (if allout-stylish-prefixes + (char-to-string (aref allout-plain-bullets-string (% (max 0 (- depth 2)) - outline-plain-bullets-string-len))) - outline-primary-bullet) + allout-plain-bullets-string-len))) + allout-primary-bullet) ) ;;;_ - Topic Production -;;;_ > outline-make-topic-prefix (&optional prior-bullet -(defun outline-make-topic-prefix (&optional prior-bullet +;;;_ > allout-make-topic-prefix (&optional prior-bullet +(defun allout-make-topic-prefix (&optional prior-bullet new depth solicit @@ -2572,7 +2572,7 @@ PRIOR-BULLET indicates the bullet of the prefix being changed, or nil if none. This bullet may be preserved (other options -notwithstanding) if it is on the outline-distinctive-bullets-string, +notwithstanding) if it is on the allout-distinctive-bullets-string, for instance. Second arg NEW indicates that a new topic is being opened after the @@ -2592,7 +2592,7 @@ including, eg, a distinctive PRIOR-BULLET.) If non-nil, then the context-specific bullet is used. -Fifth arg, NUMBER-CONTROL, matters only if `outline-numbered-bullet' +Fifth arg, NUMBER-CONTROL, matters only if `allout-numbered-bullet' is non-nil *and* soliciting was not explicitly invoked. Then NUMBER-CONTROL non-nil forces prefix to either numbered or denumbered format, depending on the value of the sixth arg, INDEX. @@ -2618,21 +2618,21 @@ (let* (body numbering denumbering - (depth (or depth (outline-depth))) - (header-lead outline-header-prefix) + (depth (or depth (allout-depth))) + (header-lead allout-header-prefix) (bullet-char ;; Getting value for bullet char is practically the whole job: (cond ; Simplest situation - level 1: - ((<= depth 1) (setq header-lead "") outline-primary-bullet) + ((<= depth 1) (setq header-lead "") allout-primary-bullet) ; Simple, too: all asterisks: - (outline-old-style-prefixes + (allout-old-style-prefixes ;; Cheat - make body the whole thing, null out header-lead and ;; bullet-char: (setq body (make-string depth - (string-to-char outline-primary-bullet))) + (string-to-char allout-primary-bullet))) (setq header-lead "") "") @@ -2643,67 +2643,67 @@ ((progn (setq body (make-string (- depth 2) ?\ )) ;; The actual condition: solicit) - (let* ((got (outline-solicit-alternate-bullet depth solicit))) + (let* ((got (allout-solicit-alternate-bullet depth solicit))) ;; Gotta check whether we're numbering and got a numbered bullet: - (setq numbering (and outline-numbered-bullet + (setq numbering (and allout-numbered-bullet (not (and number-control (not index))) - (string= got outline-numbered-bullet))) + (string= got allout-numbered-bullet))) ;; Now return what we got, regardless: got)) ;; Numbering invoked through args: - ((and outline-numbered-bullet number-control) + ((and allout-numbered-bullet number-control) (if (setq numbering (not (setq denumbering (not index)))) - outline-numbered-bullet + allout-numbered-bullet (if (and prior-bullet - (not (string= outline-numbered-bullet + (not (string= allout-numbered-bullet prior-bullet))) prior-bullet - (outline-bullet-for-depth depth)))) + (allout-bullet-for-depth depth)))) ;;; Neither soliciting nor controlled numbering ;;; ;;; (may be controlled denumbering, tho) ;;; ;; Check wrt previous sibling: ((and new ; only check for new prefixes - (<= depth (outline-depth)) - outline-numbered-bullet ; ... & numbering enabled + (<= depth (allout-depth)) + allout-numbered-bullet ; ... & numbering enabled (not denumbering) (let ((sibling-bullet (save-excursion ;; Locate correct sibling: - (or (>= depth (outline-depth)) - (outline-ascend-to-depth depth)) - (outline-get-bullet)))) + (or (>= depth (allout-depth)) + (allout-ascend-to-depth depth)) + (allout-get-bullet)))) (if (and sibling-bullet - (string= outline-numbered-bullet sibling-bullet)) + (string= allout-numbered-bullet sibling-bullet)) (setq numbering sibling-bullet))))) ;; Distinctive prior bullet? ((and prior-bullet - (outline-distinctive-bullet prior-bullet) + (allout-distinctive-bullet prior-bullet) ;; Either non-numbered: - (or (not (and outline-numbered-bullet - (string= prior-bullet outline-numbered-bullet))) + (or (not (and allout-numbered-bullet + (string= prior-bullet allout-numbered-bullet))) ;; or numbered, and not denumbering: (setq numbering (not denumbering))) ;; Here 'tis: prior-bullet)) ;; Else, standard bullet per depth: - ((outline-bullet-for-depth depth))))) + ((allout-bullet-for-depth depth))))) (concat header-lead body bullet-char (if numbering (format "%d" (cond ((and index (numberp index)) index) - (new (1+ (outline-sibling-index depth))) - ((outline-sibling-index)))))) + (new (1+ (allout-sibling-index depth))) + ((allout-sibling-index)))))) ) ) -;;;_ > outline-open-topic (relative-depth &optional before use_sib_bullet) -(defun outline-open-topic (relative-depth &optional before use_sib_bullet) +;;;_ > allout-open-topic (relative-depth &optional before use_sib_bullet) +(defun allout-open-topic (relative-depth &optional before use_sib_bullet) "Open a new topic at depth DEPTH. New topic is situated after current one, unless optional flag BEFORE @@ -2734,7 +2734,7 @@ having to go to its preceding sibling, and then open forward from there." - (let* ((depth (+ (outline-current-depth) relative-depth)) + (let* ((depth (+ (allout-current-depth) relative-depth)) (opening-on-blank (if (looking-at "^\$") (not (setq before nil)))) opening-numbered ; Will get while computing ref-topic, below @@ -2742,21 +2742,21 @@ ref-bullet ; Will get while computing ref-topic, next (ref-topic (save-excursion (cond ((< relative-depth 0) - (outline-ascend-to-depth depth)) + (allout-ascend-to-depth depth)) ((>= relative-depth 1) nil) - (t (outline-back-to-current-heading))) - (setq ref-depth (outline-recent-depth)) + (t (allout-back-to-current-heading))) + (setq ref-depth (allout-recent-depth)) (setq ref-bullet - (if (> outline-recent-prefix-end 1) - (outline-recent-bullet) + (if (> allout-recent-prefix-end 1) + (allout-recent-bullet) "")) (setq opening-numbered (save-excursion - (and outline-numbered-bullet + (and allout-numbered-bullet (or (<= relative-depth 0) - (outline-descend-to-depth depth)) - (if (outline-numbered-type-prefix) - outline-numbered-bullet)))) + (allout-descend-to-depth depth)) + (if (allout-numbered-type-prefix) + allout-numbered-bullet)))) (point))) dbl-space doing-beginning) @@ -2776,7 +2776,7 @@ (bobp))) (save-excursion ;; succeeded by a blank line? - (outline-end-of-current-subtree) + (allout-end-of-current-subtree) (bolp))) (and (= ref-depth 1) (or before @@ -2784,67 +2784,67 @@ (save-excursion ;; Don't already have following ;; vertical padding: - (not (outline-pre-next-preface))))))) + (not (allout-pre-next-preface))))))) ; Position to prior heading, ; if inserting backwards, and ; not going outwards: (if (and before (>= relative-depth 0)) - (progn (outline-back-to-current-heading) + (progn (allout-back-to-current-heading) (setq doing-beginning (bobp)) (if (not (bobp)) - (outline-previous-heading))) + (allout-previous-heading))) (if (and before (bobp)) - (outline-unprotected (open-line 1)))) + (allout-unprotected (open-line 1)))) (if (<= relative-depth 0) ;; Not going inwards, don't snug up: (if doing-beginning - (outline-unprotected (open-line (if dbl-space 2 1))) + (allout-unprotected (open-line (if dbl-space 2 1))) (if before (progn (end-of-line) - (outline-pre-next-preface) + (allout-pre-next-preface) (while (= ?\r (following-char)) (forward-char 1)) (if (not (looking-at "^$")) - (outline-unprotected (open-line 1)))) - (outline-end-of-current-subtree))) + (allout-unprotected (open-line 1)))) + (allout-end-of-current-subtree))) ;; Going inwards - double-space if first offspring is, ;; otherwise snug up. (end-of-line) ; So we skip any concealed progeny. - (outline-pre-next-preface) + (allout-pre-next-preface) (if (bolp) ;; Blank lines between current header body and next ;; header - get to last substantive (non-white-space) ;; line in body: (re-search-backward "[^ \t\n]" nil t)) (if (save-excursion - (outline-next-heading) - (if (> (outline-recent-depth) ref-depth) + (allout-next-heading) + (if (> (allout-recent-depth) ref-depth) ;; This is an offspring. (progn (forward-line -1) (looking-at "^\\s-*$")))) (progn (forward-line 1) - (outline-unprotected (open-line 1)))) + (allout-unprotected (open-line 1)))) (end-of-line)) ;;(if doing-beginning (goto-char doing-beginning)) (if (not (bobp)) (progn (if (and (not (> depth ref-depth)) (not before)) - (outline-unprotected (open-line 1)) + (allout-unprotected (open-line 1)) (if (> depth ref-depth) - (outline-unprotected (newline 1)) + (allout-unprotected (newline 1)) (if dbl-space - (outline-unprotected (open-line 1)) + (allout-unprotected (open-line 1)) (if (not before) - (outline-unprotected (newline 1)))))) + (allout-unprotected (newline 1)))))) (if dbl-space - (outline-unprotected (newline 1))) + (allout-unprotected (newline 1))) (if (and (not (eobp)) (not (bolp))) (forward-char 1)))) )) - (insert (concat (outline-make-topic-prefix opening-numbered + (insert (concat (allout-make-topic-prefix opening-numbered t depth) " ")) @@ -2852,7 +2852,7 @@ ;;(if doing-beginning (save-excursion (newline (if dbl-space 2 1)))) - (outline-rebullet-heading (and use_sib_bullet ref-bullet);;; solicit + (allout-rebullet-heading (and use_sib_bullet ref-bullet);;; solicit depth ;;; depth nil ;;; number-control nil ;;; index @@ -2872,16 +2872,16 @@ ;;;_ ; buffer boundaries - special provisions for beginning and end ob ;;;_ ; level 1 topics have special provisions also - double space. ;;;_ ; location of new topic -;;;_ > outline-open-subtopic (arg) -(defun outline-open-subtopic (arg) +;;;_ > allout-open-subtopic (arg) +(defun allout-open-subtopic (arg) "Open new topic header at deeper level than the current one. Negative universal arg means to open deeper, but place the new topic prior to the current one." (interactive "p") - (outline-open-topic 1 (> 0 arg))) -;;;_ > outline-open-sibtopic (arg) -(defun outline-open-sibtopic (arg) + (allout-open-topic 1 (> 0 arg))) +;;;_ > allout-open-sibtopic (arg) +(defun allout-open-sibtopic (arg) "Open new topic header at same level as the current one. Positive universal arg means to use the bullet of the prior sibling. @@ -2889,42 +2889,42 @@ Negative universal arg means to place the new topic prior to the current one." (interactive "p") - (outline-open-topic 0 (> 0 arg) (< 1 arg))) -;;;_ > outline-open-supertopic (arg) -(defun outline-open-supertopic (arg) + (allout-open-topic 0 (> 0 arg) (< 1 arg))) +;;;_ > allout-open-supertopic (arg) +(defun allout-open-supertopic (arg) "Open new topic header at shallower level than the current one. Negative universal arg means to open shallower, but place the new topic prior to the current one." (interactive "p") - (outline-open-topic -1 (> 0 arg))) + (allout-open-topic -1 (> 0 arg))) ;;;_ - Outline Alteration ;;;_ : Topic Modification -;;;_ = outline-former-auto-filler -(defvar outline-former-auto-filler nil - "Name of modal fill function being wrapped by outline-auto-fill.") -;;;_ > outline-auto-fill () -(defun outline-auto-fill () - "Outline-mode autofill function. +;;;_ = allout-former-auto-filler +(defvar allout-former-auto-filler nil + "Name of modal fill function being wrapped by allout-auto-fill.") +;;;_ > allout-auto-fill () +(defun allout-auto-fill () + "Allout-mode autofill function. Maintains outline hanging topic indentation if -`outline-use-hanging-indents' is set." - (let ((fill-prefix (if outline-use-hanging-indents +`allout-use-hanging-indents' is set." + (let ((fill-prefix (if allout-use-hanging-indents ;; Check for topic header indentation: (save-excursion (beginning-of-line) - (if (looking-at outline-regexp) + (if (looking-at allout-regexp) ;; ... construct indentation to account for ;; length of topic prefix: - (make-string (progn (outline-end-of-prefix) + (make-string (progn (allout-end-of-prefix) (current-column)) ?\ )))))) - (if (or outline-former-auto-filler outline-use-hanging-indents) + (if (or allout-former-auto-filler allout-use-hanging-indents) (do-auto-fill)))) -;;;_ > outline-reindent-body (old-depth new-depth &optional number) -(defun outline-reindent-body (old-depth new-depth &optional number) +;;;_ > allout-reindent-body (old-depth new-depth &optional number) +(defun allout-reindent-body (old-depth new-depth &optional number) "Reindent body lines which were indented at old-depth to new-depth. Optional arg NUMBER indicates numbering is being added, and it must @@ -2933,7 +2933,7 @@ Note that refill of indented paragraphs is not done." (save-excursion - (outline-end-of-prefix) + (allout-end-of-prefix) (let* ((new-margin (current-column)) excess old-indent-begin old-indent-end curr-ind @@ -2943,7 +2943,7 @@ (old-margin (+ old-depth (- new-margin new-depth)))) ;; Process lines up to (but excluding) next topic header: - (outline-unprotected + (allout-unprotected (save-match-data (while (and (re-search-forward "[\n\r]\\(\\s-*\\)" @@ -2953,7 +2953,7 @@ ;; match data with a subsequent `looking-at': (setq old-indent-begin (match-beginning 1) old-indent-end (match-end 1)) - (not (looking-at outline-regexp))) + (not (looking-at allout-regexp))) (if (> 0 (setq excess (- (current-column) old-margin))) ;; Text starts left of old margin - don't adjust: @@ -2963,18 +2963,18 @@ ;; beyond the old margin: (delete-region old-indent-begin old-indent-end) (indent-to (+ new-margin excess))))))))) -;;;_ > outline-rebullet-current-heading (arg) -(defun outline-rebullet-current-heading (arg) +;;;_ > allout-rebullet-current-heading (arg) +(defun allout-rebullet-current-heading (arg) "Solicit new bullet for current visible heading." (interactive "p") (let ((initial-col (current-column)) - (on-bullet (eq (point)(outline-current-bullet-pos))) + (on-bullet (eq (point)(allout-current-bullet-pos))) (backwards (if (< arg 0) (setq arg (* arg -1))))) (while (> arg 0) - (save-excursion (outline-back-to-current-heading) - (outline-end-of-prefix) - (outline-rebullet-heading t ;;; solicit + (save-excursion (allout-back-to-current-heading) + (allout-end-of-prefix) + (allout-rebullet-heading t ;;; solicit nil ;;; depth nil ;;; number-control nil ;;; index @@ -2984,14 +2984,14 @@ nil (setq initial-col nil) ; Override positioning back to init col (if (not backwards) - (outline-next-visible-heading 1) - (outline-goto-prefix) - (outline-next-visible-heading -1)))) + (allout-next-visible-heading 1) + (allout-goto-prefix) + (allout-next-visible-heading -1)))) (message "Done.") - (cond (on-bullet (goto-char (outline-current-bullet-pos))) + (cond (on-bullet (goto-char (allout-current-bullet-pos))) (initial-col (move-to-column initial-col))))) -;;;_ > outline-rebullet-heading (&optional solicit ...) -(defun outline-rebullet-heading (&optional solicit +;;;_ > allout-rebullet-heading (&optional solicit ...) +(defun allout-rebullet-heading (&optional solicit new-depth number-control index @@ -3011,7 +3011,7 @@ of the topic's current depth. Third arg NUMBER-CONTROL can force the prefix to or away from -numbered form. It has effect only if `outline-numbered-bullet' is +numbered form. It has effect only if `allout-numbered-bullet' is non-nil and soliciting was not explicitly invoked (via first arg). Its effect, numbering or denumbering, then depends on the setting of the forth arg, INDEX. @@ -3022,21 +3022,21 @@ non-nil NUMBER-CONTROL) forces a numbered-prefix form. If non-nil INDEX is a number, then that number is used for the numbered prefix. Non-nil and non-number means that the index for the -numbered prefix will be derived by outline-make-topic-prefix. +numbered prefix will be derived by allout-make-topic-prefix. Fifth arg DO-SUCCESSORS t means re-resolve count on succeeding siblings. -Cf vars `outline-stylish-prefixes', `outline-old-style-prefixes', -and `outline-numbered-bullet', which all affect the behavior of +Cf vars `allout-stylish-prefixes', `allout-old-style-prefixes', +and `allout-numbered-bullet', which all affect the behavior of this function." - (let* ((current-depth (outline-depth)) + (let* ((current-depth (allout-depth)) (new-depth (or new-depth current-depth)) - (mb outline-recent-prefix-beginning) - (me outline-recent-prefix-end) + (mb allout-recent-prefix-beginning) + (me allout-recent-prefix-end) (current-bullet (buffer-substring (- me 1) me)) - (new-prefix (outline-make-topic-prefix current-bullet + (new-prefix (allout-make-topic-prefix current-bullet nil new-depth solicit @@ -3052,44 +3052,44 @@ ;; New prefix probably different from old: ; get rid of old one: - (outline-unprotected (delete-region mb me)) + (allout-unprotected (delete-region mb me)) (goto-char mb) ; Dispense with number if ; numbered-bullet prefix: - (if (and outline-numbered-bullet - (string= outline-numbered-bullet current-bullet) + (if (and allout-numbered-bullet + (string= allout-numbered-bullet current-bullet) (looking-at "[0-9]+")) - (outline-unprotected + (allout-unprotected (delete-region (match-beginning 0)(match-end 0)))) ; Put in new prefix: - (outline-unprotected (insert new-prefix)) + (allout-unprotected (insert new-prefix)) ;; Reindent the body if elected and margin changed: - (if (and outline-reindent-bodies + (if (and allout-reindent-bodies (not (= new-depth current-depth))) - (outline-reindent-body current-depth new-depth)) + (allout-reindent-body current-depth new-depth)) ;; Recursively rectify successive siblings of orig topic if ;; caller elected for it: (if do-successors (save-excursion - (while (outline-next-sibling new-depth nil) + (while (allout-next-sibling new-depth nil) (setq index (cond ((numberp index) (1+ index)) - ((not number-control) (outline-sibling-index)))) - (if (outline-numbered-type-prefix) - (outline-rebullet-heading nil ;;; solicit + ((not number-control) (allout-sibling-index)))) + (if (allout-numbered-type-prefix) + (allout-rebullet-heading nil ;;; solicit new-depth ;;; new-depth number-control;;; number-control index ;;; index nil))))) ;;;(dont!)do-successors ) ; (if (and (= current-depth new-depth)...)) - ) ; let* ((current-depth (outline-depth))...) + ) ; let* ((current-depth (allout-depth))...) ) ; defun -;;;_ > outline-rebullet-topic (arg) -(defun outline-rebullet-topic (arg) - "Like outline-rebullet-topic-grunt, but start from topic visible at point. +;;;_ > allout-rebullet-topic (arg) +(defun allout-rebullet-topic (arg) + "Like allout-rebullet-topic-grunt, but start from topic visible at point. Descends into invisible as well as visible topics, however. @@ -3103,21 +3103,21 @@ ((listp arg) (setq arg (car arg)))) ;; Fill the user in, in case we're shifting a big topic: (if (not (zerop arg)) (message "Shifting...")) - (outline-back-to-current-heading) - (if (<= (+ (outline-recent-depth) arg) 0) + (allout-back-to-current-heading) + (if (<= (+ (allout-recent-depth) arg) 0) (error "Attempt to shift topic below level 1")) - (outline-rebullet-topic-grunt arg) + (allout-rebullet-topic-grunt arg) (if (not (zerop arg)) (message "Shifting... done."))) (move-to-column (max 0 (+ start-col arg))))) -;;;_ > outline-rebullet-topic-grunt (&optional relative-depth ...) -(defun outline-rebullet-topic-grunt (&optional relative-depth +;;;_ > allout-rebullet-topic-grunt (&optional relative-depth ...) +(defun allout-rebullet-topic-grunt (&optional relative-depth starting-depth starting-point index do-successors) "Rebullet the topic at point, visible or invisible, and all -contained subtopics. See outline-rebullet-heading for rebulleting +contained subtopics. See allout-rebullet-heading for rebulleting behavior. All arguments are optional. @@ -3129,7 +3129,7 @@ itself. The are STARTING-DEPTH, STARTING-POINT, and INDEX." (let* ((relative-depth (or relative-depth 0)) - (new-depth (outline-depth)) + (new-depth (allout-depth)) (starting-depth (or starting-depth new-depth)) (on-starting-call (null starting-point)) (index (or index @@ -3137,7 +3137,7 @@ ;; calculates it at what might be new depth: (and (or (zerop relative-depth) (not on-starting-call)) - (outline-sibling-index)))) + (allout-sibling-index)))) (moving-outwards (< 0 relative-depth)) (starting-point (or starting-point (point)))) @@ -3149,7 +3149,7 @@ (cond ((= starting-depth new-depth) ;; We're at depth to work on this one: - (outline-rebullet-heading nil ;;; solicit + (allout-rebullet-heading nil ;;; solicit (+ starting-depth ;;; starting-depth relative-depth) nil ;;; number @@ -3160,11 +3160,11 @@ nil) ;;; do-successors ;; ... and work on subsequent ones which are at greater depth: (setq index 0) - (outline-next-heading) + (allout-next-heading) (while (and (not (eobp)) - (< starting-depth (outline-recent-depth))) + (< starting-depth (allout-recent-depth))) (setq index (1+ index)) - (outline-rebullet-topic-grunt relative-depth ;;; relative-depth + (allout-rebullet-topic-grunt relative-depth ;;; relative-depth (1+ starting-depth);;;starting-depth starting-point ;;; starting-point index))) ;;; index @@ -3172,7 +3172,7 @@ ((< starting-depth new-depth) ;; Rare case - subtopic more than one level deeper than parent. ;; Treat this one at an even deeper level: - (outline-rebullet-topic-grunt relative-depth ;;; relative-depth + (allout-rebullet-topic-grunt relative-depth ;;; relative-depth new-depth ;;; starting-depth starting-point ;;; starting-point index))) ;;; index @@ -3183,19 +3183,19 @@ ;; if topic has changed depth (if (or do-successors (and (not (zerop relative-depth)) - (or (= (outline-recent-depth) starting-depth) - (= (outline-recent-depth) (+ starting-depth + (or (= (allout-recent-depth) starting-depth) + (= (allout-recent-depth) (+ starting-depth relative-depth))))) - (outline-rebullet-heading nil nil nil nil t)) + (allout-rebullet-heading nil nil nil nil t)) ;; Now rectify numbering of new siblings of the adjusted topic, ;; if depth has been changed: (progn (goto-char starting-point) (if (not (zerop relative-depth)) - (outline-rebullet-heading nil nil nil nil t))))) + (allout-rebullet-heading nil nil nil nil t))))) ) ) -;;;_ > outline-renumber-to-depth (&optional depth) -(defun outline-renumber-to-depth (&optional depth) +;;;_ > allout-renumber-to-depth (&optional depth) +(defun allout-renumber-to-depth (&optional depth) "Renumber siblings at current depth. Affects superior topics if optional arg DEPTH is less than current depth. @@ -3205,30 +3205,30 @@ ;; Proceed by level, processing subsequent siblings on each, ;; ascending until we get shallower than the start depth: - (let ((ascender (outline-depth)) + (let ((ascender (allout-depth)) was-eobp) (while (and (not (eobp)) - (outline-depth) - (>= (outline-recent-depth) depth) + (allout-depth) + (>= (allout-recent-depth) depth) (>= ascender depth)) ; Skip over all topics at ; lesser depths, which can not ; have been disturbed: (while (and (not (setq was-eobp (eobp))) - (> (outline-recent-depth) ascender)) - (outline-next-heading)) + (> (allout-recent-depth) ascender)) + (allout-next-heading)) ; Prime ascender for ascension: - (setq ascender (1- (outline-recent-depth))) - (if (>= (outline-recent-depth) depth) - (outline-rebullet-heading nil ;;; solicit + (setq ascender (1- (allout-recent-depth))) + (if (>= (allout-recent-depth) depth) + (allout-rebullet-heading nil ;;; solicit nil ;;; depth nil ;;; number-control nil ;;; index t)) ;;; do-successors (if was-eobp (goto-char (point-max))))) - (outline-recent-depth)) -;;;_ > outline-number-siblings (&optional denumber) -(defun outline-number-siblings (&optional denumber) + (allout-recent-depth)) +;;;_ > allout-number-siblings (&optional denumber) +(defun allout-number-siblings (&optional denumber) "Assign numbered topic prefix to this topic and its siblings. With universal argument, denumber - assign default bullet to this @@ -3240,44 +3240,44 @@ (interactive "P") (save-excursion - (outline-back-to-current-heading) - (outline-beginning-of-level) - (let ((depth (outline-recent-depth)) + (allout-back-to-current-heading) + (allout-beginning-of-level) + (let ((depth (allout-recent-depth)) (index (if (not denumber) 1)) (use-bullet (equal '(16) denumber)) (more t)) (while more - (outline-rebullet-heading use-bullet ;;; solicit + (allout-rebullet-heading use-bullet ;;; solicit depth ;;; depth t ;;; number-control index ;;; index nil) ;;; do-successors (if index (setq index (1+ index))) - (setq more (outline-next-sibling depth nil)))))) -;;;_ > outline-shift-in (arg) -(defun outline-shift-in (arg) + (setq more (allout-next-sibling depth nil)))))) +;;;_ > allout-shift-in (arg) +(defun allout-shift-in (arg) "Increase depth of current heading and any topics collapsed within it." (interactive "p") - (outline-rebullet-topic arg)) -;;;_ > outline-shift-out (arg) -(defun outline-shift-out (arg) + (allout-rebullet-topic arg)) +;;;_ > allout-shift-out (arg) +(defun allout-shift-out (arg) "Decrease depth of current heading and any topics collapsed within it." (interactive "p") - (outline-rebullet-topic (* arg -1))) + (allout-rebullet-topic (* arg -1))) ;;;_ : Surgery (kill-ring) functions with special provisions for outlines: -;;;_ > outline-kill-line (&optional arg) -(defun outline-kill-line (&optional arg) +;;;_ > allout-kill-line (&optional arg) +(defun allout-kill-line (&optional arg) "Kill line, adjusting subsequent lines suitably for outline mode." (interactive "*P") - (if (not (and (outline-mode-p) ; active outline mode, - outline-numbered-bullet ; numbers may need adjustment, + (if (not (and (allout-mode-p) ; active outline mode, + allout-numbered-bullet ; numbers may need adjustment, (bolp) ; may be clipping topic head, - (looking-at outline-regexp))) ; are clipping topic head. + (looking-at allout-regexp))) ; are clipping topic head. ;; Above conditions do not obtain - just do a regular kill: (kill-line arg) ;; Ah, have to watch out for adjustments: - (let* ((depth (outline-depth))) + (let* ((depth (allout-depth))) ; Do the kill: (kill-line arg) ; Provide some feedback: @@ -3285,11 +3285,11 @@ (save-excursion ; Start with the topic ; following killed line: - (if (not (looking-at outline-regexp)) - (outline-next-heading)) - (outline-renumber-to-depth depth))))) -;;;_ > outline-kill-topic () -(defun outline-kill-topic () + (if (not (looking-at allout-regexp)) + (allout-next-heading)) + (allout-renumber-to-depth depth))))) +;;;_ > allout-kill-topic () +(defun allout-kill-topic () "Kill topic together with subtopics. Leaves primary topic's trailing vertical whitespace, if any." @@ -3301,9 +3301,9 @@ ;; a lag *after* the kill has been performed. (interactive) - (let* ((beg (prog1 (outline-back-to-current-heading)(beginning-of-line))) - (depth (outline-recent-depth))) - (outline-end-of-current-subtree) + (let* ((beg (prog1 (allout-back-to-current-heading)(beginning-of-line))) + (depth (allout-recent-depth))) + (allout-end-of-current-subtree) (if (not (eobp)) (if (or (not (looking-at "^$")) ;; A blank line - cut it with this topic *unless* this @@ -3311,18 +3311,18 @@ ;; we'll leave the blank line as part of the ;; containing topic: (save-excursion - (and (outline-next-heading) - (>= (outline-recent-depth) depth)))) + (and (allout-next-heading) + (>= (allout-recent-depth) depth)))) (forward-char 1))) (kill-region beg (point)) (sit-for 0) (save-excursion - (outline-renumber-to-depth depth)))) -;;;_ > outline-yank-processing () -(defun outline-yank-processing (&optional arg) - - "Incidental outline-specific business to be done just after text yanks. + (allout-renumber-to-depth depth)))) +;;;_ > allout-yank-processing () +(defun allout-yank-processing (&optional arg) + + "Incidental allout-specific business to be done just after text yanks. Does depth adjustment of yanked topics, when: @@ -3338,7 +3338,7 @@ The point is left in front of yanked, adjusted topics, rather than at the end (and vice-versa with the mark). Non-adjusted yanks, -however, are left exactly like normal, non-outline-specific yanks." +however, are left exactly like normal, non-allout-specific yanks." (interactive "*P") ; Get to beginning, leaving @@ -3348,19 +3348,19 @@ (let* ((subj-beg (point)) (subj-end (my-mark-marker t)) ;; 'resituate' if yanking an entire topic into topic header: - (resituate (and (outline-e-o-prefix-p) - (looking-at (concat "\\(" outline-regexp "\\)")) - (outline-prefix-data (match-beginning 1) + (resituate (and (allout-e-o-prefix-p) + (looking-at (concat "\\(" allout-regexp "\\)")) + (allout-prefix-data (match-beginning 1) (match-end 1)))) ;; `rectify-numbering' if resituating (where several topics may ;; be resituating) or yanking a topic into a topic slot (bol): (rectify-numbering (or resituate - (and (bolp) (looking-at outline-regexp))))) + (and (bolp) (looking-at allout-regexp))))) (if resituate ; The yanked stuff is a topic: (let* ((prefix-len (- (match-end 1) subj-beg)) - (subj-depth (outline-recent-depth)) - (prefix-bullet (outline-recent-bullet)) + (subj-depth (allout-recent-depth)) + (prefix-bullet (allout-recent-bullet)) (adjust-to-depth ;; Nil if adjustment unnecessary, otherwise depth to which ;; adjustment should be made: @@ -3368,17 +3368,17 @@ (and (goto-char subj-end) (eolp) (goto-char subj-beg) - (and (looking-at outline-regexp) + (and (looking-at allout-regexp) (progn (beginning-of-line) (not (= (point) subj-beg))) - (looking-at outline-regexp) - (outline-prefix-data (match-beginning 0) + (looking-at allout-regexp) + (allout-prefix-data (match-beginning 0) (match-end 0))) - (outline-recent-depth)))) + (allout-recent-depth)))) done (more t)) - (setq rectify-numbering outline-numbered-bullet) + (setq rectify-numbering allout-numbered-bullet) (if adjust-to-depth ; Do the adjustment: (progn @@ -3389,20 +3389,20 @@ ; line at end, if any: (goto-char (point-max)) (if (looking-at "^$") - (outline-unprotected (delete-char -1))) + (allout-unprotected (delete-char -1))) ; Work backwards, with each ; shallowest level, ; successively excluding the ; last processed topic from ; the narrow region: (while more - (outline-back-to-current-heading) + (allout-back-to-current-heading) ; go as high as we can in each bunch: - (while (outline-ascend-to-depth (1- (outline-depth)))) + (while (allout-ascend-to-depth (1- (allout-depth)))) (save-excursion - (outline-rebullet-topic-grunt (- adjust-to-depth + (allout-rebullet-topic-grunt (- adjust-to-depth subj-depth)) - (outline-depth)) + (allout-depth)) (if (setq more (not (bobp))) (progn (widen) (forward-char -1) @@ -3411,7 +3411,7 @@ ;; Preserve new bullet if it's a distinctive one, otherwise ;; use old one: (if (string-match (regexp-quote prefix-bullet) - outline-distinctive-bullets-string) + allout-distinctive-bullets-string) ; Delete from bullet of old to ; before bullet of new: (progn @@ -3419,7 +3419,7 @@ (delete-region (point) subj-beg) (set-marker (my-mark-marker t) subj-end) (goto-char subj-beg) - (outline-end-of-prefix)) + (allout-end-of-prefix)) ; Delete base subj prefix, ; leaving old one: (delete-region (point) (+ (point) @@ -3437,25 +3437,25 @@ (message "... reconciling numbers") (sit-for 0) ; ... and renumber, in case necessary: (goto-char subj-beg) - (if (outline-goto-prefix) - (outline-rebullet-heading nil ;;; solicit - (outline-depth) ;;; depth + (if (allout-goto-prefix) + (allout-rebullet-heading nil ;;; solicit + (allout-depth) ;;; depth nil ;;; number-control nil ;;; index t)) (message "")))) (if (not resituate) (exchange-point-and-mark)))) -;;;_ > outline-yank (&optional arg) -(defun outline-yank (&optional arg) - "Outline-mode yank, with depth and numbering adjustment of yanked topics. +;;;_ > allout-yank (&optional arg) +(defun allout-yank (&optional arg) + "Allout-mode yank, with depth and numbering adjustment of yanked topics. Non-topic yanks work no differently than normal yanks. If a topic is being yanked into a bare topic prefix, the depth of the yanked topic is adjusted to the depth of the topic prefix. - 1 we're yanking in an outline-mode buffer + 1 we're yanking in an allout-mode buffer 2 the stuff being yanked starts with a valid outline header prefix, and 3 it is being yanked at the end of a line which consists of only a valid topic prefix. @@ -3472,17 +3472,17 @@ Numbering of yanked topics, and the successive siblings at the depth into which they're being yanked, is adjusted. -Outline-yank-pop works with outline-yank just like normal yank-pop +Allout-yank-pop works with allout-yank just like normal yank-pop works with normal yank in non-outline buffers." (interactive "*P") (setq this-command 'yank) (yank arg) - (if (outline-mode-p) - (outline-yank-processing))) -;;;_ > outline-yank-pop (&optional arg) -(defun outline-yank-pop (&optional arg) - "Yank-pop like outline-yank when popping to bare outline prefixes. + (if (allout-mode-p) + (allout-yank-processing))) +;;;_ > allout-yank-pop (&optional arg) +(defun allout-yank-pop (&optional arg) + "Yank-pop like allout-yank when popping to bare outline prefixes. Adapts level of popped topics to level of fresh prefix. @@ -3492,26 +3492,26 @@ (interactive "*p") (setq this-command 'yank) (yank-pop arg) - (if (outline-mode-p) - (outline-yank-processing))) + (if (allout-mode-p) + (allout-yank-processing))) ;;;_ - Specialty bullet functions ;;;_ : File Cross references -;;;_ > outline-resolve-xref () -(defun outline-resolve-xref () +;;;_ > allout-resolve-xref () +(defun allout-resolve-xref () "Pop to file associated with current heading, if it has an xref bullet. -\(Works according to setting of `outline-file-xref-bullet')." +\(Works according to setting of `allout-file-xref-bullet')." (interactive) - (if (not outline-file-xref-bullet) + (if (not allout-file-xref-bullet) (error - "outline cross references disabled - no `outline-file-xref-bullet'") - (if (not (string= (outline-current-bullet) outline-file-xref-bullet)) + "outline cross references disabled - no `allout-file-xref-bullet'") + (if (not (string= (allout-current-bullet) allout-file-xref-bullet)) (error "current heading lacks cross-reference bullet `%s'" - outline-file-xref-bullet) + allout-file-xref-bullet) (let (file-name) (save-excursion - (let* ((text-start outline-recent-prefix-end) + (let* ((text-start allout-recent-prefix-end) (heading-end (progn (end-of-line) (point)))) (goto-char text-start) (setq file-name @@ -3542,48 +3542,48 @@ ;;;_ #6 Exposure Control ;;;_ - Fundamental -;;;_ > outline-flag-current-subtree (flag) -(defun outline-flag-current-subtree (flag) +;;;_ > allout-flag-current-subtree (flag) +(defun allout-flag-current-subtree (flag) "Hide or show subtree of currently-visible topic. -See `outline-flag-region' for more details." +See `allout-flag-region' for more details." (save-excursion - (outline-back-to-current-heading) - (outline-flag-region (point) - (progn (outline-end-of-current-subtree) (1- (point))) + (allout-back-to-current-heading) + (allout-flag-region (point) + (progn (allout-end-of-current-subtree) (1- (point))) flag))) ;;;_ - Topic-specific -;;;_ > outline-show-entry () -(defun outline-show-entry () - "Like `outline-show-current-entry', reveals entries nested in hidden topics. +;;;_ > allout-show-entry () +(defun allout-show-entry () + "Like `allout-show-current-entry', reveals entries nested in hidden topics. This is a way to give restricted peek at a concealed locality without the expense of exposing its context, but can leave the outline with aberrant -exposure. outline-hide-current-entry-completely or outline-show-offshoot +exposure. allout-hide-current-entry-completely or allout-show-offshoot should be used after the peek to rectify the exposure." (interactive) (save-excursion (let ((at (point)) beg end) - (outline-goto-prefix) + (allout-goto-prefix) (setq beg (if (= (preceding-char) ?\r) (1- (point)) (point))) (re-search-forward "[\n\r]" nil t) (setq end (1- (if (< at (point)) ;; We're on topic head line - show only it: (point) ;; or we're in body - include it: - (max beg (or (outline-pre-next-preface) (point)))))) - (outline-flag-region beg end ?\n) + (max beg (or (allout-pre-next-preface) (point)))))) + (allout-flag-region beg end ?\n) (list beg end)))) -;;;_ > outline-show-children (&optional level strict) -(defun outline-show-children (&optional level strict) +;;;_ > allout-show-children (&optional level strict) +(defun allout-show-children (&optional level strict) "If point is visible, show all direct subheadings of this heading. -Otherwise, do outline-show-to-offshoot, and then show subheadings. +Otherwise, do allout-show-to-offshoot, and then show subheadings. Optional LEVEL specifies how many levels below the current level should be shown, or all levels if t. Default is 1. @@ -3599,61 +3599,61 @@ (interactive "p") (let (max-pos) (if (and (not strict) - (outline-hidden-p)) - - (progn (outline-show-to-offshoot) ; Point's concealed, open to + (allout-hidden-p)) + + (progn (allout-show-to-offshoot) ; Point's concealed, open to ; expose it. ;; Then recurse, but with "strict" set so we don't ;; infinite regress: - (setq max-pos (outline-show-children level t))) + (setq max-pos (allout-show-children level t))) (save-excursion (save-restriction (let* ((start-pt (point)) - (chart (outline-chart-subtree (or level 1))) - (to-reveal (outline-chart-to-reveal chart (or level 1)))) + (chart (allout-chart-subtree (or level 1))) + (to-reveal (allout-chart-to-reveal chart (or level 1)))) (goto-char start-pt) (if (and strict (= (preceding-char) ?\r)) ;; Concealed root would already have been taken care of, ;; unless strict was set. (progn - (outline-flag-region (point) (outline-snug-back) ?\n) - (if outline-show-bodies + (allout-flag-region (point) (allout-snug-back) ?\n) + (if allout-show-bodies (progn (goto-char (car to-reveal)) - (outline-show-current-entry))))) + (allout-show-current-entry))))) (while to-reveal (goto-char (car to-reveal)) - (outline-flag-region (point) (outline-snug-back) ?\n) - (if outline-show-bodies + (allout-flag-region (point) (allout-snug-back) ?\n) + (if allout-show-bodies (progn (goto-char (car to-reveal)) - (outline-show-current-entry))) + (allout-show-current-entry))) (setq to-reveal (cdr to-reveal))))))))) -;;;_ > outline-hide-point-reconcile () -(defun outline-hide-reconcile () - "Like `outline-hide-current-entry'; hides completely if within hidden region. +;;;_ > allout-hide-point-reconcile () +(defun allout-hide-reconcile () + "Like `allout-hide-current-entry'; hides completely if within hidden region. Specifically intended for aberrant exposure states, like entries that were -exposed by outline-show-entry but are within otherwise concealed regions." +exposed by allout-show-entry but are within otherwise concealed regions." (interactive) (save-excursion - (outline-goto-prefix) - (outline-flag-region (if (not (bobp)) (1- (point)) (point)) - (progn (outline-pre-next-preface) + (allout-goto-prefix) + (allout-flag-region (if (not (bobp)) (1- (point)) (point)) + (progn (allout-pre-next-preface) (if (= ?\r (following-char)) (point) (1- (point)))) ?\r))) -;;;_ > outline-show-to-offshoot () -(defun outline-show-to-offshoot () - "Like outline-show-entry, but reveals all concealed ancestors, as well. - -As with outline-hide-current-entry-completely, useful for rectifying -aberrant exposure states produced by outline-show-entry." +;;;_ > allout-show-to-offshoot () +(defun allout-show-to-offshoot () + "Like allout-show-entry, but reveals all concealed ancestors, as well. + +As with allout-hide-current-entry-completely, useful for rectifying +aberrant exposure states produced by allout-show-entry." (interactive) (save-excursion (let ((orig-pt (point)) - (orig-pref (outline-goto-prefix)) + (orig-pref (allout-goto-prefix)) (last-at (point)) bag-it) (while (or bag-it (= (preceding-char) ?\r)) @@ -3662,74 +3662,74 @@ ;; Oops, we're not making any progress! Show the current ;; topic completely, and bag this try. (progn (beginning-of-line) - (outline-show-current-subtree) + (allout-show-current-subtree) (goto-char orig-pt) (setq bag-it t) (beep) (message "%s: %s" - "outline-show-to-offshoot: " + "allout-show-to-offshoot: " "Aberrant nesting encountered."))) - (outline-show-children) + (allout-show-children) (goto-char orig-pref)) (goto-char orig-pt))) - (if (outline-hidden-p) - (outline-show-entry))) -;;;_ > outline-hide-current-entry () -(defun outline-hide-current-entry () + (if (allout-hidden-p) + (allout-show-entry))) +;;;_ > allout-hide-current-entry () +(defun allout-hide-current-entry () "Hide the body directly following this heading." (interactive) - (outline-back-to-current-heading) + (allout-back-to-current-heading) (save-excursion - (outline-flag-region (point) - (progn (outline-end-of-current-entry) (point)) + (allout-flag-region (point) + (progn (allout-end-of-current-entry) (point)) ?\r))) -;;;_ > outline-show-current-entry (&optional arg) -(defun outline-show-current-entry (&optional arg) +;;;_ > allout-show-current-entry (&optional arg) +(defun allout-show-current-entry (&optional arg) "Show body following current heading, or hide the entry if repeat count." (interactive "P") (if arg - (outline-hide-current-entry) + (allout-hide-current-entry) (save-excursion - (outline-flag-region (point) - (progn (outline-end-of-current-entry) (point)) + (allout-flag-region (point) + (progn (allout-end-of-current-entry) (point)) ?\n)))) -;;;_ > outline-hide-current-entry-completely () -; ... outline-hide-current-entry-completely also for isearch dynamic exposure: -(defun outline-hide-current-entry-completely () - "Like outline-hide-current-entry, but conceal topic completely. +;;;_ > allout-hide-current-entry-completely () +; ... allout-hide-current-entry-completely also for isearch dynamic exposure: +(defun allout-hide-current-entry-completely () + "Like allout-hide-current-entry, but conceal topic completely. Specifically intended for aberrant exposure states, like entries that were -exposed by outline-show-entry but are within otherwise concealed regions." +exposed by allout-show-entry but are within otherwise concealed regions." (interactive) (save-excursion - (outline-goto-prefix) - (outline-flag-region (if (not (bobp)) (1- (point)) (point)) - (progn (outline-pre-next-preface) + (allout-goto-prefix) + (allout-flag-region (if (not (bobp)) (1- (point)) (point)) + (progn (allout-pre-next-preface) (if (= ?\r (following-char)) (point) (1- (point)))) ?\r))) -;;;_ > outline-show-current-subtree (&optional arg) -(defun outline-show-current-subtree (&optional arg) +;;;_ > allout-show-current-subtree (&optional arg) +(defun allout-show-current-subtree (&optional arg) "Show everything within the current topic. With a repeat-count, expose this topic and its siblings." (interactive "P") (save-excursion - (if (<= (outline-current-depth) 0) + (if (<= (allout-current-depth) 0) ;; Outside any topics - try to get to the first: - (if (not (outline-next-heading)) + (if (not (allout-next-heading)) (error "No topics") ;; got to first, outermost topic - set to expose it and siblings: (message "Above outermost topic - exposing all.") - (outline-flag-region (point-min)(point-max) ?\n)) + (allout-flag-region (point-min)(point-max) ?\n)) (if (not arg) - (outline-flag-current-subtree ?\n) - (outline-beginning-of-level) - (outline-expose-topic '(* :)))))) -;;;_ > outline-hide-current-subtree (&optional just-close) -(defun outline-hide-current-subtree (&optional just-close) + (allout-flag-current-subtree ?\n) + (allout-beginning-of-level) + (allout-expose-topic '(* :)))))) +;;;_ > allout-hide-current-subtree (&optional just-close) +(defun allout-hide-current-subtree (&optional just-close) "Close the current topic, or containing topic if this one is already closed. If this topic is closed and it's a top level topic, close this topic @@ -3741,10 +3741,10 @@ (interactive) (let ((from (point)) (orig-eol (progn (end-of-line) - (if (not (outline-goto-prefix)) + (if (not (allout-goto-prefix)) (error "No topics found") (end-of-line)(point))))) - (outline-flag-current-subtree ?\r) + (allout-flag-current-subtree ?\r) (goto-char from) (if (and (= orig-eol (progn (goto-char orig-eol) (end-of-line) @@ -3752,66 +3752,66 @@ (not just-close) ;; Structure didn't change - try hiding current level: (goto-char from) - (if (outline-up-current-level 1 t) + (if (allout-up-current-level 1 t) t (goto-char 0) (let ((msg "Top-level topic already closed - closing siblings...")) (message msg) - (outline-expose-topic '(0 :)) + (allout-expose-topic '(0 :)) (message (concat msg " Done."))) nil) - (/= (outline-recent-depth) 0)) - (outline-hide-current-subtree)) + (/= (allout-recent-depth) 0)) + (allout-hide-current-subtree)) (goto-char from))) -;;;_ > outline-show-current-branches () -(defun outline-show-current-branches () +;;;_ > allout-show-current-branches () +(defun allout-show-current-branches () "Show all subheadings of this heading, but not their bodies." (interactive) (beginning-of-line) - (outline-show-children t)) -;;;_ > outline-hide-current-leaves () -(defun outline-hide-current-leaves () + (allout-show-children t)) +;;;_ > allout-hide-current-leaves () +(defun allout-hide-current-leaves () "Hide the bodies of the current topic and all its offspring." (interactive) - (outline-back-to-current-heading) - (outline-hide-region-body (point) (progn (outline-end-of-current-subtree) + (allout-back-to-current-heading) + (allout-hide-region-body (point) (progn (allout-end-of-current-subtree) (point)))) ;;;_ - Region and beyond -;;;_ > outline-show-all () -(defun outline-show-all () +;;;_ > allout-show-all () +(defun allout-show-all () "Show all of the text in the buffer." (interactive) (message "Exposing entire buffer...") - (outline-flag-region (point-min) (point-max) ?\n) + (allout-flag-region (point-min) (point-max) ?\n) (message "Exposing entire buffer... Done.")) -;;;_ > outline-hide-bodies () -(defun outline-hide-bodies () +;;;_ > allout-hide-bodies () +(defun allout-hide-bodies () "Hide all of buffer except headings." (interactive) - (outline-hide-region-body (point-min) (point-max))) -;;;_ > outline-hide-region-body (start end) -(defun outline-hide-region-body (start end) + (allout-hide-region-body (point-min) (point-max))) +;;;_ > allout-hide-region-body (start end) +(defun allout-hide-region-body (start end) "Hide all body lines in the region, but not headings." (save-excursion (save-restriction (narrow-to-region start end) (goto-char (point-min)) (while (not (eobp)) - (outline-flag-region (point) - (progn (outline-pre-next-preface) (point)) ?\r) + (allout-flag-region (point) + (progn (allout-pre-next-preface) (point)) ?\r) (if (not (eobp)) (forward-char (if (looking-at "[\n\r][\n\r]") 2 1))))))) -;;;_ > outline-expose-topic (spec) -(defun outline-expose-topic (spec) +;;;_ > allout-expose-topic (spec) +(defun allout-expose-topic (spec) "Apply exposure specs to successive outline topic items. -Use the more convenient frontend, `outline-new-exposure', if you don't -need evaluation of the arguments, or even better, the `outline-layout' +Use the more convenient frontend, `allout-new-exposure', if you don't +need evaluation of the arguments, or even better, the `allout-layout' variable-keyed mode-activation/auto-exposure feature of allout outline mode. See the respective documentation strings for more details. @@ -3851,15 +3851,15 @@ - - exposes the body of the corresponding topic. Examples: -\(outline-expose-topic '(-1 : 0)) +\(allout-expose-topic '(-1 : 0)) Close this and all following topics at current level, exposing only their immediate children, but close down the last topic at this current level completely. -\(outline-expose-topic '(-1 () : 1 0)) +\(allout-expose-topic '(-1 () : 1 0)) Close current topic so only the immediate subtopics are shown; show the children in the second to last topic, and completely close the last one. -\(outline-expose-topic '(-2 : -1 *)) +\(allout-expose-topic '(-2 : -1 *)) Expose children and grandchildren of all topics at current level except the last two; expose children of the second to last and completely open the last one." @@ -3867,7 +3867,7 @@ (interactive "xExposure spec: ") (if (not (listp spec)) nil - (let ((depth (outline-depth)) + (let ((depth (allout-depth)) (max-pos 0) prev-elem curr-elem stay done @@ -3880,53 +3880,53 @@ (cond ; Do current element: ((null curr-elem) nil) ((symbolp curr-elem) - (cond ((eq curr-elem '*) (outline-show-current-subtree) - (if (> outline-recent-end-of-subtree max-pos) - (setq max-pos outline-recent-end-of-subtree))) - ((eq curr-elem '+) (outline-show-current-branches) - (if (> outline-recent-end-of-subtree max-pos) - (setq max-pos outline-recent-end-of-subtree))) - ((eq curr-elem '-) (outline-show-current-entry)) + (cond ((eq curr-elem '*) (allout-show-current-subtree) + (if (> allout-recent-end-of-subtree max-pos) + (setq max-pos allout-recent-end-of-subtree))) + ((eq curr-elem '+) (allout-show-current-branches) + (if (> allout-recent-end-of-subtree max-pos) + (setq max-pos allout-recent-end-of-subtree))) + ((eq curr-elem '-) (allout-show-current-entry)) ((eq curr-elem ':) (setq stay t) ;; Expand the `repeat' spec to an explicit version, ;; w.r.t. remaining siblings: (let ((residue ; = # of sibs not covered by remaining spec ;; Dang - could be nice to make use of the chart, sigh: - (- (length (outline-chart-siblings)) + (- (length (allout-chart-siblings)) (length spec)))) (if (< 0 residue) ;; Some residue - cover it with prev-elem: (setq spec (append (make-list residue prev-elem) spec))))))) ((numberp curr-elem) - (if (and (>= 0 curr-elem) (outline-visible-p)) - (save-excursion (outline-hide-current-subtree t) + (if (and (>= 0 curr-elem) (allout-visible-p)) + (save-excursion (allout-hide-current-subtree t) (if (> 0 curr-elem) nil - (if (> outline-recent-end-of-subtree max-pos) + (if (> allout-recent-end-of-subtree max-pos) (setq max-pos - outline-recent-end-of-subtree))))) + allout-recent-end-of-subtree))))) (if (> (abs curr-elem) 0) - (progn (outline-show-children (abs curr-elem)) - (if (> outline-recent-end-of-subtree max-pos) - (setq max-pos outline-recent-end-of-subtree))))) + (progn (allout-show-children (abs curr-elem)) + (if (> allout-recent-end-of-subtree max-pos) + (setq max-pos allout-recent-end-of-subtree))))) ((listp curr-elem) - (if (outline-descend-to-depth (1+ depth)) - (let ((got (outline-expose-topic curr-elem))) + (if (allout-descend-to-depth (1+ depth)) + (let ((got (allout-expose-topic curr-elem))) (if (and got (> got max-pos)) (setq max-pos got)))))) (cond (stay (setq stay nil)) ((listp (car spec)) nil) ((> max-pos (point)) ;; Capitalize on max-pos state to get us nearer next sibling: (progn (goto-char (min (point-max) max-pos)) - (outline-next-heading))) - ((outline-next-sibling depth)))) + (allout-next-heading))) + ((allout-next-sibling depth)))) max-pos))) -;;;_ > outline-old-expose-topic (spec &rest followers) -(defun outline-old-expose-topic (spec &rest followers) - - "Deprecated. Use outline-expose-topic \(with different schema +;;;_ > allout-old-expose-topic (spec &rest followers) +(defun allout-old-expose-topic (spec &rest followers) + + "Deprecated. Use allout-expose-topic \(with different schema format) instead. Dictate wholesale exposure scheme for current topic, according to SPEC. @@ -3959,17 +3959,17 @@ Optional FOLLOWER arguments dictate exposure for succeeding siblings." (interactive "xExposure spec: ") - (let ((depth (outline-current-depth)) + (let ((depth (allout-current-depth)) done max-pos) (cond ((null spec) nil) ((symbolp spec) - (if (eq spec '*) (outline-show-current-subtree)) - (if (eq spec '+) (outline-show-current-branches)) - (if (eq spec '-) (outline-show-current-entry))) + (if (eq spec '*) (allout-show-current-subtree)) + (if (eq spec '+) (allout-show-current-branches)) + (if (eq spec '-) (allout-show-current-entry))) ((numberp spec) (if (>= 0 spec) - (save-excursion (outline-hide-current-subtree t) + (save-excursion (allout-hide-current-subtree t) (end-of-line) (if (or (not max-pos) (> (point) max-pos)) @@ -3977,19 +3977,19 @@ (if (> 0 spec) (setq spec (* -1 spec))))) (if (> spec 0) - (outline-show-children spec))) + (allout-show-children spec))) ((listp spec) - ;(let ((got (outline-old-expose-topic (car spec)))) + ;(let ((got (allout-old-expose-topic (car spec)))) ; (if (and got (or (not max-pos) (> got max-pos))) ; (setq max-pos got))) - (let ((new-depth (+ (outline-current-depth) 1)) + (let ((new-depth (+ (allout-current-depth) 1)) got) - (setq max-pos (outline-old-expose-topic (car spec))) + (setq max-pos (allout-old-expose-topic (car spec))) (setq spec (cdr spec)) (if (and spec - (outline-descend-to-depth new-depth) - (not (outline-hidden-p))) - (progn (setq got (apply 'outline-old-expose-topic spec)) + (allout-descend-to-depth new-depth) + (not (allout-hidden-p))) + (progn (setq got (apply 'allout-old-expose-topic spec)) (if (and got (or (not max-pos) (> got max-pos))) (setq max-pos got))))))) (while (and followers @@ -3997,57 +3997,57 @@ (progn (goto-char max-pos) (setq max-pos nil))) (end-of-line) - (outline-next-sibling depth))) - (outline-old-expose-topic (car followers)) + (allout-next-sibling depth))) + (allout-old-expose-topic (car followers)) (setq followers (cdr followers))) max-pos)) -;;;_ > outline-new-exposure '() -(defmacro outline-new-exposure (&rest spec) - "Literal frontend for `outline-expose-topic', doesn't evaluate arguments. -Some arguments that would need to be quoted in outline-expose-topic -need not be quoted in outline-new-exposure. +;;;_ > allout-new-exposure '() +(defmacro allout-new-exposure (&rest spec) + "Literal frontend for `allout-expose-topic', doesn't evaluate arguments. +Some arguments that would need to be quoted in allout-expose-topic +need not be quoted in allout-new-exposure. Cursor is left at start position. -Use this instead of obsolete `outline-exposure'. +Use this instead of obsolete `allout-exposure'. Examples: -\(outline-exposure (-1 () () () 1) 0) +\(allout-exposure (-1 () () () 1) 0) Close current topic at current level so only the immediate subtopics are shown, except also show the children of the third subtopic; and close the next topic at the current level. -\(outline-exposure : -1 0) +\(allout-exposure : -1 0) Close all topics at current level to expose only their immediate children, except for the last topic at the current level, in which even its immediate children are hidden. -\(outline-exposure -2 : -1 *) +\(allout-exposure -2 : -1 *) Expose children and grandchildren of first topic at current level, and expose children of subsequent topics at current level *except* for the last, which should be opened completely." (list 'save-excursion - '(if (not (or (outline-goto-prefix) - (outline-next-heading))) - (error "outline-new-exposure: Can't find any outline topics")) - (list 'outline-expose-topic (list 'quote spec)))) -;;;_ > outline-exposure '() -(defmacro outline-exposure (&rest spec) - "Being deprecated - use more recent `outline-new-exposure' instead. - -Literal frontend for `outline-old-expose-topic', doesn't evaluate arguments + '(if (not (or (allout-goto-prefix) + (allout-next-heading))) + (error "allout-new-exposure: Can't find any outline topics")) + (list 'allout-expose-topic (list 'quote spec)))) +;;;_ > allout-exposure '() +(defmacro allout-exposure (&rest spec) + "Being deprecated - use more recent `allout-new-exposure' instead. + +Literal frontend for `allout-old-expose-topic', doesn't evaluate arguments and retains start position." (list 'save-excursion - '(if (not (or (outline-goto-prefix) - (outline-next-heading))) + '(if (not (or (allout-goto-prefix) + (allout-next-heading))) (error "Can't find any outline topics")) - (cons 'outline-old-expose-topic + (cons 'allout-old-expose-topic (mapcar (function (lambda (x) (list 'quote x))) spec)))) ;;;_ #7 Systematic outline presentation - copying, printing, flattening ;;;_ - Mapping and processing of topics ;;;_ ( See also Subtree Charting, in Navigation code.) -;;;_ > outline-stringify-flat-index (flat-index) -(defun outline-stringify-flat-index (flat-index &optional context) +;;;_ > allout-stringify-flat-index (flat-index) +(defun allout-stringify-flat-index (flat-index &optional context) "Convert list representing section/subsection/... to document string. Optional arg CONTEXT indicates interior levels to include." @@ -4080,8 +4080,8 @@ ;; Dispose of single extra delim: (setq result (cdr result)))) (apply 'concat result))) -;;;_ > outline-stringify-flat-index-plain (flat-index) -(defun outline-stringify-flat-index-plain (flat-index) +;;;_ > allout-stringify-flat-index-plain (flat-index) +(defun allout-stringify-flat-index-plain (flat-index) "Convert list representing section/subsection/... to document string." (let ((delim ".") result) @@ -4091,8 +4091,8 @@ (cons delim result)))) (setq flat-index (cdr flat-index))) (apply 'concat result))) -;;;_ > outline-stringify-flat-index-indented (flat-index) -(defun outline-stringify-flat-index-indented (flat-index) +;;;_ > allout-stringify-flat-index-indented (flat-index) +(defun allout-stringify-flat-index-indented (flat-index) "Convert list representing section/subsection/... to document string." (let ((delim ".") result @@ -4120,12 +4120,12 @@ ;; Dispose of single extra delim: (setq result (cdr result)))) (apply 'concat result))) -;;;_ > outline-listify-exposed (&optional start end format) -(defun outline-listify-exposed (&optional start end format) +;;;_ > allout-listify-exposed (&optional start end format) +(defun allout-listify-exposed (&optional start end format) "Produce a list representing exposed topics in current region. -This list can then be used by `outline-process-exposed' to manipulate +This list can then be used by `allout-process-exposed' to manipulate the subject region. Optional START and END indicate bounds of region. @@ -4158,20 +4158,20 @@ (goto-char start) (beginning-of-line) ;; Goto initial topic, and register preceeding stuff, if any: - (if (> (outline-goto-prefix) start) + (if (> (allout-goto-prefix) start) ;; First topic follows beginning point - register preliminary stuff: (setq result (list (list 0 "" nil (buffer-substring start (1- (point))))))) (while (and (not done) (not (eobp)) ; Loop until we've covered the region. (not (> (point) end))) - (setq depth (outline-recent-depth) ; Current topics depth, - bullet (outline-recent-bullet) ; ... bullet, - prefix (outline-recent-prefix) - beg (progn (outline-end-of-prefix t) (point))) ; and beginning. + (setq depth (allout-recent-depth) ; Current topics depth, + bullet (allout-recent-bullet) ; ... bullet, + prefix (allout-recent-prefix) + beg (progn (allout-end-of-prefix t) (point))) ; and beginning. (setq done ; The boundary for the current topic: - (not (outline-next-visible-heading 1))) - (setq new-depth (outline-recent-depth)) + (not (allout-next-visible-heading 1))) + (setq new-depth (allout-recent-depth)) (setq gone-out out out (< new-depth depth)) (beginning-of-line) @@ -4202,14 +4202,14 @@ (if format (let ((special (if (string-match (regexp-quote bullet) - outline-distinctive-bullets-string) + allout-distinctive-bullets-string) bullet))) (cond ((listp format) (list depth - (if outline-abbreviate-flattened-numbering - (outline-stringify-flat-index format + (if allout-abbreviate-flattened-numbering + (allout-stringify-flat-index format gone-out) - (outline-stringify-flat-index-plain + (allout-stringify-flat-index-plain format)) strings special)) @@ -4222,7 +4222,7 @@ (list depth (make-string depth ? ) strings))) - (t (error "outline-listify-exposed: %s %s" + (t (error "allout-listify-exposed: %s %s" "invalid format" format)))) (list depth prefix strings)) result)) @@ -4245,9 +4245,9 @@ (cdr format))))))) ;; Put the list with first at front, to last at back: (nreverse result)))) -;;;_ > outline-process-exposed (&optional func from to frombuf +;;;_ > allout-process-exposed (&optional func from to frombuf ;;; tobuf format) -(defun outline-process-exposed (&optional func from to frombuf tobuf +(defun allout-process-exposed (&optional func from to frombuf tobuf format &optional start-num) "Map function on exposed parts of current topic; results to another buffer. @@ -4266,7 +4266,7 @@ except for distinctive bullets. Defaults: - FUNCTION: `outline-insert-listified' + FUNCTION: `allout-insert-listified' FROM: region start, if region active, else start of buffer TO: region end, if region active, else end of buffer FROMBUF: current buffer @@ -4275,7 +4275,7 @@ ; Resolve arguments, ; defaulting if necessary: - (if (not func) (setq func 'outline-insert-listified)) + (if (not func) (setq func 'allout-insert-listified)) (if (not (and from to)) (if (my-region-active-p) (setq from (region-beginning) to (region-end)) @@ -4285,7 +4285,7 @@ ;; Specified but not a buffer - get it: (let ((got (get-buffer frombuf))) (if (not got) - (error (concat "outline-process-exposed: source buffer " + (error (concat "allout-process-exposed: source buffer " frombuf " not found.")) (setq frombuf got)))) @@ -4301,14 +4301,14 @@ (let* ((listified (progn (set-buffer frombuf) - (outline-listify-exposed from to format)))) + (allout-listify-exposed from to format)))) (set-buffer tobuf) (mapcar func listified) (pop-to-buffer tobuf))) ;;;_ - Copy exposed -;;;_ > outline-insert-listified (listified) -(defun outline-insert-listified (listified) +;;;_ > allout-insert-listified (listified) +(defun allout-insert-listified (listified) "Insert contents of listified outline portion in current buffer. Listified is a list representing each topic header and body: @@ -4333,8 +4333,8 @@ (if (setq text (cdr text)) (insert "\n"))) (insert "\n"))) -;;;_ > outline-copy-exposed-to-buffer (&optional arg tobuf format) -(defun outline-copy-exposed-to-buffer (&optional arg tobuf format) +;;;_ > allout-copy-exposed-to-buffer (&optional arg tobuf format) +(defun allout-copy-exposed-to-buffer (&optional arg tobuf format) "Duplicate exposed portions of current outline to another buffer. Other buffer has current buffers name with \" exposed\" appended to it. @@ -4358,17 +4358,17 @@ (if (not tobuf) (setq tobuf (get-buffer-create (concat "*" (buffer-name) " exposed*")))) (let* ((start-pt (point)) - (beg (if arg (outline-back-to-current-heading) (point-min))) - (end (if arg (outline-end-of-current-subtree) (point-max))) + (beg (if arg (allout-back-to-current-heading) (point-min))) + (end (if arg (allout-end-of-current-subtree) (point-max))) (buf (current-buffer)) (start-list ())) (if (eq format 'flat) (setq format (if arg (save-excursion (goto-char beg) - (outline-topic-flat-index)) + (allout-topic-flat-index)) '(1)))) (save-excursion (set-buffer tobuf)(erase-buffer)) - (outline-process-exposed 'outline-insert-listified + (allout-process-exposed 'allout-insert-listified beg end (current-buffer) @@ -4377,14 +4377,14 @@ (goto-char (point-min)) (pop-to-buffer buf) (goto-char start-pt))) -;;;_ > outline-flatten-exposed-to-buffer (&optional arg tobuf) -(defun outline-flatten-exposed-to-buffer (&optional arg tobuf) +;;;_ > allout-flatten-exposed-to-buffer (&optional arg tobuf) +(defun allout-flatten-exposed-to-buffer (&optional arg tobuf) "Present numeric outline of outline's exposed portions in another buffer. The resulting outline is not compatable with outline mode - use -`outline-copy-exposed-to-buffer' if you want that. - -Use `outline-indented-exposed-to-buffer' for indented presentation. +`allout-copy-exposed-to-buffer' if you want that. + +Use `allout-indented-exposed-to-buffer' for indented presentation. With repeat count, copy the exposed portions of only current topic. @@ -4392,15 +4392,15 @@ it, unless optional second arg TOBUF is specified, in which case it is used verbatim." (interactive "P") - (outline-copy-exposed-to-buffer arg tobuf 'flat)) -;;;_ > outline-indented-exposed-to-buffer (&optional arg tobuf) -(defun outline-indented-exposed-to-buffer (&optional arg tobuf) + (allout-copy-exposed-to-buffer arg tobuf 'flat)) +;;;_ > allout-indented-exposed-to-buffer (&optional arg tobuf) +(defun allout-indented-exposed-to-buffer (&optional arg tobuf) "Present indented outline of outline's exposed portions in another buffer. The resulting outline is not compatable with outline mode - use -`outline-copy-exposed-to-buffer' if you want that. - -Use `outline-flatten-exposed-to-buffer' for numeric sectional presentation. +`allout-copy-exposed-to-buffer' if you want that. + +Use `allout-flatten-exposed-to-buffer' for numeric sectional presentation. With repeat count, copy the exposed portions of only current topic. @@ -4408,11 +4408,11 @@ it, unless optional second arg TOBUF is specified, in which case it is used verbatim." (interactive "P") - (outline-copy-exposed-to-buffer arg tobuf 'indent)) + (allout-copy-exposed-to-buffer arg tobuf 'indent)) ;;;_ - LaTeX formatting -;;;_ > outline-latex-verb-quote (str &optional flow) -(defun outline-latex-verb-quote (str &optional flow) +;;;_ > allout-latex-verb-quote (str &optional flow) +(defun allout-latex-verb-quote (str &optional flow) "Return copy of STRING for literal reproduction across latex processing. Expresses the original characters \(including carriage returns) of the string across latex processing." @@ -4424,8 +4424,8 @@ (t (char-to-string char))))) str "")) -;;;_ > outline-latex-verbatim-quote-curr-line () -(defun outline-latex-verbatim-quote-curr-line () +;;;_ > allout-latex-verbatim-quote-curr-line () +(defun allout-latex-verbatim-quote-curr-line () "Express line for exact \(literal) representation across latex processing. Adjust line contents so it is unaltered \(from the original line) @@ -4443,15 +4443,15 @@ (insert "\\") (setq end (1+ end)) (goto-char (1+ (match-end 0)))))) -;;;_ > outline-insert-latex-header (buf) -(defun outline-insert-latex-header (buf) +;;;_ > allout-insert-latex-header (buf) +(defun allout-insert-latex-header (buf) "Insert initial latex commands at point in BUFFER." ;; Much of this is being derived from the stuff in appendix of E in ;; the TeXBook, pg 421. (set-buffer buf) (let ((doc-style (format "\n\\documentstyle{%s}\n" "report")) - (page-numbering (if outline-number-pages + (page-numbering (if allout-number-pages "\\pagestyle{empty}\n" "")) (linesdef (concat "\\def\\beginlines{" @@ -4462,17 +4462,17 @@ "\\def\\endlines{" "\\kern1pt\\endgroup\\medbreak\\noindent}\n")) (titlecmd (format "\\newcommand{\\titlecmd}[1]{{%s #1}}\n" - outline-title-style)) + allout-title-style)) (labelcmd (format "\\newcommand{\\labelcmd}[1]{{%s #1}}\n" - outline-label-style)) + allout-label-style)) (headlinecmd (format "\\newcommand{\\headlinecmd}[1]{{%s #1}}\n" - outline-head-line-style)) + allout-head-line-style)) (bodylinecmd (format "\\newcommand{\\bodylinecmd}[1]{{%s #1}}\n" - outline-body-line-style)) + allout-body-line-style)) (setlength (format "%s%s%s%s" "\\newlength{\\stepsize}\n" "\\setlength{\\stepsize}{" - outline-indent + allout-indent "}\n")) (oneheadline (format "%s%s%s%s%s%s%s" "\\newcommand{\\OneHeadLine}[3]{%\n" @@ -4480,21 +4480,21 @@ "\\hspace*{#2\\stepsize}%\n" "\\labelcmd{#1}\\hspace*{.2cm}" "\\headlinecmd{#3}\\\\[" - outline-line-skip + allout-line-skip "]\n}\n")) (onebodyline (format "%s%s%s%s%s%s" "\\newcommand{\\OneBodyLine}[2]{%\n" "\\noindent%\n" "\\hspace*{#1\\stepsize}%\n" "\\bodylinecmd{#2}\\\\[" - outline-line-skip + allout-line-skip "]\n}\n")) (begindoc "\\begin{document}\n\\begin{center}\n") (title (format "%s%s%s%s" "\\titlecmd{" - (outline-latex-verb-quote (if outline-title + (allout-latex-verb-quote (if allout-title (condition-case err - (eval outline-title) + (eval allout-title) ('error "<unnamed buffer>")) "Unnamed Outline")) "}\n" @@ -4517,13 +4517,13 @@ hoffset vspace) ))) -;;;_ > outline-insert-latex-trailer (buf) -(defun outline-insert-latex-trailer (buf) +;;;_ > allout-insert-latex-trailer (buf) +(defun allout-insert-latex-trailer (buf) "Insert concluding latex commands at point in BUFFER." (set-buffer buf) (insert "\n\\end{document}\n")) -;;;_ > outline-latexify-one-item (depth prefix bullet text) -(defun outline-latexify-one-item (depth prefix bullet text) +;;;_ > allout-latexify-one-item (depth prefix bullet text) +(defun allout-latexify-one-item (depth prefix bullet text) "Insert LaTeX commands for formatting one outline item. Args are the topics numeric DEPTH, the header PREFIX lead string, the @@ -4534,12 +4534,12 @@ body-content bop) ; Do the head line: (insert (concat "\\OneHeadLine{\\verb\1 " - (outline-latex-verb-quote bullet) + (allout-latex-verb-quote bullet) "\1}{" depth "}{\\verb\1 " (if head-line - (outline-latex-verb-quote head-line) + (allout-latex-verb-quote head-line) "") "\1}\n")) (if (not body-lines) @@ -4561,7 +4561,7 @@ (substring curr-line bop)))) ;;(insert "|" (car body-lines) "|") (insert curr-line) - (outline-latex-verbatim-quote-curr-line) + (allout-latex-verbatim-quote-curr-line) (insert "\n") (setq body-lines (cdr body-lines))) (if body-content @@ -4572,8 +4572,8 @@ ;;(insert "\\endlines\n") (insert "\\end{verbatim}\n") ))) -;;;_ > outline-latexify-exposed (arg &optional tobuf) -(defun outline-latexify-exposed (arg &optional tobuf) +;;;_ > allout-latexify-exposed (arg &optional tobuf) +(defun allout-latexify-exposed (arg &optional tobuf) "Format current topics exposed portions to TOBUF for latex processing. TOBUF defaults to a buffer named the same as the current buffer, but with \"*\" prepended and \" latex-formed*\" appended. @@ -4585,33 +4585,33 @@ (setq tobuf (get-buffer-create (concat "*" (buffer-name) " latexified*")))) (let* ((start-pt (point)) - (beg (if arg (point-min) (outline-back-to-current-heading))) - (end (if arg (point-max) (outline-end-of-current-subtree))) + (beg (if arg (point-min) (allout-back-to-current-heading))) + (end (if arg (point-max) (allout-end-of-current-subtree))) (buf (current-buffer))) (set-buffer tobuf) (erase-buffer) - (outline-insert-latex-header tobuf) + (allout-insert-latex-header tobuf) (goto-char (point-max)) - (outline-process-exposed 'outline-latexify-one-item + (allout-process-exposed 'allout-latexify-one-item beg end buf tobuf) (goto-char (point-max)) - (outline-insert-latex-trailer tobuf) + (allout-insert-latex-trailer tobuf) (goto-char (point-min)) (pop-to-buffer buf) (goto-char start-pt))) ;;;_ #8 miscellaneous -;;;_ > outline-mark-topic () -(defun outline-mark-topic () +;;;_ > allout-mark-topic () +(defun allout-mark-topic () "Put the region around topic currently containing point." (interactive) (beginning-of-line) - (outline-goto-prefix) + (allout-goto-prefix) (push-mark (point)) - (outline-end-of-current-subtree) + (allout-end-of-current-subtree) (exchange-point-and-mark)) ;;;_ > outlineify-sticky () ;; outlinify-sticky is correct spelling; provide this alias for sticklers: @@ -4619,34 +4619,34 @@ (defun outlineify-sticky (&optional arg) "Activate outline mode and establish file var so it is started subsequently. -See doc-string for `outline-layout' and `outline-init' for details on +See doc-string for `allout-layout' and `allout-init' for details on setup for auto-startup." (interactive "P") - (outline-mode t) + (allout-mode t) (save-excursion (goto-char (point-min)) - (if (looking-at outline-regexp) + (if (looking-at allout-regexp) t - (outline-open-topic 2) + (allout-open-topic 2) (insert (concat "Dummy outline topic header - see" - "`outline-mode' docstring: `^Hm'.")) + "`allout-mode' docstring: `^Hm'.")) (forward-line 1) (goto-char (point-max)) (open-line 1) - (outline-open-topic 0) + (allout-open-topic 0) (insert "Local emacs vars.\n") - (outline-open-topic 1) - (insert "(`outline-layout' is for allout.el outline-mode)\n") - (outline-open-topic 0) + (allout-open-topic 1) + (insert "(`allout-layout' is for allout.el allout-mode)\n") + (allout-open-topic 0) (insert "Local variables:\n") - (outline-open-topic 0) - (insert (format "outline-layout: %s\n" - (or outline-layout + (allout-open-topic 0) + (insert (format "allout-layout: %s\n" + (or allout-layout '(-1 : 0)))) - (outline-open-topic 0) + (allout-open-topic 0) (insert "End:\n")))) ;;;_ > solicit-char-in-string (prompt string &optional do-defaulting) (defun solicit-char-in-string (prompt string &optional do-defaulting) @@ -4740,18 +4740,18 @@ (mark-marker))) ;;;_ #9 Under development -;;;_ > outline-bullet-isearch (&optional bullet) -(defun outline-bullet-isearch (&optional bullet) +;;;_ > allout-bullet-isearch (&optional bullet) +(defun allout-bullet-isearch (&optional bullet) "Isearch \(regexp) for topic with bullet BULLET." (interactive) (if (not bullet) (setq bullet (solicit-char-in-string "ISearch for topic with bullet: " - (regexp-sans-escapes outline-bullets-string)))) + (regexp-sans-escapes allout-bullets-string)))) (let ((isearch-regexp t) (isearch-string (concat "^" - outline-header-prefix + allout-header-prefix "[ \t]*" bullet))) (isearch-repeat 'forward) @@ -4760,13 +4760,13 @@ ;;; wrapping the isearch functions. ;;;_* Local emacs vars. -;;; The following `outline-layout' local variable setting: +;;; The following `allout-layout' local variable setting: ;;; - closes all topics from the first topic to just before the third-to-last, ;;; - shows the children of the third to last (config vars) ;;; - and the second to last (code section), ;;; - and closes the last topic (this local-variables section). ;;;Local variables: -;;;outline-layout: (0 : -1 -1 0) +;;;allout-layout: (0 : -1 -1 0) ;;;End: ;;; allout.el ends here