asciidoctor 1.5.7 → 1.5.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c9adee957fdfaa129f4d6ddfc82ae51a1352ea6b3cdd6ac094651099be3e4c7
-  data.tar.gz: a193373b8636c2a7196761d0d05cd3c2e3dfb62a4cf304064cc522e3d274c826
+  metadata.gz: ad8e487a317ee7c1ba5e138157d4515b3af5bdf53ff0dc18afca5eeaa1eb2c63
+  data.tar.gz: a9e4b482528e1f57fbf390ead5e49f17a1ad099f14da9b4cd9755e2ddcb8de20
 SHA512:
-  metadata.gz: be33314441c4496231066060394f5df643de75f0ad7bbd02b37c474ef4dc451333e9bb21744d53c5267b11daf12fc9658ad12505f385ce3bcab4d18ce6d64941
-  data.tar.gz: 45272e1a562a3eb49e493a55545190cdf2a77af74668f154fe9a935b5ca7af3bd9878fa86cd298b9d0b1539b1c3b024b36855fbc0e672b6bd9be15b28ccf2fa5
+  metadata.gz: 45c2b7128e586c4533b7c2aee5c9b4f249bc5d2a212b30b89828f3358be983d1d950c1b50ddfa3661587a284c426b89b088c4f58369bf3083f084134679e51c0
+  data.tar.gz: ee0bb8f333c509e165f56eb46f5de656c9930f04235081fcbb072ab36bd40cd0eb664d12d03bb4c6053caaf6d8895dbf674cbe78de30ad9f3f0704aef811d6ed

data/CHANGELOG.adoc

@@ -13,6 +13,19 @@ endif::[]
 This document provides a high-level view of the changes introduced in Asciidoctor by release.
 For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
 
+== 1.5.7.1 (2018-05-10) - @mojavelinux
+
+Fixes::
+
+  * fix regression where block attributes where being inherited by sibling blocks in a complex list item (#2771)
+  * don't apply lead styling to first paragraph in nested document (AsciiDoc table cell) if role is present (#2624)
+
+Build / Infrastructure::
+
+  * drop obsolete logic in rake build
+  * allow lib dir to be overridden for tests using an environment variable (PR #2758)
+  * load asciidoctor/version from LOAD_PATH in gemspec if not found locally (PR #2760)
+
 == 1.5.7 (2018-05-02) - @mojavelinux
 
 Enhancements::

data/README-fr.adoc

@@ -1,5 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
+v1.5.7.1, 2018-05-10
 v1.5.7, 2018-05-02
 // settings:
 :idprefix:
@@ -17,7 +18,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 1.5.7
+:release-version: 1.5.7.1
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-jp.adoc

@@ -1,5 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
+v1.5.7.1, 2018-05-10
 v1.5.7, 2018-05-02
 // settings:
 :page-layout: base
@@ -18,7 +19,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 1.5.7
+:release-version: 1.5.7.1
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-zh_CN.adoc

@@ -1,5 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
+v1.5.7.1, 2018-05-10
 v1.5.7, 2018-05-02
 // settings:
 :page-layout: base
@@ -18,7 +19,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 1.5.7
+:release-version: 1.5.7.1
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README.adoc

@@ -1,5 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
+v1.5.7.1, 2018-05-10
 v1.5.7, 2018-05-02
 // settings:
 :idprefix:
@@ -17,7 +18,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 1.5.7
+:release-version: 1.5.7.1
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor
@@ -221,9 +222,9 @@ To upgrade the gem, use:
 
 TIP: Your system may be configured to automatically update rpm packages, in which case no action is required by you to update the gem.
 
-==== apt-get (Debian, Ubuntu, or Mint)
+==== apt-get (Debian or Ubuntu)
 
-To install the gem on Debian, Ubuntu or Mint, open a terminal and type:
+To install the gem on Debian or Ubuntu, open a terminal and type:
 
  $ sudo apt-get install -y asciidoctor
 
@@ -238,7 +239,6 @@ Consult the package repository for your distribution to find out which version i
 
 * https://packages.debian.org/search?keywords=asciidoctor&searchon=names&exact=1&suite=all&section=all[asciidoctor package by Debian release]
 * https://packages.ubuntu.com/search?keywords=asciidoctor&searchon=names&exact=1&suite=all&section=all[asciidoctor package by Ubuntu release]
-* https://community.linuxmint.com/software/view/asciidoctor[asciidoctor package by Mint release]
 
 [CAUTION]
 ====

data/Rakefile

@@ -1,5 +1,3 @@
-require File.expand_path '../lib/asciidoctor/version', __FILE__
-
 def prepare_test_env
   # rather than hardcoding gc settings in test task,
   # could use https://gist.github.com/benders/788695
@@ -65,16 +63,6 @@ end
 
 begin
   require 'bundler/gem_tasks'
-
-  # Enhance the release task to create an explicit commit for the release
-  #Rake::Task[:release].enhance [:commit_release]
-
-  # NOTE you don't need to push after updating version and committing locally
-  # WARNING no longer works; it's now necessary to get master in a state ready for tagging
-  task :commit_release do
-    Bundler::GemHelper.new.send(:guard_clean)
-    sh "git commit --allow-empty -a -m 'Release #{Asciidoctor::VERSION}'"
-  end
 rescue LoadError
 end
 

data/asciidoctor.gemspec

@@ -1,5 +1,10 @@
 # encoding: UTF-8
-require File.expand_path '../lib/asciidoctor/version', __FILE__
+begin
+  require File.expand_path '../lib/asciidoctor/version', __FILE__
+rescue LoadError
+  require 'asciidoctor/version'
+end
+
 require 'open3' unless defined? Open3
 
 Gem::Specification.new do |s|

data/data/stylesheets/asciidoctor-default.css

@@ -187,7 +187,7 @@ body.toc2.toc-right{padding-left:0;padding-right:20em}}
 .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}
 table.tableblock.fit-content>caption.title{white-space:nowrap;width:0}
 .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)}
