simplify title logic

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

diff --git a/bandali/pages.scm b/bandali/pages.scm
index ec6c975..b553193 100644 (file)
--- a/bandali/pages.scm
+++ b/bandali/pages.scm
@@ -1,4 +1,4 @@
-;;; Copyright © 2019 Amin Bandali <bandali@gnu.org>
+;;; Copyright © 2019-2020 Amin Bandali <bandali@gnu.org>

 ;;;
 ;;; This program is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU General Public License as
 ;;;
 ;;; This program is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU General Public License as


@@ -55,10 +55,6 @@
        "programming languages, theorem provers, and their "
        "type systems.  You may wish to view my academic "
        ,(aa "curriculum vitae" "bandali-cv.html") ".")
        "programming languages, theorem provers, and their "
        "type systems.  You may wish to view my academic "
        ,(aa "curriculum vitae" "bandali-cv.html") ".")

-    (p (@ (class "notice"))
-       (strong "SE 212 students: ")
-       "see " ,(aa "here" "se212-f19/") " for slides and other "
-       "material from the tutorials.")

     (p "On the side, I dabble in "
        ,(aa "Lean" "https://leanprover.github.io") " and enjoy "
        ,(aa "hacking" "https://stallman.org/articles/on-hacking.html")
     (p "On the side, I dabble in "
        ,(aa "Lean" "https://leanprover.github.io") " and enjoy "
        ,(aa "hacking" "https://stallman.org/articles/on-hacking.html")


@@ -191,7 +187,7 @@
    `((h1 "Contact information")
      (p "Email is by far my preferred method of communication.  I may"
         " be contacted at any of the following addresses (choose the"
    `((h1 "Contact information")
      (p "Email is by far my preferred method of communication.  I may"
         " be contacted at any of the following addresses (choose the"

-        " most closely related):")
+        " one most closely related):")

      (ul
       (li "bandali@gnu.org")
       (li "bandali@uwaterloo.ca")
      (ul
       (li "bandali@gnu.org")
       (li "bandali@uwaterloo.ca")


@@ -225,12 +221,12 @@
         " through accounts are those I don’t use anymore, unless"
         " absolutely necessary.")
      (ul
         " through accounts are those I don’t use anymore, unless"
         " absolutely necessary.")
      (ul

+      (li ,(aa "bandali" "https://savannah.gnu.org/users/bandali")
+          " on GNU Savannah")

       (li ,(aa "bandali" "https://libreplanet.org/wiki/User:Bandali")
           " on LibrePlanet")
       (li ,(aa "bandali" "https://emacsconf.org/bandali")
           " on EmacsConf")
       (li ,(aa "bandali" "https://libreplanet.org/wiki/User:Bandali")
           " on LibrePlanet")
       (li ,(aa "bandali" "https://emacsconf.org/bandali")
           " on EmacsConf")

-      (li ,(aa "bandali" "https://savannah.gnu.org/users/bandali")
-          " on Savannah")

       (li ,(aa "bandali" "https://git.sr.ht/~bandali")
           " on Sourcehut")
       (li ,(aa "bandali" "https://lobste.rs/u/bandali")
       (li ,(aa "bandali" "https://git.sr.ht/~bandali")
           " on Sourcehut")
       (li ,(aa "bandali" "https://lobste.rs/u/bandali")


@@ -244,11 +240,11 @@
           " on HN")
       (li ,(aa "bandali" "https://www.reddit.com/u/bandali")
           " on reddit")
           " on HN")
       (li ,(aa "bandali" "https://www.reddit.com/u/bandali")
           " on reddit")

-      (li (del ,(aa "bandali0" "https://github.com/bandali0")
+      (li (del ,(aa "notbandali" "https://github.com/notbandali")

                " on GitHub"))
                " on GitHub"))

-      (li (del ,(aa "bandali0" "https://twitter.com/bandali0")
+      (li (del ,(aa "notbandali" "https://twitter.com/notbandali")

                " on Twitter"))))
                " on Twitter"))))

-   "2019"))
+   "2020"))

 
 (define cv-page
   (static-page
 
 (define cv-page
   (static-page


@@ -292,8 +288,9 @@
         "Research Assistant")
      (ul
       (li (abbr (@ (title "Logic and Computation")) "SE 212") ": "
         "Research Assistant")
      (ul
       (li (abbr (@ (title "Logic and Computation")) "SE 212") ": "

-          (abbr (@ (title "Instructional Apprentice")) "IA") " in "
-          "Fall 2019, "
+          ,(aa `((abbr (@ (title "Instructional Apprentice")) "IA")
+                 " in Fall 2019") "se212-f19/")
+          ", "

           (abbr (@ (title "Teaching Assistant")) "TA") " in "
           "Fall 2018")
       (li (abbr (@ (title ,(string-append
           (abbr (@ (title "Teaching Assistant")) "TA") " in "
           "Fall 2018")
       (li (abbr (@ (title ,(string-append