Merge branch 'master' of https://scm.trinitydesktop.org/scm/git/tdelibs

6 files changed, 117 insertions, 7 deletions

diff --git a/kate/data/CMakeLists.txt b/kate/data/CMakeLists.txt
index 2fa20670d..07afa64c7 100644
--- a/kate/data/CMakeLists.txt
+++ b/kate/data/CMakeLists.txt
@@ -37,7 +37,7 @@ install( FILES
     euphoria.xml e.xml fasm.xml ferite.xml fgl-4gl.xml fgl-per.xml fortran.xml freebasic.xml
     fsharp.xml fstab.xml ftl.xml gap.xml gcc.xml gdb.xml gdl.xml gettext.xml git-ignore.xml
     git-rebase.xml gitolite.xml glosstex.xml glsl.xml gnuassembler.xml gnuplot.xml go.xml
-    grammar.xml haml.xml haskell.xml haxe.xml html.xml hunspell-aff.xml hunspell-dat.xml 
+    grammar.xml hamlet.xml haml.xml haskell.xml haxe.xml html.xml hunspell-aff.xml hunspell-dat.xml 
     hunspell-dic.xml hunspell-idx.xml idconsole.xml idl.xml ilerpg.xml inform.xml
     ini.xml isocpp.xml jam.xml javadoc.xml javascript.xml java.xml json.xml
     jsp.xml julia.xml j.xml kbasic.xml latex.xml ldif.xml ld.xml less.xml lex.xml lilypond.xml
diff --git a/kate/data/Makefile.am b/kate/data/Makefile.am
index 1320d7a33..1b2031333 100644
--- a/kate/data/Makefile.am
+++ b/kate/data/Makefile.am
@@ -17,7 +17,7 @@ syntaxkate_DATA = language.dtd syntax.template \
     euphoria.xml e.xml fasm.xml ferite.xml fgl-4gl.xml fgl-per.xml fortran.xml freebasic.xml \
     fsharp.xml fstab.xml ftl.xml gap.xml gcc.xml gdb.xml gdl.xml gettext.xml git-ignore.xml \
     git-rebase.xml gitolite.xml glosstex.xml glsl.xml gnuassembler.xml gnuplot.xml go.xml \
-    grammar.xml haml.xml haskell.xml haxe.xml html.xml html-php.xml hunspell-aff.xml \
+    grammar.xml hamlet.xml haml.xml haskell.xml haxe.xml html.xml html-php.xml hunspell-aff.xml \
     hunspell-dat.xml hunspell-dic.xml hunspell-idx.xml idconsole.xml idl.xml ilerpg.xml \
     inform.xml ini.xml jam.xml javadoc.xml javascript.xml javascript-php.xml java.xml json.xml \
     jsp.xml julia.xml j.xml kbasic.xml latex.xml ldif.xml ld.xml less.xml lex.xml lilypond.xml \
diff --git a/kate/data/debianchangelog.xml b/kate/data/debianchangelog.xml
index 05a0db8ab..864f48fac 100644
--- a/kate/data/debianchangelog.xml
+++ b/kate/data/debianchangelog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Debian Changelog" version="0.69" kateversion="2.4" section="Other" extensions="" mimetype="">
+<language name="Debian Changelog" version="0.70" kateversion="2.4" section="Other" extensions="" mimetype="">
     <highlighting>
         <list name="keywords">
             <item>urgency</item>
@@ -140,6 +140,11 @@
             <item>utopic-proposed</item>
             <item>utopic-updates</item>
             <item>utopic-backports</item>
+            <item>vivid</item>
+            <item>vivid-security</item>
+            <item>vivid-proposed</item>
+            <item>vivid-updates</item>
+            <item>vivid-backports</item>
         </list>
 
         <list name="urgencies">
diff --git a/kate/data/hamlet.xml b/kate/data/hamlet.xml
new file mode 100644
index 000000000..1dedd09cf
--- /dev/null
+++ b/kate/data/hamlet.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd"
+[
+  <!-- names must start with a letter, ideogram or underscore. \w matches any
+  word character *or* a number, hence the lookahead -->
+  <!ENTITY name    "(?![0-9])[\w_:][\w.:_-]*">
+]>
+<language name="Hamlet" version="0.1" kateversion="2.4" section="Markup" extensions="*.hamlet" author="Bastian Holst (bastianholst@gmx.de)" license="LGPL" indenter="haskell">
+<highlighting>
+<contexts>
+  <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
+    <RegExpr attribute="Element" context="element" String="&lt;&name;\b" />
+    <!-- A widget -->
+    <StringDetect attribute="Code" context="Code" String="^{"/>
+    <!-- Something implementing ToHtml -->
+    <StringDetect attribute="Code" context="Code" String="#{"/>
+    <!-- An URL -->
+    <StringDetect attribute="Code" context="Code" String="@{"/>
+    <!-- A Message -->
+    <StringDetect attribute="Code" context="Code" String="_{"/>
+    <DetectChar attribute="Logic" context="Logic" firstNonSpace="true" char="$"/>
+  </context>
+
+  <context attribute="Element" lineEndContext="#stay" name="element" >
+    <Detect2Chars attribute="Element" context="#pop" char="/" char1="&gt;" />
+    <DetectChar attribute="Element" context="#pop" char="&gt;" />
+    <RegExpr attribute="Attribute" context="Attribute" String="&name;" column="0"/>
+    <RegExpr attribute="Attribute" context="Attribute" String="\s+&name;" />
+    <RegExpr attribute="Class" context="#stay" String="\.&name;"/>
+    <RegExpr attribute="Error" context="#stay" String="\S" />
+  </context>
+
+  <context name="Logic" lineEndContext="#pop" attribute="Normal Text">
+    <WordDetect attribute="Logic" context="Codeline" String="if"/>
+    <WordDetect attribute="Logic" context="Codeline" String="elseif"/>
+    <WordDetect attribute="Logic" context="Assignment" String="forall"/>
+    <WordDetect attribute="Logic" context="Assignment" String="maybe"/>
+    <WordDetect attribute="Logic" context="#stay" String="else"/>
+    <WordDetect attribute="Logic" context="#stay" String="nothing"/>
+    <RegExpr attribute="Error" context="#stay" String="\S" />
+  </context>
+
+  <context name="Code" attribute="Normal Text" lineEndContext="#stay">
+    <DetectChar attribute="Code" context="#pop" char="}"/>
+    <IncludeRules context="##Haskell" />
+  </context>
+
+  <context name="Codeline" attribute="Normal Text" lineEndContext="#pop">
+    <IncludeRules context="##Haskell" />
+  </context>
+
+  <context name="Assignment" attribute="Normal Text" lineEndContext="#pop">
+    <StringDetect attribute="Assignment" context="Codeline" String="&lt;-"/>
+    <IncludeRules context="##Haskell" />
+  </context>
+
+  <context name="Attribute" attribute="Other Text" lineEndContext="#stay">
+    <DetectChar attribute="Attribute" context="Value" char="=" />
+    <DetectChar attribute="Element" context="#pop#pop" char="&gt;"/>
+    <RegExpr attribute="Error" context="#stay" String="\S" />
+  </context>
+
+  <context attribute="Value" lineEndContext="#stay" name="Value">
+    <DetectChar attribute="Value" context="Value DQ" char="&quot;" />
+    <DetectChar attribute="Value" context="Value SQ" char="&apos;" />
+    <StringDetect attribute="Code" context="Value Code" String="@{"/>
+    <StringDetect attribute="Code" context="Value Code" String="#{"/>
+    <RegExpr attribute="Value" context="#pop#pop" String="[^&quot;&apos;&gt;\s]+"/>
+    <RegExpr attribute="Error" context="#stay" String="\S" />
+  </context>
+
+  <context name="Value DQ" attribute="Value" lineEndContext="#stay">
+    <DetectChar attribute="Value" context="#pop#pop#pop" char="&quot;" />
+  </context>
+
+  <context name="Value SQ" attribute="Value" lineEndContext="#stay">
+    <DetectChar attribute="Value" context="#pop#pop#pop" char="&apos;" />
+  </context>
+  
+  <context name="Value Code" attribute="Normal Text" lineEndContext="#stay">
+    <DetectChar attribute="Code" context="#pop#pop#pop" char="}"/>
+    <IncludeRules context="##Haskell" />
+  </context>
+
+</contexts>
+<itemDatas>
+  <itemData name="Normal Text" defStyleNum="dsNormal" />
+  <itemData name="Element" defStyleNum="dsKeyword" />
+  <itemData name="Attribute" defStyleNum="dsOthers" spellChecking="false" />
+  <itemData name="Class" defStyleNum="dsString" color="#a00" spellChecking="false" />
+  <itemData name="Value" defStyleNum="dsString" color="#a00" spellChecking="false" />
+  <itemData name="Logic" defStyleNum="dsKeyword" spellChecking="false" />
+  <itemData name="Code"  defStyleNum="dsKeyword" spellChecking="false" />
+  <itemData name="Error" defStyleNum="dsError" spellChecking="false" />
+  <itemData name="Assignment" defStyleNum="dsOthers"  spellChecking="false" />
+</itemDatas>
+</highlighting> 
+<general>
+  <comments>
+    <comment name="singleLine" start="#"/>
+  </comments>
+  <keywords casesensitive="1"/>
+</general> 
+</language>
diff --git a/kate/data/perl.xml b/kate/data/perl.xml
index b83bea9f3..bcec3c3d4 100644
--- a/kate/data/perl.xml
+++ b/kate/data/perl.xml
@@ -39,7 +39,7 @@
 
    Enhance tr/// and y/// support.
 -->
-<language name="Perl" version="1.30-1" kateversion="2.4" section="Scripts" extensions="*.pl;*.PL;*.pm" mimetype="application/x-perl;text/x-perl" priority="5" author="Anders Lund (anders@alweb.dk)" license="LGPL">
+<language name="Perl" version="1.31-1" kateversion="2.4" section="Scripts" extensions="*.pl;*.PL;*.pm" mimetype="application/x-perl;text/x-perl" priority="5" author="Anders Lund (anders@alweb.dk)" license="LGPL">
   <highlighting>
     <list name="keywords">
       <item> if </item>
@@ -346,7 +346,7 @@
         <keyword attribute="Operator" context="#stay" String="operators" />
         <keyword attribute="Function" context="#stay" String="functions" />
         <keyword attribute="Pragma" context="#stay" String="pragmas" />
-        <RegExpr attribute="Pod" context="pod" String="\=(?:head[1-6]|over|back|item|for|begin|end|pod)(\s|$)" column="0" beginRegion="POD"/>
+        <RegExpr attribute="Pod" context="pod" String="\=\w+(\s|$)" column="0" beginRegion="POD"/>
         <DetectSpaces />
         <DetectChar attribute="Comment" context="comment" char="#" />
 
diff --git a/kate/data/update-files.xml b/kate/data/update-files.xml
index d28b78172..798de7c8d 100644
--- a/kate/data/update-files.xml
+++ b/kate/data/update-files.xml
@@ -46,7 +46,7 @@
 <Definition name="Curry" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/curry.xml" version="0.3"/>
 <Definition name="C" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/c.xml" version="1.46"/>
 <Definition name="Ddoc" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ddoc.xml" version="1.15"/>
-<Definition name="Debian Changelog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/debianchangelog.xml" version="0.69"/>
+<Definition name="Debian Changelog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/debianchangelog.xml" version="0.70"/>
 <Definition name="Debian Control" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/debiancontrol.xml" version="0.84"/>
 <Definition name=".desktop" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/desktop.xml" version="1.05-1"/>
 <Definition name="Diff" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/diff.xml" version="1.12"/>
@@ -86,6 +86,7 @@
 <Definition name="Gnuplot" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/gnuplot.xml" version="0.1"/>
 <Definition name="Go" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/go.xml" version="1.05-1"/>
 <Definition name="KDev-PG[-Qt] Grammar" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/grammar.xml" version="0.24-1"/>
+<Definition name="Hamlet" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/hamlet.xml" version="0.1"/>
 <Definition name="Haml" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/haml.xml" version="1.1"/>
 <Definition name="Haskell" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/haskell.xml" version="2.4"/>
 <Definition name="Haxe" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/haxe.xml" version="0.1"/>
@@ -157,7 +158,7 @@
 <Definition name="OpenCL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/opencl.xml" version="1.44"/>
 <Definition name="Pango" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pango.xml" version="0.1"/>
 <Definition name="Pascal" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pascal.xml" version="1.23"/>
-<Definition name="Perl" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/perl.xml" version="1.30-1"/>
+<Definition name="Perl" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/perl.xml" version="1.31-1"/>
 <Definition name="PGN" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pgn.xml" version="2.01-1"/>
 <Definition name="PHP/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/php.xml" version="1.44"/>
 <Definition name="PicAsm" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/picsrc.xml" version="1.07"/>