X-Git-Url: http://nitlanguage.org

diff --git a/contrib/nitiwiki/src/wiki_html.nit b/contrib/nitiwiki/src/wiki_html.nit
index a937351..d82bcb6 100644
--- a/contrib/nitiwiki/src/wiki_html.nit
+++ b/contrib/nitiwiki/src/wiki_html.nit
@@ -36,7 +36,7 @@ redef class Nitiwiki
 		var src = expand_path(config.root_dir, config.assets_dir)
 		var out = expand_path(config.root_dir, config.out_dir)
 		if need_render(src, expand_path(out, config.assets_dir)) then
-			if src.file_exists then sys.system "cp -R {src} {out}"
+			if src.file_exists then sys.system "cp -R -- {src.escape_to_sh} {out.escape_to_sh}"
 		end
 	end
 
@@ -50,7 +50,7 @@ redef class Nitiwiki
 	# Markdown processor used for inline element such as titles in TOC.
 	private var inline_processor: MarkdownProcessor is lazy do
 		var proc = new MarkdownProcessor
-		proc.emitter.decorator = new InlineDecorator
+		proc.decorator = new InlineDecorator
 		return proc
 	end
 
@@ -70,7 +70,8 @@ end
 redef class WikiSection
 
 	# Output directory (where to ouput the HTML pages for this section).
-	redef fun out_path: String do
+	redef fun out_path do
+		var parent = self.parent
 		if parent == null then
 			return wiki.config.out_dir
 		else
@@ -83,25 +84,28 @@ redef class WikiSection
 		if is_new then
 			out_full_path.mkdir
 		else
-			sys.system "touch {out_full_path}"
+			sys.system "touch -- {out_full_path.escape_to_sh}"
 		end
 		if has_source then
-			wiki.message("Render section {out_path}", 1)
+			wiki.message("Render section {name} -> {out_path}", 1)
 			copy_files
 		end
 		var index = self.index
 		if index isa WikiSectionIndex then
-			wiki.message("Render auto-index for section {out_path}", 1)
+			wiki.message("Render auto-index for section {name} -> {out_path}", 1)
 			index.is_dirty = true
 			add_child index
 		end
+		# Hack: Force the rendering of `index` first so that trails are collected
+		# TODO: Add first-pass analysis to collect global information before doing the rendering
+		index.render
 		super
 	end
 
 	# Copy attached files from `src_path` to `out_path`.
 	private fun copy_files do
 		assert has_source
-		var dir = src_full_path.to_s
+		var dir = src_full_path.as(not null).to_s
 		for name in dir.files do
 			if name == wiki.config_filename then continue
 			if name.has_suffix(".md") then continue
@@ -109,7 +113,7 @@ redef class WikiSection
 			var src = wiki.expand_path(dir, name)
 			var out = wiki.expand_path(out_full_path, name)
 			if not wiki.need_render(src, out) then continue
-			sys.system "cp -R {src} {out_full_path}"
+			sys.system "cp -R -- {src.escape_to_sh} {out_full_path.escape_to_sh}"
 		end
 	end
 
@@ -164,7 +168,8 @@ end
 
 redef class WikiArticle
 
-	redef fun out_path: String do
+	redef fun out_path do
+		var parent = self.parent
 		if parent == null then
 			return wiki.expand_path(wiki.config.out_dir, "{name}.html")
 		else
@@ -175,8 +180,8 @@ redef class WikiArticle
 	redef fun render do
 		super
 		if not is_dirty and not wiki.force_render then return
-		wiki.message("Render article {name}", 2)
 		var file = out_full_path
+		wiki.message("Render article {name} -> {file}", 1)
 		file.dirname.mkdir
 		tpl_page.write_to_file file
 	end
@@ -186,10 +191,7 @@ redef class WikiArticle
 	fun load_template(template_file: String): TemplateString do
 		var tpl = wiki.load_template(template_file)
 		if tpl.has_macro("ROOT_URL") then
-			var root_dir = href.dirname.relpath("")
-			# Avoid issues if the macro is just followed by a `/` (as with url prefix)
-			if root_dir == "" then root_dir = "."
-			tpl.replace("ROOT_URL", root_dir)
+			tpl.replace("ROOT_URL", root_href)
 		end
 		return tpl
 	end
@@ -209,6 +211,9 @@ redef class WikiArticle
 		if tpl.has_macro("FOOTER") then
 			tpl.replace("FOOTER", tpl_footer)
 		end
+		if tpl.has_macro("TRAIL") then
+			tpl.replace("TRAIL", tpl_trail)
+		end
 		return tpl
 	end
 
@@ -293,6 +298,41 @@ redef class WikiArticle
 		return tpl
 	end
 
+	# Generate navigation links for the trail of this article, if any.
+	#
+	# A trail is generated if the article include or is included in a trail.
+	# See `wiki.trails` for details.
+	fun tpl_trail: Writable do
+		if not wiki.trails.has(self) then return ""
+
+		# Get the position of `self` in the trail
+		var flat = wiki.trails.to_a
+		var pos = flat.index_of(self)
+		assert pos >= 0
+
+		var res = new Template
+		res.add "<ul class=\"trail\">"
+		var parent = wiki.trails.parent(self)
+		# Up and prev are disabled on a root
+		if parent != null then
+			if pos > 0 then
+				var target = flat[pos-1]
+				res.add "<li>{target.a_from(self, "prev")}</li>"
+			end
+			res.add "<li>{parent.a_from(self, "up")}</li>"
+		end
+		if pos < flat.length - 1 then
+			var target = flat[pos+1]
+			# Only print the next if it is not a root
+			if target.parent != null then
+				res.add "<li>{target.a_from(self, "next")}</li>"
+			end
+		end
+		res.add "</ul>"
+
+		return res
+	end
+
 	# Generate the HTML footer for this article.
 	fun tpl_footer: Writable do
 		var file = footer_file