nora_mark 0.2beta3 → 0.2beta4

data/lib/nora_mark/parser.kpeg.rb

@@ -3,18 +3,277 @@ require 'kpeg/compiled_parser'
 class NoraMark::Parser < KPeg::CompiledParser
   # :stopdoc:
 
-  # eof = !.
-  def _eof
+  module ::NoraMark
+    class Node; end
+    class Block < Node
+      def initialize(name, ids, classes, parameters, content)
+        @name = name
+        @ids = ids
+        @classes = classes
+        @parameters = parameters
+        @content = content
+      end
+      attr_reader :name
+      attr_reader :ids
+      attr_reader :classes
+      attr_reader :parameters
+      attr_reader :content
+    end
+    class Breakline < Node
+      def initialize()
+      end
+    end
+    class DefinitionList < Node
+      def initialize(ids, classes, parameters, content)
+        @ids = ids
+        @classes = classes
+        @parameters = parameters
+        @content = content
+      end
+      attr_reader :ids
+      attr_reader :classes
+      attr_reader :parameters
+      attr_reader :content
+    end
+    class DLItem < Node
+      def initialize(ids, classes, parameters, content)
+        @ids = ids
+        @classes = classes
+        @parameters = parameters
+        @content = content
+      end
+      attr_reader :ids
+      attr_reader :classes
+      attr_reader :parameters
+      attr_reader :content
+    end
+    class Frontmatter < Node
+      def initialize(content)
+        @content = content
+      end
+      attr_reader :content
+    end
+    class HeadedSection < Node
+      def initialize(level, heading, content)
+        @level = level
+        @heading = heading
+        @content = content
+      end
+      attr_reader :level
+      attr_reader :heading
+      attr_reader :content
+    end
+    class Inline < Node
+      def initialize(name, ids, classes, parameters, content)
+        @name = name
+        @ids = ids
+        @classes = classes
+        @parameters = parameters
+        @content = content
+      end
+      attr_reader :name
+      attr_reader :ids
+      attr_reader :classes
+      attr_reader :parameters
+      attr_reader :content
+    end
+    class LineCommand < Node
+      def initialize(name, ids, classes, parameters, content)
+        @name = name
+        @ids = ids
+        @classes = classes
+        @parameters = parameters
+        @content = content
+      end
+      attr_reader :name
+      attr_reader :ids
+      attr_reader :classes
+      attr_reader :parameters
+      attr_reader :content
+    end
+    class Newpage < Node
+      def initialize(ids, classes, parameters, content)
+        @ids = ids
+        @classes = classes
+        @parameters = parameters
+        @content = content
+      end
+      attr_reader :ids
+      attr_reader :classes
+      attr_reader :parameters
+      attr_reader :content
+    end
+    class OlItem < Node
+      def initialize(ids, classes, parameters, content)
+        @ids = ids
+        @classes = classes
+        @parameters = parameters
+        @content = content
+      end
+      attr_reader :ids
+      attr_reader :classes
+      attr_reader :parameters
+      attr_reader :content
+    end
+    class OrderedList < Node
+      def initialize(ids, classes, parameters, content)
+        @ids = ids
+        @classes = classes
+        @parameters = parameters
+        @content = content
+      end
+      attr_reader :ids
+      attr_reader :classes
+      attr_reader :parameters
+      attr_reader :content
+    end
+    class Page < Node
+      def initialize(content)
+        @content = content
+      end
+      attr_reader :content
+    end
+    class Paragraph < Node
+      def initialize(ids, classes, parameters, content)
+        @ids = ids
+        @classes = classes
+        @parameters = parameters
+        @content = content
+      end
+      attr_reader :ids
+      attr_reader :classes
+      attr_reader :parameters
+      attr_reader :content
+    end
+    class ParagraphGroup < Node
+      def initialize(ids, classes, parameters, content)
+        @ids = ids
+        @classes = classes
+        @parameters = parameters
+        @content = content
+      end
+      attr_reader :ids
+      attr_reader :classes
+      attr_reader :parameters
+      attr_reader :content
+    end
+    class PreformattedBlock < Node
+      def initialize(name, ids, classes, parameters, codelanguage, content)
+        @name = name
+        @ids = ids
+        @classes = classes
+        @parameters = parameters
+        @codelanguage = codelanguage
+        @content = content
+      end
+      attr_reader :name
+      attr_reader :ids
+      attr_reader :classes
+      attr_reader :parameters
+      attr_reader :codelanguage
+      attr_reader :content
+    end
+    class Text < Node
+      def initialize(content)
+        @content = content
+      end
+      attr_reader :content
+    end
+    class UlItem < Node
+      def initialize(ids, classes, parameters, content)
+        @ids = ids
+        @classes = classes
+        @parameters = parameters
+        @content = content
+      end
+      attr_reader :ids
+      attr_reader :classes
+      attr_reader :parameters
+      attr_reader :content
+    end
+    class UnorderedList < Node
+      def initialize(ids, classes, parameters, content)
+        @ids = ids
+        @classes = classes
+        @parameters = parameters
+        @content = content
+      end
+      attr_reader :ids
+      attr_reader :classes
+      attr_reader :parameters
+      attr_reader :content
+    end
+  end
+  module ::NoraMarkConstruction
+    def block(name, ids, classes, parameters, content)
+      ::NoraMark::Block.new(name, ids, classes, parameters, content)
+    end
+    def br()
+      ::NoraMark::Breakline.new()
+    end
+    def definition_list(ids, classes, parameters, content)
+      ::NoraMark::DefinitionList.new(ids, classes, parameters, content)
+    end
+    def dl_item(ids, classes, parameters, content)
+      ::NoraMark::DLItem.new(ids, classes, parameters, content)
+    end
+    def frontmatter(content)
+      ::NoraMark::Frontmatter.new(content)
+    end
+    def h_section(level, heading, content)
+      ::NoraMark::HeadedSection.new(level, heading, content)
+    end
+    def inline(name, ids, classes, parameters, content)
+      ::NoraMark::Inline.new(name, ids, classes, parameters, content)
+    end
+    def line_command(name, ids, classes, parameters, content)
+      ::NoraMark::LineCommand.new(name, ids, classes, parameters, content)
+    end
+    def newpage(ids, classes, parameters, content)
+      ::NoraMark::Newpage.new(ids, classes, parameters, content)
+    end
+    def ol_item(ids, classes, parameters, content)
+      ::NoraMark::OlItem.new(ids, classes, parameters, content)
+    end
+    def ordered_list(ids, classes, parameters, content)
+      ::NoraMark::OrderedList.new(ids, classes, parameters, content)
+    end
+    def page(content)
+      ::NoraMark::Page.new(content)
+    end
+    def paragraph(ids, classes, parameters, content)
+      ::NoraMark::Paragraph.new(ids, classes, parameters, content)
+    end
+    def paragraph_group(ids, classes, parameters, content)
+      ::NoraMark::ParagraphGroup.new(ids, classes, parameters, content)
+    end
+    def preformatted_block(name, ids, classes, parameters, codelanguage, content)
+      ::NoraMark::PreformattedBlock.new(name, ids, classes, parameters, codelanguage, content)
+    end
+    def text(content)
+      ::NoraMark::Text.new(content)
+    end
+    def ul_item(ids, classes, parameters, content)
+      ::NoraMark::UlItem.new(ids, classes, parameters, content)
+    end
+    def unordered_list(ids, classes, parameters, content)
+      ::NoraMark::UnorderedList.new(ids, classes, parameters, content)
+    end
+  end
+  include ::NoraMarkConstruction
+
+  # Eof = !.
+  def _Eof
     _save = self.pos
     _tmp = get_byte
     _tmp = _tmp ? nil : true
     self.pos = _save
-    set_failed_rule :_eof unless _tmp
+    set_failed_rule :_Eof unless _tmp
     return _tmp
   end
 
-  # space = (" " | "\\t")
-  def _space
+  # Space = (" " | "\\t")
+  def _Space
 
     _save = self.pos
     while true # choice
@@ -27,22 +286,17 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end choice
 
-    set_failed_rule :_space unless _tmp
+    set_failed_rule :_Space unless _tmp
     return _tmp
   end
 
-  # eof_comment = lh space* "#" (!eof .)*
-  def _eof_comment
+  # EofComment = Space* "#" (!Eof .)*
+  def _EofComment
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_lh)
-      unless _tmp
-        self.pos = _save
-        break
-      end
       while true
-        _tmp = apply(:_space)
+        _tmp = apply(:_Space)
         break unless _tmp
       end
       _tmp = true
@@ -60,7 +314,7 @@ class NoraMark::Parser < KPeg::CompiledParser
         _save3 = self.pos
         while true # sequence
           _save4 = self.pos
-          _tmp = apply(:_eof)
+          _tmp = apply(:_Eof)
           _tmp = _tmp ? nil : true
           self.pos = _save4
           unless _tmp
@@ -83,22 +337,17 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_eof_comment unless _tmp
+    set_failed_rule :_EofComment unless _tmp
     return _tmp
   end
 
-  # comment = lh space* "#" (!nl .)* nl empty_line*
-  def _comment
+  # Comment = Space* "#" (!Nl .)* Nl EmptyLine*
+  def _Comment
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_lh)
-      unless _tmp
-        self.pos = _save
-        break
-      end
       while true
-        _tmp = apply(:_space)
+        _tmp = apply(:_Space)
         break unless _tmp
       end
       _tmp = true
@@ -116,7 +365,7 @@ class NoraMark::Parser < KPeg::CompiledParser
         _save3 = self.pos
         while true # sequence
           _save4 = self.pos
-          _tmp = apply(:_nl)
+          _tmp = apply(:_Nl)
           _tmp = _tmp ? nil : true
           self.pos = _save4
           unless _tmp
@@ -137,13 +386,13 @@ class NoraMark::Parser < KPeg::CompiledParser
         self.pos = _save
         break
       end
-      _tmp = apply(:_nl)
+      _tmp = apply(:_Nl)
       unless _tmp
         self.pos = _save
         break
       end
       while true
-        _tmp = apply(:_empty_line)
+        _tmp = apply(:_EmptyLine)
         break unless _tmp
       end
       _tmp = true
@@ -153,25 +402,14 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_comment unless _tmp
+    set_failed_rule :_Comment unless _tmp
     return _tmp
   end
 
-  # - = (space | comment)*
+  # - = Space*
   def __hyphen_
     while true
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = apply(:_space)
-        break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_comment)
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
+      _tmp = apply(:_Space)
       break unless _tmp
     end
     _tmp = true
@@ -179,12 +417,12 @@ class NoraMark::Parser < KPeg::CompiledParser
     return _tmp
   end
 
-  # empty_line = lh - nl
-  def _empty_line
+  # EmptyLine = /^/ - (Nl | Comment | EofComment)
+  def _EmptyLine
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_lh)
+      _tmp = scan(/\A(?-mix:^)/)
       unless _tmp
         self.pos = _save
         break
@@ -194,51 +432,58 @@ class NoraMark::Parser < KPeg::CompiledParser
         self.pos = _save
         break
       end
-      _tmp = apply(:_nl)
+
+      _save1 = self.pos
+      while true # choice
+        _tmp = apply(:_Nl)
+        break if _tmp
+        self.pos = _save1
+        _tmp = apply(:_Comment)
+        break if _tmp
+        self.pos = _save1
+        _tmp = apply(:_EofComment)
+        break if _tmp
+        self.pos = _save1
+        break
+      end # end choice
+
       unless _tmp
         self.pos = _save
       end
       break
     end # end sequence
 
-    set_failed_rule :_empty_line unless _tmp
+    set_failed_rule :_EmptyLine unless _tmp
     return _tmp
   end
 
-  # nl = /\r?\n/
-  def _nl
+  # Nl = /\r?\n/
+  def _Nl
     _tmp = scan(/\A(?-mix:\r?\n)/)
-    set_failed_rule :_nl unless _tmp
-    return _tmp
-  end
-
-  # lh = /^/
-  def _lh
-    _tmp = scan(/\A(?-mix:^)/)
-    set_failed_rule :_lh unless _tmp
+    set_failed_rule :_Nl unless _tmp
     return _tmp
   end
 
-  # le = (nl | eof)
-  def _le
+  # Le = (Nl | Eof)
+  def _Le
 
     _save = self.pos
     while true # choice
-      _tmp = apply(:_nl)
+      _tmp = apply(:_Nl)
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_eof)
+      _tmp = apply(:_Eof)
       break if _tmp
       self.pos = _save
       break
     end # end choice
 
-    set_failed_rule :_le unless _tmp
+    set_failed_rule :_Le unless _tmp
     return _tmp
   end
 
-  # word = < /[\w0-9]/ ("-" | /[\w0-9]/)* > { text }
-  def _word
+  # Word = < /[\w0-9]/ ("-" | /[\w0-9]/)* > { text }
+  def _Word
 
     _save = self.pos
     while true # sequence
@@ -288,12 +533,12 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_word unless _tmp
+    set_failed_rule :_Word unless _tmp
     return _tmp
   end
 
-  # num = < [0-9]+ > { text.to_i }
-  def _num
+  # Num = < [0-9]+ > { text.to_i }
+  def _Num
 
     _save = self.pos
     while true # sequence
@@ -338,12 +583,12 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_num unless _tmp
+    set_failed_rule :_Num unless _tmp
     return _tmp
   end
 
-  # classname = "." word:classname { classname }
-  def _classname
+  # ClassName = "." Word:classname { classname }
+  def _ClassName
 
     _save = self.pos
     while true # sequence
@@ -352,7 +597,7 @@ class NoraMark::Parser < KPeg::CompiledParser
         self.pos = _save
         break
       end
-      _tmp = apply(:_word)
+      _tmp = apply(:_Word)
       classname = @result
       unless _tmp
         self.pos = _save
@@ -366,18 +611,18 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_classname unless _tmp
+    set_failed_rule :_ClassName unless _tmp
     return _tmp
   end
 
-  # classnames = classname*:classnames { classnames }
-  def _classnames
+  # ClassNames = ClassName*:classnames { classnames }
+  def _ClassNames
 
     _save = self.pos
     while true # sequence
       _ary = []
       while true
-        _tmp = apply(:_classname)
+        _tmp = apply(:_ClassName)
         _ary << @result if _tmp
         break unless _tmp
       end
@@ -396,12 +641,12 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_classnames unless _tmp
+    set_failed_rule :_ClassNames unless _tmp
     return _tmp
   end
 
-  # idname = "#" word:idname { idname }
-  def _idname
+  # IdName = "#" Word:idname { idname }
+  def _IdName
 
     _save = self.pos
     while true # sequence
@@ -410,7 +655,7 @@ class NoraMark::Parser < KPeg::CompiledParser
         self.pos = _save
         break
       end
