From: Javier Sancho <jsf@jsancho.org>
Date: Mon, 26 Feb 2018 16:06:34 +0000 (+0100)
Subject: Merge branch 'master' into english
X-Git-Url: https://git.jsancho.org/?p=blog.git;a=commitdiff_plain;h=16b2c33322417be6d88ecb431116c8fcdd0677d1;hp=-c

Merge branch 'master' into english
---

16b2c33322417be6d88ecb431116c8fcdd0677d1
diff --combined haunt.scm
index 6c83826,7ad26ee..0a6fa50
--- a/haunt.scm
+++ b/haunt.scm
@@@ -33,9 -33,13 +33,13 @@@
  		   `(" "
  		     (span (@ (style "margin: 0 3px")) ⦿)
  		     (span (@ (class "tags"))
- 			   ,@(map (lambda (tag)
- 				    `((a (@ (href ,(format #f "tags/~a.html" tag))) ,tag) " "))
- 				  tags)))))
+ 			   ,@(drop-right
+                               (apply
+                                append
+                                (map (lambda (tag)
+                                       `((a (@ (href ,(format #f "tags/~a.html" tag))) ,tag) ", "))
+                                     tags))
+                               1)))))
  	  (else
  	   div))))
  
@@@ -62,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))))
@@@ -112,16 -115,7 +116,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)))