added new sass brush to doc-src, turned it on

doc-src/Gemfile.lock

@@ -8,8 +8,8 @@ GIT
 PATH
   remote: /Users/bmathis/Documents/Workspace/compass-projects/compass
   specs:
-    compass (0.11.alpha.1.8f9cce8)
+    compass (0.11.alpha.1.488fddf)
-      haml (~> 3.0.23)
+      sass (~> 3.1)
 
 GEM
   remote: http://rubygems.org/
@@ -30,6 +30,7 @@ GEM
     rack (1.2.1)
     rake (0.8.7)
     rdiscount (1.6.5)
+    sass (3.1.0.alpha.28)
     serve (1.0.0)
       activesupport (~> 3.0.1)
       i18n (~> 0.4.1)

doc-src/assets/javascripts/shBrushSass.js

@@ -44,7 +44,7 @@
                         'page-break-after page-break-before page-break-inside pause pause-after pause-before pitch pitch-range play-during position ' +
                         'quotes right richness size slope src speak-header speak-numeral speak-punctuation speak speech-rate stemh stemv stress ' +
                         'table-layout text-align top text-decoration text-indent text-shadow text-transform unicode-bidi unicode-range units-per-em ' +
-						'vertical-align visibility voice-family volume white-space widows width widths word-spacing x-height z-index';
+                        'vertical-align visibility voice-family volume white-space widows width widths word-spacing x-height z-index zoom';
         
         var values =    'above absolute all always aqua armenian attr aural auto avoid baseline behind below bidi-override black blink block blue bold bolder '+
                         'both bottom braille capitalize caption center center-left center-right circle close-quote code collapse compact condensed '+
@@ -64,10 +64,21 @@
         var fonts =     '[mM]onospace [tT]ahoma [vV]erdana [aA]rial [hH]elvetica [sS]ans-serif [sS]erif [cC]ourier mono sans serif';
         
         var statements      = '!important !default';
-		var preprocessor	= '@import @extend @debug @warn @if @for @while @mixin @include';
+        var preprocessors   = 'import extend debug warn if for while mixin include';
         
         var r = SyntaxHighlighter.regexLib;
         
+      var getKeywordsPrependedBy = function(keywords, by)
+    {
+      str = keywords
+        .replace(/^\s+|\s+$/g, '')
+        .replace(/\s+/g, '|' + by + '\\b')
+        .replace(/^/, by + '\\b')
+        ;
+
+      return '(?:' + str + ')\\b';
+    }
+
         this.regexList = [
             { regex: r.multiLineCComments,                                                          css: 'comments' },      // multiline comments
             { regex: r.singleLineCComments,                                                         css: 'comments' },      // singleline comments
@@ -75,15 +86,22 @@
             { regex: r.singleQuotedString,                                                          css: 'string' },          // single quoted strings
             { regex: /\#[a-fA-F0-9]{3,6}/g,                                                         css: 'value' },           // html colors
             { regex: /\b(-?\d+)(\.\d+)?(px|em|pt|\:|\%|)\b/g,                               css: 'value' },           // sizes
-			{ regex: /\$\w+/g,											css: 'variable' },		// variables
+            { regex: /(\$|!)\w+/g,                                                                          css: 'variable' },      // variables
             { regex: new RegExp(this.getKeywords(statements), 'g'),                       css: 'color3' },        // statements
-			{ regex: new RegExp(this.getKeywords(preprocessor), 'g'),	css: 'preprocessor' },	// preprocessor
+            { regex: new RegExp(getKeywordsPrependedBy(preprocessors, '@'), 'g'),         css: 'preprocessor' },    // preprocessors
+      { regex: new RegExp('(^|\\n)\\s*=.*', 'g'),                                   css: 'functions' },     // short mixin declarations
+            { regex: new RegExp('(^|\\n)\\s*\\+.*', 'g'),                               css: 'functions' },     // short mixin call
+            { regex: new RegExp('&', 'g'),                                          css: 'keyword' },       // &
+            { regex: new RegExp('#(\\w|-|_)+', 'g'),                                      css: 'color2' },        // ids
+            { regex: new RegExp('(\\.(\\w|-|_)+)', 'g'),                                css: 'color4' },        // classes
             { regex: new RegExp(getKeywordsCSS(keywords), 'gm'),                          css: 'keyword' },         // keywords
+            { regex: new RegExp(getKeywordsPrependedBy(keywords, ':'), 'g'),              css: 'keyword' },         // :keyword value
             { regex: new RegExp(getValuesCSS(values), 'g'),                                   css: 'value' },           // values
             { regex: new RegExp(this.getKeywords(fonts), 'g'),                              css: 'color1' }         // fonts
             ];
     };
 
+
     Brush.prototype = new SyntaxHighlighter.Highlighter();
     Brush.aliases   = ['sass', 'scss'];
 

doc-src/layouts/basic.haml

@@ -13,6 +13,7 @@
     %script(src="/javascripts/jquery.cookie.js" type="text/javascript")
     %script(src="/javascripts/site.js" type="text/javascript")
     %script(src="/javascripts/shCore.js" type="text/javascript" deferred)
+    %script(src="/javascripts/shBrushSass.js" type="text/javascript" deferred)
     %script(src="/javascripts/fixups.js" type="text/javascript" deferred)
     /[if lte IE 8]
       %link{:charset => "utf-8", :href => "/stylesheets/ie.css", :rel => "stylesheet", :type => "text/css"}

doc-src/layouts/main.haml

@@ -20,8 +20,6 @@
       = yield
       -#comments= render "partials/disqus_comments"
     %footer(role="contentinfo")= render "partials/footer"
-  -#%script{:src => "/javascripts/shBrushCss.js", :type => "text/javascript"}
-  -#%script{:src => "/javascripts/shBrushSass.js", :type => "text/javascript"}
-  -#script{:src => "/javascripts/shBrushScss.js", :type => "text/javascript"}
   = @item[:content_for_javascripts]
   = render "partials/analytics"
+  <script type="text/javascript">SyntaxHighlighter.all();</script>