-      _tmp = apply(:_word)
+      _tmp = apply(:_Word)
       idname = @result
       unless _tmp
         self.pos = _save
@@ -424,18 +669,18 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_idname unless _tmp
+    set_failed_rule :_IdName unless _tmp
     return _tmp
   end
 
-  # idnames = idname*:idnames { idnames }
-  def _idnames
+  # IdNames = IdName*:idnames { idnames }
+  def _IdNames
 
     _save = self.pos
     while true # sequence
       _ary = []
       while true
-        _tmp = apply(:_idname)
+        _tmp = apply(:_IdName)
         _ary << @result if _tmp
         break unless _tmp
       end
@@ -454,23 +699,23 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_idnames unless _tmp
+    set_failed_rule :_IdNames unless _tmp
     return _tmp
   end
 
-  # commandname = word:name idnames?:idnames classnames?:classes { {:name => name, :ids => idnames, :classes => classes} }
-  def _commandname
+  # CommandName = Word:name IdNames?:idnames ClassNames?:classes { {name: name, ids: idnames, classes: classes} }
+  def _CommandName
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_word)
+      _tmp = apply(:_Word)
       name = @result
       unless _tmp
         self.pos = _save
         break
       end
       _save1 = self.pos
-      _tmp = apply(:_idnames)
+      _tmp = apply(:_IdNames)
       @result = nil unless _tmp
       unless _tmp
         _tmp = true
@@ -482,7 +727,7 @@ class NoraMark::Parser < KPeg::CompiledParser
         break
       end
       _save2 = self.pos
-      _tmp = apply(:_classnames)
+      _tmp = apply(:_ClassNames)
       @result = nil unless _tmp
       unless _tmp
         _tmp = true
@@ -493,7 +738,7 @@ class NoraMark::Parser < KPeg::CompiledParser
         self.pos = _save
         break
       end
-      @result = begin;  {:name => name, :ids => idnames, :classes => classes} ; end
+      @result = begin;  {name: name, ids: idnames, classes: classes} ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -501,81 +746,21 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_commandname unless _tmp
+    set_failed_rule :_CommandName unless _tmp
     return _tmp
   end
 
-  # parameter = < (/[^,)]/* | "\"" /[^"]/* "\"" | "'" /[^']/* "'") > { text }
-  def _parameter
+  # ParameterNormal = < /[^,)]/* > { text }
+  def _ParameterNormal
 
     _save = self.pos
     while true # sequence
       _text_start = self.pos
-
-      _save1 = self.pos
-      while true # choice
-        while true
-          _tmp = scan(/\A(?-mix:[^,)])/)
-          break unless _tmp
-        end
-        _tmp = true
-        break if _tmp
-        self.pos = _save1
-
-        _save3 = self.pos
-        while true # sequence
-          _tmp = match_string("\"")
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          while true
-            _tmp = scan(/\A(?-mix:[^"])/)
-            break unless _tmp
-          end
-          _tmp = true
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _tmp = match_string("\"")
-          unless _tmp
-            self.pos = _save3
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save1
-
-        _save5 = self.pos
-        while true # sequence
-          _tmp = match_string("'")
-          unless _tmp
-            self.pos = _save5
-            break
-          end
-          while true
-            _tmp = scan(/\A(?-mix:[^'])/)
-            break unless _tmp
-          end
-          _tmp = true
-          unless _tmp
-            self.pos = _save5
-            break
-          end
-          _tmp = match_string("'")
-          unless _tmp
-            self.pos = _save5
-          end
-          break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
+      while true
+        _tmp = scan(/\A(?-mix:[^,)])/)
+        break unless _tmp
+      end
+      _tmp = true
       if _tmp
         text = get_text(_text_start)
       end
@@ -591,49 +776,26 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_parameter unless _tmp
+    set_failed_rule :_ParameterNormal unless _tmp
     return _tmp
   end
 
-  # parameters = < parameter ("," parameter)* > { text }
-  def _parameters
+  # ParameterQuoted = "\"" < /[^"]/* > "\"" - &/[,)]/ { text }
+  def _ParameterQuoted
 
     _save = self.pos
     while true # sequence
-      _text_start = self.pos
-
-      _save1 = self.pos
-      while true # sequence
-        _tmp = apply(:_parameter)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        while true
-
-          _save3 = self.pos
-          while true # sequence
-            _tmp = match_string(",")
-            unless _tmp
-              self.pos = _save3
-              break
-            end
-            _tmp = apply(:_parameter)
-            unless _tmp
-              self.pos = _save3
-            end
-            break
-          end # end sequence
-
-          break unless _tmp
-        end
-        _tmp = true
-        unless _tmp
-          self.pos = _save1
-        end
+      _tmp = match_string("\"")
+      unless _tmp
+        self.pos = _save
         break
-      end # end sequence
-
+      end
+      _text_start = self.pos
+      while true
+        _tmp = scan(/\A(?-mix:[^"])/)
+        break unless _tmp
+      end
+      _tmp = true
       if _tmp
         text = get_text(_text_start)
       end
@@ -641,6 +803,23 @@ class NoraMark::Parser < KPeg::CompiledParser
         self.pos = _save
         break
       end
+      _tmp = match_string("\"")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save2 = self.pos
+      _tmp = scan(/\A(?-mix:[,)])/)
+      self.pos = _save2
+      unless _tmp
+        self.pos = _save
+        break
+      end
       @result = begin;  text ; end
       _tmp = true
       unless _tmp
@@ -649,62 +828,51 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_parameters unless _tmp
+    set_failed_rule :_ParameterQuoted unless _tmp
     return _tmp
   end
 
-  # command = commandname:cn ("(" - parameters:arg - ")")? { arg ||= ''; cn.merge({ :args => arg.split(',') }) }
-  def _command
+  # ParameterSingleQuoted = "'" < /[^']/* > "'" - &/[,)]/ { text }
+  def _ParameterSingleQuoted
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_commandname)
-      cn = @result
+      _tmp = match_string("'")
       unless _tmp
         self.pos = _save
         break
       end
-      _save1 = self.pos
-
-      _save2 = self.pos
-      while true # sequence
-        _tmp = match_string("(")
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        _tmp = apply(:__hyphen_)
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        _tmp = apply(:_parameters)
-        arg = @result
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        _tmp = apply(:__hyphen_)
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        _tmp = match_string(")")
-        unless _tmp
-          self.pos = _save2
-        end
+      _text_start = self.pos
+      while true
+        _tmp = scan(/\A(?-mix:[^'])/)
+        break unless _tmp
+      end
+      _tmp = true
+      if _tmp
+        text = get_text(_text_start)
+      end
+      unless _tmp
+        self.pos = _save
         break
-      end # end sequence
-
+      end
+      _tmp = match_string("'")
       unless _tmp
-        _tmp = true
-        self.pos = _save1
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
       end
+      _save2 = self.pos
+      _tmp = scan(/\A(?-mix:[,)])/)
+      self.pos = _save2
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  arg ||= ''; cn.merge({ :args => arg.split(',') }) ; end
+      @result = begin;  text ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -712,53 +880,218 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_command unless _tmp
+    set_failed_rule :_ParameterSingleQuoted unless _tmp
     return _tmp
   end
 
-  # implicit_paragraph = < !paragraph_delimiter - documentline:p - > { create_item(:paragraph, nil, p, raw: text) }
-  def _implicit_paragraph
+  # Parameter = (ParameterQuoted | ParameterSingleQuoted | ParameterNormal):value { value }
+  def _Parameter
 
     _save = self.pos
     while true # sequence
-      _text_start = self.pos
 
       _save1 = self.pos
-      while true # sequence
-        _save2 = self.pos
-        _tmp = apply(:_paragraph_delimiter)
-        _tmp = _tmp ? nil : true
-        self.pos = _save2
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:__hyphen_)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_documentline)
-        p = @result
-        unless _tmp
-          self.pos = _save1
+      while true # choice
+        _tmp = apply(:_ParameterQuoted)
+        break if _tmp
+        self.pos = _save1
+        _tmp = apply(:_ParameterSingleQuoted)
+        break if _tmp
+        self.pos = _save1
+        _tmp = apply(:_ParameterNormal)
+        break if _tmp
+        self.pos = _save1
+        break
+      end # end choice
+
+      value = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  value ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_Parameter unless _tmp
+    return _tmp
+  end
+
+  # Parameters = Parameter:parameter ("," - Parameter)*:rest_parameters { [parameter] + rest_parameters }
+  def _Parameters
+
+    _save = self.pos
+    while true # sequence
+      _tmp = apply(:_Parameter)
+      parameter = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _ary = []
+      while true
+
+        _save2 = self.pos
+        while true # sequence
+          _tmp = match_string(",")
+          unless _tmp
+            self.pos = _save2
+            break
+          end
+          _tmp = apply(:__hyphen_)
+          unless _tmp
+            self.pos = _save2
+            break
+          end
+          _tmp = apply(:_Parameter)
+          unless _tmp
+            self.pos = _save2
+          end
+          break
+        end # end sequence
+
+        _ary << @result if _tmp
+        break unless _tmp
+      end
+      _tmp = true
+      @result = _ary
+      rest_parameters = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  [parameter] + rest_parameters ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_Parameters unless _tmp
+    return _tmp
+  end
+
+  # Command = CommandName:cn ("(" - Parameters:args - ")")? { args ||= []; cn.merge({ args: args }) }
+  def _Command
+
+    _save = self.pos
+    while true # sequence
+      _tmp = apply(:_CommandName)
+      cn = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save1 = self.pos
+
+      _save2 = self.pos
+      while true # sequence
+        _tmp = match_string("(")
+        unless _tmp
+          self.pos = _save2
           break
         end
         _tmp = apply(:__hyphen_)
         unless _tmp
-          self.pos = _save1
+          self.pos = _save2
+          break
+        end
+        _tmp = apply(:_Parameters)
+        args = @result
+        unless _tmp
+          self.pos = _save2
+          break
+        end
+        _tmp = apply(:__hyphen_)
+        unless _tmp
+          self.pos = _save2
+          break
+        end
+        _tmp = match_string(")")
+        unless _tmp
+          self.pos = _save2
         end
         break
       end # end sequence
 
-      if _tmp
-        text = get_text(_text_start)
+      unless _tmp
+        _tmp = true
+        self.pos = _save1
+      end
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  args ||= []; cn.merge({ args: args }) ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_Command unless _tmp
+    return _tmp
+  end
+
+  # ImplicitParagraph = - !ParagraphDelimiter Comment* DocumentLine:content Comment* EofComment? {paragraph([],[], [], content)}
+  def _ImplicitParagraph
+
+    _save = self.pos
+    while true # sequence
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save1 = self.pos
+      _tmp = apply(:_ParagraphDelimiter)
+      _tmp = _tmp ? nil : true
+      self.pos = _save1
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      while true
+        _tmp = apply(:_Comment)
+        break unless _tmp
+      end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_DocumentLine)
+      content = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      while true
+        _tmp = apply(:_Comment)
+        break unless _tmp
+      end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save4 = self.pos
+      _tmp = apply(:_EofComment)
+      unless _tmp
+        _tmp = true
+        self.pos = _save4
       end
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:paragraph, nil, p, raw: text) ; end
+      @result = begin; paragraph([],[], [], content); end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -766,76 +1099,63 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_implicit_paragraph unless _tmp
+    set_failed_rule :_ImplicitParagraph unless _tmp
     return _tmp
   end
 
-  # paragraph = (explicit_paragraph | implicit_paragraph)
-  def _paragraph
+  # Paragraph = (ExplicitParagraph | ImplicitParagraph)
+  def _Paragraph
 
     _save = self.pos
     while true # choice
-      _tmp = apply(:_explicit_paragraph)
+      _tmp = apply(:_ExplicitParagraph)
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_implicit_paragraph)
+      _tmp = apply(:_ImplicitParagraph)
       break if _tmp
       self.pos = _save
       break
     end # end choice
 
-    set_failed_rule :_paragraph unless _tmp
+    set_failed_rule :_Paragraph unless _tmp
     return _tmp
   end
 
-  # paragraph_group = < paragraph+:p empty_line* > { create_item(:paragraph_group, nil, p, raw: text) }
-  def _paragraph_group
+  # ParagraphGroup = Paragraph+:p EmptyLine* {paragraph_group([],[],[],p)}
+  def _ParagraphGroup
 
     _save = self.pos
     while true # sequence
-      _text_start = self.pos
-
       _save1 = self.pos
-      while true # sequence
-        _save2 = self.pos
-        _ary = []
-        _tmp = apply(:_paragraph)
-        if _tmp
-          _ary << @result
-          while true
-            _tmp = apply(:_paragraph)
-            _ary << @result if _tmp
-            break unless _tmp
-          end
-          _tmp = true
-          @result = _ary
-        else
-          self.pos = _save2
-        end
-        p = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
+      _ary = []
+      _tmp = apply(:_Paragraph)
+      if _tmp
+        _ary << @result
         while true
-          _tmp = apply(:_empty_line)
+          _tmp = apply(:_Paragraph)
+          _ary << @result if _tmp
           break unless _tmp
         end
         _tmp = true
-        unless _tmp
-          self.pos = _save1
-        end
+        @result = _ary
+      else
+        self.pos = _save1
+      end
+      p = @result
+      unless _tmp
+        self.pos = _save
         break
-      end # end sequence
-
-      if _tmp
-        text = get_text(_text_start)
       end
+      while true
+        _tmp = apply(:_EmptyLine)
+        break unless _tmp
+      end
+      _tmp = true
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:paragraph_group, nil, p, raw: text) ; end
+      @result = begin; paragraph_group([],[],[],p); end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -843,26 +1163,21 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_paragraph_group unless _tmp
+    set_failed_rule :_ParagraphGroup unless _tmp
     return _tmp
   end
 
-  # blockhead = lh - command:command - "{" - nl empty_line* { command }
-  def _blockhead
+  # BlockHead = - Command:command - "{" - Nl EmptyLine* { command }
+  def _BlockHead
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_lh)
-      unless _tmp
-        self.pos = _save
-        break
-      end
       _tmp = apply(:__hyphen_)
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = apply(:_command)
+      _tmp = apply(:_Command)
       command = @result
       unless _tmp
         self.pos = _save
@@ -883,13 +1198,13 @@ class NoraMark::Parser < KPeg::CompiledParser
         self.pos = _save
         break
       end
-      _tmp = apply(:_nl)
+      _tmp = apply(:_Nl)
       unless _tmp
         self.pos = _save
         break
       end
       while true
-        _tmp = apply(:_empty_line)
+        _tmp = apply(:_EmptyLine)
         break unless _tmp
       end
       _tmp = true
@@ -905,20 +1220,15 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_blockhead unless _tmp
+    set_failed_rule :_BlockHead unless _tmp
     return _tmp
   end
 
-  # blockend = lh - "}" - le empty_line*
-  def _blockend
+  # BlockEnd = - "}" - Le EmptyLine*
+  def _BlockEnd
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_lh)
-      unless _tmp
-        self.pos = _save
-        break
-      end
       _tmp = apply(:__hyphen_)
       unless _tmp
         self.pos = _save
