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
@@ -19,23 +19,37 @@
 <span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">#line </span><span style="color:#b08000;">12</span><span style="color:#00aa00;font-weight:bold;"> </span><span style="color:#bf0303;">&quot;hightlighttest.d&quot;</span><span style="color:#00aa00;font-weight:bold;">	</span><span style="color:#898887;">/* block comment */</span>
 <span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">#line </span><span style="color:#00aa00;">__LINE__</span><span style="color:#00aa00;font-weight:bold;"> </span><span style="color:#00aa00;">__FILE__</span><span style="color:#00aa00;font-weight:bold;">	</span><span style="color:#898887;">/++</span><span style="color:#7f7fff;"> embedded block comment </span><span style="color:#898887;">+/</span>
 <span style="color:#898887;">+</span>
-<span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">pragma </span><span style="color:#898887;">/* */</span><span style="color:#00aa00;font-weight:bold;"> </span>(<span style="font-weight:bold;">msg</span><span style="color:#bf0303;text-decoration:underline;">,</span> <span style="color:#bf0303;">&quot;what?&quot;</span>);
-<span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">pragma</span>(<span style="color:#898887;">/++</span><span style="color:#7f7fff;"> </span><span style="color:#898887;">+/</span><span style="color:#00aa00;font-weight:bold;"> </span><span style="font-weight:bold;">lib</span><span style="color:#bf0303;text-decoration:underline;">,</span> <span style="color:#bf0303;">&quot;insane.a&quot;</span>);
-<span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">pragma</span>(D_Custom_Extension<span style="color:#bf0303;text-decoration:underline;">,</span> <span style="color:#bf0303;">&quot;custom data&quot;</span>);
+<span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">pragma </span><span style="color:#898887;">/* */</span><span style="color:#00aa00;font-weight:bold;"> </span>(<span style="font-weight:bold;">msg</span>,<span style="color:#00aa00;font-weight:bold;"> </span><span style="color:#bf0303;">&quot;what?&quot;</span>);
+<span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">pragma</span>(<span style="color:#898887;">/++</span><span style="color:#7f7fff;"> </span><span style="color:#898887;">+/</span><span style="color:#00aa00;font-weight:bold;"> </span><span style="font-weight:bold;">lib</span>,<span style="color:#00aa00;font-weight:bold;"> </span><span style="color:#bf0303;">&quot;insane.a&quot;</span>);
+<span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">pragma</span>(<span style="font-weight:bold;">inline</span>);
+<span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">pragma</span>(<span style="font-weight:bold;">linkerDirective</span>);
+<span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">pragma</span>(<span style="font-weight:bold;">mangle</span>);
+<span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">pragma</span>(<span style="font-weight:bold;">startaddress</span>);
+<span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">pragma</span>(D_Custom_Extension,<span style="color:#00aa00;font-weight:bold;"> </span><span style="color:#bf0303;">&quot;custom data&quot;</span>);
+<span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#00aa00;font-weight:bold;">pragma</span>(foo<span style="color:#00aa00;font-weight:bold;"> </span><span style="color:#bf0303;text-decoration:underline;">0</span>);
 <span style="color:#898887;">+</span><span style="font-style:italic;"> </span><span style="color:#898887;">---</span>
 <span style="color:#898887;">+/</span>
 
 <span style="color:#898887;">///</span><span style="color:#7f7fff;"> version condition</span>
-<span style="color:#808000;font-weight:bold;">version</span> = X<span style="color:#bf0303;text-decoration:underline;">;</span>
+<span style="color:#808000;font-weight:bold;">version</span> = X;
+<span style="color:#808000;font-weight:bold;">version</span> = <span style="color:#b08000;">1_2_3</span>;
 <span style="color:#808000;font-weight:bold;">version</span> (X) ;
 <span style="color:#808000;font-weight:bold;">version</span>(<span style="font-weight:bold;">linux</span>) {}
 
 <span style="color:#898887;">///</span><span style="color:#7f7fff;"> linkage</span>
 <span style="color:#808000;font-weight:bold;">extern</span>
     (<span style="font-weight:bold;">C</span>) {}
 <span style="color:#808000;font-weight:bold;">extern</span> :
 ;
+<span style="color:#808000;font-weight:bold;">extern</span> (<span style="font-weight:bold;">C++</span>) {}
+<span style="color:#808000;font-weight:bold;">extern</span> (<span style="font-weight:bold;">C++</span>, foo.bar.baz) {}
+<span style="color:#808000;font-weight:bold;">extern</span> (<span style="font-weight:bold;">D</span>) {}
 <span style="color:#808000;font-weight:bold;">extern</span> (<span style="font-weight:bold;">Windows</span>) {}
+<span style="color:#808000;font-weight:bold;">extern</span> (<span style="font-weight:bold;">Pascal</span>) {}
+<span style="color:#808000;font-weight:bold;">extern</span> (<span style="font-weight:bold;">System</span>) {}
+<span style="color:#808000;font-weight:bold;">extern</span> (<span style="color:#bf0303;text-decoration:underline;">unknown</span>) {}
+<span style="color:#808000;font-weight:bold;">extern</span> (<span style="font-weight:bold;">C</span><span style="color:#bf0303;text-decoration:underline;">,</span>) {}
+<span style="color:#808000;font-weight:bold;">extern</span> (<span style="font-weight:bold;">C++</span>, foo<span style="color:#bf0303;text-decoration:underline;">,</span> bar) {}
 
 <span style="color:#898887;">///</span><span style="color:#7f7fff;"> alias &amp; typedef</span>
 <span style="color:#800000;font-weight:bold;">alias</span> <span style="color:#0057ae;">int</span>.<span style="color:#000080;">min</span> minint;
diff --git a/autotests/input/highlight.d b/autotests/input/highlight.d
--- a/autotests/input/highlight.d
+++ b/autotests/input/highlight.d
@@ -15,21 +15,35 @@
 +
 + pragma /* */ (msg, "what?");
 + pragma(/++ +/ lib, "insane.a");
++ pragma(inline);
++ pragma(linkerDirective);
++ pragma(mangle);
++ pragma(startaddress);
 + pragma(D_Custom_Extension, "custom data");
++ pragma(foo 0);
 + ---
 +/
 
 /// version condition
 version = X;
+version = 1_2_3;
 version (X) ;
 version(linux) {}
 
 /// linkage
 extern
     (C) {}
 extern :
 ;
+extern (C++) {}
+extern (C++, foo.bar.baz) {}
+extern (D) {}
 extern (Windows) {}
+extern (Pascal) {}
+extern (System) {}
+extern (unknown) {}
+extern (C,) {}
+extern (C++, foo, bar) {}
 
 /// alias & typedef
 alias int.min minint;
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
@@ -13,23 +13,37 @@
 <Comment>+</Comment><DdocCode> </DdocCode><Pragma>#line </Pragma><Integer>12</Integer><Pragma> </Pragma><String>"hightlighttest.d"</String><Pragma>	</Pragma><Comment>/* block comment */</Comment><br/>
 <Comment>+</Comment><DdocCode> </DdocCode><Pragma>#line </Pragma><SpecialTokens>__LINE__</SpecialTokens><Pragma> </Pragma><SpecialTokens>__FILE__</SpecialTokens><Pragma>	</Pragma><Comment>/++</Comment><Ddoc> embedded block comment </Ddoc><Comment>+/</Comment><br/>
 <Comment>+</Comment><br/>
