[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/hyperbole 0e53e046c6 1/3: Fix interactively HTML collap
From: |
ELPA Syncer |
Subject: |
[elpa] externals/hyperbole 0e53e046c6 1/3: Fix interactively HTML collapsible trees; remove is-collapsible flag |
Date: |
Sun, 29 Jan 2023 03:57:59 -0500 (EST) |
branch: externals/hyperbole
commit 0e53e046c6f03d29add6ef6e7285eca5e97a91d3
Author: Bob Weiner <rsw@gnu.org>
Commit: Bob Weiner <rsw@gnu.org>
Fix interactively HTML collapsible trees; remove is-collapsible flag
---
hact.el | 4 ++--
kotl/kexport.el | 11 ++++-------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/hact.el b/hact.el
index 0478e61f3a..bcc0c06ab1 100644
--- a/hact.el
+++ b/hact.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 18-Sep-91 at 02:57:09
-;; Last-Mod: 7-Oct-22 at 23:01:56 by Mats Lidell
+;; Last-Mod: 27-Jan-23 at 17:40:04 by Bob Weiner
;;
;; Copyright (C) 1991-2022 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
@@ -158,7 +158,7 @@ If no SYMBOLS are given, set it to the empty set. Return
the symset. Uses
(defun symset:add (elt symbol property)
"Add ELT to SYMBOL's PROPERTY set.
-Return nil iff ELT is already in SET; otherwise, return PROPERTY's value.
+Return nil iff ELT is already in the set; otherwise, return PROPERTY's value.
Use `eq' for comparison."
(let* ((set (get symbol property))
(set:equal-op 'eq)
diff --git a/kotl/kexport.el b/kotl/kexport.el
index d0fca68564..fc109c4a16 100644
--- a/kotl/kexport.el
+++ b/kotl/kexport.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 26-Feb-98
-;; Last-Mod: 21-Nov-22 at 00:21:03 by Bob Weiner
+;; Last-Mod: 28-Jan-23 at 23:11:25 by Bob Weiner
;;
;; Copyright (C) 1998-2022 Free Software Foundation, Inc.
;; See the "../HY-COPY" file for license information.
@@ -471,11 +471,8 @@ used. Also converts Urls and Klinks into Html hyperlinks.
(setq level (kcell-view:level)
i level
is-parent (kcell-view:child-p)
- is-collapsible (save-excursion
- (goto-char (kcell-view:start))
- (search-forward "\n"
(kcell-view:end-contents) t))
is-last-sibling (not (kcell-view:sibling-p)))
- (when (or is-parent is-collapsible)
+ (when is-parent
(push is-last-sibling no-sibling-stack)
(princ "<button type=\"button\" class=\"collapsible\">\n"))
(while (> i 1)
@@ -485,7 +482,7 @@ used. Also converts Urls and Klinks into Html hyperlinks.
;; (princ "<td width=1% valign=top>")
(princ "<td width=1%>")
(princ (format "<span class=\"fas fa-chevron-down
fa-fw\"%s></span>"
- (if (or is-parent is-collapsible)
+ (if is-parent
""
;; Fill same space for alignment but don't
;; show collapsible chevron when not collapsible
@@ -516,7 +513,7 @@ used. Also converts Urls and Klinks into Html hyperlinks.
(while (> i 1)
(princ "</ul>")
(setq i (1- i)))
- (cond ((or is-parent is-collapsible)
+ (cond (is-parent
(princ "\n</button>\n<div class=\"content\">\n"))
((and (/= level 1) is-last-sibling)
(princ "\n</div>")