Skip to content

Commit 40609ee

Browse files
authored
Merge branch 'mattcone:master' into master
2 parents 90347a4 + 3c54bd1 commit 40609ee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+283
-195
lines changed

.github/workflows/tests.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,11 @@ jobs:
44
test-links:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v2
8-
- uses: actions/setup-ruby@v1
7+
- uses: actions/checkout@v4
8+
- uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1
99
with:
10-
ruby-version: '2.7'
11-
- uses: actions/cache@v2
12-
with:
13-
path: vendor/bundle
14-
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
15-
restore-keys: |
16-
${{ runner.os }}-gems-
17-
- name: Install dependencies
18-
run: |
19-
gem install bundler
20-
bundle config path vendor/bundle
21-
bundle install --jobs 4 --retry 3
10+
ruby-version: '3.2.1'
11+
bundler-cache: true
12+
- run: bundle install
2213
- name: Run tests
2314
run: bundle exec rake test

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ _site/
33
.bundle/
44
.git-metadata/
55
.jekyll-cache/
6+
deploy.sh
67

78
# =========================
89
# Operating System Files

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.2
1+
3.2.2

Gemfile.lock

Lines changed: 44 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,44 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.1)
4+
Ascii85 (1.1.0)
5+
addressable (2.8.6)
56
public_suffix (>= 2.0.2, < 6.0)
7+
afm (0.2.2)
8+
async (2.7.0)
9+
console (~> 1.10)
10+
fiber-annotation
11+
io-event (~> 1.1)
12+
timers (~> 4.1)
613
colorator (1.1.0)
7-
concurrent-ruby (1.1.10)
14+
concurrent-ruby (1.2.2)
15+
console (1.23.3)
16+
fiber-annotation
17+
fiber-local
818
em-websocket (0.5.3)
919
eventmachine (>= 0.12.9)
1020
http_parser.rb (~> 0)
11-
ethon (0.15.0)
21+
ethon (0.16.0)
1222
ffi (>= 1.15.0)
1323
eventmachine (1.2.7)
14-
ffi (1.15.5)
24+
ffi (1.16.3)
25+
fiber-annotation (0.2.0)
26+
fiber-local (1.0.0)
1527
forwardable-extended (2.6.0)
16-
html-proofer (4.4.0)
28+
hashery (2.1.2)
29+
html-proofer (5.0.8)
1730
addressable (~> 2.3)
18-
mercenary (~> 0.3)
31+
async (~> 2.1)
1932
nokogiri (~> 1.13)
20-
parallel (~> 1.10)
33+
pdf-reader (~> 2.11)
2134
rainbow (~> 3.0)
2235
typhoeus (~> 1.3)
2336
yell (~> 2.0)
2437
zeitwerk (~> 2.5)
2538
http_parser.rb (0.8.0)
26-
i18n (1.12.0)
39+
i18n (1.14.1)
2740
concurrent-ruby (~> 1.0)
41+
io-event (1.4.0)
2842
jekyll (4.2.2)
2943
addressable (~> 2.4)
3044
colorator (~> 1.0)
@@ -53,39 +67,47 @@ GEM
5367
rexml
5468
kramdown-parser-gfm (1.1.0)
5569
kramdown (~> 2.0)
56-
liquid (4.0.3)
57-
listen (3.7.1)
70+
liquid (4.0.4)
71+
listen (3.8.0)
5872
rb-fsevent (~> 0.10, >= 0.10.3)
5973
rb-inotify (~> 0.9, >= 0.9.10)
6074
mercenary (0.4.0)
61-
mini_portile2 (2.8.0)
62-
nokogiri (1.13.8)
63-
mini_portile2 (~> 2.8.0)
75+
mini_portile2 (2.8.5)
76+
nokogiri (1.16.0)
77+
mini_portile2 (~> 2.8.2)
6478
racc (~> 1.4)
65-
parallel (1.22.1)
6679
pathutil (0.16.2)
6780
forwardable-extended (~> 2.6)
81+
pdf-reader (2.12.0)
82+
Ascii85 (~> 1.0)
83+
afm (~> 0.2.1)
84+
hashery (~> 2.0)
85+
ruby-rc4
86+
ttfunk
6887
posix-spawn (0.3.15)
69-
public_suffix (5.0.0)
70-
racc (1.6.0)
88+
public_suffix (5.0.4)
89+
racc (1.7.3)
7190
rainbow (3.1.1)
72-
rake (13.0.6)
91+
rake (13.1.0)
7392
rb-fsevent (0.11.2)
7493
rb-inotify (0.10.1)
7594
ffi (~> 1.0)
76-
rexml (3.2.5)
95+
rexml (3.2.6)
7796
rouge (3.30.0)
97+
ruby-rc4 (0.1.5)
7898
safe_yaml (1.0.5)
7999
sassc (2.4.0)
80100
ffi (~> 1.9)
81101
terminal-table (2.0.0)
82102
unicode-display_width (~> 1.1, >= 1.1.1)
83-
typhoeus (1.4.0)
103+
timers (4.3.5)
104+
ttfunk (1.7.0)
105+
typhoeus (1.4.1)
84106
ethon (>= 0.9.0)
85107
unicode-display_width (1.8.0)
86-
webrick (1.7.0)
108+
webrick (1.8.1)
87109
yell (2.2.2)
88-
zeitwerk (2.6.0)
110+
zeitwerk (2.6.12)
89111

90112
PLATFORMS
91113
ruby
@@ -99,4 +121,4 @@ DEPENDENCIES
99121
webrick (~> 1.7)
100122

