Skip to content

Commit 320722f

Browse files
kroeningkroening
committed
update highlight package
1 parent d23aa7e commit 320722f

File tree

5 files changed

+240
-104
lines changed

5 files changed

+240
-104
lines changed

‎doc/html-manual/highlight/CHANGES.md‎

Lines changed: 182 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,184 @@
1+
## Version 9.11.0
2+
3+
New languages:
4+
5+
- *Shell* by [Tsuyusato Kitsune][]
6+
- *jboss-cli* by [Raphaël Parrëe][]
7+
8+
Improvements:
9+
10+
- [Joël Porquet] has [greatly improved the definition of *makefile*][5b3e0e6].
11+
- *C++* class titles are now highlighted as in other languages with classes.
12+
- [Jordi Petit][] added rarely used `or`, `and` and `not` keywords to *C++*.
13+
- [Pieter Vantorre][] fixed highlighting of negative floating point values.
14+
15+
16+
[Tsuyusato Kitsune]: https://github.com/MakeNowJust
17+
[Jordi Petit]: https://github.com/jordi-petit
18+
[Raphaël Parrëe]: https://github.com/rparree
19+
[Pieter Vantorre]: https://github.com/NuclearCookie
20+
[5b3e0e6]: https://github.com/isagalaev/highlight.js/commit/5b3e0e68bfaae282faff6697d6a490567fa9d44b
21+
22+
23+
## Version 9.10.0
24+
25+
Apologies for missing the previous release cycle. Some thing just can't be
26+
automated… Anyway, we're back!
27+
28+
New languages:
29+
30+
- *Hy* by [Sergey Sobko][]
31+
- *Leaf* by [Hale Chan][]
32+
- *N1QL* by [Andres Täht][] and [Rene Saarsoo][]
33+
34+
Improvements:
35+
36+
- *Rust* got updated with new keywords by [Kasper Andersen][] and then
37+
significantly modernized even more by [Eduard-Mihai Burtescu][] (yes, @eddyb,
38+
Rust core team member!)
39+
- *Python* updated with f-literals by [Philipp A][].
40+
- *YAML* updated with unquoted strings support.
41+
- *Gauss* updated with new keywords by [Matt Evans][].
42+
- *Lua* updated with new keywords by [Joe Blow][].
43+
- *Kotlin* updated with new keywords by [Philipp Hauer][].
44+
- *TypeScript* got highlighting of function params and updated keywords by
45+
[Ike Ku][].
46+
- *Scheme* now correctly handles \`-quoted lists thanks to [Guannan Wei].
47+
- [Sam Wu][] fixed handling of `<<` in *C++* defines.
48+
49+
[Philipp A]: https://github.com/flying-sheep
50+
[Philipp Hauer]: https://github.com/phauer
51+
[Sergey Sobko]: https://github.com/profitware
52+
[Hale Chan]: https://github.com/halechan
53+
[Matt Evans]: https://github.com/matthewevans
54+
[Joe Blow]: https://github.com/mossarelli
55+
[Kasper Andersen]: https://github.com/kasma1990
56+
[Eduard-Mihai Burtescu]: https://github.com/eddyb
57+
[Andres Täht]: https://github.com/andrestaht
58+
[Rene Saarsoo]: https://github.com/nene
59+
[Philipp Hauer]: https://github.com/phauer
60+
[Ike Ku]: https://github.com/dempfi
61+
[Guannan Wei]: https://github.com/Kraks
62+
[Sam Wu]: https://github.com/samsam2310
63+
64+
65+
## Version 9.9.0
66+
67+
New languages
68+
69+
- *LLVM* by [Michael Rodler][]
70+
71+
Improvements:
72+
73+
- *TypeScript* updated with annotations and param lists inside constructors, by
74+
[Raphael Parree][].
75+
- *CoffeeScript* updated with new keywords and fixed to recognize JavaScript
76+
in \`\`\`, thanks to thanks to [Geoffrey Booth][].
77+
- Compiler directives in *Delphi* are now correctly highlighted as "meta".
78+
79+
[Raphael Parree]: https://github.com/rparree
80+
[Michael Rodler]: https://github.com/f0rki
81+
[Geoffrey Booth]: https://github.com/GeoffreyBooth
82+
83+
84+
## Version 9.8.0 "New York"
85+
86+
This version is the second one that deserved a name. Because I'm in New York,
87+
and the release isn't missing the deadline only because it's still Tuesday on
88+
West Coast.
89+
90+
New languages:
91+
92+
- *Clean* by [Camil Staps][]
93+
- *Flix* by [Magnus Madsen][]
94+
95+
Improvements:
96+
97+
- [Kenton Hamaluik][] did a comprehensive update for *Haxe*.
98+
- New commands for *PowerShell* from [Nicolas Le Gall][].
99+
- [Jan T. Sott][] updated *NSIS*.
100+
- *Java* and *Swift* support unicode characters in identifiers thanks to
101+
[Alexander Lichter][].
102+
103+
[Camil Staps]: https://github.com/camilstaps
104+
[Magnus Madsen]: https://github.com/magnus-madsen
105+
[Kenton Hamaluik]: https://github.com/FuzzyWuzzie
106+
[Nicolas Le Gall]: https://github.com/darkitty
107+
[Jan T. Sott]: https://github.com/idleberg
108+
[Alexander Lichter]: https://github.com/manniL
109+
110+
111+
## Version 9.7.0
112+
113+
A comprehensive bugfix release. This is one of the best things about
114+
highlight.js: even boring things keep getting better (even if slow).
115+
116+
- VHDL updated with PSL keywords and uses more consistent styling.
117+
- Nested C-style comments no longer break highlighting in many languages.
118+
- JavaScript updated with `=>` functions, highlighted object attributes and
119+
parsing within template string substitution blocks (`${...}`).
120+
- Fixed another corner case with self-closing `<tag/>` in JSX.
121+
- Added `HEALTHCHECK` directive in Docker.
122+
- Delphi updated with new Free Pascal keywords.
123+
- Fixed digit separator parsing in C++.
124+
- C# updated with new keywords and fixed to allow multiple identifiers within
125+
generics `<...>`.
126+
- Fixed another slow regex in Less.
127+
128+
129+
## Version 9.6.0
130+
131+
New languages:
132+
133+
- *ABNF* and *EBNF* by [Alex McKibben][]
134+
- *Awk* by [Matthew Daly][]
135+
- *SubUnit* by [Sergey Bronnikov][]
136+
137+
New styles:
138+
139+
- *Atom One* in both Dark and Light variants by [Daniel Gamage][]
140+
141+
Plus, a few smaller updates for *Lasso*, *Elixir*, *C++* and *SQL*.
142+
143+
[Alex McKibben]: https://github.com/mckibbenta
144+
[Daniel Gamage]: https://github.com/danielgamage
145+
[Matthew Daly]: https://github.com/matthewbdaly
146+
[Sergey Bronnikov]: https://github.com/ligurio
147+
148+
149+
## Version 9.5.0
150+
151+
New languages:
152+
153+
- *Excel* by [Victor Zhou][]
154+
- *Linden Scripting Language* by [Builder's Brewery][]
155+
- *TAP* (Test Anything Protocol) by [Sergey Bronnikov][]
156+
- *Pony* by [Joe Eli McIlvain][]
157+
- *Coq* by [Stephan Boyer][]
158+
- *dsconfig* and *LDIF* by [Jacob Childress][]
159+
160+
New styles:
161+
162+
- *Ocean Dark* by [Gavin Siu][]
163+
164+
Notable changes:
165+
166+
- [Minh Nguyễn][] added more built-ins to Objective C.
167+
- [Jeremy Hull][] fixed corner cases in C++ preprocessor directives and Diff
168+
comments.
169+
- [Victor Zhou][] added support for digit separators in C++ numbers.
170+
171+
[Gavin Siu]: https://github.com/gavsiu
172+
[Builder's Brewery]: https://github.com/buildersbrewery
173+
[Victor Zhou]: https://github.com/OiCMudkips
174+
[Sergey Bronnikov]: https://github.com/ligurio
175+
[Joe Eli McIlvain]: https://github.com/jemc
176+
[Stephan Boyer]: https://github.com/boyers
177+
[Jacob Childress]: https://github.com/braveulysses
178+
[Minh Nguyễn]: https://github.com/1ec5
179+
[Jeremy Hull]: https://github.com/sourrust
180+
181+
1182
## Version 9.4.0
2183

3184
New languages:
@@ -349,7 +530,7 @@ New languages:
349530
New styles:
350531

351532
- *Agate* by [Taufik Nurrohman][]
352-
- *Darkula* by [Jet Brains][]
533+
- *Darcula* by [JetBrains][]
353534
- *Atelier Sulphurpool* by [Bram de Haan][]
354535
- *Android Studio* by [Pedro Oliveira][]
355536

‎doc/html-manual/highlight/README.md‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,26 @@ works perfectly fine with Browserify, but there is the option to use a
106106
build specific to browsers rather than something meant for a server.
107107
Head over to the [download page][5] for all the options.
108108

109-
**Note:** the library is not supposed to work straight from the source
110-
on GitHub; it requires building. If none of the pre-packaged options
109+
**Don't link to GitHub directly.** The library is not supposed to work straight
110+
from the source, it requires building. If none of the pre-packaged options
111111
work for you refer to the [building documentation][6].
112112

113-
Also, if you are using something like almond, you need to use the
114-
optimizer to give the module a name. The basic example would be:
113+
**The CDN-hosted package doesn't have all the languages.** Otherwise it'd be
114+
too big. If you don't see the language you need in the ["Common" section][5],
115+
it can be added manually:
116+
117+
```html
118+
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.4.0/languages/go.min.js"></script>
119+
```
120+
121+
**On Almond.** You need to use the optimizer to give the module a name. For
122+
example:
115123

116124
```
117125
r.js -o name=hljs paths.hljs=/path/to/highlight out=highlight.js
118126
```
119127

128+
120129
## License
121130

122131
Highlight.js is released under the BSD License. See [LICENSE][7] file
@@ -127,15 +136,15 @@ for details.
127136
The official site for the library is at <https://highlightjs.org/>.
128137

129138
Further in-depth documentation for the API and other topics is at
130-
<http://highlightjs.readthedocs.org/>.
139+
<http://highlightjs.readthedocs.io/>.
131140

132141
Authors and contributors are listed in the [AUTHORS.en.txt][8] file.
133142

134-
[1]: http://highlightjs.readthedocs.org/en/latest/api.html#inithighlightingonload
135-
[2]: http://highlightjs.readthedocs.org/en/latest/css-classes-reference.html
136-
[3]: http://highlightjs.readthedocs.org/en/latest/api.html#highlightblock-block
137-
[4]: http://highlightjs.readthedocs.org/en/latest/api.html#configure-options
143+
[1]: http://highlightjs.readthedocs.io/en/latest/api.html#inithighlightingonload
144+
[2]: http://highlightjs.readthedocs.io/en/latest/css-classes-reference.html
145+
[3]: http://highlightjs.readthedocs.io/en/latest/api.html#highlightblock-block
146+
[4]: http://highlightjs.readthedocs.io/en/latest/api.html#configure-options
138147
[5]: https://highlightjs.org/download/
139-
[6]: http://highlightjs.readthedocs.org/en/latest/building-testing.html
148+
[6]: http://highlightjs.readthedocs.io/en/latest/building-testing.html
140149
[7]: https://github.com/isagalaev/highlight.js/blob/master/LICENSE
141150
[8]: https://github.com/isagalaev/highlight.js/blob/master/AUTHORS.en.txt

‎doc/html-manual/highlight/README.ru.md‎

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Highlight.js — это инструмент для подсветки синт
2424
<pre><code class="html">...</code></pre>
2525
```
2626

27-
Список поддерживаемых классов языков доступен в [справочнике по классам][8].
27+
Список поддерживаемых классов языков доступен в [справочнике по классам][2].
2828
Класс также можно предварить префиксами `language-` или `lang-`.
2929

3030
Чтобы отключить подсветку для какого-то блока, используйте класс `nohighlight`:
@@ -36,7 +36,7 @@ Highlight.js — это инструмент для подсветки синт
3636
## Инициализация вручную
3737

3838
Чтобы иметь чуть больше контроля за инициализацией подсветки, вы можете
39-
использовать функции [`highlightBlock`][2] и [`configure`][3]. Таким образом
39+
использовать функции [`highlightBlock`][3] и [`configure`][4]. Таким образом
4040
можно управлять тем, *что* и *когда* подсвечивать.
4141

4242
Вот пример инициализации, эквивалентной вызову [`initHighlightingOnLoad`][1], но
@@ -62,7 +62,7 @@ $('div.code').each(function(i, block) {
6262
});
6363
```
6464

65-
Другие опции можно найти в документации функции [`configure`][3].
65+
Другие опции можно найти в документации функции [`configure`][4].
6666

6767

6868
## Web Workers
@@ -96,33 +96,47 @@ onmessage = function(event) {
9696

9797
Highlight.js можно использовать в браузере прямо с CDN хостинга или скачать
9898
индивидуальную сборку, а также установив модуль на сервере. На
99-
[странице загрузки][4] подробно описаны все варианты.
99+
[странице загрузки][5] подробно описаны все варианты.
100100

101-
Обратите внимание, что библиотека не предназначена для использования в виде
102-
исходного кода на GitHub, а требует отдельной сборки. Если вам не подходит ни
103-
один из готовых вариантов, читайте [документацию по сборке][5].
101+
**Не подключайте GitHub напрямую.** Библиотека не предназначена для
102+
использования в виде исходного кода, а требует отдельной сборки. Если вам не
103+
подходит ни один из готовых вариантов, читайте [документацию по сборке][6].
104+
105+
**Файл на CDN содержит не все языки.** Иначе он будет слишком большого размера.
106+
Если нужного вам языка нет в [категории "Common"][5], можно дообавить его
107+
вручную:
108+
109+
```html
110+
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.4.0/languages/go.min.js"></script>
111+
```
112+
113+
**Про Almond.** Нужно задать имя модуля в оптимизаторе, например:
114+
115+
```
116+
r.js -o name=hljs paths.hljs=/path/to/highlight out=highlight.js
117+
```
104118

105119

106120
## Лицензия
107121

108122
Highlight.js распространяется под лицензией BSD. Подробнее читайте файл
109-
[LICENSE][10].
123+
[LICENSE][7].
110124

111125

112126
## Ссылки
113127

114128
Официальный сайт билиотеки расположен по адресу <https://highlightjs.org/>.
115129

116130
Более подробная документация по API и другим темам расположена на
117-
<http://highlightjs.readthedocs.org/>.
118-
119-
Авторы и контрибьюторы перечислены в файле [AUTHORS.ru.txt][9] file.
120-
121-
[1]: http://highlightjs.readthedocs.org/en/latest/api.html#inithighlightingonload
122-
[2]: http://highlightjs.readthedocs.org/en/latest/api.html#highlightblock-block
123-
[3]: http://highlightjs.readthedocs.org/en/latest/api.html#configure-options
124-
[4]: https://highlightjs.org/download/
125-
[5]: http://highlightjs.readthedocs.org/en/latest/building-testing.html
126-
[8]: http://highlightjs.readthedocs.org/en/latest/css-classes-reference.html
127-
[9]: https://github.com/isagalaev/highlight.js/blob/master/AUTHORS.ru.txt
128-
[10]: https://github.com/isagalaev/highlight.js/blob/master/LICENSE
131+
<http://highlightjs.readthedocs.io/>.
132+
133+
Авторы и контрибьюторы перечислены в файле [AUTHORS.ru.txt][8] file.
134+
135+
[1]: http://highlightjs.readthedocs.io/en/latest/api.html#inithighlightingonload
136+
[2]: http://highlightjs.readthedocs.io/en/latest/css-classes-reference.html
137+
[3]: http://highlightjs.readthedocs.io/en/latest/api.html#highlightblock-block
138+
[4]: http://highlightjs.readthedocs.io/en/latest/api.html#configure-options
139+
[5]: https://highlightjs.org/download/
140+
[6]: http://highlightjs.readthedocs.io/en/latest/building-testing.html
141+
[7]: https://github.com/isagalaev/highlight.js/blob/master/LICENSE
142+
[8]: https://github.com/isagalaev/highlight.js/blob/master/AUTHORS.ru.txt

0 commit comments

Comments
 (0)