 			$.extend def, options
 			text = def.text
 			text
-				.replace(/\[im(g|age):([a-zA-Z0-9\-\.\/\?%\#_]+) left\]/g,'<img class="pull-left" src="http://oz.st-n.ru/publish/photo/' + sn.region.name + '/$2">')
-				.replace(/\[im(g|age):([a-zA-Z0-9\-\.\/\?%\#_]+) right\]/g,'<img class="pull-right" src="http://oz.st-n.ru/publish/photo/' + sn.region.name + '/$2">')
-				.replace(/\[im(g|age):([a-zA-Z0-9\-\.\/\?%\#_]+)\]/g,'<img src="http://oz.st-n.ru/publish/photo/' + sn.region.name + '/$2">')
+				.replace(/\[?(img|image|picture|photo):([a-zA-Z0-9\-\.\/\?%\#_]+)[\s]+(right|left)\]?/g,'<img class="pull-$3" src="http://oz.st-n.ru/publish/photo/' + sn.region.name + '/$2">')
+				.replace(/\[?(img|image|picture|photo):([a-zA-Z0-9\-\.\/\?%\#_]+)\]?/g,'<img src="http://oz.st-n.ru/publish/photo/' + sn.region.name + '/$2">')
 
 		fonts: (options = {}) ->
 

			$.extend def, options
			text = def.text
			text
				.replace(/\[badge (.*?) (success|warning|important|info|inverse)\]/g, '<span class="badge badge-$2">$1</span>')
				.replace(/\[badge (.*?)\]/g, '<span class="badge">$1</span>')

				.replace(/\[label (.*?) (success|warning|important|info|inverse)\]/g, '<span class="label label-$2">$1</span>')
				.replace(/\[label (.*?)\]/g, '<span class="label">$1</span>')

				.replace(/\[color:\#([a-zA-Z0-9\-\.\/\?%\#_]+) (.*?)\]/g, '<font style="color:#$1">$2</font>')
				.replace(/\[color:([a-zA-Z0-9\-\.\/\?%\#_]+) (.*?)\]/g, '<span class="$1">$2</span>')
				.replace(/\[\[color:\#([a-zA-Z0-9\-\.\/\?%\#_]+)\](.*?)\]/g, '<font style="color:#$1">$2</font>')
				.replace(/\[\[color:([a-zA-Z0-9\-\.\/\?%\#_]+)\](.*?)\]/g, '<span class="$1">$2</span>')


		ind: (options = {}) ->

			$.extend def, options
			text = def.text
			text
				.replace(/\[e\-?mail:([a-zA-Z0-9@\-\.\/\?%\#_]+)[\s]+(.*?)\]/g, '<a href="mailto:$1">$2</a>')
				.replace(/\[e\-?mail:([a-zA-Z0-9@\-\.\/\?%\#_]+)\]/g, '<a href="mailto:$1">$1</a>')

		photo: (options = {}) ->

