asciidoctor 0.0.5 → 0.0.6

data/lib/asciidoctor/list_item.rb

@@ -1,11 +1,8 @@
-# Public: Methods for managing items for Asciidoc olists, ulist, and dlists.
+# Public: Methods for managing items for AsciiDoc olists, ulist, and dlists.
 class Asciidoctor::ListItem
   # Public: Get the Array of Blocks from the list item's continuation.
   attr_reader :blocks
 
-  # Public: Get/Set the String content.
-  attr_accessor :content
-
   # Public: Get/Set the String list item anchor name.
   attr_accessor :anchor
 
@@ -14,22 +11,58 @@ class Asciidoctor::ListItem
 
   # Public: Initialize an Asciidoctor::ListItem object.
   #
-  # content - the String content (default '')
-  def initialize(content='')
-    @content = content
-    @blocks  = []
+  # parent - The parent list block for this list item
+  # text - the String text (default '')
+  def initialize(parent, text='')
+    @parent = parent
+    @text = text
+    @blocks = []
+  end
+
+  def text=(new_text)
+    @text = new_text
+  end
+
+  def text
+    # this will allow the text to be processed
+    ::Asciidoctor::Block.new(self, nil, [@text]).content
+  end
+
+  def document
+    @parent.document
   end
 
-  def render
-    output = "<li><p>#{content} (HTMLIFY) "
-    output += blocks.map{|block| block.render}.join
-    output += "</p></li>"
+  def content
+    # create method for !blocks.empty?
+    if !blocks.empty?
+      blocks.map{|block| block.render}.join
+    else
+      nil
+    end
+  end
+
+  # Public: Fold the first paragraph block into the text
+  def fold_first
+    # looking for :literal here allows indentation of paragraph content, then strip indent
+    if !blocks.empty? && blocks.first.is_a?(Asciidoctor::Block) &&
+        (blocks.first.context == :paragraph || blocks.first.context == :literal)
+      block = blocks.shift
+      if !@text.nil? && !@text.empty?
+        block.buffer.unshift(@text)
+      end
+
+      if block.context == :literal
+        @text = block.buffer.map {|l| l.lstrip}.join("\n")
+      else
+        @text = block.buffer.join("\n")
+      end
+    end
   end
 
   def splain(parent_level = 0)
     parent_level += 1
-    Asciidoctor.puts_indented(parent_level, "List Item anchor: #{anchor}") unless self.anchor.nil?
-    Asciidoctor.puts_indented(parent_level, "Content: #{content}") unless self.content.nil?
+    Asciidoctor.puts_indented(parent_level, "List Item anchor: #{@anchor}") unless @anchor.nil?
+    Asciidoctor.puts_indented(parent_level, "Text: #{@text}") unless @text.nil?
 
     Asciidoctor.puts_indented(parent_level, "Blocks: #{@blocks.count}")
 

data/lib/asciidoctor/reader.rb

@@ -6,8 +6,11 @@ class Asciidoctor::Reader
   # Public: Get the String document source.
   attr_reader :source
 
-  # Public: Get the Hash of defines
-  attr_reader :defines
+  # Public: Get the String Array of lines parsed from the source
+  attr_reader :lines
+
+  # Public: Get the Hash of attributes
+  attr_reader :attributes
 
   attr_reader :references
 
@@ -41,9 +44,9 @@ class Asciidoctor::Reader
   #
   #   data   = File.readlines(filename)
   #   reader = Asciidoctor::Reader.new(data)
-  def initialize(data = [], &block)
+  def initialize(data = [], attributes = {}, &block)
     raw_source = []
-    @defines = {}
+    @attributes = attributes
     @references = {}
 
     data = data.split("\n") if data.is_a? String
@@ -80,12 +83,12 @@ class Asciidoctor::Reader
         # Lines that start with whitespace and end with a '+' are
         # a continuation, so gobble them up into `value`
         if match = line.match(/\s+(.+)\s+\+\s*$/)
-          continuing_value += match[1]
+          continuing_value += ' ' + match[1]
         elsif match = line.match(/\s+(.+)/)
           # If this continued line doesn't end with a +, then this
           # is the end of the continuation, no matter what the next
           # line does.
-          continuing_value += match[1]
+          continuing_value += ' ' + match[1]
           close_continue = true
         else
           # If this line doesn't start with whitespace, then it's
@@ -94,15 +97,15 @@ class Asciidoctor::Reader
           raw_source.unshift(line)
         end
         if close_continue
-          @defines[continuing_key] = continuing_value
+          @attributes[continuing_key] = continuing_value
           continuing_key = nil
           continuing_value = nil
         end
       elsif match = line.match(ifdef_regexp)
         attr = match[2]
         skip = case match[1]
-               when 'ifdef';  !@defines.has_key?(attr)
-               when 'ifndef'; @defines.has_key?(attr)
+               when 'ifdef';  !@attributes.has_key?(attr)
+               when 'ifndef'; @attributes.has_key?(attr)
                end
         skip_to = /^endif::#{attr}\[\]\s*\n/ if skip
       elsif match = line.match(defattr_regexp)
