diff --git a/autotests/html/highlight.d.html b/autotests/html/highlight.d.html
--- a/autotests/html/highlight.d.html
+++ b/autotests/html/highlight.d.html
@@ -102,6 +102,16 @@
     <span style="color:#0057ae;">char</span> c = <span style="color:#924c9d;">'a'</span>;
     s = <span style="color:#bf0303;">&quot;abc 012 </span><span style="color:#3daee9;">\&quot;</span><span style="color:#bf0303;"> </span><span style="color:#3daee9;">\n</span><span style="color:#bf0303;"> </span><span style="color:#3daee9;">\x12</span><span style="color:#bf0303;"> </span><span style="color:#3daee9;">\u1234</span><span style="color:#bf0303;"> </span><span style="color:#3daee9;">\U12345678</span><span style="color:#bf0303;">&quot;</span>;
     s = <span style="color:#ff5500;">`BQString '&quot;`</span>;
+    s = <span style="font-weight:bold;">q{</span>foo <span style="color:#bf0303;">&quot;bar&quot;</span> <span style="color:#b08000;">123</span><span style="font-weight:bold;">}</span>;
+    s = <span style="font-weight:bold;">q&quot;FOO</span>
+<span style="color:#bf0303;">foo</span>
+<span style="font-weight:bold;">FOO&quot;</span>;
+    s = <span style="font-weight:bold;">q&quot;[</span><span style="color:#bf0303;">foo [bar] q&quot;[baz]&quot;</span><span style="font-weight:bold;">]&quot;</span>;
+    s = <span style="font-weight:bold;">q&quot;(</span><span style="color:#bf0303;">foo (bar) q&quot;(baz)&quot;</span><span style="font-weight:bold;">)&quot;</span>;
+    s = <span style="font-weight:bold;">q&quot;&lt;</span><span style="color:#bf0303;">foo &lt;bar&gt; q&quot;&lt;baz&gt;&quot;</span><span style="font-weight:bold;">&gt;&quot;</span>;
+    s = <span style="font-weight:bold;">q&quot;{</span><span style="color:#bf0303;">foo {bar} q&quot;{baz}&quot;</span><span style="font-weight:bold;">}&quot;</span>;
+    s = <span style="font-weight:bold;">q&quot;/</span><span style="color:#bf0303;">foo</span><span style="font-weight:bold;">/&quot;</span>;
+    s = <span style="font-weight:bold;">q&quot;!</span><span style="color:#bf0303;">foo</span><span style="font-weight:bold;">!&quot;</span>;
     
     <span style="color:#898887;">///</span><span style="color:#7f7fff;"> region markers</span>
     <span style="color:#0057ae;background-color:#e0e9f8;">//BEGIN x</span>
diff --git a/autotests/input/highlight.d b/autotests/input/highlight.d
--- a/autotests/input/highlight.d
+++ b/autotests/input/highlight.d
@@ -96,6 +96,16 @@
     char c = 'a';
     s = "abc 012 \" \n \x12 \u1234 \U12345678";
     s = `BQString '"`;
+    s = q{foo "bar" 123};
+    s = q"FOO
+foo
+FOO";
+    s = q"[foo [bar] q"[baz]"]";
+    s = q"(foo (bar) q"(baz)")";
+    s = q"<foo <bar> q"<baz>">";
+    s = q"{foo {bar} q"{baz}"}";
+    s = q"/foo/";
+    s = q"!foo!";
     
     /// region markers
     //BEGIN x
diff --git a/autotests/reference/highlight.d.ref b/autotests/reference/highlight.d.ref
--- a/autotests/reference/highlight.d.ref
+++ b/autotests/reference/highlight.d.ref
@@ -96,6 +96,16 @@
 <Normal Text>    </Normal Text><Type>char</Type><Normal Text> c </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Char>'a'</Char><Symbol>;</Symbol><br/>
 <Normal Text>    s </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><String>"abc 012 </String><EscapeSequence>\"</EscapeSequence><String> </String><EscapeSequence>\n</EscapeSequence><String> </String><EscapeSequence>\x12</EscapeSequence><String> </String><EscapeSequence>\u1234</EscapeSequence><String> </String><EscapeSequence>\U12345678</EscapeSequence><String>"</String><Symbol>;</Symbol><br/>
 <Normal Text>    s </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><BQString>`BQString '"`</BQString><Symbol>;</Symbol><br/>
