diff --git a/templates/map-raw b/templates/map-raw
--- a/templates/map-raw
+++ b/templates/map-raw
@@ -1,15 +1,15 @@
header = header-raw.tmpl
footer = ""
changeset = changeset-raw.tmpl
-annotateline = "
#author#@#rev# | #line|escape# |
"
-difflineplus = "#line|escape#"
-difflineminus = "#line|escape#"
-difflineat = "#line|escape#"
-diffline = "#line|escape#"
+annotateline = "#author#@#rev# | #line# |
"
+difflineplus = "#line#"
+difflineminus = "#line#"
+difflineat = "#line#"
+diffline = "#line#"
changesetparent = "# parent: #node#"
changesetchild = "# child: #node#"
filenodelink = "#file|urlescape#"
filerevision = filerevision-raw.tmpl
-fileline = "#line|escape#"
+fileline = "#line#"
diffblock = "#lines#"
filediff = filediff-raw.tmpl