trac-wiki 0.0.1 → 0.0.2

data/lib/trac_wiki/parser.rb

@@ -3,7 +3,7 @@ require 'uri'
 
 # :main: TracWiki
 
-# The Creole parses and translates Creole formatted text into
+# The TracWiki parses and translates Trac formatted text into
 # XHTML. Creole is a lightweight markup syntax similar to what many
 # WikiWikiWebs use. Example syntax:
 #
@@ -11,11 +11,11 @@ require 'uri'
 # == Heading 2 ==
 # === Heading 3 ===
 # **Bold text**
-# //Italic text//
+# ''Italic text''
 # [[Links]]
-# |=Table|=Heading|
-# |Table |Cells |
-# {{image.png}}
+# ||=Table||=Heading||
+# || Table|| Cells ||
+# [[Image(image.png)]]
 #
 # The simplest interface is TracWiki.render. The default handling of
 # links allow explicit local links using the [[link]] syntax. External
@@ -74,6 +74,7 @@ module TracWiki
       @out = ''
       @p = false
       @stack = []
+      @stacki = []
       parse_block(@text)
       @out
     end
@@ -92,13 +93,27 @@ module TracWiki
       CGI::escape(string)
     end
 
-    def start_tag(tag)
+    def start_tag(tag, args = '', lindent = nil)
+      lindent = @stacki.last || -1  if lindent.nil?
+
       @stack.push(tag)
-      @out << '<' << tag << '>'
+      @stacki.push(lindent)
+
+      if tag == 'strongem'
+        @out << '<strong><em>'
+      else
+        @out << '<' << tag << args << '>'
+      end
     end
 
     def end_tag
-      @out << '</' << @stack.pop << '>'
+      tag = @stack.pop
+      tagi = @stacki.pop
+      if tag == 'strongem'
+        @out << '</em></strong>'
+      else
+        @out << "</#{tag}>"
+      end
     end
 
     def toggle_tag(tag, match)
@@ -185,11 +200,11 @@ module TracWiki
     # method can be overridden to generate custom
     # markup, for example to add html additional attributes or
     # to put divs around the imgs.
-    def make_image(uri, alt)
+    def make_image(uri, alt='')
       if alt
-        '<img src="' << escape_html(uri) << '" alt="' << escape_html(alt) << '"/>'
+        "<img src='" << escape_html(uri) << "' alt='" << escape_html(alt) << "'/>"
       else
-        '<img src="' << escape_html(uri) << '"/>'
+        "<img src='" << escape_html(uri) << "'/>"
       end
     end
 
@@ -209,6 +224,7 @@ module TracWiki
     def parse_inline(str)
       until str.empty?
         case str
+        # raw url
         when /\A(\~)?((https?|ftps?):\/\/\S+?)(?=([\,.?!:;"'\)]+)?(\s|$))/
           str = $'
           if $1
@@ -220,26 +236,44 @@ module TracWiki
               @out << escape_html($&)
             end
           end
+        # [[Image(pic.jpg|tag)]]
+        when /\A\[\[Image\(([^|].*?)(\|(.*?))?\)\]\]/   # image 
+          str = $'
+          @out << make_image($1, $3)
+        # [[link]]
         when /\A\[\[\s*([^|]*?)\s*(\|\s*(.*?))?\s*\]\]/m
           str = $'
-          link, content = $1, $3
-          if uri = make_explicit_link(link)
-            @out << '<a href="' << escape_html(uri) << '">'
-            if content
-              until content.empty?
-                content = parse_inline_tag(content)
-              end
-            else
-              @out << escape_html(link)
-            end
-            @out << '</a>'
-          else
-            @out << escape_html($&)
-          end
+          link, content, whole= $1, $3, $&
+          make_link(link, content, whole)
         else
           str = parse_inline_tag(str)
         end
+
+      end
+    end
+
+    def make_link(link, content, whole)
+      uri = make_explicit_link(link)
+      # specail "link" [[BR]]:
+      if link =~ /br/i
+        @out << '<br/>'
+        return
+      end
+      if not uri
+        @out << escape_html(whole)
+        return
+      end
+
+      make_explicit_link(link)
+      @out << '<a href="' << escape_html(uri) << '">'
+      if content
+        until content.empty?
+          content = parse_inline_tag(content)
+        end
+      else
+          @out << escape_html(link)
       end
+      @out << '</a>'
     end
 
     def parse_inline_tag(str)
@@ -248,21 +282,27 @@ module TracWiki
         @out << '<tt>' << escape_html($1) << '</tt>'
       when /\A`(.*?)`/                  # inline pre (tt)
         @out << '<tt>' << escape_html($1) << '</tt>'
-      when /\A\{\{\s*(.*?)\s*(\|\s*(.*?)\s*)?\}\}/
-        if uri = make_image_link($1)
-          @out << make_image(uri, $3)
-        else
-          @out << escape_html($&)
-        end                             # link
+#      when /\A\[\[Image\(([^|].*?)(\|(.*?))?\)\]\]/   # image 
+#       @out << make_image($1, $3)
+
+#      when /\A\{\{\s*(.*?)\s*(\|\s*(.*?)\s*)?\}\}/
+#        if uri = make_image_link($1)
+#          @out << make_image(uri, $3)
+#        else
+#          @out << escape_html($&)
+#        end                             # link
+
       when /\A([:alpha:]|[:digit:])+/
         @out << $&                      # word
       when /\A\s+/
         @out << ' ' if @out[-1] != ?\s  # spaces
-      when /\A\*\*/
+      when /\A'''''/
+        toggle_tag 'strongem', $&       # bolditallic
+      when /\A\*\*/, /\A'''/
         toggle_tag 'strong', $&         # bold
-      when /\A''/
+      when /\A''/, /\A\/\//
         toggle_tag 'em', $&             # italic
-      when /\A\\\\/
+      when /\A\\\\/, /\A\[\[br\]\]/i
         @out << '<br/>'                 # newline
       when /\A__/
         toggle_tag 'u', $&              # underline
@@ -270,7 +310,7 @@ module TracWiki
         toggle_tag 'del', $&            # delete
 #      when /\A\+\+/
 #        toggle_tag 'ins', $&           # insert
-      when /\A\^\^/
+      when /\A\^/
         toggle_tag 'sup', $&            # ^{}
       when /\A,,/
         toggle_tag 'sub', $&            # _{}
@@ -287,35 +327,106 @@ module TracWiki
     end
 
     def parse_table_row(str)
-      @out << '<tr>'
-      #str.scan(/\s*\|\|(=)?\s*((\[\[.*?\]\]|\{\{.*?\}\}|[^|~]|~.)*)(?=\||$)/) do
-      str.scan(/\s*\|\|(=)?(\s*)(.*?)(?==?\|\||$)/) do
-        if !$3.empty? || !$'.empty?
-          tag = $1 ? 'th' : 'td'
-          le = $2.size
-          txt = $3
-          style =''
-          if  txt =~ /\S(\s*)$/
-                ri = $1.size
-#                style = " style='text-align:left'"  if le == 0
-                style = " style='text-align:right'"  if ri == 0 && le >= 1
-                style = " style='text-align:center'" if le >= 2 && ri >= 2
-                #print "le#{le} ri#{ri} st:#{style}\n"
-          end
-          @out << ('<' + tag + style + '>' )
-          parse_inline(txt.strip) if txt
-          end_tag while @stack.last != 'table'
-          @out << ('</' + tag + '>')
+      start_tag('tr') if !@stack.include?('tr')
+      colspan = 1
+      print_tr = true
+      last_tail  = ''
+      last_txt  = ''
+      str.scan(/(=?)(\s*)(.*?)\1?($ | \|\|\\\s*$ | \|\| )/x) do
+        tdth = $1.empty? ? 'td' : 'th'
+        le, txt, tail  = $2.size, $3, $4
+
+        # do not end row, continue on next line
+        print_tr = false if tail =~ /^\|\|\\/
+
+        if txt.empty? && le == 0
+          colspan += 1
+          next
         end
+
+        style = ''
+        if  txt =~ /\S(\s*)$/
+              ri = $1.size
+              ri += 100 if tail.empty? # do not right when last || omnited
+              style = " style='text-align:right'"  if ri == 0 && le >= 1
+              style = " style='text-align:center'" if le >= 2 && ri >= 2
+              #print "le#{le} ri#{ri} st:#{style}\n"
+        end
+
+        colspan_txt  =  colspan > 1 ? " colspan='#{colspan}'" : ''
+        start_tag(tdth, style + colspan_txt);
+        colspan = 1
+
+        parse_inline(txt.strip) if txt
+        end_tag while @stack.last != 'tr'
+      end
+      if print_tr
+        end_tag
       end
-      @out << '</tr>'
     end
 
     def make_nowikiblock(input)
       input.gsub(/^ (?=\}\}\})/, '')
     end
 
