vimdeck 0.0.5 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.7

data/bin/vimdeck

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'vimdeck'
+# require 'vimdeck'
+require_relative File.dirname(__FILE__)+"/../../lib/vimdeck.rb"
 
 Vimdeck.slideshow(ARGV[0])

data/lib/templates/script.vim.erb

@@ -8,5 +8,8 @@ b <%= buffer[:num] %>
 <% if buffer[:code] %>
 <%= buffer[:code][:start] %>,<%= buffer[:code][:end] %>SyntaxInclude <%= buffer[:code][:language] %>
 <% end %>
+<% buffer[:comments].each do |comment| %>
+call matchadd("Comment", "<%= comment %>")
+<% end %>
 <% end %>
 b 1

data/lib/vimdeck.rb

@@ -68,24 +68,36 @@ module Vimdeck
         code_height = code[0].split("\n").length - 2
         code = code[0].gsub( /```[^\n]*\n/, '' ).gsub( /\n```/, '' )
         slide = slide.gsub( /```[^\n]*\n/, '' ).gsub( /\n```/, '' )
+
+        if code_height > 0
+          start = slide.index(code)
+          start = slide[0..start].split("\n").length
+          buffer[:code][:end] = code_height + start - 1
+          buffer[:code][:start] = start
+        end
       end
 
       slide += "\n" * 80
-
-      if code_height > 0
-        start = slide.index(code)
-        start = slide[0..start].split("\n").length
-        buffer[:code][:end] = code_height + start - 1
-        buffer[:code][:start] = start
-      end
+      slide += "slide #{i+1}"
 
       spaces = "           "
       slide = slide.gsub( /\n/, "\n#{spaces}" )
       slide = spaces + slide
       slide = slide.gsub( / *\n/, "\n" ).gsub( / *$/, '' )
 
+      regex = /\{\~(.*?)\~\}/m
+      match = slide.match(regex)
+      buffer[:comments] = []
+      while match && match[1] && match.post_match do
+        slide.sub!(regex, match[1])
+        pattern = match[1] + "||(||_.*slide #{i+1}||)||@="
+        buffer[:comments] << pattern.gsub(/\n/, "||n").gsub(/\[/, "||[").gsub(/\]/, "||]").gsub(/\|/, "\\").gsub(/\"/, "\\\"")
+        match = match.post_match.match(regex)
+      end
+
+      filenum = "%03d" % (i+1)
 
-      File.open("presentation/slide#{i}.md", "w") do |file|
+      File.open("presentation/slide#{filenum}.md", "w") do |file|
         file.write slide
       end
 

data/presentation/script.vim

@@ -7,21 +7,103 @@ noremap <Right> :bn<CR>
 b 1
 
 
+
 b 2
 
 
+
 b 3
 
 
+
 b 4
 
 
+call matchadd("Comment", "• Second\\n           • Third\\(\\_.*slide 4\\)\\@=")
+
+
 b 5
 
-10,15SyntaxInclude ruby
+
+call matchadd("Comment", "• First\\(\\_.*slide 5\\)\\@=")
+
+call matchadd("Comment", "• Third\\(\\_.*slide 5\\)\\@=")
 
 
 b 6
 
 