101123
BUNDLED WITH
102-
2.2.15
124+
2.4.19

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2022 Matt Cone
3+
Copyright (c) 2024 Matt Cone
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ It can be helpful to preview changes on your computer before opening a pull requ
2121

2222
See [this page](https://github.com/mattcone/markdown-guide/wiki/Markdown-tool-directory) for information about adding applications to the [Markdown tools directory](https://www.markdownguide.org/tools/).
2323

24-
## Deployment
25-
26-
Pull requests merged to the master branch are automatically deployed to the production website.
27-
2824
## License
2925

3026
The content of this project itself is licensed under the [Creative Commons Attribution-ShareAlike 4.0 International license](https://creativecommons.org/licenses/by-sa/4.0/), and the underlying source code used to format and display that content is licensed under the [MIT license](LICENSE.txt).

Rakefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ task :test do
88
:check_internal_hash => false,
99
:enforce_https => false,
1010
:only_4xx => true,
11-
:ignore_urls => ['https://ghost.org/',
11+
:ignore_urls => ['https://emojipedia.org/',
12+
'https://ghost.org/',
1213
'https://ghost.org/faq/using-the-editor/#using-markdown',
1314
'https://get.todoist.help/hc/en-us/articles/205195102',
1415
'https://twitter.com/settermjd/status/1126099562345705472',
1516
'https://twitter.com/datamorgan/status/1109518506125451264',
1617
'https://support.discord.com/hc/en-us/articles/210298617-Markdown-Text-101-Chat-Formatting-Bold-Italic-Underline-',
17-
%r{https://dpaste.com/*}],
18+
%r{https://dpaste.com/*},
19+
%r{https://www.reddit.com/*}],
1820
:url_swap => { %r{https://www.markdownguide.org} => '' },
1921
:typhoeus => {
2022
:ssl_verifypeer => false,

_basic-syntax/links.md

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,39 @@ Markdown applications don't agree on how to handle spaces in the middle of a URL
155155
<code class="highlighter-rouge">
156156
[link](https://www.example.com/my%20great%20page)<br><br>
157157

158-
&lt;a href="https://www.example.com/my great page"&gt;link&lt;/a&gt;
158+
&lt;a href="https://www.example.com/my great page"&gt;link&lt;/a&gt;<br><br>
159159
</code>
160160
</td>
161161
<td>
162162
<code class="highlighter-rouge">
163-
[link](https://www.example.com/my great page)
163+
[link](https://www.example.com/my great page)<br><br>
164+
</code>
165+
</td>
166+
</tr>
167+
</tbody>
168+
</table>
169+
170+
Parentheses in the middle of a URL can also be problematic. For compatibility, try to URL encode the opening parenthesis (`(`) with `%28` and the closing parenthesis (`)`) with `%29`. Alternatively, if your Markdown application [supports HTML](#html), you could use the `a` HTML tag.
171+
172+
<table class="table table-bordered">
173+
<thead class="thead-light">
174+
<tr>
175+
<th>✅&nbsp; Do this</th>
176+
<th>❌&nbsp; Don't do this</th>
177+
</tr>
178+
</thead>
179+
<tbody>
180+
<tr>
181+
<td>
182+
<code class="highlighter-rouge">
183+
[a novel](https://en.wikipedia.org/wiki/<wbr>The_Milagro_Beanfield_War_%28novel%29)<br><br>
184+
185+
&lt;a href="https://en.wikipedia.org/wiki/<wbr>The_Milagro_Beanfield_War_(novel)"&gt;a novel&lt;/a&gt;<br><br>
186+
</code>
187+
</td>
188+
<td>
189+
<code class="highlighter-rouge">
190+
[a novel](https://en.wikipedia.org/wiki/<wbr>The_Milagro_Beanfield_War_(novel))
164191
</code>
165192
</td>
166193
</tr>

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ kramdown:
4343
auto_ids: true
4444
toc_levels: 1..3
4545

46-
exclude: ["vendor", "Gemfile", "Gemfile.lock", "README.md", "LICENSE.txt", "Rakefile", "netlify.toml"]
46+
exclude: ["vendor", "Gemfile", "Gemfile.lock", "README.md", "LICENSE.txt", "Rakefile", "netlify.toml", "deploy.sh", "redirects.conf"]

_data/tools.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
headings:
55
name: Headings
6-
link: /basic-syntax#headings
6+
link: /basic-syntax/#headings
77

88
paragraphs:
99
name: Paragraphs
@@ -15,27 +15,27 @@ line-breaks:
1515

1616
bold:
1717
name: Bold
18-
link: /basic-syntax#bold
18+
link: /basic-syntax/#bold
1919

2020
italic:
2121
name: Italic
22-
link: /basic-syntax#italic
22+
link: /basic-syntax/#italic
2323

2424
blockquotes:
2525
name: Blockquotes
26-
link: /basic-syntax#blockquotes-1
26+
link: /basic-syntax/#blockquotes-1
2727

2828
ordered-lists:
2929
name: Ordered Lists
30-
link: /basic-syntax#ordered-lists
30+
link: /basic-syntax/#ordered-lists
3131

3232
unordered-lists:
3333
name: Unordered Lists
34-
link: /basic-syntax#unordered-lists
34+
link: /basic-syntax/#unordered-lists
3535

3636
code:
3737
name: Code
38-
link: /basic-syntax#code
38+
link: /basic-syntax/#code
3939

4040
horizontal-rules:
4141
name: Horizontal Rules

0 commit comments

Comments
 (0)