swish/commit

Updated upstream files.

authorJan Wielemaker
Mon Oct 29 16:41:22 2018 +0100
committerJan Wielemaker
Mon Oct 29 16:41:22 2018 +0100
commit818ef62d89d95f07fef38fa20ec60a7517ad2d2f
tree467f6a34893ad36b62c45c2851061009595fae20
parent6f409c5c8f67f0b3341f7c67faec8547ecc955bd
Diff style: patch stat
diff --git a/lib/swish/http_version.pl b/lib/swish/http_version.pl
index e229262..bf1b64f 100644
--- a/lib/swish/http_version.pl
+++ b/lib/swish/http_version.pl
@@ -194,10 +194,10 @@ format_commit_message(tagged, Message0, Message) :-
     sub_string(Message0, _, Post, 0, Msg),
     string_codes(Msg, Codes),
     wiki_file_codes_to_dom(Codes, '/', DOM),
-    phrase(swish_markdown:html(div(class('v-changelog-entry'),
-                                   [ span(class('v-changelog-tag'), Tag)
-                                   | DOM
-                                   ])),
+    phrase(wiki_html(div(class('v-changelog-entry'),
+                         [ span(class('v-changelog-tag'), Tag)
+                         | DOM
+                         ])),
            Tokens),
     with_output_to(string(Message), print_html(Tokens)).
 format_commit_message(all, Message0, Message) :-
diff --git a/lib/swish/markdown.pl b/lib/swish/markdown.pl
index 33e3974..1a764f7 100644
--- a/lib/swish/markdown.pl
+++ b/lib/swish/markdown.pl
@@ -33,7 +33,8 @@
 */
 
 :- module(swish_markdown,
-	  [ wiki_file_codes_to_dom/3		% +Code, +Files, -DOM
+	  [ wiki_file_codes_to_dom/3,		% +Code, +Files, -DOM
+	    wiki_html//1			% :HTML
 	  ]).
 :- use_module(library(http/http_dispatch)).
 :- use_module(library(http/http_parameters)).
@@ -50,6 +51,10 @@
 :- use_module(storage).
 :- use_module(config).
 
+:- html_meta
+	wiki_html(html,?,?).
+
+
 /** <module> SWISH Notebook markdown support
 
 This module translates markdown cells for teh SWISH Notebook into HTML
@@ -102,6 +107,11 @@ wiki_file_codes_to_dom(String, File, DOM) :-
 		 *	     HOOK WIKI		*
 		 *******************************/
 
+
+wiki_html(HTML) -->
+	html(HTML).
+
+
 :- multifile
 	prolog:doc_autolink_extension/2.