Commit 813f27c8610d53608e2c20b9ddf4b01e4b298d0e
2013-02-02T02:51:30
Update code.js, small improvements to prism-python.js & prism-python.min.js, revert prism.js to original
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76
diff --git a/code.js b/code.js
index b88c9a2..02d6767 100644
--- a/code.js
+++ b/code.js
@@ -48,6 +48,9 @@ var components = {
title: 'CoffeeScript',
require: 'javascript'
}
+ 'python': {
+ title: 'Python',
+ }
},
plugins: {
meta: {
diff --git a/components/prism-python.js b/components/prism-python.js
index 37ddaaf..34ac317 100644
--- a/components/prism-python.js
+++ b/components/prism-python.js
@@ -1,13 +1,14 @@
Prism.languages.python= {
'comment': {
- pattern: /(^|[^\\])#.*?(\r?\n|$)/g,lookbehind:!0
+ pattern: /(^|[^\\])#.*?(\r?\n|$)/g,
+ lookbehind: true
},
'string' : /("|')(\\?.)*?\1/g,
- 'keyword' :/\b(as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/g,
- 'boolean' :/\b(True|False)\b/g,
- 'number' :/\b-?(0x)?\d*\.?[\da-f]+\b/g,
- 'operator' :/[-+]{1,2}|=?<|=?>|!|=?<|=?>|={1,2}|(&){1,2}|(&){1,2}|\|?\||\?|\*|\/|~|\^|%|\b(or|and|not)\b/g,
- 'ignore' :/&(lt|gt|amp);/gi,
- 'punctuation' :/[{}[\];(),.:]/g
+ 'keyword' : /\b(as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/g,
+ 'boolean' : /\b(True|False)\b/g,
+ 'number' : /\b-?(0x)?\d*\.?[\da-f]+\b/g,
+ 'operator' : /[-+]{1,2}|=?<|=?>|!|={1,2}|(&){1,2}|(&){1,2}|\|?\||\?|\*|\/|~|\^|%|\b(or|and|not)\b/g,
+ 'ignore' : /&(lt|gt|amp);/gi,
+ 'punctuation' : /[{}[\];(),.:]/g
};
diff --git a/components/prism-python.min.js b/components/prism-python.min.js
index 2020029..6a42c72 100644
--- a/components/prism-python.min.js
+++ b/components/prism-python.min.js
@@ -1 +1 @@
-Prism.languages.python= {comment:{pattern:/(^|[^\\])#.*?(\r?\n|$)/g,lookbehind:!0},string: /("|')(\\?.)*?\1/g,keyword:/\b(as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/g,boolean:/\b(True|False)\b/g,number:/\b-?(0x)?\d*\.?[\da-f]+\b/g,operator:/[-+]{1,2}|=?<|=?>|!|=?<|=?>|={1,2}|(&){1,2}|(&){1,2}|\|?\||\?|\*|\/|~|\^|%|\b(or|and|not)\b/g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};
+Prism.languages.python= {comment:{pattern:/(^|[^\\])#.*?(\r?\n|$)/g,lookbehind:!0},string: /("|')(\\?.)*?\1/g,keyword:/\b(as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/g,boolean:/\b(True|False)\b/g,number:/\b-?(0x)?\d*\.?[\da-f]+\b/g,operator:/[-+]{1,2}|=?<|=?>|!|={1,2}|(&){1,2}|(&){1,2}|\|?\||\?|\*|\/|~|\^|%|\b(or|and|not)\b/g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};
diff --git a/prism.js b/prism.js
index 27ab944..e6cccdb 100644
--- a/prism.js
+++ b/prism.js
@@ -500,22 +500,4 @@ Prism.languages.insertBefore('coffeescript', 'keyword', {
},
'attr-name': /[_?a-z-|A-Z-]+(\s*:)| @[_?$?a-z-|A-Z-]+(\s*)| /g
-});
-
-/* **********************************************
- Begin prism-python.js
-********************************************** */
-
-Prism.languages.python= {
- 'comment': {
- pattern: /(^|[^\\])#.*?(\r?\n|$)/g,lookbehind:!0
- },
- 'string' : /("|')(\\?.)*?\1/g,
- 'keyword' :/\b(as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/g,
- 'boolean' :/\b(True|False)\b/g,
- 'number' :/\b-?(0x)?\d*\.?[\da-f]+\b/g,
- 'operator' :/[-+]{1,2}|=?<|=?>|!|=?<|=?>|={1,2}|(&){1,2}|(&){1,2}|\|?\||\?|\*|\/|~|\^|%|\b(or|and|not)\b/g,
- 'ignore' :/&(lt|gt|amp);/gi,
- 'punctuation' :/[{}[\];(),.:]/g
-};
-
+});
\ No newline at end of file