Improved PR #149 regex for matching sh_lang files.

schacon · Mar 5, 2012 · 7269bdc · 7269bdc
1 parent 6e71652
commit 7269bdc
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/lib/showoff.rb b/lib/showoff.rb
@@ -401,8 +401,7 @@ def index(static=false)
         @pause_msg = ShowOffUtils.pause_msg
 
         # Identify which languages to bundle for highlighting
-        @languages = []
-        @languages += @slides.scan(/<pre class="(sh_.*?\w)"/).uniq.map{ |w| "sh_lang/#{w[0]}.min.js"}
+        @languages = @slides.scan(/<pre class=".*(?!sh_sourceCode)(sh_[\w-]+).*"/).uniq.map{ |w| "sh_lang/#{w[0]}.min.js"}
 
         @asset_path = "./"
       end
@@ -464,8 +463,7 @@ def pdf(static=true)
       @no_js = false
 
       # Identify which languages to bundle for highlighting
-      @languages = []
-      @languages += @slides.scan(/<pre class="(sh_.*?\w)"/).uniq.map{ |w| "/sh_lang/#{w[0]}.min.js"}
+      @languages = @slides.scan(/<pre class=".*(?!sh_sourceCode)(sh_[\w-]+).*"/).uniq.map{ |w| "/sh_lang/#{w[0]}.min.js"}
 
       html = erb :onepage
       # TODO make a random filename