+call matchadd("Comment", "• First\\n           • Second\\(\\_.*slide 6\\)\\@=")
+
+
+b 7
+
+2,14SyntaxInclude ruby
+
+
+
+b 8
+
+2,14SyntaxInclude ruby
+
+
+call matchadd("Comment", "module Parts\\n             class foo\\n               def slide\\n                \"of a\"\\n               end\\n\\n               def can\\n                 highlight = \\(\\_.*slide 8\\)\\@=")
+
+call matchadd("Comment", "\\n               end\\n             end\\n           end\\(\\_.*slide 8\\)\\@=")
+
+
+b 9
+
+2,14SyntaxInclude ruby
+
+
+call matchadd("Comment", "module Parts\\n             class foo\\n               def slide\\n                \"of a\"\\n               end\\n\\n               def\\(\\_.*slide 9\\)\\@=")
+
+call matchadd("Comment", "highlight = \"vimdeck\"\\n               end\\n             end\\n           end\\(\\_.*slide 9\\)\\@=")
+
+
+b 10
+
+2,14SyntaxInclude ruby
+
+
+call matchadd("Comment", "module Parts\\n             class foo\\n               def slide\\n                \"of a\"\\n               end\\n\\n               def can\\(\\_.*slide 10\\)\\@=")
+
+call matchadd("Comment", "= \"vimdeck\"\\n               end\\n             end\\n           end\\(\\_.*slide 10\\)\\@=")
+
+
+b 11
+
+2,14SyntaxInclude ruby
+
+
+call matchadd("Comment", "module\\(\\_.*slide 11\\)\\@=")
+
+call matchadd("Comment", "class foo\\n               def slide\\n                \"of a\"\\n               end\\n\\n               def can\\n                 highlight = \"vimdeck\"\\n               end\\n             end\\n           end\\(\\_.*slide 11\\)\\@=")
+
+
+b 12
+
+2,14SyntaxInclude ruby
+
+
+call matchadd("Comment", "module Parts\\n             class foo\\n               def slide\\(\\_.*slide 12\\)\\@=")
+
+call matchadd("Comment", "end\\n\\n               def can\\n                 highlight = \"vimdeck\"\\n               end\\n             end\\n           end\\(\\_.*slide 12\\)\\@=")
+
+
+b 13
+
+2,14SyntaxInclude ruby
+
+
+call matchadd("Comment", "module Parts\\n             class foo\\n               def\\(\\_.*slide 13\\)\\@=")
+
+call matchadd("Comment", "\"of a\"\\n               end\\n\\n               def can\\n                 highlight = \"vimdeck\"\\n               end\\n             end\\n           end\\(\\_.*slide 13\\)\\@=")
+
+
+b 14
+
+
+
 b 1

data/presentation/{slide0.md → slide001.md}

@@ -89,3 +89,4 @@
 
 
 
+           slide 1

data/presentation/{slide1.md → slide002.md}

@@ -102,3 +102,4 @@
 
 
 
+           slide 2

data/presentation/{slide2.md → slide003.md}

@@ -86,3 +86,4 @@
 
 
 
+           slide 3

data/presentation/{slide3.md → slide004.md}

@@ -5,9 +5,9 @@
            /_____/\__,_/_/_/\___/\__/____/
 
 
-           - First
-           - Second
-           - Third
+           • First
+           • Second
+           • Third
 
 
 
@@ -87,3 +87,4 @@
 
 
 
+           slide 4

data/presentation/slide005.md

@@ -0,0 +1,90 @@
+               ____        ____     __
+              / __ )__  __/ / /__  / /______
+             / __  / / / / / / _ \/ __/ ___/
+            / /_/ / /_/ / / /  __/ /_(__  )
+           /_____/\__,_/_/_/\___/\__/____/
+
+
+           • First
+           • Second
+           • Third
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+           slide 5

data/presentation/slide006.md

@@ -0,0 +1,90 @@
+               ____        ____     __
+              / __ )__  __/ / /__  / /______
+             / __  / / / / / / _ \/ __/ ___/
+            / /_/ / /_/ / / /  __/ /_(__  )
+           /_____/\__,_/_/_/\___/\__/____/
+
+
+           • First
+           • Second
+           • Third
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+           slide 6

data/presentation/slide007.md

@@ -0,0 +1,94 @@
+
+           # VIMDECK DOES CODE!
+
+           module Parts
+             class foo
+               def slide
+                "of a"
+               end
+
+               def can
+                 highlight = "vimdeck"
+               end
+             end
+           end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+           slide 7

data/presentation/slide008.md

@@ -0,0 +1,94 @@
+
+           # VIMDECK DOES CODE!
+
+           module Parts
+             class foo
+               def slide
+                "of a"
+               end
+
+               def can
+                 highlight = "vimdeck"
+               end
+             end
+           end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+           slide 8

data/presentation/slide009.md

@@ -0,0 +1,94 @@
+
+           # VIMDECK DOES CODE!
+
+           module Parts
+             class foo
+               def slide
+                "of a"
+               end
+
+               def can
+                 highlight = "vimdeck"
+               end
+             end
+           end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+           slide 9