asciidoctor 1.5.2 → 1.5.3

data/test/test_helper.rb

@@ -10,7 +10,12 @@ require 'simplecov' if ENV['COVERAGE'] == 'true'
 
 require File.join(ASCIIDOCTOR_PROJECT_DIR, 'lib', 'asciidoctor')
 
-require 'minitest/autorun'
+# NOTE we require minitest libraries explicitly to avoid a superfluous warning
+require 'minitest/unit'
+require 'minitest/spec'
+require 'minitest/mock'
+MiniTest::Unit.autorun
+
 require 'socket'
 require 'nokogiri'
 require 'tmpdir'
@@ -180,7 +185,7 @@ class Minitest::Test
     else
       # this is required because nokogiri is ignorant
       result = document_from_string(src, opts).render
-      result = result.sub(RE_XMLNS_ATTRIBUTE, '')
+      result = result.sub(RE_XMLNS_ATTRIBUTE, '') if result
       result
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Dan Allen
@@ -13,8 +13,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2015-10-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: asciimath
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
@@ -212,8 +226,6 @@ files:
 - LICENSE.adoc
 - README.adoc
 - Rakefile
-- benchmark/benchmark.rb
-- benchmark/sample-data/mdbasics.adoc
 - bin/asciidoctor
 - bin/asciidoctor-safe
 - compat/asciidoc.conf
@@ -241,6 +253,7 @@ files:
 - lib/asciidoctor/converter/docbook5.rb
 - lib/asciidoctor/converter/factory.rb
 - lib/asciidoctor/converter/html5.rb
+- lib/asciidoctor/converter/manpage.rb
 - lib/asciidoctor/converter/template.rb
 - lib/asciidoctor/core_ext.rb
 - lib/asciidoctor/core_ext/object/nil_or_empty.rb
@@ -251,11 +264,6 @@ files:
 - lib/asciidoctor/helpers.rb
 - lib/asciidoctor/inline.rb
 - lib/asciidoctor/list.rb
-- lib/asciidoctor/opal_ext.rb
-- lib/asciidoctor/opal_ext/comparable.rb
-- lib/asciidoctor/opal_ext/dir.rb
-- lib/asciidoctor/opal_ext/error.rb
-- lib/asciidoctor/opal_ext/file.rb
 - lib/asciidoctor/parser.rb
 - lib/asciidoctor/path_resolver.rb
 - lib/asciidoctor/reader.rb
@@ -280,6 +288,7 @@ files:
 - test/fixtures/basic.asciidoc
 - test/fixtures/chapter-a.adoc
 - test/fixtures/child-include.adoc
+- test/fixtures/circle.svg
 - test/fixtures/custom-backends/erb/html5/block_paragraph.html.erb
 - test/fixtures/custom-backends/haml/docbook45/block_paragraph.xml.haml
 - test/fixtures/custom-backends/haml/html5-tweaks/block_paragraph.html.haml
@@ -305,6 +314,8 @@ files:
 - test/fixtures/parent-include.adoc
 - test/fixtures/sample.asciidoc
 - test/fixtures/stylesheets/custom.css
+- test/fixtures/subs-docinfo.html
+- test/fixtures/subs.adoc
 - test/fixtures/tip.gif
 - test/invoker_test.rb
 - test/links_test.rb
@@ -340,8 +351,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: asciidoctor
-rubygems_version: 2.2.2
+rubyforge_project: 
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: An implementation of the AsciiDoc text processor and publishing toolchain

data/benchmark/benchmark.rb

