Index: ruby.lang
===================================================================
--- ruby.lang	(revision 1546)
+++ ruby.lang	(working copy)
@@ -29,24 +29,25 @@
   </metadata>
 
   <styles>
-    <style id="comment"              _name="Comment"              map-to="def:comment"/>
-    <style id="attribute-definition" _name="Attribute Definition" map-to="def:type"/>
-    <style id="module-handler"       _name="Module handler"       map-to="def:preprocessor"/>
-    <style id="keyword"              _name="Keyword"              map-to="def:keyword"/>
-    <style id="nil-value"            _name="Nil Constant"         map-to="def:special-constant"/>
-    <style id="boolean"              _name="Boolean value"        map-to="def:boolean"/>
-    <style id="floating-point"       _name="Floating point"       map-to="def:floating-point"/>
-    <style id="decimal"              _name="Decimal"              map-to="def:decimal"/>
-    <style id="base-n-integer"       _name="Base-N integer"       map-to="def:base-n-integer"/>
-    <style id="numeric-literal"      _name="Numeric literal"      map-to="def:base-n-integer"/>
-    <style id="string"               _name="String"               map-to="def:string"/>
-    <style id="builtin"              _name="Builtin"              map-to="def:type"/>
-    <style id="constant"             _name="Constant"             map-to="def:type"/>
-    <style id="symbol"               _name="Symbol"               map-to="def:string"/>
-    <style id="reserved-variable"    _name="Reserved Variable"    map-to="def:function"/>
-    <style id="predefined-variable"  _name="Predefined Variable"  map-to="def:function"/>
-    <style id="variable"             _name="Variable"             map-to="def:function"/>
-    <style id="regex"                _name="Regular Expression"   map-to="def:function"/>
+    <style id="comment"              _name="Comment"               map-to="def:comment"/>
+    <style id="attribute-definition" _name="Attribute Definition"  map-to="def:type"/>
+    <style id="module-handler"       _name="Module handler"        map-to="def:preprocessor"/>
+    <style id="keyword"              _name="Keyword"               map-to="def:keyword"/>
+    <style id="nil-value"            _name="Nil Constant"          map-to="def:special-constant"/>
+    <style id="boolean"              _name="Boolean value"         map-to="def:boolean"/>
+    <style id="floating-point"       _name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal"              _name="Decimal number"        map-to="def:decimal"/>
+    <style id="base-n-integer"       _name="Base-N integer"        map-to="def:base-n-integer"/>
+    <style id="numeric-literal"      _name="Numeric literal"       map-to="def:base-n-integer"/>
+    <style id="interpolation"        _name="Interpolation"         map-to="def:special-char"/>
+    <style id="string"               _name="String"                map-to="def:string"/>
+    <style id="builtin"              _name="Builtin"               map-to="def:type"/>
+    <style id="constant"             _name="Constant"              map-to="def:type"/>
+    <style id="symbol"               _name="Symbol"                map-to="def:string"/>
+    <style id="reserved-variable"    _name="Reserved Variable"     map-to="def:function"/>
+    <style id="predefined-variable"  _name="Predefined Variable"   map-to="def:function"/>
+    <style id="variable"             _name="Variable"              map-to="def:function"/>
+    <style id="regex"                _name="Regular Expression"    map-to="def:function"/>
   </styles>
 
   <definitions>
@@ -236,26 +237,21 @@
     </context>
 
     <!-- in double quotes and backticks -->
-    <context id="simple-interpolation">
+    <context id="simple-interpolation" style-ref="interpolation">
       <start>#</start>
       <end></end>
       <include>
-        <context ref="class-variables"/>
-        <context ref="instance-variables"/>
-        <context ref="global-variables"/>
-        <context ref="predefined-variables"/>
+        <context ref="class-variables" ignore-style="true"/>
+        <context ref="instance-variables" ignore-style="true"/>
+        <context ref="global-variables" ignore-style="true"/>
+        <context ref="predefined-variables" ignore-style="true"/>
       </include>
     </context>
 
     <!-- in double quotes and backticks -->
-    <!-- FIXME: really would like for the syntax highlight to go back
-         to none here, as any ruby code could go here -->
-    <context id="complex-interpolation">
+    <context id="complex-interpolation" style-ref="interpolation">
       <start>#{</start>
       <end>}</end>
-      <include>
-        <context ref="ruby"/>
-      </include>
     </context>
 
     <!-- ruby strings do not end at line end,