@@ -934,13 +1244,13 @@ class NoraMark::Parser < KPeg::CompiledParser
         self.pos = _save
         break
       end
-      _tmp = apply(:_le)
+      _tmp = apply(:_Le)
       unless _tmp
         self.pos = _save
         break
       end
       while true
-        _tmp = apply(:_empty_line)
+        _tmp = apply(:_EmptyLine)
         break unless _tmp
       end
       _tmp = true
@@ -950,12 +1260,12 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_blockend unless _tmp
+    set_failed_rule :_BlockEnd unless _tmp
     return _tmp
   end
 
-  # blockbody = (!blockend block)+:body { body }
-  def _blockbody
+  # BlockBody = (!BlockEnd Block)+:body { body }
+  def _BlockBody
 
     _save = self.pos
     while true # sequence
@@ -965,14 +1275,14 @@ class NoraMark::Parser < KPeg::CompiledParser
       _save2 = self.pos
       while true # sequence
         _save3 = self.pos
-        _tmp = apply(:_blockend)
+        _tmp = apply(:_BlockEnd)
         _tmp = _tmp ? nil : true
         self.pos = _save3
         unless _tmp
           self.pos = _save2
           break
         end
-        _tmp = apply(:_block)
+        _tmp = apply(:_Block)
         unless _tmp
           self.pos = _save2
         end
@@ -986,14 +1296,14 @@ class NoraMark::Parser < KPeg::CompiledParser
           _save4 = self.pos
           while true # sequence
             _save5 = self.pos
-            _tmp = apply(:_blockend)
+            _tmp = apply(:_BlockEnd)
             _tmp = _tmp ? nil : true
             self.pos = _save5
             unless _tmp
               self.pos = _save4
               break
             end
-            _tmp = apply(:_block)
+            _tmp = apply(:_Block)
             unless _tmp
               self.pos = _save4
             end
@@ -1021,56 +1331,43 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_blockbody unless _tmp
+    set_failed_rule :_BlockBody unless _tmp
     return _tmp
   end
 
-  # explicit_block = < blockhead:head - blockbody:body - blockend > { create_item(:block, head, body, raw: text) }
-  def _explicit_block
+  # ExplicitBlock = BlockHead:c - BlockBody:content - BlockEnd {block(c[:name], c[:ids], c[:classes], c[:args], content)}
+  def _ExplicitBlock
 
     _save = self.pos
     while true # sequence
-      _text_start = self.pos
-
-      _save1 = self.pos
-      while true # sequence
-        _tmp = apply(:_blockhead)
-        head = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:__hyphen_)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_blockbody)
-        body = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:__hyphen_)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_blockend)
-        unless _tmp
-          self.pos = _save1
-        end
+      _tmp = apply(:_BlockHead)
+      c = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
         break
-      end # end sequence
-
-      if _tmp
-        text = get_text(_text_start)
       end
+      _tmp = apply(:_BlockBody)
+      content = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_BlockEnd)
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:block, head, body, raw: text) ; end
+      @result = begin; block(c[:name], c[:ids], c[:classes], c[:args], content); end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -1078,23 +1375,23 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_explicit_block unless _tmp
+    set_failed_rule :_ExplicitBlock unless _tmp
     return _tmp
   end
 
-  # preformatted_command = command:command &{ ['pre', 'precode'].include? command[:name] }
-  def _preformatted_command
+  # PreformattedCommand = Command:command &{ ['pre', 'code'].include? command[:name] }
+  def _PreformattedCommand
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_command)
+      _tmp = apply(:_Command)
       command = @result
       unless _tmp
         self.pos = _save
         break
       end
       _save1 = self.pos
-      _tmp = begin;  ['pre', 'precode'].include? command[:name] ; end
+      _tmp = begin;  ['pre', 'code'].include? command[:name] ; end
       self.pos = _save1
       unless _tmp
         self.pos = _save
@@ -1102,26 +1399,21 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_preformatted_command unless _tmp
+    set_failed_rule :_PreformattedCommand unless _tmp
     return _tmp
   end
 
-  # preformatted_command_head = lh - preformatted_command:command - "<<" &/[\w0-9]/ { command }
-  def _preformatted_command_head
+  # PreformattedCommandHeadSimple = - PreformattedCommand:command - "{" - Nl { command }
+  def _PreformattedCommandHeadSimple
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_lh)
-      unless _tmp
-        self.pos = _save
-        break
-      end
       _tmp = apply(:__hyphen_)
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = apply(:_preformatted_command)
+      _tmp = apply(:_PreformattedCommand)
       command = @result
       unless _tmp
         self.pos = _save
@@ -1132,14 +1424,17 @@ class NoraMark::Parser < KPeg::CompiledParser
         self.pos = _save
         break
       end
-      _tmp = match_string("<<")
+      _tmp = match_string("{")
       unless _tmp
         self.pos = _save
         break
       end
-      _save1 = self.pos
-      _tmp = scan(/\A(?-mix:[\w0-9])/)
-      self.pos = _save1
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_Nl)
       unless _tmp
         self.pos = _save
         break
@@ -1152,172 +1447,341 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_preformatted_command_head unless _tmp
+    set_failed_rule :_PreformattedCommandHeadSimple unless _tmp
     return _tmp
   end
 
-  # preformat_end = lh word:delimiter &{ delimiter == start }
-  def _preformat_end(start)
+  # PreformattedCommandHeadComplex = - PreformattedCommand:command - "{//" Word?:codelanguage - Nl { command.merge({codelanguage: codelanguage}) }
+  def _PreformattedCommandHeadComplex
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_lh)
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_PreformattedCommand)
+      command = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = apply(:_word)
-      delimiter = @result
+      _tmp = match_string("{//")
       unless _tmp
         self.pos = _save
         break
       end
       _save1 = self.pos
-      _tmp = begin;  delimiter == start ; end
-      self.pos = _save1
+      _tmp = apply(:_Word)
+      @result = nil unless _tmp
+      unless _tmp
+        _tmp = true
+        self.pos = _save1
+      end
+      codelanguage = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_Nl)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  command.merge({codelanguage: codelanguage}) ; end
+      _tmp = true
       unless _tmp
         self.pos = _save
       end
       break
     end # end sequence
 
-    set_failed_rule :_preformat_end unless _tmp
+    set_failed_rule :_PreformattedCommandHeadComplex unless _tmp
     return _tmp
   end
 
-  # preformatted_block = < lh - preformatted_command_head:command !nl word:delimiter nl (!preformat_end(delimiter) lh charstring nl)+:content preformat_end(delimiter) > { create_item(:preformatted, command, content, raw: text) }
-  def _preformatted_block
+  # PreformattedCommandHead = (PreformattedCommandHeadComplex | PreformattedCommandHeadSimple)
+  def _PreformattedCommandHead
+
+    _save = self.pos
+    while true # choice
+      _tmp = apply(:_PreformattedCommandHeadComplex)
+      break if _tmp
+      self.pos = _save
+      _tmp = apply(:_PreformattedCommandHeadSimple)
+      break if _tmp
+      self.pos = _save
+      break
+    end # end choice
+
+    set_failed_rule :_PreformattedCommandHead unless _tmp
+    return _tmp
+  end
+
+  # PreformatEndSimple = - "}" - Le EmptyLine*
+  def _PreformatEndSimple
 
     _save = self.pos
     while true # sequence
-      _text_start = self.pos
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = match_string("}")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_Le)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      while true
+        _tmp = apply(:_EmptyLine)
+        break unless _tmp
+      end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_PreformatEndSimple unless _tmp
+    return _tmp
+  end
+
+  # PreformatEndComplex = - "//}" - Le EmptyLine*
+  def _PreformatEndComplex
+
+    _save = self.pos
+    while true # sequence
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = match_string("//}")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_Le)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      while true
+        _tmp = apply(:_EmptyLine)
+        break unless _tmp
+      end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
 
+    set_failed_rule :_PreformatEndComplex unless _tmp
+    return _tmp
+  end
+
+  # PreformattedBlockSimple = PreformattedCommandHeadSimple:c (!PreformatEndSimple CharString Nl)+:content PreformatEndSimple {preformatted_block(c[:name], c[:ids], c[:classes], c[:args], c[:codelanguage], content)}
+  def _PreformattedBlockSimple
+
+    _save = self.pos
+    while true # sequence
+      _tmp = apply(:_PreformattedCommandHeadSimple)
+      c = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
       _save1 = self.pos
+      _ary = []
+
+      _save2 = self.pos
       while true # sequence
-        _tmp = apply(:_lh)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:__hyphen_)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_preformatted_command_head)
-        command = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _save2 = self.pos
-        _tmp = apply(:_nl)
+        _save3 = self.pos
+        _tmp = apply(:_PreformatEndSimple)
         _tmp = _tmp ? nil : true
-        self.pos = _save2
+        self.pos = _save3
         unless _tmp
-          self.pos = _save1
+          self.pos = _save2
           break
         end
-        _tmp = apply(:_word)
-        delimiter = @result
+        _tmp = apply(:_CharString)
         unless _tmp
-          self.pos = _save1
+          self.pos = _save2
           break
         end
-        _tmp = apply(:_nl)
+        _tmp = apply(:_Nl)
         unless _tmp
-          self.pos = _save1
-          break
+          self.pos = _save2
         end
-        _save3 = self.pos
-        _ary = []
+        break
+      end # end sequence
 
-        _save4 = self.pos
-        while true # sequence
-          _save5 = self.pos
-          _tmp = apply_with_args(:_preformat_end, delimiter)
-          _tmp = _tmp ? nil : true
-          self.pos = _save5
-          unless _tmp
-            self.pos = _save4
-            break
-          end
-          _tmp = apply(:_lh)
-          unless _tmp
-            self.pos = _save4
-            break
-          end
-          _tmp = apply(:_charstring)
-          unless _tmp
-            self.pos = _save4
+      if _tmp
+        _ary << @result
+        while true
+
+          _save4 = self.pos
+          while true # sequence
+            _save5 = self.pos
+            _tmp = apply(:_PreformatEndSimple)
+            _tmp = _tmp ? nil : true
+            self.pos = _save5
+            unless _tmp
+              self.pos = _save4
+              break
+            end
+            _tmp = apply(:_CharString)
+            unless _tmp
+              self.pos = _save4
+              break
+            end
+            _tmp = apply(:_Nl)
+            unless _tmp
+              self.pos = _save4
+            end
             break
-          end
-          _tmp = apply(:_nl)
-          unless _tmp
-            self.pos = _save4
-          end
-          break
-        end # end sequence
+          end # end sequence
 
-        if _tmp
-          _ary << @result
-          while true
+          _ary << @result if _tmp
+          break unless _tmp
+        end
+        _tmp = true
+        @result = _ary
+      else
+        self.pos = _save1
+      end
+      content = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_PreformatEndSimple)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin; preformatted_block(c[:name], c[:ids], c[:classes], c[:args], c[:codelanguage], content); end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
 
-            _save6 = self.pos
-            while true # sequence
-              _save7 = self.pos
-              _tmp = apply_with_args(:_preformat_end, delimiter)
-              _tmp = _tmp ? nil : true
-              self.pos = _save7
-              unless _tmp
-                self.pos = _save6
-                break
-              end
-              _tmp = apply(:_lh)
-              unless _tmp
-                self.pos = _save6
-                break
-              end
-              _tmp = apply(:_charstring)
-              unless _tmp
-                self.pos = _save6
-                break
-              end
-              _tmp = apply(:_nl)
-              unless _tmp
-                self.pos = _save6
-              end
-              break
-            end # end sequence
+    set_failed_rule :_PreformattedBlockSimple unless _tmp
+    return _tmp
+  end
 
-            _ary << @result if _tmp
-            break unless _tmp
-          end
-          _tmp = true
-          @result = _ary
-        else
-          self.pos = _save3
+  # PreformattedBlockComplex = PreformattedCommandHeadComplex:c (!PreformatEndComplex CharString Nl)+:content PreformatEndComplex {preformatted_block(c[:name], c[:ids], c[:classes], c[:args], c[:codelanguage], content)}
+  def _PreformattedBlockComplex
+
+    _save = self.pos
+    while true # sequence
+      _tmp = apply(:_PreformattedCommandHeadComplex)
+      c = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save1 = self.pos
+      _ary = []
+
+      _save2 = self.pos
+      while true # sequence
+        _save3 = self.pos
+        _tmp = apply(:_PreformatEndComplex)
+        _tmp = _tmp ? nil : true
+        self.pos = _save3
+        unless _tmp
+          self.pos = _save2
+          break
         end
-        content = @result
+        _tmp = apply(:_CharString)
         unless _tmp
-          self.pos = _save1
+          self.pos = _save2
           break
         end
-        _tmp = apply_with_args(:_preformat_end, delimiter)
+        _tmp = apply(:_Nl)
         unless _tmp
-          self.pos = _save1
+          self.pos = _save2
         end
         break
       end # end sequence
 
       if _tmp
-        text = get_text(_text_start)
+        _ary << @result
+        while true
+
+          _save4 = self.pos
+          while true # sequence
+            _save5 = self.pos
+            _tmp = apply(:_PreformatEndComplex)
+            _tmp = _tmp ? nil : true
+            self.pos = _save5
+            unless _tmp
+              self.pos = _save4
+              break
+            end
+            _tmp = apply(:_CharString)
+            unless _tmp
+              self.pos = _save4
+              break
+            end
+            _tmp = apply(:_Nl)
+            unless _tmp
+              self.pos = _save4
+            end
+            break
+          end # end sequence
+
+          _ary << @result if _tmp
+          break unless _tmp
+        end
+        _tmp = true
+        @result = _ary
+      else
+        self.pos = _save1
       end
+      content = @result
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:preformatted, command, content, raw: text) ; end
+      _tmp = apply(:_PreformatEndComplex)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin; preformatted_block(c[:name], c[:ids], c[:classes], c[:args], c[:codelanguage], content); end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -1325,79 +1789,89 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_preformatted_block unless _tmp
+    set_failed_rule :_PreformattedBlockComplex unless _tmp
     return _tmp
   end
 
-  # inline = (img_inline | common_inline)
-  def _inline
+  # PreformattedBlock = (PreformattedBlockComplex | PreformattedBlockSimple)
+  def _PreformattedBlock
 
     _save = self.pos
     while true # choice
-      _tmp = apply(:_img_inline)
+      _tmp = apply(:_PreformattedBlockComplex)
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_common_inline)
+      _tmp = apply(:_PreformattedBlockSimple)
       break if _tmp
       self.pos = _save
       break
     end # end choice
 
-    set_failed_rule :_inline unless _tmp
+    set_failed_rule :_PreformattedBlock unless _tmp
     return _tmp
   end
 
-  # common_inline = < "[" command:c "{" documentcontent_except('}'):content "}" "]" > { create_item(:inline, c, content, raw: text) }
-  def _common_inline
+  # Inline = (ImgInline | CommonInline)
+  def _Inline
 
     _save = self.pos
-    while true # sequence
-      _text_start = self.pos
+    while true # choice
+      _tmp = apply(:_ImgInline)
+      break if _tmp
+      self.pos = _save
+      _tmp = apply(:_CommonInline)
+      break if _tmp
+      self.pos = _save
+      break
+    end # end choice
 
-      _save1 = self.pos
-      while true # sequence
-        _tmp = match_string("[")
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_command)
-        c = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = match_string("{")
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply_with_args(:_documentcontent_except, '}')
-        content = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = match_string("}")
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = match_string("]")
-        unless _tmp
-          self.pos = _save1
-        end
-        break
-      end # end sequence
+    set_failed_rule :_Inline unless _tmp
+    return _tmp
+  end
 
-      if _tmp
-        text = get_text(_text_start)
+  # CommonInline = "[" Command:c "{" - DocumentContentExcept('}'):content "}" "]" {inline(c[:name], c[:ids], c[:classes], c[:args], content)}
+  def _CommonInline
+
+    _save = self.pos
+    while true # sequence
+      _tmp = match_string("[")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_Command)
+      c = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = match_string("{")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply_with_args(:_DocumentContentExcept, '}')
+      content = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = match_string("}")
+      unless _tmp
+        self.pos = _save
+        break
       end
+      _tmp = match_string("]")
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:inline, c, content, raw: text) ; end
+      @result = begin; inline(c[:name], c[:ids], c[:classes], c[:args], content); end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -1405,16 +1879,16 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_common_inline unless _tmp
+    set_failed_rule :_CommonInline unless _tmp
     return _tmp
   end
 
-  # img_command = command:c &{ c[:name] == 'img' && c[:args].size == 2}
-  def _img_command
+  # ImgCommand = Command:c &{ c[:name] == 'img' && c[:args].size == 2}
+  def _ImgCommand
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_command)
+      _tmp = apply(:_Command)
       c = @result
       unless _tmp
         self.pos = _save
@@ -1429,45 +1903,32 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_img_command unless _tmp
+    set_failed_rule :_ImgCommand unless _tmp
     return _tmp
   end
 
-  # img_inline = < "[" img_command:c "]" > { create_item(:inline, c, nil, raw: text) }
-  def _img_inline
+  # ImgInline = "[" ImgCommand:c "]" {inline(c[:name], c[:ids], c[:classes], c[:args], nil)}
+  def _ImgInline
 
     _save = self.pos
     while true # sequence
-      _text_start = self.pos
-
-      _save1 = self.pos
-      while true # sequence
-        _tmp = match_string("[")
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_img_command)
-        c = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = match_string("]")
-        unless _tmp
-          self.pos = _save1
-        end
+      _tmp = match_string("[")
+      unless _tmp
+        self.pos = _save
         break
-      end # end sequence
-
-      if _tmp
-        text = get_text(_text_start)
       end
+      _tmp = apply(:_ImgCommand)
+      c = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = match_string("]")
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:inline, c, nil, raw: text) ; end
+      @result = begin; inline(c[:name], c[:ids], c[:classes], c[:args], nil); end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -1475,34 +1936,34 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_img_inline unless _tmp
+    set_failed_rule :_ImgInline unless _tmp
     return _tmp
   end
 
-  # commandname_for_special_line_command = (newpage_command | explicit_paragraph_command)
-  def _commandname_for_special_line_command
+  # CommandNameForSpecialLineCommand = (NewpageCommand | ExplicitParagraphCommand)
+  def _CommandNameForSpecialLineCommand
 
     _save = self.pos
     while true # choice
-      _tmp = apply(:_newpage_command)
+      _tmp = apply(:_NewpageCommand)
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_explicit_paragraph_command)
+      _tmp = apply(:_ExplicitParagraphCommand)
       break if _tmp
       self.pos = _save
       break
     end # end choice
 
-    set_failed_rule :_commandname_for_special_line_command unless _tmp
+    set_failed_rule :_CommandNameForSpecialLineCommand unless _tmp
     return _tmp
   end
 
-  # newpage_command = command:command &{ command[:name] == 'newpage' }
-  def _newpage_command
+  # NewpageCommand = Command:command &{ command[:name] == 'newpage' }
+  def _NewpageCommand
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_command)
+      _tmp = apply(:_Command)
       command = @result
       unless _tmp
         self.pos = _save
@@ -1517,72 +1978,59 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_newpage_command unless _tmp
+    set_failed_rule :_NewpageCommand unless _tmp
     return _tmp
   end
 
-  # newpage = < lh - newpage_command:c ":" documentcontent?:content - nl > { create_item(:newpage, c, content, raw:text) }
-  def _newpage
+  # Newpage = - NewpageCommand:c ":" - DocumentContent?:content - Nl {newpage(c[:ids],c[:classes],c[:args], content)}
+  def _Newpage
 
     _save = self.pos
     while true # sequence
-      _text_start = self.pos
-
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_NewpageCommand)
+      c = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = match_string(":")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
       _save1 = self.pos
-      while true # sequence
-        _tmp = apply(:_lh)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:__hyphen_)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_newpage_command)
-        c = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = match_string(":")
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _save2 = self.pos
-        _tmp = apply(:_documentcontent)
-        @result = nil unless _tmp
-        unless _tmp
-          _tmp = true
-          self.pos = _save2
-        end
-        content = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:__hyphen_)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_nl)
-        unless _tmp
-          self.pos = _save1
-        end
+      _tmp = apply(:_DocumentContent)
+      @result = nil unless _tmp
+      unless _tmp
+        _tmp = true
+        self.pos = _save1
+      end
+      content = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
         break
-      end # end sequence
-
-      if _tmp
-        text = get_text(_text_start)
       end
+      _tmp = apply(:_Nl)
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:newpage, c, content, raw:text) ; end
+      @result = begin; newpage(c[:ids],c[:classes],c[:args], content); end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -1590,16 +2038,16 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_newpage unless _tmp
+    set_failed_rule :_Newpage unless _tmp
     return _tmp
   end
 
-  # explicit_paragraph_command = command:c &{ c[:name] == 'p' }
-  def _explicit_paragraph_command
+  # ExplicitParagraphCommand = Command:c &{ c[:name] == 'p' }
+  def _ExplicitParagraphCommand
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_command)
+      _tmp = apply(:_Command)
       c = @result
       unless _tmp
         self.pos = _save
@@ -1614,76 +2062,138 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_explicit_paragraph_command unless _tmp
+    set_failed_rule :_ExplicitParagraphCommand unless _tmp
     return _tmp
   end
 
-  # explicit_paragraph = < lh - explicit_paragraph_command:c ":" documentcontent?:content le empty_line* > { create_item(:paragraph, c, content, raw:text) }
-  def _explicit_paragraph
+  # ExplicitParagraph = - ExplicitParagraphCommand:c ":" - DocumentContent?:content Le EmptyLine* {paragraph(c[:ids], c[:classes], c[:args], content)}
+  def _ExplicitParagraph
 
     _save = self.pos
     while true # sequence
-      _text_start = self.pos
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_ExplicitParagraphCommand)
+      c = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = match_string(":")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save1 = self.pos
+      _tmp = apply(:_DocumentContent)
+      @result = nil unless _tmp
+      unless _tmp
+        _tmp = true
+        self.pos = _save1
+      end
+      content = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_Le)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      while true
+        _tmp = apply(:_EmptyLine)
+        break unless _tmp
+      end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin; paragraph(c[:ids], c[:classes], c[:args], content); end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
 
+    set_failed_rule :_ExplicitParagraph unless _tmp
+    return _tmp
+  end
+
+  # UnorderedList = UnorderedItem+:items {unordered_list([],[],[], items)}
+  def _UnorderedList
+
+    _save = self.pos
+    while true # sequence
       _save1 = self.pos
-      while true # sequence
-        _tmp = apply(:_lh)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:__hyphen_)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_explicit_paragraph_command)
-        c = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = match_string(":")
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _save2 = self.pos
-        _tmp = apply(:_documentcontent)
-        @result = nil unless _tmp
-        unless _tmp
-          _tmp = true
-          self.pos = _save2
-        end
-        content = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_le)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
+      _ary = []
+      _tmp = apply(:_UnorderedItem)
+      if _tmp
+        _ary << @result
         while true
-          _tmp = apply(:_empty_line)
+          _tmp = apply(:_UnorderedItem)
+          _ary << @result if _tmp
           break unless _tmp
         end
         _tmp = true
-        unless _tmp
-          self.pos = _save1
-        end
+        @result = _ary
+      else
+        self.pos = _save1
+      end
+      items = @result
+      unless _tmp
+        self.pos = _save
         break
-      end # end sequence
+      end
+      @result = begin; unordered_list([],[],[], items); end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
 
-      if _tmp
-        text = get_text(_text_start)
+    set_failed_rule :_UnorderedList unless _tmp
+    return _tmp
+  end
+
+  # UnorderedItem = "*:" - DocumentContent:content Le {ul_item([], [], [], content)}
+  def _UnorderedItem
+
+    _save = self.pos
+    while true # sequence
+      _tmp = match_string("*:")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_DocumentContent)
+      content = @result
+      unless _tmp
+        self.pos = _save
+        break
       end
+      _tmp = apply(:_Le)
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:paragraph, c, content, raw:text) ; end
+      @result = begin; ul_item([], [], [], content); end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -1691,23 +2201,22 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_explicit_paragraph unless _tmp
+    set_failed_rule :_UnorderedItem unless _tmp
     return _tmp
   end
 
-  # unordered_list = < unordered_item+:items > { create_item(:ul, nil, items, raw: text) }
-  def _unordered_list
+  # OrderedList = OrderedItem+:items {ordered_list([],[],[], items)}
+  def _OrderedList
 
     _save = self.pos
     while true # sequence
-      _text_start = self.pos
       _save1 = self.pos
       _ary = []
-      _tmp = apply(:_unordered_item)
+      _tmp = apply(:_OrderedItem)
       if _tmp
         _ary << @result
         while true
-          _tmp = apply(:_unordered_item)
+          _tmp = apply(:_OrderedItem)
           _ary << @result if _tmp
           break unless _tmp
         end
@@ -1717,14 +2226,11 @@ class NoraMark::Parser < KPeg::CompiledParser
         self.pos = _save1
       end
       items = @result
-      if _tmp
-        text = get_text(_text_start)
-      end
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:ul, nil, items, raw: text) ; end
+      @result = begin; ordered_list([],[],[], items); end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -1732,50 +2238,42 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_unordered_list unless _tmp
+    set_failed_rule :_OrderedList unless _tmp
     return _tmp
   end
 
-  # unordered_item = < lh "*:" documentcontent:content le > { create_item(:li, nil, content, raw: text) }
-  def _unordered_item
+  # OrderedItem = Num ":" - DocumentContent:content Le {ol_item([], [], [], content)}
+  def _OrderedItem
 
     _save = self.pos
     while true # sequence
-      _text_start = self.pos
-
-      _save1 = self.pos
-      while true # sequence
-        _tmp = apply(:_lh)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = match_string("*:")
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_documentcontent)
-        content = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_le)
-        unless _tmp
-          self.pos = _save1
-        end
+      _tmp = apply(:_Num)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = match_string(":")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_DocumentContent)
+      content = @result
+      unless _tmp
+        self.pos = _save
         break
-      end # end sequence
-
-      if _tmp
-        text = get_text(_text_start)
       end
+      _tmp = apply(:_Le)
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:li, nil, content, raw: text) ; end
+      @result = begin; ol_item([], [], [], content); end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -1783,23 +2281,22 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_unordered_item unless _tmp
+    set_failed_rule :_OrderedItem unless _tmp
     return _tmp
   end
 
-  # ordered_list = < ordered_item+:items > { create_item(:ol, nil, items, raw: text) }
-  def _ordered_list
+  # DefinitionList = DefinitionItem+:items {definition_list([], [], [], items)}
+  def _DefinitionList
 
     _save = self.pos
     while true # sequence
-      _text_start = self.pos
       _save1 = self.pos
       _ary = []
-      _tmp = apply(:_ordered_item)
+      _tmp = apply(:_DefinitionItem)
       if _tmp
         _ary << @result
         while true
-          _tmp = apply(:_ordered_item)
+          _tmp = apply(:_DefinitionItem)
           _ary << @result if _tmp
           break unless _tmp
         end
@@ -1809,14 +2306,11 @@ class NoraMark::Parser < KPeg::CompiledParser
         self.pos = _save1
       end
       items = @result
-      if _tmp
-        text = get_text(_text_start)
-      end
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:ol, nil, items, raw: text) ; end
+      @result = begin; definition_list([], [], [], items); end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -1824,55 +2318,58 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_ordered_list unless _tmp
+    set_failed_rule :_DefinitionList unless _tmp
     return _tmp
   end
 
-  # ordered_item = < lh num ":" documentcontent:content le > { create_item(:li, nil, content, raw: text) }
-  def _ordered_item
+  # DefinitionItem = - ";:" - DocumentContentExcept(':'):term ":" - DocumentContent:definition Le {dl_item([], [], [term], definition)}
+  def _DefinitionItem
 
     _save = self.pos
     while true # sequence
-      _text_start = self.pos
-
-      _save1 = self.pos
-      while true # sequence
-        _tmp = apply(:_lh)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_num)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = match_string(":")
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_documentcontent)
-        content = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_le)
-        unless _tmp
-          self.pos = _save1
-        end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = match_string(";:")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
         break
-      end # end sequence
-
-      if _tmp
-        text = get_text(_text_start)
       end
+      _tmp = apply_with_args(:_DocumentContentExcept, ':')
+      term = @result
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:li, nil, content, raw: text) ; end
+      _tmp = match_string(":")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_DocumentContent)
+      definition = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_Le)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin; dl_item([], [], [term], definition); end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -1880,23 +2377,22 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_ordered_item unless _tmp
+    set_failed_rule :_DefinitionItem unless _tmp
     return _tmp
   end
 
-  # definition_list = < definition_item+:items > { create_item(:dl, nil, items, raw: text) }
-  def _definition_list
+  # LongDefinitionList = LongDefinitionItem+:items {definition_list([], [], [], items)}
+  def _LongDefinitionList
 
     _save = self.pos
     while true # sequence
-      _text_start = self.pos
       _save1 = self.pos
       _ary = []
-      _tmp = apply(:_definition_item)
+      _tmp = apply(:_LongDefinitionItem)
       if _tmp
         _ary << @result
         while true
