History

Merge pull request #1064 from simon04/julia

Jasper van Merle committed 7 years ago

Commit 0fd990d2 parents c25865b 79260c26 files · +49 −6Browse files

Unified · Split

6 files
  1. assets/javascripts/models/entry.coffee +1 −0
  2. assets/javascripts/templates/pages/about_tmpl.coffee +1 −1
  3. assets/javascripts/vendor/prism.js +15 −1
  4. lib/docs/filters/julia/clean_html.rb +1 −0
  5. lib/docs/filters/julia/entries.rb +9 −2
  6. lib/docs/scrapers/julia.rb +22 −2
assets/javascripts/models/entry.coffee+1−0
@@ -58,6 +58,7 @@ class app.models.Entry extends app.Model · 57 unmodified lines
58 'crystal': 'cr'58 'crystal': 'cr'
59 'elixir': 'ex'59 'elixir': 'ex'
60 'javascript': 'js'60 'javascript': 'js'
61 'julia': 'jl'
61 'jquery': '$'62 'jquery': '$'
62 'knockout.js': 'ko'63 'knockout.js': 'ko'
63 'less': 'ls'64 'less': 'ls'
assets/javascripts/templates/pages/about_tmpl.coffee+1−1
@@ -383,7 +383,7 @@ credits = [ · 382 unmodified lines
383 'https://raw.githubusercontent.com/jquery/api.jqueryui.com/master/LICENSE.txt'383 'https://raw.githubusercontent.com/jquery/api.jqueryui.com/master/LICENSE.txt'
384 ], [384 ], [
385 'Julia',385 'Julia',
386 '2009-2018 Jeff Bezanson, Stefan Karpinski, Viral B. Shah, and other contributors',386 '2009-2019 Jeff Bezanson, Stefan Karpinski, Viral B. Shah, and other contributors',
387 'MIT',387 'MIT',
388 'https://raw.githubusercontent.com/JuliaLang/julia/master/LICENSE.md'388 'https://raw.githubusercontent.com/JuliaLang/julia/master/LICENSE.md'
389 ], [389 ], [
assets/javascripts/vendor/prism.js+15−1
@@ -1,5 +1,5 @@
1/* PrismJS 1.17.11/* PrismJS 1.17.1
2https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript+c+bash+cpp+coffeescript+ruby+d+dart+markup-templating+elixir+erlang+go+java+php+json+kotlin+crystal+lua+django+matlab+typescript+nginx+nim+perl+sql+scss+python+jsx+rust+yaml */2https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript+c+bash+cpp+coffeescript+ruby+d+dart+markup-templating+elixir+erlang+go+java+php+json+julia+kotlin+crystal+lua+django+matlab+typescript+nginx+nim+perl+sql+scss+python+jsx+rust+yaml */
3var _self = (typeof window !== 'undefined')3var _self = (typeof window !== 'undefined')
4 ? window // if in browser4 ? window // if in browser
5 : (5 : (
@@ -1894,6 +1894,20 @@ Prism.languages.json = { · 1888 unmodified lines
1894 }1894 }
1895};1895};
1896 1896
1897Prism.languages.julia= {
1898 'comment': {
1899 pattern: /(^|[^\\])#.*/,
1900 lookbehind: true
1901 },
1902 'string': /("""|''')[\s\S]+?\1|("|')(?:\\.|(?!\2)[^\\\r\n])*\2/,
1903 'keyword' : /\b(?:abstract|baremodule|begin|bitstype|break|catch|ccall|const|continue|do|else|elseif|end|export|finally|for|function|global|if|immutable|import|importall|in|let|local|macro|module|print|println|quote|return|struct|try|type|typealias|using|while)\b/,
1904 'boolean' : /\b(?:true|false)\b/,
1905 'number' : /(?:\b(?=\d)|\B(?=\.))(?:0[box])?(?:[\da-f]+\.?\d*|\.\d+)(?:[efp][+-]?\d+)?j?/i,
1906 'operator': /[-+*^%÷&$\\]=?|\/[\/=]?|!=?=?|\|[=>]?|<(?:<=?|[=:])?|>(?:=|>>?=?)?|==?=?|[~≠≤≥]/,
1907 'punctuation' : /[{}[\];(),.:]/,
1908 'constant': /\b(?:(?:NaN|Inf)(?:16|32|64)?)\b/
1909};
1910
1897(function (Prism) {1911(function (Prism) {
1898 Prism.languages.kotlin = Prism.languages.extend('clike', {1912 Prism.languages.kotlin = Prism.languages.extend('clike', {
1899 'keyword': {1913 'keyword': {
lib/docs/filters/julia/clean_html.rb+1−0
@@ -21,6 +21,7 @@ module Docs · 20 unmodified lines
21 21
22 css('pre').each do |node|22 css('pre').each do |node|
23 node.content = node.content23 node.content = node.content
24 node['data-language'] = 'julia'
24 end25 end
25 26
26 doc27 doc
lib/docs/filters/julia/entries.rb+9−2
@@ -16,14 +16,21 @@ module Docs · 15 unmodified lines
16 def additional_entries16 def additional_entries
17 return [] unless slug.start_with?('stdlib')17 return [] unless slug.start_with?('stdlib')
18 18
19 css('.docstring-binding[id]').map do |node|19 entries = []
20 used_names = {}
21
22 css('.docstring-binding[id]').each do |node|
20 name = node.content23 name = node.content
21 name.gsub! '.:', '.'24 name.gsub! '.:', '.'
22 name.remove! 'Base.'25 name.remove! 'Base.'
23 category = node.parent.at_css('.docstring-category').content26 category = node.parent.at_css('.docstring-category').content
24 name << '()' if category == 'Function' || category == 'Method'27 name << '()' if category == 'Function' || category == 'Method'
25 [name, node['id']]28
29 entries << [name, node['id']] unless used_names.key?(name)
30 used_names[name] = true
26 end31 end
32
33 entries
27 end34 end
28 end35 end
29 end36 end
lib/docs/scrapers/julia.rb+22−2
@@ -8,12 +8,32 @@ module Docs · 7 unmodified lines
8 options[:only_patterns] = [/\Amanual\//, /\Astdlib\//]8 options[:only_patterns] = [/\Amanual\//, /\Astdlib\//]
9 9
10 options[:attribution] = <<-HTML10 options[:attribution] = <<-HTML
11 &copy; 2009&ndash;2018 Jeff Bezanson, Stefan Karpinski, Viral B. Shah, and other contributors<br>11 &copy; 2009&ndash;2019 Jeff Bezanson, Stefan Karpinski, Viral B. Shah, and other contributors<br>
12 Licensed under the MIT License.12 Licensed under the MIT License.
13 HTML13 HTML
14 14
15 version '1.2' do
16 self.release = '1.2.0'
17 self.base_url = "https://docs.julialang.org/en/v#{release}/"
18 self.type = 'julia'
19
20 html_filters.push 'julia/entries', 'julia/clean_html'
21
22 options[:container] = '#docs'
23 end
24
25 version '1.1' do
26 self.release = '1.1.1'
27 self.base_url = "https://docs.julialang.org/en/v#{release}/"
28 self.type = 'julia'
29
30 html_filters.push 'julia/entries', 'julia/clean_html'
31
32 options[:container] = '#docs'
33 end
34
15 version '1.0' do35 version '1.0' do
16 self.release = '1.0.1'36 self.release = '1.0.4'
17 self.base_url = "https://docs.julialang.org/en/v#{release}/"37 self.base_url = "https://docs.julialang.org/en/v#{release}/"
18 self.type = 'julia'38 self.type = 'julia'
19 39