-<Comment>+</Comment><DdocCode> </DdocCode><Pragma>pragma </Pragma><Comment>/* */</Comment><Pragma> </Pragma><Normal Text>(</Normal Text><Version Type>msg</Version Type><Error>,</Error><Normal Text> </Normal Text><String>"what?"</String><Symbol>);</Symbol><br/>
-<Comment>+</Comment><DdocCode> </DdocCode><Pragma>pragma</Pragma><Normal Text>(</Normal Text><Comment>/++</Comment><Ddoc> </Ddoc><Comment>+/</Comment><Pragma> </Pragma><Version Type>lib</Version Type><Error>,</Error><Normal Text> </Normal Text><String>"insane.a"</String><Symbol>);</Symbol><br/>
-<Comment>+</Comment><DdocCode> </DdocCode><Pragma>pragma</Pragma><Normal Text>(D_Custom_Extension</Normal Text><Error>,</Error><Normal Text> </Normal Text><String>"custom data"</String><Symbol>);</Symbol><br/>
+<Comment>+</Comment><DdocCode> </DdocCode><Pragma>pragma </Pragma><Comment>/* */</Comment><Pragma> </Pragma><Normal Text>(</Normal Text><Version Type>msg</Version Type><Normal Text>,</Normal Text><Pragma> </Pragma><String>"what?"</String><Normal Text>)</Normal Text><Symbol>;</Symbol><br/>
+<Comment>+</Comment><DdocCode> </DdocCode><Pragma>pragma</Pragma><Normal Text>(</Normal Text><Comment>/++</Comment><Ddoc> </Ddoc><Comment>+/</Comment><Pragma> </Pragma><Version Type>lib</Version Type><Normal Text>,</Normal Text><Pragma> </Pragma><String>"insane.a"</String><Normal Text>)</Normal Text><Symbol>;</Symbol><br/>
+<Comment>+</Comment><DdocCode> </DdocCode><Pragma>pragma</Pragma><Normal Text>(</Normal Text><Version Type>inline</Version Type><Normal Text>)</Normal Text><Symbol>;</Symbol><br/>
+<Comment>+</Comment><DdocCode> </DdocCode><Pragma>pragma</Pragma><Normal Text>(</Normal Text><Version Type>linkerDirective</Version Type><Normal Text>)</Normal Text><Symbol>;</Symbol><br/>
+<Comment>+</Comment><DdocCode> </DdocCode><Pragma>pragma</Pragma><Normal Text>(</Normal Text><Version Type>mangle</Version Type><Normal Text>)</Normal Text><Symbol>;</Symbol><br/>
+<Comment>+</Comment><DdocCode> </DdocCode><Pragma>pragma</Pragma><Normal Text>(</Normal Text><Version Type>startaddress</Version Type><Normal Text>)</Normal Text><Symbol>;</Symbol><br/>
+<Comment>+</Comment><DdocCode> </DdocCode><Pragma>pragma</Pragma><Normal Text>(D_Custom_Extension,</Normal Text><Pragma> </Pragma><String>"custom data"</String><Normal Text>)</Normal Text><Symbol>;</Symbol><br/>
+<Comment>+</Comment><DdocCode> </DdocCode><Pragma>pragma</Pragma><Normal Text>(foo</Normal Text><Pragma> </Pragma><Error>0</Error><Symbol>);</Symbol><br/>
 <Comment>+</Comment><DdocCode> </DdocCode><Comment>---</Comment><br/>
 <Comment>+/</Comment><br/>
 <Normal Text></Normal Text><br/>
 <Comment>///</Comment><Ddoc> version condition</Ddoc><br/>
-<Version>version</Version><Normal Text> = X</Normal Text><Error>;</Error><br/>
+<Version>version</Version><Normal Text> = X;</Normal Text><br/>
+<Version>version</Version><Normal Text> = </Normal Text><Integer>1_2_3</Integer><Normal Text>;</Normal Text><br/>
 <Version>version</Version><Normal Text> (X) </Normal Text><Symbol>;</Symbol><br/>
 <Version>version</Version><Normal Text>(</Normal Text><Version Type>linux</Version Type><Normal Text>) </Normal Text><Symbol>{}</Symbol><br/>
 <Normal Text></Normal Text><br/>
 <Comment>///</Comment><Ddoc> linkage</Ddoc><br/>
 <Linkage>extern</Linkage><br/>
 <Normal Text>    (</Normal Text><Linkage Type>C</Linkage Type><Normal Text>) </Normal Text><Symbol>{}</Symbol><br/>
 <Linkage>extern</Linkage><Normal Text> </Normal Text><Symbol>:</Symbol><br/>
 <Symbol>;</Symbol><br/>
