Skip to content

Commit c3694da

Browse files
authored
Pr update versions (#418)
* Update Gemfile.lock, requires switching to kramdown for md * Remove unused vuvuzela * Also remove redcarpet from Gemfile* * Add missing quotes in href tags, otherwise fails in updated Gems * Force Pandoc to return UTF8
1 parent 0648dd9 commit c3694da

File tree

7 files changed

+71
-71
lines changed

7 files changed

+71
-71
lines changed

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,5 @@ gem 'mercurial-ruby'
1212
gem 'nokogiri'
1313
gem 'pandoc-ruby'
1414
gem 'pygments.rb'
15-
gem 'redcarpet'
1615
gem 'rugged'
1716
gem 'typhoeus'

Gemfile.lock

Lines changed: 64 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,105 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.5.2)
5-
public_suffix (>= 2.0.2, < 4.0)
6-
awesome_print (1.8.0)
4+
addressable (2.8.7)
5+
public_suffix (>= 2.0.2, < 7.0)
6+
awesome_print (1.9.2)
77
colorator (1.1.0)
8-
concurrent-ruby (1.1.4)
9-
em-websocket (0.5.1)
8+
concurrent-ruby (1.3.3)
9+
em-websocket (0.5.3)
1010
eventmachine (>= 0.12.9)
11-
http_parser.rb (~> 0.6.0)
12-
ethon (0.11.0)
13-
ffi (>= 1.3.0)
11+
http_parser.rb (~> 0)
12+
ethon (0.16.0)
13+
ffi (>= 1.15.0)
1414
eventmachine (1.2.7)
15-
ffi (1.10.0)
15+
ffi (1.17.0)
1616
forwardable-extended (2.6.0)
17-
github-markup (3.0.2)
18-
http_parser.rb (0.6.0)
19-
i18n (0.9.5)
17+
github-markup (4.0.2)
18+
google-protobuf (3.25.3-x86_64-linux)
19+
http_parser.rb (0.8.0)
20+
i18n (1.14.5)
2021
concurrent-ruby (~> 1.0)
21-
jekyll (3.8.5)
22+
jekyll (4.3.3)
2223
addressable (~> 2.4)
2324
colorator (~> 1.0)
2425
em-websocket (~> 0.5)
25-
i18n (~> 0.7)
26-
jekyll-sass-converter (~> 1.0)
26+
i18n (~> 1.0)
27+
jekyll-sass-converter (>= 2.0, < 4.0)
2728
jekyll-watch (~> 2.0)
28-
kramdown (~> 1.14)
29+
kramdown (~> 2.3, >= 2.3.1)
30+
kramdown-parser-gfm (~> 1.0)
2931
liquid (~> 4.0)
30-
mercenary (~> 0.3.3)
32+
mercenary (>= 0.3.6, < 0.5)
3133
pathutil (~> 0.9)
32-
rouge (>= 1.7, < 4)
34+
rouge (>= 3.0, < 5.0)
3335
safe_yaml (~> 1.0)
34-
jekyll-sass-converter (1.5.2)
35-
sass (~> 3.4)
36-
jekyll-sitemap (1.2.0)
37-
jekyll (~> 3.3)
38-
jekyll-watch (2.1.2)
36+
terminal-table (>= 1.8, < 4.0)
37+
webrick (~> 1.7)
38+
jekyll-include-cache (0.2.1)
39+
jekyll (>= 3.7, < 5.0)
40+
jekyll-sass-converter (3.0.0)
41+
sass-embedded (~> 1.54)
42+
jekyll-sitemap (1.4.0)
43+
jekyll (>= 3.7, < 5.0)
44+
jekyll-watch (2.2.1)
3945
listen (~> 3.0)
40-
kramdown (1.17.0)
41-
liquid (4.0.1)
42-
listen (3.1.5)
43-
rb-fsevent (~> 0.9, >= 0.9.4)
44-
rb-inotify (~> 0.9, >= 0.9.7)
45-
ruby_dep (~> 1.2)
46-
mercenary (0.3.6)
46+
kramdown (2.4.0)
47+
rexml
48+
kramdown-parser-gfm (1.1.0)
49+
kramdown (~> 2.0)
50+
liquid (4.0.4)
51+
listen (3.9.0)
52+
rb-fsevent (~> 0.10, >= 0.10.3)
53+
rb-inotify (~> 0.9, >= 0.9.10)
54+
mercenary (0.4.0)
4755
mercurial-ruby (0.7.12)
4856
open4 (~> 1.3.0)
49-
mini_portile2 (2.4.0)
50-
multi_json (1.13.1)
51-
nokogiri (1.10.0)
52-
mini_portile2 (~> 2.4.0)
57+
nokogiri (1.15.6-x86_64-linux)
58+
racc (~> 1.4)
5359
open4 (1.3.4)
54-
pandoc-ruby (2.0.2)
60+
pandoc-ruby (2.1.10)
5561
pathutil (0.16.2)
5662
forwardable-extended (~> 2.6)
57-
public_suffix (3.0.3)
58-
pygments.rb (1.2.1)
59-
multi_json (>= 1.0.0)
60-
rb-fsevent (0.10.3)
61-
rb-inotify (0.10.0)
63+
public_suffix (5.1.1)
64+
pygments.rb (3.0.0)
65+
racc (1.8.0)
66+
rake (13.2.1)
67+
rb-fsevent (0.11.2)
68+
rb-inotify (0.11.1)
6269
ffi (~> 1.0)
63-
redcarpet (3.4.0)
64-
rouge (3.3.0)
65-
ruby_dep (1.5.0)
66-
rugged (0.27.7)
67-
safe_yaml (1.0.4)
68-
sass (3.7.3)
69-
sass-listen (~> 4.0.0)
70-
sass-listen (4.0.0)
71-
rb-fsevent (~> 0.9, >= 0.9.4)
72-
rb-inotify (~> 0.9, >= 0.9.7)
73-
typhoeus (1.3.1)
70+
rexml (3.3.2)
71+
strscan
72+
rouge (4.3.0)
73+
rugged (1.7.2)
74+
safe_yaml (1.0.5)
75+
sass-embedded (1.63.6)
76+
google-protobuf (~> 3.23)
77+
rake (>= 13.0.0)
78+
strscan (3.1.0)
79+
terminal-table (3.0.2)
80+
unicode-display_width (>= 1.1.1, < 3)
81+
typhoeus (1.4.1)
7482
ethon (>= 0.9.0)
83+
unicode-display_width (2.5.0)
84+
webrick (1.8.1)
7585

