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

diff --git a/lib/markdown/markdown.nit b/lib/markdown/markdown.nit
index d928228..1bb8815 100644
--- a/lib/markdown/markdown.nit
+++ b/lib/markdown/markdown.nit
@@ -169,7 +169,7 @@ class MarkdownProcessor
 				if c == '\n' then
 					eol = true
 				else if c == '\t' then
-					var np = pos + (4 - (pos.bin_and(3)))
+					var np = pos + (4 - (pos & 3))
 					while pos < np do
 						value.add ' '
 						pos += 1
@@ -646,6 +646,11 @@ interface Decorator
 	# Kind of emitter used for decoration.
 	type EMITTER: MarkdownEmitter
 
+	# Render a single plain char.
+	#
+	# Redefine this method to add special escaping for plain text.
+	fun add_char(v: EMITTER, c: Char) do v.addc c
+
 	# Render a ruler block.
 	fun add_ruler(v: EMITTER, block: BlockRuler) is abstract
 
@@ -1918,7 +1923,7 @@ abstract class Token
 	var char: Char
 
 	# Output that token using `MarkdownEmitter::decorator`.
-	fun emit(v: MarkdownEmitter) do v.addc char
+	fun emit(v: MarkdownEmitter) do v.decorator.add_char(v, char)
 end
 
 # A token without a specific meaning.
@@ -2102,6 +2107,7 @@ abstract class TokenLinkOrImage
 					if pos == -1 then return -1
 				end
 			end
+			if pos < start then return -1
 			if md[pos] != ')' then return -1
 		else if md[pos] == '[' then
 			pos += 1