asciidoctor 0.0.1 → 0.0.2

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) Tom Preston-Werner
+Copyright (c) Ryan Waldron
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,69 +1,150 @@
-RakeGem
-=======
+Asciidoctor
+===========
 
-# DESCRIPTION
+Asciidoctor is a pure-ruby processor for turning
+[Asciidoc](http://www.methods.co.nz/asciidoc/index.html) documents
+into HTML (and, eventually, other formats perhaps).
 
-Ever wanted to manage your RubyGem in a sane way without having to resort to
-external dependencies like Jeweler or Hoe? Ever thought that Rake and a hand
-crafted gemspec should be enough to deal with these problems? If so, then
-RakeGem is here to make your life awesome!
+Currently, asciidoctor uses some simple built-in ERB templates to
+style the output in a way tht roughly matches the default HTML output
+of the native Python processor.
 
-RakeGem is not a library. It is just a few simple file templates that you can
-copy into your project and easily customize to match your specific needs. It
-ships with a few Rake tasks to help you keep your gemspec up-to-date, build
-a gem, and release your library and gem to the world.
+Asciidoctor currently works with Ruby 1.8.7 and 1.9.3, though I don't
+know of any reason it shouldn't work with more exotic Ruby versions,
+and would welcome help in testing that out.
 
-RakeGem assumes you are using Git. This makes the Rake tasks easy to write. If
-you are using something else, you should be able to get RakeGem up and running
-with your system without too much editing.
+The initial code on which asciidoctor is based was from the Git SCM
+site repo, [gitscm-next](https://github.com/github/gitscm-next).
 
-The RakeGem tasks were inspired by the
-[Sinatra](http://github.com/sinatra/sinatra) project.
+# Installation
 
-# INSTALLATION
+NOTE: This gem is very immature, and as yet only supports a small
+subset of Asciidoc features.  Thus, you should only use it if you have
+a high tolerance for bugs, failures, and generally bad and intemperate
+behavior.
 
-Take a look at `Rakefile` and `NAME.gemspec`. For new projects, you can start
-with these files and edit a few lines to make them fit into your library. If
-you have an existing project, you'll probably want to take the RakeGem
-versions and copy any custom stuff from your existing Rakefile and gemspec
-into them. As long as you're careful, the rake tasks should keep working.
+To install the gem:
 
-# ASSUMPTIONS
+    gem install 'asciidoctor'
 
-RakeGem makes a few assumptions. You will either need to satisfy these
-assumptions or modify the rake tasks to work with your setup.
+Or if you prefer bundler:
 
-You should have a file named `lib/NAME.rb` (where NAME is the name of your
-library) that contains a version line. It should look something like this:
+    bundle install 'asciidoctor'
 
-    module NAME
-      VERSION = '0.1.0'
-    end
-
-It is important that you use the constant `VERSION` and that it appear on a
-line by itself.
-
-# UPDATING THE VERSION
-
-In order to make a new release, you'll want to update the version. With
-RakeGem, you only need to do that in the `lib/NAME.rb` file. Everything else
-will use this find the canonical version of the library.
+# Usage
 
-# TASKS
+To render a file of Asciidoc-marked-up text to html
 
-RakeGem provides three rake tasks:
-
-`rake gemspec` will update your gemspec with the latest version (taken from
-the `lib/NAME.rb` file) and file list (as reported by `git ls-files`).
-
-`rake build` will update your gemspec, build your gemspec into a gem, and
-place it in the `pkg` directory.
-
-`rake release` will update your gemspec, build your gem, make a commit with
-the message `Release 0.1.0` (with the correct version, obviously), tag the
-commit with `v0.1.0` (again with the correct version), and push the `master`
-branch and new tag to `origin`.
+    lines = File.readlines("your_file.asc")
+    doc = Asciidoctor::Document.new(lines)
+    html = doc.render
+    File.open("your_file.html", "w+") do |file|
+      file.puts html
+    end
 
-Keep in mind that these are just simple Rake tasks and you can edit them
-however you please. Don't want to auto-commit or auto-push? Just delete those
-lines. You can bend RakeGem to your own needs. That's the whole point!
+Render an Asciidoc-formatted string
+
+    doc = Asciidoctor::Document.new("*This* is it.")
+    puts doc.render
+
+Asciidoctor allows you to override the default template used to render
+almost any individual Asciidoc elements. If you provide a directory of
+[Tilt](https://github.com/rtomayko/tilt)-compatible templates, named
+in a way Asciidoctor can figure out which template goes with which
+element, Asciidoctor will use the templates in this directory instead
+of its built-in templates for any elements for which it finds a
+matching template.  It will use its default templates for everything
+else.
+
+    doc = Asciidoctor::Document.new("*This* is it.", :template_dir => 'templates')
+    puts doc.render
+
+The Document and Section templates should begin with `document.` and
+`section.`, respectively. The file extension will depend on which
+Tilt-compatible format you've chosen. For ERB, they would be
+`document.html.erb` and `section.html.erb`, for instance.
+
+Specific elements, like a Paragraph or Anchor, would begin with
+`section_<element>.`. So to override the default Paragraph template
+with an ERB template you'd put a file called
+`section_paragraph.html.erb` in the template directory you pass in to
+`Document.new`.
+
+For more usage examples, see the test suite.
+
+## Contributing
+In the spirit of [free software][free-sw], **everyone** is encouraged to help
+improve this project.
+
+[free-sw]: http://www.fsf.org/licensing/essays/free-sw.html
+
+Here are some ways *you* can contribute:
+
+* by using alpha, beta, and prerelease versions
+* by reporting bugs
+* by suggesting new features
+* by writing or editing documentation
+* by writing specifications
+* by writing code (**no patch is too small**: fix typos, add comments, clean up
+  inconsistent whitespace)
+* by refactoring code
+* by fixing [issues][]
+* by reviewing patches
+
+[issues]: https://github.com/erebor/asciidoctor/issues
+
+## Submitting an Issue
+We use the [GitHub issue tracker][issues] to track bugs and
+features. Before submitting a bug report or feature request, check to
+make sure it hasn't already been submitted. When submitting a bug
+report, please include a [Gist][] that includes any details that may
+help reproduce the bug, including your gem version, Ruby version, and
+operating system.
+
+Most importantly, since asciidoctor is a text processor, reproducing
+most bugs requires that we have some snippet of text on which
+asciidoctor exhibits the bad behavior.
+
+An ideal bug report would include a pull request with failing
+specs.
+
+[gist]: https://gist.github.com/
+
+## Submitting a Pull Request
+1. [Fork the repository.][fork]
+2. [Create a topic branch.][branch]
+3. Add tests for your unimplemented feature or bug fix.
+4. Run `bundle exec rake`. If your tests pass, return to step 3.
+5. Implement your feature or bug fix.
+6. Run `bundle exec rake`. If your tests fail, return to step 5.
+7. Add documentation for your feature or bug fix.
+8. If your changes are not 100% documented, go back to step 7.
+9. Add, commit, and push your changes.
+10. [Submit a pull request.][pr]
+
+[fork]: http://help.github.com/fork-a-repo/
+[branch]: http://learn.github.com/p/branching.html
+[pr]: http://help.github.com/send-pull-requests/
+
+## Supported Ruby Versions
+This library aims to support the following Ruby implementations:
+
+* Ruby 1.8.7
+* Ruby 1.9.3
+
+If something doesn't work on one of these interpreters, it should be
+considered a bug.
+
+If you would like this library to support another Ruby version, you
+may volunteer to be a maintainer. Being a maintainer entails making
+sure all tests run and pass on that implementation. When something
+breaks on your implementation, you will be personally responsible for
+providing patches in a timely fashion. If critical issues for a
+particular implementation exist at the time of a major release,
+support for that Ruby version may be dropped.
+
+## Copyright
+Copyright (c) 2012 Ryan Waldron.
+See [LICENSE][] for details.
+
+[license]: https://github.com/erebor/asciidoctor/blob/master/LICENSE

data/asciidoctor.gemspec

@@ -13,14 +13,14 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'asciidoctor'
-  s.version           = '0.0.1'
-  s.date              = '2012-06-14'
+  s.version           = '0.0.2'
+  s.date              = '2012-08-03'
   s.rubyforge_project = 'asciidoctor'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
   s.summary     = "Pure Ruby Asciidoc to HTML rendering."
-  s.description = "Render all the AsciiDocs! The time, she is now, for all good renders."
+  s.description = "A pure Ruby processor to turn Asciidoc-formatted documents into HTML (and, eventually, other formats perhaps)."
 
   ## List the primary authors. If there are a bunch of authors, it's probably
   ## better to set the email to an email list or something. If you don't have
@@ -44,13 +44,14 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('json')
-  s.add_dependency('nokogiri')
+  s.add_dependency('tilt')
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
   s.add_development_dependency('mocha')
   s.add_development_dependency('nokogiri')
   s.add_development_dependency('htmlentities')
+  s.add_development_dependency('pending')
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE
@@ -67,21 +68,26 @@ Gem::Specification.new do |s|
     lib/asciidoctor/debug.rb
     lib/asciidoctor/document.rb
     lib/asciidoctor/errors.rb
+    lib/asciidoctor/lexer.rb
     lib/asciidoctor/list_item.rb
+    lib/asciidoctor/reader.rb
     lib/asciidoctor/render_templates.rb
     lib/asciidoctor/renderer.rb
     lib/asciidoctor/section.rb
     lib/asciidoctor/string.rb
     lib/asciidoctor/version.rb
     noof.rb
+    test/attributes_test.rb
     test/document_test.rb
     test/fixtures/asciidoc.txt
     test/fixtures/asciidoc_index.txt
     test/fixtures/ascshort.txt
     test/fixtures/list_elements.asciidoc
     test/headers_test.rb
+    test/lexer_test.rb
     test/list_elements_test.rb
     test/paragraphs_test.rb
+    test/reader_test.rb
     test/test_helper.rb
     test/text_test.rb
   ]

data/lib/asciidoctor.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'cgi'
 require 'erb'
+require 'tilt'
 
 $:.unshift(File.dirname(__FILE__))
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'vendor'))
@@ -40,6 +41,13 @@ module Asciidoctor
     # Foowhatevs [[Bar]]
     :anchor_embedded  => /^(.*)\[\[([^\]]+)\]\]\s*$/,
 
+    # +   Attribute values treat lines ending with ' +' as a continuation,
+    #     not a line-break as elsewhere in the document, where this is
+    #     a forced line break. This should be the same regexp as :line_break,
+    #     below, but it gets its own entry because readability ftw, even
+    #     though repeating regexps ftl.
+    :attr_continue    => /(.*)(?:^|\s)\+$/,
+
     # [[[Foo]]]  (does not suffer quite the same malady as :anchor, but almost. Allows [ but not ] in internal capture
     :biblio           => /\[\[\[([^\]]+)\]\]\]/,
 
@@ -52,11 +60,6 @@ module Asciidoctor
     # // (and then whatever)
     :comment          => /^\/\/\s/,
 
-    # +   Note that Asciidoc appears to allow continuations using + at
-    #     the end of the previous line and indenting
-    #     the following line (as in :lit_par)
-    :continue         => /^\+\s*$/,
-
     # foo::  ||  foo;;
     # Should be followed by a definition line, e.g.,
     # foo::
@@ -78,6 +81,23 @@ module Asciidoctor
     # ======  || ------ || ~~~~~~ || ^^^^^^ || ++++++
     :line             => /^([=\-~^\+])+\s*$/,
 
+    # +   From the Asciidoc User Guide: "A plus character preceded by at
+    #     least one space character at the end of a non-blank line forces
+    #     a line break. It generates a line break (br) tag for HTML outputs.
+    #
+    #     This is the correct regexp to match what the User Guide actually
+    #     says to do:
+    #     :line_break        => /^(.*(?:\S+)+.*)\s\+$/,
+    #
+    # But the regexp we're using (below), is what asciidoc *actually*
+    # does for HTML output, courtesy of the default html4.conf file (under
+    # the [replacements2] section).
+    #
+    # +      (would not match because there's no space before +)
+    #  +     (would match and capture '')
+    # Foo +  (would and capture 'Foo')
+    :line_break       => /^(.*)\s\+$/,
+
     # ----
     :listing          => /^\-{4,}\s*$/,
 
