don't merge tokens (Includes coding style cleanups)

fix #355

index.html

@@ -31,7 +31,6 @@
           <option value="java">Java</option>
           <option value="csharp">C#</option>
           <option value="c_cpp">C++</option>
-          <option value="svg">SVG</option>
           <option value="clojure">Clojure</option>
           <option value="ocaml">OCaml</option>
           <option value="textile">Textile</option>
@@ -221,9 +220,7 @@
     for (var i=0; i<items.length; i++) {
         alert(items[i] + "juhu");
     }	// Real Tab.
-}
-// A magic character: >> ぁ <<
-</script>
+}</script>
 
     <script type="text/editor" id="csstext">.text-layer {
     font-family: Monaco, "Courier New", monospace;
@@ -302,8 +299,7 @@ for i in sys.argv[1:]:
         print repr(i), "not a numeric value"
     else:
         celsius=(fahrenheit-32)*5.0/9.0
-        print '%i\260F = %i\260C' % (int(fahrenheit), int(celsius+.5))
-</script>
+        print '%i\260F = %i\260C' % (int(fahrenheit), int(celsius+.5))</script>
 
     <script type="text/editor" id="phptext"><?php
 
@@ -674,8 +670,7 @@ th.join()
 assert counter.get() == 12
 </script>
 
-<script type="text/editor" id="scala">
-//http://www.scala-lang.org/node/227
+<script type="text/editor" id="scala">//http://www.scala-lang.org/node/227
 /* Defines a new method 'sort' for array objects */
 object implicits extends Application {
   implicit def arrayWrapper[A : ClassManifest](x: Array[A]) =
@@ -686,8 +681,7 @@ object implicits extends Application {
     }
   val x = Array(2, 3, 1, 4)
   println("x = "+ x.sort((x: Int, y: Int) => x < y))
-}
-</script>
+}</script>
   <input id="cockpitInput" type="text"/>
 
   <script type="text/javascript">