@@ -115,18 +118,19 @@ class Asciidoctor::Reader
           continuing_value = match[1]  # strip off the spaces and +
           Asciidoctor.debug "continuing key: #{continuing_key} with partial value: '#{continuing_value}'"
         else
-          @defines[key] = value
+          @attributes[key] = value
           Asciidoctor.debug "Defines[#{key}] is '#{value}'"
         end
       elsif match = line.match(delete_attr_regexp)
         key = sanitize_attribute_name(match[1])
-        @defines.delete(key)
+        @attributes.delete(key)
       elsif !line.match(endif_regexp)
         while match = line.match(conditional_regexp)
-          value = @defines.has_key?(match[1]) ? match[2] : ''
+          value = @attributes.has_key?(match[1]) ? match[2] : ''
           line.sub!(conditional_regexp, value)
         end
-        @lines << line unless line.match(REGEXP[:comment])
+        # leave line comments in as they play a role in flow (such as a list divider)
+        @lines << line
       end
     end
 
@@ -138,7 +142,7 @@ class Asciidoctor::Reader
       end
     end
 
-    Asciidoctor.debug "About to leave Reader#init, and references is #{@references.inspect}"
+    #Asciidoctor.debug "About to leave Reader#init, and references is #{@references.inspect}"
     @source = @lines.join
     Asciidoctor.debug "Leaving Reader#init, and I have #{@lines.count} lines"
     Asciidoctor.debug "Also, has_lines? is #{self.has_lines?}"
@@ -173,6 +177,17 @@ class Asciidoctor::Reader
     nil
   end
 
+  # Skip the next line if it's a list continuation character
+  # 
+  # Returns nil
+  def skip_list_continuation
+    if !@lines.empty? && @lines.first.chomp == '+'
+      @lines.shift
+    end
+
+    nil
+  end
+
   # Public: Get the next line of source data. Consumes the line returned.
   #
   # Returns the String of the next line of the source data if data is present.

data/lib/asciidoctor/render_templates.rb

@@ -24,23 +24,41 @@ end
 class DocumentTemplate < BaseTemplate
   def template
     @template ||= ::ERB.new <<-EOF
-      <div class='man-page'>
-      <div id='header'>
-        <% if header %>
-          <h1><%= header.name %></h1>
-          <div class='sectionbody'><%= header.content %></div>
-        <% elsif preamble %>
-          <div class=preamble'>
-            <div class='sectionbody'>
-              <%= preamble.content %>
+      <!DOCTYPE html>
+      <html lang='en'>
+        <head>
+          <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+          <meta name='generator' content='Asciidoctor <%= attr "asciidoctor-version" %>'>
+          <title><%= title ? title : (doctitle ? doctitle : '') %></title>
+        </head>
+        <body class='<%= attr :doctype %>'>
+          <div id='header'>
+            <% if doctitle %>
+              <h1><%= doctitle %></h1>
+            <% end %>
+          </div>
+          <div id='content'>
+            <%= content %>
+          </div>
+          <div id='footer'>
+            <div id='footer-text'>
+              Last updated <%= attr :localdatetime %>
             </div>
           </div>
-        <% end %>
-      </div>
-
-      <%= content %>
+        </body>
+      </html>
+    EOF
+  end
+end
 
-    </div>
+class SectionPreambleTemplate < BaseTemplate
+  def template
+    @template ||= ::ERB.new <<-EOF
+      <div id='preamble'>
+        <div class='sectionbody'>
+          <%= content %>
+        </div>
+      </div>
     EOF
   end
 end
@@ -77,9 +95,19 @@ class SectionDlistTemplate < BaseTemplate
       <div class='dlist'>
         <dl>
           <% content.each do |dt, dd| %>
-            <dt class='hdlist1'><%= dt %></dt>
-            <% unless dd.nil? || dd.empty? %>
-              <dd><%= dd %></dd>
+            <dt class='hdlist1'>
+              <% if !dt.anchor.nil? and !dt.anchor.empty? %>
+              <a id='<%= dt.anchor %>'></a>
+              <% end %>
+              <%= dt.text %>
+            </dt>
+            <% unless dd.nil? %>
+              <dd>
+                <p><%= dd.text %></p>
+                <% if !dd.blocks.empty? %>
+                <%= dd.content %> 
+                <% end %>
+              </dd>
             <% end %>
           <% end %>
         </dl>
@@ -114,13 +142,17 @@ class SectionLiteralTemplate < BaseTemplate
   end
 end
 
-class SectionNoteTemplate < BaseTemplate
+class SectionAdmonitionTemplate < BaseTemplate
   def template
     @template ||= ERB.new <<-EOF
       <div class='admonitionblock'>
         <table>
           <tr>
-            <td class='icon'></td>
+            <td class='icon'>
+              <% if attr? :caption %>
+              <div class='title'><%= attr :caption %></div>
+              <% end %>
+            </td>
             <td class='content'>
               <% if !title.nil? %>
                 <div class='title'><%= title %></div>