-    def ulol?(x); x == 'ul' || x == 'ol'; end
+    def parse_li_line(spc_size, bullet, text)
+
+      while !@stacki.empty? && @stacki.last >  spc_size
+        end_tag
+      end
+
+      if @stack.include?('li')
+        while @stack.last != 'li'
+          end_tag
+        end
+
+        # end list if type differ
+        # @stack.last is now ul or li
+        if @stacki.last == spc_size
+          end_tag # li
+          ulol_last = @stack.last
+          ulol_now =  bullet =~ /[*-]/ ? 'ul' : 'ol'
+          if ulol_last != ulol_now
+            end_tag # ol | ul
+          end
+        end
+      else
+        end_paragraph
+      end
+
+      if @stacki.empty? || @stacki.last <  spc_size
+        bullet.gsub!(/\.$/,'')
+        ulol = bullet =~ /[-*]/ ? 'ul' : 'ol';
+        attr = ""
+        attr = " type='i'" if bullet =~ /i/i;
+        attr = " type='a'" if bullet =~ /a/i;
+
+        if bullet =~ /^\d+$/ && bullet != '1'
+                attr += " start='#{bullet}'"
+        end
+        start_tag(ulol, attr, spc_size)
+      end
+
+      start_tag('li')
+      parse_inline(text)
+
+    end
+
+    def blockquote_level_to(level)
+      cur_level = @stack.count('blockquote')
+      if cur_level ==  level
+        @out << ' '
+        return
+      end
+      while cur_level < level
+        cur_level += 1
+        start_tag('blockquote')
+      end
+      while cur_level > level
+        cur_level -= 1 if @stack.last == 'blockquote'
+        end_tag
+      end
+    end
 
     def parse_block(str)
       until str.empty?
@@ -339,58 +450,59 @@ module TracWiki
           @out << make_headline(level, $2)
 
         # table row
-        when /\A[ \t]*\|\|.*$(\r?\n)?/
+        when /\A[ \t]*\|\|(.*)$(\r?\n)?/
           if !@stack.include?('table')
             end_paragraph
             start_tag('table')
           end
-          parse_table_row($&)
+          parse_table_row($1)
 
         # empty line
         when /\A\s*$(\r?\n)?/
           end_paragraph
+        when /\A([\w\s]*)::\s*/
+          term = $1
+          start_tag('dl')
+          start_tag('dt')
+          @out << escape_html(term)
+          end_tag
+          start_tag('dd')
 
         # li
