From 50c8e5544a1c049f0322a3b59ba35fae92058214 Mon Sep 17 00:00:00 2001
From: Thomas Wood <thomas.wood09@imperial.ac.uk>
Date: Thu, 6 Jul 2017 15:11:20 +0100
Subject: [PATCH] Fix linking of Emanuele's name to publications.
---
Gemfile | 4 +--
Gemfile.lock | 29 ++++++++----------
_includes/publication-authors.html | 3 +-
_people/{dosualdo.md => d-osualdo.md} | 5 +--
images/people/{dosualdo.jpg => d-osualdo.jpg} | Bin
5 files changed, 20 insertions(+), 21 deletions(-)
rename _people/{dosualdo.md => d-osualdo.md} (74%)
rename images/people/{dosualdo.jpg => d-osualdo.jpg} (100%)
diff --git a/Gemfile b/Gemfile
index 4fd6d1b..aff27f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,9 +4,9 @@ gem 'rake'
gem 'jekyll'
group :default, :jekyll_plugins do
- gem 'jekyll-scholar', '~> 5.9.1'
+ gem 'jekyll-scholar', '~> 5.10'
#gem 'jekyll-scholar', :git => '/home/thomas/jekyll-scholar', :branch => 'master'
- gem 'jekyll-redirect-from'
+ #gem 'jekyll-redirect-from' # Temporarily disable due to incompatibility with Jekyll 3.5.0
gem 'jekyll-feed'
gem 'jekyll-sitemap'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 9e42b62..605f2f0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,18 +1,18 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (5.1.1)
+ activesupport (5.1.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
- bibtex-ruby (4.4.3)
+ bibtex-ruby (4.4.4)
latex-decode (~> 0.0)
citeproc (1.0.5)
namae (~> 0.8)
- citeproc-ruby (1.1.6)
+ citeproc-ruby (1.1.7)
citeproc (>= 1.0.4, < 2.0)
csl (~> 1.4)
colorator (1.1.0)
@@ -20,7 +20,7 @@ GEM
concurrent-ruby (1.0.5)
csl (1.4.5)
namae (~> 0.7)
- csl-styles (1.0.1.7)
+ csl-styles (1.0.1.8)
csl (~> 1.0)
ethon (0.10.1)
ffi (>= 1.3.0)
@@ -36,24 +36,22 @@ GEM
typhoeus (~> 0.7)
yell (~> 2.0)
i18n (0.8.4)
- jekyll (3.4.3)
+ jekyll (3.5.0)
addressable (~> 2.4)
colorator (~> 1.0)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
kramdown (~> 1.3)
- liquid (~> 3.0)
+ liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (~> 1.7)
safe_yaml (~> 1.0)
jekyll-feed (0.9.2)
jekyll (~> 3.3)
- jekyll-redirect-from (0.12.1)
- jekyll (~> 3.3)
jekyll-sass-converter (1.5.0)
sass (~> 3.4)
- jekyll-scholar (5.9.1)
+ jekyll-scholar (5.10.1)
bibtex-ruby (~> 4.0, >= 4.0.13)
citeproc-ruby (~> 1.0)
csl-styles (~> 1.0)
@@ -62,10 +60,10 @@ GEM
jekyll (~> 3.3)
jekyll-watch (1.5.0)
listen (~> 3.0, < 3.1)
- kramdown (1.13.2)
+ kramdown (1.14.0)
latex-decode (0.2.2)
unicode (~> 0.4)
- liquid (3.0.6)
+ liquid (4.0.0)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
@@ -80,9 +78,9 @@ GEM
forwardable-extended (~> 2.6)
public_suffix (2.0.5)
rake (12.0.0)
- rb-fsevent (0.9.8)
- rb-inotify (0.9.9)
- ffi (~> 1.0)
+ rb-fsevent (0.10.2)
+ rb-inotify (0.9.10)
+ ffi (>= 0.5.0, < 2)
rouge (1.11.1)
safe_yaml (1.0.4)
sass (3.4.24)
@@ -101,8 +99,7 @@ DEPENDENCIES
html-proofer (~> 3.0)
jekyll
jekyll-feed
- jekyll-redirect-from
- jekyll-scholar (~> 5.9.1)
+ jekyll-scholar (~> 5.10)
jekyll-sitemap
rake
diff --git a/_includes/publication-authors.html b/_includes/publication-authors.html
index 1565113..ddf0bc3 100644
--- a/_includes/publication-authors.html
+++ b/_includes/publication-authors.html
@@ -1,6 +1,7 @@
<ul class="list-inline">
{% for author in include.authors %}
-{% assign matched = site.people | where:"lastname",author.last | first %}
+{% assign matched = site.people | where:"lastname", author.last | first %}
+{% unless matched %}{% assign slug = author.last | slugify %}{% assign matched = site.people | where:"slug", slug | first %}{% endunless %}
<li class="list-inline-item">{% if matched %}<a href="{{ matched.url }}">{% endif %}{{ author.first }} {{ author.last }}{% if matched %}</a>{% endif %}</li>
{% endfor %}
</ul>
diff --git a/_people/dosualdo.md b/_people/d-osualdo.md
similarity index 74%
rename from _people/dosualdo.md
rename to _people/d-osualdo.md
index acb12dc..2a937a7 100644
--- a/_people/dosualdo.md
+++ b/_people/d-osualdo.md
@@ -4,7 +4,8 @@ lastname: D'Osualdo
position: Research Associate
webpage: http://www.emanueledosualdo.com/
email: e.dosualdo@imperial.ac.uk
-github:
+github: bordaigorl
projects:
- concurrency
----
\ No newline at end of file
+redirect_from: /people/dosualdo.html
+---
diff --git a/images/people/dosualdo.jpg b/images/people/d-osualdo.jpg
similarity index 100%
rename from images/people/dosualdo.jpg
rename to images/people/d-osualdo.jpg
--
GitLab