kramdown-asciidoc 1.0.0.alpha.12 → 1.0.0.alpha.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64f9079115320afb426fbb449cd0b6163b49fbdeb7ae2dc07407eb37524c787a
-  data.tar.gz: e2b4a086c0ec8248970d4d8f121b9642b8a9665510b69fe658f9311a7f96fa2f
+  metadata.gz: f703fb6eabd74ef5641f298a7d7bc2fadce80e5fe9b97d1965abad29a5f5a4d6
+  data.tar.gz: 18c3c1f8f4f2006381b83561badf425e56762216c92d64cc42aae640058ded82
 SHA512:
-  metadata.gz: 2a537db76f1c5406c9a991e442fa366a121907c3b3aeb813434da304f2ec37d0773c1a91b72224ff2ab28f7ad8bc8f9884c842dce0d4228f31a44f4aca889a9e
-  data.tar.gz: fd86b40db1f4f2b22d99ae6295a8a78173f0e8039045224306b143f1d6fd96e00e384c6d9fea4873ccad4616771fa29a96b8cb01005e129315d19c729b7a8cb6
+  metadata.gz: 1f51c28d5cfa7d9c7fb8c1f32e5502a052b0e0030f782c0f4e4f6814c792a36d9f9e03663013d84b338021e0524fefb0fcf54b8a381078f22ebb56cd1f645f06
+  data.tar.gz: 768357f79d874791c79aa6f4a0c1df5f3eaa3fff1648b03f1465d5648ba64ab62279823a2e9133950e42904fdb75c84462db830a1ceecfc2e50d1d60f6b7fafe

data/CHANGELOG.adoc

@@ -5,6 +5,26 @@
 This document provides a high-level view of the changes to {project-name} by release.
 For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
 
