diff --git a/Gemfile b/Gemfile index cfd40910..490c2171 100644 --- a/Gemfile +++ b/Gemfile @@ -12,6 +12,5 @@ gem 'mercurial-ruby' gem 'nokogiri' gem 'pandoc-ruby' gem 'pygments.rb' -gem 'redcarpet' gem 'rugged' gem 'typhoeus' diff --git a/Gemfile.lock b/Gemfile.lock index 503f0346..cf2394b7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,95 +1,105 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - awesome_print (1.8.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + awesome_print (1.9.2) colorator (1.1.0) - concurrent-ruby (1.1.4) - em-websocket (0.5.1) + concurrent-ruby (1.3.3) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) - ethon (0.11.0) - ffi (>= 1.3.0) + http_parser.rb (~> 0) + ethon (0.16.0) + ffi (>= 1.15.0) eventmachine (1.2.7) - ffi (1.10.0) + ffi (1.17.0) forwardable-extended (2.6.0) - github-markup (3.0.2) - http_parser.rb (0.6.0) - i18n (0.9.5) + github-markup (4.0.2) + google-protobuf (3.25.3-x86_64-linux) + http_parser.rb (0.8.0) + i18n (1.14.5) concurrent-ruby (~> 1.0) - jekyll (3.8.5) + jekyll (4.3.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (~> 0.7) - jekyll-sass-converter (~> 1.0) + i18n (~> 1.0) + jekyll-sass-converter (>= 2.0, < 4.0) jekyll-watch (~> 2.0) - kramdown (~> 1.14) + kramdown (~> 2.3, >= 2.3.1) + kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.3.3) + mercenary (>= 0.3.6, < 0.5) pathutil (~> 0.9) - rouge (>= 1.7, < 4) + rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) - jekyll-sitemap (1.2.0) - jekyll (~> 3.3) - jekyll-watch (2.1.2) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) + jekyll-include-cache (0.2.1) + jekyll (>= 3.7, < 5.0) + jekyll-sass-converter (3.0.0) + sass-embedded (~> 1.54) + jekyll-sitemap (1.4.0) + jekyll (>= 3.7, < 5.0) + jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (1.17.0) - liquid (4.0.1) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - mercenary (0.3.6) + kramdown (2.4.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + liquid (4.0.4) + listen (3.9.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + mercenary (0.4.0) mercurial-ruby (0.7.12) open4 (~> 1.3.0) - mini_portile2 (2.4.0) - multi_json (1.13.1) - nokogiri (1.10.0) - mini_portile2 (~> 2.4.0) + nokogiri (1.15.6-x86_64-linux) + racc (~> 1.4) open4 (1.3.4) - pandoc-ruby (2.0.2) + pandoc-ruby (2.1.10) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (3.0.3) - pygments.rb (1.2.1) - multi_json (>= 1.0.0) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + public_suffix (5.1.1) + pygments.rb (3.0.0) + racc (1.8.0) + rake (13.2.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) ffi (~> 1.0) - redcarpet (3.4.0) - rouge (3.3.0) - ruby_dep (1.5.0) - rugged (0.27.7) - safe_yaml (1.0.4) - sass (3.7.3) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - typhoeus (1.3.1) + rexml (3.3.2) + strscan + rouge (4.3.0) + rugged (1.7.2) + safe_yaml (1.0.5) + sass-embedded (1.63.6) + google-protobuf (~> 3.23) + rake (>= 13.0.0) + strscan (3.1.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + typhoeus (1.4.1) ethon (>= 0.9.0) + unicode-display_width (2.5.0) + webrick (1.8.1) PLATFORMS - ruby + x86_64-linux DEPENDENCIES awesome_print colorator github-markup jekyll + jekyll-include-cache jekyll-sitemap liquid mercurial-ruby nokogiri pandoc-ruby pygments.rb - redcarpet rugged typhoeus BUNDLED WITH - 2.0.2 + 2.4.22 diff --git a/_config.yml b/_config.yml index dd02f624..8d23c157 100644 --- a/_config.yml +++ b/_config.yml @@ -1,5 +1,5 @@ # Build settings -markdown: redcarpet +markdown: kramdown kramdown: # use Github Flavored Markdown input: GFM @@ -11,15 +11,6 @@ profile: true google_analytics_tag_id: 'G-EVD5Z6G6NH' -redcarpet: - extensions: - - fenced_code_blocks - - autolink - - no_intra_emphasis - - with_toc_data - - html_toc - - tables - # OLD from jekyll 2.x #highlighter: pygments diff --git a/_layouts/default.html b/_layouts/default.html index 70a84793..7ddcbef7 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -29,7 +29,7 @@ - {% comment %}{% endcomment %} + {% comment %}{% endcomment %} {% if page.script_uris %} {% for script_uri in page.script_uris %} diff --git a/_ruby_libs/text_rendering.rb b/_ruby_libs/text_rendering.rb index 997092ae..9642f758 100644 --- a/_ruby_libs/text_rendering.rb +++ b/_ruby_libs/text_rendering.rb @@ -7,7 +7,8 @@ # Converts RST to Markdown def rst_to_md(rst) begin - return PandocRuby.convert(rst, :from => :rst, :to => :markdown) + # For some reason, Pandoc is converting UTF-8 into ASCII which then kills kramdown + return PandocRuby.convert(rst, :from => :rst, :to => :markdown).force_encoding(Encoding::UTF_8) rescue Exception => e return "Could not convert RST to MD: "+e.to_s end diff --git a/contribute.md b/contribute.md index d3e65b09..09dbfd45 100644 --- a/contribute.md +++ b/contribute.md @@ -27,7 +27,7 @@ responsibility if you add your repository to `rosdistro`. If you would like you get your code indexed for documentation, click the button below. -Add a Repository to the Index +Add a Repository to the Index ### Releasing Binary Packages @@ -65,7 +65,7 @@ or by reviewing the contributions proposed or submitted by others as pull re If you would like some suggestions where your help may be welcomed, click the button below. -Contribution Suggestions +Contribution Suggestions ## Opting out of Indexing diff --git a/node_modules/lunr-index-build/bin/lunr-index-build b/node_modules/lunr-index-build/bin/lunr-index-build index 5bb63ecc..d58064b6 100755 --- a/node_modules/lunr-index-build/bin/lunr-index-build +++ b/node_modules/lunr-index-build/bin/lunr-index-build @@ -1,8 +1,7 @@ #!/usr/bin/env node var lunr = require('lunr'), - optimist = require('optimist'), - vuvuzela = require('vuvuzela') + optimist = require('optimist') var argv = optimist .usage('Generates a lunr.js index.\n\n lunr-index-build -r id -f title:10 -f body < data.json > index.json')