+<Linkage>extern</Linkage><Normal Text> (</Normal Text><Linkage Type>C++</Linkage Type><Normal Text>) </Normal Text><Symbol>{}</Symbol><br/>
+<Linkage>extern</Linkage><Normal Text> (</Normal Text><Linkage Type>C++</Linkage Type><Normal Text>, foo.bar.baz) </Normal Text><Symbol>{}</Symbol><br/>
+<Linkage>extern</Linkage><Normal Text> (</Normal Text><Linkage Type>D</Linkage Type><Normal Text>) </Normal Text><Symbol>{}</Symbol><br/>
 <Linkage>extern</Linkage><Normal Text> (</Normal Text><Linkage Type>Windows</Linkage Type><Normal Text>) </Normal Text><Symbol>{}</Symbol><br/>
+<Linkage>extern</Linkage><Normal Text> (</Normal Text><Linkage Type>Pascal</Linkage Type><Normal Text>) </Normal Text><Symbol>{}</Symbol><br/>
+<Linkage>extern</Linkage><Normal Text> (</Normal Text><Linkage Type>System</Linkage Type><Normal Text>) </Normal Text><Symbol>{}</Symbol><br/>
+<Linkage>extern</Linkage><Normal Text> (</Normal Text><Error>unknown</Error><Symbol>)</Symbol><Normal Text> </Normal Text><Symbol>{}</Symbol><br/>
+<Linkage>extern</Linkage><Normal Text> (</Normal Text><Linkage Type>C</Linkage Type><Error>,</Error><Symbol>)</Symbol><Normal Text> </Normal Text><Symbol>{}</Symbol><br/>
+<Linkage>extern</Linkage><Normal Text> (</Normal Text><Linkage Type>C++</Linkage Type><Normal Text>, foo</Normal Text><Error>,</Error><Normal Text> bar) </Normal Text><Symbol>{}</Symbol><br/>
 <Normal Text></Normal Text><br/>
 <Comment>///</Comment><Ddoc> alias & typedef</Ddoc><br/>
 <Declarator>alias</Declarator><Normal Text> </Normal Text><Type>int</Type><Normal Text>.</Normal Text><Property>min</Property><Normal Text> minint</Normal Text><Symbol>;</Symbol><br/>
diff --git a/data/syntax/d.xml b/data/syntax/d.xml
--- a/data/syntax/d.xml
+++ b/data/syntax/d.xml
@@ -314,11 +314,16 @@
       <item>Windows</item>
       <item>Pascal</item>
       <item>System</item>
+      <!-- <item>Objective-C</item> --><!-- is handled specially in Linkage rule -->
     </list>
 
     <list name="ptypes">
-      <item>msg</item>
+      <item>inline</item>
       <item>lib</item>
+      <item>linkerDirective</item>
+      <item>mangle</item>
+      <item>msg</item>
+      <item>startaddress</item>
     </list>
     
     <list name="scope_keywords">
@@ -514,23 +519,46 @@
       </context>
       <context name="Linkage2" attribute="Normal Text" lineEndContext="#stay">
         <DetectSpaces/>
-        <StringDetect attribute="Linkage Type" context="#pop#pop" String="C++"/>
+        <StringDetect attribute="Linkage Type" context="Linkage-C++" String="C++"/>
+        <StringDetect attribute="Linkage Type" context="#stay" String="Objective-C"/>
         <keyword    attribute="Linkage Type" context="#stay" String="ltypes"/>
         <IncludeRules context="CommentRules" />
         <!-- Fall-through rules, highlighting errors: -->
         <DetectChar char=")" attribute="Normal Text" context="#pop#pop"/>
         <RegExpr String="[^)\s\n]+" attribute="Error" context="#pop#pop"/>
       </context>
