f144623ce9
Minor spelling differences for style
2017-10-10 15:11:20 +11:00
f680ee7088
Updated all instances of jade to be named pug.
2017-10-10 15:05:49 +11:00
edf2454cab
Merge branch 'master' of https://github.com/eisbehr-/prism into eisbehr--master
2017-09-16 13:13:38 +02:00
5ac0afb458
Merge branch 'opencl' of https://github.com/Milania1/prism into Milania1-opencl
...
# Conflicts:
# plugins/autoloader/prism-autoloader.js
# plugins/autoloader/prism-autoloader.min.js
# plugins/show-language/prism-show-language.js
# plugins/show-language/prism-show-language.min.js
2017-09-16 12:58:59 +02:00
4b48de3162
add prism-arduino.html
2017-09-12 08:36:11 +02:00
eaa8ebb4cb
Merge branch 'n4js' of https://github.com/bsmith-n4/prism into bsmith-n4-n4js
...
# Conflicts:
# plugins/show-language/prism-show-language.js
# plugins/show-language/prism-show-language.min.js
2017-09-09 12:40:24 +02:00
7ab4013a62
Merge branch 'Hyuchia-renpy-language' into gh-pages
...
# Conflicts:
# components/prism-apl.js
# components/prism-apl.min.js
# plugins/show-language/prism-show-language.js
# plugins/show-language/prism-show-language.min.js
2017-09-09 11:36:53 +02:00
2e32fc7eba
Eiffel: Make strings greedy and update tests and example
2017-09-09 10:51:00 +02:00
1a628b8dc7
Add OpenCL language support
2017-08-17 22:12:51 +02:00
af937cf773
expand on n4js example
2017-05-29 17:15:03 +02:00
98867cf030
initial commit
2017-05-29 15:28:00 +02:00
62cdaf8066
Ruby: Add support for =begin =end comments. Manual merge of #1121 .
2017-05-08 13:39:11 +02:00
88300817fd
VB.Net: Add example + tests + fix regexps
2017-05-08 13:26:16 +02:00
bf5519672e
Clean up no longer relevant failures in examples
2017-02-08 23:25:12 +01:00
345b1b2afd
Adds Django/Jinja2 language definition ( #1085 )
2017-01-28 10:08:49 +01:00
df31330f48
Merge remote-tracking branch 'upstream/master' into renpy-language
2016-12-29 11:05:48 -06:00
3cae6ce887
Add support for Reason. Fix #1046
2016-11-19 12:16:31 +01:00
dfc19413d3
Add support for the Jolie language ( #1014 )
...
* Added component for the Jolie language
* Added Jolie among the supported components
* update for merge
- revised jolie component
- added tests
- added code example
- minified with `gulp`
* fixes
* fixes
* fixed Jolie html file example and highlight for punctuation
* fixed indentation in test html file and added comma as punctuation
2016-11-09 01:57:46 +01:00
5e62f023dc
Add support for Xojo. Fix #898
2016-07-04 20:13:26 +02:00
65619f7ece
Add support for Ada (generic). Closes #949
2016-07-03 03:20:53 +02:00
9c5ffb5ead
Merge remote-tracking branch 'official/gh-pages' into prism-livescript
...
Conflicts:
plugins/show-language/prism-show-language.js
plugins/show-language/prism-show-language.min.js
2016-06-27 01:27:23 +02:00
9cfc8cb2ef
Add support for LiveScript
2016-06-18 19:39:36 +02:00
2607dcd9ae
Add support for .properties files
2016-06-18 14:46:44 +02:00
bfb559bf53
Add support for GraphQL
2016-06-11 01:20:38 +02:00
b8275198db
Fixed whitespaces, reordered tokens, used Gulp to min JS
2016-04-08 12:27:12 +02:00
22bf9c55db
Fixed issues pointed out in previous pull request
2016-04-08 12:27:12 +02:00
ff93a9cc09
Better HTML example
2016-04-08 12:27:12 +02:00
9e8d4f99a4
More improvements to Bro
2016-04-08 12:27:12 +02:00
b25a751508
Added Bro support to Prism
2016-04-08 12:27:12 +02:00
367ace62de
1)Adding annotation token for Java
...
2)Aliasing java annotation to punctuation
3)Aliasing grovy annotation to punctuation
4)Adding in sample code
2016-03-08 06:43:49 -06:00
e8a31a50c3
Merge pull request #814 from Golmote/prism-kotlin
...
Add support for Kotlin
2015-10-26 08:16:29 +01:00
81933ee8cd
Merge pull request #813 from Golmote/prism-puppet
...
Add support for Puppet configuration
2015-10-22 07:17:56 +02:00
f5db346320
Merge pull request #812 from Golmote/prism-roboconf
...
Add support for Roboconf
2015-10-22 07:17:38 +02:00
eb7aa969e3
Add support for Kotlin
2015-10-22 07:14:06 +02:00
e7a623c58b
Merge branch 'gh-pages' into prism-haxe
...
Conflicts:
plugins/autoloader/prism-autoloader.js
plugins/autoloader/prism-autoloader.min.js
2015-10-21 06:35:03 +02:00
77c0b061f2
Merge branch 'gh-pages' into prism-parser
...
Conflicts:
components.js
2015-10-21 06:32:15 +02:00
b7b1b6a9ab
Merge branch 'gh-pages' into prism-oz
...
Conflicts:
components.js
2015-10-17 10:37:52 +02:00
a36bc4ae2e
Merge pull request #804 from Golmote/prism-lua
...
Add support for Lua
2015-10-17 10:36:03 +02:00
b43c5f3fb6
Merge pull request #803 from Golmote/prism-icon
...
Add support for Icon
2015-10-17 10:35:30 +02:00
0b4e1d3ded
Add support for Puppet configuration
2015-10-17 10:32:59 +02:00
c9b40810df
Add support for Roboconf
2015-10-16 08:50:33 +02:00
188c75ccb7
Merge branch 'gh-pages' into prism-parigp
...
Conflicts:
plugins/show-language/prism-show-language.js
plugins/show-language/prism-show-language.min.js
2015-10-16 08:00:22 +02:00
6803ca03c0
Merge pull request #800 from Golmote/prism-asciidoc
...
Add support for AsciiDoc
2015-10-16 07:58:39 +02:00
e25da0da67
Add support for Haxe
2015-10-15 08:55:07 +02:00
2ba763e093
Add support for Parser
2015-10-13 21:08:49 +02:00
d5ace6c2eb
Add support for Oz
2015-10-11 13:45:28 +02:00
1a4ff7aca1
Add support for Lua
2015-10-11 10:38:10 +02:00
2d08fa9013
Add support for Icon
2015-10-10 21:36:23 +02:00
6679e735cb
Add support for PARI/GP
2015-10-10 16:38:02 +02:00
68159d5b38
Add support for AsciiDoc
2015-10-10 03:57:25 +02:00
198bc99a64
Add support for Nix
2015-10-07 00:28:30 +02:00
6babaad4c1
Merge pull request #781 from Golmote/prism-batch
...
Prism batch
2015-10-06 07:53:35 +02:00
71bf8e9a9f
Add support for Here-Documents for the Bash language
...
This patch adds support for Here-Documents for the Bash language.
A Here-Document should be highlighted as a multiline string
and looks like this:
cat << EOF
foo bar
EOF
2015-10-02 10:17:41 +02:00
93a53c773c
Merge branch 'gh-pages' into prism-batch
2015-09-28 09:19:42 +02:00
eab5b06eac
Add support for Batch ( Fix #398 )
2015-09-28 09:19:26 +02:00
239b95f0a2
Fix something commented in #780
2015-09-27 16:29:47 +09:00
3bfc7fa2b4
Add Crystal examples
2015-09-27 00:24:46 +09:00
69ea994eb5
Add support for vim. Closes #777
2015-09-24 09:04:32 +02:00
e62c88ed01
Add nginx to components, fixed basic highlighting, add a few tests
2015-09-23 08:41:41 +02:00
dc4fc19b03
Merge pull request #776 from westonganger/master
...
Add Nginx
2015-09-23 08:23:23 +02:00
114a6e1e44
Add Nginx
2015-09-22 10:40:37 -07:00
3f3867323c
Add support for AutoIt. Fix #453
2015-09-17 08:56:50 +02:00
795eb996f9
Verilog: Rename to "Verilog", optimize string regexp, don't use captures unless needed
2015-09-16 08:22:27 +02:00
44a11c2b66
Merge pull request #640 from a-rey/gh-pages
...
adding system verilog language
2015-09-16 07:55:58 +02:00
7feb135e24
Merge pull request #764 from Golmote/prism-bison
...
Add support for Bison
2015-09-16 07:53:42 +02:00
e642a222be
Add diff syntax definition
2015-09-15 13:48:01 +08:00
75b0328b94
Merge pull request #636 from dellagustin/add_abap_language
...
Add ABAP language
2015-09-11 07:47:25 +02:00
e336007fcf
Add support for Bison
2015-09-09 21:09:41 +02:00
d1d971fa97
Merge branch 'gh-pages' into prism-prolog
...
Conflicts:
components.js
2015-09-09 08:29:35 +02:00
73e16f37cd
Merge branch 'gh-pages' into prism-processing
...
Conflicts:
components.js
2015-09-09 08:17:21 +02:00
ae2fbb615d
Merge branch 'gh-pages' into prism-ocaml
2015-09-09 07:39:00 +02:00
e1dd5cc947
Merge branch 'gh-pages' into prism-pure
2015-09-08 19:11:06 +02:00
addc971003
Q: Fixed comments + added explanation, renamed date to datetime, optimized operators
2015-09-08 09:04:06 +02:00
d1f90a11d0
Merge branch 'gh-pages' into prism-q
...
Conflicts:
components.js
2015-09-08 08:19:09 +02:00
82638e753c
Merge branch 'gh-pages' into prism-j
2015-09-08 07:34:56 +02:00
ea61184a51
Merge branch 'gh-pages' into prism-nim
2015-09-07 21:56:23 +02:00
fd324de973
Merge branch 'gh-pages' into prism-monkey
...
Conflicts:
components.js
2015-09-07 21:35:58 +02:00
8e93d55bac
Merge branch 'gh-pages' into prism-basic
2015-09-07 08:14:00 +02:00
8af0b91a47
Merge branch 'gh-pages' into prism-mizar
...
Conflicts:
components.js
2015-09-07 08:02:38 +02:00
95720443d6
Merge branch 'gh-pages' into prism-mel
2015-09-07 07:33:04 +02:00
6c0bc91c62
Merge branch 'gh-pages' into prism-inform7
2015-09-06 19:05:51 +02:00
92de71d77d
Merge branch 'gh-pages' into prism-glsl
2015-09-06 18:37:33 +02:00
4d3f20e4f1
Merge branch 'gh-pages' into prism-d
2015-09-06 11:26:39 +02:00
93964dd2b4
Textile: Fix table modifiers, fix blank punctuation and modifiers, fix phrases, fix image title, simplified regexps, simplified nesting.
2015-09-06 11:19:33 +02:00
9019fce52d
Merge branch 'gh-pages' into prism-textile
...
Conflicts:
components.js
2015-09-06 08:12:40 +02:00
125e91ff1d
Merge branch 'gh-pages' of https://github.com/temnoregg/prism into gh-pages + fixes + add example and tests
...
Conflicts:
components.js
2015-09-05 18:53:11 +02:00
e808352051
Merge pull request #576 from JustinBeckwith/gh-pages
...
add dockerfile highlighting
2015-09-05 16:44:38 +02:00
89cd5d01f7
Swift: Add support for string interpolation. Fix #448
2015-09-05 16:27:38 +02:00
33a295fdbf
APL: Add examples
2015-09-05 11:52:28 +02:00
11ff829f74
Tcl: Add operators and punctuation + add examples
2015-09-05 11:35:00 +02:00
c451611466
Elixir is capitalized (2) + fixed example
2015-09-05 09:48:50 +02:00
ea49b6608b
Elixir is capitalized
2015-09-05 09:45:11 +02:00
801769cc93
Elixir: Merged heredoc with strings, fixed capture, optimized operators and keywords.
2015-09-05 09:42:40 +02:00
a2dda44853
Merge branch 'gh-pages' into prism-elixir
2015-09-05 00:26:10 +02:00
2f9fe1efb8
Added some language aliases.
2015-09-03 23:39:16 +02:00
8cf9e6a074
Wiki markup: fixed emphasis + merged some url patterns + added TODOs
2015-09-03 08:27:37 +02:00
77297288da
Stylus: Rewrote the component entirely
2015-09-02 00:47:09 +02:00
e0f89843b7
Makefile example: Add known failures
2015-08-26 20:30:11 +02:00
a9e3010729
Added examples and simplified expressions
2015-08-15 19:29:26 -05:00
6fc4cf68a8
More examples for git
2015-08-02 23:55:37 +02:00
1cf5006055
requested changes and personal modifications
2015-07-12 16:41:33 -04:00
8d43cdfb68
adding system verilog language
2015-07-11 16:59:13 -04:00
c36b12315e
Merge pull request #583 from westonganger/gh-pages
...
Added Ruby string interpolation
2015-07-11 10:21:25 +02:00
39877114fa
ActionScript: Update examples to add inline XML
2015-07-10 22:04:05 +02:00
2c1626a731
ActionScript: Update examples to add inline XML
2015-07-10 22:01:06 +02:00
eeec00cdac
Updated ABAP with some more example
2015-07-10 15:07:48 +00:00
16c20ac7d0
First abap example
2015-07-10 14:42:03 +00:00
3e9d3abb0e
Add support for Prolog
2015-07-08 00:03:25 +02:00
25b11bf24f
Add support for Processing
2015-07-07 08:47:44 +02:00
afb634bc05
Add support for OCaml
2015-07-07 01:13:08 +02:00
f0684e6c34
Add support for Pure
2015-07-06 19:39:35 +02:00
d3155c97ab
Add support for Q (kdb+ database)
2015-07-05 20:49:20 +02:00
d03f11a613
Add support for J
2015-07-05 16:03:08 +02:00
972fc8fd61
Add support for Nim
2015-07-04 11:18:00 +02:00
3275c884a8
Add support for Monkey
2015-07-03 22:55:59 +02:00
aff673389a
Add support for BASIC
2015-07-03 21:51:05 +02:00
e90c74e3e8
Add support for Mizar
2015-07-03 08:40:47 +02:00
930e97faea
Add support for MEL (Maya Embedded Language)
2015-07-02 07:51:39 +02:00
c3850a30b5
Add support for Inform 7
2015-07-01 22:14:58 +02:00
69344cb727
Add support for GLSL (OpenGL Shading Language)
2015-07-01 07:12:12 +02:00
08054b153b
Add support for elixir
2015-06-30 21:46:35 +02:00
c2735d2089
Add support for D
2015-06-29 22:00:42 +02:00
2698f82e71
Merge pull request #609 from mcdurdin/gh-pages
...
Add Keyman language highlighting
2015-06-27 22:36:43 -04:00
3baa61c1f7
Merge pull request #610 from Golmote/prism-makefile
...
Add support for Makefile
2015-06-27 22:25:58 -04:00
82dbbdfe44
Merge remote-tracking branch 'official/gh-pages' into prism-brainfuck
...
Conflicts:
components.js
2015-06-28 03:07:59 +02:00
12219d2f59
Add support for Makefile
2015-06-28 02:27:32 +02:00
ab4a4cad3d
Clean up Keyman regexes, add further examples
2015-06-28 06:24:07 +10:00
e07819b86e
Keyman examples
2015-06-27 22:42:19 +10:00
5b1e07bc04
fixed double quoted strings in interpolation ruby
2015-06-25 12:58:40 -07:00
a7064dd4cc
Moved up JS strings before template strings as they are far more common
2015-06-20 20:07:37 +02:00
43e6157d3d
Merge pull request #595 from a-rey/add-vhdl
...
adding vhdl language
2015-06-18 18:52:55 +02:00
3d3989151c
adding example page and minified file
2015-06-18 11:13:15 -04:00
04f72b1495
ES6: Template strings + interpolation
2015-06-14 18:26:16 +02:00
b081804639
Basic Sass support ( fix #199 )
2015-06-13 11:03:08 +02:00
f409b13111
Merge pull request #587 from apfelbox/handlebars-blocks-dashes
...
Handlebars: support block names with dashes (or other special characters)
2015-06-12 20:55:55 +02:00
52fd55ee6a
Relax markup grammar to allow non-ASCII chars in tag names and attributes. Fix #585
2015-06-12 20:20:41 +02:00
67b89eaf0f
Handlebars: support blocks with dashes
2015-06-01 18:45:17 +02:00
e3f4d7af13
added ruby string interpolation
2015-05-29 20:31:17 -07:00
81eff5476f
fixed string interpolation feature
2015-05-23 14:54:09 -07:00
d795397ef0
C#: Verbatim strings can contain doubled quotes and new lines
2015-05-23 10:25:16 +02:00
99d87ca25e
fix CR feedback, add better sample
2015-05-13 17:54:36 -07:00
951e973eaf
add dockerfile highlighting
2015-05-08 08:30:37 -07:00
404dfb7230
Merge branch 'gh-pages' of https://github.com/PrismJS/prism into prism-textile
2015-03-27 19:48:45 +01:00
6e555bc047
Added YAML highlighter
2015-03-27 13:34:54 +01:00
42fcc2a4cc
Merge branch 'master' into prism-textile
...
Conflicts:
components.js
2015-03-21 02:22:34 +01:00
4fa8ac5cfc
Add Smalltalk language
2015-03-21 01:39:20 +01:00
230b67ae80
Add Brainfuck language
2015-03-21 00:05:02 +01:00
7a4c6355ca
Merge branch 'gh-pages' of https://github.com/PrismJS/prism into prism-textile
...
Conflicts:
components.js
2015-03-20 23:39:32 +01:00
05bb4bdabe
Merge branch 'master' into prism-wiki
...
Conflicts:
components.js
2015-03-20 23:32:42 +01:00
5db8c43724
Add quick examples for Objective C and Julia
2015-03-20 07:23:46 +01:00
8cf224f5b0
fix conflict
2015-03-16 14:44:07 +05:30
e8f101f31f
Merge pull request #502 from hason/gherkin
...
Improved gherkin highlighter
2015-03-16 04:50:37 -04:00
6eaf17684e
Add reST language ( fix #552 )
2015-03-15 19:08:17 +01:00
afb3cd5283
Bash: add examples for the highlighting of commands
2015-03-13 08:07:34 +01:00
53eb9d25bc
Improved gherkin highlighter
2015-03-11 23:02:39 +01:00
1b284a1af1
Add Wiki markup language
2015-03-10 21:23:05 +01:00
df8267d6ee
Merge branch 'gh-pages' of https://github.com/PrismJS/prism into prism-textile
...
Conflicts:
components.js
2015-03-09 22:41:12 +01:00
6006eef7ff
Add Textile language
2015-03-09 22:32:01 +01:00
80489ab954
Merge branch 'gh-pages' of github.com:LeaVerou/prism into stylus
...
Conflicts:
components.js
2015-03-04 19:56:43 +05:30
18ce84f3cf
Add basic highlighting for SAS language. ( fix #515 )
2015-02-28 00:07:00 +01:00
95173e4d57
fix merge conflict
2015-02-13 22:52:05 +05:30
9a2c814a0c
Correcting numbers regexes as per suggestions
2015-02-08 17:05:29 +00:00
eba7177122
Reversing change in examples.js, simplifying regexes and expanding numbers section in example per suggestion
2015-02-08 13:17:02 +00:00
2664796c79
Removed newline consumption in single line comment and split numbers regex to handle hex, binary, integer and decimal numbers separately
2015-02-07 16:44:50 +00:00
459777847d
Added F# support and example
...
Added F# support and example
2015-02-06 13:50:12 +00:00
4a03e2736e
Initial definition for stylus
2015-02-01 18:03:53 +05:30
01b1ef21d3
Update PHP examples to reflect last changes
2015-01-29 07:59:11 +01:00
43e93e6c97
Added TypeScript definition
2015-01-20 14:52:20 +05:30
875ad39f1b
Added React JSX definition
2015-01-18 17:30:09 +05:30
0bc736ad4b
Remove uneeded precisions for known issues
2015-01-15 19:12:34 +01:00
1436dd4c2d
Add Eiffel examples
2015-01-14 00:06:50 +01:00
fb6e3e4b63
Make nesting failures more clear
2015-01-07 20:50:48 +01:00
a1ea012383
Add support for some nesting, give priority to Markdown over Markup, fixed example
2015-01-07 20:37:24 +01:00
c38c2447f2
Fixed example
2015-01-07 20:07:14 +01:00
c03c2948a1
Merge branch 'master' into prism-markdown
...
Conflicts:
components.js
2015-01-07 19:57:07 +01:00
93c82ca2d2
Fixed example
2015-01-07 19:55:56 +01:00
eaf8ac0c61
Improved Markdown + added example
2015-01-07 19:48:29 +01:00
77815a153c
Added Smarty and ActionScript examples
2015-01-07 01:04:18 +01:00
61e75a0e0c
Merge branch 'prism-examples'
2015-01-06 20:22:52 +01:00
72cde69424
Groovy fix : added support for shebang, fixed single-line strings and updated example page
2015-01-06 20:22:24 +01:00
5acb61ed1c
Merge branch 'prism-examples'
2015-01-05 09:13:52 +01:00
cc59da8a4d
Improved floating-point numbers in NASM
2015-01-05 09:13:06 +01:00
dc0599cb4e
Example for NASM
2015-01-05 09:01:17 +01:00
3eeaff11ed
Add example/test code for #452
2015-01-04 17:18:15 +01:00
2c8ca95df3
Fix broken example in Scala
2015-01-04 14:19:45 +01:00
d9c69cbd24
Add examples for AutoHotkey, Haskell, Pascal, R, Scala
2015-01-04 14:14:54 +01:00
f57df1ec93
Fixes on examples
2015-01-03 12:56:15 +01:00
fe9e174be1
Removed broken java examples
2015-01-03 12:45:13 +01:00
a1dcf1aeaf
Add known failures for C-like
2015-01-03 12:37:50 +01:00
987e8f2899
Added examples for C-like, C#, Gherkin, Groovy, Java, NSIS, Rip and SCSS
2015-01-03 12:31:33 +01:00
9cfcc2d8d4
PowerShell support
2014-12-31 10:19:19 +11:00
e262ba89cc
Merge branch 'prism-examples'
2014-12-23 20:51:45 +01:00
68f60007c8
Add examples for ASP.NET, C, C++, Go, Scheme and Swift
2014-12-23 20:48:51 +01:00
88ba4c48f0
Fixes in examples
2014-12-23 09:01:46 +01:00
27ec928b35
Add examples for Haml, Handlebars, Ini, LaTeX and PHP
2014-12-23 08:53:56 +01:00
c51673874b
Improved examples
2014-12-22 22:34:36 +01:00
a1747745a4
Add examples for Git, HTTP, LOLCODE, MATLAB, Perl, Python and Ruby
2014-12-22 22:15:56 +01:00
95ef3dae3c
Fixed spacing
2014-12-22 09:18:36 +01:00
49a1467b23
Add CoffeeScript examples + fix others
2014-12-22 09:14:46 +01:00
00068402ac
Added bash, Jade, Less, SQL and Twig examples
2014-12-22 08:59:49 +01:00
63563e5a7e
Improved examples
2014-12-21 21:18:22 +01:00
30f590560c
Add several examples
2014-12-21 20:53:49 +01:00
e2c57b2e48
Merge branch 'master' into prism-examples
2014-12-21 20:39:11 +01:00
6e9bffb04f
Added apacheconf examples
2014-12-21 19:48:03 +01:00
2e156c9ac4
Fixed spacing in examples
2014-12-21 19:42:02 +01:00
1a4fcc63b6
Add Rust examples
2014-12-21 16:11:33 +01:00
aac37ffff7
Add Rust examples
2014-12-21 15:38:07 +01:00
d7ab5ac6bc
Examples work in progress
2014-12-21 15:35:47 +01:00
d85f18c59b
Examples work in progress
2014-12-21 15:25:26 +01:00
a4250c8eee
Examples first shot
2014-12-21 14:33:25 +01:00
Jake Miller
Golmote
Eisbehr
Jan S. (Milania1)
bsmith
Roman Miroshnychenko
Diego Islas Ocampo
thesave
Golmote
wayward710
James Baca
Andreas Rohner
TSUYUSATO Kitsune
Weston Ganger
Tzu-ping Chung
Loic Giraudel
a-rey
dellagustin
Lea Verou
Marc Durdin
Jannik Zschiesche
Justin Beckwith
beckwith
Martin Hasoň
Vivek Kumar Bansal
Simon Reynolds
Victorien ELVINGER
Daniel Flint