@@ -106,7 +126,7 @@ module Asciidoctor
     # ____
     :quote            => /^_{4,}\s*$/,
 
-    # ____
+    # ''''
     :ruler            => /^'{3,}\s*$/,
 
     # ****
@@ -120,7 +140,7 @@ module Asciidoctor
     :title            => /^\.([^\s\.].*)\s*$/,
 
     # * Foo  ||  - Foo
-    :ulist            => /^\s*([\*\-])\s+(.*)$/,
+    :ulist            => /^ \s* (- | \*{1,5}) \s+ (.*) $/x,
 
     # [verse]
     :verse            => /^\[verse\]\s*$/
@@ -139,11 +159,17 @@ module Asciidoctor
     'backtick'   => '`'
   )
 
+  HTML_ELEMENTS = {
+    'br-asciidoctor' => '<br/>'
+  }
+
   require 'asciidoctor/block'
   require 'asciidoctor/debug'
   require 'asciidoctor/document'
   require 'asciidoctor/errors'
+  require 'asciidoctor/lexer'
   require 'asciidoctor/list_item'
+  require 'asciidoctor/reader'
   require 'asciidoctor/render_templates'
   require 'asciidoctor/renderer'
   require 'asciidoctor/section'

data/lib/asciidoctor/block.rb