-        when /\A(\s*([*#]+)\s*(.*?))$(\r?\n)?/
-          line, bullet, item = $1, $2, $3
-          tag = (bullet[0,1] == '*' ? 'ul' : 'ol')
-          if bullet[0,1] == '#' || bullet.size != 2 || @stack.find {|x| ulol?(x) }
-            count = @stack.select { |x| ulol?(x) }.size
-
-            while !@stack.empty? && count > bullet.size
-              count -= 1 if ulol?(@stack.last)
-              end_tag
-            end
+        when /\A(\s*)([*-]|[aAIi\d]\.)\s+(.*?)$(\r?\n)?/
+          parse_li_line($1.size, $2, $3)
 
-            end_tag while !@stack.empty? && @stack.last != 'li'
+        when /\A(>[>\s]*)(.*?)$(\r?\n)?/
+          # citation
+          level, quote =  $1.count('>'), $2
 
-            if @stack.last == 'li' && count == bullet.size
-              end_tag
-              if @stack.last != tag
-                end_tag
-                count -= 1
-              end
-            end
+          start_paragraph if !@stack.include? 'p'
+          blockquote_level_to(level)
+          parse_inline(quote.strip)
 
-            while count < bullet.size
-              start_tag tag
-              count += 1
-              start_tag 'li' if count < bullet.size
-            end
 
-            @p = true
-            start_tag('li')
-            parse_inline(item)
+        # ordinary line
+        when /\A(\s*)(\S+.*?)$(\r?\n)?/
+          spc_size, text =  $1.size, $2
+
+          if @stack.include?('li') ||@stack.include?('dl')
+
+            # dl, li continuation
+            parse_inline(' ')
+            parse_inline(text)
+
+          elsif spc_size > 0
+            # quote continuation
+            start_paragraph if !@stack.include? 'p'
+            blockquote_level_to(1)
+            parse_inline(text)
+
           else
+            # real ordinary line
             start_paragraph
-            parse_inline(line)
+            parse_inline(text)
           end
-
-        # ordinary line
-        when /\A([ \t]*\S+.*?)$(\r?\n)?/
-          start_paragraph
-          parse_inline($1)
-        else
+        else # case str
           raise "Parse error at #{str[0,30].inspect}"
         end
         str = $'

data/lib/trac_wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/test/parser_test.rb

@@ -46,6 +46,24 @@ describe TracWiki::Parser do
     tc "<p>This <strong>is bold</strong></p>", "This **is\nbold**"
   end
 
+  it 'should parse bolditalic' do
+    tc '<p>This is <strong><em>bolditallic</em></strong>.</p>', "This is '''''bolditallic'''''."
+    tc '<p>This is <strong> <em>bolditallic</em> </strong>.</p>', "This is ''' ''bolditallic'' '''."
+    tc '<p>This is <em> <strong>bolditallic</strong> </em>.</p>', "This is '' '''bolditallic''' ''."
+    tc '<p>This is <strong>bold</strong>.</p>', "This is '''bold'''."
+    #fuj tc '<p>This is <strong><em>bolditallic</em></strong>.</p>', "This is **''bolditallic**''."
+  end
+  it 'should parse monospace' do
+    tc "<p>This is <tt>monospace</tt>.</p>", "This is {{{monospace}}}."
+    tc "<p>This is <tt>mon**o**space</tt>.</p>", "This is {{{mon**o**space}}}."
+    tc "<p>This is <tt>mon&lt;o&gt;space</tt>.</p>", "This is {{{mon<o>space}}}."
+    tc "<p>This is <tt>mon''o''space</tt>.</p>", "This is {{{mon''o''space}}}."
+    tc "<p>This is <tt>mon''o''space</tt>.</p>", "This is `mon''o''space`."
+    tc "<p>This is <tt>mon{{o}}space</tt>.</p>", "This is {{{mon{{o}}space}}}."
+    tc "<p>This is <tt>mon``o''space</tt>.</p>", "This is {{{mon``o''space}}}."
+    tc "<p>This is <tt>mon{{o}}space</tt>.</p>", "This is `mon{{o}}space`."
+  end
+
   it 'should parse italic' do
     # Italic can be used inside paragraphs
     tc("<p>This <em>is</em> italic</p>",
@@ -156,7 +174,7 @@ describe TracWiki::Parser do
 
     # WRNING: Parsing markup within a link is optional
     tc "<p><a href=\"Weird+Stuff\"><strong>Weird</strong> <em>Stuff</em></a></p>", "[[Weird Stuff|**Weird** ''Stuff'']]"
-    tc("<p><a href=\"http://example.org/\"><img src=\"image.jpg\"/></a></p>", "[[http://example.org/|{{image.jpg}}]]")
+    #tc("<p><a href=\"http://example.org/\"><img src='image.jpg'/></a></p>", "[[http://example.org/|{{image.jpg}}]]")
 
     # Inside bold
     tc "<p><strong><a href=\"link\">link</a></strong></p>", "**[[link]]**"
@@ -210,19 +228,35 @@ describe TracWiki::Parser do
   it 'should parse linebreaks' do
     #  \\ (wiki-style) for line breaks.
     tc "<p>This is the first line,<br/>and this is the second.</p>", "This is the first line,\\\\and this is the second."
+    tc "<p>This is the first line,<br/>and this is the second.</p>", "This is the first line,[[br]]and this is the second."
+    tc "<p>This is the first line,<br/>and this is the second.</p>", "This is the first line,[[Br]]and this is the second."
   end
 
+  it 'should parse blockquote' do
+    tc "<p><blockquote>Monty Python</blockquote></p>", "> Monty Python\n"
+    tc "<p><blockquote>Monty Python q2</blockquote></p>", "> Monty Python\n> q2\n"
+    tc "<p><blockquote>Monty Python q2</blockquote></p>", "> Monty Python\n>q2\n"
+    tc "<p><blockquote>Monty Python <strong>q2</strong></blockquote></p>", "> Monty Python\n>**q2**\n"
+    tc "<p><blockquote>Monty Python<blockquote>q2</blockquote></blockquote></p>", "> Monty Python\n> > q2\n"
+    tc "<p><blockquote>Monty Python<blockquote>q2 q3</blockquote></blockquote></p>", "> Monty Python\n> > q2\n>>q3\n"
+    tc "<p><blockquote>Monty Python<blockquote><em>q2</em></blockquote>q1</blockquote></p>", ">Monty Python\n> > ''q2''\n>q1"
+    tc "<p><blockquote>Monty Python rules</blockquote></p>", "  Monty Python\n rules\n"
+  end
+  it 'should parse definition list' do
+    # FIXME: trailing space 
+    tc "<dl><dt>Monty Python</dt><dd> definition</dd></dl>", "Monty Python:: \n   definition\n"
+  end
   it 'should parse unordered_lists' do
     # List items begin with a * at the beginning of a line.
     # An item ends at the next *
-    tc "<ul><li>Item 1</li><li>Item 2</li><li>Item 3</li></ul>", "* Item 1\n *Item 2\n *\t\tItem 3\n"
+
+    tc "<ul><li>Item 1 next</li></ul>", "* Item 1\n  next\n"
 
     #  Whitespace is optional before and after the *.
     tc("<ul><li>Item 1</li><li>Item 2</li><li>Item 3</li></ul>",
-       " * Item 1\n*Item 2\n \t*\t\tItem 3\n")
+       " * Item 1\n * Item 2\n *\t\tItem 3\n")
 
     #  A space is required if if the list element starts with bold text.
-    tc("<ul><li><ul><li><ul><li>Item 1</li></ul></li></ul></li></ul>", "***Item 1")
     tc("<ul><li><strong>Item 1</strong></li></ul>", "* **Item 1")
 
     #  An item ends at blank line
@@ -239,107 +273,110 @@ describe TracWiki::Parser do
 
     #  An item can span multiple lines
     tc("<ul><li>The quick brown fox jumps over lazy dog.</li><li>Humpty Dumpty sat on a wall.</li></ul>",
-       "* The quick\nbrown fox\n\tjumps over\nlazy dog.\n*Humpty Dumpty\nsat\t\non a wall.")
+       "* The quick\nbrown fox\n\tjumps over\nlazy dog.\n* Humpty Dumpty\nsat\t\non a wall.")
 
     #  An item can contain line breaks
     tc("<ul><li>The quick brown<br/>fox jumps over lazy dog.</li></ul>",
        "* The quick brown\\\\fox jumps over lazy dog.")
 
     #  Nested
-    tc "<ul><li>Item 1<ul><li>Item 2</li></ul></li><li>Item 3</li></ul>", "* Item 1\n **Item 2\n *\t\tItem 3\n"
+    tc "<ul><li>Item 1<ul><li>Item 2</li></ul></li><li>Item 3</li></ul>", "* Item 1\n  * Item 2\n*\t\tItem 3\n"
 
     #  Nested up to 5 levels
     tc("<ul><li>Item 1<ul><li>Item 2<ul><li>Item 3<ul><li>Item 4<ul><li>Item 5</li></ul></li></ul></li></ul></li></ul></li></ul>",
-       "*Item 1\n**Item 2\n***Item 3\n****Item 4\n*****Item 5\n")
+       "* Item 1\n * Item 2\n   * Item 3\n    *    Item 4\n     * Item 5\n")
+
+    tc("<ul><li>Item 1<ul><li>Item 2<ul><li>Item 3<ul><li>Item 4</li></ul></li></ul></li></ul></li><li>Item 5</li></ul>",
+       "* Item 1\n * Item 2\n   * Item 3\n    *    Item 4\n* Item 5\n")
 
     #  ** immediatly following a list element will be treated as a nested unordered element.
     tc("<ul><li>Hello, World!<ul><li>Not bold</li></ul></li></ul>",
-       "*Hello,\nWorld!\n**Not bold\n")
+       "* Hello,\n  World!\n  * Not bold\n")
 
     #  ** immediatly following a list element will be treated as a nested unordered element.
     tc("<ol><li>Hello, World!<ul><li>Not bold</li></ul></li></ol>",
-       "#Hello,\nWorld!\n**Not bold\n")
+       "1. Hello,\n   World!\n  * Not bold\n")
 
     #  [...] otherwise it will be treated as the beginning of bold text.
     tc("<ul><li>Hello, World!</li></ul><p><strong>Not bold</strong></p>",
-       "*Hello,\nWorld!\n\n**Not bold\n")
+       "* Hello,\nWorld!\n\n**Not bold\n")
   end
 
   it 'should parse ordered lists' do
     #  List items begin with a * at the beginning of a line.
     #  An item ends at the next *
