branch: externals/hyperbole commit b7b779338a1c89375c279d6ad2cd34a1383b306a Author: Bob Weiner <r...@gnu.org> Commit: Bob Weiner <r...@gnu.org>
kexport:html - Allow only Koutline buffers and files Also stop centering HTML title since often ends up to far to the right. --- ChangeLog | 6 ++++++ kotl/kexport.el | 20 +++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03e5ba5..7f7ff8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2021-09-05 Bob Weiner <r...@gnu.org> + +* kotl/kexport.el (kexport:html): Fix export-from parameter checks to + allow only Koutline buffers and files. Stop centering title since + often places it too far right. + 2021-08-19 Mats Lidell <ma...@gnu.org> * test/hbut-tests.el (hbut-tests:should-match-tmp-folder): Add check for diff --git a/kotl/kexport.el b/kotl/kexport.el index 34be7cc..c8cbd1d 100644 --- a/kotl/kexport.el +++ b/kotl/kexport.el @@ -225,14 +225,20 @@ hard newlines are not used. Also converts Urls and Klinks into Html hyperlinks. STILL TODO: Make delimited pathnames into file links (but not if within klinks). Copy attributes stored in cell 0 and attributes from each cell." - (interactive "fKoutline buffer/file to export: \nFHTML buffer/file to save to: \nP") + (interactive (list (read-file-name + "Koutline buffer/file to export: " nil buffer-file-name t) + (read-file-name "HTML buffer/file to save to: ") + current-prefix-arg)) (let* ((export-buf-name - (cond ((or (bufferp export-from) - (get-buffer export-from)) - (buffer-name (get-buffer export-from))) - ((get-file-buffer export-from) + (cond ((get-file-buffer export-from) (buffer-name (get-file-buffer export-from))) - ((stringp export-from) + ((and (or (bufferp export-from) + (get-buffer export-from)) + (kotl-mode:is-p)) + (buffer-name (get-buffer export-from))) + ((and (stringp export-from) + (string-match "\\.kotl$" export-from) + (file-readable-p export-from)) (buffer-name (find-file-noselect export-from))) (t (error "(kexport:html): `%s' is an invalid `export-from' argument" export-from)))) @@ -291,7 +297,7 @@ STILL TODO: ;; HTML (princ "</head>\n\n") (princ (format "<body %s>\n\n" kexport:html-body-attributes)) - (princ (format "<center><h1>%s</h1></center>\n\n" title)) + (princ (format "<h1>%s</h1>\n\n" title)) (let* ((separator (hypb:replace-match-string ">" (hypb:replace-match-string