| 790fe12d | 2014-06-02 21:56:45 | Michele Calgaro |
Kate syntax highlighting files update - Jun 2014 |
||
|
M kate/data/ada.xml M kate/data/coffee.xml M kate/data/euphoria.xml M kate/data/html-php.xml M kate/data/html.xml M kate/data/javascript-php.xml M kate/data/javascript.xml M kate/data/mako.xml M kate/data/maxima.xml M kate/data/php.xml M kate/data/prolog.xml M kate/data/rhtml.xml M kate/data/template-toolkit.xml M kate/data/update-files.xml |
||
diff --git a/kate/data/ada.xml b/kate/data/ada.xml
index 9bc6b76..f2f753c 100644
--- a/kate/data/ada.xml
+++ b/kate/data/ada.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
-<language name="Ada" version="1.07" kateversion="2.4" section="Sources" extensions="*.adb;*.ads;*.ada;*.a" mimetype="text/x-adasrc">
+<language name="Ada"
+ version="1.08"
+ kateversion="2.5"
+ section="Sources"
+ extensions="*.adb;*.ads;*.ada;*.a"
+ indenter="ada"
+ mimetype="text/x-adasrc">
<highlighting>
<list name="keywords">
<item> abort </item>
diff --git a/kate/data/coffee.xml b/kate/data/coffee.xml
index 043e51b..dc0f1c5 100644
--- a/kate/data/coffee.xml
+++ b/kate/data/coffee.xml
@@ -2,7 +2,7 @@
<!DOCTYPE language SYSTEM "language.dtd">
<language name="CoffeeScript"
- version="1.4"
+ version="1.5"
kateversion="2.4"
section="Scripts"
extensions="Cakefile;*.coffee;*.coco"
@@ -223,7 +223,7 @@
<context name="Javascript" attribute="Javascript" lineEndContext="#stay" noIndentationBasedFolding="1">
<DetectChar attribute="Javascript" context="#pop" char="`" endRegion="Javascript"/>
<!-- NOTE: This hides errors where a backtick is embedded in a JS string. -->
- <IncludeRules context="##JavaScript" includeAttrib="true"/>
+ <IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
</context>
</contexts>
<!-- Style mappings. -->
diff --git a/kate/data/euphoria.xml b/kate/data/euphoria.xml
index 4c00a56..431a2dc 100644
--- a/kate/data/euphoria.xml
+++ b/kate/data/euphoria.xml
@@ -27,9 +27,9 @@
-->
-<!-- Store this in /usr/share/apps/katepart/syntax -->
+<!-- Store this in ~/.trinity/share/apps/katepart/syntax, -->
-<language name="Euphoria" version="2.08-1" kateversion="2.4" section="Scripts" extensions="*.e;*.ex;*.exw;*.exu" mimetype="text/x-euphoria" author="Irv Mullins (irvm@...)" license="LGPL">
+<language name="Euphoria" version="2.08-2" kateversion="2.4" section="Scripts" extensions="*.e;*.ex;*.exw;*.exu" mimetype="text/x-euphoria" author="Irv Mullins (irvm@...)" license="LGPL">
<highlighting>
<list name="keywords">
<item> abort </item>
diff --git a/kate/data/html-php.xml b/kate/data/html-php.xml
index 7a5215f..4b18b99 100644
--- a/kate/data/html-php.xml
+++ b/kate/data/html-php.xml
@@ -10,7 +10,7 @@
-<language name="PHP (HTML)" version="2.0" kateversion="2.4" section="Scripts" extensions="*.php;*.php3;*.wml;*.phtml;*.phtm;*.inc" mimetype="text/x-php4-src;text/x-php3-src;text/vnd.wap.wml;application/x-php" author="Wilbert Berendsen (wilbert@...)" license="LGPL" priority="10">
+<language name="PHP (HTML)" version="2.1" kateversion="2.4" section="Scripts" extensions="*.php;*.php3;*.wml;*.phtml;*.phtm;*.inc" mimetype="text/x-php4-src;text/x-php3-src;text/vnd.wap.wml;application/x-php" author="Wilbert Berendsen (wilbert@...)" license="LGPL" priority="10">
<highlighting>
<contexts>
@@ -199,7 +199,7 @@
<IncludeRules context="FindPHP" />
<RegExpr attribute="Element" context="El Close 2" String="</script\b" insensitive="TRUE" endRegion="script" />
<RegExpr attribute="Comment" context="JS comment close" String="//(?=.*</script\b)" insensitive="TRUE" />
- <IncludeRules context="##JavaScript/PHP" includeAttrib="true"/>
+ <IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
</context>
<context name="JS comment close" attribute="Comment" lineEndContext="#pop">
diff --git a/kate/data/html.xml b/kate/data/html.xml
index 756fa8f..653fdb2 100644
--- a/kate/data/html.xml
+++ b/kate/data/html.xml
@@ -4,7 +4,7 @@
<!ENTITY name "[A-Za-z_:][\w.:_-]*">
<!ENTITY entref "&(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
]>
-<language name="HTML" version="2.0" kateversion="2.4" section="Markup" extensions="*.htm;*.html;*.shtml;*.shtm" mimetype="text/html" author="Wilbert Berendsen (wilbert@...)" license="LGPL" priority="10">
+<language name="HTML" version="2.1" kateversion="2.4" section="Markup" extensions="*.htm;*.html;*.shtml;*.shtm" mimetype="text/html" author="Wilbert Berendsen (wilbert@...)" license="LGPL" priority="10">
<highlighting>
<contexts>
@@ -171,7 +171,7 @@
<context name="JS content" attribute="Other Text" lineEndContext="#stay">
<RegExpr attribute="Element" context="El Close 2" String="</script\b" insensitive="TRUE" endRegion="script" />
<RegExpr attribute="Comment" context="JS comment close" String="//(?=.*</script\b)" insensitive="TRUE" />
- <IncludeRules context="##JavaScript" includeAttrib="true"/>
+ <IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
</context>
<context name="JS comment close" attribute="Comment" lineEndContext="#pop">
diff --git a/kate/data/javascript-php.xml b/kate/data/javascript-php.xml
index d61b076..a4ff012 100644
--- a/kate/data/javascript-php.xml
+++ b/kate/data/javascript-php.xml
@@ -9,7 +9,7 @@
-<language name="JavaScript/PHP" hidden="true" version="1.22" kateversion="2.4" section="Other" extensions=""
+<language name="JavaScript/PHP" hidden="true" version="1.23" kateversion="2.4" section="Other" extensions=""
mimetype="" indenter="cstyle"
author="Anders Lund (anders@...), Joseph Wenninger (jowenn@...), Whitehawk Stormchaser (zerokode@...)" license="">
<highlighting>
@@ -70,6 +70,18 @@
<item> undefined </item>
</list>
<contexts>
+
+ <!-- Shebang: ("#!") Detect shebang and fallthrough to Normal -->
+ <!-- Based on the similar clause from prolog.xml, which notes the following BUG:
+ If the file starts with whitespace and a shebang on a line other than the first line,
+ this rule will still match it as a shebang, even tough the shebang is only valid on
+ the very first line.
+ -->
+ <context name="Shebang" lineEndContext="Normal" attribute="Syntax Error" fallthrough="true" fallthroughContext="Normal" >
+<IncludeRules context="FindPHP" />
+ <Detect2Chars column="0" char="#" char1="!" context="Comment" attribute="Comment" />
+ </context>
+
<context attribute="Normal Text" lineEndContext="#stay" name="Normal">
<IncludeRules context="FindPHP" />
<DetectSpaces/>
diff --git a/kate/data/javascript.xml b/kate/data/javascript.xml
index 260aa72..dc12404 100644
--- a/kate/data/javascript.xml
+++ b/kate/data/javascript.xml
@@ -3,7 +3,7 @@
<!-- Author: Anders Lund <anders@...> //-->
<!-- Minor changes: Joseph Wenninger <jowenn@...> //-->
<!-- Full JavaScript 1.0 support by Whitehawk Stormchaser //-->
-<language name="JavaScript" version="1.22" kateversion="2.4" section="Scripts" extensions="*.js;*.kwinscript"
+<language name="JavaScript" version="1.23" kateversion="2.4" section="Scripts" extensions="*.js;*.kwinscript"
mimetype="text/x-javascript;application/x-javascript" indenter="cstyle"
author="Anders Lund (anders@...), Joseph Wenninger (jowenn@...), Whitehawk Stormchaser (zerokode@...)" license="">
<highlighting>
@@ -64,6 +64,17 @@
<item> undefined </item>
</list>
<contexts>
+
+ <!-- Shebang: ("#!") Detect shebang and fallthrough to Normal -->
+ <!-- Based on the similar clause from prolog.xml, which notes the following BUG:
+ If the file starts with whitespace and a shebang on a line other than the first line,
+ this rule will still match it as a shebang, even tough the shebang is only valid on
+ the very first line.
+ -->
+ <context name="Shebang" lineEndContext="Normal" attribute="Syntax Error" fallthrough="true" fallthroughContext="Normal" >
+ <Detect2Chars column="0" char="#" char1="!" context="Comment" attribute="Comment" />
+ </context>
+
<context attribute="Normal Text" lineEndContext="#stay" name="Normal">
<DetectSpaces/>
<StringDetect attribute="Region Marker" context="region_marker" String="//BEGIN" beginRegion="Region1" />
diff --git a/kate/data/mako.xml b/kate/data/mako.xml
index cfac839..86acdf9 100644
--- a/kate/data/mako.xml
+++ b/kate/data/mako.xml
@@ -4,7 +4,7 @@
<!ENTITY name "[A-Za-z_:][\w.:_-]*">
<!ENTITY entref "&(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
]>
-<language name="Mako" version="1.0" kateversion="2.4" section="Markup" extensions="*.mako;*.mak" author="Massimiliano Torromeo (massimiliano.torromeo@...)" license="LGPL">
+<language name="Mako" version="1.1" kateversion="2.4" section="Markup" extensions="*.mako;*.mak" author="Massimiliano Torromeo (massimiliano.torromeo@...)" license="LGPL">
<highlighting>
<list name="flow">
@@ -47,7 +47,7 @@
<context name="NoMakoJS" attribute="Normal Text" lineEndContext="#stay">
<StringDetect attribute="MakoKeyword" context="#pop" String="</%text>" endRegion="nomako" />
- <IncludeRules context="##JavaScript" includeAttrib="true"/>
+ <IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
</context>
<context name="FindHTML" attribute="Normal Text" lineEndContext="#stay">
@@ -192,7 +192,7 @@
<RegExpr attribute="Comment" context="JS comment close" String="//(?=.*</script\b)" insensitive="TRUE" />
<RegExpr attribute="MakoKeyword" context="NoMakoJS" String="<%text(?:\s+[^>]*)?>" beginRegion="nomako" />
<IncludeRules context="FindMako" />
- <IncludeRules context="##JavaScript" includeAttrib="true"/>
+ <IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
</context>
<context name="JS comment close" attribute="Comment" lineEndContext="#pop">
diff --git a/kate/data/maxima.xml b/kate/data/maxima.xml
index da93258..cbf7657 100644
--- a/kate/data/maxima.xml
+++ b/kate/data/maxima.xml
@@ -16,12 +16,12 @@
You should have received a copy of the GNU General Public License
along with the maxima.xml. If not, see <http://www.gnu.org/licenses/>.
- Usage: place maxima.xml in $TDEDIR/share/apps/katepart/syntax.
+ Usage: place maxima.xml in ~/.trinity/share/apps/katepart/syntax/.
-->
<!DOCTYPE language SYSTEM "language.dtd">
-<language name="Maxima" version="0.16-1" kateversion="2.0" section="Scientific" extensions="*.mac;*.MAC;*.dem;*.DEM" casesensitive="1" author="Alexey Beshenov <al@...>" license="LGPL">
+<language name="Maxima" version="0.16-2" kateversion="2.0" section="Scientific" extensions="*.mac;*.MAC;*.dem;*.DEM" casesensitive="1" author="Alexey Beshenov <al@...>" license="LGPL">
<highlighting>
<list name="MaximaKeyword">
diff --git a/kate/data/php.xml b/kate/data/php.xml
index b7d30b7..f195b95 100644
--- a/kate/data/php.xml
+++ b/kate/data/php.xml
@@ -64,7 +64,7 @@
<!ENTITY types "int|integer|bool|boolean|float|double|real|string|array|object">
]>
-<language name="PHP/PHP" indenter="cstyle" version="1.44" kateversion="2.4" section="Scripts" extensions="" priority="5" mimetype="" hidden="true">
+<language name="PHP/PHP" indenter="cstyle" version="1.45" kateversion="2.4" section="Scripts" extensions="" priority="5" mimetype="" hidden="true">
<highlighting>
<list name="control structures">
<item>as</item>
@@ -5559,7 +5559,7 @@
<context name="javascriptheredoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
<RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" />
<IncludeRules context="commonheredoc" />
- <IncludeRules context="##JavaScript" />
+ <IncludeRules context="Normal##JavaScript" />
</context>
<context name="heredoc" attribute="String" lineEndContext="#stay" dynamic="true">
<RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" />
@@ -5588,7 +5588,7 @@
<context name="javascriptnowdoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
<RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" />
<IncludeRules context="commonnowdoc" />
- <IncludeRules context="##JavaScript" />
+ <IncludeRules context="Normal##JavaScript" />
</context>
<context name="nowdoc" attribute="String" lineEndContext="#stay" dynamic="true">
<RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" />
diff --git a/kate/data/prolog.xml b/kate/data/prolog.xml
index e8e57fa..269c307 100644
--- a/kate/data/prolog.xml
+++ b/kate/data/prolog.xml
@@ -105,7 +105,7 @@
<!ENTITY bs "\">
** Diff limit reached (max: 250 lines) **
|
||