X-Git-Url: https://git.korewanetadesu.com/?p=pelican-mode.git;a=blobdiff_plain;f=pelican-mode.el;h=5fa2179c2a803587e24ecd7dfefdb83bcc282c16;hp=85d2be924aeb5f1660a6cf80b031e172bf894657;hb=c9586c17fd94ebfb8dd712f30dcf224ea130a8f9;hpb=2442f07f94c4b90bceae26d04fa593d3a9eba3ff diff --git a/pelican-mode.el b/pelican-mode.el index 85d2be9..5fa2179 100644 --- a/pelican-mode.el +++ b/pelican-mode.el @@ -29,9 +29,11 @@ ;; process a variety of text file formats. For more information, see ;; URL https://blog.getpelican.com/. ;; -;; It's intended to be used alongside `markdown-mode' or `rst-mode'. -;; It also assumes you've set up Pelican with ``pelican-quickstart'' -;; or something like it. In particular it assumes: +;; It's intended to be used alongside a major mode for the Pelican +;; document. Currently supported formats are Markdown, +;; reStructuredText, AsciiDoc, and Org. It also assumes you've set up +;; Pelican with ``pelican-quickstart'' or something like it. In +;; particular it expects: ;; ;; * The existence of ``pelicanconf.py'' and ``Makefile'' in some ;; ancestor directory. @@ -80,7 +82,7 @@ for editing articles or pages: (,(kbd "C-c P f") . pelican-set-field) (,(kbd "C-c P h") . pelican-make-html) (,(kbd "C-c P n") . pelican-mode-insert-header) - (,(kbd "C-c P p") . pelican-mode-publish-draft) + (,(kbd "C-c P p") . pelican-mode-publish) (,(kbd "C-c P u") . pelican-make-rsync-upload))) ;;;###autoload @@ -170,7 +172,7 @@ When called from Lisp, VALUE may be any value; except for the following special values, the unquoted printed representation of it is used: -- `now' means the current time; see `pelican-mode-timestamp'. +- `now' means the current time. - `slug' means the file's path relative to the document root sans extension; see `pelican-mode-default-slug'. @@ -181,7 +183,7 @@ The buffer must be in a format listed in `pelican-mode-formats' for this function to work correctly." (interactive "sField: \nsValue: ") (setq value (pcase value - ('now (pelican-mode-timestamp)) + ('now (format-time-string "%Y-%m-%d %H:%M")) ('slug (pelican-mode-default-slug)) ('"" nil) (_ value))) @@ -213,19 +215,22 @@ than the modification date." (interactive "P") (pelican-mode-set-field (if original :date :modified) 'now)) -(defun pelican-mode-publish-draft () - "Remove draft status from a Pelican article." +(defun pelican-mode-publish () + "Remove draft or hidden status from a Pelican article." (interactive) (pelican-mode-remove-field :status) (pelican-mode-update-date :date)) -(defun pelican-mode-insert-draft-article-header (title tags) - "Insert a Pelican header for a draft with a TITLE and TAGS." +(defun pelican-mode-insert-article-header (title tags) + "Insert a Pelican header for an article with a TITLE and TAGS." (interactive "sArticle title: \nsTags: ") - (apply #'pelican-mode-set-fields - `(:title ,title - ,@pelican-mode-default-article-fields - :tags ,tags))) + (save-excursion + (goto-char 0) + (insert "\n") + (apply #'pelican-mode-set-fields + `(:title ,title + ,@pelican-mode-default-article-fields + :tags ,tags)))) (defun pelican-mode-insert-page-header (title &optional hidden) "Insert a Pelican header for a page with a TITLE. @@ -233,10 +238,13 @@ than the modification date." If HIDDEN is non-nil, the page is marked hidden; otherwise it has no status." (interactive "sPage title: \nP") - (apply #'pelican-mode-set-fields - (append - (list :title title :status (when hidden "hidden")) - pelican-mode-default-page-fields))) + (save-excursion + (goto-char 0) + (insert "\n") + (apply #'pelican-mode-set-fields + (append + (list :title title :status (when hidden "hidden")) + pelican-mode-default-page-fields)))) (defun pelican-mode-insert-header () "Insert a Pelican header for a page or article." @@ -244,7 +252,7 @@ has no status." (call-interactively (if (pelican-mode-page-p) #'pelican-mode-insert-page-header - #'pelican-mode-insert-draft-article-header))) + #'pelican-mode-insert-article-header))) (defun pelican-make (target) "Execute TARGET in a Makefile at the root of the site." @@ -266,10 +274,6 @@ has no status." -(defun pelican-mode-timestamp (&optional time) - "Generate a pelican-mode-compatible timestamp for TIME." - (format-time-string "%Y-%m-%d %H:%M" time)) - (defun pelican-mode-set-fields (&rest fields) "Insert a Pelican header for an article with metadata FIELDS." (mapc (apply-partially #'apply #'pelican-mode-set-field) @@ -343,22 +347,20 @@ has no status." (defun pelican-mode-page-p () "Return non-nil the current buffer is a Pelican page." - (when-let (pelican-mode-base (pelican-mode-find-root)) - (let* ((relative (file-relative-name buffer-file-name pelican-mode-base)) - (components (split-string relative "/"))) - (equal "pages" (cadr components))))) + (string-match-p + "^[^/]+/pages/" + (file-relative-name + (abbreviate-file-name (or (buffer-file-name) (buffer-name))) + (pelican-mode-find-root)))) (defun pelican-mode-default-slug () - "Generate a Pelican article/page slug for the current buffer." - (if-let ((pelican-mode-base (pelican-mode-find-root)) - (file-name (file-name-sans-extension buffer-file-name))) - (let* ((relative (file-relative-name file-name pelican-mode-base)) - (components (cdr (split-string relative "/"))) - (components (if (string= "pages" (car components)) - (cdr components) components))) - (mapconcat 'identity components "/")) - (when-let (file-name (file-name-sans-extension buffer-file-name)) - (file-name-base file-name)))) + "Generate a Pelican slug for the current buffer." + (file-name-sans-extension + (replace-regexp-in-string + "^[^/]+/\\(?:pages/\\)?" "" + (file-relative-name + (abbreviate-file-name (or (buffer-file-name) (buffer-name))) + (pelican-mode-find-root))))) (defun pelican-mode-find-root () "Return the root of the buffer's Pelican site, or nil."