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

diff --git a/src/doc/doc_model.nit b/src/doc/doc_model.nit
index 536cb3a..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
@@ -376,8 +376,8 @@ redef class MClassDef
 	redef fun tpl_css_classes do
 		var set = new HashSet[String]
 		if is_intro then set.add "intro"
-		set.add_all mclass.intro.modifiers
-		set.add_all modifiers
+		for m in mclass.intro.modifiers do set.add m.to_cmangle
+		for m in modifiers do set.add m.to_cmangle
 		return set.to_a
 	end
 
@@ -385,7 +385,7 @@ redef class MClassDef
 		var tpl = new Template
 		for modifier in modifiers do
 			if modifier == "public" then continue
-			tpl.add "{modifier} "
+			tpl.add "{modifier.html_escape} "
 		end
 		return tpl
 	end
@@ -468,8 +468,8 @@ redef class MPropDef
 	redef fun tpl_css_classes do
 		var set = new HashSet[String]
 		if is_intro then set.add "intro"
-		set.add_all mproperty.intro.modifiers
-		set.add_all modifiers
+		for m in mproperty.intro.modifiers do set.add m.to_cmangle
+		for m in modifiers do set.add m.to_cmangle
 		return set.to_a
 	end
 
@@ -477,7 +477,7 @@ redef class MPropDef
 		var tpl = new Template
 		for modifier in modifiers do
 			if modifier == "public" then continue
-			tpl.add "{modifier} "
+			tpl.add "{modifier.html_escape} "
 		end
 		return tpl
 	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