update to asciidoctor 2.0.19 (rhbz#2208089)

Release notes:
https://github.com/asciidoctor/asciidoctor/releases/tag/v2.0.19
This commit is contained in:
Todd Zullinger 2023-05-17 21:02:46 -04:00
parent 24ce10d5c7
commit f73db33c50
4 changed files with 6 additions and 66 deletions

View File

@ -1,26 +0,0 @@
From 066a4618b92fb08d6c9928e134d86bbbcaa4f8f2 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz@pobox.com>
Date: Tue, 21 Feb 2023 05:42:24 -0500
Subject: [PATCH] backport fix for #4406 fix test assertion for fallback Rouge
stylesheet to be compatible with Rouge 4.1
Co-authored-by: Dan Allen <dan.j.allen@gmail.com>
---
test/syntax_highlighter_test.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/syntax_highlighter_test.rb b/test/syntax_highlighter_test.rb
index a9f5c41f..43548a12 100644
--- a/test/syntax_highlighter_test.rb
+++ b/test/syntax_highlighter_test.rb
@@ -1017,8 +1017,8 @@ def highlight?
EOS
output = convert_string input, safe: :safe, linkcss_default: true
assert_css 'pre.rouge', output, 1
- assert_includes output, 'pre.rouge .no {'
- assert_match %r/pre\.rouge \{\s*background-color: #f8f8f8;/m, output
+ expected_css = (Asciidoctor::SyntaxHighlighter.for 'rouge').read_stylesheet 'github'
+ assert_includes output, expected_css
end
test 'should restore isolated callout mark on last line of source' do

View File

@ -1,32 +0,0 @@
From b3c05398b1b4b483fe5f9c9ef89dc772863cf6f1 Mon Sep 17 00:00:00 2001
From: Dan Allen <dan.j.allen@gmail.com>
Date: Mon, 20 Feb 2023 23:47:59 -0700
Subject: [PATCH] resolves #4390 fix call order so use of an include file with
invalid encoding continues to raise error when using Ruby >= 3.2.0
---
lib/asciidoctor/reader.rb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/asciidoctor/reader.rb b/lib/asciidoctor/reader.rb
index d18b27c9..3e189498 100644
--- a/lib/asciidoctor/reader.rb
+++ b/lib/asciidoctor/reader.rb
@@ -1197,15 +1197,16 @@ def preprocess_include_directive target, attrlist
push_include inc_lines, inc_path, relpath, inc_offset, parsed_attrs
end
else
+ inc_content = nil
begin
# NOTE read content before shift so cursor is only advanced if IO operation succeeds
inc_content = reader.call(inc_path, read_mode) {|f| f.read }
shift
- push_include inc_content, inc_path, relpath, 1, parsed_attrs
rescue
logger.error message_with_context %(include #{target_type} not readable: #{inc_path}), source_location: cursor
return replace_next_line %(Unresolved directive in #{@path} - include::#{expanded_target}[#{attrlist}])
end
+ push_include inc_content, inc_path, relpath, 1, parsed_attrs
end
true
end

View File

@ -6,16 +6,11 @@
Summary: A fast, open source AsciiDoc implementation in Ruby
Name: rubygem-%{gem_name}
Version: 2.0.18
Release: 3%{?dist}
Version: 2.0.19
Release: 1%{?dist}
License: MIT
URL: https://asciidoctor.org
Source0: https://github.com/asciidoctor/asciidoctor/archive/%{gittag}/%{gem_name}-%{version}%{pre}.tar.gz
# https://bugzilla.redhat.com/2171711
# https://github.com/asciidoctor/asciidoctor/issues/4390
Patch0: 0001-resolves-4390-fix-call-order-so-use-of-an-include-fi.patch
# https://github.com/asciidoctor/asciidoctor/issues/4406
Patch1: 0001-backport-fix-for-4406-fix-test-assertion-for-fallbac.patch
%if 0%{?el7}
Requires: ruby(release)
BuildRequires: ruby(release)
@ -126,6 +121,9 @@ cp -a .%{gem_instdir}/man/*.1 \
%doc %{gem_docdir}
%changelog
* Wed May 17 2023 Todd Zullinger <tmz@pobox.com> - 2.0.19-1
- update to asciidoctor 2.0.19 (rhbz#2208089)
* Mon Feb 20 2023 Todd Zullinger <tmz@pobox.com> - 2.0.18-3
- fixes for ruby-3.2.x and rouge-4.1.0 (rhbz#2171711)

View File

@ -1 +1 @@
SHA512 (asciidoctor-2.0.18.tar.gz) = b47b377520046d95101fc9bcd3defdf7219714ebadc0d069cb108d39a349fcf1abd1e61178e1515f75bb69e9e3d0f8cb2de67de5a0f8aa75fdd139d693c0e437
SHA512 (asciidoctor-2.0.19.tar.gz) = 5a47519a736bb4e62942e062478fe52d200c620af9d6120ef0ca49b21cb108726c6fddddc49ae8b08462674bc9c976d8cf4e1841a1e977349cfcae1a704b6199