-          _tmp = apply(:_definition_item)
+          _tmp = apply(:_LongDefinitionItem)
           _ary << @result if _tmp
           break unless _tmp
         end
@@ -1906,14 +2402,11 @@ class NoraMark::Parser < KPeg::CompiledParser
         self.pos = _save1
       end
       items = @result
-      if _tmp
-        text = get_text(_text_start)
-      end
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:dl, nil, items, raw: text) ; end
+      @result = begin; definition_list([], [], [], items); end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -1921,71 +2414,73 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_definition_list unless _tmp
+    set_failed_rule :_LongDefinitionList unless _tmp
     return _tmp
   end
 
-  # definition_item = < lh ";:" - documentcontent_except(':'):term ":" - documentcontent:definition le > { create_item(:dtdd, {:args => [term, definition]}, nil, raw: text) }
-  def _definition_item
+  # LongDefinitionItem = - ";:" - DocumentContentExcept('{'):term "{" - Nl - BlockBody:definition - BlockEnd {dl_item([], [], [term], definition)}
+  def _LongDefinitionItem
 
     _save = self.pos
     while true # sequence
-      _text_start = self.pos
-
-      _save1 = self.pos
-      while true # sequence
-        _tmp = apply(:_lh)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = match_string(";:")
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:__hyphen_)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply_with_args(:_documentcontent_except, ':')
-        term = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = match_string(":")
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:__hyphen_)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_documentcontent)
-        definition = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_le)
-        unless _tmp
-          self.pos = _save1
-        end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = match_string(";:")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply_with_args(:_DocumentContentExcept, '{')
+      term = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = match_string("{")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_Nl)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_BlockBody)
+      definition = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
         break
-      end # end sequence
-
-      if _tmp
-        text = get_text(_text_start)
       end
+      _tmp = apply(:_BlockEnd)
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:dtdd, {:args => [term, definition]}, nil, raw: text) ; end
+      @result = begin; dl_item([], [], [term], definition); end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -1993,110 +2488,100 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_definition_item unless _tmp
+    set_failed_rule :_LongDefinitionItem unless _tmp
     return _tmp
   end
 
-  # items_list = (unordered_list | ordered_list | definition_list)
-  def _items_list
+  # ItemsList = (UnorderedList | OrderedList | DefinitionList | LongDefinitionList)
+  def _ItemsList
 
     _save = self.pos
     while true # choice
-      _tmp = apply(:_unordered_list)
+      _tmp = apply(:_UnorderedList)
+      break if _tmp
+      self.pos = _save
+      _tmp = apply(:_OrderedList)
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_ordered_list)
+      _tmp = apply(:_DefinitionList)
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_definition_list)
+      _tmp = apply(:_LongDefinitionList)
       break if _tmp
       self.pos = _save
       break
     end # end choice
 
-    set_failed_rule :_items_list unless _tmp
+    set_failed_rule :_ItemsList unless _tmp
     return _tmp
   end
 
-  # line_command = < lh - !commandname_for_special_line_command command:c ":" documentcontent?:content - le empty_line* > { create_item(:line_command, c, content, raw: text) }
-  def _line_command
+  # LineCommand = - !CommandNameForSpecialLineCommand Command:c ":" - DocumentContent?:content - Le EmptyLine* {line_command(c[:name], c[:ids], c[:classes], c[:args], content)}
+  def _LineCommand
 
     _save = self.pos
     while true # sequence
-      _text_start = self.pos
-
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
       _save1 = self.pos
-      while true # sequence
-        _tmp = apply(:_lh)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:__hyphen_)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _save2 = self.pos
-        _tmp = apply(:_commandname_for_special_line_command)
-        _tmp = _tmp ? nil : true
-        self.pos = _save2
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_command)
-        c = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = match_string(":")
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _save3 = self.pos
-        _tmp = apply(:_documentcontent)
-        @result = nil unless _tmp
-        unless _tmp
-          _tmp = true
-          self.pos = _save3
-        end
-        content = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:__hyphen_)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_le)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        while true
-          _tmp = apply(:_empty_line)
-          break unless _tmp
-        end
+      _tmp = apply(:_CommandNameForSpecialLineCommand)
+      _tmp = _tmp ? nil : true
+      self.pos = _save1
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_Command)
+      c = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = match_string(":")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save2 = self.pos
+      _tmp = apply(:_DocumentContent)
+      @result = nil unless _tmp
+      unless _tmp
         _tmp = true
-        unless _tmp
-          self.pos = _save1
-        end
+        self.pos = _save2
+      end
+      content = @result
+      unless _tmp
+        self.pos = _save
         break
-      end # end sequence
-
-      if _tmp
-        text = get_text(_text_start)
       end
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_Le)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      while true
+        _tmp = apply(:_EmptyLine)
+        break unless _tmp
+      end
+      _tmp = true
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:line_command, c, content, raw: text) ; end
+      @result = begin; line_command(c[:name], c[:ids], c[:classes], c[:args], content); end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -2104,51 +2589,60 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_line_command unless _tmp
+    set_failed_rule :_LineCommand unless _tmp
     return _tmp
   end
 
-  # line_block = (items_list | line_command)
-  def _line_block
+  # LineBlock = (ItemsList | LineCommand)
+  def _LineBlock
 
     _save = self.pos
     while true # choice
-      _tmp = apply(:_items_list)
+      _tmp = apply(:_ItemsList)
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_line_command)
+      _tmp = apply(:_LineCommand)
       break if _tmp
       self.pos = _save
       break
     end # end choice
 
-    set_failed_rule :_line_block unless _tmp
+    set_failed_rule :_LineBlock unless _tmp
     return _tmp
   end
 
-  # block = (preformatted_block | headed_section | line_block | explicit_block | paragraph_group):block empty_line* {block}
-  def _block
+  # Block = EmptyLine* (PreformattedBlock | HeadedSection | LineBlock | ExplicitBlock | ParagraphGroup):block EmptyLine* {block}
+  def _Block
 
     _save = self.pos
     while true # sequence
+      while true
+        _tmp = apply(:_EmptyLine)
+        break unless _tmp
+      end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+        break
+      end
 
-      _save1 = self.pos
+      _save2 = self.pos
       while true # choice
-        _tmp = apply(:_preformatted_block)
+        _tmp = apply(:_PreformattedBlock)
         break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_headed_section)
+        self.pos = _save2
+        _tmp = apply(:_HeadedSection)
         break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_line_block)
+        self.pos = _save2
+        _tmp = apply(:_LineBlock)
         break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_explicit_block)
+        self.pos = _save2
+        _tmp = apply(:_ExplicitBlock)
         break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_paragraph_group)
+        self.pos = _save2
+        _tmp = apply(:_ParagraphGroup)
         break if _tmp
-        self.pos = _save1
+        self.pos = _save2
         break
       end # end choice
 
@@ -2158,7 +2652,7 @@ class NoraMark::Parser < KPeg::CompiledParser
         break
       end
       while true
-        _tmp = apply(:_empty_line)
+        _tmp = apply(:_EmptyLine)
         break unless _tmp
       end
       _tmp = true
@@ -2174,57 +2668,57 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_block unless _tmp
+    set_failed_rule :_Block unless _tmp
     return _tmp
   end
 
-  # block_delimiter = (blockhead | blockend)
-  def _block_delimiter
+  # BlockDelimiter = (BlockHead | BlockEnd)
+  def _BlockDelimiter
 
     _save = self.pos
     while true # choice
-      _tmp = apply(:_blockhead)
+      _tmp = apply(:_BlockHead)
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_blockend)
+      _tmp = apply(:_BlockEnd)
       break if _tmp
       self.pos = _save
       break
     end # end choice
 
-    set_failed_rule :_block_delimiter unless _tmp
+    set_failed_rule :_BlockDelimiter unless _tmp
     return _tmp
   end
 
-  # paragraph_delimiter = (block_delimiter | preformatted_command_head | line_block | newpage | headed_start)
-  def _paragraph_delimiter
+  # ParagraphDelimiter = (BlockDelimiter | PreformattedCommandHead | LineBlock | Newpage | HeadedStart)
+  def _ParagraphDelimiter
 
     _save = self.pos
     while true # choice
-      _tmp = apply(:_block_delimiter)
+      _tmp = apply(:_BlockDelimiter)
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_preformatted_command_head)
+      _tmp = apply(:_PreformattedCommandHead)
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_line_block)
+      _tmp = apply(:_LineBlock)
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_newpage)
+      _tmp = apply(:_Newpage)
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_headed_start)
+      _tmp = apply(:_HeadedStart)
       break if _tmp
       self.pos = _save
       break
     end # end choice
 
-    set_failed_rule :_paragraph_delimiter unless _tmp
+    set_failed_rule :_ParagraphDelimiter unless _tmp
     return _tmp
   end
 
-  # h_start_mark = < "="+ ":" > &{ text.length - 1 == n }
-  def _h_start_mark(n)
+  # HStartMark = < "="+ ":" > &{ text.length - 1 == n }
+  def _HStartMark(n)
 
     _save = self.pos
     while true # sequence
@@ -2270,20 +2764,15 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_h_start_mark unless _tmp
+    set_failed_rule :_HStartMark unless _tmp
     return _tmp
   end
 
-  # h_markup_terminator = lh - < "="+ ":" > &{ text.length - 1 <= n }
-  def _h_markup_terminator(n)
+  # HMarkupTerminator = - < "="+ ":" > &{ text.length - 1 <= n }
+  def _HMarkupTerminator(n)
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_lh)
-      unless _tmp
-        self.pos = _save
-        break
-      end
       _tmp = apply(:__hyphen_)
       unless _tmp
         self.pos = _save
@@ -2331,37 +2820,37 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_h_markup_terminator unless _tmp
+    set_failed_rule :_HMarkupTerminator unless _tmp
     return _tmp
   end
 
-  # h_start = lh - h_start_mark(n) charstring:s le { { level: n, heading: s } }
-  def _h_start(n)
+  # HStart = - HStartMark(n) - DocumentContent:s Le { { level: n, heading: s } }
+  def _HStart(n)
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_lh)
+      _tmp = apply(:__hyphen_)
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = apply(:__hyphen_)
+      _tmp = apply_with_args(:_HStartMark, n)
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = apply_with_args(:_h_start_mark, n)
+      _tmp = apply(:__hyphen_)
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = apply(:_charstring)
+      _tmp = apply(:_DocumentContent)
       s = @result
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = apply(:_le)
+      _tmp = apply(:_Le)
       unless _tmp
         self.pos = _save
         break
@@ -2374,105 +2863,60 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_h_start unless _tmp
+    set_failed_rule :_HStart unless _tmp
     return _tmp
   end
 
-  # h_section = < h_start(n):h (!h_markup_terminator(n) !eof block)+:content > { create_item(:h_section, h, content, raw: text) }
-  def _h_section(n)
+  # HSection = HStart(n):h (!HMarkupTerminator(n) !Eof Block)*:content {h_section(h[:level], h[:heading], content)}
+  def _HSection(n)
 
     _save = self.pos
     while true # sequence
-      _text_start = self.pos
+      _tmp = apply_with_args(:_HStart, n)
+      h = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _ary = []
+      while true
 
-      _save1 = self.pos
-      while true # sequence
-        _tmp = apply_with_args(:_h_start, n)
-        h = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
         _save2 = self.pos
-        _ary = []
-
-        _save3 = self.pos
         while true # sequence
-          _save4 = self.pos
-          _tmp = apply_with_args(:_h_markup_terminator, n)
+          _save3 = self.pos
+          _tmp = apply_with_args(:_HMarkupTerminator, n)
           _tmp = _tmp ? nil : true
-          self.pos = _save4
+          self.pos = _save3
           unless _tmp
-            self.pos = _save3
+            self.pos = _save2
             break
           end
-          _save5 = self.pos
-          _tmp = apply(:_eof)
+          _save4 = self.pos
+          _tmp = apply(:_Eof)
           _tmp = _tmp ? nil : true
-          self.pos = _save5
+          self.pos = _save4
           unless _tmp
-            self.pos = _save3
+            self.pos = _save2
             break
           end
-          _tmp = apply(:_block)
+          _tmp = apply(:_Block)
           unless _tmp
-            self.pos = _save3
+            self.pos = _save2
           end
           break
         end # end sequence
 
-        if _tmp
-          _ary << @result
-          while true
-
-            _save6 = self.pos
-            while true # sequence
-              _save7 = self.pos
-              _tmp = apply_with_args(:_h_markup_terminator, n)
-              _tmp = _tmp ? nil : true
-              self.pos = _save7
-              unless _tmp
-                self.pos = _save6
-                break
-              end
-              _save8 = self.pos
-              _tmp = apply(:_eof)
-              _tmp = _tmp ? nil : true
-              self.pos = _save8
-              unless _tmp
-                self.pos = _save6
-                break
-              end
-              _tmp = apply(:_block)
-              unless _tmp
-                self.pos = _save6
-              end
-              break
-            end # end sequence
-
-            _ary << @result if _tmp
-            break unless _tmp
-          end
-          _tmp = true
-          @result = _ary
-        else
-          self.pos = _save2
-        end
-        content = @result
-        unless _tmp
-          self.pos = _save1
-        end
-        break
-      end # end sequence
-
-      if _tmp
-        text = get_text(_text_start)
+        _ary << @result if _tmp
+        break unless _tmp
       end
+      _tmp = true
+      @result = _ary
+      content = @result
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:h_section, h, content, raw: text) ; end
+      @result = begin; h_section(h[:level], h[:heading], content); end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -2480,370 +2924,203 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_h_section unless _tmp
+    set_failed_rule :_HSection unless _tmp
     return _tmp
   end
 
-  # headed_start = (h_start(1) | h_start(2) | h_start(3) | h_start(4) | h_start(5) | h_start(6))
-  def _headed_start
+  # HeadedStart = (HStart(1) | HStart(2) | HStart(3) | HStart(4) | HStart(5) | HStart(6))
+  def _HeadedStart
 
     _save = self.pos
     while true # choice
-      _tmp = apply_with_args(:_h_start, 1)
+      _tmp = apply_with_args(:_HStart, 1)
       break if _tmp
       self.pos = _save
-      _tmp = apply_with_args(:_h_start, 2)
+      _tmp = apply_with_args(:_HStart, 2)
       break if _tmp
       self.pos = _save
-      _tmp = apply_with_args(:_h_start, 3)
+      _tmp = apply_with_args(:_HStart, 3)
       break if _tmp
       self.pos = _save
-      _tmp = apply_with_args(:_h_start, 4)
+      _tmp = apply_with_args(:_HStart, 4)
       break if _tmp
       self.pos = _save
-      _tmp = apply_with_args(:_h_start, 5)
+      _tmp = apply_with_args(:_HStart, 5)
       break if _tmp
       self.pos = _save