+== 1.0.0.alpha.13 (2018-08-21) - @mojavelinux
+
+=== Added
+
+* drop ID on section title if matches auto-generated value when :lazy_ids API option / --lazy-ids CLI option is set (#16)
+* auto-generate IDs for section titles when :auto_ids option is set and :input is not GFM
+* add :postprocess callback option to `convert` and `convert_file` API methods (#53)
+
+=== Changed
+
+* automatically set idprefix, if necessary, based on value of :auto_id_prefix option when :auto_ids options is set (#16)
+* don't modify value of :attributes option passed to `convert` and `convert_file` API methods
+* define ID containing a dot using longhand attribute assignment (#59)
+* extract raw text consistently regardless of input flavor (#56)
+* sort attributes in document header (#55)
+
+=== Fixed
+
+* enclose codeblock content in literal block delimiters if content starts with a list marker (#57)
+
 == 1.0.0.alpha.12 (2018-08-11) - @mojavelinux
 
 === Added
@@ -23,6 +43,10 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
 * break on all terminal punctuation (period, question mark, and exclamation mark) when ventilating prose (#51)
 * consolidated logic in CLI by further delegating to API
 
+=== Details
+
+{uri-repo}/releases/tag/v1.0.0.alpha.12[git tag] | {uri-repo}/compare/v1.0.0.alpha.11\...v1.0.0.alpha.12[full diff]
+
 == 1.0.0.alpha.11 (2018-08-02) - @mojavelinux
 
 === Added
@@ -42,6 +66,10 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
 * use unconstrained codespan if bounded on either side by a smart quote
 * ignore auto-generated ID if heading has an explicit inline anchor
 
+=== Details
+
+{uri-repo}/releases/tag/v1.0.0.alpha.11[git tag] | {uri-repo}/compare/v1.0.0.alpha.10\...v1.0.0.alpha.11[full diff]
+
 == 1.0.0.alpha.10 (2018-07-16) - @mojavelinux
 
 === Added
@@ -60,6 +88,10 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
 
 * insert blank line above list continuation to attach to parent list item (#27)
 
+=== Details
+
+{uri-repo}/releases/tag/v1.0.0.alpha.10[git tag] | {uri-repo}/compare/v1.0.0.alpha.9\...v1.0.0.alpha.10[full diff]
+
 == 1.0.0.alpha.9 (2018-07-10) - @mojavelinux
 
 === Changed
@@ -69,6 +101,10 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
 * don't add newline after period at start of line when producing ventilated prose
 * use :imagesdir API option or --imagesdir CLI option to set implicit imagesdir instead of attribute
 
+=== Details
+
+{uri-repo}/releases/tag/v1.0.0.alpha.9[git tag] | {uri-repo}/compare/v1.0.0.alpha.8\...v1.0.0.alpha.9[full diff]
+
 == 1.0.0.alpha.8 (2018-07-03) - @mojavelinux
 
 === Added
@@ -80,6 +116,10 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
 * don't escape double hyphen in codespan unless surrounded by spaces or word chars
 * treat leading specialchar (<, >, or &) as a word character (since it gets converted to a char reference)
 
+=== Details
+
+{uri-repo}/releases/tag/v1.0.0.alpha.8[git tag] | {uri-repo}/compare/v1.0.0.alpha.7\...v1.0.0.alpha.8[full diff]
+
 == 1.0.0.alpha.7 (2018-07-02) - @mojavelinux
 
 === Added
@@ -100,6 +140,10 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
 * replace .md extension with .adoc in text of interdoc xref
 * replace a non-breaking space with a single space instead of \{nbsp}
 
+=== Details
+
+{uri-repo}/releases/tag/v1.0.0.alpha.7[git tag] | {uri-repo}/compare/v1.0.0.alpha.6\...v1.0.0.alpha.7[full diff]
+
 == 1.0.0.alpha.6 (2018-06-26) - @mojavelinux
 
 === Added
@@ -116,6 +160,10 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
 * use writer to track list nesting level
 * fix warnings
 
+=== Details
+
+{uri-repo}/releases/tag/v1.0.0.alpha.6[git tag] | {uri-repo}/compare/v1.0.0.alpha.5\...v1.0.0.alpha.6[full diff]
+
 == 1.0.0.alpha.5 (2018-06-19) - @mojavelinux
 
 === Added
@@ -131,6 +179,10 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
 * use separate list level for dl
 * fold description list item to one line if primary text is a single line
 
+=== Details
+
+{uri-repo}/releases/tag/v1.0.0.alpha.5[git tag] | {uri-repo}/compare/v1.0.0.alpha.4\...v1.0.0.alpha.5[full diff]
+
 == 1.0.0.alpha.4 (2018-06-12) - @mojavelinux
 
 === Added
@@ -156,6 +208,10 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
 * upgrade kramdown to 1.17.0
 * use correct casing for kramdown in README and library metadata
 
+=== Details
+
+{uri-repo}/releases/tag/v1.0.0.alpha.4[git tag] | {uri-repo}/compare/v1.0.0.alpha.3\...v1.0.0.alpha.4[full diff]
+
 == 1.0.0.alpha.3 (2018-05-31) - @mojavelinux
 
 === Added
@@ -169,6 +225,10 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
 
 * replace ndash symbol with \-- instead of \&#8211;
 
+=== Details
+
+{uri-repo}/releases/tag/v1.0.0.alpha.3[git tag] | {uri-repo}/compare/v1.0.0.alpha.2\...v1.0.0.alpha.3[full diff]
+
 == 1.0.0.alpha.2 (2018-05-24) - @mojavelinux
 
 === Added
@@ -195,8 +255,7 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
 
 === Details
 
-{uri-repo}/releases/tag/v1.0.0.alpha.2[git tag] |
-{uri-repo}/compare/v1.0.0.alpha.1...v1.0.0.alpha.2[full diff]
+{uri-repo}/releases/tag/v1.0.0.alpha.2[git tag] | {uri-repo}/compare/v1.0.0.alpha.1\...v1.0.0.alpha.2[full diff]
 
 == 1.0.0.alpha.1 (2018-05-22) - @mojavelinux
 

data/Gemfile

@@ -1,8 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-group :coverage do
-  gem 'deep-cover', git: 'https://github.com/mojavelinux/deep-cover', branch: 'no-cli', require: false
-  gem 'sass', require: false unless ENV['CI']
-end

data/README.adoc

@@ -1,6 +1,6 @@
 = {project-name} (Markdown to AsciiDoc)
 Dan Allen <https://github.com/mojavelinux>
-v1.0.0.alpha.12, 2018-08-11
+v1.0.0.alpha.13, 2018-08-21
 // Aliases:
 :project-name: Kramdown AsciiDoc
 :project-handle: kramdown-asciidoc
@@ -25,6 +25,7 @@ endif::[]
 :uri-kramdown: https://kramdown.gettalong.org
 :uri-rvm: https://rvm.io
 :uri-rvm-install: https://rvm.io/rvm/install
+:uri-docs-api: https://www.rubydoc.info/github/asciidoctor/kramdown-asciidoc/master
 :uri-ci-appveyor: https://ci.appveyor.com/project/asciidoctor/kramdown-asciidoc
 :img-ci-appveyor: https://ci.appveyor.com/api/projects/status/2pwvdbcoeux1ifb5/branch/master?svg=true
 :uri-ci-travis: https://travis-ci.org/asciidoctor/kramdown-asciidoc
@@ -92,7 +93,7 @@ For example, you can inject attributes (key/value pairs) into the header of the
 
  $ kramdoc -a product-name="ACME Cloud" -a hide-uri-scheme sample.md
 
-Another use for attributes is setting the shared images directory, which is coverd in the next section.
+Another use for attributes is setting the shared images directory, which is covered in the next section.
 
 == Configure shared images directory
 
@@ -136,9 +137,34 @@ image::octocat.png[Octocat]
 
 In this scenario, you may need to pass the `imagesdir` attribute to the AsciiDoc processor when converting the output document so the image is resolved, depending on where the image is stored.
 
+== Auto-generate IDs
+
+You can configure kramdoc to automatically generate explicit IDs for each section title (aka heading) that doesn't already have an ID assigned to it (in the Markdown source).
+To do so, simply enable the `--auto-ids` flag:
+
+ $ kramdoc --auto-ids sample.md
+
+By default, kramdoc does not add a prefix to the generated ID and uses `-` as the separator / replacement character.
+You can change these values using the `--auto-id-prefix` and `--auto-id-separator` options, respectively:
+
+ $ kramdoc --auto-ids --auto-id-prefix=_ --auto-id-separator=_ sample.md
+
+Since the AsciiDoc processor generates an ID for any section title that doesn't have one by default, you may decide you want to drop any ID which matches its auto-generated value.
+You can enable this behavior by adding the `--lazy-ids` flag:
+
+ $ kramdoc --lazy-ids sample.md
+
+The catch is that kramdown/kramdoc and AsciiDoc don't use the same prefix and separator when generating IDs.
+So it's necessary to sync them.
+The simplest way is to set the `--auto-id-prefix` and `--auto-id-separator` values to match those used by AsciiDoc.
+
+ $ kramdoc --lazy-ids --auto-id-prefix=_ --auto-id-separator=_ sample.md
+
+If these values do not match the defaults in AsciiDoc, the `idprefix` and/or `idseparator` attributes will be assigned explicitly in the generated document.
+
 == API
 
-In additional to the command-line interface, {project-name} also provides a porcelain API.
+In additional to the command-line interface, {project-name} also provides a porcelain API (see {uri-docs-api}[API docs]).
 We use the term "`porcelain`" because the API hides the details of registering the converter, preprocessing the Markdown document, parsing the document with kramdown, and calling the converter method to transform the parse tree to AsciiDoc.
 
 The API consists of two static methods:
@@ -194,6 +220,8 @@ Kramdoc.convert markdown, to: 'result.adoc'
 
 The input string is automatically converted to UTF-8.
 
+For more information about the API, refer to the {uri-docs-api}[API documentation].
+
 == Development
 
 To help develop {project-name}, or to simply test-drive the development version, you need to retrieve the source from GitHub.
@@ -242,7 +270,7 @@ Then, use the `bundle` command to install the project dependencies under the pro
 
 NOTE: You must invoke `bundle` from the project's root directory so it can locate the [.path]_Gemfile_.
 
-=== Run the Tests
+=== Run the tests
 
 The test suite is located in the [.path]_spec_ directory.
 The tests are all based on RSpec.
@@ -264,7 +292,7 @@ To run all the scenarios, point RSpec at the spec file:
 
  $ bundle exec rspec spec/scenario_spec.rb
 
-==== Run Individual Tests
+==== Run individual tests
 
 If you only want to run a single test, or a group of tests, you can do so by tagging the test cases, then filtering the test run using that tag.
 
@@ -291,6 +319,40 @@ Run RSpec with the example filter:
 
 RSpec will only run the specifications that have a description containing the text `wrap`.
 
+=== Generate code coverage
+
+To generate a code coverage report when running tests using simplecov, set the `COVERAGE` environment variable as follows when running the tests:
+
+ $ COVERAGE=true bundle exec rake
+
+You'll see a total coverage score as well as a link to the HTML report in the output.
+The HTML report helps you understand which lines and branches were missed, if any.
+
+Despite being fast, the downside of using simplecov is that it misses branches.
+You can use deep-cover to generate a more thorough report.
+To do so, set the `COVERAGE` environment variable as follows when running the tests:
+
+ $ COVERAGE=deep bundle exec rake
+
+You'll see a total coverage score, a detailed coverage report, and a link to HTML report in the output.
+The HTML report helps you understand which lines and branches were missed, if any.
+
+As an alternative to deep cover's native HTML reporter, you can also use istanbul / nyc.
+First, you'll need to have the `nyc` command available on your system:
+
+ $ npm install -g nyc
+
+or
+
+ $ yarn global add nyc
+
+Next, in addition to the `COVERAGE` environment variable, also set the `DEEP_COVER_REPORTER` environment variable as follows when running the tests:
+
+ $ COVERAGE=deep DEEP_COVER_REPORTER=istanbul bundle exec rake
+
+You'll see a total coverage score, a detailed coverage report, and a link to HTML report in the output.
+The HTML report helps you understand which lines and branches were missed, if any.
+
 === Usage
 
 When running the `kramdoc` command from source, you must prefix the command with `bundle exec`:

data/kramdown-asciidoc.gemspec

@@ -35,7 +35,8 @@ Gem::Specification.new do |s|
   #s.extra_rdoc_files = ['CHANGELOG.adoc', 'LICENSE.adoc']
 
   s.add_runtime_dependency 'kramdown', '~> 1.17.0'
+  s.add_development_dependency 'deep-cover-core', '~> 0.6.3'
   s.add_development_dependency 'rake', '~> 12.3.1'
-  s.add_development_dependency 'rspec', '~> 3.7.0'
+  s.add_development_dependency 'rspec', '~> 3.8.0'
   s.add_development_dependency 'simplecov', '~> 0.16.1'
 end

data/lib/kramdown-asciidoc.rb

@@ -1,4 +1,5 @@
 require 'kramdown'
+require_relative 'kramdown-asciidoc/kramdown_ext/parser/base'
 require_relative 'kramdown-asciidoc/kramdown_ext/parser/html'
 require_relative 'kramdown-asciidoc/core_ext/regexp/is_match'
 require_relative 'kramdown-asciidoc/api'

data/lib/kramdown-asciidoc/api.rb

@@ -4,16 +4,19 @@ module Kramdown; module AsciiDoc
   UTF_8 = ::Encoding::UTF_8
 
   def self.convert markdown, opts = {}
-    unless (opts.delete :encode) == false || (markdown.encoding == UTF_8 && !(markdown.include? CR))
+    unless opts[:encode] == false || (markdown.encoding == UTF_8 && !(markdown.include? CR))
       markdown = markdown.encode UTF_8, universal_newline: true
     end
     markdown = markdown.rstrip
     markdown = markdown.slice 1, markdown.length while markdown.start_with? LF
-    # QUESTION should we .dup?
-    attributes = (opts[:attributes] ||= {})
+    parser_opts = ::Kramdown::AsciiDoc::DEFAULT_PARSER_OPTS.merge opts
+    attributes = (parser_opts[:attributes] = (parser_opts[:attributes] || {}).dup)
     markdown = ::Kramdown::AsciiDoc.extract_front_matter markdown, attributes
     markdown = ::Kramdown::AsciiDoc.replace_toc markdown, attributes
-    asciidoc = (::Kramdown::Document.new markdown, (::Kramdown::AsciiDoc::DEFAULT_PARSER_OPTS.merge opts)).to_asciidoc
+    asciidoc = (kramdown_doc = ::Kramdown::Document.new markdown, parser_opts).to_asciidoc
+    if (postprocess = opts[:postprocess])
+      asciidoc = (postprocess.arity == 1 ? postprocess[asciidoc] : postprocess[asciidoc, kramdown_doc]) || asciidoc
+    end
     asciidoc += LF unless asciidoc.empty?
     if (to = opts[:to])
       if ::Pathname === to || (!(to.respond_to? :write) && (to = ::Pathname.new to.to_s))

data/lib/kramdown-asciidoc/cli.rb

@@ -53,10 +53,18 @@ module Kramdown; module AsciiDoc
           options[:auto_ids] = auto_ids
         end
 
-        opts.on '--auto-id-prefix=STRING', 'Set the prefix to add to auto-generated section title IDs' do |string|
+        opts.on '--auto-id-prefix=STRING', 'Set the prefix to use for auto-generated section title IDs' do |string|
           options[:auto_id_prefix] = string
         end
 
+        opts.on '--auto-id-separator=CHAR', 'Set the separator char to use for auto-generated section title IDs' do |char|
+          options[:auto_id_separator] = char
+        end
+
+        opts.on '--lazy-ids', 'Set whether to drop IDs that match value of auto-generated ID' do |lazy_ids|
+          options[:lazy_ids] = lazy_ids
+        end
+
         opts.on '--[no-]auto-links', 'Set whether to automatically convert bare URLs into links (default: true)' do |auto_links|
           options[:auto_links] = auto_links
         end

data/lib/kramdown-asciidoc/converter.rb

@@ -1,5 +1,7 @@
 # encoding: UTF-8
 module Kramdown; module AsciiDoc
+  using CoreExt
+
   DEFAULT_PARSER_OPTS = {
     auto_ids: false,
     hard_wrap: false,
@@ -51,6 +53,7 @@ module Kramdown; module AsciiDoc
     ADMON_TYPE_MAP = ADMON_LABELS.map {|l, _| [l, l.upcase] }.to_h.merge 'Attention' => 'IMPORTANT', 'Hint' => 'TIP'
     BLOCK_TYPES = [:p, :blockquote, :codeblock, :table]
     DLIST_MARKERS = %w(:: ;; ::: ::::)
+    NON_DEFAULT_TABLE_ALIGNMENTS = [:center, :right]
     PUNCTUATION = %w(. ? !)
     # FIXME here we reverse the smart quotes; add option to allow them (needs to be handled carefully)
     SMART_QUOTE_ENTITY_TO_MARKUP = { ldquo: ?", rdquo: ?", lsquo: ?', rsquo: ?' }
@@ -74,18 +77,16 @@ module Kramdown; module AsciiDoc
       laquo_scape: '<< ',
       raquo_space: ' >>',
     }
-    TABLE_ALIGNMENTS = {
-      left: '<',
-      center: '^',
-      right: '>',
-    }
-
-    NON_DEFAULT_TABLE_ALIGNMENTS = [:center, :right]
+    TABLE_ALIGNMENTS = { left: '<', center: '^', right: '>' }
+    # NOTE assumes default Asciidoctor::Compliance.unique_id_start_index value
+    UNIQUE_ID_START_INDEX = 1
 
     CommentPrefixRx = /^ *! ?/m
     CssPropDelimRx = /\s*;\s*/
     FullStopRx = /(?<=\S\.|.\?|.!)\p{Blank}+/
     InadvertentReplacementsRx = /[-=]>|<[-=]|\.\.\.|\{\p{Word}[\p{Word}-]*\}/
+    InvalidIdCharsRx = /&(?:[a-z][a-z]+\d{0,2}|#\d\d\d{0,4}|#x[\da-f][\da-f][\da-f]{0,3});|[^ \p{Word}\-.]+?/
+    ListMarkerRx = /^[ \t]*(?:(?:-|\*\*{0,4}|\.\.{0,4}|\d+\.|[a-zA-Z]\.|[IVXivx]+\))[ \t]|.*?(?::::{0,2}|;;)(?:$|[ \t]))/
     MenuRefRx = /^([\p{Word}&].*?)\s>\s([\p{Word}&].*(?:\s>\s|$))+/
     ReplaceableTextRx = /[-=]>|<[-=]| -- |\p{Word}--\p{Word}|\*\*|\.\.\.|&\S+;|\{\p{Word}[\p{Word}-]*\}|(?:https?|ftp):\/\/\p{Word}|\((?:C|R|TM)\)/
     SmartApostropheRx = /\b’\b/
@@ -104,6 +105,31 @@ module Kramdown; module AsciiDoc
     def initialize root, opts
       super
       @attributes = opts[:attributes] || {}
+      @auto_ids = opts[:auto_ids]
+      @lazy_ids = opts[:lazy_ids]
+      if @auto_ids || @lazy_ids
+        if @auto_ids
+          unless (@id_pre = opts[:auto_id_prefix]) == '_'
+            # NOTE only need to set idprefix when lazy_ids is set since otherwise all IDs are explicit
+            @attributes['idprefix'] = @id_pre if @lazy_ids
+          end
+          unless (sep = opts[:auto_id_separator] || '-') == '_'
+            # NOTE only need to set idseparator when lazy_ids is set since otherwise all IDs are explicit
+            @attributes['idseparator'] = sep if @lazy_ids
+          end
+        else
+          @id_pre = @attributes['idprefix'] || '_'
+          sep = @attributes['idseparator']
+        end
+        if sep
+          sep_replace = (sep = sep.chr) == '-' || sep == '.' ? ' .-' : %( #{sep}.-) unless sep.empty?
+        else
+          sep, sep_replace = '_', ' _.-'
+        end
+        @id_sep = sep
+        @id_sep_replace = sep_replace
+      end
+      @ids_seen = {}
       @auto_links = opts.fetch :auto_links, true
       @heading_offset = opts[:heading_offset] || 0
       @imagesdir = opts[:imagesdir] || @attributes['imagesdir']
@@ -132,6 +158,7 @@ module Kramdown; module AsciiDoc
     def convert_heading el, opts
       (writer = opts[:writer]).start_block
       level = el.options[:level] + @heading_offset
+      attrs = []
       style = []
       # Q: should writer track last heading level?
       if (discrete = @current_heading_level && level > @current_heading_level + 1)
@@ -145,23 +172,34 @@ module Kramdown; module AsciiDoc
       end
       if (child_i = to_element el.children[0]).type == :html_element && child_i.value == 'a' && (id = child_i.attr['id'])
         el = clone el, children: child_i.children + (el.children.drop 1)
-        style << %(##{id})
+        unless @lazy_ids && id == (generate_unique_id (extract_raw_text el), false)
+          (id.include? '.') ? (attrs << %(id=#{id})) : (style << %(##{id}))
+        end
+        record_id id
       elsif (id = el.attr['id'])
-        style << %(##{id})
+        # NOTE no need to check for '.' in this case since it's not recognized as a valid ID character by kramdown
+        style << %(##{id}) unless @lazy_ids && id == (generate_unique_id (extract_raw_text el), false)
+        record_id id
+      elsif @auto_ids
+        unless @lazy_ids
+          ((id = generate_unique_id (extract_raw_text el)).include? '.') ? (attrs << %(id=#{id})) : (style << %(##{id}))
+        end
       end
       if (role = el.attr['class'])
         style << %(.#{role.tr ' ', '.'})
       end
-      lines = []
-      lines << %([#{style.join}]) unless style.empty?
-      # NOTE kramdown removes newlines from heading
-      lines << %(#{'=' * level} #{compose_text el, strip: true})
+      attrs.unshift style.join unless style.empty?
+      attrlist = %([#{attrs.join ','}]) unless attrs.empty?
+      # NOTE kramdown has already removed newlines
+      title = compose_text el, strip: true
       if level == 1 && writer.empty? && @current_heading_level != 1
-        writer.header.push(*lines)
+        writer.add_prologue_line attrlist if attrlist
+        writer.doctitle = title
         nil
       else
         @attributes['doctype'] = 'book' if level == 1
-        writer.add_lines lines
+        writer.add_line attrlist if attrlist
+        writer.add_line %(#{'=' * level} #{title})
       end
       @current_heading_level = level unless discrete
       nil
@@ -241,12 +279,12 @@ module Kramdown; module AsciiDoc
         writer.add_line '----'
         writer.add_lines lines
         writer.add_line '----'
-      elsif !prompt && (lines.include? '')
+      elsif !prompt && ((lines.include? '') || (ListMarkerRx.match? lines[0]))
         writer.add_line '....'
         writer.add_lines lines
         writer.add_line '....'
       else
-        # NOTE clear the list continuation
+        # NOTE clear the list continuation as it isn't required
         writer.clear_line if writer.current_line == '+'
         writer.add_line lines.map {|l| %( #{l}) }
       end
@@ -254,14 +292,16 @@ module Kramdown; module AsciiDoc
 
     def convert_img el, opts
       if (parent = opts[:parent]).type == :p && parent.children.size == 1
+        attrs = []
         style = []
         if (id = el.attr['id'])
-          style << %(##{id})
+          (id.include? '.') ? (attrs << %(id=#{id})) : (style << %(##{id}))
         end
         if (role = el.attr['class'])
           style << %(.#{role.tr ' ', '.'})
         end
-        block_attributes_line = %([#{style.join}]) unless style.empty?
+        attrs.unshift style.join unless style.empty?
+        attrlist = %([#{attrs.join ','}]) unless attrs.empty?
         block = true
       end
       macro_attrs = [nil]
@@ -288,7 +328,7 @@ module Kramdown; module AsciiDoc
       writer = opts[:writer]
       if block
         writer.start_block
-        writer.add_line block_attributes_line if block_attributes_line
+        writer.add_line attrlist if attrlist
         writer.add_line %(image::#{src}[#{macro_attrs.join ','}])
       else
         writer.append %(image:#{src}[#{macro_attrs.join ','}])
@@ -608,12 +648,14 @@ module Kramdown; module AsciiDoc
       end
     end
 
+    private
+
     def extract_prologue el, opts
       if (child_i = to_element (children = el.children)[0]).type == :xml_comment
         (prologue_el = el.dup).children = children.take_while {|child| child.type == :xml_comment || child.type == :blank }
         (el = el.dup).children = children.drop prologue_el.children.size
         traverse prologue_el, (opts.merge writer: (prologue_writer = Writer.new))
-        opts[:writer].header.push(*prologue_writer.body)
+        opts[:writer].add_prologue_lines prologue_writer.body
       end
       el
     end
@@ -694,6 +736,47 @@ module Kramdown; module AsciiDoc
         result.join LF
       end
     end
+
+    def extract_raw_text node
+      node.children.reduce([]) {|accum, child| mine_text child, accum }.join
+    end
+
+    def mine_text node, accum
+      case node.type
+      when :text
+        accum << node.value
+      when :entity
+        accum << node.options[:original]
+      else
+        node.children.each {|child| mine_text child, accum }
+      end
+      accum
+    end
+
+    def generate_id str
+      id = %(#{pre = @id_pre}#{str.downcase.gsub InvalidIdCharsRx, ''})
+      if (sep_replace = @id_sep_replace)
+        id = id.tr_s sep_replace, (sep = @id_sep)
+        id = id.chop if id.end_with? sep
+        id = id.slice 1, id.length if pre.empty? && (id.start_with? sep)
+      else
+        id = id.delete ' '
+      end
+      id
+    end
+
+    def generate_unique_id str, record = true
+      id = generate_id str
+      if (seen_idx = @ids_seen[id])
+        id = %(#{id}#{@id_sep}#{seen_idx += 1})
+      end
+      record_id id, seen_idx if record
+      id
+    end
+
+    def record_id id, idx = nil
+      @ids_seen[id] = idx || UNIQUE_ID_START_INDEX
+    end
   end
 end; end