slideshow 0.9.1 → 0.9.2

data/lib/slideshow/helpers/table_helper.rb

@@ -1,4 +1,5 @@
-module TableHelper
+module Slideshow
+  module TableHelper
 
 # todo: add center, plus generic col helper
 
@@ -20,9 +21,9 @@ def left( opts={}, &blk )
   after  << "<!-- end left -->\n"
 
   html  = ""
-  html << guard_text( before )
+  html << guard_block( before )
   html << text
-  html << guard_text( after )
+  html << guard_block( after )
 
   concat_erb( html, blk.binding )
   return
@@ -45,9 +46,9 @@ def right( opts={}, &blk )
   after  << "<!-- end right -->\n"
 
   html  = ""
-  html << guard_text( before )
+  html << guard_block( before )
   html << text
-  html << guard_text( after )
+  html << guard_block( after )
       
   concat_erb( html, blk.binding )
   return
@@ -55,7 +56,8 @@ end
   
   
 end # module TableHelper
+end # module Slideshow
 
 class Slideshow::Gen
-  include TableHelper
+  include Slideshow::TableHelper
 end

data/lib/slideshow/helpers/text_helper.rb

@@ -1,6 +1,7 @@
-module TextHelper
+module Slideshow
+  module TextHelper
   
-def __include__( name, opts = {} )
+def s9_include( name, opts = {} )
   puts "  Including '#{name}'..." 
   content = File.read( name )
 end
@@ -24,7 +25,7 @@ EOS
 <!-- end help -->
 EOS
 
- guard_text( html )  
+ guard_block( html )  
 end
 
 
@@ -141,10 +142,11 @@ def format_code( code, opts )
   out << code_highlighted
   out << %{<!-- end code -->\n}
   
-  wrap_markup( out ) # saveguard with notextile wrapper etc./no further processing needed
+  guard_block( out ) # saveguard with notextile wrapper etc./no further processing needed
 end
 
 
 end # module TextHelper
+end # module Slideshow
 
-Slideshow::Gen.__send__( :include, TextHelper )
+Slideshow::Gen.__send__( :include, Slideshow::TextHelper )

data/lib/slideshow/markdown.rb

@@ -1,4 +1,5 @@
-module MarkdownEngines
+module Slideshow
+  module MarkdownEngines
 
   def rdiscount_to_html( content )
     RDiscount.new( content ).to_html
@@ -21,7 +22,8 @@ module MarkdownEngines
   end
 
 end   # module MarkdownEngines
+end # module Slideshow
 
 class Slideshow::Gen
-  include MarkdownEngines
+  include Slideshow::MarkdownEngines
 end

data/lib/slideshow/opts.rb

@@ -101,7 +101,7 @@ class Opts
     :gradient_color1   => 'red',
     :gradient_color2   => 'black',
 
-    :code_engine       => 'uv',  # ultraviolet (uv) | coderay (cr)
+    :code_engine       => 'sh',  # SyntaxHighligher (sh) | ultraviolet (uv) | coderay (cr)
     :code_txmt         => 'false', # Text Mate Hyperlink for Source?
   }
 

data/lib/slideshow/textile.rb

@@ -1,4 +1,5 @@
-module TextileEngines
+module Slideshow
+  module TextileEngines
 
   def redcloth_java_fix_escape_nonascii( txt )
     txt.chars.map{ |x| x.size > 1 ? "&##{x.unpack("U*")};" : x }.join
@@ -42,9 +43,9 @@ module TextileEngines
     content = red.to_html
   end
 
-end # module TextileEngines
-
+end   # module TextileEngines
+end # module Slideshow
 
 class Slideshow::Gen
-  include TextileEngines
+  include Slideshow::TextileEngines
 end

data/templates/s6.txt

@@ -1,11 +1,21 @@
-# builtin S6 template package manifest
+#  S6 blank template package manifest
+#  Change as desired/needed
+#
+#  Questions? Comments?
+#  Send them along to the Free Web Slide Show Alternatives (S5, S6, S9 And Friends) Forum/Mailing List. 
+#  http://groups.google.com/group/webslideshow
+
+__file__.html   slides.html.erb
+__file__.css    style.css.erb
+
+# styles
 
