More

8 files changed, 95 insertions, 9 deletions

diff --git a/Gemfile b/Gemfile
index 6ca852e..2d0c493 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,2 +1,3 @@
 source 'https://rubygems.org'
-gem 'jekyll', '3.1.2'
\ No newline at end of file
+gem 'jekyll', '3.1.2'
+gem 'jekyll-scholar'
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index d8d551b..ea96b36 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,18 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    bibtex-ruby (4.4.2)
+      latex-decode (~> 0.0)
+    citeproc (1.0.4)
+      namae (~> 0.8)
+    citeproc-ruby (1.1.5)
+      citeproc (>= 1.0.4, < 2.0)
+      csl (~> 1.4)
     colorator (0.1)
+    csl (1.4.5)
+      namae (~> 0.7)
+    csl-styles (1.0.1.7)
+      csl (~> 1.0)
     ffi (1.9.14)
     jekyll (3.1.2)
       colorator (~> 0.1)
@@ -14,26 +25,36 @@ GEM
       safe_yaml (~> 1.0)
     jekyll-sass-converter (1.4.0)
       sass (~> 3.4)
+    jekyll-scholar (5.8.5)
+      bibtex-ruby (~> 4.0, >= 4.0.13)
+      citeproc-ruby (~> 1.0)
+      csl-styles (~> 1.0)
+      jekyll (~> 3.0)
     jekyll-watch (1.5.0)
       listen (~> 3.0, < 3.1)
     kramdown (1.12.0)
+    latex-decode (0.2.2)
+      unicode (~> 0.4)
     liquid (3.0.6)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
     mercenary (0.3.6)
+    namae (0.11.0)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     rouge (1.11.1)
     safe_yaml (1.0.4)
     sass (3.4.22)
+    unicode (0.4.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   jekyll (= 3.1.2)
+  jekyll-scholar
 
 BUNDLED WITH
    1.13.5
diff --git a/_config.yml b/_config.yml
index 7af46cb..7d34000 100644
--- a/_config.yml
+++ b/_config.yml
@@ -19,3 +19,16 @@ github_username:  jekyll
 
 # Build settings
 markdown: kramdown
+gems: ['jekyll/scholar']
+scholar:
+  style: apa
+  locale: en
+
+  sort_by: none
+  order: ascending
+
+  group_by: none
+  group_order: ascending
+
+  source: .
+  bibliography: example.bib
\ No newline at end of file
diff --git a/_includes/head.html b/_includes/head.html
index dfaf33b..3b4228a 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -9,6 +9,8 @@
   <link href="https://fonts.googleapis.com/css?family=Montserrat" rel="stylesheet">
   <link href="https://fonts.googleapis.com/css?family=Alegreya+Sans:100,700i,900" rel="stylesheet">
 
+  <script src='https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'></script>
+
   <!-- <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}"> -->
   <link rel="stylesheet" href="{{ site.baseurl }}/tufte.css"/>
   <link rel="stylesheet" href="{{ site.baseurl }}/latex.css"/>
diff --git a/_posts/2016-10-16-welcome-to-jekyll.markdown b/_posts/2016-10-16-welcome-to-jekyll.markdown
index 99948f6..cea231b 100644
--- a/_posts/2016-10-16-welcome-to-jekyll.markdown
+++ b/_posts/2016-10-16-welcome-to-jekyll.markdown
@@ -3,7 +3,7 @@ layout: post
 title:  "Remote Procedure Call"
 date:   2016-10-16 11:46:07 -0400
 categories: jekyll update
-by: "Aviral Goel and Heather Miller"
+by: "Joe Schmoe and Mary Jane"
 ---
 You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.
 
@@ -45,14 +45,30 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i
 
 > This is also a blockquote, but I guess it doesn't have who it's attributed to.
 
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. {% cite Uniqueness %}
 
 <figure class="fullwidth">
   <img src="{{ site.baseurl }}/img/napoleons-march.png" alt="Figurative map of the successive losses of the French Army in the Russian campaign, 1812-1813" />
 </figure>
 
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. {% cite Elsman2005 Kennedy2004 %}
+
+This is a bulleted list:
+
+- one
+- two
+- three
+
+This is a numbered list:
+
+1. one
+2. two
+3. three
+
+You can also have inline math, like this $$x^2+x=4$$ as well as equation blocks:
+
+\\[x^2 + 3 = y\\]
+
+## References
 
-[jekyll-docs]: http://jekyllrb.com/docs/home
-[jekyll-gh]:   https://github.com/jekyll/jekyll
-[jekyll-talk]: https://talk.jekyllrb.com/
+{% bibliography %}
diff --git a/custom.css b/custom.css
index b89fbab..75960e0 100644
--- a/custom.css
+++ b/custom.css
@@ -86,7 +86,7 @@ h2, h3 {
 }
 
 code {
-  color: #8C9899;
+  color: #7599a9;
   /*background: #F4F4F4;*/
   /*border-radius: 3px;*/
   /*padding: 2px;*/
@@ -147,3 +147,10 @@ blockquote footer {
   color: #b3b3b3;
 }
 
+.bibliography {
+width: 55%;
+}
+
+@media (max-width: 760px) {
+                            .bibliography  { width: 90%; }
+                          }
\ No newline at end of file
diff --git a/example.bib b/example.bib
new file mode 100644
index 0000000..416b697
--- /dev/null
+++ b/example.bib
@@ -0,0 +1,26 @@
+@inproceedings{Uniqueness,
+  author    = {Philipp Haller and
+               Martin Odersky},
+  title     = {Capabilities for Uniqueness and Borrowing},
+  booktitle = {ECOOP 2010, Maribor, Slovenia, June 21-25, 2010.},
+  pages     = {354--378},
+  year      = {2010},
+}
+
+@inproceedings{Elsman2005,
+  author    = {Martin Elsman},
+  title     = {Type-specialized serialization with sharing},
+  booktitle = {Trends in Functional Programming},
+  year      = {2005},
+  pages     = {47-62},
+}
+
+@article{Kennedy2004,
+  author    = {Andrew Kennedy},
+  title     = {Pickler combinators},
+  journal   = {J. Funct. Program.},
+  volume    = {14},
+  number    = {6},
+  year      = {2004},
+  pages     = {727-739},
+}
\ No newline at end of file
diff --git a/tufte.css b/tufte.css
index 0828e07..3d9275d 100755
--- a/tufte.css
+++ b/tufte.css
@@ -246,7 +246,7 @@ label.margin-toggle:not(.sidenote-number) { display: none; }
                             .logo-wrap { width: 84%;
                                    padding-left: 8%;
                                    padding-right: 8%; }
-                            p, footer { width: 100%; }
+                            p, footer, .bibliography { width: 100%; }
                             pre.code { width: 97%; }
                             ul { width: 85%; }
                             figure { max-width: 90%; }