-      _tmp = apply_with_args(:_h_start, 6)
+      _tmp = apply_with_args(:_HStart, 6)
       break if _tmp
       self.pos = _save
       break
     end # end choice
 
-    set_failed_rule :_headed_start unless _tmp
+    set_failed_rule :_HeadedStart unless _tmp
     return _tmp
   end
 
-  # headed_section = (h_section(1) | h_section(2) | h_section(3) | h_section(4) | h_section(5) | h_section(6))
-  def _headed_section
+  # HeadedSection = (HSection(1) | HSection(2) | HSection(3) | HSection(4) | HSection(5) | HSection(6))
+  def _HeadedSection
 
     _save = self.pos
     while true # choice
-      _tmp = apply_with_args(:_h_section, 1)
+      _tmp = apply_with_args(:_HSection, 1)
       break if _tmp
       self.pos = _save
-      _tmp = apply_with_args(:_h_section, 2)
+      _tmp = apply_with_args(:_HSection, 2)
       break if _tmp
       self.pos = _save
-      _tmp = apply_with_args(:_h_section, 3)
+      _tmp = apply_with_args(:_HSection, 3)
       break if _tmp
       self.pos = _save
-      _tmp = apply_with_args(:_h_section, 4)
+      _tmp = apply_with_args(:_HSection, 4)
       break if _tmp
       self.pos = _save
-      _tmp = apply_with_args(:_h_section, 5)
+      _tmp = apply_with_args(:_HSection, 5)
       break if _tmp
       self.pos = _save
-      _tmp = apply_with_args(:_h_section, 6)
+      _tmp = apply_with_args(:_HSection, 6)
       break if _tmp
       self.pos = _save
       break
     end # end choice
 
-    set_failed_rule :_headed_section unless _tmp
+    set_failed_rule :_HeadedSection unless _tmp
     return _tmp
   end
 
-  # stylesheets = < lh - "stylesheets:" !le charstring:s nl > { create_item(:stylesheets, {:stylesheets => s.split(',').map(&:strip)}, nil, raw:text) }
-  def _stylesheets
+  # FrontmatterSeparator = - "---" - Nl
+  def _FrontmatterSeparator
 
     _save = self.pos
     while true # sequence
-      _text_start = self.pos
-
-      _save1 = self.pos
-      while true # sequence
-        _tmp = apply(:_lh)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:__hyphen_)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = match_string("stylesheets:")
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _save2 = self.pos
-        _tmp = apply(:_le)
-        _tmp = _tmp ? nil : true
-        self.pos = _save2
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_charstring)
-        s = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_nl)
-        unless _tmp
-          self.pos = _save1
-        end
-        break
-      end # end sequence
-
-      if _tmp
-        text = get_text(_text_start)
-      end
+      _tmp = apply(:__hyphen_)
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:stylesheets, {:stylesheets => s.split(',').map(&:strip)}, nil, raw:text) ; end
-      _tmp = true
+      _tmp = match_string("---")
       unless _tmp
         self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_stylesheets unless _tmp
-    return _tmp
-  end
-
-  # title = < lh - "title:" !le charstring:t nl > { create_item(:title, {:title => t }, nil, raw:text) }
-  def _title
-
-    _save = self.pos
-    while true # sequence
-      _text_start = self.pos
-
-      _save1 = self.pos
-      while true # sequence
-        _tmp = apply(:_lh)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:__hyphen_)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = match_string("title:")
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _save2 = self.pos
-        _tmp = apply(:_le)
-        _tmp = _tmp ? nil : true
-        self.pos = _save2
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_charstring)
-        t = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_nl)
-        unless _tmp
-          self.pos = _save1
-        end
         break
-      end # end sequence
-
-      if _tmp
-        text = get_text(_text_start)
       end
+      _tmp = apply(:__hyphen_)
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:title, {:title => t }, nil, raw:text) ; end
-      _tmp = true
+      _tmp = apply(:_Nl)
       unless _tmp
         self.pos = _save
       end
       break
     end # end sequence
 
-    set_failed_rule :_title unless _tmp
+    set_failed_rule :_FrontmatterSeparator unless _tmp
     return _tmp
   end
 
-  # lang = < lh - "lang:" !le charstring:l nl > { create_item(:lang, {:lang => l }, nil, raw:text) }
-  def _lang
+  # Frontmatter = FrontmatterSeparator (!FrontmatterSeparator CharString Nl)+:yaml FrontmatterSeparator EmptyLine* {frontmatter(yaml)}
+  def _Frontmatter
 
     _save = self.pos
     while true # sequence
-      _text_start = self.pos
-
-      _save1 = self.pos
-      while true # sequence
-        _tmp = apply(:_lh)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:__hyphen_)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = match_string("lang:")
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _save2 = self.pos
-        _tmp = apply(:_le)
-        _tmp = _tmp ? nil : true
-        self.pos = _save2
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_charstring)
-        l = @result
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:_nl)
-        unless _tmp
-          self.pos = _save1
-        end
-        break
-      end # end sequence
-
-      if _tmp
-        text = get_text(_text_start)
-      end
+      _tmp = apply(:_FrontmatterSeparator)
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:lang, {:lang => l }, nil, raw:text) ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_lang unless _tmp
-    return _tmp
-  end
-
-  # paragraph_style = < lh - "paragraph-style:" !le charstring:l nl > { create_item(:paragraph_style, {:paragraph_style => l }, nil, raw:text) }
-  def _paragraph_style
-
-    _save = self.pos
-    while true # sequence
-      _text_start = self.pos
-
       _save1 = self.pos
+      _ary = []
+
+      _save2 = self.pos
       while true # sequence
-        _tmp = apply(:_lh)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = apply(:__hyphen_)
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _tmp = match_string("paragraph-style:")
-        unless _tmp
-          self.pos = _save1
-          break
-        end
-        _save2 = self.pos
-        _tmp = apply(:_le)
+        _save3 = self.pos
+        _tmp = apply(:_FrontmatterSeparator)
         _tmp = _tmp ? nil : true
-        self.pos = _save2
+        self.pos = _save3
         unless _tmp
-          self.pos = _save1
+          self.pos = _save2
           break
         end
-        _tmp = apply(:_charstring)
-        l = @result
+        _tmp = apply(:_CharString)
         unless _tmp
-          self.pos = _save1
+          self.pos = _save2
           break
         end
-        _tmp = apply(:_nl)
+        _tmp = apply(:_Nl)
         unless _tmp
-          self.pos = _save1
+          self.pos = _save2
         end
         break
       end # end sequence
 
       if _tmp
-        text = get_text(_text_start)
+        _ary << @result
+        while true
+
+          _save4 = self.pos
+          while true # sequence
+            _save5 = self.pos
+            _tmp = apply(:_FrontmatterSeparator)
+            _tmp = _tmp ? nil : true
+            self.pos = _save5
+            unless _tmp
+              self.pos = _save4
+              break
+            end
+            _tmp = apply(:_CharString)
+            unless _tmp
+              self.pos = _save4
+              break
+            end
+            _tmp = apply(:_Nl)
+            unless _tmp
+              self.pos = _save4
+            end
+            break
+          end # end sequence
+
+          _ary << @result if _tmp
+          break unless _tmp
+        end
+        _tmp = true
+        @result = _ary
+      else
+        self.pos = _save1
       end
+      yaml = @result
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:paragraph_style, {:paragraph_style => l }, nil, raw:text) ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_paragraph_style unless _tmp
-    return _tmp
-  end
-
-  # header = (stylesheets | title | lang | paragraph_style) empty_line*
-  def _header
-
-    _save = self.pos
-    while true # sequence
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = apply(:_stylesheets)
-        break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_title)
-        break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_lang)
-        break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_paragraph_style)
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
+      _tmp = apply(:_FrontmatterSeparator)
       unless _tmp
         self.pos = _save
         break
       end
       while true
-        _tmp = apply(:_empty_line)
+        _tmp = apply(:_EmptyLine)
         break unless _tmp
       end
       _tmp = true
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin; frontmatter(yaml); end
+      _tmp = true
       unless _tmp
         self.pos = _save
       end
       break
     end # end sequence
 
-    set_failed_rule :_header unless _tmp
+    set_failed_rule :_Frontmatter unless _tmp
     return _tmp
   end
 
-  # char = < /[[:print:]]/ > { text }
-  def _char
+  # Char = < /[[:print:]]/ > { text }
+  def _Char
 
     _save = self.pos
     while true # sequence
@@ -2864,18 +3141,18 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_char unless _tmp
+    set_failed_rule :_Char unless _tmp
     return _tmp
   end
 
-  # charstring = < char* > { text }
-  def _charstring
+  # CharString = < Char* > { text }
+  def _CharString
 
     _save = self.pos
     while true # sequence
       _text_start = self.pos
       while true
-        _tmp = apply(:_char)
+        _tmp = apply(:_Char)
         break unless _tmp
       end
       _tmp = true
@@ -2894,16 +3171,16 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_charstring unless _tmp
+    set_failed_rule :_CharString unless _tmp
     return _tmp
   end
 
-  # char_except = char:c &{ c != e }
-  def _char_except(e)
+  # CharExcept = Char:c &{ c != e }
+  def _CharExcept(e)
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_char)
+      _tmp = apply(:_Char)
       c = @result
       unless _tmp
         self.pos = _save
@@ -2918,21 +3195,61 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_char_except unless _tmp
+    set_failed_rule :_CharExcept unless _tmp
     return _tmp
   end
 
-  # charstring_except = < char_except(e)* > { text }
-  def _charstring_except(e)
+  # DocumentTextExcept = < (!Inline CharExcept(e))+ > {text(text)}
+  def _DocumentTextExcept(e)
 
     _save = self.pos
     while true # sequence
       _text_start = self.pos
-      while true
-        _tmp = apply_with_args(:_char_except, e)
-        break unless _tmp
+      _save1 = self.pos
+
+      _save2 = self.pos
+      while true # sequence
+        _save3 = self.pos
+        _tmp = apply(:_Inline)
+        _tmp = _tmp ? nil : true
+        self.pos = _save3
+        unless _tmp
+          self.pos = _save2
+          break
+        end
+        _tmp = apply_with_args(:_CharExcept, e)
+        unless _tmp
+          self.pos = _save2
+        end
+        break
+      end # end sequence
+
+      if _tmp
+        while true
+
+          _save4 = self.pos
+          while true # sequence
+            _save5 = self.pos
+            _tmp = apply(:_Inline)
+            _tmp = _tmp ? nil : true
+            self.pos = _save5
+            unless _tmp
+              self.pos = _save4
+              break
+            end
+            _tmp = apply_with_args(:_CharExcept, e)
+            unless _tmp
+              self.pos = _save4
+            end
+            break
+          end # end sequence
+
+          break unless _tmp
+        end
+        _tmp = true
+      else
+        self.pos = _save1
       end
-      _tmp = true
       if _tmp
         text = get_text(_text_start)
       end
@@ -2940,7 +3257,7 @@ class NoraMark::Parser < KPeg::CompiledParser
         self.pos = _save
         break
       end
-      @result = begin;  text ; end
+      @result = begin; text(text); end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -2948,12 +3265,12 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_charstring_except unless _tmp
+    set_failed_rule :_DocumentTextExcept unless _tmp
     return _tmp
   end
 
-  # documentcontent_except = (inline | !inline char_except(e))+:content {parse_text(content)}
-  def _documentcontent_except(e)
+  # DocumentContentExcept = (Inline | DocumentTextExcept(e))+:content { content }
+  def _DocumentContentExcept(e)
 
     _save = self.pos
     while true # sequence
@@ -2962,27 +3279,10 @@ class NoraMark::Parser < KPeg::CompiledParser
 
       _save2 = self.pos
       while true # choice
-        _tmp = apply(:_inline)
+        _tmp = apply(:_Inline)
         break if _tmp
         self.pos = _save2
-
-        _save3 = self.pos
-        while true # sequence
-          _save4 = self.pos
-          _tmp = apply(:_inline)
-          _tmp = _tmp ? nil : true
-          self.pos = _save4
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _tmp = apply_with_args(:_char_except, e)
-          unless _tmp
-            self.pos = _save3
-          end
-          break
-        end # end sequence
-
+        _tmp = apply_with_args(:_DocumentTextExcept, e)
         break if _tmp
         self.pos = _save2
         break
@@ -2992,31 +3292,14 @@ class NoraMark::Parser < KPeg::CompiledParser
         _ary << @result
         while true
 
-          _save5 = self.pos
+          _save3 = self.pos
           while true # choice
-            _tmp = apply(:_inline)
+            _tmp = apply(:_Inline)
             break if _tmp
-            self.pos = _save5
-
-            _save6 = self.pos
-            while true # sequence
-              _save7 = self.pos
-              _tmp = apply(:_inline)
-              _tmp = _tmp ? nil : true
-              self.pos = _save7
-              unless _tmp
-                self.pos = _save6
-                break
-              end
-              _tmp = apply_with_args(:_char_except, e)
-              unless _tmp
-                self.pos = _save6
-              end
-              break
-            end # end sequence
-
+            self.pos = _save3
+            _tmp = apply_with_args(:_DocumentTextExcept, e)
             break if _tmp
-            self.pos = _save5
+            self.pos = _save3
             break
           end # end choice
 
@@ -3033,7 +3316,7 @@ class NoraMark::Parser < KPeg::CompiledParser
         self.pos = _save
         break
       end
-      @result = begin; parse_text(content); end
+      @result = begin;  content ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -3041,92 +3324,69 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_documentcontent_except unless _tmp
+    set_failed_rule :_DocumentContentExcept unless _tmp
     return _tmp
   end
 
-  # documentcontent = (inline | !inline char)+:content {parse_text(content)}
-  def _documentcontent
+  # DocumentText = < (!Inline Char)+ > {text(text)}
+  def _DocumentText
 
     _save = self.pos
     while true # sequence
+      _text_start = self.pos
       _save1 = self.pos
-      _ary = []
 
       _save2 = self.pos
-      while true # choice
-        _tmp = apply(:_inline)
-        break if _tmp
-        self.pos = _save2
-
+      while true # sequence
         _save3 = self.pos
-        while true # sequence
-          _save4 = self.pos
-          _tmp = apply(:_inline)
-          _tmp = _tmp ? nil : true
-          self.pos = _save4
-          unless _tmp
-            self.pos = _save3
-            break
-          end
-          _tmp = apply(:_char)
-          unless _tmp
-            self.pos = _save3
-          end
+        _tmp = apply(:_Inline)
+        _tmp = _tmp ? nil : true
+        self.pos = _save3
+        unless _tmp
+          self.pos = _save2
           break
-        end # end sequence
-
-        break if _tmp
-        self.pos = _save2
+        end
+        _tmp = apply(:_Char)
+        unless _tmp
+          self.pos = _save2
+        end
         break
