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

diff --git a/contrib/nitiwiki/src/wiki_links.nit b/contrib/nitiwiki/src/wiki_links.nit
index 40f747c..ac3e171 100644
--- a/contrib/nitiwiki/src/wiki_links.nit
+++ b/contrib/nitiwiki/src/wiki_links.nit
@@ -17,6 +17,7 @@ module wiki_links
 
 import wiki_base
 import markdown::wikilinks
+import ordered_tree
 
 redef class Nitiwiki
 	# Looks up a WikiEntry by its `name`.
@@ -86,6 +87,12 @@ redef class Nitiwiki
 		end
 		return entry
 	end
+
+	# Trails between pages
+	#
+	# Trails are represented as a forest of entries.
+	# This way it is possible to represent a flat-trail as a visit of a tree.
+	var trails = new OrderedTree[WikiEntry]
 end
 
 redef class WikiEntry
@@ -93,12 +100,23 @@ redef class WikiEntry
 	# Relative path to `self` from the target root_url
 	fun href: String do return breadcrumbs.join("/")
 
+	# Relative path to the directory `self` from the target root_url
+	fun dir_href: String do return href.dirname
+
+	# Relative path to the root url from `self`
+	fun root_href: String do
+		var root_dir = dir_href.relpath("")
+		# Avoid issues if used as a macro just followed by a `/` (as with url prefix)
+		if root_dir == "" then root_dir = "."
+		return root_dir
+	end
+
 	# A relative `href` to `self` from the page `context`.
 	#
 	# Should be used to navigate between documents.
 	fun href_from(context: WikiEntry): String
 	do
-		var res = context.href.dirname.relpath(href)
+		var res = context.dir_href.relpath(href)
 		return res
 	end
 
@@ -167,6 +185,8 @@ redef class WikiSection
 		end
 		return new WikiSectionIndex(wiki, "index", self)
 	end
+
+	redef fun dir_href do return href
 end
 
 redef class WikiArticle
@@ -191,7 +211,7 @@ redef class WikiArticle
 		super
 		if not is_dirty and not wiki.force_render or not has_source then return
 		content = md_proc.process(md.as(not null))
-		headlines.recover_with(md_proc.emitter.decorator.headlines)
+		headlines.add_all(md_proc.emitter.decorator.headlines)
 	end
 end
 
@@ -205,6 +225,8 @@ class WikiSectionIndex
 	redef fun title do return section.title
 
 	redef fun href do return section.href
+
+	redef fun dir_href do return section.dir_href
 end
 
 # A MarkdownProcessor able to parse wiki links.
@@ -268,6 +290,11 @@ class NitiwikiDecorator
 			if target != null then
 				if name == null then name = target.title
 				link = target.href_from(context)
+
+				if command == "trail" then
+					if target isa WikiSection then target = target.index
+					wiki.trails.add(context, target)
+				end
 			else
 				wiki.message("Warning: unknown wikilink `{link}` (in {context.src_path.as(not null)})", 0)
 				v.add "class=\"broken\" "