Merge remote-tracking branch 'upstream/master' into oauth-moodle-dev

Author: erikmd

demo-repository/exercises/demo2/descr.md

@@ -1,5 +1,5 @@
-
-This exercise is just another demo for the exercise environment.
+The following example link will open another tab/window: [OCaml](https://ocaml.org "External link")  
+This exercise is just another demo for the exercise environment.  
 <a href="" onclick="top.location='/exercises/demo/';">Test</a>
 
 <details>

dune

@@ -3,7 +3,7 @@
 (rule
  (targets VERSION)
  (action (with-stdout-to %{targets}
-           (run opam show ./%{dep:./learn-ocaml.opam} -f version --normalise)))
+           (run opam show --color=never ./%{dep:./learn-ocaml.opam} -f version --normalise)))
 )
 
 (env

learn-ocaml-client.opam

@@ -17,7 +17,7 @@ depends: [
   "base" {>= "v0.9.4"}
   "base64"
   "cmdliner"
-  "omd"
+  "omd" {<= "1.3.1"}
   "asak"
   "cohttp" {>= "1.0.0" & < "2.0.0"}
   "cohttp-lwt-unix" {>= "1.0.0" & < "2.0.0"}

learn-ocaml.opam

@@ -48,7 +48,7 @@ depends: [
   "ocp-ocamlres" {>= "0.4"}
   "ocplib-json-typed" {= "0.6"}
   "odoc" {build & >= "1.3.0"}
-  "omd"
+  "omd" {<= "1.3.1"}
   "pprint"
   "ppx_cstruct"
   "ppx_tools"

src/repo/learnocaml_exercise.ml

@@ -317,8 +317,25 @@ module File = struct
               descrs := (lang, f raw) :: !descrs;
               return ()
       in
+  let override_url = function
+    | Omd_representation.Url(href,s,title) ->
+       if String.length href > 0 then
+         if Char.equal (String.get href 0) '#' then
+           None
+         else
+           let title_url =
+             if title <> "" then Printf.sprintf {| title="%s"|}
+                               (Omd_utils.htmlentities ~md:true title) else "" in
+           let html =
+             Printf.sprintf
+              {|<a href="%s" target="_blank" rel="noopener noreferrer"%s>%s</a>|}
+              (Omd_utils.htmlentities ~md:true href) title_url
+                 (Omd_backend.html_of_md s) in
+           Some html
+         else None
+    | _ -> None in
       let markdown_to_html md =
-        Omd.(md |> of_string |> to_html)
+        Omd.(md |> of_string |> to_html ~override:override_url)
       in
       let read_descrs () =
         let langs = [] in