[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/hyperbole d27f4c5197 3/4: Add and doc kexport/kimport c
|
From: |
ELPA Syncer |
|
Subject: |
[elpa] externals/hyperbole d27f4c5197 3/4: Add and doc kexport/kimport commands in pulldown/minibuffer menus |
|
Date: |
Sat, 5 Feb 2022 17:57:33 -0500 (EST) |
branch: externals/hyperbole
commit d27f4c51973882c92942d37aae67814680d5a022
Author: Bob Weiner <rsw@gnu.org>
Commit: Bob Weiner <rsw@gnu.org>
Add and doc kexport/kimport commands in pulldown/minibuffer menus
---
ChangeLog | 17 ++++++++++++++
hui-mini.el | 61 ++++++++++++++++++++++++++++----------------------
kotl/kexport.el | 6 ++---
kotl/kimport.el | 19 +++++++++-------
kotl/kmenu.el | 8 ++++---
man/hyperbole.html | 61 ++++++++++++++++++++++++++++++++++----------------
man/hyperbole.info | Bin 577711 -> 578802 bytes
man/hyperbole.pdf | Bin 1331183 -> 1332461 bytes
man/hyperbole.texi | 51 ++++++++++++++++++++++++++---------------
man/version.texi | 4 ++--
test/kexport-tests.el | 8 +++----
11 files changed, 151 insertions(+), 84 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b7ef69df9c..2aeab08ffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
2022-02-05 Bob Weiner <rsw@gnu.org>
+* kotl/kexport.el (kexport:buffer): Rename to 'kexport:koutline'.
+ test/kexport-tests.el (kexport:buffer-calls-kexport:html): Rename to
+ 'kexport:koutline-calls-kexport:html'.
+
+* hui-mini.el (hui:menus): Kotl/Format - Add new submenu for import/export
+ of Koutlines to match one from the Koutline pulldown menu.
+ man/hyperbole.texi (Exporting):
+ (Menu Commands): Document new menu and add
'kexport:koutline'
+ command documentation.
+
+* kotl/kimport.el (kimport:suffix-alist): Add importation of Org outlines
+ as Koutlines.
+
+* kotl/kmenu.el (kotl-menu-common-postamble): In pulldown Koutliner menu,
+ change 'Export-to-HTML' to 'Export-Other-Koutline-to-HTML'. Add
+ 'Display-This-Koutline-in-Web-Browser' and 'Export-This-Koutline-to-HTML'.
+
* hpath.el (hpath:outline-section-pattern): Remove leading spaces
(hpath:to-markup-anchor): Search for leading spaces in above regexp
only after not finding a match without leading spaces. This prevents
diff --git a/hui-mini.el b/hui-mini.el
index f3d213a405..8ef5a57789 100644
--- a/hui-mini.el
+++ b/hui-mini.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 15-Oct-91 at 20:13:17
-;; Last-Mod: 5-Feb-22 at 11:39:04 by Bob Weiner
+;; Last-Mod: 5-Feb-22 at 16:48:59 by Bob Weiner
;;
;; Copyright (C) 1991-2022 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
@@ -516,7 +516,7 @@ constructs. If not given, the top level Hyperbole menu is
used."
"Jumps back to location prior to last Hyperbole button
follow.")
'("Ibut/" (menu . ibut)
"Implicit button and button type commands.")
- '("Kotl/" (menu . otl)
+ '("Kotl/" (menu . kotl)
"Autonumbered outlining and hyperlink capabilities.")
'("Msg/" (menu . msg)
"Mail and News messaging capabilities.")
@@ -700,31 +700,7 @@ constructs. If not given, the top level Hyperbole menu is
used."
"Modifies a label preceding an implicit button in the current
buffer.")
("Types" (hui:htype-help 'ibtypes 'no-sort)
"Displays documentation for one or all implicit button types.")))
- '(msg .
- (("Msg>")
- ("Compose-Hypb-Mail"
- (hmail:compose "hyperbole-users@gnu.org" '(hact 'hyp-config))
- "Send a message to the Hyperbole discussion list.")
- ("Join-Hypb-List"
- (hmail:compose "hyperbole-users-join@gnu.org" nil
- "Just send the message; subject and body are
ignored.")
- "Subscribe to the Hyperbole discussion list.")
- ("Leave-Hypb-List"
- (hmail:compose "hyperbole-users-leave@gnu.org" nil
- "Just send the message; subject and body are
ignored.")
- "Unsubscribe from the Hyperbole discussion list.")
- ("Report-Hypb-Bug"
- (hmail:compose "bug-hyperbole@gnu.org" '(hact 'hyp-config))
- "Send a message to the Hyperbole bug reporting list.")
- ("Subscribe-Hypb-Bug"
- (hmail:compose "bug-hyperbole-join@gnu.org" nil
- "Just send the message; subject and body are
ignored.")
- "Subscribe to the Hyperbole bug reporting list.")
- ("Unsub-Hypb-Bug"
- (hmail:compose "bug-hyperbole-leave@gnu.org" nil
- "Just send the message; subject and body are
ignored.")
- "Unsubscribe from the Hyperbole bug reporting list.")))
- '(otl
+ '(kotl
. (("Kotl>")
("All" kotl-mode:show-all "Expand all collapsed cells.")
("Blanks" kvspec:toggle-blank-lines
@@ -734,6 +710,7 @@ constructs. If not given, the top level Hyperbole menu is
used."
"Hide all cells in outline deeper than a particular level.")
("Examp" kotl-mode:example
"Display a self-descriptive example outline file.")
+ ("Format/" (menu . kotl-format) "Imports/Exports Koutlines.")
("Hide" (progn (kotl-mode:is-p)
(kotl-mode:hide-tree (kcell-view:label)))
"Collapse tree rooted at point.")
@@ -753,6 +730,36 @@ constructs. If not given, the top level Hyperbole menu is
used."
"Hide all but top-level cells.")
("Vspec" kvspec:activate
"Prompt for and activate a view specifiction.")))
+ '(kotl-format .
+ (("Format>")
+ ("Display-in-Browser" kexport:display "Export and display
current Koutline in default web browser")
+ ("Html-Export-Other" kexport:html "Prompt for a Koutline
buffer/file and output HTML file; export it.")
+ ("Import-to-Koutline" kimport:file "Import a buffer/file
into a new or existing Koutline.")
+ ("Koutline-Export-to-Html" kexport:koutline "Export current
Koutline and save as an HTML file for web usage.")))
+ '(msg .
+ (("Msg>")
+ ("Compose-Hypb-Mail"
+ (hmail:compose "hyperbole-users@gnu.org" '(hact 'hyp-config))
+ "Send a message to the Hyperbole discussion list.")
+ ("Join-Hypb-List"
+ (hmail:compose "hyperbole-users-join@gnu.org" nil
+ "Just send the message; subject and body are
ignored.")
+ "Subscribe to the Hyperbole discussion list.")
+ ("Leave-Hypb-List"
+ (hmail:compose "hyperbole-users-leave@gnu.org" nil
+ "Just send the message; subject and body are
ignored.")
+ "Unsubscribe from the Hyperbole discussion list.")
+ ("Report-Hypb-Bug"
+ (hmail:compose "bug-hyperbole@gnu.org" '(hact 'hyp-config))
+ "Send a message to the Hyperbole bug reporting list.")
+ ("Subscribe-Hypb-Bug"
+ (hmail:compose "bug-hyperbole-join@gnu.org" nil
+ "Just send the message; subject and body are
ignored.")
+ "Subscribe to the Hyperbole bug reporting list.")
+ ("Unsub-Hypb-Bug"
+ (hmail:compose "bug-hyperbole-leave@gnu.org" nil
+ "Just send the message; subject and body are
ignored.")
+ "Unsubscribe from the Hyperbole bug reporting list.")))
'(hyrolo .
(("Rolo>")
("Add" hyrolo-add "Add a new rolo entry.")
diff --git a/kotl/kexport.el b/kotl/kexport.el
index e8f86acfc8..040a134adb 100644
--- a/kotl/kexport.el
+++ b/kotl/kexport.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 26-Feb-98
-;; Last-Mod: 24-Jan-22 at 00:25:17 by Bob Weiner
+;; Last-Mod: 5-Feb-22 at 16:24:59 by Bob Weiner
;;
;; Copyright (C) 1998-2021 Free Software Foundation, Inc.
;; See the "../HY-COPY" file for license information.
@@ -329,7 +329,7 @@ for (i = 0; i < coll.length; i++) {
;;; ************************************************************************
;;;###autoload
-(defun kexport:buffer (&optional soft-newlines-flag)
+(defun kexport:koutline (&optional soft-newlines-flag)
"Export the current buffer's koutline to the same named file with a
\".html\" suffix.
Return the pathname of the html file created.
@@ -349,7 +349,7 @@ Return the pathname of the html file created.
By default, this retains newlines within cells as they are. With optional
prefix arg, SOFT-NEWLINES-FLAG,
hard newlines are not used. Also converts Urls and Klinks into Html
hyperlinks."
(interactive "P")
- (let ((html-file (kexport:buffer soft-newlines-flag)))
+ (let ((html-file (kexport:koutline soft-newlines-flag)))
(hact 'www-url (concat "file://" html-file))
html-file))
diff --git a/kotl/kimport.el b/kotl/kimport.el
index a8a28d35bb..aa8d29a641 100644
--- a/kotl/kimport.el
+++ b/kotl/kimport.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 15-Nov-93 at 11:57:05
-;; Last-Mod: 24-Jan-22 at 00:25:18 by Bob Weiner
+;; Last-Mod: 5-Feb-22 at 15:46:39 by Bob Weiner
;;
;; Copyright (C) 1993-2021 Free Software Foundation, Inc.
;; See the "../HY-COPY" file for license information.
@@ -50,19 +50,22 @@ as the initial set of children of the current cell, if any.
;;;###autoload
(defvar kimport:suffix-alist
- '(("\\.otl$". kimport:star-outline)
+ '(("\\.org$" . kimport:star-outline)
+ ("\\.otl$" . kimport:star-outline)
("\\.aug$" . kimport:aug-post-outline))
"Alist of (buffer-name-suffix-regexp . importation-function) elements.
This determines the type of importation done on a file when `kimport:file' is
called. Each importation-function must take two arguments, a buffer/file to
-import and a buffer/file into which to insert the imported elements and a
-third optional argument, CHILDREN-P, which when non-nil means insert imported
-cells as the initial set of children of the current cell, if any.
+import and a buffer/file into which to insert the imported elements.
+A third optional argument, CHILDREN-P, may be given; when non-nil, insert
+imported cells as the initial set of children of the current cell, if any.
- .otl - imported as an Emacs outline whose entries begin with asterisks;
+ .org - import format is an Emacs outline whose entries begin with
asterisks;
+ .otl - import format is an Emacs outline whose entries begin with
asterisks;
.kot
- .kotl - imported as a structured koutline
- .aug - imported as an Augment post-numbered outline.")
+ .kotl - import format is a Koutline
+ .aug - import format is an Augment post-numbered outline
+ (see https://dougengelbart.org/content/view/148/).")
(defconst kimport:star-heading "^\\(\\*+\\)"
"Regular expression matching a star outline heading with the number of stars
given by groupoing 1.")
diff --git a/kotl/kmenu.el b/kotl/kmenu.el
index 7696b217b2..ae61707f01 100644
--- a/kotl/kmenu.el
+++ b/kotl/kmenu.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 28-Mar-94 at 11:22:09
-;; Last-Mod: 25-Jan-22 at 23:36:14 by Bob Weiner
+;; Last-Mod: 5-Feb-22 at 16:24:59 by Bob Weiner
;;
;; Copyright (C) 1994-2021 Free Software Foundation, Inc.
;; See the "../HY-COPY" file for license information.
@@ -163,8 +163,10 @@
:keys "C-x C-q"]
["Write (Save as)" kfile:write t]
"----"
- ["Export-to-HTML" kexport:html t]
- ["Import-to-Koutline" kimport:file t]
+ ["Display-This-Koutline-in-Web-Browser" kexport:display t]
+ ["Export-Other-Koutline-to-HTML" kexport:html t]
+ ["Export-This-Koutline-to-HTML" kexport:koutline t]
+ ["Import-to-Koutline" kimport:file t]
"----"
["Quit" (id-tool-quit '(kill-buffer nil)) t]))
diff --git a/man/hyperbole.html b/man/hyperbole.html
index 3d47867895..5abe083b84 100644
--- a/man/hyperbole.html
+++ b/man/hyperbole.html
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
<!-- This manual is for GNU Hyperbole
-(Edition 8.0.0pre, Published January, 2022).
+(Edition 8.0.0pre, Published February, 2022).
Copyright (C) 1989-2022 Free Software Foundation, Inc.
@@ -370,7 +370,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</P>
<PRE>
Edition 8.0.0pre
-Printed January 30, 2022.
+Printed February 5, 2022.
Published by the Free Software Foundation, Inc.
Author: Bob Weiner
@@ -5226,6 +5226,9 @@ a number of major Koutliner commands:
</p>
<span id="index-outliner-commands"></span>
<span id="index-Koutliner-commands"></span>
+<span id="index-Koutliner-import_002fexport-commands"></span>
+<span id="index-importing_002c-Koutliner"></span>
+<span id="index-exporting_002c-Koutliner"></span>
<span id="index-Koutliner-menu"></span>
<span id="index-menu_002c-Koutliner"></span>
<span id="index-kotl_002dmode_003ashow_002dall"></span>
@@ -5247,6 +5250,7 @@ Blanks kvspec:toggle-blank-lines Toggle blank
lines on or off
Create kfile:find Edit or create an outline
Downto kotl-mode:hide-sublevels Hide cells deeper than a level
Examp <sample outliner file> Show self-descriptive example
+Format/ Submenu Import/Export commands
Hide kotl-mode:hide-tree Hide tree with root at point
Info <outliner documentation> Show outliner manual section
Kill kotl-mode:kill-tree Kill the current tree
@@ -5882,12 +5886,13 @@ cell.
</p>
<span id="index-kimport_003amode_002dalist"></span>
<span id="index-kimport_003asuffix_002dalist"></span>
-<span id="index-outline_002c-conversion"></span>
+<span id="index-outline_002c-formatting"></span>
<span id="index-kotl_002dmode"></span>
<span id="index-outline-mode-1"></span>
<span id="index-koutline-mode"></span>
<span id="index-file_002c-importing"></span>
<span id="index-importing-a-file"></span>
+<span id="index-Koutline-import"></span>
<p>For information on mode and suffix-specific conversions performed on
file elements before they are inserted, see the documentation for the
variables, <code>kimport:mode-alist</code> and
<code>kimport:suffix-alist</code>. This
@@ -5943,7 +5948,8 @@ have alphanumeric statement identifiers on the right
side. You can
import such files while maintaining their outline structure. Use
<kbd>{M-x kimport:aug-post-outline <span class="key">RET</span>}</kbd> and you
will be
prompted for the Augment buffer or file to import and the koutline to
-create.
+create. See <a
href="https://dougengelbart.org/content/view/148/";>https://dougengelbart.org/content/view/148/</a>
for more
+information.
</p>
<hr>
<span id="Exporting"></span><div class="header">
@@ -5952,29 +5958,38 @@ Previous: <a href="#Inserting-and-Importing"
accesskey="p" rel="prev">Inserting
</div>
<span id="Exporting-1"></span><h4 class="subsection">7.5.9 Exporting</h4>
-<span id="index-outline_002c-exporting-from"></span>
+<span id="index-outline_002c-exporting-1"></span>
<span id="index-outline_002c-HTML-conversion"></span>
<span id="index-exporting"></span>
<span id="index-HTML-conversion"></span>
<p>Koutlines may be <em>exported</em> to other file formats. Presently, the
only format supported is conversion to HTML for publishing on the
-World-Wide Web.
+World-Wide Web. Use the Kotl/Format minibuffer menu, <kbd>{C-h h k f}</kbd>,
+for this.
</p>
<span id="index-kexport_003adisplay"></span>
<span id="index-browse_002durl_002dbrowser_002dfunction-2"></span>
-<p><kbd>{M-x kexport:display <span class="key">RET</span>}</kbd> exports the
current Koutline buffer
-to a temporary HTML file and displays the file in the web browser given by
-<code>browse-url-browser-function</code>. Any tree in the HTML outline may be
-expanded or collapsed by clicking the left mouse button on its root cell,
-for ease of viewing.
+<span id="index-C_002dh-h-k-f-d"></span>
+<p><kbd>{C-h h k f d}</kbd> or <kbd>{M-x kexport:display <span
class="key">RET</span>}</kbd> exports the
+current Koutline buffer to a temporary HTML file and displays the file
+in the web browser given by <code>browse-url-browser-function</code>. Any tree
+in the HTML outline may be expanded or collapsed by clicking the left
+mouse button on its root cell, for ease of viewing.
</p>
<span id="index-kexport_003ahtml"></span>
-<p>Alternatively, <kbd>{M-x kexport:html <span class="key">RET</span>}</kbd>
prompts for the koutline
-buffer or file to export, the HTML file or buffer to which to output, and
-the title to use for the HTML file. Completion of filenames is provided.
-The conversion will then be done and the output file or buffer will be
-written; the output file will not be displayed. You must display it
-manually if desired.
+<span id="index-C_002dh-h-k-f-h"></span>
+<p>Alternatively, <kbd>{C-h h k f h}</kbd> or <kbd>{M-x kexport:html <span
class="key">RET</span>}</kbd>
+prompts for the koutline buffer or file to export, the HTML file or buffer
+to which to output, and the title to use for the HTML file. Completion of
+filenames is provided. The conversion will then be done and the output
+file or buffer will be written; the output file will not be displayed.
+You must display it manually, if desired.
+</p>
+<span id="index-kexport_003akoutline"></span>
+<span id="index-C_002dh-h-k-f-k"></span>
+<p><kbd>{C-h h k f k}</kbd> or <kbd>{M-x kexport:koutline <span
class="key">RET</span>}</kbd> exports the current
+Koutline buffer to a <samp>.html</samp> file of the same name. The output
file will
+not be displayed; you must display it manually, if desired.
</p>
<hr>
<span id="Viewing"></span><div class="header">
@@ -12708,6 +12723,9 @@ Next: <a href="#Function" accesskey="n"
rel="next">Function</a>, Previous: <a hr
<tr><td></td><td valign="top"><a href="#index-C_002dh-h-i-e"><code>C-h h i
e</code></a>:</td><td> </td><td valign="top"><a
href="#Implicit-Buttons">Implicit Buttons</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-C_002dh-h-i-l"><code>C-h h i
l</code></a>:</td><td> </td><td valign="top"><a
href="#Implicit-Buttons">Implicit Buttons</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-C_002dh-h-k-e"><code>C-h h k
e</code></a>:</td><td> </td><td valign="top"><a
href="#Koutliner">Koutliner</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-C_002dh-h-k-f-d"><code>C-h h k f
d</code></a>:</td><td> </td><td valign="top"><a
href="#Exporting">Exporting</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-C_002dh-h-k-f-h"><code>C-h h k f
h</code></a>:</td><td> </td><td valign="top"><a
href="#Exporting">Exporting</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-C_002dh-h-k-f-k"><code>C-h h k f
k</code></a>:</td><td> </td><td valign="top"><a
href="#Exporting">Exporting</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-C_002dh-h-m-c"><code>C-h h m
c</code></a>:</td><td> </td><td valign="top"><a
href="#Smart-Key-Debugging">Smart Key Debugging</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-C_002dh-h-m-r"><code>C-h h m
r</code></a>:</td><td> </td><td valign="top"><a
href="#Smart-Key-Debugging">Smart Key Debugging</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-C_002dh-h-s-f"><code>C-h h s
f</code></a>:</td><td> </td><td valign="top"><a
href="#HyControl">HyControl</a></td></tr>
@@ -13436,6 +13454,7 @@ Next: <a href="#Concept-Index" accesskey="n"
rel="next">Concept Index</a>, Previ
<tr><td></td><td valign="top"><a
href="#index-kcell_003aref_002dto_002did"><code>kcell:ref-to-id</code></a>:</td><td> </td><td
valign="top"><a href="#Action-Types">Action Types</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-kexport_003adisplay"><code>kexport:display</code></a>:</td><td> </td><td
valign="top"><a href="#Exporting">Exporting</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-kexport_003ahtml"><code>kexport:html</code></a>:</td><td> </td><td
valign="top"><a href="#Exporting">Exporting</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-kexport_003akoutline"><code>kexport:koutline</code></a>:</td><td> </td><td
valign="top"><a href="#Exporting">Exporting</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-kfile_003afind"><code>kfile:find</code></a>:</td><td> </td><td
valign="top"><a href="#Menu-Commands">Menu Commands</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-kfile_003awrite"><code>kfile:write</code></a>:</td><td> </td><td
valign="top"><a href="#Koutliner-Keys">Koutliner Keys</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-kill_002dring">kill-ring</a>:</td><td> </td><td
valign="top"><a href="#Window-Configurations">Window
Configurations</a></td></tr>
@@ -14065,6 +14084,7 @@ Previous: <a href="#Function" accesskey="p"
rel="prev">Function</a>, Up: <a href
<tr><td></td><td valign="top"><a
href="#index-explicit-button_002c-programmatic-creation">explicit button,
programmatic creation</a>:</td><td> </td><td valign="top"><a
href="#Programmatic-Button-Creation">Programmatic Button Creation</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-exporting">exporting</a>:</td><td> </td><td valign="top"><a
href="#Exporting">Exporting</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-exporting-an-outline">exporting
an outline</a>:</td><td> </td><td valign="top"><a
href="#Relocating-and-Copying">Relocating and Copying</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-exporting_002c-Koutliner">exporting,
Koutliner</a>:</td><td> </td><td valign="top"><a
href="#Menu-Commands">Menu Commands</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-external-display">external
display</a>:</td><td> </td><td valign="top"><a
href="#Referent-Display">Referent Display</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-external-display-1">external
display</a>:</td><td> </td><td valign="top"><a
href="#External-Viewers">External Viewers</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-external-klink">external
klink</a>:</td><td> </td><td valign="top"><a
href="#Links">Links</a></td></tr>
@@ -14232,6 +14252,7 @@ Previous: <a href="#Function" accesskey="p"
rel="prev">Function</a>, Up: <a href
<tr><td></td><td valign="top"><a href="#index-implicit-button-types">implicit
button types</a>:</td><td> </td><td valign="top"><a
href="#Implicit-Button-Types">Implicit Button Types</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-importing">importing</a>:</td><td> </td><td valign="top"><a
href="#Inserting-and-Importing">Inserting and Importing</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-importing-a-file">importing a
file</a>:</td><td> </td><td valign="top"><a
href="#Inserting-and-Importing">Inserting and Importing</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-importing_002c-Koutliner">importing,
Koutliner</a>:</td><td> </td><td valign="top"><a
href="#Menu-Commands">Menu Commands</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-in_002ddevelopment-installation">in-development
installation</a>:</td><td> </td><td valign="top"><a
href="#Elpa-In_002dDevelopment-Package-Installation">Elpa In-Development
Package Installation</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-inactive-minibuffer">inactive
minibuffer</a>:</td><td> </td><td valign="top"><a
href="#Minibuffer-Menu-Activation">Minibuffer Menu Activation</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-Info-browser">Info
browser</a>:</td><td> </td><td valign="top"><a
href="#Smart-Mouse-Key-Modeline-Clicks">Smart Mouse Key Modeline
Clicks</a></td></tr>
@@ -14319,9 +14340,11 @@ Previous: <a href="#Function" accesskey="p"
rel="prev">Function</a>, Up: <a href
<tr><td></td><td valign="top"><a href="#index-klink_002c-view-spec">klink,
view spec</a>:</td><td> </td><td valign="top"><a
href="#Links">Links</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-klinks_002c-ignoring">klinks,
ignoring</a>:</td><td> </td><td valign="top"><a
href="#Links">Links</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-knowledge-transfer">knowledge
transfer</a>:</td><td> </td><td valign="top"><a
href="#Koutliner-History">Koutliner History</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-Koutline-import">Koutline
import</a>:</td><td> </td><td valign="top"><a
href="#Inserting-and-Importing">Inserting and Importing</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-koutline-link">koutline
link</a>:</td><td> </td><td valign="top"><a
href="#Implicit-Button-Types">Implicit Button Types</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-koutline-mode">koutline
mode</a>:</td><td> </td><td valign="top"><a
href="#Inserting-and-Importing">Inserting and Importing</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-Koutliner-commands">Koutliner
commands</a>:</td><td> </td><td valign="top"><a href="#Menu-Commands">Menu
Commands</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-Koutliner-import_002fexport-commands">Koutliner import/export
commands</a>:</td><td> </td><td valign="top"><a href="#Menu-Commands">Menu
Commands</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-Koutliner-menu">Koutliner
menu</a>:</td><td> </td><td valign="top"><a href="#Menu-Commands">Menu
Commands</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-Koutliner_002c-toggle-tab-behavior">Koutliner, toggle tab
behavior</a>:</td><td> </td><td valign="top"><a
href="#Promoting-and-Demoting">Promoting and Demoting</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
@@ -14550,12 +14573,12 @@ Previous: <a href="#Function" accesskey="p"
rel="prev">Function</a>, Up: <a href
<tr><td></td><td valign="top"><a href="#index-outline-structure">outline
structure</a>:</td><td> </td><td valign="top"><a
href="#Autonumbering">Autonumbering</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-outline_002c-all-cells">outline,
all cells</a>:</td><td> </td><td valign="top"><a
href="#Hiding-and-Showing">Hiding and Showing</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-outline_002c-attribute-list">outline, attribute
list</a>:</td><td> </td><td valign="top"><a href="#Cell-Attributes">Cell
Attributes</a></td></tr>
-<tr><td></td><td valign="top"><a
href="#index-outline_002c-conversion">outline,
conversion</a>:</td><td> </td><td valign="top"><a
href="#Inserting-and-Importing">Inserting and Importing</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-outline_002c-creating">outline,
creating</a>:</td><td> </td><td valign="top"><a
href="#Creating-Outlines">Creating Outlines</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-outline_002c-exporting">outline,
exporting</a>:</td><td> </td><td valign="top"><a
href="#Relocating-and-Copying">Relocating and Copying</a></td></tr>
-<tr><td></td><td valign="top"><a
href="#index-outline_002c-exporting-from">outline, exporting
from</a>:</td><td> </td><td valign="top"><a
href="#Exporting">Exporting</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-outline_002c-exporting-1">outline,
exporting</a>:</td><td> </td><td valign="top"><a
href="#Exporting">Exporting</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-outline_002c-filling">outline,
filling</a>:</td><td> </td><td valign="top"><a
href="#Filling">Filling</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-outline_002c-foreign-file">outline, foreign
file</a>:</td><td> </td><td valign="top"><a
href="#Inserting-and-Importing">Inserting and Importing</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-outline_002c-formatting">outline,
formatting</a>:</td><td> </td><td valign="top"><a
href="#Inserting-and-Importing">Inserting and Importing</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-outline_002c-hiding">outline,
hiding</a>:</td><td> </td><td valign="top"><a
href="#Hiding-and-Showing">Hiding and Showing</a></td></tr>
<tr><td></td><td valign="top"><a
href="#index-outline_002c-HTML-conversion">outline, HTML
conversion</a>:</td><td> </td><td valign="top"><a
href="#Exporting">Exporting</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-outline_002c-importing">outline,
importing</a>:</td><td> </td><td valign="top"><a
href="#Relocating-and-Copying">Relocating and Copying</a></td></tr>
diff --git a/man/hyperbole.info b/man/hyperbole.info
index 48a1afeafa..931dbd08b6 100644
Binary files a/man/hyperbole.info and b/man/hyperbole.info differ
diff --git a/man/hyperbole.pdf b/man/hyperbole.pdf
index cd90fb4dd4..9148b81814 100644
Binary files a/man/hyperbole.pdf and b/man/hyperbole.pdf differ
diff --git a/man/hyperbole.texi b/man/hyperbole.texi
index 4457698e6f..9eccc4a48b 100644
--- a/man/hyperbole.texi
+++ b/man/hyperbole.texi
@@ -7,7 +7,7 @@
@c Author: Bob Weiner
@c
@c Orig-Date: 6-Nov-91 at 11:18:03
-@c Last-Mod: 30-Jan-22 at 12:57:08 by Bob Weiner
+@c Last-Mod: 5-Feb-22 at 16:55:30 by Bob Weiner
@c %**start of header (This is for running Texinfo on a region.)
@setfilename hyperbole.info
@@ -156,7 +156,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</P>
<PRE>
Edition 8.0.0pre
-Printed January 30, 2022.
+Printed February 5, 2022.
Published by the Free Software Foundation, Inc.
Author: Bob Weiner
@@ -198,7 +198,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@example
Edition 8.0.0pre
-January 30, 2022
+February 5, 2022
Published by the Free Software Foundation, Inc.
Author: Bob Weiner
@@ -4376,6 +4376,9 @@ a number of major Koutliner commands:
@cindex outliner commands
@cindex Koutliner commands
+@cindex Koutliner import/export commands
+@cindex importing, Koutliner
+@cindex exporting, Koutliner
@cindex Koutliner menu
@cindex menu, Koutliner
@findex kotl-mode:show-all
@@ -4397,6 +4400,7 @@ Blanks kvspec:toggle-blank-lines Toggle blank
lines on or off
Create kfile:find Edit or create an outline
Downto kotl-mode:hide-sublevels Hide cells deeper than a level
Examp <sample outliner file> Show self-descriptive example
+Format/ Submenu Import/Export commands
Hide kotl-mode:hide-tree Hide tree with root at point
Info <outliner documentation> Show outliner manual section
Kill kotl-mode:kill-tree Kill the current tree
@@ -4931,12 +4935,13 @@ cell.
@vindex kimport:mode-alist
@vindex kimport:suffix-alist
-@cindex outline, conversion
+@cindex outline, formatting
@findex kotl-mode
@cindex outline mode
@cindex koutline mode
@cindex file, importing
@cindex importing a file
+@cindex Koutline import
For information on mode and suffix-specific conversions performed on
file elements before they are inserted, see the documentation for the
variables, @code{kimport:mode-alist} and @code{kimport:suffix-alist}. This
@@ -4992,34 +4997,44 @@ have alphanumeric statement identifiers on the right
side. You can
import such files while maintaining their outline structure. Use
@bkbd{M-x kimport:aug-post-outline @key{RET}} and you will be
prompted for the Augment buffer or file to import and the koutline to
-create.
+create. See @url{https://dougengelbart.org/content/view/148/} for more
+information.
@node Exporting, , Inserting and Importing, Editing
@subsection Exporting
-@cindex outline, exporting from
+@cindex outline, exporting
@cindex outline, HTML conversion
@cindex exporting
@cindex HTML conversion
Koutlines may be @dfn{exported} to other file formats. Presently, the
only format supported is conversion to HTML for publishing on the
-World-Wide Web.
+World-Wide Web. Use the Kotl/Format minibuffer menu, @bkbd{C-h h k f},
+for this.
@findex kexport:display
@vindex browse-url-browser-function
-@bkbd{M-x kexport:display @key{RET}} exports the current Koutline buffer
-to a temporary HTML file and displays the file in the web browser given by
-@code{browse-url-browser-function}. Any tree in the HTML outline may be
-expanded or collapsed by clicking the left mouse button on its root cell,
-for ease of viewing.
+@kindex C-h h k f d
+@bkbd{C-h h k f d} or @bkbd{M-x kexport:display @key{RET}} exports the
+current Koutline buffer to a temporary HTML file and displays the file
+in the web browser given by @code{browse-url-browser-function}. Any tree
+in the HTML outline may be expanded or collapsed by clicking the left
+mouse button on its root cell, for ease of viewing.
@findex kexport:html
-Alternatively, @bkbd{M-x kexport:html @key{RET}} prompts for the koutline
-buffer or file to export, the HTML file or buffer to which to output, and
-the title to use for the HTML file. Completion of filenames is provided.
-The conversion will then be done and the output file or buffer will be
-written; the output file will not be displayed. You must display it
-manually if desired.
+@kindex C-h h k f h
+Alternatively, @bkbd{C-h h k f h} or @bkbd{M-x kexport:html @key{RET}}
+prompts for the koutline buffer or file to export, the HTML file or buffer
+to which to output, and the title to use for the HTML file. Completion of
+filenames is provided. The conversion will then be done and the output
+file or buffer will be written; the output file will not be displayed.
+You must display it manually, if desired.
+
+@findex kexport:koutline
+@kindex C-h h k f k
+@bkbd{C-h h k f k} or @bkbd{M-x kexport:koutline @key{RET}} exports the current
+Koutline buffer to a @file{.html} file of the same name. The output file will
+not be displayed; you must display it manually, if desired.
@node Viewing, Links, Editing, Koutliner
@section Viewing
diff --git a/man/version.texi b/man/version.texi
index 198403cbce..0a175c56ff 100644
--- a/man/version.texi
+++ b/man/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED January, 2022
-@set UPDATED-MONTH January 2022
+@set UPDATED February, 2022
+@set UPDATED-MONTH February 2022
@set EDITION 8.0.0pre
@set VERSION 8.0.0pre
diff --git a/test/kexport-tests.el b/test/kexport-tests.el
index 1a7b73d342..fd9375e1d0 100644
--- a/test/kexport-tests.el
+++ b/test/kexport-tests.el
@@ -5,7 +5,7 @@
;; Author: Mats Lidell <matsl@gnu.org>
;;
;; Orig-Date: 10-Oct-21 at 17:30:00
-;; Last-Mod: 24-Jan-22 at 00:41:36 by Bob Weiner
+;; Last-Mod: 5-Feb-22 at 16:24:59 by Bob Weiner
;;
;; Copyright (C) 2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
@@ -125,8 +125,8 @@
(delete-file kotl-file)
(delete-file html-file)))))
-(ert-deftest kexport:buffer-calls-kexport:html ()
- "kexport:buffer calls kexport:html and returns html buffer name."
+(ert-deftest kexport:koutline-calls-kexport:html ()
+ "kexport:koutline calls kexport:html and returns html buffer name."
(let* ((kotl-file (make-temp-file "hypb"))
(html-file (concat kotl-file ".html")))
(unwind-protect
@@ -137,7 +137,7 @@
(should (equal soft-newlines-flag nil))
nil)))
(find-file kotl-file)
- (should (string= (kexport:buffer) html-file)))
+ (should (string= (kexport:koutline) html-file)))
(progn
(delete-file kotl-file)))))