Fixing ordered and unordered lists

Author: tybenz

lib/vimdeck.rb

@@ -33,7 +33,7 @@ class Render < Redcarpet::Render::Base
     [
       # block-level calls
       :block_quote,
-      :block_html, :list, :list_item,
+      :block_html, :list_item,
 
       # span-level calls
       :autolink, :codespan, :double_emphasis,
@@ -52,6 +52,14 @@ class Render < Redcarpet::Render::Base
       end
     end
 
+    def list(content, type)
+      if type == :unordered
+        "<!~#{content}~!>"
+      else
+        "<@~#{content}~@>"
+      end
+    end
+
     def header(title, level)
       case level
       when 1
@@ -104,6 +112,30 @@ def self.generate(filename)
         slide_num = "%03d" % (i+1)
         slide = renderer.render(slide)
 
+        regex = /\<\@\~(.*)\~\@\>/m
+        match = slide.match(regex)
+        while match && match[1] && match.post_match do
+          list = match[1].split("\n")
+          j = 0
+          list = list.map do |li|
+            j += 1
+            "#{j}. #{li}"
+          end
+          slide.sub!(regex, list.join("\n"))
+          match = match.post_match.match(regex)
+        end
+
+        regex = /\<\!\~(.*)\~\!\>/m
+        match = slide.match(regex)
+        while match && match[1] && match.post_match do
+          list = match[1].split("\n")
+          list = list.map do |li|
+            "\u2022 #{li}"
+          end
+          slide.sub!(regex, list.join("\n"))
+          match = match.post_match.match(regex)
+        end
+
         # buffer gets stashed into @buffers array for script template
         # needs to track things like the buffer number, code highlighting
         # and focus/unfocus stuff

slides.md

@@ -17,16 +17,16 @@
 
 # BULLETS
 
-• First
-{~• Second
+• First{~
+• Second
 • Third~}
 
 
 # BULLETS
 
 {~• First~}
-• Second
-{~• Third~}
+• Second{~
+• Third~}
 
 
 # BULLETS