further tweak style and fix indentation

[~bandali/bndl.org] / haunt.scm

diff --git a/haunt.scm b/haunt.scm
index db736a6..f1fe078 100644 (file)
--- a/haunt.scm
+++ b/haunt.scm
@@ -12,6 +12,13 @@
              (ice-9 match)
              (srfi srfi-19))
 
              (ice-9 match)
              (srfi srfi-19))
 

+(define my-scheme 'https)
+(define my-domain "bandali.eu.org")
+(define my-url
+  (string-append (symbol->string my-scheme) "://" my-domain))
+
+(define my-date-format "~B ~d, ~Y")
+

 (define (stylesheet name)
   `(link (@ (rel "stylesheet")
             (href ,(string-append "/" name ".css")))))
 (define (stylesheet name)
   `(link (@ (rel "stylesheet")
             (href ,(string-append "/" name ".css")))))


@@ -32,10 +39,12 @@
       (main ,body)
       (footer
        (p
       (main ,body)
       (footer
        (p

-        "Copyright 2016–2019 Amin Bandali.  See " ,(aa "license.html")
-        " for license conditions. Please copy and share."))))))
+        "Copyright 2016–2019 Amin Bandali.  See "
+        ,(aa "license.html" "/license.html") " for license "
+        "conditions. Please copy and share."))))))

 
 