-__file__.svg    gradient.svg.erb
-__file__.html   s6/header.html.erb + s6/footer.html.erb 
-__file__.css    s6/style.css.erb
 s6/outline.css
 s6/print.css
 s6/slides.css
+
+# javascript machinery
+
 s6/jquery.js
 s6/slides.js
 s6/slides.core.js
@@ -14,4 +24,4 @@ s6/slides.core.js
 # -- use html-to-pdf tool (such as wkhtmltopdf, prince, etc) to generate pdf
 # -- from javascript free web page
 
-__file__.pdf.html  s6/header.pdf.html.erb + s6/footer.pdf.html.erb
+__file__.pdf.html  slides.pdf.html.erb

data/templates/s6.txt.gen

@@ -1,10 +1,11 @@
 # S6 manifest to generate sample template package from builtin templates
 
-s6.txt            s6.txt.sample
-gradient.svg.erb
-header.html.erb   s6/header.html.erb
-footer.html.erb   s6/footer.html.erb 
-style.css.erb     s6/style.css.erb
+s6.txt
+
+slides.html.erb
+slides.pdf.html.erb
+style.css.erb
+
 s6/outline.css
 s6/print.css
 s6/slides.css

data/templates/s6/slides.css

@@ -46,9 +46,6 @@
   
   /* .step { visibility: hidden; } */
 
-/* enable svg backgrounds for gradient themes */
-div.background { position: fixed; left: 0px; right: 0px; top: 0px; bottom: 0px; z-index: -1; }
-body { opacity: .99; }
 
 html, body { margin: 0; padding: 0; }
 

data/templates/{s6/header.html.erb → slides.html.erb}

@@ -1,13 +1,16 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE html>
 <html>
 <head>
-   <%= content_for :head %>
+   <meta http-equiv="content-type" content="text/html;charset=utf-8"> 
+   <title><%= @headers['title'] %></title>
 
-	  <title><%= @headers['title'] %></title>
+<meta name="generator" content="<%= @headers['generator'] %>">
+<meta name="author"    content="<%= @headers['author']%>" >
 
-<!-- configuration parameters -->
+<!-- S6 configuration parameters -->
 <meta name="defaultView" content="slideshow">
-<!-- style sheet links -->
+
+<!-- S6 style sheet links -->
 <link rel="stylesheet" href="<%= "#{@name}.css" %>" type="text/css" media="projection" id="slideProj">
 <link rel="stylesheet" href="s6/outline.css" type="text/css" media="screen" id="outlineStyle">
 <link rel="stylesheet" href="s6/print.css" type="text/css" media="print" id="slidePrint">
@@ -16,27 +19,26 @@
 <script src="s6/jquery.js" type="text/javascript"></script>
 <script src="s6/slides.js" type="text/javascript"></script>
 
+
+<script type="text/javascript">
   <%= content_for :js %>
+</script>
+
+<%= content_for :head %>
 
 </head>
 <body>
 
-<div class="layout">
-  
-  <div class="background">  
-    <object data="<%= "#{@name}.svg" %>" width="100%" height="100%">
-		</object>
-  </div>   
-  
-<div id="controls"><!-- DO NOT EDIT --></div>
-<div id="currentSlide"><!-- DO NOT EDIT --></div>
-<div id="header"></div>
-<div id="footer">
-<h1><%= @headers['footer'] %></h1>
-<h2><%= @headers['subfooter'] %></h2>
-</div>
-
-      <div id='microsoft'>       
+<div class="layout"> 
+  <div id="controls"><!-- DO NOT EDIT --></div>
+  <div id="currentSlide"><!-- DO NOT EDIT --></div>
+  <div id="header"></div>
+  <div id="footer">
+    <h1><%= @headers['footer'] %></h1>
+    <h2><%= @headers['subfooter'] %></h2>
+  </div>
+
+   <div id='microsoft'>       
         <p>
           Microsoft's Internet Explorer browser
             has no built-in vector graphics machinery