+<Normal Text>    s </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Token String Delimiter>q{</Token String Delimiter><Normal Text>foo </Normal Text><String>"bar"</String><Normal Text> </Normal Text><Integer>123</Integer><Token String Delimiter>}</Token String Delimiter><Symbol>;</Symbol><br/>
+<Normal Text>    s </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Delimited String Delimiter>q"FOO</Delimited String Delimiter><br/>
+<Delimited String Content>foo</Delimited String Content><br/>
+<Delimited String Delimiter>FOO"</Delimited String Delimiter><Symbol>;</Symbol><br/>
+<Normal Text>    s </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Delimited String Delimiter>q"[</Delimited String Delimiter><Delimited String Content>foo [bar] q"[baz]"</Delimited String Content><Delimited String Delimiter>]"</Delimited String Delimiter><Symbol>;</Symbol><br/>
+<Normal Text>    s </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Delimited String Delimiter>q"(</Delimited String Delimiter><Delimited String Content>foo (bar) q"(baz)"</Delimited String Content><Delimited String Delimiter>)"</Delimited String Delimiter><Symbol>;</Symbol><br/>
+<Normal Text>    s </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Delimited String Delimiter>q"<</Delimited String Delimiter><Delimited String Content>foo <bar> q"<baz>"</Delimited String Content><Delimited String Delimiter>>"</Delimited String Delimiter><Symbol>;</Symbol><br/>
+<Normal Text>    s </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Delimited String Delimiter>q"{</Delimited String Delimiter><Delimited String Content>foo {bar} q"{baz}"</Delimited String Content><Delimited String Delimiter>}"</Delimited String Delimiter><Symbol>;</Symbol><br/>
+<Normal Text>    s </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Delimited String Delimiter>q"/</Delimited String Delimiter><Delimited String Content>foo</Delimited String Content><Delimited String Delimiter>/"</Delimited String Delimiter><Symbol>;</Symbol><br/>
+<Normal Text>    s </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Delimited String Delimiter>q"!</Delimited String Delimiter><Delimited String Content>foo</Delimited String Content><Delimited String Delimiter>!"</Delimited String Delimiter><Symbol>;</Symbol><br/>
 <Normal Text>    </Normal Text><br/>
 <Normal Text>    </Normal Text><Comment>///</Comment><Ddoc> region markers</Ddoc><br/>
 <Normal Text>    </Normal Text><Region Marker>//BEGIN x</Region Marker><br/>
diff --git a/data/syntax/d.xml b/data/syntax/d.xml
--- a/data/syntax/d.xml
+++ b/data/syntax/d.xml
@@ -96,8 +96,6 @@
   2003.08.11 - D.XML 1.10           - updated.
   2003.07.18 - D.XML 1.00           - First released.
 
-  TODO:- Deliminated strings and Token strings (D2.0) are not supported.
-
    ========================================================================
 -->
 
@@ -408,11 +406,15 @@
         <StringDetect attribute="Pragma" context="LinePragma" String="#line"/>
         
         <!-- Rules for the C-style indenter. Currently problems with /// and /++ comments. -->
-        <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="BraceA" />
-        <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="BraceA" />
+        <DetectChar attribute="Symbol" context="BraceA" char="{" beginRegion="BraceA" />
         <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]|~^&#59;"/>
       </context>
 
+      <context name="BraceA" attribute="Normal Text" lineEndContext="#stay">
+        <DetectChar attribute="Symbol" context="#pop" char="}" endRegion="BraceA" />
+        <IncludeRules context="normal"/>
+      </context>
+
       <context name="StartingLetter" attribute="Normal Text" lineEndContext="#pop">
           <DetectSpaces />
           <!-- fall-through should work now that DetectIdentifier is used (without infinite loops) -->
@@ -446,6 +448,13 @@
           
           <Detect2Chars attribute="RawString" context="RawString" char="r" char1="&quot;"/>
           <Detect2Chars attribute="HexString" context="HexString" char="x" char1="&quot;"/>
+          <Detect2Chars attribute="Token String Delimiter" context="TokenString" char="q" char1="{"/>
+          <RegExpr attribute="Delimited String Delimiter" context="DelimStrHeredoc" String="q&quot;([A-Za-z_][A-Za-z0-9_]*)$" />
+          <StringDetect attribute="Delimited String Delimiter" context="DelimStrBracket" String="q&quot;[" />
+          <StringDetect attribute="Delimited String Delimiter" context="DelimStrParen" String="q&quot;(" />
+          <StringDetect attribute="Delimited String Delimiter" context="DelimStrLtGt" String="q&quot;&lt;" />
+          <StringDetect attribute="Delimited String Delimiter" context="DelimStrBrace" String="q&quot;{" />
+          <RegExpr attribute="Delimited String Delimiter" context="DelimStrSimple" String="q&quot;([^A-Za-z_[(&lt;{])" />
           
           <!-- user highlighting: last so as not to interfere with anything else -->
           <keyword String="userkeywords"    attribute="UserKeywords"   context="#stay"     />
@@ -611,6 +620,62 @@
         <Detect2Chars attribute="EscapeSequence" context="UnicodeLong"   char="\" char1="U"/>
         <Detect2Chars attribute="EscapeSequence" context="HTMLEntity"   char="\" char1="&amp;"/>
       </context>
+      <!-- token strings: q{...} -->
+      <context name="TokenString" attribute="Normal Text" lineEndContext="#stay">
+        <DetectChar attribute="Token String Delimiter" context="#pop" char="}" />
+        <IncludeRules context="normal" />
+      </context>
+      <!-- delimited strings -->
+      <!-- q"IDENTIFIER...IDENTIFIER" -->
+      <context name="DelimStrHeredoc" attribute="Delimited String Content" lineEndContext="#stay">
+        <RegExpr attribute="Delimited String Delimiter" context="#pop" String="^%1&quot;" dynamic="true" />
+        <RegExpr attribute="Error" context="#pop" String="^%1" dynamic="true" />
+      </context>
+      <!-- q"[...]" -->
+      <context name="DelimStrBracket" attribute="Delimited String Content" lineEndContext="#stay">
+        <DetectChar attribute="Delimited String Content" context="DelimStrBracket2" char="[" />
+        <Detect2Chars attribute="Delimited String Delimiter" context="#pop" char="]" char1="&quot;" />
+        <DetectChar attribute="Error" context="#pop" char="]" />
+      </context>
+      <context name="DelimStrBracket2" attribute="Delimited String Content" lineEndContext="#stay">
+        <DetectChar attribute="Delimited String Content" context="DelimStrBracket2" char="[" />
+        <DetectChar attribute="Delimited String Content" context="#pop" char="]" />
+      </context>
+      <!-- q"(...)" -->
+      <context name="DelimStrParen" attribute="Delimited String Content" lineEndContext="#stay">
+        <DetectChar attribute="Delimited String Content" context="DelimStrParen2" char="(" />
+        <Detect2Chars attribute="Delimited String Delimiter" context="#pop" char=")" char1="&quot;" />
+        <DetectChar attribute="Error" context="#pop" char=")" />
+      </context>
+      <context name="DelimStrParen2" attribute="Delimited String Content" lineEndContext="#stay">
+        <DetectChar attribute="Delimited String Content" context="DelimStrParen2" char="(" />
+        <DetectChar attribute="Delimited String Content" context="#pop" char=")" />
+      </context>
+      <!-- q"<...>" -->
+      <context name="DelimStrLtGt" attribute="Delimited String Content" lineEndContext="#stay">
+        <DetectChar attribute="Delimited String Content" context="DelimStrLtGt2" char="&lt;" />
+        <Detect2Chars attribute="Delimited String Delimiter" context="#pop" char="&gt;" char1="&quot;" />
+        <DetectChar attribute="Error" context="#pop" char="&gt;" />
+      </context>
+      <context name="DelimStrLtGt2" attribute="Delimited String Content" lineEndContext="#stay">
+        <DetectChar attribute="Delimited String Content" context="DelimStrLtGt2" char="&lt;" />
+        <DetectChar attribute="Delimited String Content" context="#pop" char="&gt;" />
+      </context>
+      <!-- q"{...}" -->
+      <context name="DelimStrBrace" attribute="Delimited String Content" lineEndContext="#stay">
+        <DetectChar attribute="Delimited String Content" context="DelimStrBrace2" char="{" />
+        <Detect2Chars attribute="Delimited String Delimiter" context="#pop" char="}" char1="&quot;" />
+        <DetectChar attribute="Error" context="#pop" char="}" />
+      </context>
+      <context name="DelimStrBrace2" attribute="Delimited String Content" lineEndContext="#stay">
+        <DetectChar attribute="Delimited String Content" context="DelimStrBrace2" char="{" />
+        <DetectChar attribute="Delimited String Content" context="#pop" char="}" />
+      </context>
+      <!-- q"*...*" -->
+      <context name="DelimStrSimple" attribute="Delimited String Content" lineEndContext="#stay">
+        <RegExpr attribute="Delimited String Delimiter" context="#pop" String="%1&quot;" dynamic="true" />
+        <RegExpr attribute="Error" context="#pop" String="%1" dynamic="true" />
+      </context>
 
       <!-- Comments -->
       <context name="CommentRules" attribute="Normal Text" lineEndContext="#pop">
@@ -800,6 +865,9 @@
       <itemData name="RawString"      defStyleNum="dsVerbatimString"/>
       <itemData name="BQString"       defStyleNum="dsSpecialString"/>
       <itemData name="HexString"      defStyleNum="dsSpecialString"/>
+      <itemData name="Token String Delimiter" defStyleNum="dsKeyword"/>
+      <itemData name="Delimited String Content" defStyleNum="dsVerbatimString"/>
+      <itemData name="Delimited String Delimiter" defStyleNum="dsKeyword"/>
       
       <!-- Ddoc specific -->
       <itemData name="Macros"      defStyleNum="dsOthers" color="#bf5fbf" selColor="#ffffff" bold="1" italic="0" />