-    tc "<ol><li>Item 1</li><li>Item 2</li><li>Item 3</li></ol>", "# Item 1\n #Item 2\n #\t\tItem 3\n"
+    tc "<ol><li>Item 1</li><li>Item 2</li><li>Item 3</li></ol>", "1. Item 1\n2. Item 2\n3. \t\tItem 3\n"
 
     #  Whitespace is optional before and after the #.
     tc("<ol><li>Item 1</li><li>Item 2</li><li>Item 3</li></ol>",
-       " # Item 1\n#Item 2\n \t#\t\tItem 3\n")
+       "1. Item 1\n1.   Item 2\n4.\t\tItem 3\n")
 
     #  A space is required if if the list element starts with bold text.
-    tc("<ol><li><ol><li><ol><li>Item 1</li></ol></li></ol></li></ol>", "###Item 1")
-    tc("<ol><li><strong>Item 1</strong></li></ol>", "# **Item 1")
+#    tc("<ol><li><ol><li><ol><li>Item 1</li></ol></li></ol></li></ol>", "###Item 1")
+    tc("<ol><li><strong>Item 1</strong></li></ol>", "1. **Item 1")
 
     #  An item ends at blank line
-    tc("<ol><li>Item</li></ol><p>Par</p>", "# Item\n\nPar\n")
+    tc("<ol><li>Item</li></ol><p>Par</p>", "1. Item\n\nPar\n")
 
     #  An item ends at a heading
-    tc("<ol><li>Item</li></ol><h1>Heading</h1>", "# Item\n= Heading =\n")
+    tc("<ol><li>Item</li></ol><h1>Heading</h1>", "1. Item\n= Heading =\n")
 
     #  An item ends at a table
-    tc("<ol><li>Item</li></ol><table><tr><td>Cell</td></tr></table>", "# Item\n||Cell||\n")
+    tc("<ol><li>Item</li></ol><table><tr><td>Cell</td></tr></table>", "1. Item\n||Cell||\n")
 
     #  An item ends at a nowiki block
-    tc("<ol><li>Item</li></ol><pre>Code</pre>", "# Item\n{{{\nCode\n}}}\n")
+    tc("<ol><li>Item</li></ol><pre>Code</pre>", "1. Item\n{{{\nCode\n}}}\n")
 
     #  An item can span multiple lines
     tc("<ol><li>The quick brown fox jumps over lazy dog.</li><li>Humpty Dumpty sat on a wall.</li></ol>",
-       "# The quick\nbrown fox\n\tjumps over\nlazy dog.\n#Humpty Dumpty\nsat\t\non a wall.")
+       "1. The quick\nbrown fox\n\tjumps over\nlazy dog.\n2. Humpty Dumpty\nsat\t\non a wall.")
 
     #  An item can contain line breaks
     tc("<ol><li>The quick brown<br/>fox jumps over lazy dog.</li></ol>",
-       "# The quick brown\\\\fox jumps over lazy dog.")
+       "1. The quick brown\\\\fox jumps over lazy dog.")
 
     #  Nested
