asciidoctor 1.5.7 → 1.5.7.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4c9adee957fdfaa129f4d6ddfc82ae51a1352ea6b3cdd6ac094651099be3e4c7
4
- data.tar.gz: a193373b8636c2a7196761d0d05cd3c2e3dfb62a4cf304064cc522e3d274c826
3
+ metadata.gz: ad8e487a317ee7c1ba5e138157d4515b3af5bdf53ff0dc18afca5eeaa1eb2c63
4
+ data.tar.gz: a9e4b482528e1f57fbf390ead5e49f17a1ad099f14da9b4cd9755e2ddcb8de20
5
5
  SHA512:
6
- metadata.gz: be33314441c4496231066060394f5df643de75f0ad7bbd02b37c474ef4dc451333e9bb21744d53c5267b11daf12fc9658ad12505f385ce3bcab4d18ce6d64941
7
- data.tar.gz: 45272e1a562a3eb49e493a55545190cdf2a77af74668f154fe9a935b5ca7af3bd9878fa86cd298b9d0b1539b1c3b024b36855fbc0e672b6bd9be15b28ccf2fa5
6
+ metadata.gz: 45c2b7128e586c4533b7c2aee5c9b4f249bc5d2a212b30b89828f3358be983d1d950c1b50ddfa3661587a284c426b89b088c4f58369bf3083f084134679e51c0
7
+ data.tar.gz: ee0bb8f333c509e165f56eb46f5de656c9930f04235081fcbb072ab36bd40cd0eb664d12d03bb4c6053caaf6d8895dbf674cbe78de30ad9f3f0704aef811d6ed
@@ -13,6 +13,19 @@ endif::[]
13
13
  This document provides a high-level view of the changes introduced in Asciidoctor by release.
14
14
  For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
15
15
 
