Gebruik recente versies van packages.

[www2.vanrenterghem.biz.git] / maak-website.el

diff --git a/maak-website.el b/maak-website.el
index a30d8e28e4f59f53b44cf7de63e344a36ea20a7b..c93f1ccd7cab5039a0eda29b9678dc2d24db7e5a 100644 (file)
--- a/maak-website.el
+++ b/maak-website.el
@@ -1,6 +1,12 @@
 (require 'cl-lib)
 (require 'org)
 (require 'ox-publish)
+(add-to-list 'load-path "~/.emacs.d/elpa/ox-rss-20230408.231")
+(add-to-list 'load-path "~/.emacs.d/elpa/mustache-20230713.514")
+(add-to-list 'load-path "~/.emacs.d/elpa/s-20220902.1511")
+(add-to-list 'load-path "~/.emacs.d/elpa/dash-20240510.1327")
+(add-to-list 'load-path "~/.emacs.d/elpa/f-20240308.906 " )
+(add-to-list 'load-path "~/.emacs.d/elpa/htmlize-20240527.1456")
 (require 'ox-rss)
 (load "~/.emacs.d/lisp/mustache-html.el")
 
@@ -9,7 +15,7 @@
 (setq org-html-htmlize-output-type 'css) ; default: 'inline-css
 (setq org-time-stamp-custom-formats '("%A %e %B %Y" . "%A %e %B %Y at %H:%M"))
 (setq org-display-custom-times t)
-(setq org-html-container-element "section") ;; TODO - check
+(setq org-html-container-element "div") ;; TODO - check
 (setq my-blog-base-folder "~/websites/stage.vanrenterghem.biz")
 (setq my-blog-source-folder "~/websites/stage.vanrenterghem.biz/source")
 (setq my-blog-target-folder "~/websites/stage.vanrenterghem.biz/target")
@@ -48,14 +54,19 @@
 
 (defun my-blog-create-tags-files (plist)
   "Create org files for each tag defined in FILETAGS in posts, storing them in my-blog-tags-folder."
-  (unless (file-directory-p my-blog-tags-folder) (make-directory my-blog-tags-folder))
-  (with-temp-file (file-name-concat my-blog-source-folder "tag-index.org")
+  (let* ((tagfolder (file-name-concat
+                   (plist-get (cdr (assoc "landing" org-publish-project-alist)) :base-directory)))
+        (postfolder (file-name-concat
+                   (plist-get (cdr (assoc "posts" org-publish-project-alist)) :base-directory)))
+        (relpostfolder (file-relative-name  postfolder tagfolder)))
+    (unless (file-directory-p my-blog-tags-folder) (make-directory my-blog-tags-folder))
+    (with-temp-file (file-name-concat tagfolder "tag-index.org")
       (insert (concat "#+mustache-template: " (file-name-concat my-blog-mustache-folder "tags-index.mustache") "\n"))
       (insert (concat "#+TITLE: Blog - All tags\n"))
       (insert "#+OPTIONS: ^:nil\n") ; do not use underscores as subscript
       (insert "\n")
       (dolist (tag (sort (my-org-get-all-filetags) (lambda (x y) (string-lessp (car x) (car y))) ))
-       (insert (concat "- [[file:" (file-name-concat my-blog-posts-folder (concat "tag-" (car tag) ".org")) "][" (car tag) "]]\n")))) 
+       (insert (concat "- [[file:" (file-name-concat relpostfolder (concat "tag-" (car tag) ".org")) "][" (car tag) "]]\n"))))) 
   (dolist (tag (my-org-get-all-filetags))
     (with-temp-file (file-name-concat my-blog-tags-folder (concat "tag-" (car tag) ".org"))
       (insert (concat "#+mustache-template: " (file-name-concat my-blog-mustache-folder "tags.mustache") "\n"))
@@ -156,10 +167,10 @@ Either the section between #+BEGIN_PREVIEW and +#END_PREVIEW is used, or the fir
          (insert "#+END_export\n")
          (insert preview)
                                        ;(insert (concat "#+INCLUDE: \"" relpath "\" :only-contents t :lines \"1-10\"\n"))
-          (insert "\n")
+         (insert "\n")
           (insert (concat "[[file:" relpath "][Read More...]]\n"))
          (insert "#+BEGIN_export html\n")
-         (insert "<\/section>\n")
+         (insert "</section> <!-- END CARD-BODY-->\n")
          (insert "#+END_export\n")
          ))
       ;; kill the first hrule to make this look OK
@@ -195,14 +206,15 @@ representation for the files to include, as returned by
 
 (defun my-blog-cleanup-sitemaps (plist)
   "Clean up temporary files created in the process of publishing"
-  ;; Create a body-only version of the tags index.
+  ;; Create a body-only version of the tags index. Needs absolute path to posts folder.
   (with-temp-file (file-name-concat
-                  (plist-get (cdr (assoc "posts" org-publish-project-alist)) :publishing-directory)
+                  (plist-get (cdr (assoc "landing" org-publish-project-alist)) :publishing-directory)
                   "tag-index-body.html")
     (insert-file-contents (file-name-concat
                           (plist-get (cdr (assoc "landing" org-publish-project-alist)) :base-directory)
                           "tag-index.org"))
-    (org-export-to-buffer 'mustache-html (current-buffer) nil nil nil t nil))
+    (org-export-to-buffer 'mustache-html (current-buffer) nil nil nil t nil)
+    (replace-string "href=\"posts" "href=\"/posts"))
   (delete-file (file-name-concat my-blog-source-folder "sitemap.org"))
   (delete-file (file-name-concat my-blog-posts-folder "sitemap.org"))
   (delete-file (file-name-concat my-blog-posts-folder "sitemap.org~")))