Skip to content

Commit ce20d65

Browse files
committed
Update nokogiri, nokogiri-diff, rdoc
1 parent a849a12 commit ce20d65

11 files changed

+33
-23
lines changed

Diff for: .gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ pkg/
44
Gemfile.lock
55
.project
66
.buildpath
7-
*~
7+
*~
8+
vendor/

Diff for: Gemfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ gem "RedCloth"
88
# using a tag version here because 0.18.3 was not published by the author to encourage users to upgrade.
99
# however we want to bump up to this version since this has a security patch
1010
gem "commonmarker", git: "https://github.com/gjtorikian/commonmarker.git", tag: "v0.18.3"
11-
gem "rdoc", "~>3.6"
11+
gem "rdoc", "~> 6.7.0"
1212
gem "org-ruby", "= 0.9.9"
1313
gem "creole", "~>0.3.6"
1414
gem "wikicloth", "=0.8.3"
1515
gem "twitter-text", "~> 1.14"
1616
gem "asciidoctor", "~> 2.0.5"
1717
gem "rake"
18+
gem "rexml"

Diff for: github-markup.gemspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
2424
s.add_development_dependency 'minitest', '~> 5.4', '>= 5.4.3'
2525
s.add_development_dependency 'html-pipeline', '~> 1.0'
2626
s.add_development_dependency 'sanitize', '>= 4.6.3'
27-
s.add_development_dependency 'nokogiri', '~> 1.8.1'
28-
s.add_development_dependency 'nokogiri-diff', '~> 0.2.0'
27+
s.add_development_dependency 'nokogiri', '~> 1.16.5'
28+
s.add_development_dependency 'nokogiri-diff', '~> 0.3.0'
2929
s.add_development_dependency "github-linguist", ">= 7.1.3"
3030
end

Diff for: test/markups/README.asciidoc.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ <h2>Another Section</h2>
5959
<p>content</p>
6060
</div>
6161
</div>
62-
</div>
62+
</div>

Diff for: test/markups/README.hidetitle.asciidoc.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<div>
22
<p>This test verifies the author can disable the document title by adding <code>:!showtitle:</code> to the document header.</p>
3-
</div>
3+
</div>

Diff for: test/markups/README.litcoffee.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ <h2>Literate CoffeeScript Test</h2>
5252
</ul>
5353
<p>Tabs work too:</p>
5454
<p>test "tabbed code", -&gt;
55-
ok yes</p>
55+
ok yes</p>

Diff for: test/markups/README.mediawiki.html

+9-5
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,20 @@
1515

1616

1717
<h1>
18-
<a name="Red_Bridge_JRuby_Embed"></a>Red Bridge (JRuby Embed)</h1>
18+
<a name="Red_Bridge_JRuby_Embed"></a>Red Bridge (JRuby Embed)
19+
</h1>
20+
1921

2022

2123
<p><tt>one-&lt;two</tt>
2224
</p><pre>a-b</pre>
2325

24-
2526
<p>JRuby has long had a private embedding API, which was closely tied to the runtime's internals and therefore changed frequently as JRuby evolved. Since version 1.4, however, we have also provided a more stable public API, known as Red Bridge or JRuby Embed. Existing Java programs written to the <a href="DirectJRubyEmbedding">legacy API</a> should still work, but we strongly recommend Red Bridge for all new projects.
2627
</p>
2728

2829
<h2>
29-
<a name="Features_of_Red_Bridge"></a>Features of Red Bridge</h2>
30+
<a name="Features_of_Red_Bridge"></a>Features of Red Bridge
31+
</h2>
3032

3133

3234
<p>Red Bridge consists of two layers: Embed Core on the bottom, and implementations of <a href="http://www.jcp.org/en/jsr/detail?id=223" target="_blank">JSR223</a> and <a href="http://jakarta.apache.org/bsf/" target="_blank">BSF</a> on top. Embed Core is JRuby-specific, and can take advantage of much of JRuby's power. JSR223 and BSF are more general interfaces that provide a common ground across scripting languages.
@@ -46,14 +48,16 @@ <h2>
4648
</p>
4749

4850
<h1>
49-
<a name="Previous_Embedding_JRuby_Page"></a>Previous Embedding JRuby Page</h1>
51+
<a name="Previous_Embedding_JRuby_Page"></a>Previous Embedding JRuby Page
52+
</h1>
5053

5154

5255
<p>We recommend using Embed Core; however, if you're maintaining code that uses the old API, you can find its documentation on the <a href="JavaIntegration">legacy embedding</a><sup>[<a href="#cite_note-1">1</a>]</sup> page.
5356
</p>
5457

5558
<h1>
56-
<a name="References"></a>References</h1>
59+
<a name="References"></a>References
60+
</h1>
5761

5862

5963
<p></p><ol><li>

Diff for: test/markups/README.pod.html

+8-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ <h2>ABOUT</h2>
1010

1111
<ul>
1212

13-
<li><p>Create a working compiler that understands the majority of the MATLAB/Octave programming language.</p>
13+
<li>
14+
<p>Create a working compiler that understands the majority of the MATLAB/Octave programming language.</p>
1415

1516
</li>
1617
</ul>
@@ -21,13 +22,16 @@ <h2>IMPLEMENTATION</h2>
2122

2223
<ul>
2324

24-
<li><p>The first is the parser, located in the <code>src/parser/</code> directory. The parser proper is composed of three source files, <i>grammar.pg</i> which is a Perl6Grammar file, and <i>actions.pm</i> which is the associated actions file written in NQP, and <i>grammar-oper.pm</i> which is the operator precedence parser. In addition, several helper functions used by the parser are located in <code>src/internals</code>.</p>
25+
<li>
26+
<p>The first is the parser, located in the <code>src/parser/</code> directory. The parser proper is composed of three source files, <i>grammar.pg</i> which is a Perl6Grammar file, and <i>actions.pm</i> which is the associated actions file written in NQP, and <i>grammar-oper.pm</i> which is the operator precedence parser. In addition, several helper functions used by the parser are located in <code>src/internals</code>.</p>
2527

2628
</li>
27-
<li><p>The second component is the library of builtin functions in the <code>src/builtins/</code> directory. These functions are, currently, written primarily in PIR. Function names prefixed with an underscore are &quot;private&quot; functions for use with the parser. Other functions should have names which are the same as names for regular MATLAB or Octave functions, since they will be available to the HLL. These are also separated into different namespaces depending on visibility and utility.</p>
29+
<li>
30+
<p>The second component is the library of builtin functions in the <code>src/builtins/</code> directory. These functions are, currently, written primarily in PIR. Function names prefixed with an underscore are "private" functions for use with the parser. Other functions should have names which are the same as names for regular MATLAB or Octave functions, since they will be available to the HLL. These are also separated into different namespaces depending on visibility and utility.</p>
2831

2932
</li>
30-
<li><p>A number of library functions are written in M, or mostly M with some inline PIR code in <code>toolbox/</code>.</p>
33+
<li>
34+
<p>A number of library functions are written in M, or mostly M with some inline PIR code in <code>toolbox/</code>.</p>
3135

3236
</li>
3337
</ul>

Diff for: test/markups/README.rst.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ <h1>Header 1</h1>
22
<h2>Subtitle</h2>
33
<p>Example text.</p>
44
<div>
5-
<p>Table of Contents</p>
5+
<p><a href="#top">Table of Contents</a></p>
66
<ul>
77
<li><a href="#header-2">Header 2</a></li>
88
<li><a href="#field-list">Field list</a></li>
@@ -102,7 +102,8 @@ <h2><a href="#toc-entry-1">Header 2</a></h2>
102102
</tr>
103103
</tbody>
104104
</table>
105-
<a href="https://scan.coverity.com/projects/621"><img alt="Coverity Scan Build Status" src="https://scan.coverity.com/projects/621/badge.svg">
105+
<a href="https://scan.coverity.com/projects/621">
106+
<img alt="Coverity Scan Build Status" src="https://scan.coverity.com/projects/621/badge.svg">
106107
</a>
107108
<img alt="Coverity Scan Build Status" src="https://scan.coverity.com/projects/621/badge.svg">
108109
<a name="field-list"></a>
@@ -133,5 +134,4 @@ <h2><a href="#toc-entry-2">Field list</a></h2>
133134
</table>
134135
<p><a href="mailto:[email protected]">[email protected]</a></p>
135136
<p>Press <kbd>Ctrl+C</kbd> to quit</p>
136-
137-
<p><strong>RAW HTML!</strong></p> p {color:blue;}
137+
<p><strong>RAW HTML!</strong></p> p {color:blue;}

Diff for: test/markups/README.toc.asciidoc.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ <h3>Subsection B-2</h3>
4343

4444
</div>
4545
</div>
46-
</div>
46+
</div>

Diff for: test/markups/README.toc.rst.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div>
2-
<p>Contents</p>
2+
<p><a href="#top">Contents</a></p>
33
<ul>
44
<li>
55
<a href="#introduction">1   Introduction</a><ul>
@@ -29,4 +29,4 @@ <h3>1.2   What is it good for?</h3>
2929
</ul>
3030
<p><strong>pycparser</strong> is unique in the sense that it's written in pure Python - a very
3131
high level language that's easy to experiment with and tweak. To people familiar
32-
with Lex and Yacc, <strong>pycparser</strong>'s code will be simple to understand.</p>
32+
with Lex and Yacc, <strong>pycparser</strong>'s code will be simple to understand.</p>

0 commit comments

Comments
 (0)