-    tc "<ol><li>Item 1<ol><li>Item 2</li></ol></li><li>Item 3</li></ol>", "# Item 1\n ##Item 2\n #\t\tItem 3\n"
+    tc "<ol><li>Item 1<ol><li>Item 2</li></ol></li><li>Item 3</li></ol>", "1. Item 1\n  1. Item 2\n2.\t\tItem 3\n"
 
     #  Nested up to 5 levels
     tc("<ol><li>Item 1<ol><li>Item 2<ol><li>Item 3<ol><li>Item 4<ol><li>Item 5</li></ol></li></ol></li></ol></li></ol></li></ol>",
-       "#Item 1\n##Item 2\n###Item 3\n####Item 4\n#####Item 5\n")
+       "1. Item 1\n  1. Item 2\n     1. Item 3\n      1. Item 4\n               1. Item 5\n")
 
     #  The two-bullet rule only applies to **.
-    tc("<ol><li><ol><li>Item</li></ol></li></ol>", "##Item")
+#    tc("<ol><li><ol><li>Item</li></ol></li></ol>", "##Item")
   end
 
   it 'should parse ordered lists #2' do
-    tc "<ol><li>Item 1</li><li>Item 2</li><li>Item 3</li></ol>", "# Item 1\n #Item 2\n #\t\tItem 3\n"
+    tc "<ol><li>Item 1</li><li>Item 2</li><li>Item 3</li></ol>", "1. Item 1\n1.    Item 2\n1.\t\tItem 3\n"
     # Nested
-    tc "<ol><li>Item 1<ol><li>Item 2</li></ol></li><li>Item 3</li></ol>", "# Item 1\n ##Item 2\n #\t\tItem 3\n"
+    tc "<ol><li>Item 1<ol><li>Item 2</li></ol></li><li>Item 3</li></ol>", "1. Item 1\n  1. Item 2\n1.\t\tItem 3\n"
     # Multiline
-    tc "<ol><li>Item 1 on multiple lines</li></ol>", "# Item 1\non multiple lines"
+    tc "<ol><li>Item 1 on multiple lines</li></ol>", "1. Item 1\non multiple lines"
   end
 
   it 'should parse ambiguious mixed lists' do
     # ol following ul
-    tc("<ul><li>uitem</li></ul><ol><li>oitem</li></ol>", "*uitem\n#oitem\n")
+    tc("<ul><li>uitem</li></ul><ol><li>oitem</li></ol>", "* uitem\n1. oitem\n")
 
     # ul following ol
-    tc("<ol><li>uitem</li></ol><ul><li>oitem</li></ul>", "#uitem\n*oitem\n")
+    tc("<ol><li>uitem</li></ol><ul><li>oitem</li></ul>", "1. uitem\n* oitem\n")
 
     # 2ol following ul
-    tc("<ul><li>uitem<ol><li>oitem</li></ol></li></ul>", "*uitem\n##oitem\n")
+    tc("<ul><li>uitem<ol><li>oitem</li></ol></li></ul>", "* uitem\n  1. oitem\n")
 
     # 2ul following ol
-    tc("<ol><li>uitem<ul><li>oitem</li></ul></li></ol>", "#uitem\n**oitem\n")
+    tc("<ol><li>uitem<ul><li>oitem</li></ul></li></ol>", "1. uitem\n  * oitem\n")
 
     # 3ol following 3ul
-    tc("<ul><li><ul><li><ul><li>uitem</li></ul><ol><li>oitem</li></ol></li></ul></li></ul>", "***uitem\n###oitem\n")
+#    tc("<ul><li><ul><li><ul><li>uitem</li></ul><ol><li>oitem</li></ol></li></ul></li></ul>", "***uitem\n###oitem\n")
 
     # 2ul following 2ol
-    tc("<ol><li><ol><li>uitem</li></ol><ul><li>oitem</li></ul></li></ol>", "##uitem\n**oitem\n")
+#    tc("<ol><li><ol><li>uitem</li></ol><ul><li>oitem</li></ul></li></ol>", "##uitem\n**oitem\n")
 
     # ol following 2ol
-    tc("<ol><li><ol><li>oitem1</li></ol></li><li>oitem2</li></ol>", "##oitem1\n#oitem2\n")
+#    tc("<ol><li><ol><li>oitem1</li></ol></li><li>oitem2</li></ol>", "##oitem1\n#oitem2\n")
     # ul following 2ol
-    tc("<ol><li><ol><li>oitem1</li></ol></li></ol><ul><li>oitem2</li></ul>", "##oitem1\n*oitem2\n")
+#    tc("<ol><li><ol><li>oitem1</li></ol></li></ol><ul><li>oitem2</li></ul>", "##oitem1\n*oitem2\n")
   end
 
   it 'should parse ambiguious italics and url' do
@@ -358,12 +395,13 @@ describe TracWiki::Parser do
 
   it 'should parse ambiguious bold and lists' do
     tc "<p><strong> bold text </strong></p>", "** bold text **"
-    tc "<p> <strong> bold text </strong></p>", " ** bold text **"
+    tc "<p><blockquote><strong> bold text </strong></blockquote></p>", " ** bold text **"
   end
 
   it 'should parse nowiki' do
     # ... works as block
     tc "<pre>Hello</pre>", "{{{\nHello\n}}}\n"
+    tc "<p><tt>{{{-}}}</tt></p>", "`{{{-}}}`\n"
 
     # ... works inline
     tc "<p>Hello <tt>world</tt>.</p>", "Hello {{{world}}}."
@@ -373,8 +411,8 @@ describe TracWiki::Parser do
     tc "<pre>**Hello**</pre>", "{{{\n**Hello**\n}}}\n"
 
     # Leading whitespaces are not permitted
