From ed80cb23328930e38dc0f1b9beacf95e30745658 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jean-Christophe=20Beaupr=C3=A9?=
 <jcbrinfo@users.noreply.github.com>
Date: Fri, 12 Dec 2014 14:40:09 -0500
Subject: [PATCH] nitdoc: Always escape names.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Fix #891.

Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
---
 src/doc/doc_model.nit |    8 ++++----
 src/doc/doc_pages.nit |    5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/doc/doc_model.nit b/src/doc/doc_model.nit
index dfb932f..2c80ffb 100644
--- a/src/doc/doc_model.nit
+++ b/src/doc/doc_model.nit
@@ -283,7 +283,7 @@ redef class MClass
 			tpl.add "["
 			var parameter_names = new Array[String]
 			for p in mparameters do
-				parameter_names.add(p.name)
+				parameter_names.add(p.nitdoc_name)
 			end
 			tpl.add parameter_names.join(", ")
 			tpl.add "]"
@@ -354,7 +354,7 @@ redef class MClassDef
 		if not mparameters.is_empty then
 			tpl.add "["
 			for i in [0..mparameters.length[ do
-				tpl.add "{mparameters[i].name}: "
+				tpl.add "{mparameters[i].nitdoc_name}: "
 				tpl.add bound_mtype.arguments[i].tpl_signature
 				if i < mparameters.length - 1 then tpl.add ", "
 			end
@@ -533,7 +533,7 @@ redef class MMethod
 		var tpl = new Template
 		var params = new Array[String]
 		for param in intro.msignature.mparameters do
-			params.add param.name
+			params.add param.name.html_escape
 		end
 		if not params.is_empty then
 			tpl.add "("
@@ -596,7 +596,7 @@ end
 
 redef class MParameterType
 	redef fun tpl_link do
-		return new TplLink.with_title("{mclass.nitdoc_url}#FT_{name}", name, "formal type")
+		return new TplLink.with_title("{mclass.nitdoc_url}#FT_{name.to_cmangle}", name, "formal type")
 	end
 	redef fun tpl_signature do return tpl_link
 end
diff --git a/src/doc/doc_pages.nit b/src/doc/doc_pages.nit
index 0d26ad6..fc556d6 100644
--- a/src/doc/doc_pages.nit
+++ b/src/doc/doc_pages.nit
@@ -518,7 +518,8 @@ abstract class NitdocPage
 		else
 			var cls_url = mprop.intro.mclassdef.mclass.nitdoc_url
 			var def_url = "{cls_url}#{mprop.nitdoc_id}"
-			var lnk = new TplLink.with_title(def_url, mprop.name, "Go to introduction")
+			var lnk = new TplLink.with_title(def_url, mprop.nitdoc_name,
+					"Go to introduction")
 			title.add "redef "
 			title.add lnk
 		end
@@ -1126,7 +1127,7 @@ class NitdocClass
 			classes.add "inherit"
 			var cls_url = mprop.intro.mclassdef.mclass.nitdoc_url
 			var def_url = "{cls_url}#{mprop.nitdoc_id}"
-			var lnk = new TplLink(def_url, mprop.name)
+			var lnk = new TplLink(def_url, mprop.nitdoc_name)
 			var mdoc = mprop.intro.mdoc_or_fallback
 			if mdoc != null then lnk.title = mdoc.short_comment
 			var item = new Template
-- 
1.7.9.5