-      end # end choice
+      end # end sequence
 
       if _tmp
-        _ary << @result
         while true
 
-          _save5 = self.pos
-          while true # choice
-            _tmp = apply(:_inline)
-            break if _tmp
+          _save4 = self.pos
+          while true # sequence
+            _save5 = self.pos
+            _tmp = apply(:_Inline)
+            _tmp = _tmp ? nil : true
             self.pos = _save5
-
-            _save6 = self.pos
-            while true # sequence
-              _save7 = self.pos
-              _tmp = apply(:_inline)
-              _tmp = _tmp ? nil : true
-              self.pos = _save7
-              unless _tmp
-                self.pos = _save6
-                break
-              end
-              _tmp = apply(:_char)
-              unless _tmp
-                self.pos = _save6
-              end
+            unless _tmp
+              self.pos = _save4
               break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save5
+            end
+            _tmp = apply(:_Char)
+            unless _tmp
+              self.pos = _save4
+            end
             break
-          end # end choice
+          end # end sequence
 
-          _ary << @result if _tmp
           break unless _tmp
         end
         _tmp = true
-        @result = _ary
       else
         self.pos = _save1
       end
-      content = @result
+      if _tmp
+        text = get_text(_text_start)
+      end
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin; parse_text(content); end
+      @result = begin; text(text); end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -3134,31 +3394,57 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_documentcontent unless _tmp
+    set_failed_rule :_DocumentText unless _tmp
     return _tmp
   end
 
-  # documentline = lh documentcontent:content le { content }
-  def _documentline
+  # DocumentContent = (Inline | DocumentText)+:content { content }
+  def _DocumentContent
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_lh)
-      unless _tmp
-        self.pos = _save
+      _save1 = self.pos
+      _ary = []
+
+      _save2 = self.pos
+      while true # choice
+        _tmp = apply(:_Inline)
+        break if _tmp
+        self.pos = _save2
+        _tmp = apply(:_DocumentText)
+        break if _tmp
+        self.pos = _save2
         break
+      end # end choice
+
+      if _tmp
+        _ary << @result
+        while true
+
+          _save3 = self.pos
+          while true # choice
+            _tmp = apply(:_Inline)
+            break if _tmp
+            self.pos = _save3
+            _tmp = apply(:_DocumentText)
+            break if _tmp
+            self.pos = _save3
+            break
+          end # end choice
+
+          _ary << @result if _tmp
+          break unless _tmp
+        end
+        _tmp = true
+        @result = _ary
+      else
+        self.pos = _save1
       end
-      _tmp = apply(:_documentcontent)
       content = @result
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = apply(:_le)
-      unless _tmp
-        self.pos = _save
-        break
-      end
       @result = begin;  content ; end
       _tmp = true
       unless _tmp
@@ -3167,29 +3453,27 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_documentline unless _tmp
+    set_failed_rule :_DocumentContent unless _tmp
     return _tmp
   end
 
-  # headers = header*:headers { create_item(:headers, nil, headers) }
-  def _headers
+  # DocumentLine = DocumentContent:content Le { content }
+  def _DocumentLine
 
     _save = self.pos
     while true # sequence
-      _ary = []
-      while true
-        _tmp = apply(:_header)
-        _ary << @result if _tmp
-        break unless _tmp
+      _tmp = apply(:_DocumentContent)
+      content = @result
+      unless _tmp
+        self.pos = _save
+        break
       end
-      _tmp = true
-      @result = _ary
-      headers = @result
+      _tmp = apply(:_Le)
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:headers, nil, headers) ; end
+      @result = begin;  content ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -3197,17 +3481,23 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_headers unless _tmp
+    set_failed_rule :_DocumentLine unless _tmp
     return _tmp
   end
 
-  # page = headers:headers - (!newpage block)*:blocks { create_item(:page, nil, [headers] + blocks.select{ |x| !x.nil?}) }
-  def _page
+  # Page = Frontmatter?:frontmatter - (!Newpage Block)*:blocks {page(([frontmatter] +  blocks).select{ |x| !x.nil?})}
+  def _Page
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_headers)
-      headers = @result
+      _save1 = self.pos
+      _tmp = apply(:_Frontmatter)
+      @result = nil unless _tmp
+      unless _tmp
+        _tmp = true
+        self.pos = _save1
+      end
+      frontmatter = @result
       unless _tmp
         self.pos = _save
         break
@@ -3220,19 +3510,19 @@ class NoraMark::Parser < KPeg::CompiledParser
       _ary = []
       while true
 
-        _save2 = self.pos
+        _save3 = self.pos
         while true # sequence
-          _save3 = self.pos
-          _tmp = apply(:_newpage)
+          _save4 = self.pos
+          _tmp = apply(:_Newpage)
           _tmp = _tmp ? nil : true
-          self.pos = _save3
+          self.pos = _save4
           unless _tmp
-            self.pos = _save2
+            self.pos = _save3
             break
           end
-          _tmp = apply(:_block)
+          _tmp = apply(:_Block)
           unless _tmp
-            self.pos = _save2
+            self.pos = _save3
           end
           break
         end # end sequence
@@ -3247,7 +3537,7 @@ class NoraMark::Parser < KPeg::CompiledParser
         self.pos = _save
         break
       end
-      @result = begin;  create_item(:page, nil, [headers] + blocks.select{ |x| !x.nil?}) ; end
+      @result = begin; page(([frontmatter] +  blocks).select{ |x| !x.nil?}); end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -3255,28 +3545,28 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_page unless _tmp
+    set_failed_rule :_Page unless _tmp
     return _tmp
   end
 
-  # newpaged_page = newpage:newpage page:page { page[:children] = page[:children].unshift newpage; page }
-  def _newpaged_page
+  # NewpagedPage = Newpage:newpage Page:page { page.content = page.content.unshift newpage; page }
+  def _NewpagedPage
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_newpage)
+      _tmp = apply(:_Newpage)
       newpage = @result
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = apply(:_page)
+      _tmp = apply(:_Page)
       page = @result
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  page[:children] = page[:children].unshift newpage; page ; end
+      @result = begin;  page.content = page.content.unshift newpage; page ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -3284,16 +3574,16 @@ class NoraMark::Parser < KPeg::CompiledParser
       break
     end # end sequence
 
-    set_failed_rule :_newpaged_page unless _tmp
+    set_failed_rule :_NewpagedPage unless _tmp
     return _tmp
   end
 
-  # root = page:page newpaged_page*:pages - eof_comment? eof { [ page ] + pages }
+  # root = Page:page NewpagedPage*:pages - EofComment? Eof { [ page ] + pages }
   def _root
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_page)
+      _tmp = apply(:_Page)
       page = @result
       unless _tmp
         self.pos = _save
@@ -3301,7 +3591,7 @@ class NoraMark::Parser < KPeg::CompiledParser
       end
       _ary = []
       while true
-        _tmp = apply(:_newpaged_page)
+        _tmp = apply(:_NewpagedPage)
         _ary << @result if _tmp
         break unless _tmp
       end
@@ -3318,7 +3608,7 @@ class NoraMark::Parser < KPeg::CompiledParser
         break
       end
       _save2 = self.pos
-      _tmp = apply(:_eof_comment)
+      _tmp = apply(:_EofComment)
       unless _tmp
         _tmp = true
         self.pos = _save2
@@ -3327,7 +3617,7 @@ class NoraMark::Parser < KPeg::CompiledParser
         self.pos = _save
         break
       end
-      _tmp = apply(:_eof)
+      _tmp = apply(:_Eof)
       unless _tmp
         self.pos = _save
         break
@@ -3345,78 +3635,84 @@ class NoraMark::Parser < KPeg::CompiledParser
   end
 
   Rules = {}
