Merge pull request #466 from vkbansal/fix-crlf

fixes #464 crlf issue
PrismJS · Jan 11, 2015 · bf66348 · bf66348
2 parents 6cac548 + b6e7da5
commit bf66348
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/plugins/show-invisibles/index.html b/plugins/show-invisibles/index.html
@@ -43,4 +43,4 @@ <h1>Examples</h1>
 
 
 </body>
-</html>
+</html>
diff --git a/plugins/show-invisibles/prism-show-invisibles.css b/plugins/show-invisibles/prism-show-invisibles.css
@@ -5,13 +5,16 @@
 }
 
 .token.tab:not(:empty):before {
-	content: '▸';
+    content: '\21E5';
 }
 
 .token.cr:before {
-	content: '␍';
+    content: '\240D';
 }
 
+.token.crlf:before {
+    content: '\240D\240A';
+}
 .token.lf:before {
-	content: '␊';
-}
+    content: '\240A';
+}
diff --git a/plugins/show-invisibles/prism-show-invisibles.js b/plugins/show-invisibles/prism-show-invisibles.js
@@ -7,9 +7,10 @@ if(!window.Prism) {
 for (var language in Prism.languages) {
 	var tokens = Prism.languages[language];
 
-	tokens.tab = /\t/g;
-	tokens.lf = /\n/g;
+    tokens.tab = /\t/g;
+    tokens.crlf = /\r\n/g;
+    tokens.lf = /\n/g;
 	tokens.cr = /\r/g;
 }
 
-})();
+})();
diff --git a/plugins/show-invisibles/prism-show-invisibles.min.js b/plugins/show-invisibles/prism-show-invisibles.min.js