Skip to content

Commit

Permalink
Update nokogiri, nokogiri-diff, rdoc
Browse files Browse the repository at this point in the history
  • Loading branch information
kenyonj committed Jun 12, 2024
1 parent a849a12 commit ce20d65
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 23 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ pkg/
Gemfile.lock
.project
.buildpath
*~
*~
vendor/
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ gem "RedCloth"
# using a tag version here because 0.18.3 was not published by the author to encourage users to upgrade.
# however we want to bump up to this version since this has a security patch
gem "commonmarker", git: "https://github.com/gjtorikian/commonmarker.git", tag: "v0.18.3"
gem "rdoc", "~>3.6"
gem "rdoc", "~> 6.7.0"
gem "org-ruby", "= 0.9.9"
gem "creole", "~>0.3.6"
gem "wikicloth", "=0.8.3"
gem "twitter-text", "~> 1.14"
gem "asciidoctor", "~> 2.0.5"
gem "rake"
gem "rexml"
4 changes: 2 additions & 2 deletions github-markup.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'minitest', '~> 5.4', '>= 5.4.3'
s.add_development_dependency 'html-pipeline', '~> 1.0'
s.add_development_dependency 'sanitize', '>= 4.6.3'
s.add_development_dependency 'nokogiri', '~> 1.8.1'
s.add_development_dependency 'nokogiri-diff', '~> 0.2.0'
s.add_development_dependency 'nokogiri', '~> 1.16.5'
s.add_development_dependency 'nokogiri-diff', '~> 0.3.0'
s.add_development_dependency "github-linguist", ">= 7.1.3"
end
2 changes: 1 addition & 1 deletion test/markups/README.asciidoc.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ <h2>Another Section</h2>
<p>content</p>
</div>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion test/markups/README.hidetitle.asciidoc.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div>
<p>This test verifies the author can disable the document title by adding <code>:!showtitle:</code> to the document header.</p>
</div>
</div>
2 changes: 1 addition & 1 deletion test/markups/README.litcoffee.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ <h2>Literate CoffeeScript Test</h2>
</ul>
<p>Tabs work too:</p>
<p>test "tabbed code", -&gt;
ok yes</p>
ok yes</p>
14 changes: 9 additions & 5 deletions test/markups/README.mediawiki.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,20 @@


<h1>
<a name="Red_Bridge_JRuby_Embed"></a>Red Bridge (JRuby Embed)</h1>
<a name="Red_Bridge_JRuby_Embed"></a>Red Bridge (JRuby Embed)
</h1>



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


<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.
</p>

<h2>
<a name="Features_of_Red_Bridge"></a>Features of Red Bridge</h2>
<a name="Features_of_Red_Bridge"></a>Features of Red Bridge
</h2>


<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.
Expand All @@ -46,14 +48,16 @@ <h2>
</p>

<h1>
<a name="Previous_Embedding_JRuby_Page"></a>Previous Embedding JRuby Page</h1>
<a name="Previous_Embedding_JRuby_Page"></a>Previous Embedding JRuby Page
</h1>


<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.
</p>

<h1>
<a name="References"></a>References</h1>
<a name="References"></a>References
</h1>


<p></p><ol><li>
Expand Down
12 changes: 8 additions & 4 deletions test/markups/README.pod.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ <h2>ABOUT</h2>

<ul>

<li><p>Create a working compiler that understands the majority of the MATLAB/Octave programming language.</p>
<li>
<p>Create a working compiler that understands the majority of the MATLAB/Octave programming language.</p>

</li>
</ul>
Expand All @@ -21,13 +22,16 @@ <h2>IMPLEMENTATION</h2>

<ul>

<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>
<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>

</li>
<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>
<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 "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>

</li>
<li><p>A number of library functions are written in M, or mostly M with some inline PIR code in <code>toolbox/</code>.</p>
<li>
<p>A number of library functions are written in M, or mostly M with some inline PIR code in <code>toolbox/</code>.</p>

</li>
</ul>
Expand Down
8 changes: 4 additions & 4 deletions test/markups/README.rst.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ <h1>Header 1</h1>
<h2>Subtitle</h2>
<p>Example text.</p>
<div>
<p>Table of Contents</p>
<p><a href="#top">Table of Contents</a></p>
<ul>
<li><a href="#header-2">Header 2</a></li>
<li><a href="#field-list">Field list</a></li>
Expand Down Expand Up @@ -102,7 +102,8 @@ <h2><a href="#toc-entry-1">Header 2</a></h2>
</tr>
</tbody>
</table>
<a href="https://scan.coverity.com/projects/621"><img alt="Coverity Scan Build Status" src="https://scan.coverity.com/projects/621/badge.svg">
<a href="https://scan.coverity.com/projects/621">
<img alt="Coverity Scan Build Status" src="https://scan.coverity.com/projects/621/badge.svg">
</a>
<img alt="Coverity Scan Build Status" src="https://scan.coverity.com/projects/621/badge.svg">
<a name="field-list"></a>
Expand Down Expand Up @@ -133,5 +134,4 @@ <h2><a href="#toc-entry-2">Field list</a></h2>
</table>
<p><a href="mailto:someone@somewhere.org">someone@somewhere.org</a></p>
<p>Press <kbd>Ctrl+C</kbd> to quit</p>

<p><strong>RAW HTML!</strong></p> p {color:blue;}
<p><strong>RAW HTML!</strong></p> p {color:blue;}
2 changes: 1 addition & 1 deletion test/markups/README.toc.asciidoc.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ <h3>Subsection B-2</h3>

</div>
</div>
</div>
</div>
4 changes: 2 additions & 2 deletions test/markups/README.toc.rst.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div>
<p>Contents</p>
<p><a href="#top">Contents</a></p>
<ul>
<li>
<a href="#introduction">1   Introduction</a><ul>
Expand Down Expand Up @@ -29,4 +29,4 @@ <h3>1.2   What is it good for?</h3>
</ul>
<p><strong>pycparser</strong> is unique in the sense that it's written in pure Python - a very
high level language that's easy to experiment with and tweak. To people familiar
with Lex and Yacc, <strong>pycparser</strong>'s code will be simple to understand.</p>
with Lex and Yacc, <strong>pycparser</strong>'s code will be simple to understand.</p>

0 comments on commit ce20d65

Please sign in to comment.