vimdeck 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/templates/script.vim.erb

@@ -1,4 +1,5 @@
 set nonumber
+set hidden
 noremap <PageUp> :bp<CR>
 noremap <Left> :bp<CR>
 noremap <PageDown> :bn<CR>

data/lib/vimdeck.rb

@@ -33,7 +33,7 @@ module Vimdeck
     [
       # 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 @@ module Vimdeck
       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 @@ module Vimdeck
         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

data/presentation/script.vim

@@ -1,4 +1,5 @@
 set nonumber
+set hidden
 noremap <PageUp> :bp<CR>
 noremap <Left> :bp<CR>
 noremap <PageDown> :bn<CR>
@@ -21,7 +22,7 @@ b 3
 b 4
 
 
-call matchadd("Comment", "• Second\\n        • Third\\(\\_.*slide 4\\)\\@=")
+call matchadd("Comment", "\\n        • Second\\n        • Third\\(\\_.*slide 4\\)\\@=")
 
 
 b 5
@@ -29,7 +30,7 @@ b 5
 
 call matchadd("Comment", "• First\\(\\_.*slide 5\\)\\@=")
 
-call matchadd("Comment", "• Third\\(\\_.*slide 5\\)\\@=")
+call matchadd("Comment", "\\n        • Third\\(\\_.*slide 5\\)\\@=")
 
 
 b 6

data/presentation/slide003.md

@@ -3,10 +3,9 @@
          /    / /_/ / /|_/ / _  / _// , _/ _// // / / /___/ /_\ \  / /
         /_/|_/\____/_/  /_/____/___/_/|_/___/____/ /____/___/___/ /_/
 
-        This is how a numbered list
-        Looks in vimdeck
-        What do you think?
-
+        1. This is how a numbered list
+        2. Looks in vimdeck
+        3. What do you think?
 
 
 

data/presentation/slide015.md

@@ -0,0 +1,87 @@
+          ________            ______          ____
+         /_  __/ /_  ___     / ____/___  ____/ / /
+          / / / __ \/ _ \   / __/ / __ \/ __  / /
+         / / / / / /  __/  / /___/ / / / /_/ /_/
+        /_/ /_/ /_/\___/  /_____/_/ /_/\__,_(_)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+slide 15

data/slides.md

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vimdeck
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -75,7 +75,6 @@ files:
 - img/demo4.png
 - img/vim.png
 - lib/templates/script.vim.erb
-- lib/test
 - lib/vimdeck.rb
 - LICENSE.txt
 - presentation/script.vim
@@ -93,6 +92,7 @@ files:
 - presentation/slide012.md
 - presentation/slide013.md
 - presentation/slide014.md
+- presentation/slide015.md
 - Rakefile
 - README.md
 - slides.md
@@ -101,6 +101,7 @@ files:
 - vimdeck-0.1.0.gem
 - vimdeck-0.1.1.gem
 - vimdeck-0.1.2.gem
+- vimdeck-0.1.3.gem
 - vimdeck.gemspec
 homepage: http://github.com/tybenz/vimdeck
 licenses:

data/lib/test

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require './vimdeck2'
-
-Vimdeck.slideshow($1)