From aaa5afedcdca81a36c23dbcdd596c72f4c9192b9 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Mon, 28 Jul 2014 19:12:40 +0900
Subject: Kate syntax highlighting files update - Jul 2014 (cherry picked from
 commit aa18c1556b6e122f4b414639cf091e1e3848b974)

---
 kate/data/css-php.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'kate/data/css-php.xml')

diff --git a/kate/data/css-php.xml b/kate/data/css-php.xml
index 8fd82afc0..6a8bf4d73 100644
--- a/kate/data/css-php.xml
+++ b/kate/data/css-php.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language SYSTEM "language.dtd"
+[
+  <!-- http://www.w3.org/TR/CSS21/syndata.html#tokenization -->
+  <!ENTITY nmstart "[_a-zA-Z]|(\\[0-9a-fA-F]{1,6})|(\\[^\n\r\f0-9a-fA-F])">
+  <!ENTITY nmchar  "[_a-zA-Z0-9-]|(\\[0-9a-fA-F]{1,6})|(\\[^\n\r\f0-9a-fA-F])">
+]>
 
 <!--
 
@@ -24,7 +29,7 @@ Changelog:
 
 
 
-<language name="CSS/PHP" hidden="true" version="2.08" kateversion="2.4" section="Other" extensions="" indenter="cstyle" mimetype="" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="CSS/PHP" hidden="true" version="2.09" kateversion="2.4" section="Other" extensions="" indenter="cstyle" mimetype="" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 	<highlighting>
 		<list name="properties">
@@ -726,7 +731,7 @@ Changelog:
 				<DetectChar attribute="Property" context="RuleSet" char="{" beginRegion="ruleset" />
 				<!--parse selectors-->
 				<DetectChar attribute="Selector Attr" context="SelAttr" char="[" />
-				<RegExpr attribute="Selector Id" context="#stay" String="#([a-zA-Z0-9\-_]|[\x80-\xFF]|\\[0-9A-Fa-f]{1,6})*" />
+				<RegExpr attribute="Selector Id" context="#stay" String="#(-)?(&nmstart;)(&nmchar;)*" />
 				<RegExpr attribute="Selector Class" context="#stay" String="\.([a-zA-Z0-9\-_]|[\x80-\xFF]|\\[0-9A-Fa-f]{1,6})*" />
 				<RegExpr attribute="Selector Pseudo" context="#stay" String=":lang\([\w_-]+\)" />
 				<DetectChar attribute="Selector Pseudo" context="SelPseudo" char=":" />
@@ -809,6 +814,7 @@ Changelog:
                         <context attribute="Media" lineEndContext="#stay" name="MQEV">
 <IncludeRules context="FindPHP" />
                         <!-- this should be seperate for different features, for now it is all the same -->
+                            <DetectSpaces/>
                             <RegExpr attribute="Value" context="#pop" String="[1-9][0-9.]*\s*/\s*[1-9][0-9.]*" />
                             <RegExpr attribute="Value" context="#pop" String="[0-9.]+(em|ex|ch|rem|vw|vh|vm|px|in|cm|mm|pt|pc|deg|rad|grad|turn|ms|s|Hz|kHz|dpi|dpcm)\b" />
                             <RegExpr attribute="Value" context="#pop" String="[0-9.]+[%]?" />
-- 
cgit v1.2.1