X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=elpher.git;a=blobdiff_plain;f=elpher.el;h=8f967cfbb7516e010311f17b3fe4075a0a5bc491;hp=c2c24a89ea53c5965a5a85b27ece5a94019e7e0f;hb=2043d24c32ba47699ef37e95d269a54117eef679;hpb=770de5d967e8517b13d3865482cdda7078f6a3ba diff --git a/elpher.el b/elpher.el index c2c24a8..8f967cf 100644 --- a/elpher.el +++ b/elpher.el @@ -103,7 +103,7 @@ ;;; Global constants ;; -(defconst elpher-version "2.10.2" +(defconst elpher-version "2.11.0" "Current version of elpher.") (defconst elpher-margin-width 6 @@ -135,11 +135,15 @@ ;;; Internal variables ;; -(defvar elpher--gemini-page-links '() - "Internal variable containing list of links on page.") +;; buffer-local +(defvar elpher--gemini-page-headings nil + "List of headings on the page.") + +(defvar elpher--gemini-page-links nil + "List of links on the page.") (defvar elpher--gemini-page-links-cache (make-hash-table :test 'equal) - "Internal variable containing hash of addresses and page links.") + "Hash of addresses and page links.") ;;; Customization group ;; @@ -186,7 +190,7 @@ These certificates may be used for establishing authenticated TLS connections." :type '(file)) (defcustom elpher-default-url-type "gopher" - "Default URL type to assume if not explicitly given." + "Default URL type (i.e. scheme) to assume if not explicitly given." :type '(choice (const "gopher") (const "gemini"))) @@ -632,7 +636,7 @@ If LINE is non-nil, replace that line instead." "Preprocess text selector response contained in STRING. This involes decoding the character representation, and clearing away CRs and any terminating period." - (elpher-decode (replace-regexp-in-string "\n\.\n$" "\n" + (elpher-decode (replace-regexp-in-string "\n\\.\n$" "\n" (replace-regexp-in-string "\r" "" string)))) @@ -1049,7 +1053,7 @@ If ADDRESS is not supplied or nil the record is rendered as an ;; Text rendering (defconst elpher-url-regex - "\\([a-zA-Z]+\\)://\\([a-zA-Z0-9.\-]*[a-zA-Z0-9\-]\\|\[[a-zA-Z0-9:]+\]\\)\\(:[0-9]+\\)?\\(/\\([0-9a-zA-Z\-_~?/@|:.%#=&]*[0-9a-zA-Z\-_~?/@|#]\\)?\\)?" + "\\([a-zA-Z]+\\)://\\([a-zA-Z0-9.-]*[a-zA-Z0-9-]\\|\\[[a-zA-Z0-9:]+\\]\\)\\(:[0-9]+\\)?\\(/\\([0-9a-zA-Z_~?/@|:.%#=&-]*[0-9a-zA-Z_~?/@|#-]\\)?\\)?" "Regexp used to locate and buttinofy URLs in text files loaded by elpher.") (defun elpher-buttonify-urls (string) @@ -1457,6 +1461,8 @@ by HEADER-LINE." (/ (* fill-column (font-get (font-spec :name (face-font 'default)) :size)) (font-get (font-spec :name (face-font face)) :size)) fill-column))) + (setq elpher--gemini-page-headings (cons (cons header (point)) + elpher--gemini-page-headings)) (unless (display-graphic-p) (insert (make-string level ?#) " ")) (insert (propertize header 'face face)) @@ -1466,13 +1472,13 @@ by HEADER-LINE." "Insert a plain non-preformatted TEXT-LINE into a text/gemini document. This function uses Emacs' auto-fill to wrap text sensibly to a maximum width defined by elpher-gemini-max-fill-width." - (string-match "\\(^[ \t]*\\)\\(\*[ \t]+\\|>[ \t]*\\)?" text-line) + (string-match "\\(^[ \t]*\\)\\(\\*[ \t]+\\|>[ \t]*\\)?" text-line) (let* ((line-prefix (match-string 2 text-line)) (processed-text-line (if line-prefix (cond ((string-prefix-p "*" line-prefix) (concat - (replace-regexp-in-string "\*" + (replace-regexp-in-string "\\*" elpher-gemini-bullet-string (match-string 0 text-line)) (substring text-line (match-end 0)))) @@ -1487,6 +1493,7 @@ width defined by elpher-gemini-max-fill-width." (defun elpher-render-gemini-map (data _parameters) "Render DATA as a gemini map file, PARAMETERS is currently unused." (elpher-with-clean-buffer + (setq elpher--gemini-page-headings nil) (let ((preformatted nil) (link-counter 1)) (auto-fill-mode 1) @@ -1510,6 +1517,7 @@ width defined by elpher-gemini-max-fill-width." (elpher-gemini-insert-link line))) ((string-prefix-p "#" line) (elpher-gemini-insert-header line)) (t (elpher-gemini-insert-text line))))) + (setq elpher--gemini-page-headings (nreverse elpher--gemini-page-headings)) (elpher-cache-content (elpher-page-address elpher-current-page) (buffer-string)) @@ -1630,8 +1638,8 @@ The result is rendered using RENDERER." "Alternatively, select a search engine and enter some search terms:\n") (elpher-insert-index-record "Gopher Search Engine (Veronica-2)" (elpher-make-gopher-address ?7 "/v2/vs" "gopher.floodgap.com" 70)) - (elpher-insert-index-record "Gemini Search Engine (GUS)" - (elpher-address-from-url "gemini://gus.guru/search")) + (elpher-insert-index-record "Gemini Search Engine (geminispace.info)" + (elpher-address-from-url "gemini://geminispace.info/search")) (insert "\n" "This page contains your bookmarked sites (also visit with B):\n") (elpher-insert-index-record "Your Bookmarks" 'bookmarks) @@ -1808,7 +1816,9 @@ If ADDRESS is already bookmarked, update the label only." ;; Use elpher to open gopher, finger and gemini links (when (boundp 'browse-url-default-handlers) (add-to-list 'browse-url-default-handlers - '("^\\(gopher\\|finger\\|gemini\\)://" . browse-url-elpher))) + '("^\\(gopher\\|finger\\|gemini\\)://" . browse-url-elpher)))) + +(with-eval-after-load "thingatpt" ;; Register "gemini://" as a URI scheme so `browse-url' does the right thing (add-to-list 'thing-at-point-uri-schemes "gemini://")) @@ -1846,10 +1856,10 @@ When run interactively HOST-OR-URL is read from the minibuffer." "Go to a particular site read from the minibuffer, initialized with the current URL." (interactive) (let ((address (elpher-page-address elpher-current-page))) - (if (elpher-address-special-p address) - (error "Command invalid for this page") - (let ((url (read-string "Gopher or Gemini URL: " (elpher-address-to-url address)))) - (elpher-visit-page (elpher-make-page url (elpher-address-from-url url))))))) + (let ((url (read-string "Gopher or Gemini URL: " + (unless (elpher-address-special-p address) + (elpher-address-to-url address))))) + (elpher-visit-page (elpher-make-page url (elpher-address-from-url url)))))) (defun elpher-visit-gemini-numbered-link (n) "Visit link designated by a number." @@ -2159,9 +2169,14 @@ When run interactively HOST-OR-URL is read from the minibuffer." This mode is automatically enabled by the interactive functions which initialize the gopher client, namely `elpher', `elpher-go' and `elpher-bookmarks'." + (setq-local elpher--gemini-page-headings nil) (setq-local elpher-current-page nil) (setq-local elpher-history nil) - (setq-local elpher-buffer-name (buffer-name))) + (setq-local elpher-buffer-name (buffer-name)) + + (setq-local imenu-create-index-function + (lambda () + elpher--gemini-page-headings))) (when (fboundp 'evil-set-initial-state) (evil-set-initial-state 'elpher-mode 'motion))