From fd5cd110243a5aaf6e3586b9fc8841f53787c495 Mon Sep 17 00:00:00 2001
From: simon <simon@journeyman.cc>
Date: Sun, 30 Jul 2017 14:40:56 +0100
Subject: [PATCH] Experimental tidying up after vega introduction

None of this is very significant, but it is small improvements.
---
 project.clj                   | 5 ++++-
 resources/templates/base.html | 3 +--
 resources/templates/edit.html | 4 ++--
 resources/templates/wiki.html | 4 +++-
 src/smeagol/formatting.clj    | 6 +++++-
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/project.clj b/project.clj
index 347c7ed..dba11fb 100644
--- a/project.clj
+++ b/project.clj
@@ -33,7 +33,10 @@
             [lein-bower "0.5.1"]
             [lein-ancient "0.5.5" :exclusions [org.clojure/clojure org.clojure/data.xml]]
             [lein-marginalia "0.7.1" :exclusions [org.clojure/clojure]]]
-  :bower-dependencies [[simplemde "1.11.2"]]
+  :bower-dependencies [[simplemde "1.11.2"]
+                       ;; [vega-embed "3.0.0-beta.19"] vega-embed currently not loaded from Bower because of
+                       ;; dependency conflict which will hopefully be resolved soon.
+                       [vega-lite "2.0.0-beta.10"]]
   :ring {:handler smeagol.handler/app
          :init    smeagol.handler/init
          :destroy smeagol.handler/destroy}
diff --git a/resources/templates/base.html b/resources/templates/base.html
index 8d980d8..103a537 100644
--- a/resources/templates/base.html
+++ b/resources/templates/base.html
@@ -5,8 +5,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link href="{{servlet-context}}/content/stylesheet.css" media="screen" rel="stylesheet" type="text/css" />
-    <link href="{{servlet-context}}/css/print.css" media="print" rel="stylesheet" type="text/css" />
+    {% style "/content/stylesheet.css" %}
     {% block extra-headers %}
     {% endblock %}
   </head>
diff --git a/resources/templates/edit.html b/resources/templates/edit.html
index 8f32002..a5672a7 100644
--- a/resources/templates/edit.html
+++ b/resources/templates/edit.html
@@ -1,7 +1,7 @@
 {% extends "templates/base.html" %}
 {% block extra-headers %}
-    <link rel="stylesheet" href="{{servlet-context}}/vendor/simplemde/dist/simplemde.min.css">
-    <script src="{{servlet-context}}/vendor/simplemde/dist/simplemde.min.js"></script>
+{% style "/vendor/simplemde/dist/simplemde.min.css" %}
+{% script "/vendor/simplemde/dist/simplemde.min.js" %}
 {% endblock %}
 
 {% block content %}
diff --git a/resources/templates/wiki.html b/resources/templates/wiki.html
index 70d6974..97d0228 100644
--- a/resources/templates/wiki.html
+++ b/resources/templates/wiki.html
@@ -2,7 +2,9 @@
 
 {% block extra-headers %}
   <script src="https://cdnjs.cloudflare.com/ajax/libs/vega/3.0.0-rc2/vega.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/vega-lite/2.0.0-beta.10/vega-lite.js"></script>
+<!-- there's at the time of writing (20170731) a problem with the dependencies of the Bower
+package for vega-embed, so we're currently not installing either it or Vega locally. TODO: fix -->
+  {% script "/vendor/vega-lite/build/vega-lite.js" %}
   <script src="https://cdnjs.cloudflare.com/ajax/libs/vega-embed/3.0.0-beta.19/vega-embed.js"></script>
 
   <style media="screen">
diff --git a/src/smeagol/formatting.clj b/src/smeagol/formatting.clj
index 9dd1d0c..8acd922 100644
--- a/src/smeagol/formatting.clj
+++ b/src/smeagol/formatting.clj
@@ -87,7 +87,11 @@
   ([index result fragments processed]
    (cond
      (empty? fragments)
-     (assoc result :text (local-links (md/md-to-html-string (cs/join "\n\n" (reverse processed)))))
+     (assoc result :text
+       (local-links
+         (md/md-to-html-string
+           (cs/join "\n\n" (reverse processed))
+           :heading-anchors true)))
      (clojure.string/starts-with? (first fragments) "vis")
      (let [kw (keyword (str "visualisation-" index))]
        (process-text