slideshow 0.4.1 → 0.4.2

data/lib/slideshow.rb

@@ -111,8 +111,13 @@ def Slideshow.create_slideshow( fn )
   # run pre-filters (built-in macros)
   # o replace {{{  w/ <pre class='code'>
   # o replace }}}  w/ </pre>
+  content.gsub!( "{{{{{{", "<pre class='code'>_S9BEGIN_" )
+  content.gsub!( "}}}}}}", "_S9END_</pre>" )  
   content.gsub!( "{{{", "<pre class='code'>" )
   content.gsub!( "}}}", "</pre>" )
+  # restore escaped {{{}}} I'm sure there's a better way! Rubyize this! Anyone?
+  content.gsub!( "_S9BEGIN_", "{{{" )
+  content.gsub!( "_S9END_", "}}}" )
 
   set_default_options()
   params = Params.new( basename, $options )
@@ -130,7 +135,7 @@ def Slideshow.create_slideshow( fn )
   
   if known_markdown_extnames.include?( extname )
     content = Maruku.new( content, {:on_error => :raise} ).to_html
-    # content = BlueCloth.new( content ).to_html
+    # old code: content = BlueCloth.new( content ).to_html
   else
     content = RedCloth.new( content ).to_html
   end
@@ -152,20 +157,39 @@ def Slideshow.create_slideshow( fn )
   }
   content2 << "\n\n</div>"   if slide_counter > 0
 
+  ## todo: run syntax highlighting before markup/textilize? lets us add textile to highlighted code?
+  ##  avoid undoing escaped entities?
+  
   include_code_stylesheet = false
   # syntax highlight code
-  # todo: can the code handle escaped entities? e.g. &gt;
+  # todo: can the code handle escaped entities? e.g. &gt; 
   doc = Hpricot(content2)
     doc.search("pre.code, pre > code").each do |e|
       if e.inner_html =~ /^\s*#!(\w+)/
         lang = $1.downcase
-        logger.debug "  syntax highlighting using lang=#{lang}"
-        if Uv.syntaxes.include?(lang)
-          # e.inner_html = Uv.parse( e.inner_html.sub(/^\s*#!\w+/, '').strip, "xhtml", lang, get_boolean_option( 'code-line-numbers', true ), get_option( 'code-theme', 'amy' ))
-          # todo: is it ok to replace the pre.code enclosing element to avoid duplicates?
-          html = Uv.parse( e.inner_html.sub(/^\s*#!\w+/, '').strip, "xhtml", lang, get_boolean_option( 'code-line-numbers', true ), get_option( 'code-theme', 'amy' ))
-          e.swap( html )
-          include_code_stylesheet = true
+        if e.inner_html =~ /^\{\{\{/  # {{{ assumes escape/literal #!lang 
+          # do nothing; next
+          logger.debug "  skipping syntax highlighting using lang=#{lang}; assumimg escaped literal"
+        else         
+          logger.debug "  syntax highlighting using lang=#{lang}"
+          if Uv.syntaxes.include?(lang)
+            code = e.inner_html.sub(/^\s*#!\w+/, '').strip
+            
+            code.gsub!( "&lt;", "<" )
+            code.gsub!( "&gt;", ">" )
+            code.gsub!( "&amp;", "&" )
+            # todo: missing any other entities? use CGI::unescapeHTML?
+            logger.debug "code=>#{code}<"
+            
+            # get options using headers
+            code_line_numbers = get_boolean_option( 'code-line-numbers', true )
+            code_theme        = get_option( 'code-theme', 'amy' )
+            code_highlighted = Uv.parse( code, "xhtml", lang, code_line_numbers, code_theme )
+            # old code: e.inner_html = code_highlighted
+            # todo: is it ok to replace the pre.code enclosing element to avoid duplicates?
+            e.swap( code_highlighted )
+            include_code_stylesheet = true
+          end
         end
       end
     end
@@ -306,7 +330,7 @@ def Slideshow.main
 
   opt.parse!
 
-  puts "Slide Show (S9) Version: 0.4.1 on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+  puts "Slide Show (S9) Version: 0.4.2 on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
 
   ARGV.each { |fn| Slideshow.create_slideshow( fn ) }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-18 00:00:00 -07:00
+date: 2008-05-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency