Merge pull request #1445 from ajaxorg/highlighting/bugfix

Add more modes

demo/kitchen-sink/doclist.js

@@ -142,6 +142,7 @@ var docs = {
     "docs/c9search.c9search_results": "C9 Search Results",
     
     "docs/actionscript.as": "ActionScript",
+    "docs/assembly_x86.asm": "Assembly_x86",
     "docs/autohotkey.ahk": "AutoHotKey",
     "docs/batchfile.bat": "BatchFile",
     "docs/erlang/erl": "Erlang",
@@ -149,7 +150,8 @@ var docs = {
     "docs/haskell.hs": "Haskell",
     "docs/julia.js": "Julia",
     "docs/prolog/plg": "Prolog",
-    "docs/rust.rs": "Rust"
+    "docs/rust.rs": "Rust",
+    "docs/twig.twig": "Twig"
 };
 
 var ownSource = {

demo/kitchen-sink/docs/assembly_x86.asm

@@ -0,0 +1,18 @@
+section	.text
+    global main         ;must be declared for using gcc
+
+main:	                ;tell linker entry point
+
+	mov	edx, len	    ;message length
+	mov	ecx, msg	    ;message to write
+	mov	ebx, 1	        ;file descriptor (stdout)
+	mov	eax, 4	        ;system call number (sys_write)
+	int	0x80	        ;call kernel
+
+	mov	eax, 1	        ;system call number (sys_exit)
+	int	0x80	        ;call kernel
+
+section	.data
+
+msg	db	'Hello, world!',0xa	;our dear string
+len	equ	$ - msg			;length of our dear string

demo/kitchen-sink/docs/twig.twig

@@ -0,0 +1,9 @@
+{% autoescape true %}
+    {{ var }}
+    {{ var|raw }}     {# var won't be escaped #}
+    {{ var|escape }}  {# var won't be doubled-escaped #}
+{% endautoescape %}
+
+{{ include('twig.html', sandboxed = true) }}
+
+{{"string #{with} \" escapes" 'another#one' }}