-(define my-date-format "~B ~d, ~Y")
+
+(register-metadata-parser! 'updated string->date*)

 
 (define (my-post-template post)
   `((header
 
 (define (my-post-template post)
   `((header


@@ -43,7 +52,13 @@
      (address "By " ,(aa (post-ref post 'author) "/")
               " <" ,(post-ref post 'email) ">")
      (p (@ (class "date"))
      (address "By " ,(aa (post-ref post 'author) "/")
               " <" ,(post-ref post 'email) ">")
      (p (@ (class "date"))

-        ,(date->string (post-date post) my-date-format)))
+        "Published "
+        ,(date->string (post-date post) my-date-format))
+     ,(if (post-ref post 'updated)
+          `(p (@ (class "updated"))
+              "Updated "
+              ,(date->string (post-ref post 'updated)
+                             my-date-format)) ""))

     ,(post-sxml post)
     (p (@ (class "muted inbox"))
        "Have a question or comment?  Start a discussion in my "
     ,(post-sxml post)
     (p (@ (class "muted inbox"))
        "Have a question or comment?  Start a discussion in my "


@@ -61,14 +76,16 @@
     (string-append (or prefix "") "/"
                    (site-post-slug site post) ".html"))
 
     (string-append (or prefix "") "/"
                    (site-post-slug site post) ".html"))
 

-  `((h3 ,title)
-    (ul
-     ,@(map (lambda (post)
-              `(li
-                ,(aa (post-ref post 'title) (post-uri post))
-                " — "
-                ,(date->string (post-date post) my-date-format)))
-            posts))))
+  `((h2 ,title)
+    (table
+     (@ (class "post-list"))
+     (tbody
+      ,@(map (lambda (post)
+               `(tr
+                 (td ,(aa (post-ref post 'title) (post-uri post)))
+                 (td (@ (style "font-size: 0.875em;"))
+                     ,(date->string (post-date post) my-date-format))))
+             posts)))))

 
 (define bandali-theme
   (theme #:name "bandali"
 
 (define bandali-theme
   (theme #:name "bandali"


@@ -145,7 +162,7 @@
            " [ " ,(aa "pdf" "papers/modre2018-declarative.pdf") " | "
            ,(aa "bib" "papers/modre2018-declarative.bib") " ]"))
      (dd "Ali Abbassi, "
            " [ " ,(aa "pdf" "papers/modre2018-declarative.pdf") " | "
            ,(aa "bib" "papers/modre2018-declarative.bib") " ]"))
      (dd "Ali Abbassi, "

-         ,(aa "Amin Bandali" "https://bandali.eu.org") ", "
+         ,(aa "Amin Bandali" my-url) ", "

          ,(aa "Nancy A. Day" "https://cs.uwaterloo.ca/~nday/") ", "
          "Jose Serna"
          (br)
          ,(aa "Nancy A. Day" "https://cs.uwaterloo.ca/~nday/") ", "
          "Jose Serna"
          (br)


@@ -169,7 +186,7 @@
             " Research Conference,\n"
             "York University, Toronto, Canada, August 15, 2017")
        " ]"))
             " Research Conference,\n"
             "York University, Toronto, Canada, August 15, 2017")
        " ]"))

-     (dd ,(aa "Amin Bandali" "https://bandali.eu.org") ", "
+     (dd ,(aa "Amin Bandali" my-url) ", "

          ,(aa "Simon Hudon" "https://github.com/cipher1024") ", "
          ,(aa "Jonathan S. Ostroff"
               "http://www.cse.yorku.ca/~jonathan/")))
          ,(aa "Simon Hudon" "https://github.com/cipher1024") ", "
          ,(aa "Jonathan S. Ostroff"
               "http://www.cse.yorku.ca/~jonathan/")))


@@ -188,19 +205,22 @@
      (dd "Library and CLI for converting TeX and LaTeX to PNG "
          "images"))
     (h2 (@ (id "notes")) "Notes")
      (dd "Library and CLI for converting TeX and LaTeX to PNG "
          "images"))
     (h2 (@ (id "notes")) "Notes")

+    (p "Here are notes about a variety of topics and issues I care "
+       "about.  They’re also available via " ,(aa "Atom" "feed.atom")
+       " and " ,(aa "RSS" "feed.rss") " feeds.")

     (table
      (@ (class "post-list"))
      (tbody
     (table
      (@ (class "post-list"))
      (tbody

-     ,@(map
-        (lambda (post)
-          (define (post-uri post)
-            (string-append "/"
-                           (site-post-slug site post) ".html"))
-          `(tr
-            (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)))))))
+      ,@(map
+         (lambda (post)
+           (define (post-uri post)
+             (string-append "/"
+                            (site-post-slug site post) ".html"))
+           `(tr
+             (td ,(aa (post-ref post 'title) (post-uri post)))
+             (td (small
+                  ,(date->string (post-date post) my-date-format)))))
+         (take-up-to 10 (posts/reverse-chronological posts)))))))

 
 (define (index-page site posts)
   (make-page
 
 (define (index-page site posts)
   (make-page


@@ -212,7 +232,7 @@
   (static-page
    "Licensing Information"
    "license.html"
   (static-page
    "Licensing Information"
    "license.html"

-   `((h1 "License information for bandali.eu.org")
+   `((h1 "License information for " ,my-domain)

      (p "I strongly believe in "
         ,(aa "free culture"
              "https://questioncopyright.org/what_is_free_culture")
      (p "I strongly believe in "
         ,(aa "free culture"
              "https://questioncopyright.org/what_is_free_culture")


@@ -286,7 +306,7 @@
       (li ,(aa "bandali" "https://hackage.haskell.org/user/bandali")
           " on Hackage")
       (li ,(aa "bandali" "https://gitlab.com/bandali")
       (li ,(aa "bandali" "https://hackage.haskell.org/user/bandali")
           " on Hackage")
       (li ,(aa "bandali" "https://gitlab.com/bandali")

-          " on GitLab.com")
+          " on GitLab")

       (li ,(aa "bandali"
                "https://news.ycombinator.com/user?id=bandali")
           " on HN")
       (li ,(aa "bandali"
                "https://news.ycombinator.com/user?id=bandali")
           " on HN")


@@ -297,9 +317,111 @@
       (li (del ,(aa "bandali0" "https://twitter.com/bandali0")
                " on Twitter"))))))
 
       (li (del ,(aa "bandali0" "https://twitter.com/bandali0")
                " on Twitter"))))))
 

-(define my-domain "bandali.eu.org")
+(define cv-page
+  (static-page
+   "Curriculum vitae"
+   "bandali-cv.html"
+   `((h1 "Curriculum vitae (" ,(aa "PDF" "bandali-cv.pdf") ")")
+     (table
+      (tbody
+       (tr
+        (td "Site")
+        (td ,(aa my-domain my-url)))
+       (tr
+        (td "Email")
+        (td "bandali@uwaterloo.ca"))
+       (tr
+        (td "Phone")
+        (td "available upon request via email"))))
+     (h2 "Education")
+     (h3 "Master of Mathematics (Computer Science) | 2018–present")
+     (p "University of Waterloo, Canada")
+     (p "Supervised by Dr. Nancy Day | GPA: 3.7/4.0 | "
+        "Expected completion: April 2020")
+     (p "Research focusing on formal logic, model checking, and "
+        "verification.")
+     (h3 "B.Sc. Honours Computer Science | 2013–2017")
+     (p "York University, Toronto, Canada")
+     (p "GPA: 7.84/9.0")
+     (p "Relevant courses: System Specification & Refinement, "
+        "Software Requirements Eng., Software Design, "
+        "Operating Systems, Computational Complexity, "
+        "Design & Analysis of Algorithms.")
+     (p "Finished first year (2013-14) at " (em "Carleton University")
+        " with a GPA of 11.0/12.0, then transferred to "
+        (em "York University") " in Fall 2014.")
+     (h2 "Publications")
+     (p "Listed on my " ,(aa "homepage" "/#papers"))
+     (h2 "Work & Research Experience")
+     (h3 "Cheriton School of Computer Science, University of Waterloo"
+         " | 2018–present")
+     (p "Instructional Apprentice, Teaching Assistant, "
+        "Research Assistant")
+     (ul
+      (li (abbr (@ (title "Logic and Computation")) "SE 212") ": "
+          (abbr (@ (title "Instructional Apprentice")) "IA") " in "
+          "Fall 2019, "
+          (abbr (@ (title "Teaching Assistant")) "TA") " in "
+          "Fall 2018")
+      (li (abbr (@ (title ,(string-append
+                            "Software Requirements Specification and "
+                            "Analysis"))) "SE 463")
+          ": TA in Summer 2019 and 2018")
+      (li (abbr (@ (title ,(string-append
+                            "Elementary Algorithm Design and "
+                            "Data Abstraction"))) "CS 136")
+          ": TA in Winter 2018"))
+     (h3 (abbr (@ (title
+                   ,(string-append
+                     "Electrical Engineering & Computer Science")))
+               "EECS")
+         " Department, York University | Fall 2017")
+     (p "Teaching Assistant")
+     (p (abbr (@ (title "Net-Centric Introduction to Computing"))
+              "EECS 1012")
+        ": TA in Fall 2017"))))
+
+(define se212-f19-page
+  (static-page
+   "SE 212 Material"
+   "se212-f19/index.html"
+   `((h1 "Material from SE 212 tutorials")
+     (p "This page contains slides and other material from "
+        ,(aa "SE 212 tutorials"
+             "https://www.student.cs.uwaterloo.ca/~se212/times.html")
+        " held by me in Fall 2019. "
+        (del "If you have any questions, concerns, or suggestions "
+             "about the presented material, please email me at "
+             "bandali@uwaterloo.ca or come see me during my "
+             ,(aa "Friday office hours"
+                  "https://www.student.cs.uwaterloo.ca/~se212/personnel.html")
+             "."))
+     (ul
+      (li "Tutorial 1:"
+          (ul
+           (li ,(aa "TUT 101 slides" "se212-t01-101.pdf"))
+           (li ,(aa "TUT 102 slides" "se212-t01-102.pdf"))
+           (li ,(aa "Org beamer sources" "se212-t01.org"))))
+      (li "Tutorial 2:"
+          (ul
+           (li ,(aa "Homework 2 q04d solution"
+                    "se212-h02q04d-soln.grg"))))
+      (li "Tutorial 3: —")
+      (li "Tutorial 4: —")
+      (li "Tutorial 5:"
+          (ul
+           (li ,(aa "Slides" "se212-t05.pdf"))
+           (li ,(aa "Org beamer sources" "se212-t05.org"))))
+      (li "Tutorial 6: —")
+      (li "Tutorial 7: worked through questions 1–5 of Homework 7")
+      (li "Tutorial 8: —")
+      (li "Tutorial 9: —")
+      (li "Tutorial 10: worked through questions 1–10 of "
+          "Homework 10")))))

 
 (site #:title "Amin Bandali"
 
 (site #:title "Amin Bandali"

+      ;; TODO: uncomment after new haunt release
+      ;; #:scheme my-scheme

       #:domain my-domain
       #:default-metadata
       '((author . "Amin Bandali")
       #:domain my-domain
       #:default-metadata
       '((author . "Amin Bandali")


@@ -318,5 +440,7 @@
                        (rss-feed
                         #:file-name "feed.rss")
                        contact-page
                        (rss-feed
                         #:file-name "feed.rss")
                        contact-page

+                       cv-page

                        license-page
                        license-page

+                       se212-f19-page

                        (static-directory "static" "")))
                        (static-directory "static" "")))