Merge branch 'master' into english

diff --combined haunt.scm
index 8924dd6e32020df383436d504ac84687fe974537,c594fd9548e9e0d48c690511f1bed746990fec5e..7222df96fafad9c7f2f6d421399e029e5afb897a
--- 1/haunt.scm
--- 2/haunt.scm
+++ b/haunt.scm
@@@ -66,8 -66,7 +66,8 @@@
                                  (li (@ (id "blog-title-header"))
                                      (a (@ (href "index.html"))
                                         (h1 ,(assoc-ref metadata 'author)))))
 -                            (ul (@ (class "navigation-items center")))
 +                            (ul (@ (class "navigation-items center"))
 +                                (li (a (@ (href "https://jsancho.org/")) "in spanish")))
                              (ul (@ (class "navigation-items right"))
                                  ,@(map (lambda (page)
                                           `(li (a (@ (href ,(cdr page))) ,(car page))))
@@@ -95,10 -94,8 +95,8 @@@
                        res)
                       ((and (pair? (car sxml)) (eq? (caar sxml) 'p))
                        (getp (cdr sxml) (- count 1) (cons (car sxml) res)))
-                      ((and (pair? (car sxml)) (eq? (caar sxml) 'a))
-                       (getp (cdr sxml) count (cons (car sxml) res)))
                       (else
-                       (getp (cdr sxml) count res))))
+                       (getp (cdr sxml) count (cons (car sxml) res)))))
               (reverse (getp sxml count '())))
                     
             (define (post-summary post)
@@@ -122,16 -119,7 +120,16 @@@
    (static-page
     "About me"
     "about.html"
 -   `((h2 "hi."))))
 +   `((div
 +      (article
 +       (header (h2 "About me"))
 +       (img (@ (src "images/jsancho.jpg") (width "150") (height "150") (align "left") (style "margin: 10px;")))
 +       (p "My name is Javier Sancho, and I am a programmer and a free software evangelist. I live in Castellón, Spain.")
 +       (p "I met GNU/Linux and free software while I was studying Computer Science at " (a (@ (href "http://www.uji.es/")) "Universitat Jaume I") " and, since then, my commitment with these ideas hasn't stopped growing.")
 +       (p "It was in 2003 when I started as an activist, participating in events related with free software, demonstrations against software patents, talks and information sessions at install parties, schools, etc.")
 +       (p "I enjoy programming and I use the programming language that better fits my needs (Python, PHP, Golang, Erlang, ...). For many years my favorite language was C, although over time that privileged place has been occupied by Lisp y Scheme. I'm in love with the functional paradigm.")
 +       (p "I'm married with a wonderful woman and we have a kid that amaze us every day. They are the best of my life.")
 +       (p "Besides this blog, sometimes I share thoughts in " (a (@ (href "https://twitter.com/jsancho_gpl")) "Twitter") ". You can email me at " (a (@ (href "mailto:jsf@jsancho.org")) "jsf@jsancho.org") "."))))))
  
  (define %collections
    `(("Home" "index.html" ,posts/reverse-chronological)))