Wiki markup: fixed emphasis + merged some url patterns + added TODOs

PrismJS · Sep 3, 2015 · 8cf9e6a · 8cf9e6a
1 parent 5203dd1
commit 8cf9e6a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/components/prism-wiki.js b/components/prism-wiki.js
@@ -12,18 +12,19 @@ Prism.languages.wiki = Prism.languages.extend('markup', {
 		}
 	},
 	'emphasis': {
-		pattern: /('{2,4}).+?\1/,
+		// TODO Multi-line
+		pattern: /('{2,5}).+?\1/,
 		inside: {
 			'bold italic': {
-				pattern: /('''').+?(?=\1)/,
+				pattern: /(''''').+?(?=\1)/,
 				lookbehind: true
 			},
 			'bold': {
-				pattern: /(''').+?(?=\1)/,
+				pattern: /(''')[^'](?:.*?[^'])?(?=\1)/,
 				lookbehind: true
 			},
 			'italic': {
-				pattern: /('').+?(?=\1)/,
+				pattern: /('')[^'](?:.*?[^'])?(?=\1)/,
 				lookbehind: true
 			},
 			'punctuation': /^''+|''+$/
@@ -34,13 +35,13 @@ Prism.languages.wiki = Prism.languages.extend('markup', {
 		alias: 'punctuation'
 	},
 	'url': [
-		/ISBN +(?:97[89][ -]?)?(?:\d[ -]?){9}[\dx]\b/i,
-		/(?:RFC|PMID) +\d+/,
-		/\[\[.+?\]\]/,
-		/\[.+?\]/
+		/ISBN +(?:97[89][ -]?)?(?:\d[ -]?){9}[\dx]\b|(?:RFC|PMID) +\d+/i,
+		/\[\[.+?\]\]|\[.+?\]/
 	],
 	'variable': [
 		/__[A-Z]+__/,
+		// FIXME Nested structures should be handled
+		// {{formatnum:{{#expr:{{{3}}}}}}}
 		/\{{3}.+?\}{3}/,
 		/\{\{.+?}}/
 	],

diff --git a/components/prism-wiki.min.js b/components/prism-wiki.min.js
diff --git a/examples/prism-wiki.html b/examples/prism-wiki.html
@@ -14,7 +14,7 @@ <h2>Headings</h2>
 ====== Header 6 ======</code></pre>
 
 <h2>Bold and italic</h2>
-<pre><code>''''Both bold and italic''''
+<pre><code>'''''Both bold and italic'''''
 '''Only bold'''
 ''Only italic''</code></pre>