7686
PLATFORMS
77-
ruby
87+
x86_64-linux
7888

7989
DEPENDENCIES
8090
awesome_print
8191
colorator
8292
github-markup
8393
jekyll
94+
jekyll-include-cache
8495
jekyll-sitemap
8596
liquid
8697
mercurial-ruby
8798
nokogiri
8899
pandoc-ruby
89100
pygments.rb
90-
redcarpet
91101
rugged
92102
typhoeus
93103

94104
BUNDLED WITH
95-
2.0.2
105+
2.4.22

_config.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build settings
2-
markdown: redcarpet
2+
markdown: kramdown
33
kramdown:
44
# use Github Flavored Markdown
55
input: GFM
@@ -11,15 +11,6 @@ profile: true
1111

1212
google_analytics_tag_id: 'G-EVD5Z6G6NH'
1313

14-
redcarpet:
15-
extensions:
16-
- fenced_code_blocks
17-
- autolink
18-
- no_intra_emphasis
19-
- with_toc_data
20-
- html_toc
21-
- tables
22-
2314
# OLD from jekyll 2.x
2415
#highlighter: pygments
2516

_layouts/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<link rel="stylesheet" type="text/css" href="{{ site.baseurl}}/bootstrap/css/bootstrap.min.css"/>
3131
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
32-
{% comment %}<link rel="stylesheet" type="text/css" media="screen" href={{ "/css/toc.css" | prepend: site.baseurl}}>{% endcomment %}
32+
{% comment %}<link rel="stylesheet" type="text/css" media="screen" href="{{ "/css/toc.css" | prepend: site.baseurl}}">{% endcomment %}
3333

3434
{% if page.script_uris %}
3535
{% for script_uri in page.script_uris %}

_ruby_libs/text_rendering.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
# Converts RST to Markdown
88
def rst_to_md(rst)
99
begin
10-
return PandocRuby.convert(rst, :from => :rst, :to => :markdown)
10+
# For some reason, Pandoc is converting UTF-8 into ASCII which then kills kramdown
11+
return PandocRuby.convert(rst, :from => :rst, :to => :markdown).force_encoding(Encoding::UTF_8)
1112
rescue Exception => e
1213
return "Could not convert RST to MD: "+e.to_s
1314
end

contribute.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ responsibility if you add your repository to `rosdistro`.
2727
If you would like you get your code indexed for documentation, click the
2828
button below.
2929

30-
<a type="button" href={{ "/contribute/add_repo" | prepend: site.baseurl }} class="btn btn-success">Add a Repository to the Index</a>
30+
<a type="button" href="{{ "/contribute/add_repo" | prepend: site.baseurl }}" class="btn btn-success">Add a Repository to the Index</a>
3131

3232
### Releasing Binary Packages
3333

@@ -65,7 +65,7 @@ or by reviewing the contributions proposed or submitted by others as <em>pull re
6565
If you would like some suggestions where your help may be welcomed,
6666
click the button below.
6767

68-
<a type="button" href={{ "/contribute/suggestions" | prepend: site.baseurl }} class="btn btn-success">Contribution Suggestions</a>
68+
<a type="button" href="{{ "/contribute/suggestions" | prepend: site.baseurl }}" class="btn btn-success">Contribution Suggestions</a>
6969

7070
## Opting out of Indexing
7171

node_modules/lunr-index-build/bin/lunr-index-build

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)