16
+ == 1.5.7.1 (2018-05-10) - @mojavelinux
17
+
18
+ Fixes::
19
+
20
+ * fix regression where block attributes where being inherited by sibling blocks in a complex list item (#2771)
21
+ * don't apply lead styling to first paragraph in nested document (AsciiDoc table cell) if role is present (#2624)
22
+
23
+ Build / Infrastructure::
24
+
25
+ * drop obsolete logic in rake build
26
+ * allow lib dir to be overridden for tests using an environment variable (PR #2758)
27
+ * load asciidoctor/version from LOAD_PATH in gemspec if not found locally (PR #2760)
28
+
16
29
  == 1.5.7 (2018-05-02) - @mojavelinux
17
30
 
18
31
  Enhancements::
@@ -1,5 +1,6 @@
1
1
  = Asciidoctor
2
2
  Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
3
+ v1.5.7.1, 2018-05-10
3
4
  v1.5.7, 2018-05-02
4
5
  // settings:
5
6
  :idprefix:
@@ -17,7 +18,7 @@ ifdef::env-github[]
17
18
  :warning-caption: :warning:
18
19
  endif::[]
19
20
  // Variables:
20
- :release-version: 1.5.7
21
+ :release-version: 1.5.7.1
21
22
  // URIs:
22
23
  :uri-org: https://github.com/asciidoctor
23
24
  :uri-repo: {uri-org}/asciidoctor
@@ -1,5 +1,6 @@
1
1
  = Asciidoctor
2
2
  Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
3
+ v1.5.7.1, 2018-05-10
3
4
  v1.5.7, 2018-05-02
4
5
  // settings:
5
6
  :page-layout: base
@@ -18,7 +19,7 @@ ifdef::env-github[]
18
19
  :warning-caption: :warning:
19
20
  endif::[]
20
21
  // Variables:
21
- :release-version: 1.5.7
22
+ :release-version: 1.5.7.1
22
23
  // URIs:
23
24
  :uri-org: https://github.com/asciidoctor
24
25
  :uri-repo: {uri-org}/asciidoctor
@@ -1,5 +1,6 @@
1
1
  = Asciidoctor
2
2
  Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
3
+ v1.5.7.1, 2018-05-10
3
4
  v1.5.7, 2018-05-02
4
5
  // settings:
5
6
  :page-layout: base
@@ -18,7 +19,7 @@ ifdef::env-github[]
18
19
  :warning-caption: :warning:
19
20
  endif::[]
20
21
  // Variables:
21
- :release-version: 1.5.7
22
+ :release-version: 1.5.7.1
22
23
  // URIs:
23
24
  :uri-org: https://github.com/asciidoctor
24
25
  :uri-repo: {uri-org}/asciidoctor
@@ -1,5 +1,6 @@
1
1
  = Asciidoctor
2
2
  Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
3
+ v1.5.7.1, 2018-05-10
3
4
  v1.5.7, 2018-05-02
4
5
  // settings:
5
6
  :idprefix:
@@ -17,7 +18,7 @@ ifdef::env-github[]
17
18
  :warning-caption: :warning:
18
19
  endif::[]
19
20
  // Variables:
20
- :release-version: 1.5.7
21
+ :release-version: 1.5.7.1
21
22
  // URIs:
22
23
  :uri-org: https://github.com/asciidoctor
23
24
  :uri-repo: {uri-org}/asciidoctor
@@ -221,9 +222,9 @@ To upgrade the gem, use:
221
222
 
222
223
  TIP: Your system may be configured to automatically update rpm packages, in which case no action is required by you to update the gem.
223
224
 
224
- ==== apt-get (Debian, Ubuntu, or Mint)
225
+ ==== apt-get (Debian or Ubuntu)
225
226
 
226
- To install the gem on Debian, Ubuntu or Mint, open a terminal and type:
227
+ To install the gem on Debian or Ubuntu, open a terminal and type:
227
228
 
228
229
  $ sudo apt-get install -y asciidoctor
229
230
 
@@ -238,7 +239,6 @@ Consult the package repository for your distribution to find out which version i
238
239
 
239
240
  * https://packages.debian.org/search?keywords=asciidoctor&searchon=names&exact=1&suite=all&section=all[asciidoctor package by Debian release]
240
241
  * https://packages.ubuntu.com/search?keywords=asciidoctor&searchon=names&exact=1&suite=all&section=all[asciidoctor package by Ubuntu release]
241
- * https://community.linuxmint.com/software/view/asciidoctor[asciidoctor package by Mint release]
242
242
 
243
243
  [CAUTION]
244
244
  ====
data/Rakefile CHANGED
@@ -1,5 +1,3 @@
1
- require File.expand_path '../lib/asciidoctor/version', __FILE__
2
-
3
1
  def prepare_test_env
4
2
  # rather than hardcoding gc settings in test task,
5
3
  # could use https://gist.github.com/benders/788695
@@ -65,16 +63,6 @@ end
65
63
 
66
64
  begin
67
65
  require 'bundler/gem_tasks'
68
-
69
- # Enhance the release task to create an explicit commit for the release
70
- #Rake::Task[:release].enhance [:commit_release]
71
-
72
- # NOTE you don't need to push after updating version and committing locally
73
- # WARNING no longer works; it's now necessary to get master in a state ready for tagging
74
- task :commit_release do
75
- Bundler::GemHelper.new.send(:guard_clean)
76
- sh "git commit --allow-empty -a -m 'Release #{Asciidoctor::VERSION}'"
77
- end
78
66
  rescue LoadError
79
67
  end
80
68
 
@@ -1,5 +1,10 @@
1
1
  # encoding: UTF-8
2
- require File.expand_path '../lib/asciidoctor/version', __FILE__
2
+ begin
3
+ require File.expand_path '../lib/asciidoctor/version', __FILE__
4
+ rescue LoadError
5
+ require 'asciidoctor/version'
6
+ end
7
+
3
8
  require 'open3' unless defined? Open3
4
9
 
5
10
  Gem::Specification.new do |s|
@@ -187,7 +187,7 @@ body.toc2.toc-right{padding-left:0;padding-right:20em}}
187
187
  .admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{text-rendering:optimizeLegibility;text-align:left;font-family:"Noto Serif","DejaVu Serif",serif;font-size:1rem;font-style:italic}
188
188
  table.tableblock.fit-content>caption.title{white-space:nowrap;width:0}
189
189
  .paragraph.lead>p,#preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:1.21875em;line-height:1.6;color:rgba(0,0,0,.85)}
190
- table.tableblock #preamble>.sectionbody>.paragraph:first-of-type p{font-size:inherit}
190
+ table.tableblock #preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:inherit}
191
191
  .admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%}
192
192
  .admonitionblock>table td.icon{text-align:center;width:80px}
193
193
  .admonitionblock>table td.icon img{max-width:none}
@@ -1335,12 +1335,12 @@ class Parser
1335
1335
  end
1336
1336
 
1337
1337
  # reader is confined to boundaries of list, which means only blocks will be found (no sections)
1338
- if (block = next_block(list_item_reader, list_item, (attrs = {}), :text => !has_text))
1338
+ if (block = next_block(list_item_reader, list_item, {}, :text => !has_text))
1339
1339
  list_item.blocks << block
1340
1340
  end
1341
1341
 
1342
1342
  while list_item_reader.has_more_lines?
1343
- if (block = next_block(list_item_reader, list_item, attrs))
1343
+ if (block = next_block(list_item_reader, list_item))
1344
1344
  list_item.blocks << block
1345
1345
  end
1346
1346
  end
@@ -1,3 +1,3 @@
1
1
  module Asciidoctor
2
- VERSION = '1.5.7'
2
+ VERSION = '1.5.7.1'
3
3
  end
@@ -1,13 +1,13 @@
1
1
  '\" t
2
2
  .\" Title: asciidoctor
3
3
  .\" Author: Dan Allen, Sarah White, Ryan Waldron
4
- .\" Generator: Asciidoctor 1.5.7
5
- .\" Date: 2018-05-02
4
+ .\" Generator: Asciidoctor 1.5.7.1
5
+ .\" Date: 2018-05-10
6
6
  .\" Manual: Asciidoctor Manual
7
- .\" Source: Asciidoctor 1.5.7
7
+ .\" Source: Asciidoctor 1.5.7.1
8
8
  .\" Language: English
9
9
  .\"
10
- .TH "ASCIIDOCTOR" "1" "2018-05-02" "Asciidoctor 1.5.7" "Asciidoctor Manual"
10
+ .TH "ASCIIDOCTOR" "1" "2018-05-10" "Asciidoctor 1.5.7.1" "Asciidoctor Manual"
11
11
  .ie \n(.g .ds Aq \(aq
12
12
  .el .ds Aq '
13
13
  .ss \n[.ss] 0
@@ -2,7 +2,7 @@
2
2
  Dan Allen; Sarah White; Ryan Waldron
3
3
  :doctype: manpage
4
4
  :man manual: Asciidoctor Manual
5
- :man source: Asciidoctor 1.5.7
5
+ :man source: Asciidoctor 1.5.7.1
6
6
  :page-layout: base
7
7
 
8
8
  == NAME
@@ -377,6 +377,29 @@ NOTE: This is a note.
377
377
  assert_xpath '(//ul)[1]/li/hr', output, 1
378
378
  end
379
379
 
380
+ test 'should not inherit block attributes from previous block when block is attached using a list continuation' do
381
+ input = <<-EOS
382
+ * complex list item
383
+ +
384
+ [source,xml]
385
+ ----
386
+ <name>value</name> <!--1-->
387
+ ----
388
+ <1> a configuration value
389
+ EOS
390
+
391
+ doc = document_from_string input
392
+ colist = doc.blocks[0].items[0].blocks[-1]
393
+ assert_equal :colist, colist.context
394
+ refute_equal 'source', colist.style
395
+ output = doc.convert :header_footer => false
396
+ assert_css 'ul', output, 1
397
+ assert_css 'ul > li', output, 1
398
+ assert_css 'ul > li > p', output, 1
399
+ assert_css 'ul > li > .listingblock', output, 1
400
+ assert_css 'ul > li > .colist', output, 1
401
+ end
402
+
380
403
  test 'should continue to parse blocks attached by a list continuation after block is dropped' do
381
404
  input = <<-EOS
382
405
  * item
@@ -1,6 +1,7 @@
1
1
  # encoding: UTF-8
2
2
  ASCIIDOCTOR_TEST_DIR = File.expand_path File.dirname __FILE__
3
3
  ASCIIDOCTOR_PROJECT_DIR = File.dirname ASCIIDOCTOR_TEST_DIR
4
+ ASCIIDOCTOR_LIB_DIR = ENV['ASCIIDOCTOR_LIB_DIR'] || File.join(ASCIIDOCTOR_PROJECT_DIR, 'lib')
4
5
  Dir.chdir ASCIIDOCTOR_PROJECT_DIR
5
6
 
6
7
  if RUBY_VERSION < '1.9'
@@ -9,7 +10,7 @@ end
9
10
 
10
11
  require 'simplecov' if ENV['COVERAGE'] == 'true'
11
12
 
12
- require File.join(ASCIIDOCTOR_PROJECT_DIR, 'lib', 'asciidoctor')
13
+ require File.join(ASCIIDOCTOR_LIB_DIR, 'asciidoctor')
13
14
 
14
15
  require 'socket'
15
16
  require 'nokogiri'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: asciidoctor
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.7
4
+ version: 1.5.7.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dan Allen
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2018-05-03 00:00:00.000000000 Z
16
+ date: 2018-05-10 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: asciimath