@@ -2,7 +2,7 @@
 #
 # Examples
 #
-#   block = Asciidoctor::Block.new(:paragraph, ["`This` is a <test>"])
+#   block = Asciidoctor::Block.new(document, :paragraph, ["`This` is a <test>"])
 #   block.content
 #   => ["<em>This</em> is a &lt;test&gt;"]
 class Asciidoctor::Block
@@ -18,6 +18,10 @@ class Asciidoctor::Block
   # Public: Get/Set the String section anchor name.
   attr_accessor :anchor
 
+  # Public: Get/Set the Integer block level (for nested elements, like
+  # list elements).
+  attr_accessor :level
+
   # Public: Get/Set the String block title.
   attr_accessor :title
 
@@ -29,6 +33,10 @@ class Asciidoctor::Block
   # parent  - The parent Asciidoc Object.
   # context - The Symbol context name for the type of content.
   # buffer  - The Array buffer of source data.
+
+  # TODO: Don't really need the parent, just the document (for access
+  # both to its renderer, as well as its references and other defined
+  # elements). Would probably be better to pass in just the document.
   def initialize(parent, context, buffer=nil)
     @parent = parent
     @context = context
@@ -39,13 +47,14 @@ class Asciidoctor::Block
 
   # Public: Get the Asciidoctor::Document instance to which this Block belongs
   def document
-    @parent.is_a?(Asciidoctor::Document) ? @parent : @parent.document
+    return @document if @document
+    @document = (@parent.is_a?(Asciidoctor::Document) ? @parent : @parent.document)
   end
 
   # Public: Get the Asciidoctor::Renderer instance being used for the ancestor
   # Asciidoctor::Document instance.
   def renderer
-    @parent.renderer
+    document.renderer
   end
 
   # Public: Get the rendered String content for this Block.  If the block
@@ -59,21 +68,69 @@ class Asciidoctor::Block
     renderer.render("section_#{context}", self)
   end
 
+  def splain(parent_level = 0)
+    parent_level += 1
+    Asciidoctor.puts_indented(parent_level, "Block title: #{title}") unless self.title.nil?
+    Asciidoctor.puts_indented(parent_level, "Block anchor: #{anchor}") unless self.anchor.nil?
+    Asciidoctor.puts_indented(parent_level, "Block caption: #{caption}") unless self.caption.nil?
+    Asciidoctor.puts_indented(parent_level, "Block level: #{level}") unless self.level.nil?
+    Asciidoctor.puts_indented(parent_level, "Block context: #{context}") unless self.context.nil?
+
+    Asciidoctor.puts_indented(parent_level, "Blocks: #{@blocks.count}")
+
+    if buffer.is_a? Enumerable
+      buffer.each_with_index do |buf, i|
+        Asciidoctor.puts_indented(parent_level, "v" * (60 - parent_level*2))
+        Asciidoctor.puts_indented(parent_level, "Buffer ##{i} is a #{buf.class}")
+        Asciidoctor.puts_indented(parent_level, "Name is #{buf.name rescue 'n/a'}")
+
+        if buf.respond_to? :splain
+          buf.splain(parent_level)
+        else
+          Asciidoctor.puts_indented(parent_level, "Buffer: #{buf}")
+        end
+        Asciidoctor.puts_indented(parent_level, "^" * (60 - parent_level*2))
+      end
+    else
+      if buffer.respond_to? :splain
+        buffer.splain(parent_level)
+      else
+        Asciidoctor.puts_indented(parent_level, "Buffer: #{@buffer}")
+      end
+    end
+
+    @blocks.each_with_index do |block, i|
+      Asciidoctor.puts_indented(parent_level, "v" * (60 - parent_level*2))
+      Asciidoctor.puts_indented(parent_level, "Block ##{i} is a #{block.class}")
+      Asciidoctor.puts_indented(parent_level, "Name is #{block.name rescue 'n/a'}")
+
+      block.splain(parent_level) if block.respond_to? :splain
+      Asciidoctor.puts_indented(parent_level, "^" * (60 - parent_level*2))
+    end
+    nil
+  end
+
   # Public: Get an HTML-ified version of the source buffer, with special
   # Asciidoc characters and entities converted to their HTML equivalents.
   #
   # Examples
   #
