From 455bb137ad35a7a856fe058bb1e3e98ec340ba41 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Fri, 29 Nov 2019 12:07:09 -0500 Subject: [PATCH] replace uses of `a' with my more convenient `aa' wrapper --- haunt.scm | 195 ++++++++++++++++++++++-------------------------------- 1 file changed, 80 insertions(+), 115 deletions(-) diff --git a/haunt.scm b/haunt.scm index 7be77b3..27f2719 100644 --- a/haunt.scm +++ b/haunt.scm @@ -16,6 +16,9 @@ `(link (@ (rel "stylesheet") (href ,(string-append "/" name ".css"))))) +(define* (aa content #:optional (uri content) . title) + `(a (@ (href ,uri) (title ,(apply string-append title))) ,content)) + (define* (base-layout site body #:key title) `((doctype "html") (html @@ -29,8 +32,7 @@ (main ,body) (footer (p - "Copyright 2016–2019 Amin Bandali. See " - (a (@ (href "license.html")) "license.html") + "Copyright 2016–2019 Amin Bandali. See " ,(aa "license.html") " for license conditions. Please copy and share.")))))) (define my-date-format "~B ~d, ~Y") @@ -38,25 +40,20 @@ (define (my-post-template post) `((header (h1 ,(post-ref post 'title)) - (address "By " - (a (@ (href "/")) - ,(post-ref post 'author)) + (address "By " ,(aa (post-ref post 'author) "/") " <" ,(post-ref post 'email) ">") (p (@ (class "date")) ,(date->string (post-date post) my-date-format))) ,(post-sxml post) (p (@ (class "muted inbox")) "Have a question or comment? Start a discussion in my " - (a (@ (href "https://lists.sr.ht/~bandali/public-inbox")) - "public inbox") + ,(aa "public inbox" "https://lists.sr.ht/~bandali/public-inbox") " by sending an email to " - (a (@ (href "mailto:~bandali/public-inbox@lists.sr.ht")) - "~bandali/public-inbox@lists.sr.ht") + ,(aa "~bandali/public-inbox@lists.sr.ht" + "mailto:~bandali/public-inbox@lists.sr.ht") (small - " [" - (a (@ (href "https://man.sr.ht/lists.sr.ht/etiquette.md")) - "mailing list etiquette") - "]") + " [" ,(aa "mailing list etiquette" + "https://man.sr.ht/lists.sr.ht/etiquette.md") "]") "."))) (define (my-collection-template site title posts prefix) @@ -68,9 +65,9 @@ (ul ,@(map (lambda (post) `(li - (a (@ (href ,(post-uri post))) - ,(post-ref post 'title)) - " — " ,(date->string (post-date post) my-date-format))) + ,(aa (post-ref post 'title) (post-uri post)) + " — " + ,(date->string (post-date post) my-date-format))) posts)))) (define bandali-theme @@ -94,17 +91,13 @@ "Amin Bandali") (p (@ (style "margin-top: 0;")) "Hi, I’m " - (a (@ (href "images/bandali-with-rms.jpg") - (title ,(string-append - "photo of bandali with rms wearing a " - "“pay cash don’t be tracked” pin"))) - "Amin Bandali") + ,(aa "Amin Bandali" "images/bandali-with-rms.jpg" + "photo of bandali with rms wearing a " + "“pay cash don’t be tracked” pin") ". I’m a graduate student at " - (a (@ (href "https://watform.uwaterloo.ca")) - "WatForm") + ,(aa "WatForm" "https://watform.uwaterloo.ca") " at University of Waterloo, supervised by " - (a (@ (href "https://cs.uwaterloo.ca/~nday/")) - "Dr. Nancy Day") + ,(aa "Dr. Nancy Day" "https://cs.uwaterloo.ca/~nday/") ". The main goal of my research is improving " (strong "software and systems reliability") " through application of " (em "formal methods") ".") @@ -112,63 +105,49 @@ "checking, and verification. I’m also interested in " "programming languages, theorem provers, and their " "type systems. You may wish to view my academic " - (a (@ (href "bandali-cv.html")) "curriculum vitae") ".") + ,(aa "curriculum vitae" "bandali-cv.html") ".") (p (@ (class "notice")) (strong "SE 212 students: ") - "see " (a (@ (href "se212-f19/")) "here") " for slides and " - "other material from the tutorials.") + "see " ,(aa "here" "se212-f19/") " for slides and other " + "material from the tutorials.") (p "On the side, I dabble in " - (a (@ (href "https://leanprover.github.io")) "Lean") - " and enjoy " - (a (@ (href "https://stallman.org/articles/on-hacking.html")) - "hacking") + ,(aa "Lean" "https://leanprover.github.io") " and enjoy " + ,(aa "hacking" "https://stallman.org/articles/on-hacking.html") " on " - (a (@ (href "https://www.gnu.org/software/emacs/manual/elisp.html")) - "Elisp") - ". I’m a " - (a (@ (href "https://www.gnu.org/philosophy/free-sw.html")) - "Free Software") + ,(aa "Elisp" + "https://www.gnu.org/software/emacs/manual/elisp.html") + ". I’m a " ,(aa "Free Software" + "https://www.gnu.org/philosophy/free-sw.html") " activist, a GNU " - (a (@ (href "https://www.gnu.org/people/#bandali")) - "maintainer") + ,(aa "maintainer" "https://www.gnu.org/people/#bandali") " and " - (a (@ (href "https://www.gnu.org/people/webmeisters.html#bandali")) - "webmaster") - ", and an " - (a (@ (href "https://www.fsf.org/associate/")) - "associate member") - " of the " (a (@ (href "https:///www.fsf.org") - (title "Free Software Foundation")) "FSF") - ". I co-host the " - (a (@ (href "https://emacsel.com")) "Emacs.el") - " podcast with " - (a (@ (href "https://www.pygopar.com")) "Daniel Gopar") - ", and organize " - (a (@ (href "https://emacsconf.org")) "EmacsConf") " with help" - " from many wonderful people. I am also a member of the" - " Systems Committee for the " - (a (@ (href "https://csclub.uwaterloo.ca") - (title ,(string-append - "Computer Science Club of the " - "University of Waterloo"))) "CSC") + ,(aa "webmaster" + "https://www.gnu.org/people/webmeisters.html#bandali") + ", and an " ,(aa "associate member" + "https://www.fsf.org/associate/") + " of the " ,(aa "FSF" "https:///www.fsf.org" + "Free Software Foundation") + ". I co-host the " ,(aa "Emacs.el" "https://emacsel.com") + " podcast with " ,(aa "Daniel Gopar" "https://www.pygopar.com") + ", and organize " ,(aa "EmacsConf" "https://emacsconf.org") + " with help from many wonderful people. I am also a member of" + " the Systems Committee for the " + ,(aa "CSC" "https://csclub.uwaterloo.ca" + "Computer Science Club of the University of Waterloo") ".") - (p "See my " (a (@ (href "contact.html")) "contact") " page for " - "how to best reach me.") + (p "See my " ,(aa "contact" "contact.html") " page for how to " + "best reach me.") (h2 (@ (id "papers")) "Papers") (dl (dt "A Comparison of the Declarative Modelling Languages B, DASH, and TLA" (sup "+") (small - " [ " - (a (@ (href "papers/modre2018-declarative.pdf")) "pdf") - " | " - (a (@ (href "papers/modre2018-declarative.bib")) "bib") - " ]")) + " [ " ,(aa "pdf" "papers/modre2018-declarative.pdf") " | " + ,(aa "bib" "papers/modre2018-declarative.bib") " ]")) (dd "Ali Abbassi, " - (a (@ (href "https://bandali.eu.org")) "Amin Bandali") ", " - (a (@ (href "https://cs.uwaterloo.ca/~nday/")) - "Nancy A. Day") - ", and Jose Serna" + ,(aa "Amin Bandali" "https://bandali.eu.org") ", " + ,(aa "Nancy A. Day" "https://cs.uwaterloo.ca/~nday/") ", " + "Jose Serna" (br) (em "2018 IEEE 8th International Model-Driven Requirements" " Engineering Workshop (MoDRE)") @@ -178,45 +157,34 @@ (dl (dt "The Magic of Specifications and Type Systems" - (span (@ (class "plinks")) - " [ " - (a (@ (href "talks/cucsc-2017-slides.pdf") - (title ,(string-append - "presented at the Canadian Undergraduate" - " Computer Science Conference 2017,\n" - "University of Toronto, Canada," - "June 15–17, 2017"))) - "slides") - " | " - (a (@ (href "talks/eecs4080-poster.pdf") - (title ,(string-append - "presented at the Lassonde Undergraduate" - " Summer Student Research Conference,\n" - "York University, Toronto, Canada," - "August 15, 2017"))) - "poster") - " ]")) - (dd (a (@ (href "https://bandali.eu.org")) "Amin Bandali") ", " - (a (@ (href "https://github.com/cipher1024")) - "Simon Hudon") - ", " - (a (@ (href "http://www.cse.yorku.ca/~jonathan/")) - "Jonathan S. Ostroff"))) + (small + " [ " + ,(aa "slides" "talks/cucsc-2017-slides.pdf" + "presented at the Canadian Undergraduate Computer Science" + " Conference 2017,\n" + "University of Toronto, Canada, June 15–17, 2017") + " | " + ,(aa "poster" "talks/eecs4080-poster.pdf" + "presented at the Lassonde Undergraduate Summer Student" + " Research Conference,\n" + "York University, Toronto, Canada, August 15, 2017") + " ]")) + (dd ,(aa "Amin Bandali" "https://bandali.eu.org") ", " + ,(aa "Simon Hudon" "https://github.com/cipher1024") ", " + ,(aa "Jonathan S. Ostroff" + "http://www.cse.yorku.ca/~jonathan/"))) (h2 (@ (id "projects")) "Projects") (p "Below are a number of free software projects I have worked " "on:") (dl - (dt (a (@ (href "https://git.sr.ht/~bandali/george-mode")) - "george-mode")) + (dt ,(aa "george-mode" "https://git.sr.ht/~bandali/george-mode")) (dd "Emacs major mode for editing George files") - (dt (a (@ (href "https://git.uwaterloo.ca/bandali/alloy-catalyst")) - "alloy-catalyst")) + (dt ,(aa "alloy-catalyst" + "https://git.uwaterloo.ca/bandali/alloy-catalyst")) (dd "Framework for performance analysis of Alloy models") - (dt (a (@ (href "https://github.com/unitb/unitb-web")) - "unitb-web")) + (dt ,(aa "unitb-web" "https://github.com/unitb/unitb-web")) (dd "Web interface for Unit-B") - (dt (a (@ (href "https://github.com/unitb/tex2png-hs")) - "tex2png-hs")) + (dt ,(aa "tex2png-hs" "https://github.com/unitb/tex2png-hs")) (dd "Library and CLI for converting TeX and LaTeX to PNG " "images")) (h2 (@ (id "notes")) "Notes") @@ -229,8 +197,7 @@ (string-append "/" (site-post-slug site post) ".html")) `(tr - (td (a (@ (href ,(post-uri post))) - ,(post-ref post 'title))) + (td ,(aa (post-ref post 'title) (post-uri post))) (td (@ (style "font-size: 0.875em;")) ,(date->string (post-date post) my-date-format)))) (take-up-to 10 (posts/reverse-chronological posts))))))) @@ -247,25 +214,23 @@ "license.html" `((h1 "License information for bandali.eu.org") (p "I strongly believe in " - (a (@ (href "https://questioncopyright.org/what_is_free_culture")) - "free culture") + ,(aa "free culture" + "https://questioncopyright.org/what_is_free_culture") " and that all creative works everywhere should be " - (a (@ (href "https://freedomdefined.org/Definition")) "free" - ".")) + ,(aa "free" "https://freedomdefined.org/Definition") ".") (p "Unless otherwise noted material on this site is licensed " "under the GNU General Public License as published by the " "Free Software Foundation, either version 3 of the License, " "or (at your option) any later version. A copy of the " - "license is included at " - (a (@ (href "gpl-3.0.html")) "gpl-3.0.html") ".") + "license is included at " ,(aa "gpl-3.0.html") ".") (p "Some resources on free software and licenses:") (ul - (li (a (@ (href "https://www.gnu.org/philosophy/free-sw.html")) - "What is free software?")) - (li (a (@ (href "https://www.gnu.org/licenses/license-list.html")) - "Various Licenses and Comments about Them")) - (li (a (@ (href "https://www.gnu.org/proprietary/proprietary.html")) - "Proprietary Software Is Often Malware")))))) + (li ,(aa "What is free software?" + "https://www.gnu.org/philosophy/free-sw.html")) + (li ,(aa "Various Licenses and Comments about Them" + "https://www.gnu.org/licenses/license-list.html")) + (li ,(aa "Proprietary Software Is Often Malware" + "https://www.gnu.org/proprietary/proprietary.html")))))) (define my-domain "bandali.eu.org") -- 2.20.1