From: <var...@us...> - 2014-07-04 11:58:32
|
Revision: 8955 http://sourceforge.net/p/phpwiki/code/8955 Author: vargenau Date: 2014-07-04 11:58:20 +0000 (Fri, 04 Jul 2014) Log Message: ----------- Move SyntaxHighlighter plugin to highlight.js Modified Paths: -------------- trunk/highlight.js/README.md trunk/highlight.js/README.ru.md trunk/highlight.js/highlight.pack.js trunk/highlight.js/styles/arta.css trunk/highlight.js/styles/ascetic.css trunk/highlight.js/styles/brown_paper.css trunk/highlight.js/styles/dark.css trunk/highlight.js/styles/default.css trunk/highlight.js/styles/far.css trunk/highlight.js/styles/github.css trunk/highlight.js/styles/googlecode.css trunk/highlight.js/styles/idea.css trunk/highlight.js/styles/ir_black.css trunk/highlight.js/styles/magula.css trunk/highlight.js/styles/monokai.css trunk/highlight.js/styles/pojoaque.css trunk/highlight.js/styles/rainbow.css trunk/highlight.js/styles/school_book.css trunk/highlight.js/styles/solarized_dark.css trunk/highlight.js/styles/solarized_light.css trunk/highlight.js/styles/sunburst.css trunk/highlight.js/styles/tomorrow-night-blue.css trunk/highlight.js/styles/tomorrow-night-bright.css trunk/highlight.js/styles/tomorrow-night-eighties.css trunk/highlight.js/styles/tomorrow-night.css trunk/highlight.js/styles/tomorrow.css trunk/highlight.js/styles/vs.css trunk/highlight.js/styles/xcode.css trunk/highlight.js/styles/zenburn.css trunk/lib/plugin/SyntaxHighlighter.php trunk/themes/fusionforge/templates/bottom.tmpl Added Paths: ----------- trunk/highlight.js/CHANGES.md trunk/highlight.js/styles/atelier-dune.dark.css trunk/highlight.js/styles/atelier-dune.light.css trunk/highlight.js/styles/atelier-forest.dark.css trunk/highlight.js/styles/atelier-forest.light.css trunk/highlight.js/styles/atelier-heath.dark.css trunk/highlight.js/styles/atelier-heath.light.css trunk/highlight.js/styles/atelier-lakeside.dark.css trunk/highlight.js/styles/atelier-lakeside.light.css trunk/highlight.js/styles/atelier-seaside.dark.css trunk/highlight.js/styles/atelier-seaside.light.css trunk/highlight.js/styles/docco.css trunk/highlight.js/styles/foundation.css trunk/highlight.js/styles/mono-blue.css trunk/highlight.js/styles/monokai_sublime.css trunk/highlight.js/styles/obsidian.css trunk/highlight.js/styles/paraiso.dark.css trunk/highlight.js/styles/paraiso.light.css trunk/highlight.js/styles/railscasts.css Removed Paths: ------------- trunk/highlight.js/classref.txt Added: trunk/highlight.js/CHANGES.md =================================================================== --- trunk/highlight.js/CHANGES.md (rev 0) +++ trunk/highlight.js/CHANGES.md 2014-07-04 11:58:20 UTC (rev 8955) @@ -0,0 +1,827 @@ +## Version 8.0 beta + +This new major release is quite a big overhaul bringing both new features and +some backwards incompatible changes. However, chances are that the majority of +users won't be affected by the latter: the basic scenario described in the +README is left intact. + +Here's what did change in an incompatible way: + +- We're now prefixing all classes located in [CSS classes reference][cr] with + `hljs-`, by default, because some class names would collide with other + people's stylesheets. If you were using an older version, you might still want + the previous behavior, but still want to upgrade. To suppress this new + behavior, you would initialize like so: + + ```html + <script type="text/javascript"> + hljs.configure({classPrefix: ''}); + hljs.initHighlightingOnLoad(); + </script> + ``` + +- `tabReplace` and `useBR` that were used in different places are also unified + into the global options object and are to be set using `configure(options)`. + This function is documented in our [API docs][]. Also note that these + parameters are gone from `highlightBlock` and `fixMarkup` which are now also + rely on `configure`. + +- We removed public-facing (though undocumented) object `hljs.LANGUAGES` which + was used to register languages with the library in favor of two new methods: + `registerLanguage` and `getLanguage`. Both are documented in our [API docs][]. + +- Result returned from `highlight` and `highlightAuto` no longer contains two + separate attributes contributing to relevance score, `relevance` and + `keyword_count`. They are now unified in `relevance`. + +Another technically compatible change that nonetheless might need attention: + +- The structure of the NPM package was refactored, so if you had installed it + locally, you'll have to update your paths. The usual `require('highlight.js')` + works as before. This is contributed by [Dmitry Smolin][]. + +New features: + +- Languages now can be recognized by multiple names like "js" for JavaScript or + "html" for, well, HTML (which earlier insisted on calling it "xml"). These + aliases can be specified in the class attribute of the code container in your + HTML as well as in various API calls. For now there are only a few very common + aliases but we'll expand it in the future. All of them are listed in the + [class reference][]. + +- Language detection can now be restricted to a subset of languages relevant in + a given context — a web page or even a single highlighting call. This is + especially useful for node.js build that includes all the known languages. + Another example is a StackOverflow-style site where users specify languages + as tags rather than in the markdown-formatted code snippets. This is + documented in the [API reference][] (see methods `highlightAuto` and + `configure`). + +- Language definition syntax streamlined with [variants][] and + [beginKeywords][]. + +New languages and styles: + +- *Oxygene* by [Carlo Kok][] +- *Mathematica* by [Daniel Kvasnička][] +- *Autohotkey* by [Seongwon Lee][] +- *Atelier* family of styles in 10 variants by [Bram de Haan][] +- *Paraíso* styles by [Jan T. Sott][] + +Miscelleanous improvements: + +- Highlighting `=>` prompts in Clojure. +- [Jeremy Hull][] fixed a lot of styles for consistency. +- Finally, highlighting PHP and HTML [mixed in peculiar ways][php-html]. +- Objective C and C# now properly highlight titles in method definition. +- Big overhaul of relevance counting for a number of languages. Please do report + bugs about mis-detection of non-trivial code snippets! + +[cr]: http://highlightjs.readthedocs.org/en/latest/css-classes-reference.html +[api docs]: http://highlightjs.readthedocs.org/en/latest/api.html +[variants]: https://groups.google.com/d/topic/highlightjs/VoGC9-1p5vk/discussion +[beginKeywords]: https://github.com/isagalaev/highlight.js/commit/6c7fdea002eb3949577a85b3f7930137c7c3038d +[php-html]: https://twitter.com/highlightjs/status/408890903017689088 + +[Carlo Kok]: https://github.com/carlokok +[Bram de Haan]: https://github.com/atelierbram +[Daniel Kvasnička]: https://github.com/dkvasnicka +[Dmitry Smolin]: https://github.com/dimsmol +[Jeremy Hull]: https://github.com/sourrust +[Seongwon Lee]: https://github.com/dlimpid +[Jan T. Sott]: https://github.com/idleberg + + +## Version 7.5 + +A catch-up release dealing with some of the accumulated contributions. This one +is probably will be the last before the 8.0 which will be slightly backwards +incompatible regarding some advanced use-cases. + +One outstanding change in this version is the addition of 6 languages to the +[hosted script][d]: Markdown, ObjectiveC, CoffeeScript, Apache, Nginx and +Makefile. It now weighs about 6K more but we're going to keep it under 30K. + +New languages: + +- OCaml by [Mehdi Dogguy][mehdid] and [Nicolas Braud-Santoni][nbraud] +- [LiveCode Server][lcs] by [Ralf Bitter][revig] +- Scilab by [Sylvestre Ledru][sylvestre] +- basic support for Makefile by [Ivan Sagalaev][isagalaev] + +Improvements: + +- Ruby's got support for characters like `?A`, `?1`, `?\012` etc. and `%r{..}` + regexps. +- Clojure now allows a function call in the beginning of s-expressions + `(($filter "myCount") (arr 1 2 3 4 5))`. +- Haskell's got new keywords and now recognizes more things like pragmas, + preprocessors, modules, containers, FFIs etc. Thanks to [Zena Treep][treep] + for the implementation and to [Jeremy Hull][sourrust] for guiding it. +- Miscelleanous fixes in PHP, Brainfuck, SCSS, Asciidoc, CMake, Python and F#. + +[mehdid]: https://github.com/mehdid +[nbraud]: https://github.com/nbraud +[revig]: https://github.com/revig +[lcs]: http://livecode.com/developers/guides/server/ +[sylvestre]: https://github.com/sylvestre +[isagalaev]: https://github.com/isagalaev +[treep]: https://github.com/treep +[sourrust]: https://github.com/sourrust +[d]: http://highlightjs.org/download/ + + +## New core developers + +The latest long period of almost complete inactivity in the project coincided +with growing interest to it led to a decision that now seems completely obvious: +we need more core developers. + +So without further ado let me welcome to the core team two long-time +contributors: [Jeremy Hull][] and [Oleg +Efimov][]. + +Hope now we'll be able to work through stuff faster! + +P.S. The historical commit is [here][1] for the record. + +[Jeremy Hull]: https://github.com/sourrust +[Oleg Efimov]: https://github.com/sannis +[1]: https://github.com/isagalaev/highlight.js/commit/f3056941bda56d2b72276b97bc0dd5f230f2473f + + +## Version 7.4 + +This long overdue version is a snapshot of the current source tree with all the +changes that happened during the past year. Sorry for taking so long! + +Along with the changes in code highlight.js has finally got its new home at +<http://highlightjs.org/>, moving from its craddle on Software Maniacs which it +outgrew a long time ago. Be sure to report any bugs about the site to +<mailto:in...@hi...>. + +On to what's new… + +New languages: + +- Handlebars templates by [Robin Ward][] +- Oracle Rules Language by [Jason Jacobson][] +- F# by [Joans Follesø][] +- AsciiDoc and Haml by [Dan Allen][] +- Lasso by [Eric Knibbe][] +- SCSS by [Kurt Emch][] +- VB.NET by [Poren Chiang][] +- Mizar by [Kelley van Evert][] + +[Robin Ward]: https://github.com/eviltrout +[Jason Jacobson]: https://github.com/jayce7 +[Joans Follesø]: https://github.com/follesoe +[Dan Allen]: https://github.com/mojavelinux +[Eric Knibbe]: https://github.com/EricFromCanada +[Kurt Emch]: https://github.com/kemch +[Poren Chiang]: https://github.com/rschiang +[Kelley van Evert]: https://github.com/kelleyvanevert + +New style themes: + +- Monokai Sublime by [noformnocontent][] +- Railscasts by [Damien White][] +- Obsidian by [Alexander Marenin][] +- Docco by [Simon Madine][] +- Mono Blue by [Ivan Sagalaev][] (uses a single color hue for everything) +- Foundation by [Dan Allen][] + +[noformnocontent]: http://nn.mit-license.org/ +[Damien White]: https://github.com/visoft +[Alexander Marenin]: https://github.com/ioncreature +[Simon Madine]: https://github.com/thingsinjars +[Ivan Sagalaev]: https://github.com/isagalaev + +Other notable changes: + +- Corrected many corner cases in CSS. +- Dropped Python 2 version of the build tool. +- Implemented building for the AMD format. +- Updated Rust keywords (thanks to [Dmitry Medvinsky][]). +- Literal regexes can now be used in language definitions. +- CoffeeScript highlighting is now significantly more robust and rich due to + input from [Cédric Néhémie][]. + +[Dmitry Medvinsky]: https://github.com/dmedvinsky +[Cédric Néhémie]: https://github.com/abe33 + + +## Version 7.3 + +- Since this version highlight.js no longer works in IE version 8 and older. + It's made it possible to reduce the library size and dramatically improve code + readability and made it easier to maintain. Time to go forward! + +- New languages: AppleScript (by [Nathan Grigg][ng] and [Dr. Drang][dd]) and + Brainfuck (by [Evgeny Stepanischev][bolk]). + +- Improvements to existing languages: + + - interpreter prompt in Python (`>>>` and `...`) + - @-properties and classes in CoffeeScript + - E4X in JavaScript (by [Oleg Efimov][oe]) + - new keywords in Perl (by [Kirk Kimmel][kk]) + - big Ruby syntax update (by [Vasily Polovnyov][vast]) + - small fixes in Bash + +- Also Oleg Efimov did a great job of moving all the docs for language and style + developers and contributors from the old wiki under the source code in the + "docs" directory. Now these docs are nicely presented at + <http://highlightjs.readthedocs.org/>. + +[ng]: https://github.com/nathan11g +[dd]: https://github.com/drdrang +[bolk]: https://github.com/bolknote +[oe]: https://github.com/Sannis +[kk]: https://github.com/kimmel +[vast]: https://github.com/vast + + +## Version 7.2 + +A regular bug-fix release without any significant new features. Enjoy! + + +## Version 7.1 + +A Summer crop: + +- [Marc Fornos][mf] made the definition for Clojure along with the matching + style Rainbow (which, of course, works for other languages too). +- CoffeeScript support continues to improve getting support for regular + expressions. +- Yoshihide Jimbo ported to highlight.js [five Tomorrow styles][tm] from the + [project by Chris Kempson][tm0]. +- Thanks to [Casey Duncun][cd] the library can now be built in the popular + [AMD format][amd]. +- And last but not least, we've got a fair number of correctness and consistency + fixes, including a pretty significant refactoring of Ruby. + +[mf]: https://github.com/mfornos +[tm]: http://jmblog.github.com/color-themes-for-highlightjs/ +[tm0]: https://github.com/ChrisKempson/Tomorrow-Theme +[cd]: https://github.com/caseman +[amd]: http://requirejs.org/docs/whyamd.html + + +## Version 7.0 + +The reason for the new major version update is a global change of keyword syntax +which resulted in the library getting smaller once again. For example, the +hosted build is 2K less than at the previous version while supporting two new +languages. + +Notable changes: + +- The library now works not only in a browser but also with [node.js][]. It is + installable with `npm install highlight.js`. [API][] docs are available on our + wiki. + +- The new unique feature (apparently) among syntax highlighters is highlighting + *HTTP* headers and an arbitrary language in the request body. The most useful + languages here are *XML* and *JSON* both of which highlight.js does support. + Here's [the detailed post][p] about the feature. + +- Two new style themes: a dark "south" *[Pojoaque][]* by Jason Tate and an + emulation of*XCode* IDE by [Angel Olloqui][ao]. + +- Three new languages: *D* by [Aleksandar Ružičić][ar], *R* by [Joe Cheng][jc] + and *GLSL* by [Sergey Tikhomirov][st]. + +- *Nginx* syntax has become a million times smaller and more universal thanks to + remaking it in a more generic manner that doesn't require listing all the + directives in the known universe. + +- Function titles are now highlighted in *PHP*. + +- *Haskell* and *VHDL* were significantly reworked to be more rich and correct + by their respective maintainers [Jeremy Hull][sr] and [Igor Kalnitsky][ik]. + +And last but not least, many bugs have been fixed around correctness and +language detection. + +Overall highlight.js currently supports 51 languages and 20 style themes. + +[node.js]: http://nodejs.org/ +[api]: http://softwaremaniacs.org/wiki/doku.php/highlight.js:api +[p]: http://softwaremaniacs.org/blog/2012/05/10/http-and-json-in-highlight-js/en/ +[pojoaque]: http://web-cms-designs.com/ftopict-10-pojoaque-style-for-highlight-js-code-highlighter.html +[ao]: https://github.com/angelolloqui +[ar]: https://github.com/raleksandar +[jc]: https://github.com/jcheng5 +[st]: https://github.com/tikhomirov +[sr]: https://github.com/sourrust +[ik]: https://github.com/ikalnitsky + + +## Version 6.2 + +A lot of things happened in highlight.js since the last version! We've got nine +new contributors, the discussion group came alive, and the main branch on GitHub +now counts more than 350 followers. Here are most significant results coming +from all this activity: + +- 5 (five!) new languages: Rust, ActionScript, CoffeeScript, MatLab and + experimental support for markdown. Thanks go to [Andrey Vlasovskikh][av], + [Alexander Myadzel][am], [Dmytrii Nagirniak][dn], [Oleg Efimov][oe], [Denis + Bardadym][db] and [John Crepezzi][jc]. + +- 2 new style themes: Monokai by [Luigi Maselli][lm] and stylistic imitation of + another well-known highlighter Google Code Prettify by [Aahan Krish][ak]. + +- A vast number of [correctness fixes and code refactorings][log], mostly made + by [Oleg Efimov][oe] and [Evgeny Stepanischev][es]. + +[av]: https://github.com/vlasovskikh +[am]: https://github.com/myadzel +[dn]: https://github.com/dnagir +[oe]: https://github.com/Sannis +[db]: https://github.com/btd +[jc]: https://github.com/seejohnrun +[lm]: http://grigio.org/ +[ak]: https://github.com/geekpanth3r +[es]: https://github.com/bolknote +[log]: https://github.com/isagalaev/highlight.js/commits/ + + +## Version 6.1 — Solarized + +[Jeremy Hull][jh] has implemented my dream feature — a port of [Solarized][] +style theme famous for being based on the intricate color theory to achieve +correct contrast and color perception. It is now available for highlight.js in +both variants — light and dark. + +This version also adds a new original style Arta. Its author pumbur maintains a +[heavily modified fork of highlight.js][pb] on GitHub. + +[jh]: https://github.com/sourrust +[solarized]: http://ethanschoonover.com/solarized +[pb]: https://github.com/pumbur/highlight.js + + +## Version 6.0 + +New major version of the highlighter has been built on a significantly +refactored syntax. Due to this it's even smaller than the previous one while +supporting more languages! + +New languages are: + +- Haskell by [Jeremy Hull][sourrust] +- Erlang in two varieties — module and REPL — made collectively by [Nikolay + Zakharov][desh], [Dmitry Kovega][arhibot] and [Sergey Ignatov][ignatov] +- Objective C by [Valerii Hiora][vhbit] +- Vala by [Antono Vasiljev][antono] +- Go by [Stephan Kountso][steplg] + +[sourrust]: https://github.com/sourrust +[desh]: http://desh.su/ +[arhibot]: https://github.com/arhibot +[ignatov]: https://github.com/ignatov +[vhbit]: https://github.com/vhbit +[antono]: https://github.com/antono +[steplg]: https://github.com/steplg + +Also this version is marginally faster and fixes a number of small long-standing +bugs. + +Developer overview of the new language syntax is available in a [blog post about +recent beta release][beta]. + +[beta]: http://softwaremaniacs.org/blog/2011/04/25/highlight-js-60-beta/en/ + +P.S. New version is not yet available on a Yandex' CDN, so for now you have to +download [your own copy][d]. + +[d]: /soft/highlight/en/download/ + + +## Version 5.14 + +Fixed bugs in HTML/XML detection and relevance introduced in previous +refactoring. + +Also test.html now shows the second best result of language detection by +relevance. + + +## Version 5.13 + +Past weekend began with a couple of simple additions for existing languages but +ended up in a big code refactoring bringing along nice improvements for language +developers. + +### For users + +- Description of C++ has got new keywords from the upcoming [C++ 0x][] standard. +- Description of HTML has got new tags from [HTML 5][]. +- CSS-styles have been unified to use consistent padding and also have lost + pop-outs with names of detected languages. +- [Igor Kalnitsky][ik] has sent two new language descriptions: CMake и VHDL. + +This makes total number of languages supported by highlight.js to reach 35. + +Bug fixes: + +- Custom classes on `<pre>` tags are not being overridden anymore +- More correct highlighting of code blocks inside non-`<pre>` containers: + highlighter now doesn't insist on replacing them with its own container and + just replaces the contents. +- Small fixes in browser compatibility and heuristics. + +[c++ 0x]: http://ru.wikipedia.org/wiki/C%2B%2B0x +[html 5]: http://en.wikipedia.org/wiki/HTML5 +[ik]: http://kalnitsky.org.ua/ + +### For developers + +The most significant change is the ability to include language submodes right +under `contains` instead of defining explicit named submodes in the main array: + + contains: [ + 'string', + 'number', + {begin: '\\n', end: hljs.IMMEDIATE_RE} + ] + +This is useful for auxiliary modes needed only in one place to define parsing. +Note that such modes often don't have `className` and hence won't generate a +separate `<span>` in the resulting markup. This is similar in effect to +`noMarkup: true`. All existing languages have been refactored accordingly. + +Test file test.html has at last become a real test. Now it not only puts the +detected language name under the code snippet but also tests if it matches the +expected one. Test summary is displayed right above all language snippets. + + +## CDN + +Fine people at [Yandex][] agreed to host highlight.js on their big fast servers. +[Link up][l]! + +[yandex]: http://yandex.com/ +[l]: http://softwaremaniacs.org/soft/highlight/en/download/ + + +## Version 5.10 — "Paris". + +Though I'm on a vacation in Paris, I decided to release a new version with a +couple of small fixes: + +- Tomas Vitvar discovered that TAB replacement doesn't always work when used + with custom markup in code +- SQL parsing is even more rigid now and doesn't step over SmallTalk in tests + + +## Version 5.9 + +A long-awaited version is finally released. + +New languages: + +- Andrew Fedorov made a definition for Lua +- a long-time highlight.js contributor [Peter Leonov][pl] made a definition for + Nginx config +- [Vladimir Moskva][vm] made a definition for TeX + +[pl]: http://kung-fu-tzu.ru/ +[vm]: http://fulc.ru/ + +Fixes for existing languages: + +- [Loren Segal][ls] reworked the Ruby definition and added highlighting for + [YARD][] inline documentation +- the definition of SQL has become more solid and now it shouldn't be overly + greedy when it comes to language detection + +[ls]: http://gnuu.org/ +[yard]: http://yardoc.org/ + +The highlighter has become more usable as a library allowing to do highlighting +from initialization code of JS frameworks and in ajax methods (see. +readme.eng.txt). + +Also this version drops support for the [WordPress][wp] plugin. Everyone is +welcome to [pick up its maintenance][p] if needed. + +[wp]: http://wordpress.org/ +[p]: http://bazaar.launchpad.net/~isagalaev/+junk/highlight/annotate/342/src/wp_highlight.js.php + + +## Version 5.8 + +- Jan Berkel has contributed a definition for Scala. +1 to hotness! +- All CSS-styles are rewritten to work only inside `<pre>` tags to avoid + conflicts with host site styles. + + +## Version 5.7. + +Fixed escaping of quotes in VBScript strings. + + +## Version 5.5 + +This version brings a small change: now .ini-files allow digits, underscores and +square brackets in key names. + + +## Version 5.4 + +Fixed small but upsetting bug in the packer which caused incorrect highlighting +of explicitly specified languages. Thanks to Andrew Fedorov for precise +diagnostics! + + +## Version 5.3 + +The version to fulfil old promises. + +The most significant change is that highlight.js now preserves custom user +markup in code along with its own highlighting markup. This means that now it's +possible to use, say, links in code. Thanks to [Vladimir Dolzhenko][vd] for the +[initial proposal][1] and for making a proof-of-concept patch. + +Also in this version: + +- [Vasily Polovnyov][vp] has sent a GitHub-like style and has implemented + support for CSS @-rules and Ruby symbols. +- Yura Zaripov has sent two styles: Brown Paper and School Book. +- Oleg Volchkov has sent a definition for [Parser 3][p3]. + +[1]: http://softwaremaniacs.org/forum/highlightjs/6612/ +[p3]: http://www.parser.ru/ +[vp]: http://vasily.polovnyov.ru/ +[vd]: http://dolzhenko.blogspot.com/ + + +## Version 5.2 + +- at last it's possible to replace indentation TABs with something sensible (e.g. 2 or 4 spaces) +- new keywords and built-ins for 1C by Sergey Baranov +- a couple of small fixes to Apache highlighting + + +## Version 5.1 + +This is one of those nice version consisting entirely of new and shiny +contributions! + +- [Vladimir Ermakov][vooon] created highlighting for AVR Assembler +- [Ruslan Keba][rukeba] created highlighting for Apache config file. Also his + original visual style for it is now available for all highlight.js languages + under the name "Magula". +- [Shuen-Huei Guan][drake] (aka Drake) sent new keywords for RenderMan + languages. Also thanks go to [Konstantin Evdokimenko][ke] for his advice on + the matter. + +[vooon]: http://vehq.ru/about/ +[rukeba]: http://rukeba.com/ +[drake]: http://drakeguan.org/ +[ke]: http://k-evdokimenko.moikrug.ru/ + + +## Version 5.0 + +The main change in the new major version of highlight.js is a mechanism for +packing several languages along with the library itself into a single compressed +file. Now sites using several languages will load considerably faster because +the library won't dynamically include additional files while loading. + +Also this version fixes a long-standing bug with Javascript highlighting that +couldn't distinguish between regular expressions and division operations. + +And as usually there were a couple of minor correctness fixes. + +Great thanks to all contributors! Keep using highlight.js. + + +## Version 4.3 + +This version comes with two contributions from [Jason Diamond][jd]: + +- language definition for C# (yes! it was a long-missed thing!) +- Visual Studio-like highlighting style + +Plus there are a couple of minor bug fixes for parsing HTML and XML attributes. + +[jd]: http://jason.diamond.name/weblog/ + + +## Version 4.2 + +The biggest news is highlighting for Lisp, courtesy of Vasily Polovnyov. It's +somewhat experimental meaning that for highlighting "keywords" it doesn't use +any pre-defined set of a Lisp dialect. Instead it tries to highlight first word +in parentheses wherever it makes sense. I'd like to ask people programming in +Lisp to confirm if it's a good idea and send feedback to [the forum][f]. + +Other changes: + +- Smalltalk was excluded from DEFAULT_LANGUAGES to save traffic +- [Vladimir Epifanov][voldmar] has implemented javascript style switcher for + test.html +- comments now allowed inside Ruby function definition +- [MEL][] language from [Shuen-Huei Guan][drake] +- whitespace now allowed between `<pre>` and `<code>` +- better auto-detection of C++ and PHP +- HTML allows embedded VBScript (`<% .. %>`) + +[f]: http://softwaremaniacs.org/forum/highlightjs/ +[voldmar]: http://voldmar.ya.ru/ +[mel]: http://en.wikipedia.org/wiki/Maya_Embedded_Language +[drake]: http://drakeguan.org/ + + +## Version 4.1 + +Languages: + +- Bash from Vah +- DOS bat-files from Alexander Makarov (Sam) +- Diff files from Vasily Polovnyov +- Ini files from myself though initial idea was from Sam + +Styles: + +- Zenburn from Vladimir Epifanov, this is an imitation of a + [well-known theme for Vim][zenburn]. +- Ascetic from myself, as a realization of ideals of non-flashy highlighting: + just one color in only three gradations :-) + +In other news. [One small bug][bug] was fixed, built-in keywords were added for +Python and C++ which improved auto-detection for the latter (it was shame that +[my wife's blog][alenacpp] had issues with it from time to time). And lastly +thanks go to Sam for getting rid of my stylistic comments in code that were +getting in the way of [JSMin][]. + +[zenburn]: http://en.wikipedia.org/wiki/Zenburn +[alenacpp]: http://alenacpp.blogspot.com/ +[bug]: http://softwaremaniacs.org/forum/viewtopic.php?id=1823 +[jsmin]: http://code.google.com/p/jsmin-php/ + + +## Version 4.0 + +New major version is a result of vast refactoring and of many contributions. + +Visible new features: + +- Highlighting of embedded languages. Currently is implemented highlighting of + Javascript and CSS inside HTML. +- Bundled 5 ready-made style themes! + +Invisible new features: + +- Highlight.js no longer pollutes global namespace. Only one object and one + function for backward compatibility. +- Performance is further increased by about 15%. + +Changing of a major version number caused by a new format of language definition +files. If you use some third-party language files they should be updated. + + +## Version 3.5 + +A very nice version in my opinion fixing a number of small bugs and slightly +increased speed in a couple of corner cases. Thanks to everybody who reports +bugs in he [forum][f] and by email! + +There is also a new language — XML. A custom XML formerly was detected as HTML +and didn't highlight custom tags. In this version I tried to make custom XML to +be detected and highlighted by its own rules. Which by the way include such +things as CDATA sections and processing instructions (`<? ... ?>`). + +[f]: http://softwaremaniacs.org/forum/viewforum.php?id=6 + + +## Version 3.3 + +[Vladimir Gubarkov][xonix] has provided an interesting and useful addition. +File export.html contains a little program that shows and allows to copy and +paste an HTML code generated by the highlighter for any code snippet. This can +be useful in situations when one can't use the script itself on a site. + + +[xonix]: http://xonixx.blogspot.com/ + + +## Version 3.2 consists completely of contributions: + +- Vladimir Gubarkov has described SmallTalk +- Yuri Ivanov has described 1C +- Peter Leonov has packaged the highlighter as a Firefox extension +- Vladimir Ermakov has compiled a mod for phpBB + +Many thanks to you all! + + +## Version 3.1 + +Three new languages are available: Django templates, SQL and Axapta. The latter +two are sent by [Dmitri Roudakov][1]. However I've almost entirely rewrote an +SQL definition but I'd never started it be it from the ground up :-) + +The engine itself has got a long awaited feature of grouping keywords +("keyword", "built-in function", "literal"). No more hacks! + +[1]: http://roudakov.ru/ + + +## Version 3.0 + +It is major mainly because now highlight.js has grown large and has become +modular. Now when you pass it a list of languages to highlight it will +dynamically load into a browser only those languages. + +Also: + +- Konstantin Evdokimenko of [RibKit][] project has created a highlighting for + RenderMan Shading Language and RenderMan Interface Bytestream. Yay for more + languages! +- Heuristics for C++ and HTML got better. +- I've implemented (at last) a correct handling of backslash escapes in C-like + languages. + +There is also a small backwards incompatible change in the new version. The +function initHighlighting that was used to initialize highlighting instead of +initHighlightingOnLoad a long time ago no longer works. If you by chance still +use it — replace it with the new one. + +[RibKit]: http://ribkit.sourceforge.net/ + + +## Version 2.9 + +Highlight.js is a parser, not just a couple of regular expressions. That said +I'm glad to announce that in the new version 2.9 has support for: + +- in-string substitutions for Ruby -- `#{...}` +- strings from from numeric symbol codes (like #XX) for Delphi + + +## Version 2.8 + +A maintenance release with more tuned heuristics. Fully backwards compatible. + + +## Version 2.7 + +- Nikita Ledyaev presents highlighting for VBScript, yay! +- A couple of bugs with escaping in strings were fixed thanks to Mickle +- Ongoing tuning of heuristics + +Fixed bugs were rather unpleasant so I encourage everyone to upgrade! + + +## Version 2.4 + +- Peter Leonov provides another improved highlighting for Perl +- Javascript gets a new kind of keywords — "literals". These are the words + "true", "false" and "null" + +Also highlight.js homepage now lists sites that use the library. Feel free to +add your site by [dropping me a message][mail] until I find the time to build a +submit form. + +[mail]: mailto:Ma...@So... + + +## Version 2.3 + +This version fixes IE breakage in previous version. My apologies to all who have +already downloaded that one! + + +## Version 2.2 + +- added highlighting for Javascript +- at last fixed parsing of Delphi's escaped apostrophes in strings +- in Ruby fixed highlighting of keywords 'def' and 'class', same for 'sub' in + Perl + + +## Version 2.0 + +- Ruby support by [Anton Kovalyov][ak] +- speed increased by orders of magnitude due to new way of parsing +- this same way allows now correct highlighting of keywords in some tricky + places (like keyword "End" at the end of Delphi classes) + +[ak]: http://anton.kovalyov.net/ + + +## Version 1.0 + +Version 1.0 of javascript syntax highlighter is released! + +It's the first version available with English description. Feel free to post +your comments and question to [highlight.js forum][forum]. And don't be afraid +if you find there some fancy Cyrillic letters -- it's for Russian users too :-) + +[forum]: http://softwaremaniacs.org/forum/viewforum.php?id=6 Modified: trunk/highlight.js/README.md =================================================================== --- trunk/highlight.js/README.md 2014-07-04 11:55:05 UTC (rev 8954) +++ trunk/highlight.js/README.md 2014-07-04 11:58:20 UTC (rev 8955) @@ -24,13 +24,13 @@ - You can download your own customized version of "highlight.pack.js" or use the hosted one as described on the download page: - <http://softwaremaniacs.org/soft/highlight/en/download/> + <http://highlightjs.org/download/> - Style themes are available in the download package or as hosted files. To create a custom style for your site see the class reference in the file - [classref.txt][cr] from the downloaded package. + [CSS classes reference][cr] from the downloaded package. -[cr]: http://github.com/isagalaev/highlight.js/blob/master/classref.txt +[cr]: http://highlightjs.readthedocs.org/en/latest/css-classes-reference.html ## node.js @@ -42,7 +42,7 @@ Alternatively, you can build it from the source with only languages you need: - python tools/build.py -tnode lang1 lang2 .. + python3 tools/build.py -tnode lang1 lang2 .. Using the library: @@ -56,6 +56,31 @@ hljs.highlightAuto(code).value; ``` + +## AMD + +Highlight.js can be used with an AMD loader. You will need to build it from +source in order to do so: + +```bash +$ python3 tools/build.py -tamd lang1 lang2 .. +``` + +Which will generate a `build/highlight.pack.js` which will load as an AMD +module with support for the built languages and can be used like so: + +```javascript +require(["highlight.js/build/highlight.pack"], function(hljs){ + + // If you know the language + hljs.highlight(lang, code).value; + + // Automatic language detection + hljs.highlightAuto(code).value; +}); +``` + + ## Tab replacement You can replace TAB ('\x09') characters used for indentation in your code @@ -64,9 +89,9 @@ ```html <script type="text/javascript"> - hljs.tabReplace = ' '; // 4 spaces + hljs.configure({tabReplace: ' '}); // 4 spaces // ... or - hljs.tabReplace = '<span class="indent">\t</span>'; + hljs.configure({tabReplace: '<span class="indent">\t</span>'}); hljs.initHighlightingOnLoad(); </script> @@ -75,9 +100,9 @@ ## Custom initialization If you use different markup for code blocks you can initialize them manually -with `highlightBlock(code, tabReplace, useBR)` function. It takes a DOM element -containing the code to highlight and optionally a string with which to replace -TAB characters. +with `highlightBlock(code)` function. It takes a DOM element containing the +code to highlight and optionally a string with which to replace TAB +characters. Initialization using, for example, jQuery might look like this: @@ -92,11 +117,11 @@ blocks. If your code container relies on `<br>` tags instead of line breaks (i.e. if -it's not `<pre>`) pass `true` into the third parameter of `highlightBlock` -to make highlight.js use `<br>` in the output: +it's not `<pre>`) set the `useBR` option to `true`: ```javascript -$('div.code').each(function(i, e) {hljs.highlightBlock(e, null, true)}); +hljs.configure({useBR: true}); +$('div.code').each(function(i, e) {hljs.highlightBlock(e)}); ``` @@ -135,9 +160,8 @@ ## Meta -- Version: 7.3 -- URL: http://softwaremaniacs.org/soft/highlight/en/ -- Author: Ivan Sagalaev (<ma...@so...>) +- Version: 8.0 +- URL: http://highlightjs.org/ For the license terms see LICENSE files. -For the list of contributors see AUTHORS.en.txt file. +For authors and contributors see AUTHORS.en.txt file. Modified: trunk/highlight.js/README.ru.md =================================================================== --- trunk/highlight.js/README.ru.md 2014-07-04 11:55:05 UTC (rev 8954) +++ trunk/highlight.js/README.ru.md 2014-07-04 11:58:20 UTC (rev 8955) @@ -26,14 +26,13 @@ - Вы можете скачать собственную версию "highlight.pack.js" или сослаться на захостенный файл, как описано на странице загрузки: - <http://softwaremaniacs.org/soft/highlight/download/> + <http://highlightjs.org/download/> - Стилевые темы можно найти в загруженном архиве или также использовать захостенные. Чтобы сделать собственный стиль для своего сайта, вам - будет полезен справочник классов в файле [classref.txt][cr], который тоже - есть в архиве. + будет полезен [CSS classes reference][cr], который тоже есть в архиве. -[cr]: http://github.com/isagalaev/highlight.js/blob/master/classref.txt +[cr]: http://highlightjs.readthedocs.org/en/latest/css-classes-reference.html ## node.js @@ -45,7 +44,7 @@ Также её можно собрать из исходников с только теми языками, которые нужны: - python tools/build.py -tnode lang1 lang2 .. + python3 tools/build.py -tnode lang1 lang2 .. Использование библиотеки: @@ -60,6 +59,30 @@ ``` +## AMD + +Highlight.js можно использовать с загрузчиком AMD-модулей. Для этого его +нужно собрать из исходников следующей командой: + +```bash +$ python3 tools/build.py -tamd lang1 lang2 .. +``` + +Она создаст файл `build/highlight.pack.js`, который является загружаемым +AMD-модулем и содержит все выбранные при сборке языки. Используется он так: + +```javascript +require(["highlight.js/build/highlight.pack"], function(hljs){ + + // Если вы знаете язык + hljs.highlight(lang, code).value; + + // Автоопределение языка + hljs.highlightAuto(code).value; +}); +``` + + ## Замена TABов Также вы можете заменить символы TAB ('\x09'), используемые для отступов, на @@ -68,9 +91,9 @@ ```html <script type="text/javascript"> - hljs.tabReplace = ' '; // 4 spaces + hljs.configure({tabReplace: ' '}); // 4 spaces // ... or - hljs.tabReplace = '<span class="indent">\t</span>'; + hljs.configure({tabReplace: '<span class="indent">\t</span>'}); hljs.initHighlightingOnLoad(); </script> @@ -80,9 +103,8 @@ ## Инициализация вручную Если вы используете другие теги для блоков кода, вы можете инициализировать их -явно с помощью функции `highlightBlock(code, tabReplace, useBR)`. Она принимает -DOM-элемент с текстом расцвечиваемого кода и опционально - строчку для замены -символов TAB. +явно с помощью функции `highlightBlock(code)`. Она принимает DOM-элемент с +текстом расцвечиваемого кода и опционально - строчку для замены символов TAB. Например с использованием jQuery код инициализации может выглядеть так: @@ -97,10 +119,11 @@ повторно для уже раскрашенных блоков. Если ваш блок кода использует `<br>` вместо переводов строки (т.е. если это не -`<pre>`), передайте `true` третьим параметром в `highlightBlock`: +`<pre>`), включите опцию `useBR`: ```javascript -$('div.code').each(function(i, e) {hljs.highlightBlock(e, null, true)}); +hljs.configure({useBR: true}); +$('div.code').each(function(i, e) {hljs.highlightBlock(e)}); ``` @@ -141,9 +164,8 @@ ## Координаты -- Версия: 7.3 -- URL: http://softwaremaniacs.org/soft/highlight/ -- Автор: Иван Сагалаев (<ma...@so...>) +- Версия: 8.0 +- URL: http://highlightjs.org/ Лицензионное соглашение читайте в файле LICENSE. -Список соавторов читайте в файле AUTHORS.ru.txt +Список авторов и соавторов читайте в файле AUTHORS.ru.txt Deleted: trunk/highlight.js/classref.txt =================================================================== --- trunk/highlight.js/classref.txt 2014-07-04 11:55:05 UTC (rev 8954) +++ trunk/highlight.js/classref.txt 2014-07-04 11:58:20 UTC (rev 8955) @@ -1,568 +0,0 @@ -This is a full list of available classes corresponding to languages' -syntactic structures. The parentheses after language name contain identifiers -used as class names in `<code>` element. - -Python ("python"): - - keyword keyword - built_in built-in objects (None, False, True and Ellipsis) - number number - string string (of any type) - comment comment - decorator @-decorator for functions - function function header "def some_name(...):" - class class header "class SomeName(...):" - title name of a function or a class inside a header - params everything inside parentheses in a function's or class' header - -Python profiler results ("profile"): - - number number - string string - builtin builtin function entry - filename filename in an entry - summary profiling summary - header header of table of results - keyword column header - function function name in an entry (including parentheses) - title actual name of a function in an entry (excluding parentheses) - prompt interpreter prompt (>>> or ...) - -Ruby ("ruby"): - - keyword keyword - string string - subst in-string substitution (#{...}) - comment comment - yardoctag YARD tag - function function header "def some_name(...):" - class class header "class SomeName(...):" - title name of a function or a class inside a header - parent name of a parent class - symbol symbol - -Perl ("perl"): - - keyword keyword - comment comment - number number - string string - regexp regular expression - sub subroutine header (from "sub" till "{") - variable variable starting with "$", "%", "@" - operator operator - pod plain old doc - -PHP ("php"): - - keyword keyword - number number - string string (of any type) - comment comment - phpdoc phpdoc params in comments - variable variable starting with "$" - preprocessor preprocessor marks: "<?php" and "?>" - -Scala ("scala"): - - keyword keyword - number number - string string - comment comment - annotation annotation - javadoc javadoc comment - javadoctag @-tag in javadoc - class class header - title class name inside a header - params everything in parentheses inside a class header - inheritance keywords "extends" and "with" inside class header - -Go language ("go"): - comment comment - string string constant - number number - keyword language keywords - constant true false nil iota - typename built-in plain types (int, string etc.) - built_in built-in functions - -HTML, XML ("xml"): - - tag any tag from "<" till ">" - attribute tag's attribute with or without value - value attribute's value - comment comment - pi processing instruction (<? ... ?>) - doctype <!DOCTYPE ... > declaration - cdata CDATA section - -CSS ("css"): - - tag tag in selectors - id #some_name in selectors - class .some_name in selectors - at_rule @-rule till first "{" or ";" - attr_selector attribute selector (square brackets in a[href^=http://]) - pseudo pseudo classes and elemens (:after, ::after etc.) - comment comment - rules everything from "{" till "}" - attribute property name inside a rule - value property value inside a rule, from ":" till ";" or - till the end of rule block - number number within a value - string string within a value - hexcolor hex color (#FFFFFF) within a value - function CSS function within a value - important "!important" symbol - -Markdown ("markdown"): - - header header - bullet list bullet - emphasis emphasis - strong strong emphasis - blockquote blockquote - code code - horizontal_rule horizontal rule - link_label link label - link_url link url - -Django ("django"): - - keyword HTML tag in HTML, default tags and default filters in templates - tag any tag from "<" till ">" - comment comment - doctype <!DOCTYPE ... > declaration - attribute tag's attribute with or withou value - value attribute's value - template_tag template tag {% .. %} - variable template variable {{ .. }} - template_comment template comment, both {# .. #} and {% comment %} - filter filter from "|" till the next filter or the end of tag - argument filter argument - -JSON ("json"): - - number number - literal "true", "false" and "null" - string string value - attribute name of an object property - value value of an object property - -JavaScript ("javascript"): - - keyword keyword - comment comment - number number - literal special literal: "true", "false" and "null" - string string - regexp regular expression - function header of a function - title name of a function inside a header - params parentheses and everything inside them in a function's header - -CoffeeScript ("coffeescript"): - - keyword keyword - comment comment - number number - literal special literal: "true", "false" and "null" - string string - regexp regular expression - function header of a function - class header of a class - title name of a function variable inside a header - params parentheses and everything inside them in a function's header - property @-property within class and functions - -ActionScript ("actionscript"): - - comment comment - string string - number number - keyword keywords - literal literal - reserved reserved keyword - title name of declaration (package, class or function) - preprocessor preprocessor directive (import, include) - type type of returned value (for functions) - package package (named or not) - class class/interface - function function - param params of function - rest_arg rest argument of function - -VBScript ("vbscript"): - - keyword keyword - number number - string string - comment comment - built_in built-in function - -HTTP ("http"): - - request first line of a request - status first line of a response - attribute header name - string header value or query string in a request line - number status code - -Lua ("lua"): - - keyword keyword - number number - string string - comment comment - built_in built-in operator - function header of a function - title name of a function inside a header - params everything inside parentheses in a function's header - long_brackets multiline string in [=[ .. ]=] - -Delphi ("delphi"): - - keyword keyword - comment comment (of any type) - number number - string string - function header of a function, procedure, constructor and destructor - title name of a function, procedure, constructor or destructor - inside a header - params everything inside parentheses in a function's header - class class' body from "= class" till "end;" - -Java ("java"): - - keyword keyword - number number - string string - comment commment - annotaion annotation - javadoc javadoc comment - class class header from "class" till "{" - title class name inside a header - params everything in parentheses inside a class header - inheritance keywords "extends" and "implements" inside class header - -C++ ("cpp"): - - keyword keyword - number number - string string and character - comment comment - preprocessor preprocessor directive - stl_container instantiation of STL containers ("vector<...>") - -Objective C ("objectivec"): - keyword keyword - built_in Cocoa/Cocoa Touch constants and classes - number number - string string - comment comment - preprocessor preprocessor directive - class interface/implementation, protocol and forward class declaration - variable properties and struct accesors - -Vala ("vala"): - - keyword keyword - number number - string string - comment comment - class class definitions - title in class definition - constant ALL_UPPER_CASE - -C# ("cs"): - - keyword keyword - number number - string string - comment commment - xmlDocTag xmldoc tag ("///", "<!--", "-->", "<..>") - -D language ("d"): - - comment comment - string string constant - number number - keyword language keywords (including @attributes) - constant true false null - built_in built-in plain types (int, string etc.) - -RenderMan RSL ("rsl"): - - keyword keyword - number number - string string (including @"..") - comment comment - preprocessor preprocessor directive - shader sahder keywords - shading shading keywords - built_in built-in function - -RenderMan RIB ("rib"): - - keyword keyword - number number - string string - comment comment - commands command - -Maya Embedded Language ("mel"): - - keyword keyword - number number - string string - comment comment - variable variable - -SQL ("sql"): - - keyword keyword (mostly SQL'92 and SQL'99) - number number - string string (of any type: "..", '..', `..`) - comment comment - aggregate aggregate function - -Smalltalk ("smalltalk"): - - keyword keyword - number number - string string - comment commment - symbol symbol - array array - class name of a class - char char - localvars block of local variables - -Lisp ("lisp"): - - keyword keyword - number number - string string - comment commment - variable variable - literal b, t and nil - list non-quoted list - title first symbol in a non-quoted list - body remainder of the non-quoted list - quoted quoted list, both "(quote .. )" and "'(..)" - -Clojure ("clojure"): - - comment comments and hints - string string - number number - collection collections - attribute :keyword - title function name (built-in or user defined) - built_in built-in function name - -Ini ("ini"): - - title title of a section - value value of a setting of any type - string string - number number - keyword boolean value keyword - -Apache ("apache"): - - keyword keyword - number number - comment commment - literal On and Off - sqbracket variables in rewrites "%{..}" - cbracket options in rewrites "[..]" - tag begin and end of a configuration section - -Nginx ("nginx"): - - title directive title - string string - number number - comment comment - built_in built-in constant - variable $-variable - regexp regexp - -Diff ("diff"): - - header file header - chunk chunk header within a file - addition added lines - deletion deleted lines - change changed lines - -DOS ("dos"): - - keyword keyword - flow batch control keyword - stream DOS special files ("con", "prn", ...) - winutils some commands (see dos.js specifically) - envvar environment variables - -Bash ("bash"): - - keyword keyword - string string - number number - comment comment - literal special literal: "true" и "false" - variable variable - shebang script interpreter header - -CMake ("cmake") - - keyword keyword - number number - string string - comment commment - envvar $-variable - -Axapta ("axapta"): - - keyword keyword - number number - string string - comment commment - class class header from "class" till "{" - title class name inside a header - params everything in parentheses inside a class header - inheritance keywords "extends" and "implements" inside class header - preprocessor preprocessor directive - -1C ("1c"): - - keyword keyword - number number - date date - string string - comment commment - function header of function or procudure - title function name inside a header - params everything in parentheses inside a function header - preprocessor preprocessor directive - -AVR assembler ("avrasm"): - - keyword keyword - built_in pre-defined register - number number - string string - comment commment - label label - preprocessor preprocessor directive - localvars substitution in .macro - -VHDL ("vhdl") - - keyword keyword - number number - string string - comment commment - literal signal logical value - typename typename - attribute signal attribute - -Parser3 ("parser3"): - - keyword keyword - number number - comment commment - variable variable starting with "$" - preprocessor preprocessor directive - title user-defined name starting with "@" - -TeX ("tex"): - - comment comment - number number - command command - parameter parameter - formula formula - special special symbol - -Haskell ("haskell"): - - keyword keyword - number number - string string - comment comment - class type classes and other data types - title function name - type type class name - typedef definition of types (type, newtype, data) - -Erlang ("erlang"): - - comment comment - string string - number number - keyword keyword - record_name record access (#record_name) - title name of declaration function - variable variable (starts with capital letter or with _) - pp.keywords module's attribute (-attribute) - function_name atom or atom:atom in case of function call - -Rust ("rust"): - - comment comment - string string - number number - keyword keyword - title name of declaration - preprocessor preprocessor directive - -Matlab ("matlab"): - - comment comment - string string - number number - keyword keyword - title function name - function function - param params of function - matrix matrix in [ .. ] - cell cell in { .. } - -R ("r"): - - comment comment - string string constant - number number - keyword language keywords (function, if) plus "structural" - functions (attach, require, setClass) - literal special literal: TRUE, FALSE, NULL, NA, etc. - -OpenGL Shading Language ("glsl"): - - comment comment - number number - preprocessor preprocessor directive - keyword keyword - built_in GLSL built-in functions and variables - literal true false - -AppleScript ("applescript"): - - keyword keyword - command core AppleScript command - constant AppleScript built in constant - type AppleScript variable type (integer, etc.) - property Applescript built in property (length, etc.) - number number - string string - comment comment - title name of a handler - -Brainfuck ("brainfuck"): - - title Brainfuck while loop command - literal Brainfuck inc and dec commands - comment comment - string Brainfuck input and output commands Modified: trunk/highlight.js/highlight.pack.js =================================================================== --- trunk/highlight.js/highlight.pack.js 2014-07-04 11:55:05 UTC (rev 8954) +++ trunk/highlight.js/highlight.pack.js 2014-07-04 11:58:20 UTC (rev 8955) @@ -1 +1 @@ -var hljs=new function(){function l(o){return o.replace(/&/gm,"&").replace(/</gm,"<").replace(/>/gm,">")}function b(p){for(var o=p.firstChild;o;o=o.nextSibling){if(o.nodeName=="CODE"){return o}if(!(o.nodeType==3&&o.nodeValue.match(/\s+/))){break}}}function h(p,o){return Array.prototype.map.call(p.childNodes,function(q){if(q.nodeType==3){return o?q.nodeValue.replace(/\n/g,""):q.nodeValue}if(q.nodeName=="BR"){return"\n"}return h(q,o)}).join("")}function a(q){var p=(q.className+" "+q.parentNode.className).split(/\s+/);p=p.map(function(r){return r.replace(/^language-/,"")});for(var o=0;o<p.length;o++){if(e[p[o]]||p[o]=="no-highlight"){return p[o]}}}function c(q){var o=[];(function p(r,s){for(var t=r.firstChild;t;t=t.nextSibling){if(t.nodeType==3){s+=t.nodeValue.length}else{if(t.nodeName=="BR"){s+=1}else{if(t.nodeType==1){o.push({event:"start",offset:s,node:t});s=p(t,s);o.push({event:"stop",offset:s,node:t})}}}}return s})(q,0);return o}function j(x,v,w){var p=0;var y="";var r=[];function t(){if(x.length&&v.length){if(x[0].offset!=v[0].offset){return(x[0].offset<v[0].offset)?x:v}else{return v[0].event=="start"?x:v}}else{return x.length?x:v}}function s(A){function z(B){return" "+B.nodeName+'="'+l(B.value)+'"'}return"<"+A.nodeName+Array.prototype.map.call(A.attributes,z).join("")+">"}while(x.length||v.length){var u=t().splice(0,1)[0];y+=l(w.substr(p,u.offset-p));p=u.offset;if(u.event=="start"){y+=s(u.node);r.push(u.node)}else{if(u.event=="stop"){var o,q=r.length;do{q--;o=r[q];y+=("</"+o.nodeName.toLowerCase()+">")}while(o!=u.node);r.splice(q,1);while(q<r.length){y+=s(r[q]);q++}}}}return y+l(w.substr(p))}function f(q){function o(s,r){return RegExp(s,"m"+(q.cI?"i":"")+(r?"g":""))}function p(y,w){if(y.compiled){return}y.compiled=true;var s=[];if(y.k){var r={};function z(A,t){t.split(" ").forEach(function(B){var C=B.split("|");r[C[0]]=[A,C[1]?Number(C[1]):1];s.push(C[0])})}y.lR=o(y.l||hljs.IR,true);if(typeof y.k=="string"){z("keyword",y.k)}else{for(var x in y.k){if(!y.k.hasOwnProperty(x)){continue}z(x,y.k[x])}}y.k=r}if(w){if(y.bWK){y.b="\\b("+s.join("|")+")\\s"}y.bR=o(y.b?y.b:"\\B|\\b");if(!y.e&&!y.eW){y.e="\\B|\\b"}if(y.e){y.eR=o(y.e)}y.tE=y.e||"";if(y.eW&&w.tE){y.tE+=(y.e?"|":"")+w.tE}}if(y.i){y.iR=o(y.i)}if(y.r===undefined){y.r=1}if(!y.c){y.c=[]}for(var v=0;v<y.c.length;v++){if(y.c[v]=="self"){y.c[v]=y... [truncated message content] |