-    tc("<p> {{{ Hello }}}</p>", " {{{\nHello\n}}}")
-    tc("<p>{{{ Hello }}}</p>", "{{{\nHello\n }}}")
+#    tc("<p>{{{ Hello }}}</p>", " {{{\nHello\n}}}")
+    tc("<p>{{{ Hello<blockquote>}}}</blockquote></p>", "{{{\nHello\n }}}")
 
     # Assumed: Should preserve whitespace
     tc("<pre> \t Hello, \t \n \t World \t </pre>",
@@ -395,7 +433,8 @@ describe TracWiki::Parser do
     tc("<p>&lt;b&gt;not bold&lt;/b&gt;</p>", "<b>not bold</b>")
 
     # Image tags should be escape
-    tc("<p><img src=\"image.jpg\" alt=\"&quot;tag&quot;\"/></p>", "{{image.jpg|\"tag\"}}")
+    tc("<p><img src='image.jpg'/></p>", "[[Image(image.jpg)]]")
+    tc("<p><img src='image.jpg' alt='&quot;tag&quot;'/></p>", "[[Image(image.jpg|\"tag\")]]")
 
     # Malicious links should not be converted.
     tc("<p><a href=\"javascript%3Aalert%28%22Boo%21%22%29\">Click</a></p>", "[[javascript:alert(\"Boo!\")|Click]]")
@@ -407,7 +446,9 @@ describe TracWiki::Parser do
     tc "<p>* Not Bullet</p>", "!* Not Bullet"
     # Following char is not a blank (space or line feed)
     tc "<p>Hello ~ world</p>", "Hello ~ world\n"
-    tc "<p>Hello ~ world</p>", "Hello ~\nworld\n"
+    tc "<p>Hello ! world</p>", "Hello ! world\n"
+    tc "<p>Hello ! world</p>", "Hello ! world\n"
+    tc "<p>Hello ! world</p>", "Hello !\nworld\n"
     # Not escaping inside URLs 
     tc "<p><a href=\"http://example.org/~user/\">http://example.org/~user/</a></p>", "http://example.org/~user/"
 
@@ -430,11 +471,22 @@ describe TracWiki::Parser do
     tc "<p>---- foo</p>", "---- foo\n"
 
     # [...] no whitespace is allowed between them
-    tc "<p> -- -- </p>", " -- -- "
-    tc "<p> -- -- </p>", " --\t-- "
+    tc "<p>-- -- </p>", "-- -- "
+    tc "<p>-- -- </p>", "--\t-- "
   end
 
   it 'should parse table' do
+    tc "<table><tr><td>Hello</td><td>World!</td></tr></table>", "||Hello||World!||"
+    tc "<table><tr><td>Hello</td><td>World!</td></tr></table>", "||Hello||\\\n||World!||"
+    tc "<table><tr><td>He</td><td>llo</td><td>World!</td></tr></table>", "||He||llo||\\\n||World!||"
+    tc "<table><tr><td>Hello</td><td colspan='2'>World!</td></tr></table>", "||Hello||||World!||"
+    tc "<table><tr><td>Hello</td><td colspan='2'>kuk</td><td>World!</td></tr></table>", "||Hello||||kuk||\\\n||World!||"
+    tc "<table><tr><td>1</td><td>2</td><td>3</td></tr><tr><td colspan='2'>1-2</td><td>3</td></tr><tr><td>1</td><td colspan='2'>2-3</td></tr><tr><td colspan='3'>1-2-3</td></tr></table>", "|| 1 || 2 || 3 ||\n|||| 1-2 || 3 ||\n|| 1 |||| 2-3 ||\n|||||| 1-2-3 ||\n"
+
+    tc "<table><tr><td>table</td><td style='text-align:center'>center</td></tr></table>", "||table||   center  ||"
+    tc "<table><tr><td>table</td><td style='text-align:right'>right</td></tr></table>", "||table||   right||"
+    tc "<table><tr><td>table</td><td style='text-align:center'>center</td><td style='text-align:right'>right</td></tr></table>", "||table||  center  ||   right||"
+
     tc "<table><tr><td>Hello, World!</td></tr></table>", "||Hello, World!||"
     tc "<table><tr><td style='text-align:right'>Hello, Right World!</td></tr></table>", "|| Hello, Right World!||"
     tc "<table><tr><th style='text-align:right'>Hello, Right World!</th></tr></table>", "||= Hello, Right World!=||"
@@ -457,7 +509,7 @@ describe TracWiki::Parser do
     # Equal sign after pipe make a header
     tc "<table><tr><th>Header</th></tr></table>", "||=Header=||"
 
-    tc "<table><tr><td>c1</td><td><a href=\"Link\">Link text</a></td><td><img src=\"Image\" alt=\"Image text\"/></td></tr></table>", "||c1||[[Link|Link text]]||{{Image|Image text}}||"
+    tc "<table><tr><td>c1</td><td><a href=\"Link\">Link text</a></td><td><img src='Image'/></td></tr></table>", "||c1||[[Link|Link text]]||[[Image(Image)]]||"
   end
 
   it 'should parse following table' do
@@ -468,11 +520,11 @@ describe TracWiki::Parser do
     tc("<table><tr><td>table</td></tr></table><p>par</p>", "||table||\npar\n")
     tc("<table><tr><td>table</td></tr></table><p>par</p>", "||table||\n\npar\n")
     # table followed by unordered list
-    tc("<table><tr><td>table</td></tr></table><ul><li>item</li></ul>", "||table||\n*item\n")
-    tc("<table><tr><td>table</td></tr></table><ul><li>item</li></ul>", "||table||\n\n*item\n")
+    tc("<table><tr><td>table</td></tr></table><ul><li>item</li></ul>", "||table||\n* item\n")
+    tc("<table><tr><td>table</td></tr></table><ul><li>item</li></ul>", "||table||\n\n* item\n")
     # table followed by ordered list
-    tc("<table><tr><td>table</td></tr></table><ol><li>item</li></ol>", "||table||\n#item\n")
-    tc("<table><tr><td>table</td></tr></table><ol><li>item</li></ol>", "||table||\n\n#item\n")
+    tc("<table><tr><td>table</td></tr></table><ol><li>item</li></ol>", "||table||\n1. item\n")
+    tc("<table><tr><td>table</td></tr></table><ol><li>item</li></ol>", "||table||\n\n1. item\n")
     # table followed by horizontal rule
     tc("<table><tr><td>table</td></tr></table><hr/>", "||table||\n----\n")
     tc("<table><tr><td>table</td></tr></table><hr/>", "||table||\n\n----\n")
@@ -492,11 +544,11 @@ describe TracWiki::Parser do
     tc("<h1>heading</h1><p>par</p>", "=heading=\npar\n")
     tc("<h1>heading</h1><p>par</p>", "=heading=\n\npar\n")
     # unordered list
-    tc("<h1>heading</h1><ul><li>item</li></ul>", "=heading=\n*item\n")
-    tc("<h1>heading</h1><ul><li>item</li></ul>", "=heading=\n\n*item\n")
+    tc("<h1>heading</h1><ul><li>item</li></ul>", "=heading=\n* item\n")
+    tc("<h1>heading</h1><ul><li>item</li></ul>", "=heading=\n\n* item\n")
     # ordered list
-    tc("<h1>heading</h1><ol><li>item</li></ol>", "=heading=\n#item\n")
-    tc("<h1>heading</h1><ol><li>item</li></ol>", "=heading=\n\n#item\n")
+    tc("<h1>heading</h1><ol><li>item</li></ol>", "=heading=\n1. item\n")
+    tc("<h1>heading</h1><ol><li>item</li></ol>", "=heading=\n\n1. item\n")
     # horizontal rule
     tc("<h1>heading</h1><hr/>", "=heading=\n----\n")
     tc("<h1>heading</h1><hr/>", "=heading=\n\n----\n")
@@ -516,11 +568,11 @@ describe TracWiki::Parser do
     tc("<p>par par</p>", "par\npar\n")
     tc("<p>par</p><p>par</p>", "par\n\npar\n")
     # unordered
-    tc("<p>par</p><ul><li>item</li></ul>", "par\n*item")
-    tc("<p>par</p><ul><li>item</li></ul>", "par\n\n*item")
+    tc("<p>par</p><ul><li>item</li></ul>", "par\n* item")
+    tc("<p>par</p><ul><li>item</li></ul>", "par\n\n* item")
     # ordered
-    tc("<p>par</p><ol><li>item</li></ol>", "par\n#item\n")
-    tc("<p>par</p><ol><li>item</li></ol>", "par\n\n#item\n")
+    tc("<p>par</p><ol><li>item</li></ol>", "par\n1. item\n")
+    tc("<p>par</p><ol><li>item</li></ol>", "par\n\n1. item\n")
     # horizontal
     tc("<p>par</p><hr/>", "par\n----\n")
     tc("<p>par</p><hr/>", "par\n\n----\n")
@@ -534,50 +586,50 @@ describe TracWiki::Parser do
 
   it 'should parse following unordered list' do
     # heading
-    tc("<ul><li>item</li></ul><h1>heading</h1>", "*item\n=heading=")
-    tc("<ul><li>item</li></ul><h1>heading</h1>", "*item\n\n=heading=")
+    tc("<ul><li>item</li></ul><h1>heading</h1>", "* item\n=heading=")
+    tc("<ul><li>item</li></ul><h1>heading</h1>", "* item\n\n=heading=")
     # paragraph
-    tc("<ul><li>item par</li></ul>", "*item\npar\n") # items may span multiple lines
-    tc("<ul><li>item</li></ul><p>par</p>", "*item\n\npar\n")
+    tc("<ul><li>item par</li></ul>", "* item\npar\n") # items may span multiple lines
+    tc("<ul><li>item</li></ul><p>par</p>", "* item\n\npar\n")
     # unordered
-    tc("<ul><li>item</li><li>item</li></ul>", "*item\n*item\n")
-    tc("<ul><li>item</li></ul><ul><li>item</li></ul>", "*item\n\n*item\n")
+    tc("<ul><li>item</li><li>item</li></ul>", "* item\n* item\n")
+    tc("<ul><li>item</li></ul><ul><li>item</li></ul>", "* item\n\n* item\n")
     # ordered
-    tc("<ul><li>item</li></ul><ol><li>item</li></ol>", "*item\n#item\n")
-    tc("<ul><li>item</li></ul><ol><li>item</li></ol>", "*item\n\n#item\n")
+    tc("<ul><li>item</li></ul><ol><li>item</li></ol>", "* item\n1. item\n")
+    tc("<ul><li>item</li></ul><ol><li>item</li></ol>", "* item\n\n1. item\n")
     # horizontal rule
-    tc("<ul><li>item</li></ul><hr/>", "*item\n----\n")
-    tc("<ul><li>item</li></ul><hr/>", "*item\n\n----\n")
+    tc("<ul><li>item</li></ul><hr/>", "* item\n----\n")
+    tc("<ul><li>item</li></ul><hr/>", "* item\n\n----\n")
     # nowiki
-    tc("<ul><li>item</li></ul><pre>nowiki</pre>", "*item\n{{{\nnowiki\n}}}\n")
-    tc("<ul><li>item</li></ul><pre>nowiki</pre>", "*item\n\n{{{\nnowiki\n}}}\n")
+    tc("<ul><li>item</li></ul><pre>nowiki</pre>", "* item\n{{{\nnowiki\n}}}\n")
+    tc("<ul><li>item</li></ul><pre>nowiki</pre>", "* item\n\n{{{\nnowiki\n}}}\n")
     # table
-    tc("<ul><li>item</li></ul><table><tr><td>table</td></tr></table>", "*item\n||table||\n")
-    tc("<ul><li>item</li></ul><table><tr><td>table</td></tr></table>", "*item\n\n||table||\n")
+    tc("<ul><li>item</li></ul><table><tr><td>table</td></tr></table>", "* item\n||table||\n")
+    tc("<ul><li>item</li></ul><table><tr><td>table</td></tr></table>", "* item\n\n||table||\n")
   end
 
   it 'should parse following ordered list' do
     # heading
-    tc("<ol><li>item</li></ol><h1>heading</h1>", "#item\n=heading=")
-    tc("<ol><li>item</li></ol><h1>heading</h1>", "#item\n\n=heading=")
+    tc("<ol><li>item</li></ol><h1>heading</h1>", "1. item\n=heading=")
+    tc("<ol><li>item</li></ol><h1>heading</h1>", "1. item\n\n=heading=")
     # paragraph
-    tc("<ol><li>item par</li></ol>", "#item\npar\n") # items may span multiple lines
-    tc("<ol><li>item</li></ol><p>par</p>", "#item\n\npar\n")
+    tc("<ol><li>item par</li></ol>", "1. item\npar\n") # items may span multiple lines
+    tc("<ol><li>item</li></ol><p>par</p>", "1. item\n\npar\n")
     # unordered
-    tc("<ol><li>item</li></ol><ul><li>item</li></ul>", "#item\n*item\n")
-    tc("<ol><li>item</li></ol><ul><li>item</li></ul>", "#item\n\n*item\n")
+    tc("<ol><li>item</li></ol><ul><li>item</li></ul>", "1. item\n* item\n")
+    tc("<ol><li>item</li></ol><ul><li>item</li></ul>", "1. item\n\n*   item\n")
     # ordered
-    tc("<ol><li>item</li><li>item</li></ol>", "#item\n#item\n")
-    tc("<ol><li>item</li></ol><ol><li>item</li></ol>", "#item\n\n#item\n")
+    tc("<ol><li>item</li><li>item</li></ol>", "1. item\n2. item\n")
+    tc("<ol><li>item</li></ol><ol><li>item</li></ol>", "1. item\n\n1. item\n")
     # horizontal role
-    tc("<ol><li>item</li></ol><hr/>", "#item\n----\n")
-    tc("<ol><li>item</li></ol><hr/>", "#item\n\n----\n")
+    tc("<ol><li>item</li></ol><hr/>", "1. item\n----\n")
+    tc("<ol><li>item</li></ol><hr/>", "1. item\n\n----\n")
     # nowiki
-    tc("<ol><li>item</li></ol><pre>nowiki</pre>", "#item\n{{{\nnowiki\n}}}\n")
-    tc("<ol><li>item</li></ol><pre>nowiki</pre>", "#item\n\n{{{\nnowiki\n}}}\n")
+    tc("<ol><li>item</li></ol><pre>nowiki</pre>", "1. item\n{{{\nnowiki\n}}}\n")
+    tc("<ol><li>item</li></ol><pre>nowiki</pre>", "1. item\n\n{{{\nnowiki\n}}}\n")
     # table
-    tc("<ol><li>item</li></ol><table><tr><td>table</td></tr></table>", "#item\n||table||\n")
-    tc("<ol><li>item</li></ol><table><tr><td>table</td></tr></table>", "#item\n\n||table||\n")
+    tc("<ol><li>item</li></ol><table><tr><td>table</td></tr></table>", "1. item\n||table||\n")
+    tc("<ol><li>item</li></ol><table><tr><td>table</td></tr></table>", "1. item\n\n||table||\n")
   end
 
   it 'should parse following horizontal rule' do
@@ -588,11 +640,14 @@ describe TracWiki::Parser do
     tc("<hr/><p>par</p>", "----\npar\n")
     tc("<hr/><p>par</p>", "----\n\npar\n")
     # unordered
-    tc("<hr/><ul><li>item</li></ul>", "----\n*item")
-    tc("<hr/><ul><li>item</li></ul>", "----\n*item")
+    tc("<hr/><ul><li>item</li></ul>", "----\n* item")
+    tc("<hr/><ul><li>item</li></ul>", "----\n* item")
+    tc("<hr/><ul><li>item</li></ul>", "----\n- item")
+    tc("<hr/><ul><li>item</li></ul>", "----\n- item")
+    tc("<hr/><ul><li>item</li></ul>", "----\n - item")
     # ordered
-    tc("<hr/><ol><li>item</li></ol>", "----\n#item")
-    tc("<hr/><ol><li>item</li></ol>", "----\n#item")
+    tc("<hr/><ol><li>item</li></ol>", "----\n1. item")
+    tc("<hr/><ol><li>item</li></ol>", "----\n1. item")
     # horizontal
     tc("<hr/><hr/>", "----\n----\n")
     tc("<hr/><hr/>", "----\n\n----\n")
@@ -612,11 +667,11 @@ describe TracWiki::Parser do
     tc("<pre>nowiki</pre><p>par</p>", "{{{\nnowiki\n}}}\npar")
     tc("<pre>nowiki</pre><p>par</p>", "{{{\nnowiki\n}}}\n\npar")
     # unordered
-    tc("<pre>nowiki</pre><ul><li>item</li></ul>", "{{{\nnowiki\n}}}\n*item\n")
-    tc("<pre>nowiki</pre><ul><li>item</li></ul>", "{{{\nnowiki\n}}}\n\n*item\n")
+    tc("<pre>nowiki</pre><ul><li>item</li></ul>", "{{{\nnowiki\n}}}\n* item\n")
+    tc("<pre>nowiki</pre><ul><li>item</li></ul>", "{{{\nnowiki\n}}}\n\n* item\n")
     # ordered
-    tc("<pre>nowiki</pre><ol><li>item</li></ol>", "{{{\nnowiki\n}}}\n#item\n")
-    tc("<pre>nowiki</pre><ol><li>item</li></ol>", "{{{\nnowiki\n}}}\n\n#item\n")
+    tc("<pre>nowiki</pre><ol><li>item</li></ol>", "{{{\nnowiki\n}}}\n1. item\n")
+    tc("<pre>nowiki</pre><ol><li>item</li></ol>", "{{{\nnowiki\n}}}\n\n1. item\n")
     # horizontal
     tc("<pre>nowiki</pre><hr/>", "{{{\nnowiki\n}}}\n----\n")
     tc("<pre>nowiki</pre><hr/>", "{{{\nnowiki\n}}}\n\n----\n")
@@ -629,9 +684,9 @@ describe TracWiki::Parser do
   end
 
   it 'should parse image' do
-    tc("<p><img src=\"image.jpg\"/></p>", "{{image.jpg}}")
-    tc("<p><img src=\"image.jpg\" alt=\"tag\"/></p>", "{{image.jpg|tag}}")
-    tc("<p><img src=\"http://example.org/image.jpg\"/></p>", "{{http://example.org/image.jpg}}")
+    tc("<p><img src='image.jpg'/></p>", "[[Image(image.jpg)]]")
+    tc("<p><img src='image.jpg' alt='tag'/></p>", "[[Image(image.jpg|tag)]]")
+    tc("<p><img src='http://example.org/image.jpg'/></p>", "[[Image(http://example.org/image.jpg)]]")
   end
 
   it 'should parse bold combo' do
@@ -647,7 +702,7 @@ describe TracWiki::Parser do
         "This is ~~deleted~~")
 
     tce("<p>This is <sup>super</sup></p>",
-        "This is ^^super^^")
+        "This is ^super^")
 
     tce("<p>This is <sub>sub</sub></p>",
         "This is ,,sub,,")
@@ -663,3 +718,4 @@ describe TracWiki::Parser do
     tc("<p><a href=\"a/b/c\">a/b/c</a></p>", "[[a/b/c]]", :no_escape => true)
   end
 end
+# vim: tw=0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trac-wiki
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: