[DRE-commits] [ruby-kramdown] 02/05: Refresh patches

[Youhei SASAKI]

This is an automated email from the git hooks/post-receive script.

uwabami-guest pushed a commit to branch master
in repository ruby-kramdown.

commit abc82c61e9d0955c41312ae8a805ff3d67b7503a
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Thu Aug 3 20:32:25 2017 +0900

    Refresh patches
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/patches/rouge2.patch                    | 61 --------------------------
 debian/patches/skip_missing_math_engines.patch |  4 +-
 2 files changed, 2 insertions(+), 63 deletions(-)

diff --git a/debian/patches/rouge2.patch b/debian/patches/rouge2.patch
index aacdd71..e5205e9 100644
--- a/debian/patches/rouge2.patch
+++ b/debian/patches/rouge2.patch
@@ -5,25 +5,6 @@ Bug: https://github.com/gettalong/kramdown/issues/350
 Author: Cédric Boutillier <boutil at debian.org>
 Last-Update: 2016-08-27
 
---- a/test/testcases/block/06_codeblock/rouge/simple.html
-+++ b/test/testcases/block/06_codeblock/rouge/simple.html
-@@ -1,10 +1,7 @@
--<div class="language-ruby highlighter-rouge"><pre class="highlight"><code><span class="n">x</span> <span class="o">=</span> <span class="no">Class</span><span class="p">.</span><span class="nf">new</span>
--</code></pre>
--</div>
--<div class="language-html highlighter-rouge"><pre class="highlight"><code><span class="nt"><a></span>href<span class="nt"></a></span>
--</code></pre>
--</div>
-+<div class="language-ruby highlighter-rouge"><pre class="codehilite"><code><span class="n">x</span> <span class="o">=</span> <span class="no">Class</span><span class="p">.</span><span class="nf">new</span>
-+</code></pre></div>
-+<div class="language-html highlighter-rouge"><pre class="codehilite"><code><span class="nt"><a></span>href<span class="nt"></a></span>
-+</code></pre></div>
- 
--<div class="language-php highlighter-rouge"><pre class="highlight"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nx">Bar</span><span class="p">;</span>
--</code></pre>
--</div>
-+<div class="language-php highlighter-rouge"><pre class="codehilite"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nx">Bar</span><span class="p">;</span>
-+</code></pre></div>
 --- a/kramdown.gemspec
 +++ b/kramdown.gemspec
 @@ -31,7 +31,7 @@
@@ -53,45 +34,3 @@ Last-Update: 2016-08-27
      s.add_dependency(%q<stringex>, ["~> 1.5.1"])
    end
  end
---- a/lib/kramdown/converter/syntax_highlighter/rouge.rb
-+++ b/lib/kramdown/converter/syntax_highlighter/rouge.rb
-@@ -27,7 +27,7 @@
-       lexer = ::Rouge::Lexer.find_fancy(lang || opts[:default_lang], text)
-       return nil if opts[:disable] || !lexer
- 
--      formatter = (opts.fetch(:formatter, ::Rouge::Formatters::HTML)).new(opts)
-+      formatter = (opts.fetch(:formatter, ::Rouge::Formatters::HTMLLegacy)).new(opts)
-       formatter.format(lexer.lex(text))
-     end
- 
---- a/test/test_files.rb
-+++ b/test/test_files.rb
-@@ -16,7 +16,7 @@
-   require 'kramdown/converter/syntax_highlighter/rouge'
- 
-   # custom formatter for tests
--  class RougeHTMLFormatters < ::Rouge::Formatters::HTML
-+  class RougeHTMLFormatters < ::Rouge::Formatters::HTMLLegacy
-     tag 'rouge_html_formatters'
- 
-     def stream(tokens, &b)
---- a/test/testcases/block/06_codeblock/rouge/multiple.html
-+++ b/test/testcases/block/06_codeblock/rouge/multiple.html
-@@ -1,11 +1,8 @@
--<div class="language-ruby highlighter-rouge"><div class="custom-class"><pre class="highlight"><code><span class="nb">puts</span> <span class="s2">"Hello"</span>
--</code></pre>
--</div></div>
-+<div class="language-ruby highlighter-rouge"><div class="custom-class"><pre class="codehilite"><code><span class="nb">puts</span> <span class="s2">"Hello"</span>
-+</code></pre></div></div>
- 
--<div class="language-ruby highlighter-rouge"><div class="custom-class"><pre class="highlight"><code><span class="nb">puts</span> <span class="s2">"World"</span>
--</code></pre>
--</div></div>
-+<div class="language-ruby highlighter-rouge"><div class="custom-class"><pre class="codehilite"><code><span class="nb">puts</span> <span class="s2">"World"</span>
-+</code></pre></div></div>
- 
--<div class="language-php highlighter-rouge"><div class="custom-class"><pre class="highlight"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nx">Bar</span><span class="p">;</span>
--</code></pre>
--</div></div>
-+<div class="language-php highlighter-rouge"><div class="custom-class"><pre class="codehilite"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nx">Bar</span><span class="p">;</span>
-+</code></pre></div></div>
diff --git a/debian/patches/skip_missing_math_engines.patch b/debian/patches/skip_missing_math_engines.patch
index a0dd5a2..7dfa600 100644
--- a/debian/patches/skip_missing_math_engines.patch
+++ b/debian/patches/skip_missing_math_engines.patch
@@ -5,7 +5,7 @@ Last-Update: 2016-08-27
 
 --- a/test/test_files.rb
 +++ b/test/test_files.rb
-@@ -35,8 +35,15 @@
+@@ -41,8 +41,15 @@
    EXCLUDE_KD_FILES = [('test/testcases/block/04_header/with_auto_ids.text' if RUBY_VERSION <= '1.8.6'), # bc of dep stringex not working
                        ('test/testcases/span/03_codespan/rouge/' if RUBY_VERSION < '2.0'), #bc of rouge
                        ('test/testcases/block/06_codeblock/rouge/' if RUBY_VERSION < '2.0'), #bc of rouge
@@ -23,7 +23,7 @@ Last-Update: 2016-08-27
                       ].compact
  
    # Generate test methods for kramdown-to-xxx conversion
-@@ -323,8 +330,15 @@
+@@ -344,8 +351,15 @@
                         ('test/testcases/block/06_codeblock/rouge/simple.text' if RUBY_VERSION < '2.0'), #bc of rouge
                         ('test/testcases/block/06_codeblock/rouge/disabled.text' if RUBY_VERSION < '2.0'), #bc of rouge
                         ('test/testcases/block/06_codeblock/rouge/multiple.text' if RUBY_VERSION < '2.0'), #bc of rouge

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-kramdown.git