@@ -152,7 +184,75 @@ class SectionSidebarTemplate < BaseTemplate
     @template ||= ERB.new <<-EOF
       <div class='sidebarblock'>
         <div class='content'>
-          <p><%= content %></p>
+          <% if !title.nil? %>
+            <div class='title'><%= title %></div>
+          <% end %>
+          <%= content %>
+        </div>
+      </div>
+    EOF
+  end
+end
+
+class SectionExampleTemplate < BaseTemplate
+  def template
+    @template ||= ERB.new <<-EOF
+      <div class='exampleblock'>
+        <div class='content'>
+          <% if !title.nil? %>
+            <div class='title'><%= title %></div>
+          <% end %>
+          <%= content %>
+        </div>
+      </div>
+    EOF
+  end
+end
+
+class SectionQuoteTemplate < BaseTemplate
+  def template
+    @template ||= ERB.new <<-EOF
+      <div class='quoteblock'>
+        <% if !title.nil? %>
+          <div class='title'><%= title %></div>
+        <% end %>
+        <div class='content'>
+          <%= content %>
+        </div>
+        <div class='attribution'>
+          <% if attr? :citetitle %>
+            <em><%= attr :citetitle %></em>
+          <% end %>
+          <% if attr? :attribution %>
+            <% if attr? :citetitle %>
+            <br/>
+            <% end %>
+            <%= "&#8212; " + attr(:attribution) %>
+          <% end %>
+        </div>
+      </div>
+    EOF
+  end
+end
+
+class SectionVerseTemplate < BaseTemplate
+  def template
+    @template ||= ERB.new <<-EOF
+      <div class='verseblock'>
+        <% if !title.nil? %>
+          <div class='title'><%= title %></div>
+        <% end %>
+        <pre class='content'><%= content %></pre>
+        <div class='attribution'>
+          <% if attr? :citetitle %>
+            <em><%= attr :citetitle %></em>
+          <% end %>
+          <% if attr? :attribution %>
+            <% if attr? :citetitle %>
+            <br/>
+            <% end %>
+            <%= "&#8212; " + attr(:attribution) %>
+          <% end %>
         </div>
       </div>
     EOF
@@ -165,7 +265,12 @@ class SectionUlistTemplate < BaseTemplate
       <div class='ulist'>
         <ul>
         <% content.each do |li| %>
-          <%= li %>
+          <li>
+            <p><%= li.text %></p>
+            <% if !li.blocks.empty? %>
+            <%= li.content %>
+            <% end %>
+          </li>
         <% end %>
         </ul>
       </div>
@@ -173,47 +278,40 @@ class SectionUlistTemplate < BaseTemplate
   end
 end
 
-=begin
-../gitscm-next/templates/section_colist.html.erb
-<div class='colist arabic'>
-  <ol>
-    <% content.each do |li| %>
-      <li><p><%= li %></p></li>
-    <% end %>
-  </ol>
-</div>
-../gitscm-next/templates/section_example.html.erb
-<div class='exampleblock'>
-  <div class='content'>
-    <div class='literalblock'>
-      <div class='content'>
-        <pre><tt><%= content %></tt></pre>
+class SectionOlistTemplate < BaseTemplate
+  def template
+    @template ||= ERB.new <<-EOF
+      <div class='olist arabic'>
+        <ol class='arabic'>
+        <% content.each do |li| %>
+          <li>
+            <p><%= li.text %></p>
+            <% if !li.blocks.empty? %>
+            <%= li.content %>
+            <% end %>
+          </li>
+        <% end %>
+        </ol>
+      </div>
+    EOF
+  end
+end
+
+class SectionImageTemplate < BaseTemplate
+  def template
+    @template ||= ERB.new <<-EOF
+      <div class='imageblock'>
+        <div class='content'>
+          <% if attr :link %>
+          <a class='image' href='<%= attr :link%>'><img src='<%= attr :target %>' alt='<%= attr :alt %>'/></a>
+          <% else %>
+          <img src='<%= attr :target %>' alt='<%= attr :alt %>'/>
+          <% end %>
+        </div>
+        <% if title %>
+        <div class='title'><%= title %></div>
+        <% end %>
       </div>
-    </div>
-  </div>
-</div>
-../gitscm-next/templates/section_oblock.html.erb
-<div class='openblock'>
-  <div class='content'>
-    <%= content %>
-  </div>
-</div>
-../gitscm-next/templates/section_olist.html.erb
-<div class='olist arabic'>
-  <ol class='arabic'>
-    <% content.each do |li| %>
-      <li><p><%= li %></p></li>
-    <% end %>
-  </ol>
-</div>
-../gitscm-next/templates/section_quote.html.erb
-<div class='quoteblock'>
-  <div class='content'>
-    <%= content %>
-  </div>
-</div>
-../gitscm-next/templates/section_verse.html.erb
-<div class='verseblock'>
-  <pre class='content'><%= content %></pre>
-</div>
-=end
+    EOF
+  end
+end