@@ -1,129 +0,0 @@
-#!/usr/bin/env ruby
-
-=begin
-
-Use this script to monitor changes in performance when making code changes to Asciidoctor.
-
- $ ruby benchmark.rb <benchmark-name> <repeat>
-
-The most common benchmark is the userguide-loop.
-It will download the AsciiDoc User Guide automatically the first time, then convert it in memory.
-Running it 10 times provides a good picture.
-
- $ ruby benchmark.rb userguide-loop 10
-
-Only worry about the relative change to the numbers before and after the code change.
-Absolute times are highly dependent on the capabilities of the machine the the version of Ruby.
-
-To get the best results under MRI, tune Ruby using environment variables as follows:
-
-.Ruby < 2.1
- $ RUBY_GC_MALLOC_LIMIT=90000000 RUBY_FREE_MIN=650000 ruby benchmark.rb userguide-loop 10
-
-.Ruby >= 2.1
- $ RUBY_GC_MALLOC_LIMIT=128000000 RUBY_GC_OLDMALLOC_LIMIT=128000000 RUBY_GC_HEAP_INIT_SLOTS=800000 RUBY_GC_HEAP_FREE_SLOTS=800000 RUBY_GC_HEAP_GROWTH_MAX_SLOTS=250000 RUBY_GC_HEAP_GROWTH_FACTOR=2 ruby benchmark.rb userguide-loop 10
-
-Asciidoctor starts with ~ 12,500 objects, adds ~ 300,000 each run, so tune RUBY_GC_HEAP_* accordingly
-
-See http://globaldev.co.uk/2014/05/ruby-2-1-in-detail/#gc-tuning-environment-variables
-
-Execute Ruby using the `--disable=gems` flag to speed up the initial load time, as shown below:
-
- $ ruby --disable=gems ...
-
-=end
-
-require 'benchmark'
-include Benchmark
-
-bench = ARGV[0]
-$repeat = ARGV[1].to_i || 10000
-
-if bench.nil?
-  raise 'You must specify a benchmark to run.'
-end
-
-def fetch_userguide
-  require 'open-uri'
-  userguide_uri = 'https://raw.githubusercontent.com/asciidoc/asciidoc/d43faae38c4a8bf366dcba545971da99f2b2d625/doc/asciidoc.txt'
-  customers_uri = 'https://raw.githubusercontent.com/asciidoc/asciidoc/d43faae38c4a8bf366dcba545971da99f2b2d625/doc/customers.csv'
-  userguide_content = open(userguide_uri) {|fd2| fd2.read }
-  customers_content = open(customers_uri) {|fd2| fd2.read }
-  File.open('sample-data/userguide.adoc', 'w') {|fd1| fd1.write userguide_content }
-  File.open('sample-data/customers.csv', 'w') {|fd1| fd1.write customers_content }
-end
-
-case bench
-
-=begin
-# benchmark template
-
-when 'name'
-
-  sample = 'value'
-
-  Benchmark.bmbm(12) {|bm|
-    bm.report('operation a') { $repeat.times { call_a_on sample } }
-    bm.report('operation b') { $repeat.times { call_b_on sample } }
-  }
-=end
-
-when 'userguide'
-  require '../lib/asciidoctor.rb'
-  Asciidoctor::Compliance.markdown_syntax = false
-  Asciidoctor::Compliance.shorthand_property_syntax = false if Asciidoctor::VERSION > '0.1.4'
-  sample_file = ENV['BENCH_TEST_FILE'] || 'sample-data/userguide.adoc'
-  backend = ENV['BENCH_BACKEND'] || 'html5'
-  fetch_userguide if sample_file == 'sample-data/userguide.adoc' && !(File.exist? sample_file)
-  result = Benchmark.bmbm {|bm|
-    bm.report(%(Convert #{sample_file} (x#{$repeat}))) {
-      $repeat.times {
-        Asciidoctor.render_file sample_file, :backend => backend, :safe => Asciidoctor::SafeMode::SAFE, :eruby => 'erubis', :header_footer => true, :to_file => false, :attributes => {'linkcss' => '', 'toc' => nil, 'numbered' => nil, 'icons' => nil, 'compat-mode' => 'legacy'}
-      }
-    }
-  }
-  # prints average for real run
-  puts %(>avg: #{result.first.real / $repeat})
-
-when 'userguide-loop'
-  require '../lib/asciidoctor.rb'
-  GC.start
-  Asciidoctor::Compliance.markdown_syntax = false
-  Asciidoctor::Compliance.shorthand_property_syntax = false if Asciidoctor::VERSION > '0.1.4'
-  sample_file = ENV['BENCH_TEST_FILE'] || 'sample-data/userguide.adoc'
-  backend = ENV['BENCH_BACKEND'] || 'html5'
-  fetch_userguide if sample_file == 'sample-data/userguide.adoc' && !(File.exist? sample_file)
-
-  best = nil
-  2.times.each do
-    outer_start = Time.now
-    (1..$repeat).each do
-      inner_start = Time.now
-      Asciidoctor.render_file sample_file, :backend => backend, :safe => Asciidoctor::SafeMode::SAFE, :eruby => 'erubis', :header_footer => true, :to_file => false, :attributes => {'linkcss' => '', 'toc' => nil, 'numbered' => nil, 'icons' => nil, 'compat-mode' => 'legacy'}
-      puts (elapsed = Time.now - inner_start)
-      best = (best ? [best, elapsed].min : elapsed)
-    end
-    puts %(Run Total: #{Time.now - outer_start})
-  end
-  puts %(Best Time: #{best})
-
-when 'mdbasics-loop'
-  require '../lib/asciidoctor.rb'
-  GC.start
-  sample_file = ENV['BENCH_TEST_FILE'] || 'sample-data/userguide.adoc'
-  backend = ENV['BENCH_BACKEND'] || 'html5'
-
-  best = nil
-  2.times do
-    outer_start = Time.now
-    (1..$repeat).each do
-      inner_start = Time.now
-      Asciidoctor.render_file sample_file, :backend => backend, :safe => Asciidoctor::SafeMode::SAFE, :header_footer => false, :to_file => false, :attributes => {'linkcss' => '', 'idprefix' => '', 'idseparator' => '-', 'showtitle' => ''}
-      puts (elapsed = Time.now - inner_start)
-      best = (best ? [best, elapsed].min : elapsed)
-    end
-    puts %(Run Total: #{Time.now - outer_start})
-  end
-  puts %(Best Time: #{best})
-
-end

data/benchmark/sample-data/mdbasics.adoc

@@ -1,334 +0,0 @@
-// converted to AsciiDoc from https://github.com/gettalong/kramdown/blob/master/benchmark/mdbasics.text
-# Markdown: Basics
-John Gruber
-:s: link:/projects/markdown/syntax
-:d: link:/projects/markdown/dingus
-:src: link:/projects/markdown/basics.text
-
-++++
-<ul id="ProjectSubmenu">
-    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
-    <li><a class="selected" title="Markdown Basics">Basics</a></li>
-    <li><a href="/projects/markdown/syntax" title="Markdown Syntax Documentation">Syntax</a></li>
-    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
-    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-++++
-
-## Getting the Gist of Markdown's Formatting Syntax
-
-This page offers a brief overview of what it's like to use Markdown.
-The {s}[syntax page] provides complete, detailed documentation for
-every feature, but Markdown should be very easy to pick up simply by
-looking at a few examples of it in action. The examples on this page
-are written in a before/after style, showing example syntax and the
-HTML output produced by Markdown.
-
-It's also helpful to simply try Markdown out; the {d}[Dingus] is a
-web application that allows you type your own Markdown-formatted text
-and translate it to XHTML.
-
-NOTE: This document is itself written using Markdown; you
-can {src}[see the source for it by adding \'.text' to the URL].
-
-### Paragraphs, Headers, Blockquotes
-
-A paragraph is simply one or more consecutive lines of text, separated
-by one or more blank lines. (A blank line is any line that looks like a
-blank line -- a line containing nothing spaces or tabs is considered
-blank.) Normal paragraphs should not be intended with spaces or tabs.
-
-Markdown offers two styles of headers: _Setext_ and _atx_.
-Setext-style headers for +<h1>+ and +<h2>+ are created by
-"underlining" with equal signs (+=+) and hyphens (+-+), respectively.
-To create an atx-style header, you put 1-6 hash marks (+#+) at the
-beginning of the line -- the number of hashes equals the resulting
-HTML header level.
-
-Blockquotes are indicated using email-style \'+>+' angle brackets.
-
-.Markdown:
-[listing]
-....
-A First Level Header
-====================
-
-A Second Level Header
----------------------
-
-Now is the time for all good men to come to
-the aid of their country. This is just a
-regular paragraph.
-
-The quick brown fox jumped over the lazy
-dog's back.
-
-### Header 3
-
-> This is a blockquote.
-> 
-> This is the second paragraph in the blockquote.
->
-> ## This is an H2 in a blockquote
-....
-
-.Output:
-....
-<h1>A First Level Header</h1>
-
-<h2>A Second Level Header</h2>
-
-<p>Now is the time for all good men to come to
-the aid of their country. This is just a
-regular paragraph.</p>
-
-<p>The quick brown fox jumped over the lazy
-dog's back.</p>
-
-<h3>Header 3</h3>
-
-<blockquote>
-    <p>This is a blockquote.</p>
-    
-    <p>This is the second paragraph in the blockquote.</p>
-    
-    <h2>This is an H2 in a blockquote</h2>
-</blockquote>
-....
-
-### Phrase Emphasis
-
-Markdown uses asterisks and underscores to indicate spans of emphasis.
-
-.Markdown:
-----
-Some of these words *are emphasized*.
-Some of these words _are emphasized also_.
-
-Use two asterisks for **strong emphasis**.
-Or, if you prefer, __use two underscores instead__.
-----
-
-.Output:
-....
-<p>Some of these words <em>are emphasized</em>.
-Some of these words <em>are emphasized also</em>.</p>
-
-<p>Use two asterisks for <strong>strong emphasis</strong>.
-Or, if you prefer, <strong>use two underscores instead</strong>.</p>
-....
-
-### Lists
-
-Unordered (bulleted) lists use asterisks, pluses, and hyphens (+*+,
-+++, and +-+) as list markers. These three markers are
-interchangable; this:
-
-----
-*   Candy.
-*   Gum.
-*   Booze.
-----
-
-this:
-
-----
-+   Candy.
-+   Gum.
-+   Booze.
-----
-
-and this:
-
-----
--   Candy.
--   Gum.
--   Booze.
-----
-
-all produce the same output:
-
-....
-<ul>
-<li>Candy.</li>
-<li>Gum.</li>
-<li>Booze.</li>
-</ul>
-....
-
-Ordered (numbered) lists use regular numbers, followed by periods, as
-list markers:
-
-----
-1.  Red
-2.  Green
-3.  Blue
-----
-
-.Output:
-....
-<ol>
-<li>Red</li>
-<li>Green</li>
-<li>Blue</li>
-</ol>
-....
-
-If you put blank lines between items, you'll get +<p>+ tags for the
-list item text. You can create multi-paragraph list items by indenting
-the paragraphs by 4 spaces or 1 tab:
-
-----
-*   A list item.
-
-    With multiple paragraphs.
-
-*   Another item in the list.
-----
-
-.Output:
-....
-<ul>
-<li><p>A list item.</p>
-<p>With multiple paragraphs.</p></li>
-<li><p>Another item in the list.</p></li>
-</ul>
-....
-
-### Links
-
-Markdown supports two styles for creating links: _inline_ and
-_reference_. With both styles, you use square brackets to delimit the
-text you want to turn into a link.
-
-Inline-style links use parentheses immediately after the link text.
-For example:
-
-----
-This is an [example link](http://example.com/).
-----
-
-.Output:
-....
-<p>This is an <a href="http://example.com/">
-example link</a>.</p>
-....
-
-Optionally, you may include a title attribute in the parentheses:
-
-----
-This is an [example link](http://example.com/ "With a Title").
-----
-
-.Output:
-....
-<p>This is an <a href="http://example.com/" title="With a Title">
-example link</a>.</p>
-....
-
-Reference-style links allow you to refer to your links by names, which
-you define elsewhere in your document:
-
-----
-I get 10 times more traffic from [Google][1] than from
-[Yahoo][2] or [MSN][3].
-
-[1]: http://google.com/        "Google"
-[2]: http://search.yahoo.com/  "Yahoo Search"
-[3]: http://search.msn.com/    "MSN Search"
-----
-
-.Output:
-....
-<p>I get 10 times more traffic from <a href="http://google.com/"
-title="Google">Google</a> than from <a href="http://search.yahoo.com/"
-title="Yahoo Search">Yahoo</a> or <a href="http://search.msn.com/"
-title="MSN Search">MSN</a>.</p>
-....
-
-The title attribute is optional. Link names may contain letters,
-numbers and spaces, but are _not_ case sensitive:
-
-----
-I start my morning with a cup of coffee and
-[The New York Times][NY Times].
-
-[ny times]: http://www.nytimes.com/
-----
-
-.Output:
-....
-<p>I start my morning with a cup of coffee and
-<a href="http://www.nytimes.com/">The New York Times</a>.</p>
-....
-
-### Images
-
-Image syntax is very much like link syntax.
-
-.Inline (titles are optional):
-----
-![alt text](/path/to/img.jpg "Title")
-----
-
-.Reference-style:
-----
-![alt text][id]
-
-[id]: /path/to/img.jpg "Title"
-----
-
-Both of the above examples produce the same output:
-
-....
-<img src="/path/to/img.jpg" alt="alt text" title="Title" />
-....
-
-### Code
-
-In a regular paragraph, you can create code span by wrapping text in
-backtick quotes. Any ampersands (+&+) and angle brackets (+<+ or
-+>+) will automatically be translated into HTML entities. This makes
-it easy to use Markdown to write about HTML example code:
-
-----
-I strongly recommend against using any `<blink>` tags.
-
-I wish SmartyPants used named entities like `&mdash;`
-instead of decimal-encoded entites like `&#8212;`.
-----
-
-.Output:
-....
-<p>I strongly recommend against using any
-<code>&lt;blink&gt;</code> tags.</p>
-
-<p>I wish SmartyPants used named entities like
-<code>&amp;mdash;</code> instead of decimal-encoded
-entites like <code>&amp;#8212;</code>.</p>
-....
-
-To specify an entire block of pre-formatted code, indent every line of
-the block by 4 spaces or 1 tab. Just like with code spans, +&+, +<+,
-and +>+ characters will be escaped automatically.
-
-.Markdown:
-----
-If you want your page to validate under XHTML 1.0 Strict,
-you've got to put paragraph tags in your blockquotes:
-
-    <blockquote>
-        <p>For example.</p>
-    </blockquote>
-----
-
-.Output:
-....
-<p>If you want your page to validate under XHTML 1.0 Strict,
-you've got to put paragraph tags in your blockquotes:</p>
-
-<pre><code>&lt;blockquote&gt;
-    &lt;p&gt;For example.&lt;/p&gt;
-&lt;/blockquote&gt;
-</code></pre>
-....