@@ -52,7 +54,15 @@
               at the <a href='http://slideshow.rubyforge.org'>Slide Show (S9)</a>
             project site. Thanks!)
         </p>             
-    </div>
-</div>
+   </div>
+</div><!-- layout -->
 
 <div class="presentation">
+   
+<%= @content %>
+
+</div><!-- presentation -->
+</body>
+</html>
+
+   

data/templates/{s6/header.pdf.html.erb → slides.pdf.html.erb}

@@ -16,9 +16,10 @@ a:link, a:visited { color: black; }
 h1 { font-size: 30pt;  }
 h2 { font-size: 28pt;  }
 h3 { font-size: 25pt;  }
-p, li, td, th { font-size: 18pt; }
+p, li, dt, dd, td, th { font-size: 18pt; }
 
 pre { font-size: 14pt;  }
+pre.small { font-size: 11pt; }
 
 pre.code {
         background-color: azure;
@@ -26,6 +27,8 @@ pre.code {
       }
      
 ul { list-style-type: square; }    
+   
+.center { text-align: center; }   
      
 .slide { page-break-after: always;
          min-height: 100mm;
@@ -51,3 +54,9 @@ for princexml (CSS3 paged media support)
 
 <div class="presentation">
 
+<%= @content %>
+
+  </div> <!-- presentation -->
+</body>
+</html> 
+

data/templates/style.css.erb

@@ -0,0 +1,35 @@
+@import url(s6/slides.css); /* required to make the slide show run at all */
+     
+html, body { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; }
+
+a:link, a:visited { color: black; }
+
+h1 { font-size: 30pt;  }
+h2 { font-size: 28pt;  }
+h3 { font-size: 25pt;  }
+p, li, dt, dd, td, th { font-size: 18pt; }
+
+pre { font-size: 16pt;  }
+pre.small { font-size: 12pt; }
+
+pre.code { 
+        background-color: azure;
+        padding: 5px;
+      }
+
+div.code {
+        background-color: azure;
+        padding: 5px;
+}
+
+ul { list-style-type: square; }    
+
+.center { text-align: center; }
+
+/*** style rules for steps ****/     
+
+.stepcurrent { color: black; }
+.step { color: silver; }
+/* or hide next steps e.g.  .step { visibility: hidden; } */
+
+<%= content_for :css %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-05 00:00:00 +02:00
+date: 2010-07-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,35 +105,37 @@ files:
 - config/slideshow.yml
 - lib/slideshow.rb
 - lib/slideshow/config.rb
+- lib/slideshow/filters/debug_filter.rb
 - lib/slideshow/filters/headers_filter.rb
 - lib/slideshow/filters/text_filter.rb
 - lib/slideshow/gen.rb
 - lib/slideshow/helpers/analytics_helper.rb
+- lib/slideshow/helpers/background_helper.rb
 - lib/slideshow/helpers/capture_helper.rb
-- lib/slideshow/helpers/coderay_helper.rb
+- lib/slideshow/helpers/directive_helper.rb
+- lib/slideshow/helpers/markdown_helper.rb
+- lib/slideshow/helpers/source_helper.rb
 - lib/slideshow/helpers/step_helper.rb
+- lib/slideshow/helpers/syntax/coderay_helper.rb
+- lib/slideshow/helpers/syntax/sh_helper.rb
+- lib/slideshow/helpers/syntax/uv_helper.rb
 - lib/slideshow/helpers/table_helper.rb
 - lib/slideshow/helpers/text_helper.rb
-- lib/slideshow/helpers/uv_helper.rb
 - lib/slideshow/markdown.rb
 - lib/slideshow/opts.rb
 - lib/slideshow/slide.rb
 - lib/slideshow/textile.rb
-- templates/gradient.svg.erb
 - templates/s6.txt
 - templates/s6.txt.gen
-- templates/s6.txt.sample
-- templates/s6/footer.html.erb
-- templates/s6/footer.pdf.html.erb
-- templates/s6/header.html.erb
-- templates/s6/header.pdf.html.erb
 - templates/s6/jquery.js
 - templates/s6/outline.css
 - templates/s6/print.css
 - templates/s6/slides.core.js
 - templates/s6/slides.css
 - templates/s6/slides.js
-- templates/s6/style.css.erb
+- templates/slides.html.erb
+- templates/slides.pdf.html.erb
+- templates/style.css.erb
 has_rdoc: true
 homepage: http://slideshow.rubyforge.org
 licenses: []

data/templates/gradient.svg.erb

@@ -1,59 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg">
-  
-  <defs>
-    <linearGradient id="dark" x1="0" y1="0" x2="1" y2="1">
-      <stop offset="0" style="stop-color: <%= @headers['gradient-color1'] %>"/>
-      <stop offset="1" style="stop-color: <%= @headers['gradient-color2'] %>"/>
-    </linearGradient>
-    
-    <linearGradient id="dark_reverse" x1="0" y1="0" x2="1" y2="1">
-      <stop offset="0" style="stop-color: <%= @headers['gradient-color2'] %>"/>
-      <stop offset="1" style="stop-color: <%= @headers['gradient-color1'] %>"/>
-    </linearGradient>
-    
-     <linearGradient id="light" x1="0" y1="0" x2="1" y2="1">
-      <stop offset="0" style="stop-color: <%= @headers['gradient-color1'] %>"/>
-      <stop offset="1" style="stop-color: <%= @headers['gradient-color2'] %>"/>
-    </linearGradient>
-    
-    <linearGradient id="top_bottom" x1="0" y1="0" x2="0" y2="1">
-       <stop offset="0%"   style="stop-color: <%= @headers['gradient-color1'] %>" />
-       <stop offset="100%" style="stop-color: <%= @headers['gradient-color2'] %>" />
-    </linearGradient>
-
-   <linearGradient id="left_right" x1="0" y1="0" x2="1" y2="0">
-     <stop offset="0%"   style="stop-color: <%= @headers['gradient-color1'] %>" />
-     <stop offset="100%" style="stop-color: <%= @headers['gradient-color2'] %>" />
-   </linearGradient>
-
-    <linearGradient id="repeat" x1="0.4" y1="0.4" x2="0.5" y2="0.5"
-         spreadMethod="repeat">
-     <stop offset="0%"   style="stop-color: <%= @headers['gradient-color1'] %>" />
-     <stop offset="50%"  style="stop-color: <%= @headers['gradient-color2'] %>" />
-     <stop offset="100%" style="stop-color: <%= @headers['gradient-color1'] %>" />
-   </linearGradient>
-
-   <radialGradient id="radial">
-    <stop offset="0%"   style="stop-color: <%= @headers['gradient-color2'] %>" />
-    <stop offset="100%" style="stop-color: <%= @headers['gradient-color1'] %>" />
-   </radialGradient>
-  
-
-   <radialGradient id="radial_off_center" fx="0.7" fy="0.7" cx="0.5" cy="0.5" r="0.4">
-     <stop offset="0%"   style="stop-color: <%= @headers['gradient-color2'] %>" />
-     <stop offset="100%" style="stop-color: <%= @headers['gradient-color1'] %>" />
-   </radialGradient>
-
-  <radialGradient id="radial_repeat" fx="0.5" fy="0.5" cx="0.6" cy="0.6" r="0.2"
-          spreadMethod="repeat">
-     <stop offset="0%"   style="stop-color: <%= @headers['gradient-color1'] %>" />
-     <stop offset="50%"  style="stop-color: <%= @headers['gradient-color2'] %>" />
-     <stop offset="100%" style="stop-color: <%= @headers['gradient-color1'] %>" />
-  </radialGradient>
-    
-  </defs>
-  
-  <rect width="100%" height="100%"
-            style="fill: url(#<%= @headers['gradient-theme'] %>) "/>
-            
-</svg>