-  #   block = Asciidoctor::Block.new(:paragraph, ['`This` is what happens when you <meet> a stranger in the <alps>!'])
+  #   doc = Asciidoctor::Document.new([])
+  #   block = Asciidoctor::Block.new(doc, :paragraph,
+  #             ['`This` is what happens when you <meet> a stranger in the <alps>!'])
   #   block.content
   #   => ["<em>This</em> is what happens when you &lt;meet&gt; a stranger in the &lt;alps&gt;!"]
   #
   # TODO:
-  # * forced line breaks
+  # * forced line breaks (partly done, at least in regular paragraphs)
   # * bold, mono
   # * double/single quotes
   # * super/sub script
   def content
+
+    Asciidoctor.debug "For the record, buffer is:"
+    Asciidoctor.debug @buffer.inspect
+
     case @context
     when :dlist
       @buffer.map do |dt, dd|
@@ -93,21 +150,106 @@ class Asciidoctor::Block
       end
     when :oblock, :quote
       blocks.map{|block| block.render}.join
-    when :olist, :ulist, :colist
+    when :olist, :colist
       @buffer.map do |li|
         htmlify(li.content) + li.blocks.map{|block| block.render}.join
       end
+    when :ulist
+      @buffer.map do |element|
+        if element.is_a? Asciidoctor::ListItem
+          element.content = sub_attributes(element.content)
+        end
+        # TODO - not sure why tests work the same whether or not this is commented out.
+        # I think that I am likely not yet testing unordered list items with no block
+        # content. Still and all, it seems like this should be all done by list_item.render .
+        element.render # + element.blocks.map{|block| block.render}.join
+      end
     when :listing
       @buffer.map{|l| CGI.escapeHTML(l).gsub(/(<\d+>)/,'<b>\1</b>')}.join
     when :literal
       htmlify( @buffer.join.gsub( '*', '{asterisk}' ).gsub( '\'', '{apostrophe}' ))
     when :verse
-      htmlify( @buffer.map{ |l| l.strip }.join( "\n" ) )
+      htmlify( sub_attributes(@buffer).map{ |l| l.strip }.join( "\n" ) )
     else
-      htmlify( @buffer.map{ |l| l.lstrip }.join )
+      lines = sub_attributes(@buffer).map do |line|
+        line.strip
+        line.gsub(Asciidoctor::REGEXP[:line_break], '\1{br-asciidoctor}')
+      end
+      lines = htmlify( lines.join )
+      sub_html_attributes(lines)  # got to clean up the br-asciidoctor line-break
     end
   end
 
+  # Attribute substitution
+  #
+  # TODO: Tom all the docs
+  def sub_attributes(lines)
+    Asciidoctor.debug "Entering #{__method__} from #{caller[0]}"
+    if lines.is_a? String
+      return_string = true
+      lines = Array(lines)
+    end
+
+    result = lines.map do |line|
+      Asciidoctor.debug "#{__method__} -> Processing line: #{line}"
+      # gsub! doesn't have lookbehind, so we have to capture and re-insert
+      f = line.gsub(/ (^|[^\\]) \{ (\w[\w\-_]+\w) \} /x) do
+        if self.document.defines.has_key?($2)
+          # Substitute from user defines first
+          $1 + self.document.defines[$2]
+        elsif Asciidoctor::INTRINSICS.has_key?($2)
+          # Then do intrinsics
+          $1 + Asciidoctor::INTRINSICS[$2]
+        elsif Asciidoctor::HTML_ELEMENTS.has_key?($2)
+          $1 + Asciidoctor::HTML_ELEMENTS[$2]
+        else
+          Asciidoctor.debug "Bailing on key: #{$2}"
+          # delete the line if it has a bad attribute
+          # TODO: According to AsciiDoc, we're supposed to delete any line
+          # containing a bad attribute. Eek! Can't do that here via gsub!.
+          # (See `subs_attrs` function in asciidoc.py for many gory details.)
+          "{ZZZZZ}"
+        end
+      end
+      Asciidoctor.debug "#{__method__} -> Processed line: #{f}"
+      f
+    end
+    Asciidoctor.debug "#{__method__} -> result looks like #{result.inspect}"
+    result.reject! {|l| l =~ /\{ZZZZZ\}/}
+
+    if return_string
+      result = result.join
+    end
+    result
+  end
+
+  def sub_html_attributes(lines)
+    Asciidoctor.debug "Entering #{__method__} from #{caller[0]}"
+    if lines.is_a? String
+      return_string = true
+      lines = Array(lines)
+    end
+
+    result = lines.map do |line|
+      Asciidoctor.debug "#{__method__} -> Processing line: #{line}"
+      # gsub! doesn't have lookbehind, so we have to capture and re-insert
+      line.gsub(/ (^|[^\\]) \{ (\w[\w\-_]+\w) \} /x) do
+        if Asciidoctor::HTML_ELEMENTS.has_key?($2)
+          $1 + Asciidoctor::HTML_ELEMENTS[$2]
+        else
+          $1 + "{#{$2}}"
+        end
+      end
+    end
+    Asciidoctor.debug "#{__method__} -> result looks like #{result.inspect}"
+    result.reject! {|l| l =~ /\{ZZZZZ\}/}
+
+    if return_string
+      result = result.join
+    end
+    result
+  end
+
   private
 
   # Private: Return a String HTML version of the source string, with
@@ -143,8 +285,16 @@ class Asciidoctor::Block
       html = CGI.escapeHTML(html)
       html.gsub!(Asciidoctor::REGEXP[:biblio], '<a name="\1">[\1]</a>')
       html.gsub!(Asciidoctor::REGEXP[:ruler], '<hr>\n')
-      html.gsub!(/``(.*?)''/m, '&ldquo;\1&rdquo;')
-      html.gsub!(/`(.*?)'/m, '&lsquo;\1&rsquo;')
+      html.gsub!(/``([^`']*)''/m, '&ldquo;\1&rdquo;')
+      html.gsub!(/(?:\s|^)`([^`']*)'/m, '&lsquo;\1&rsquo;')
+
+      # TODO: This text thus quoted is supposed to be rendered as an
+      # "inline literal passthrough", meaning that it is rendered
+      # in a monospace font, but also doesn't go through any further
+      # text substitution, except for special character substitution.
+      # So we need to technically pull this text out, sha it and store
+      # a marker and replace it after the other gsub!s are done in here.
+      # See:  http://www.methods.co.nz/asciidoc/userguide.html#X80
       html.gsub!(/`([^`]+)`/m) { "<tt>#{$1.gsub( '*', '{asterisk}' ).gsub( '\'', '{apostrophe}' )}</tt>" }
       html.gsub!(/([\s\W])#(.+?)#([\s\W])/, '\1\2\3')
 
@@ -164,23 +314,10 @@ class Asciidoctor::Block
       html.gsub!(/([\s\W])\^([^\^]+)\^([\s\W])/m, '\1<sup>\2</sup>\3')
       html.gsub!(/([\s\W])\~([^\~]+)\~([\s\W])/m, '\1<sub>\2</sub>\3')
 
-      # Don't have lookbehind so have to capture and re-insert
-      html.gsub!(/(^|[^\\])\{(\w[\w\-]+\w)\}/) do
-        if self.document.defines.has_key?($2)
-          # Substitute from user defines first
-          $1 + self.document.defines[$2]
-        elsif Asciidoctor::INTRINSICS.has_key?($2)
-          # Then do intrinsics
-          $1 + Asciidoctor::INTRINSICS[$2]
-        else
-          # leave everything else alone
-          "#{$1}{#{$2}}"
-        end
-      end
-
       html.gsub!(/\\([\{\}\-])/, '\1')
       html.gsub!(/linkgit:([^\]]+)\[(\d+)\]/, '<a href="\1.html">\1(\2)</a>')
       html.gsub!(/link:([^\[]+)(\[+[^\]]*\]+)/ ) { "<a href=\"#{$1}\">#{$2.gsub( /(^\[|\]$)/,'' )}</a>" }
+      html.gsub!(Asciidoctor::REGEXP[:line_break], '\1<br/>')
       html
     end
   end