+      <context name="Linkage-C++" attribute="Normal Text" lineEndContext="#stay">
+        <DetectSpaces/>
+        <IncludeRules context="CommentRules" />
+        <DetectChar char="," attribute="Normal Text" context="Linkage-C++2"/>
+        <DetectChar char=")" attribute="Normal Text" context="#pop#pop#pop"/>
+        <RegExpr String="." attribute="Error" context="#stay"/>
+      </context>
+      <context name="Linkage-C++2" attribute="Normal Text" lineEndContext="#stay">
+        <DetectSpaces/>
+        <IncludeRules context="CommentRules" />
+        <DetectIdentifier attribute="Normal Text" context="#stay"/>
+        <DetectChar char="." attribute="Normal Text" context="#stay"/>
+        <DetectChar char=")" attribute="Normal Text" context="#pop#pop#pop"/>
+        <RegExpr String="." attribute="Error" context="#stay"/>
+      </context>
 
       <context name="Version" attribute="Normal Text" lineEndContext="#stay">
         <DetectSpaces/>
-        <DetectChar attribute="Normal Text"  context="Version2"  char="="/>
-        <DetectChar attribute="Normal Text"  context="Version2" char="("/>
+        <DetectChar attribute="Normal Text" context="VersionSpec" char="="/>
+        <DetectChar attribute="Normal Text" context="VersionCond" char="("/>
         <IncludeRules context="CommentRules" />
         <!-- Fall-through rules, highlighting errors: -->
         <RegExpr String="[^\s\n]+" attribute="Error" context="#pop"/>
       </context>
-      <context name="Version2" attribute="Normal Text" lineEndContext="#stay">
+      <context name="VersionSpec" attribute="Normal Text" lineEndContext="#stay">
+        <DetectSpaces/>
+        <DetectIdentifier attribute="Normal Text" context="#stay"/>
+        <RegExpr attribute="Integer" context="#stay" String="\d+[\d_]*(L[uU]?|[uU]L?)?"/>
+        <DetectChar char=";" attribute="Normal Text" context="#pop#pop"/>
+        <RegExpr String="." attribute="Error" context="#pop#pop"/>
+      </context>
+      <context name="VersionCond" attribute="Normal Text" lineEndContext="#stay">
         <DetectSpaces/>
         <keyword    attribute="Version Type" context="#stay" String="vtypes"/>
         <DetectIdentifier attribute="Normal Text" context="#stay"/>
@@ -564,13 +592,29 @@
       </context>
       <context name="Pragma2" attribute="Pragma" lineEndContext="#stay">
         <DetectSpaces/>
-        <keyword    attribute="Version Type" context="#stay" String="ptypes"/>
-        <DetectIdentifier attribute="Normal Text" context="#stay"/>
+        <keyword    attribute="Version Type" context="Pragma3" String="ptypes"/>
+        <DetectIdentifier attribute="Normal Text" context="Pragma3"/>
         <IncludeRules context="CommentRules" />
         <!-- Fall-through rules, highlighting errors: -->
         <DetectChar char=")" attribute="Normal Text" context="#pop#pop"/>
         <RegExpr String="[^)\s\n]+" attribute="Error" context="#pop#pop"/>
       </context>
+      <context name="Pragma3" attribute="Pragma" lineEndContext="#stay">
+        <DetectSpaces/>
+        <DetectChar char="," attribute="Normal Text" context="Pragma4"/>
+        <DetectChar char=")" attribute="Normal Text" context="#pop#pop#pop"/>
+        <RegExpr String="." attribute="Error" context="#pop#pop#pop"/>
+      </context>
+      <context name="Pragma4" attribute="Pragma" lineEndContext="#stay">
+        <DetectChar char="(" attribute="Normal Text" context="Parenthetical"/>
+        <DetectChar char=")" attribute="Normal Text" context="#pop#pop#pop#pop"/>
+        <IncludeRules context="normal" />
+      </context>
+      <context name="Parenthetical" attribute="Normal Text" lineEndContext="#stay">
+        <DetectChar char="(" attribute="Normal Text" context="Parenthetical"/>
+        <DetectChar char=")" attribute="Normal Text" context="#pop"/>
+        <IncludeRules context="normal" />
+      </context>
 
       <!-- Strings -->
       <!-- r"..." -->