vimdeck 0.1.8 → 0.1.9

data/README.md

@@ -130,3 +130,7 @@ Images are even converted to ascii art!
 ---------------------
 
 Made by [tybenz](http://github.com/tybenz): [tybenz.com](http://tybenz.com) // [@tybenz](http://twitter.com/tybenz)
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/tybenz/vimdeck/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/bin/vimdeck

@@ -14,6 +14,7 @@
 
 require "optparse"
 require "vimdeck"
+# require_relative File.dirname(__FILE__)+"/../../lib/vimdeck.rb"
 
 def usage
   File.read(__FILE__).split("\n").grep(/^#>/).each do |line|

data/lib/templates/script.vim.erb

@@ -9,7 +9,9 @@ noremap Q :q<CR>
 <% @buffers.each do |buffer| %>
 b <%= buffer[:num] %>
 <% if buffer[:code] %>
-<%= buffer[:code][:start] %>,<%= buffer[:code][:end] %>SyntaxInclude <%= buffer[:code][:language] %>
+<% buffer[:code].each do |code| %>
+<%= code[:start] %>,<%= code[:end] %>SyntaxInclude <%= code[:language] %>
+<% end %>
 <% end %>
 <% buffer[:comments].each do |comment| %>
 call matchadd("Comment", "<%= comment %>")

data/lib/vimdeck.rb

@@ -180,7 +180,8 @@ module Vimdeck
         code = nil
         code = slide.match( /```([^\n]*)\n.*\n```/m )
         if code
-          buffer[:code] = { :language => code[1] }
+          buffer[:code] = []
+          code_hash = { :language => code[1] }
           code_height = code[0].split("\n").length - 2
           code = code[0].gsub( /```[^\n]*\n/, '' ).gsub( /\n```/, '' )
           slide = slide.gsub( /```[^\n]*\n/, '' ).gsub( /\n```/, '' )
@@ -188,9 +189,10 @@ module Vimdeck
           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
+            code_hash[:end] = code_height + start - 1
+            code_hash[:start] = start
           end
+          buffer[:code] << code_hash
         end
 
         # Prepending each line with slide_padding

data/presentation/script.vim

@@ -45,15 +45,19 @@ call matchadd("Comment", "• First\\n        • Second\\(\\_.*slide 007\\)\\@=
 
 b 8
 
+
 6,17SyntaxInclude ruby
 
 
 
+
 b 9
 
+
 6,17SyntaxInclude ruby
 
 
+
 call matchadd("Comment", "module Parts\\n          class foo\\n            def slide\\n             \"of a\"\\n            end\\n\\n            def can\\n              highlight = \\(\\_.*slide 009\\)\\@=")
 
 call matchadd("Comment", "\\n            end\\n          end\\n        end\\(\\_.*slide 009\\)\\@=")
@@ -61,9 +65,11 @@ call matchadd("Comment", "\\n            end\\n          end\\n        end\\(\\_
 
 b 10
 
+
 6,17SyntaxInclude ruby
 
 
+
 call matchadd("Comment", "module Parts\\n          class foo\\n            def slide\\n             \"of a\"\\n            end\\n\\n            def\\(\\_.*slide 010\\)\\@=")
 
 call matchadd("Comment", "highlight = \"vimdeck\"\\n            end\\n          end\\n        end\\(\\_.*slide 010\\)\\@=")
@@ -71,9 +77,11 @@ call matchadd("Comment", "highlight = \"vimdeck\"\\n            end\\n
 
 b 11
 
+
 6,17SyntaxInclude ruby
 
 
+
 call matchadd("Comment", "module Parts\\n          class foo\\n            def slide\\n             \"of a\"\\n            end\\n\\n            def can\\(\\_.*slide 011\\)\\@=")
 
 call matchadd("Comment", "= \"vimdeck\"\\n            end\\n          end\\n        end\\(\\_.*slide 011\\)\\@=")
@@ -81,9 +89,11 @@ call matchadd("Comment", "= \"vimdeck\"\\n            end\\n          end\\n
 
 b 12
 
+
 6,17SyntaxInclude ruby
 
 
+
 call matchadd("Comment", "module\\(\\_.*slide 012\\)\\@=")
 
 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 012\\)\\@=")
@@ -91,9 +101,11 @@ call matchadd("Comment", "class foo\\n            def slide\\n             \"of
 
 b 13
 
+
 6,17SyntaxInclude ruby
 
 
+
 call matchadd("Comment", "module Parts\\n          class foo\\n            def slide\\(\\_.*slide 013\\)\\@=")
 
 call matchadd("Comment", "end\\n\\n            def can\\n              highlight = \"vimdeck\"\\n            end\\n          end\\n        end\\(\\_.*slide 013\\)\\@=")
@@ -101,9 +113,11 @@ call matchadd("Comment", "end\\n\\n            def can\\n              highlight
 
 b 14
 
+
 6,17SyntaxInclude ruby
 
 
+
 call matchadd("Comment", "module Parts\\n          class foo\\n            def\\(\\_.*slide 014\\)\\@=")
 
 call matchadd("Comment", "\"of a\"\\n            end\\n\\n            def can\\n              highlight = \"vimdeck\"\\n            end\\n          end\\n        end\\(\\_.*slide 014\\)\\@=")
@@ -112,5 +126,49 @@ call matchadd("Comment", "\"of a\"\\n            end\\n\\n            def can\\n
 b 15
 
 
+6,16SyntaxInclude javascript
+
+
+
+
+b 16
+
+
+6,16SyntaxInclude javascript
+
+
+
+call matchadd("Comment", "(function( window, $, undefined ) {\\n            $( '.hello' ).on( 'click', function sayHello() {\\(\\_.*slide 016\\)\\@=")
+
+call matchadd("Comment", "\\n            });\\n        })( window, jQuery );\\(\\_.*slide 016\\)\\@=")
+
+
+b 17
+
+
+6,16SyntaxInclude javascript
+
+
+
+call matchadd("Comment", "<body>\\(\\_.*slide 017\\)\\@=")
+
+call matchadd("Comment", "</body>\\(\\_.*slide 017\\)\\@=")
+
+
+b 18
+
+
+6,16SyntaxInclude javascript
+
+
+
+call matchadd("Comment", "(function( window, $, undefined ) {\\n            $( '.hello' ).on( 'click', function sayHello() {\\(\\_.*slide 018\\)\\@=")
+
+call matchadd("Comment", "\\n            });\\n        })( window, jQuery );\\n\\n        <body>\\n            <a href=\"#\" class=\"hello\">Hello!</a>\\n        </body>\\(\\_.*slide 018\\)\\@=")
+
+
+b 19
+
+
 
 b 1

data/presentation/slide015.md

@@ -1,9 +1,17 @@
-          ________            ______          ____
-         /_  __/ /_  ___     / ____/___  ____/ / /
-          / / / __ \/ _ \   / __/ / __ \/ __  / /
-         / / / / / /  __/  / /___/ / / / /_/ /_/
-        /_/ /_/ /_/\___/  /_____/_/ /_/\__,_(_)
-
+          _________  ___  ____  ___ ______  ___
+         / ___/ __ \/ _ \/ __/ / _ \_  __/ |_  |
+        / /__/ /_/ / // / _/  / ___// /   / __/
+        \___/\____/____/___/ /_/   /_/   /____/
+
+        (function( window, $, undefined ) {
+            $( '.hello' ).on( 'click', function sayHello() {
+                alert( 'Why, hello there!' );
+            });
+        })( window, jQuery );
+
+        <body>
+            <a href="#" class="hello">Hello!</a>
+        </body>
 
 
 

data/presentation/slide016.md

@@ -0,0 +1,95 @@
+          _________  ___  ____  ___ ______  ___
+         / ___/ __ \/ _ \/ __/ / _ \_  __/ |_  |
+        / /__/ /_/ / // / _/  / ___// /   / __/
+        \___/\____/____/___/ /_/   /_/   /____/
+
+        (function( window, $, undefined ) {
+            $( '.hello' ).on( 'click', function sayHello() {
+                alert( 'Why, hello there!' );
+            });
+        })( window, jQuery );
+
+        <body>
+            <a href="#" class="hello">Hello!</a>
+        </body>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+slide 016

data/presentation/slide017.md

@@ -0,0 +1,95 @@
+          _________  ___  ____  ___ ______  ___
+         / ___/ __ \/ _ \/ __/ / _ \_  __/ |_  |
+        / /__/ /_/ / // / _/  / ___// /   / __/
+        \___/\____/____/___/ /_/   /_/   /____/
+
+        (function( window, $, undefined ) {
+            $( '.hello' ).on( 'click', function sayHello() {
+                alert( 'Why, hello there!' );
+            });
+        })( window, jQuery );
+
+        <body>
+            <a href="#" class="hello">Hello!</a>
+        </body>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+slide 017

data/presentation/slide018.md

@@ -0,0 +1,95 @@
+          _________  ___  ____  ___ ______  ___
+         / ___/ __ \/ _ \/ __/ / _ \_  __/ |_  |
+        / /__/ /_/ / // / _/  / ___// /   / __/
+        \___/\____/____/___/ /_/   /_/   /____/
+
+        (function( window, $, undefined ) {
+            $( '.hello' ).on( 'click', function sayHello() {
+                alert( 'Why, hello there!' );
+            });
+        })( window, jQuery );
+
+        <body>
+            <a href="#" class="hello">Hello!</a>
+        </body>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+slide 018

data/presentation/slide019.md

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

data/slides.md

@@ -162,4 +162,72 @@ end~}
 ```
 
 
+## CODE PT 2
+
+```javascript
+(function( window, $, undefined ) {
+    $( '.hello' ).on( 'click', function sayHello() {
+        alert( 'Why, hello there!' );
+    });
+})( window, jQuery );
+```
+
+```html
+<body>
+    <a href="#" class="hello">Hello!</a>
+</body>
+```
+
+
+## CODE PT 2
+
+```javascript
+{~(function( window, $, undefined ) {
+    $( '.hello' ).on( 'click', function sayHello() {~}
+        alert( 'Why, hello there!' );{~
+    });
+})( window, jQuery );~}
+```
+
+```html
+<body>
+    <a href="#" class="hello">Hello!</a>
+</body>
+```
+
+
+## CODE PT 2
+
+```javascript
+(function( window, $, undefined ) {
+    $( '.hello' ).on( 'click', function sayHello() {
+        alert( 'Why, hello there!' );
+    });
+})( window, jQuery );
+```
+
+```html
+{~<body>~}
+    <a href="#" class="hello">Hello!</a>
+{~</body>~}
+```
+
+
+## CODE PT 2
+
+```javascript
+{~(function( window, $, undefined ) {
+    $( '.hello' ).on( 'click', function sayHello() {~}
+        alert( 'Why, hello there!' );{~
+    });
+})( window, jQuery );
+```
+
+```html
+<body>
+    <a href="#" class="hello">Hello!</a>
+</body>~}
+```
+
+
 # The End!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vimdeck
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -93,6 +93,10 @@ files:
 - presentation/slide013.md
 - presentation/slide014.md
 - presentation/slide015.md
+- presentation/slide016.md
+- presentation/slide017.md
+- presentation/slide018.md
+- presentation/slide019.md
 - Rakefile
 - README.md
 - slides.md