-  Rules[:_eof] = rule_info("eof", "!.")
-  Rules[:_space] = rule_info("space", "(\" \" | \"\\\\t\")")
-  Rules[:_eof_comment] = rule_info("eof_comment", "lh space* \"\#\" (!eof .)*")
-  Rules[:_comment] = rule_info("comment", "lh space* \"\#\" (!nl .)* nl empty_line*")
-  Rules[:__hyphen_] = rule_info("-", "(space | comment)*")
-  Rules[:_empty_line] = rule_info("empty_line", "lh - nl")
-  Rules[:_nl] = rule_info("nl", "/\\r?\\n/")
-  Rules[:_lh] = rule_info("lh", "/^/")
-  Rules[:_le] = rule_info("le", "(nl | eof)")
-  Rules[:_word] = rule_info("word", "< /[\\w0-9]/ (\"-\" | /[\\w0-9]/)* > { text }")
-  Rules[:_num] = rule_info("num", "< [0-9]+ > { text.to_i }")
-  Rules[:_classname] = rule_info("classname", "\".\" word:classname { classname }")
-  Rules[:_classnames] = rule_info("classnames", "classname*:classnames { classnames }")
-  Rules[:_idname] = rule_info("idname", "\"\#\" word:idname { idname }")
-  Rules[:_idnames] = rule_info("idnames", "idname*:idnames { idnames }")
-  Rules[:_commandname] = rule_info("commandname", "word:name idnames?:idnames classnames?:classes { {:name => name, :ids => idnames, :classes => classes} }")
-  Rules[:_parameter] = rule_info("parameter", "< (/[^,)]/* | \"\\\"\" /[^\"]/* \"\\\"\" | \"'\" /[^']/* \"'\") > { text }")
-  Rules[:_parameters] = rule_info("parameters", "< parameter (\",\" parameter)* > { text }")
-  Rules[:_command] = rule_info("command", "commandname:cn (\"(\" - parameters:arg - \")\")? { arg ||= ''; cn.merge({ :args => arg.split(',') }) }")
-  Rules[:_implicit_paragraph] = rule_info("implicit_paragraph", "< !paragraph_delimiter - documentline:p - > { create_item(:paragraph, nil, p, raw: text) }")
-  Rules[:_paragraph] = rule_info("paragraph", "(explicit_paragraph | implicit_paragraph)")
-  Rules[:_paragraph_group] = rule_info("paragraph_group", "< paragraph+:p empty_line* > { create_item(:paragraph_group, nil, p, raw: text) }")
-  Rules[:_blockhead] = rule_info("blockhead", "lh - command:command - \"{\" - nl empty_line* { command }")
-  Rules[:_blockend] = rule_info("blockend", "lh - \"}\" - le empty_line*")
-  Rules[:_blockbody] = rule_info("blockbody", "(!blockend block)+:body { body }")
-  Rules[:_explicit_block] = rule_info("explicit_block", "< blockhead:head - blockbody:body - blockend > { create_item(:block, head, body, raw: text) }")
-  Rules[:_preformatted_command] = rule_info("preformatted_command", "command:command &{ ['pre', 'precode'].include? command[:name] }")
-  Rules[:_preformatted_command_head] = rule_info("preformatted_command_head", "lh - preformatted_command:command - \"<<\" &/[\\w0-9]/ { command }")
-  Rules[:_preformat_end] = rule_info("preformat_end", "lh word:delimiter &{ delimiter == start }")
-  Rules[:_preformatted_block] = rule_info("preformatted_block", "< lh - preformatted_command_head:command !nl word:delimiter nl (!preformat_end(delimiter) lh charstring nl)+:content preformat_end(delimiter) > { create_item(:preformatted, command, content, raw: text) }")
-  Rules[:_inline] = rule_info("inline", "(img_inline | common_inline)")
-  Rules[:_common_inline] = rule_info("common_inline", "< \"[\" command:c \"{\" documentcontent_except('}'):content \"}\" \"]\" > { create_item(:inline, c, content, raw: text) }")
-  Rules[:_img_command] = rule_info("img_command", "command:c &{ c[:name] == 'img' && c[:args].size == 2}")
-  Rules[:_img_inline] = rule_info("img_inline", "< \"[\" img_command:c \"]\" > { create_item(:inline, c, nil, raw: text) }")
-  Rules[:_commandname_for_special_line_command] = rule_info("commandname_for_special_line_command", "(newpage_command | explicit_paragraph_command)")
-  Rules[:_newpage_command] = rule_info("newpage_command", "command:command &{ command[:name] == 'newpage' }")
-  Rules[:_newpage] = rule_info("newpage", "< lh - newpage_command:c \":\" documentcontent?:content - nl > { create_item(:newpage, c, content, raw:text) }")
-  Rules[:_explicit_paragraph_command] = rule_info("explicit_paragraph_command", "command:c &{ c[:name] == 'p' }")
-  Rules[:_explicit_paragraph] = rule_info("explicit_paragraph", "< lh - explicit_paragraph_command:c \":\" documentcontent?:content le empty_line* > { create_item(:paragraph, c, content, raw:text) }")
-  Rules[:_unordered_list] = rule_info("unordered_list", "< unordered_item+:items > { create_item(:ul, nil, items, raw: text) }")
-  Rules[:_unordered_item] = rule_info("unordered_item", "< lh \"*:\" documentcontent:content le > { create_item(:li, nil, content, raw: text) }")
-  Rules[:_ordered_list] = rule_info("ordered_list", "< ordered_item+:items > { create_item(:ol, nil, items, raw: text) }")
-  Rules[:_ordered_item] = rule_info("ordered_item", "< lh num \":\" documentcontent:content le > { create_item(:li, nil, content, raw: text) }")
-  Rules[:_definition_list] = rule_info("definition_list", "< definition_item+:items > { create_item(:dl, nil, items, raw: text) }")
-  Rules[:_definition_item] = rule_info("definition_item", "< lh \";:\" - documentcontent_except(':'):term \":\" - documentcontent:definition le > { create_item(:dtdd, {:args => [term, definition]}, nil, raw: text) }")
-  Rules[:_items_list] = rule_info("items_list", "(unordered_list | ordered_list | definition_list)")
-  Rules[:_line_command] = rule_info("line_command", "< lh - !commandname_for_special_line_command command:c \":\" documentcontent?:content - le empty_line* > { create_item(:line_command, c, content, raw: text) }")
-  Rules[:_line_block] = rule_info("line_block", "(items_list | line_command)")
-  Rules[:_block] = rule_info("block", "(preformatted_block | headed_section | line_block | explicit_block | paragraph_group):block empty_line* {block}")
-  Rules[:_block_delimiter] = rule_info("block_delimiter", "(blockhead | blockend)")
-  Rules[:_paragraph_delimiter] = rule_info("paragraph_delimiter", "(block_delimiter | preformatted_command_head | line_block | newpage | headed_start)")
-  Rules[:_h_start_mark] = rule_info("h_start_mark", "< \"=\"+ \":\" > &{ text.length - 1 == n }")
-  Rules[:_h_markup_terminator] = rule_info("h_markup_terminator", "lh - < \"=\"+ \":\" > &{ text.length - 1 <= n }")
-  Rules[:_h_start] = rule_info("h_start", "lh - h_start_mark(n) charstring:s le { { level: n, heading: s } }")
-  Rules[:_h_section] = rule_info("h_section", "< h_start(n):h (!h_markup_terminator(n) !eof block)+:content > { create_item(:h_section, h, content, raw: text) }")
-  Rules[:_headed_start] = rule_info("headed_start", "(h_start(1) | h_start(2) | h_start(3) | h_start(4) | h_start(5) | h_start(6))")
-  Rules[:_headed_section] = rule_info("headed_section", "(h_section(1) | h_section(2) | h_section(3) | h_section(4) | h_section(5) | h_section(6))")
-  Rules[:_stylesheets] = rule_info("stylesheets", "< lh - \"stylesheets:\" !le charstring:s nl > { create_item(:stylesheets, {:stylesheets => s.split(',').map(&:strip)}, nil, raw:text) }")
-  Rules[:_title] = rule_info("title", "< lh - \"title:\" !le charstring:t nl > { create_item(:title, {:title => t }, nil, raw:text) }")
-  Rules[:_lang] = rule_info("lang", "< lh - \"lang:\" !le charstring:l nl > { create_item(:lang, {:lang => l }, nil, raw:text) }")
-  Rules[:_paragraph_style] = rule_info("paragraph_style", "< lh - \"paragraph-style:\" !le charstring:l nl > { create_item(:paragraph_style, {:paragraph_style => l }, nil, raw:text) }")
-  Rules[:_header] = rule_info("header", "(stylesheets | title | lang | paragraph_style) empty_line*")
-  Rules[:_char] = rule_info("char", "< /[[:print:]]/ > { text }")
-  Rules[:_charstring] = rule_info("charstring", "< char* > { text }")
-  Rules[:_char_except] = rule_info("char_except", "char:c &{ c != e }")
-  Rules[:_charstring_except] = rule_info("charstring_except", "< char_except(e)* > { text }")
-  Rules[:_documentcontent_except] = rule_info("documentcontent_except", "(inline | !inline char_except(e))+:content {parse_text(content)}")
-  Rules[:_documentcontent] = rule_info("documentcontent", "(inline | !inline char)+:content {parse_text(content)}")
-  Rules[:_documentline] = rule_info("documentline", "lh documentcontent:content le { content }")
-  Rules[:_headers] = rule_info("headers", "header*:headers { create_item(:headers, nil, headers) }")
-  Rules[:_page] = rule_info("page", "headers:headers - (!newpage block)*:blocks { create_item(:page, nil, [headers] + blocks.select{ |x| !x.nil?}) }")
-  Rules[:_newpaged_page] = rule_info("newpaged_page", "newpage:newpage page:page { page[:children] = page[:children].unshift newpage; page }")
-  Rules[:_root] = rule_info("root", "page:page newpaged_page*:pages - eof_comment? eof { [ page ] + pages }")
+  Rules[:_Eof] = rule_info("Eof", "!.")
+  Rules[:_Space] = rule_info("Space", "(\" \" | \"\\\\t\")")
+  Rules[:_EofComment] = rule_info("EofComment", "Space* \"\#\" (!Eof .)*")
+  Rules[:_Comment] = rule_info("Comment", "Space* \"\#\" (!Nl .)* Nl EmptyLine*")
+  Rules[:__hyphen_] = rule_info("-", "Space*")
+  Rules[:_EmptyLine] = rule_info("EmptyLine", "/^/ - (Nl | Comment | EofComment)")
+  Rules[:_Nl] = rule_info("Nl", "/\\r?\\n/")
+  Rules[:_Le] = rule_info("Le", "(Nl | Eof)")
+  Rules[:_Word] = rule_info("Word", "< /[\\w0-9]/ (\"-\" | /[\\w0-9]/)* > { text }")
+  Rules[:_Num] = rule_info("Num", "< [0-9]+ > { text.to_i }")
+  Rules[:_ClassName] = rule_info("ClassName", "\".\" Word:classname { classname }")
+  Rules[:_ClassNames] = rule_info("ClassNames", "ClassName*:classnames { classnames }")
+  Rules[:_IdName] = rule_info("IdName", "\"\#\" Word:idname { idname }")
+  Rules[:_IdNames] = rule_info("IdNames", "IdName*:idnames { idnames }")
+  Rules[:_CommandName] = rule_info("CommandName", "Word:name IdNames?:idnames ClassNames?:classes { {name: name, ids: idnames, classes: classes} }")
+  Rules[:_ParameterNormal] = rule_info("ParameterNormal", "< /[^,)]/* > { text }")
+  Rules[:_ParameterQuoted] = rule_info("ParameterQuoted", "\"\\\"\" < /[^\"]/* > \"\\\"\" - &/[,)]/ { text }")
+  Rules[:_ParameterSingleQuoted] = rule_info("ParameterSingleQuoted", "\"'\" < /[^']/* > \"'\" - &/[,)]/ { text }")
+  Rules[:_Parameter] = rule_info("Parameter", "(ParameterQuoted | ParameterSingleQuoted | ParameterNormal):value { value }")
+  Rules[:_Parameters] = rule_info("Parameters", "Parameter:parameter (\",\" - Parameter)*:rest_parameters { [parameter] + rest_parameters }")
+  Rules[:_Command] = rule_info("Command", "CommandName:cn (\"(\" - Parameters:args - \")\")? { args ||= []; cn.merge({ args: args }) }")
+  Rules[:_ImplicitParagraph] = rule_info("ImplicitParagraph", "- !ParagraphDelimiter Comment* DocumentLine:content Comment* EofComment? {paragraph([],[], [], content)}")
+  Rules[:_Paragraph] = rule_info("Paragraph", "(ExplicitParagraph | ImplicitParagraph)")
+  Rules[:_ParagraphGroup] = rule_info("ParagraphGroup", "Paragraph+:p EmptyLine* {paragraph_group([],[],[],p)}")
+  Rules[:_BlockHead] = rule_info("BlockHead", "- Command:command - \"{\" - Nl EmptyLine* { command }")
+  Rules[:_BlockEnd] = rule_info("BlockEnd", "- \"}\" - Le EmptyLine*")
+  Rules[:_BlockBody] = rule_info("BlockBody", "(!BlockEnd Block)+:body { body }")
+  Rules[:_ExplicitBlock] = rule_info("ExplicitBlock", "BlockHead:c - BlockBody:content - BlockEnd {block(c[:name], c[:ids], c[:classes], c[:args], content)}")
+  Rules[:_PreformattedCommand] = rule_info("PreformattedCommand", "Command:command &{ ['pre', 'code'].include? command[:name] }")
+  Rules[:_PreformattedCommandHeadSimple] = rule_info("PreformattedCommandHeadSimple", "- PreformattedCommand:command - \"{\" - Nl { command }")
+  Rules[:_PreformattedCommandHeadComplex] = rule_info("PreformattedCommandHeadComplex", "- PreformattedCommand:command - \"{//\" Word?:codelanguage - Nl { command.merge({codelanguage: codelanguage}) }")
+  Rules[:_PreformattedCommandHead] = rule_info("PreformattedCommandHead", "(PreformattedCommandHeadComplex | PreformattedCommandHeadSimple)")
+  Rules[:_PreformatEndSimple] = rule_info("PreformatEndSimple", "- \"}\" - Le EmptyLine*")
+  Rules[:_PreformatEndComplex] = rule_info("PreformatEndComplex", "- \"//}\" - Le EmptyLine*")
+  Rules[:_PreformattedBlockSimple] = rule_info("PreformattedBlockSimple", "PreformattedCommandHeadSimple:c (!PreformatEndSimple CharString Nl)+:content PreformatEndSimple {preformatted_block(c[:name], c[:ids], c[:classes], c[:args], c[:codelanguage], content)}")
+  Rules[:_PreformattedBlockComplex] = rule_info("PreformattedBlockComplex", "PreformattedCommandHeadComplex:c (!PreformatEndComplex CharString Nl)+:content PreformatEndComplex {preformatted_block(c[:name], c[:ids], c[:classes], c[:args], c[:codelanguage], content)}")
+  Rules[:_PreformattedBlock] = rule_info("PreformattedBlock", "(PreformattedBlockComplex | PreformattedBlockSimple)")
+  Rules[:_Inline] = rule_info("Inline", "(ImgInline | CommonInline)")
+  Rules[:_CommonInline] = rule_info("CommonInline", "\"[\" Command:c \"{\" - DocumentContentExcept('}'):content \"}\" \"]\" {inline(c[:name], c[:ids], c[:classes], c[:args], content)}")
+  Rules[:_ImgCommand] = rule_info("ImgCommand", "Command:c &{ c[:name] == 'img' && c[:args].size == 2}")
+  Rules[:_ImgInline] = rule_info("ImgInline", "\"[\" ImgCommand:c \"]\" {inline(c[:name], c[:ids], c[:classes], c[:args], nil)}")
+  Rules[:_CommandNameForSpecialLineCommand] = rule_info("CommandNameForSpecialLineCommand", "(NewpageCommand | ExplicitParagraphCommand)")
+  Rules[:_NewpageCommand] = rule_info("NewpageCommand", "Command:command &{ command[:name] == 'newpage' }")
+  Rules[:_Newpage] = rule_info("Newpage", "- NewpageCommand:c \":\" - DocumentContent?:content - Nl {newpage(c[:ids],c[:classes],c[:args], content)}")
+  Rules[:_ExplicitParagraphCommand] = rule_info("ExplicitParagraphCommand", "Command:c &{ c[:name] == 'p' }")
+  Rules[:_ExplicitParagraph] = rule_info("ExplicitParagraph", "- ExplicitParagraphCommand:c \":\" - DocumentContent?:content Le EmptyLine* {paragraph(c[:ids], c[:classes], c[:args], content)}")
+  Rules[:_UnorderedList] = rule_info("UnorderedList", "UnorderedItem+:items {unordered_list([],[],[], items)}")
+  Rules[:_UnorderedItem] = rule_info("UnorderedItem", "\"*:\" - DocumentContent:content Le {ul_item([], [], [], content)}")
+  Rules[:_OrderedList] = rule_info("OrderedList", "OrderedItem+:items {ordered_list([],[],[], items)}")
+  Rules[:_OrderedItem] = rule_info("OrderedItem", "Num \":\" - DocumentContent:content Le {ol_item([], [], [], content)}")
+  Rules[:_DefinitionList] = rule_info("DefinitionList", "DefinitionItem+:items {definition_list([], [], [], items)}")
+  Rules[:_DefinitionItem] = rule_info("DefinitionItem", "- \";:\" - DocumentContentExcept(':'):term \":\" - DocumentContent:definition Le {dl_item([], [], [term], definition)}")
+  Rules[:_LongDefinitionList] = rule_info("LongDefinitionList", "LongDefinitionItem+:items {definition_list([], [], [], items)}")
+  Rules[:_LongDefinitionItem] = rule_info("LongDefinitionItem", "- \";:\" - DocumentContentExcept('{'):term \"{\" - Nl - BlockBody:definition - BlockEnd {dl_item([], [], [term], definition)}")
+  Rules[:_ItemsList] = rule_info("ItemsList", "(UnorderedList | OrderedList | DefinitionList | LongDefinitionList)")
+  Rules[:_LineCommand] = rule_info("LineCommand", "- !CommandNameForSpecialLineCommand Command:c \":\" - DocumentContent?:content - Le EmptyLine* {line_command(c[:name], c[:ids], c[:classes], c[:args], content)}")
+  Rules[:_LineBlock] = rule_info("LineBlock", "(ItemsList | LineCommand)")
+  Rules[:_Block] = rule_info("Block", "EmptyLine* (PreformattedBlock | HeadedSection | LineBlock | ExplicitBlock | ParagraphGroup):block EmptyLine* {block}")
+  Rules[:_BlockDelimiter] = rule_info("BlockDelimiter", "(BlockHead | BlockEnd)")
+  Rules[:_ParagraphDelimiter] = rule_info("ParagraphDelimiter", "(BlockDelimiter | PreformattedCommandHead | LineBlock | Newpage | HeadedStart)")
+  Rules[:_HStartMark] = rule_info("HStartMark", "< \"=\"+ \":\" > &{ text.length - 1 == n }")
+  Rules[:_HMarkupTerminator] = rule_info("HMarkupTerminator", "- < \"=\"+ \":\" > &{ text.length - 1 <= n }")
+  Rules[:_HStart] = rule_info("HStart", "- HStartMark(n) - DocumentContent:s Le { { level: n, heading: s } }")
+  Rules[:_HSection] = rule_info("HSection", "HStart(n):h (!HMarkupTerminator(n) !Eof Block)*:content {h_section(h[:level], h[:heading], content)}")
+  Rules[:_HeadedStart] = rule_info("HeadedStart", "(HStart(1) | HStart(2) | HStart(3) | HStart(4) | HStart(5) | HStart(6))")
+  Rules[:_HeadedSection] = rule_info("HeadedSection", "(HSection(1) | HSection(2) | HSection(3) | HSection(4) | HSection(5) | HSection(6))")
+  Rules[:_FrontmatterSeparator] = rule_info("FrontmatterSeparator", "- \"---\" - Nl")
+  Rules[:_Frontmatter] = rule_info("Frontmatter", "FrontmatterSeparator (!FrontmatterSeparator CharString Nl)+:yaml FrontmatterSeparator EmptyLine* {frontmatter(yaml)}")
+  Rules[:_Char] = rule_info("Char", "< /[[:print:]]/ > { text }")
+  Rules[:_CharString] = rule_info("CharString", "< Char* > { text }")
+  Rules[:_CharExcept] = rule_info("CharExcept", "Char:c &{ c != e }")
+  Rules[:_DocumentTextExcept] = rule_info("DocumentTextExcept", "< (!Inline CharExcept(e))+ > {text(text)}")
+  Rules[:_DocumentContentExcept] = rule_info("DocumentContentExcept", "(Inline | DocumentTextExcept(e))+:content { content }")
+  Rules[:_DocumentText] = rule_info("DocumentText", "< (!Inline Char)+ > {text(text)}")
+  Rules[:_DocumentContent] = rule_info("DocumentContent", "(Inline | DocumentText)+:content { content }")
+  Rules[:_DocumentLine] = rule_info("DocumentLine", "DocumentContent:content Le { content }")
+  Rules[:_Page] = rule_info("Page", "Frontmatter?:frontmatter - (!Newpage Block)*:blocks {page(([frontmatter] +  blocks).select{ |x| !x.nil?})}")
+  Rules[:_NewpagedPage] = rule_info("NewpagedPage", "Newpage:newpage Page:page { page.content = page.content.unshift newpage; page }")
+  Rules[:_root] = rule_info("root", "Page:page NewpagedPage*:pages - EofComment? Eof { [ page ] + pages }")
   # :startdoc:
 end