-table.tableblock #preamble>.sectionbody>.paragraph:first-of-type p{font-size:inherit}
+table.tableblock #preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:inherit}
 .admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%}
 .admonitionblock>table td.icon{text-align:center;width:80px}
 .admonitionblock>table td.icon img{max-width:none}

data/lib/asciidoctor/parser.rb

@@ -1335,12 +1335,12 @@ class Parser
       end
 
       # reader is confined to boundaries of list, which means only blocks will be found (no sections)
-      if (block = next_block(list_item_reader, list_item, (attrs = {}), :text => !has_text))
+      if (block = next_block(list_item_reader, list_item, {}, :text => !has_text))
         list_item.blocks << block
       end
 
       while list_item_reader.has_more_lines?
-        if (block = next_block(list_item_reader, list_item, attrs))
+        if (block = next_block(list_item_reader, list_item))
           list_item.blocks << block
         end
       end

data/lib/asciidoctor/version.rb

@@ -1,3 +1,3 @@
 module Asciidoctor
-  VERSION = '1.5.7'
+  VERSION = '1.5.7.1'
 end

data/man/asciidoctor.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: asciidoctor
 .\"    Author: Dan Allen, Sarah White, Ryan Waldron
-.\" Generator: Asciidoctor 1.5.7
-.\"      Date: 2018-05-02
+.\" Generator: Asciidoctor 1.5.7.1
+.\"      Date: 2018-05-10
 .\"    Manual: Asciidoctor Manual
-.\"    Source: Asciidoctor 1.5.7
+.\"    Source: Asciidoctor 1.5.7.1
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "2018-05-02" "Asciidoctor 1.5.7" "Asciidoctor Manual"
+.TH "ASCIIDOCTOR" "1" "2018-05-10" "Asciidoctor 1.5.7.1" "Asciidoctor Manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0

data/man/asciidoctor.adoc

@@ -2,7 +2,7 @@
 Dan Allen; Sarah White; Ryan Waldron
 :doctype: manpage
 :man manual: Asciidoctor Manual
-:man source: Asciidoctor 1.5.7
+:man source: Asciidoctor 1.5.7.1
 :page-layout: base
 
 == NAME

data/test/lists_test.rb

@@ -377,6 +377,29 @@ NOTE: This is a note.
       assert_xpath '(//ul)[1]/li/hr', output, 1
     end
 
+    test 'should not inherit block attributes from previous block when block is attached using a list continuation' do
+      input = <<-EOS
+* complex list item
++
+[source,xml]
+----
+<name>value</name> <!--1-->
+----
+<1> a configuration value
+      EOS
+
+      doc = document_from_string input
+      colist = doc.blocks[0].items[0].blocks[-1]
+      assert_equal :colist, colist.context
+      refute_equal 'source', colist.style
+      output = doc.convert :header_footer => false
+      assert_css 'ul', output, 1
+      assert_css 'ul > li', output, 1
+      assert_css 'ul > li > p', output, 1
+      assert_css 'ul > li > .listingblock', output, 1
+      assert_css 'ul > li > .colist', output, 1
+    end
+
     test 'should continue to parse blocks attached by a list continuation after block is dropped' do
       input = <<-EOS
 * item

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 ASCIIDOCTOR_TEST_DIR = File.expand_path File.dirname __FILE__
 ASCIIDOCTOR_PROJECT_DIR = File.dirname ASCIIDOCTOR_TEST_DIR
+ASCIIDOCTOR_LIB_DIR = ENV['ASCIIDOCTOR_LIB_DIR'] || File.join(ASCIIDOCTOR_PROJECT_DIR, 'lib')
 Dir.chdir ASCIIDOCTOR_PROJECT_DIR
 
 if RUBY_VERSION < '1.9'
@@ -9,7 +10,7 @@ end
 
 require 'simplecov' if ENV['COVERAGE'] == 'true'
 
-require File.join(ASCIIDOCTOR_PROJECT_DIR, 'lib', 'asciidoctor')
+require File.join(ASCIIDOCTOR_LIB_DIR, 'asciidoctor')
 
 require 'socket'
 require 'nokogiri'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.7.1
 platform: ruby
 authors:
 - Dan Allen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath