Hello community,
here is the log from the commit of package syntax-highlighting for
openSUSE:Factory checked in at 2017-04-30 21:22:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/syntax-highlighting (Old)
and /work/SRC/openSUSE:Factory/.syntax-highlighting.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "syntax-highlighting"
Sun Apr 30 21:22:35 2017 rev:6 rq:492104 version:5.33.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/syntax-highlighting/syntax-highlighting.changes
2017-03-28 15:14:01.599215017 +0200
+++
/work/SRC/openSUSE:Factory/.syntax-highlighting.new/syntax-highlighting.changes
2017-04-30 21:22:36.371627275 +0200
@@ -1,0 +2,17 @@
+Sat Apr 15 10:12:00 CEST 2017 - [email protected]
+
+- Update to 5.33.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.33.0.php
+- Changes since 5.32.0:
+ * Upgrade ECM and KF5 version requirements for 5.33.0 release.
+ * TOML: Fix highlighting of string escape sequences
+ * Update Clojure syntax highlighting
+ * few updates to OCaml syntax
+ * Hightlight *.sbt files as scala code
+ * Also use the QML highlighter for .qmltypes files
+ * Add unit test for Apache configuration highlighting
+ * Upgrade KF5 version to 5.33.0.
+
+-------------------------------------------------------------------
Old:
----
syntax-highlighting-5.32.0.tar.xz
New:
----
syntax-highlighting-5.33.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ syntax-highlighting.spec ++++++
--- /var/tmp/diff_new_pack.INNn7f/_old 2017-04-30 21:22:37.111522951 +0200
+++ /var/tmp/diff_new_pack.INNn7f/_new 2017-04-30 21:22:37.115522387 +0200
@@ -18,9 +18,9 @@
%bcond_without lang
%define lname libKF5SyntaxHighlighting5
-%define _tar_path 5.32
+%define _tar_path 5.33
Name: syntax-highlighting
-Version: 5.32.0
+Version: 5.33.0
Release: 0
Summary: Syntax highlighting engine and library
License: LGPL-2.1+ and GPL-2.0 and GPL-2.0+ and GPL-3.0 and MIT and
BSD-3-Clause and Artistic-1.0
++++++ syntax-highlighting-5.32.0.tar.xz -> syntax-highlighting-5.33.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/syntax-highlighting-5.32.0/CMakeLists.txt
new/syntax-highlighting-5.33.0/CMakeLists.txt
--- old/syntax-highlighting-5.32.0/CMakeLists.txt 2017-03-04
17:24:44.000000000 +0100
+++ new/syntax-highlighting-5.33.0/CMakeLists.txt 2017-04-01
21:45:56.000000000 +0200
@@ -1,9 +1,9 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.32.0")
+set(KF5_VERSION "5.33.0")
project(KSyntaxHighlighting VERSION ${KF5_VERSION})
-find_package(ECM 5.32.0 REQUIRED NO_MODULE)
+find_package(ECM 5.33.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
if(POLICY CMP0063)
cmake_policy(SET CMP0063 NEW)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/syntax-highlighting-5.32.0/autotests/folding/apache.conf.fold
new/syntax-highlighting-5.33.0/autotests/folding/apache.conf.fold
--- old/syntax-highlighting-5.32.0/autotests/folding/apache.conf.fold
1970-01-01 01:00:00.000000000 +0100
+++ new/syntax-highlighting-5.33.0/autotests/folding/apache.conf.fold
2017-04-01 21:45:56.000000000 +0200
@@ -0,0 +1,67 @@
+# Apache configuration highlighting unit test
+# comment with alters TODO FIXME ###
+
+<beginfold id='1'><IfModule</beginfold id='1'> mod_dav_fs.c>
+ DAVLockDB /var/lock/apache/DAVLock
+<endfold id='1'></IfModule</endfold id='1'>>
+
+<beginfold id='1'><VirtualHost</beginfold id='1'> *:443>
+ Include something_else.inc
+
+ SSLEngine on
+ # exclude insecure protocols
+ SSLProtocol all -SSLv2 -SSLv3
+ SSLHonorCipherOrder on
+ # exclude insecure ciphers
+ SSLCipherSuite "HIGH !EXP !eNULL !aNULL !LOW !RC4 !3DES !MD5 !EXP !PSK
!SRP !DSS !DES !aECDH"
+
+ SSLCertificateFile /etc/letsencrypt/live/cert.pem
+ SSLCertificateKeyFile /etc/letsencrypt/live/privkey.pem
+ SSLCertificateChainFile /etc/letsencrypt/live/chain.pem
+ CustomLog /var/log/apache2/ssl_request_log ssl_combined
+<endfold id='1'></VirtualHost</endfold id='1'>>
+
+<beginfold id='1'><Proxy</beginfold id='1'> "http://localhost:10000/";>
+ SSLRequireSSL
+<endfold id='1'></Proxy</endfold id='1'>>
+
+<beginfold id='1'><Directory</beginfold id='1'> "/some/quoted/path">
+ Options -Indexes -FollowSymLinks
+ DirectoryIndex index.php
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+
+ Options FollowSymLinks
+ AllowOverride FileInfo Options All
+ <beginfold id='1'><LimitExcept</beginfold id='1'> GET>
+ Require valid-user
+ <endfold id='1'></LimitExcept</endfold id='1'>>
+
+ <beginfold id='1'><Files</beginfold id='1'> ~ "\.(cgi|shtml|phtml|php3?)$">
+ ForceType text/plain
+ <endfold id='1'></Files</endfold id='1'>>
+<endfold id='1'></Directory</endfold id='1'>>
+
+Alias /foo/ "/srv/www/htdocs/foo/"
+
+AuthType Basic
+AuthName "KDE"
+AuthUserFile /srv/www/htpasswd.db
+Require user konqui
+
+<beginfold id='1'><VirtualHost</beginfold id='1'> _default_:80>
+ ServerName www.kde.org
+ ServerAlias kde.org
+
+ RewriteEngine On
+ RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [L,QSA,R=permanent]
+<endfold id='1'></VirtualHost</endfold id='1'>>
+
+AuthBasicProvider ldap
+AuthLDAPBindDN uid=ldapproxy,ou=people,dc=kde,dc=org
+AuthLDAPBindPassword top_secret
+AuthLDAPURL
ldap://localhost:389/ou=people,dc=kde,dc=org?uid?sub?(objectClass=posixAccount)
+AuthLDAPGroupAttributeIsDN on
+AuthLDAPGroupAttribute member
+Require ldap-group cn=sysadmin,ou=Group,dc=kde,dc=org
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/syntax-highlighting-5.32.0/autotests/folding/clojure.clj.fold
new/syntax-highlighting-5.33.0/autotests/folding/clojure.clj.fold
--- old/syntax-highlighting-5.32.0/autotests/folding/clojure.clj.fold
1970-01-01 01:00:00.000000000 +0100
+++ new/syntax-highlighting-5.33.0/autotests/folding/clojure.clj.fold
2017-04-01 21:45:56.000000000 +0200
@@ -0,0 +1,71 @@
+; Test file, released under MIT License
+(ns ^{:doc "Syntax highlighting test file"
+ :author "Markus Brenneis"}
+ highlighting)
+
+(defn something-else [f xs]
+ #_(map #(apply f (% [%])) (cons 1 xs))
+ (map #(apply f (% xs)) (cons 1 xs))
+ #_[1 '(2)]
+ xs)
+
+(def foo [\a \b \n \ucafe \o123 \n
+ \newline \tab \space \formfeed \backspace])
+
+(def fizz {#{\a \b}
+ #{\n \newline}})
+
+(def fizz' #{{\a \b}
+ {\n \newline}})
+
+(defn bar [xs]
+ (as-> xs <>
+ (cons :a <>)
+ (map #(%1 %2) <>) ; TODO improve
+ (into <> [:konjure.logic.specs/numShips])))
+
+(def x-2-y
+ #_"do \" sth"
+ (domonad set-m
+ [x #{1.1, (+ -2 +4)}
+ y #{1.1, (- -2.0 4.0)}]
+ (*' x y)))
+
+(def bases
+ (and (= -1 -1N)
+ (= 1/4 -2.5e-1)
+ (= -1/2 -0.5M)
+ (= -0x1Ab -0X1ab)
+ (= +2r101010 25R1h)
+ (= 39r13 42R10))) ; FIXME this one is not correct
+
+(def ^{:private true}
+ (= (last #{#{}}) #{{#{}}}))
+
+(def s "#repl\n")
+(def r #"repl")
+
+(defn- stuff!
+ [a]
+ "This is no \"documentation\"!"
+ (= (class #'+) (class #'foo))
+ (let [+ -] [(+ a 1) (@#'+ a 1)]))
+
+(defn- throwIllegalArgumentException!
+ "Throws an \"IllegalArgumentException\" or
+ a js/Error."
+ [message]
+ #?(:clj (throw (IllegalArgumentException. message))
+ :cljs (throw (js/Error. message))))
+
+(defmacro let-fn "a nonsense macro" [one-binding & body]
+ `(+ 1 ~(inc' 1))
+ (let [[identifier & fn-body] one-binding]
+ `(let [~identifier (fn ~identifier ~@fn-body)]
+ ~@body `a#)))
+
+(def state (atom [(= false true) nil]))
+
+(defn something-cool [] (first @state))
+
+(defn- something-different [] (first (into @state [12])))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/syntax-highlighting-5.32.0/autotests/html/apache.conf.html
new/syntax-highlighting-5.33.0/autotests/html/apache.conf.html
--- old/syntax-highlighting-5.32.0/autotests/html/apache.conf.html
1970-01-01 01:00:00.000000000 +0100
+++ new/syntax-highlighting-5.33.0/autotests/html/apache.conf.html
2017-04-01 21:45:56.000000000 +0200
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html><head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<title>apache.conf</title>
+<meta name="generator" content="KF5::SyntaxHighlighting (Apache
Configuration)"/>
+</head><body style="color:#1f1c1b"><pre>
+<span style="color:#898887;"># Apache configuration highlighting unit
test</span>
+<span style="color:#898887;"># comment with alters </span><span
style="color:#ca9219;background-color:#451e1a;font-weight:bold;">TODO</span><span
style="color:#898887;"> </span><span
style="color:#ca9219;background-color:#451e1a;font-weight:bold;">FIXME</span><span
style="color:#898887;"> </span><span
style="color:#81ca2d;background-color:#f7e6e6;font-weight:bold;">###</span>
+
+<span style="color:#644a9b;"><IfModule</span><span style="color:#0057ae;">
mod_dav_fs.c</span><span style="color:#644a9b;">></span>
+ <span style="color:#0095ff;font-weight:bold;">DAVLockDB</span><span
style="color:#bf0303;"> /var/lock/apache/DAVLock</span>
+<span style="color:#644a9b;"></IfModule></span>
+
+<span style="color:#644a9b;"><VirtualHost</span><span
style="color:#0057ae;"> *:443</span><span style="color:#644a9b;">></span>
+ <span style="color:#0095ff;font-weight:bold;">Include</span><span
style="color:#bf0303;"> something_else.inc</span>
+
+ <span style="color:#0095ff;font-weight:bold;">SSLEngine</span><span
style="color:#924c9d;"> </span><span style="font-weight:bold;">on</span>
+ <span style="color:#898887;"># exclude insecure protocols</span>
+ <span style="color:#0095ff;font-weight:bold;">SSLProtocol</span><span
style="color:#924c9d;"> </span><span style="font-weight:bold;">all</span><span
style="color:#924c9d;"> </span><span
style="font-weight:bold;">-SSLv2</span><span style="color:#924c9d;">
</span><span style="font-weight:bold;">-SSLv3</span>
+ <span
style="color:#0095ff;font-weight:bold;">SSLHonorCipherOrder</span><span
style="color:#924c9d;"> </span><span style="font-weight:bold;">on</span>
+ <span style="color:#898887;"># exclude insecure ciphers</span>
+ <span style="color:#0095ff;font-weight:bold;">SSLCipherSuite</span><span
style="color:#bf0303;"> "HIGH !EXP !eNULL !aNULL !LOW !RC4 !3DES !MD5 !EXP
!PSK !SRP !DSS !DES !aECDH"</span>
+
+ <span
style="color:#0095ff;font-weight:bold;">SSLCertificateFile</span><span
style="color:#bf0303;"> /etc/letsencrypt/live/cert.pem</span>
+ <span
style="color:#0095ff;font-weight:bold;">SSLCertificateKeyFile</span><span
style="color:#bf0303;"> /etc/letsencrypt/live/privkey.pem</span>
+ <span
style="color:#0095ff;font-weight:bold;">SSLCertificateChainFile</span><span
style="color:#bf0303;"> /etc/letsencrypt/live/chain.pem</span>
+ <span style="color:#0095ff;font-weight:bold;">CustomLog</span><span
style="color:#bf0303;"> /var/log/apache2/ssl_request_log ssl_combined</span>
+<span style="color:#644a9b;"></VirtualHost></span>
+
+<span style="color:#644a9b;"><Proxy</span><span style="color:#0057ae;">
"http://localhost:10000/"</span><span
style="color:#644a9b;">></span>
+ <span style="color:#0095ff;font-weight:bold;">SSLRequireSSL</span>
+<span style="color:#644a9b;"></Proxy></span>
+
+<span style="color:#644a9b;"><Directory</span><span style="color:#0057ae;">
"/some/quoted/path"</span><span style="color:#644a9b;">></span>
+ <span style="color:#0095ff;font-weight:bold;">Options</span><span
style="color:#924c9d;"> </span><span
style="font-weight:bold;">-Indexes</span><span style="color:#924c9d;">
</span><span style="font-weight:bold;">-FollowSymLinks</span>
+ <span style="color:#0095ff;font-weight:bold;">DirectoryIndex</span><span
style="color:#bf0303;"> index.php</span>
+ <span style="color:#0095ff;font-weight:bold;">AllowOverride</span><span
style="color:#924c9d;"> </span><span style="font-weight:bold;">None</span>
+ <span style="color:#0095ff;font-weight:bold;">Order</span><span
style="color:#924c9d;"> </span><span style="font-weight:bold;">allow,deny</span>
+ <span style="color:#0095ff;font-weight:bold;">Allow</span><span
style="color:#bf0303;"> from all</span>
+
+ <span style="color:#0095ff;font-weight:bold;">Options</span><span
style="color:#924c9d;"> </span><span
style="font-weight:bold;">FollowSymLinks</span>
+ <span style="color:#0095ff;font-weight:bold;">AllowOverride</span><span
style="color:#924c9d;"> </span><span
style="font-weight:bold;">FileInfo</span><span style="color:#924c9d;">
</span><span style="font-weight:bold;">Options</span><span
style="color:#924c9d;"> </span><span style="font-weight:bold;">All</span>
+ <span style="color:#644a9b;"><LimitExcept</span><span
style="color:#0057ae;"> GET</span><span style="color:#644a9b;">></span>
+ <span style="color:#0095ff;font-weight:bold;">Require</span><span
style="color:#bf0303;"> valid-user</span>
+ <span style="color:#644a9b;"></LimitExcept></span>
+
+ <span style="color:#644a9b;"><Files</span><span style="color:#0057ae;">
~ "\.(cgi|shtml|phtml|php3?)$"</span><span
style="color:#644a9b;">></span>
+ <span style="color:#0095ff;font-weight:bold;">ForceType</span><span
style="color:#bf0303;"> text/plain</span>
+ <span style="color:#644a9b;"></Files></span>
+<span style="color:#644a9b;"></Directory></span>
+
+<span style="color:#0095ff;font-weight:bold;">Alias</span><span
style="color:#bf0303;"> /foo/ "/srv/www/htdocs/foo/"</span>
+
+<span style="color:#0095ff;font-weight:bold;">AuthType</span><span
style="color:#924c9d;"> </span><span style="font-weight:bold;">Basic</span>
+<span style="color:#0095ff;font-weight:bold;">AuthName</span><span
style="color:#bf0303;"> "KDE"</span>
+<span style="color:#0095ff;font-weight:bold;">AuthUserFile</span><span
style="color:#bf0303;"> /srv/www/htpasswd.db</span>
+<span style="color:#0095ff;font-weight:bold;">Require</span><span
style="color:#bf0303;"> user konqui</span>
+
+<span style="color:#644a9b;"><VirtualHost</span><span
style="color:#0057ae;"> _default_:80</span><span
style="color:#644a9b;">></span>
+ <span style="color:#0095ff;font-weight:bold;">ServerName</span><span
style="color:#bf0303;"> www.kde.org</span>
+ <span style="color:#0095ff;font-weight:bold;">ServerAlias</span><span
style="color:#bf0303;"> kde.org</span>
+
+ <span style="color:#0095ff;font-weight:bold;">RewriteEngine</span><span
style="color:#924c9d;"> </span><span style="font-weight:bold;">On</span>
+ <span style="color:#0095ff;font-weight:bold;">RewriteRule</span><span
style="color:#bf0303;"> ^ https://%{SERVER_NAME}%{REQUEST_URI}
[L,QSA,R=permanent]</span>
+<span style="color:#644a9b;"></VirtualHost></span>
+
+<span style="color:#0095ff;font-weight:bold;">AuthBasicProvider</span><span
style="color:#bf0303;"> ldap</span>
+<span style="color:#0095ff;font-weight:bold;">AuthLDAPBindDN</span><span
style="color:#bf0303;"> uid=ldapproxy,ou=people,dc=kde,dc=org</span>
+<span style="color:#0095ff;font-weight:bold;">AuthLDAPBindPassword</span><span
style="color:#bf0303;"> top_secret</span>
+<span style="color:#0095ff;font-weight:bold;">AuthLDAPURL</span><span
style="color:#bf0303;">
ldap://localhost:389/ou=people,dc=kde,dc=org?uid?sub?(objectClass=posixAccount)</span>
+<span
style="color:#0095ff;font-weight:bold;">AuthLDAPGroupAttributeIsDN</span><span
style="color:#924c9d;"> </span><span style="font-weight:bold;">on</span>
+<span
style="color:#0095ff;font-weight:bold;">AuthLDAPGroupAttribute</span><span
style="color:#bf0303;"> member</span>
+<span style="color:#0095ff;font-weight:bold;">Require</span><span
style="color:#bf0303;"> ldap-group cn=sysadmin,ou=Group,dc=kde,dc=org</span>
+</pre></body></html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/syntax-highlighting-5.32.0/autotests/html/clojure.clj.html
new/syntax-highlighting-5.33.0/autotests/html/clojure.clj.html
--- old/syntax-highlighting-5.32.0/autotests/html/clojure.clj.html
1970-01-01 01:00:00.000000000 +0100
+++ new/syntax-highlighting-5.33.0/autotests/html/clojure.clj.html
2017-04-01 21:45:56.000000000 +0200
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html><head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<title>clojure.clj</title>
+<meta name="generator" content="KF5::SyntaxHighlighting (Clojure)"/>
+</head><body style="color:#1f1c1b"><pre>
+<span style="color:#898887;">; Test file, released under MIT License</span>
+<span style="color:#ff0000;">(</span><span style="font-weight:bold;">ns</span>
<span style="color:#0000ff;font-weight:bold;">^{</span><span
style="color:#0057ae;">:doc</span> <span style="color:#607880;">"Syntax
highlighting test file"</span>
+ <span style="color:#0057ae;">:author</span> <span
style="color:#607880;">"Markus Brenneis"</span><span
style="color:#0000ff;font-weight:bold;">}</span>
+ highlighting<span style="color:#ff0000;">)</span>
+
+<span style="color:#ff0000;">(</span><span
style="color:#644a9b;font-weight:bold;">defn</span><span
style="color:#644a9b;"> something-else </span><span
style="color:#3333ff;">[</span>f xs<span style="color:#3333ff;">]</span>
+ <span style="color:#898887;">#_</span><span
style="color:#ff8800;">(</span><span style="font-weight:bold;">map</span> <span
style="color:#888800;">#(</span><span style="font-weight:bold;">apply</span> f
<span style="color:#008800;">(</span><span style="color:#0057ae;">%</span>
<span style="color:#3333ff;">[</span><span style="color:#0057ae;">%</span><span
style="color:#3333ff;">]</span><span style="color:#008800;">)</span><span
style="color:#888800;">)</span> <span style="color:#888800;">(</span><span
style="font-weight:bold;">cons</span> <span style="color:#b08000;">1</span>
xs<span style="color:#888800;">)</span><span style="color:#ff8800;">)</span>
+ <span style="color:#ff8800;">(</span><span
style="font-weight:bold;">map</span> <span
style="color:#888800;">#(</span><span style="font-weight:bold;">apply</span> f
<span style="color:#008800;">(</span><span style="color:#0057ae;">%</span>
xs<span style="color:#008800;">)</span><span style="color:#888800;">)</span>
<span style="color:#888800;">(</span><span
style="font-weight:bold;">cons</span> <span style="color:#b08000;">1</span>
xs<span style="color:#888800;">)</span><span style="color:#ff8800;">)</span>
+ <span style="color:#898887;">#_</span><span
style="color:#3333ff;">[</span><span style="color:#b08000;">1</span> <span
style="color:#ff8800;">'(</span><span style="color:#b08000;">2</span><span
style="color:#ff8800;">)</span><span style="color:#3333ff;">]</span>
+ xs<span style="color:#ff0000;">)</span>
+
+<span style="color:#ff0000;">(</span><span
style="color:#644a9b;font-weight:bold;">def</span><span style="color:#644a9b;">
foo </span><span style="color:#3333ff;">[</span><span
style="color:#924c9d;">\a</span> <span style="color:#924c9d;">\b</span> <span
style="color:#924c9d;">\n</span> <span style="color:#924c9d;">\ucafe</span>
<span style="color:#924c9d;">\o123</span> <span style="color:#924c9d;">\n</span>
+ <span style="color:#924c9d;">\newline</span> <span
style="color:#924c9d;">\tab</span> <span style="color:#924c9d;">\space</span>
<span style="color:#924c9d;">\formfeed</span> <span
style="color:#924c9d;">\backspace</span><span
style="color:#3333ff;">]</span><span style="color:#ff0000;">)</span>
+
+<span style="color:#ff0000;">(</span><span
style="color:#644a9b;font-weight:bold;">def</span><span style="color:#644a9b;">
fizz </span><span style="color:#206620;">{</span><span
style="color:#0000ff;">#{</span><span style="color:#924c9d;">\a</span> <span
style="color:#924c9d;">\b</span><span style="color:#0000ff;">}</span>
+ <span style="color:#0000ff;">#{</span><span
style="color:#924c9d;">\n</span> <span
style="color:#924c9d;">\newline</span><span
style="color:#0000ff;">}</span><span style="color:#206620;">}</span><span
style="color:#ff0000;">)</span>
+
+<span style="color:#ff0000;">(</span><span
style="color:#644a9b;font-weight:bold;">def</span><span style="color:#644a9b;">
fizz' </span><span style="color:#0000ff;">#{</span><span
style="color:#206620;">{</span><span style="color:#924c9d;">\a</span> <span
style="color:#924c9d;">\b</span><span style="color:#206620;">}</span>
+ <span style="color:#206620;">{</span><span
style="color:#924c9d;">\n</span> <span
style="color:#924c9d;">\newline</span><span
style="color:#206620;">}</span><span style="color:#0000ff;">}</span><span
style="color:#ff0000;">)</span>
+
+<span style="color:#ff0000;">(</span><span
style="color:#644a9b;font-weight:bold;">defn</span><span
style="color:#644a9b;"> bar </span><span style="color:#3333ff;">[</span>xs<span
style="color:#3333ff;">]</span>
+ <span style="color:#ff8800;">(</span><span
style="font-weight:bold;">as-></span> xs <>
+ <span style="color:#888800;">(</span><span
style="font-weight:bold;">cons</span> <span style="color:#0057ae;">:a</span>
<><span style="color:#888800;">)</span>
+ <span style="color:#888800;">(</span><span
style="font-weight:bold;">map</span> <span
style="color:#008800;">#(</span><span style="color:#0057ae;">%1</span> <span
style="color:#0057ae;">%2</span><span style="color:#008800;">)</span>
<><span style="color:#888800;">)</span> <span style="color:#898887;">;
</span><span
style="color:#bf0303;background-color:#f7e6e6;font-weight:bold;">TODO</span><span
style="color:#898887;"> improve</span>
+ <span style="color:#888800;">(</span><span
style="font-weight:bold;">into</span> <> <span
style="color:#3333ff;">[</span><span
style="color:#0057ae;">:konjure.logic.specs/numShips</span><span
style="color:#3333ff;">]</span><span style="color:#888800;">)</span><span
style="color:#ff8800;">)</span><span style="color:#ff0000;">)</span>
+
+<span style="color:#ff0000;">(</span><span
style="color:#644a9b;font-weight:bold;">def</span><span style="color:#644a9b;">
x-2-y</span>
+ <span style="color:#898887;">#_</span><span style="color:#bf0303;">"do
</span>\"<span style="color:#bf0303;"> sth"</span>
+ <span style="color:#ff8800;">(</span>domonad set-m
+ <span style="color:#3333ff;">[</span>x <span
style="color:#0000ff;">#{</span><span style="color:#b08000;">1.1</span>, <span
style="color:#ff0000;">(</span><span style="font-weight:bold;">+</span> -2
+4<span style="color:#ff0000;">)</span><span style="color:#0000ff;">}</span>
+ y <span style="color:#0000ff;">#{</span><span
style="color:#b08000;">1.1</span>, <span style="color:#ff0000;">(</span><span
style="font-weight:bold;">-</span> -2.<span style="color:#b08000;">0</span>
<span style="color:#b08000;">4.0</span><span
style="color:#ff0000;">)</span><span style="color:#0000ff;">}</span><span
style="color:#3333ff;">]</span>
+ <span style="color:#888800;">(</span><span
style="font-weight:bold;">*'</span> x y<span
style="color:#888800;">)</span><span style="color:#ff8800;">)</span><span
style="color:#ff0000;">)</span>
+
+<span style="color:#ff0000;">(</span><span
style="color:#644a9b;font-weight:bold;">def</span><span style="color:#644a9b;">
bases</span>
+ <span style="color:#ff8800;">(</span><span
style="font-weight:bold;">and</span> <span style="color:#888800;">(</span><span
style="font-weight:bold;">=</span> -1 -1N<span style="color:#888800;">)</span>
+ <span style="color:#888800;">(</span><span
style="font-weight:bold;">=</span> <span style="color:#b08000;">1/4</span>
-2.<span style="color:#b08000;">5</span>e-1<span style="color:#888800;">)</span>
+ <span style="color:#888800;">(</span><span
style="font-weight:bold;">=</span> -<span style="color:#b08000;">1/2</span>
-0.<span style="color:#b08000;">5</span>M<span style="color:#888800;">)</span>
+ <span style="color:#888800;">(</span><span
style="font-weight:bold;">=</span> -<span style="color:#b08000;">0x1Ab</span>
-<span style="color:#b08000;">0X1ab</span><span style="color:#888800;">)</span>
+ <span style="color:#888800;">(</span><span
style="font-weight:bold;">=</span> +<span
style="color:#b08000;">2r101010</span> <span
style="color:#b08000;">25R1h</span><span style="color:#888800;">)</span>
+ <span style="color:#888800;">(</span><span
style="font-weight:bold;">=</span> <span
style="color:#bf0303;text-decoration:underline;">39r13</span> <span
style="color:#bf0303;text-decoration:underline;">42R10</span><span
style="color:#888800;">)</span><span style="color:#ff8800;">)</span><span
style="color:#ff0000;">)</span> <span style="color:#898887;">; </span><span
style="color:#bf0303;background-color:#f7e6e6;font-weight:bold;">FIXME</span><span
style="color:#898887;"> this one is not correct</span>
+
+<span style="color:#ff0000;">(</span><span
style="color:#644a9b;font-weight:bold;">def</span><span style="color:#644a9b;">
</span><span style="color:#0000ff;font-weight:bold;">^{</span><span
style="color:#0057ae;">:private</span> <span
style="color:#0057ae;">true</span><span
style="color:#0000ff;font-weight:bold;">}</span>
+ <span style="color:#ff8800;">(</span><span
style="font-weight:bold;">=</span> <span style="color:#888800;">(</span><span
style="font-weight:bold;">last</span> <span
style="color:#0000ff;">#{#{}}</span><span style="color:#888800;">)</span> <span
style="color:#0000ff;">#{</span><span style="color:#206620;">{</span><span
style="color:#0000ff;">#{}</span><span style="color:#206620;">}</span><span
style="color:#0000ff;">}</span><span style="color:#ff8800;">)</span><span
style="color:#ff0000;">)</span>
+
+<span style="color:#ff0000;">(</span><span
style="color:#644a9b;font-weight:bold;">def</span><span style="color:#644a9b;">
s </span><span style="color:#bf0303;">"#repl</span>\n<span
style="color:#bf0303;">"</span><span style="color:#ff0000;">)</span>
+<span style="color:#ff0000;">(</span><span
style="color:#644a9b;font-weight:bold;">def</span><span style="color:#644a9b;">
r </span><span style="color:#ff5500;">#"repl"</span><span
style="color:#ff0000;">)</span>
+
+<span style="color:#ff0000;">(</span><span
style="color:#644a9b;font-weight:bold;">defn-</span><span
style="color:#644a9b;"> stuff!</span>
+ <span style="color:#3333ff;">[</span>a<span style="color:#3333ff;">]</span>
+ <span style="color:#bf0303;">"This is no </span>\"<span
style="color:#bf0303;">documentation</span>\"<span
style="color:#bf0303;">!"</span>
+ <span style="color:#ff8800;">(</span><span
style="font-weight:bold;">=</span> <span style="color:#888800;">(</span><span
style="font-weight:bold;">class</span> <span
style="color:#0057ae;">#'+</span><span style="color:#888800;">)</span> <span
style="color:#888800;">(</span><span style="font-weight:bold;">class</span>
<span style="color:#0057ae;">#'foo</span><span
style="color:#888800;">)</span><span style="color:#ff8800;">)</span>
+ <span style="color:#ff8800;">(</span><span
style="font-weight:bold;">let</span> <span style="color:#3333ff;">[</span><span
style="font-weight:bold;">+</span> <span
style="font-weight:bold;">-</span><span style="color:#3333ff;">]</span> <span
style="color:#3333ff;">[</span><span style="color:#888800;">(</span><span
style="font-weight:bold;">+</span> a <span style="color:#b08000;">1</span><span
style="color:#888800;">)</span> <span style="color:#888800;">(</span><span
style="color:#0057ae;">@#'+</span> a <span style="color:#b08000;">1</span><span
style="color:#888800;">)</span><span style="color:#3333ff;">]</span><span
style="color:#ff8800;">)</span><span style="color:#ff0000;">)</span>
+
+<span style="color:#ff0000;">(</span><span
style="color:#644a9b;font-weight:bold;">defn-</span><span
style="color:#644a9b;"> throwIllegalArgumentException!</span>
+ <span style="color:#607880;">"Throws an </span>\"<span
style="color:#607880;">IllegalArgumentException</span>\"<span
style="color:#607880;"> or</span>
+<span style="color:#607880;"> a js/Error."</span>
+ <span style="color:#3333ff;">[</span>message<span
style="color:#3333ff;">]</span>
+ <span style="color:#006e28;">#?</span><span
style="color:#ff8800;">(</span><span style="color:#0057ae;">:clj</span> <span
style="color:#888800;">(</span><span style="font-weight:bold;">throw</span>
<span style="color:#008800;">(</span>IllegalArgumentException. message<span
style="color:#008800;">)</span><span style="color:#888800;">)</span>
+ <span style="color:#0057ae;">:cljs</span> <span
style="color:#888800;">(</span><span style="font-weight:bold;">throw</span>
<span style="color:#008800;">(</span>js/Error. message<span
style="color:#008800;">)</span><span style="color:#888800;">)</span><span
style="color:#ff8800;">)</span><span style="color:#ff0000;">)</span>
+
+<span style="color:#ff0000;">(</span><span
style="color:#644a9b;font-weight:bold;">defmacro</span><span
style="color:#644a9b;"> let-fn </span><span style="color:#607880;">"a
nonsense macro"</span> <span style="color:#3333ff;">[</span>one-binding
& body<span style="color:#3333ff;">]</span>
+ <span style="color:#ff8800;">`(</span><span
style="font-weight:bold;">+</span> <span style="color:#b08000;">1</span> ~<span
style="color:#888800;">(</span><span style="font-weight:bold;">inc'</span>
<span style="color:#b08000;">1</span><span style="color:#888800;">)</span><span
style="color:#ff8800;">)</span>
+ <span style="color:#ff8800;">(</span><span
style="font-weight:bold;">let</span> <span
style="color:#3333ff;">[[</span>identifier & fn-body<span
style="color:#3333ff;">]</span> one-binding<span style="color:#3333ff;">]</span>
+ <span style="color:#888800;">`(</span><span
style="font-weight:bold;">let</span> <span style="color:#3333ff;">[</span><span
style="color:#0057ae;">~identifier</span> <span
style="color:#008800;">(</span><span style="font-weight:bold;">fn</span> <span
style="color:#0057ae;">~identifier</span> <span
style="color:#0057ae;">~@fn-body</span><span
style="color:#008800;">)</span><span style="color:#3333ff;">]</span>
+ <span style="color:#0057ae;">~@body</span> <span
style="color:#0057ae;">`a#</span><span style="color:#888800;">)</span><span
style="color:#ff8800;">)</span><span style="color:#ff0000;">)</span>
+
+<span style="color:#ff0000;">(</span><span
style="color:#644a9b;font-weight:bold;">def</span><span style="color:#644a9b;">
state </span><span style="color:#ff8800;">(</span><span
style="font-weight:bold;">atom</span> <span
style="color:#3333ff;">[</span><span style="color:#888800;">(</span><span
style="font-weight:bold;">=</span> <span style="color:#0057ae;">false</span>
<span style="color:#0057ae;">true</span><span style="color:#888800;">)</span>
<span style="color:#0057ae;">nil</span><span
style="color:#3333ff;">]</span><span style="color:#ff8800;">)</span><span
style="color:#ff0000;">)</span>
+
+<span style="color:#ff0000;">(</span><span
style="color:#644a9b;font-weight:bold;">defn</span><span
style="color:#644a9b;"> something-cool </span><span
style="color:#3333ff;">[]</span> <span style="color:#ff8800;">(</span><span
style="font-weight:bold;">first</span> <span
style="color:#0057ae;">@state</span><span style="color:#ff8800;">)</span><span
style="color:#ff0000;">)</span>
+
+<span style="color:#ff0000;">(</span><span
style="color:#644a9b;font-weight:bold;">defn-</span><span
style="color:#644a9b;"> something-different </span><span
style="color:#3333ff;">[]</span> <span style="color:#ff8800;">(</span><span
style="font-weight:bold;">first</span> <span
style="color:#888800;">(</span><span style="font-weight:bold;">into</span>
<span style="color:#0057ae;">@state</span> <span
style="color:#3333ff;">[</span><span style="color:#b08000;">12</span><span
style="color:#3333ff;">]</span><span style="color:#888800;">)</span><span
style="color:#ff8800;">)</span><span style="color:#ff0000;">)</span>
+</pre></body></html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/syntax-highlighting-5.32.0/autotests/input/apache.conf
new/syntax-highlighting-5.33.0/autotests/input/apache.conf
--- old/syntax-highlighting-5.32.0/autotests/input/apache.conf 1970-01-01
01:00:00.000000000 +0100
+++ new/syntax-highlighting-5.33.0/autotests/input/apache.conf 2017-04-01
21:45:56.000000000 +0200
@@ -0,0 +1,67 @@
+# Apache configuration highlighting unit test
+# comment with alters TODO FIXME ###
+
+<IfModule mod_dav_fs.c>
+ DAVLockDB /var/lock/apache/DAVLock
+</IfModule>
+
+<VirtualHost *:443>
+ Include something_else.inc
+
+ SSLEngine on
+ # exclude insecure protocols
+ SSLProtocol all -SSLv2 -SSLv3
+ SSLHonorCipherOrder on
+ # exclude insecure ciphers
+ SSLCipherSuite "HIGH !EXP !eNULL !aNULL !LOW !RC4 !3DES !MD5 !EXP !PSK
!SRP !DSS !DES !aECDH"
+
+ SSLCertificateFile /etc/letsencrypt/live/cert.pem
+ SSLCertificateKeyFile /etc/letsencrypt/live/privkey.pem
+ SSLCertificateChainFile /etc/letsencrypt/live/chain.pem
+ CustomLog /var/log/apache2/ssl_request_log ssl_combined
+</VirtualHost>
+
+<Proxy "http://localhost:10000/";>
+ SSLRequireSSL
+</Proxy>
+
+<Directory "/some/quoted/path">
+ Options -Indexes -FollowSymLinks
+ DirectoryIndex index.php
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+
+ Options FollowSymLinks
+ AllowOverride FileInfo Options All
+ <LimitExcept GET>
+ Require valid-user
+ </LimitExcept>
+
+ <Files ~ "\.(cgi|shtml|phtml|php3?)$">
+ ForceType text/plain
+ </Files>
+</Directory>
+
+Alias /foo/ "/srv/www/htdocs/foo/"
+
+AuthType Basic
+AuthName "KDE"
+AuthUserFile /srv/www/htpasswd.db
+Require user konqui
+
+<VirtualHost _default_:80>
+ ServerName www.kde.org
+ ServerAlias kde.org
+
+ RewriteEngine On
+ RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [L,QSA,R=permanent]
+</VirtualHost>
+
+AuthBasicProvider ldap
+AuthLDAPBindDN uid=ldapproxy,ou=people,dc=kde,dc=org
+AuthLDAPBindPassword top_secret
+AuthLDAPURL
ldap://localhost:389/ou=people,dc=kde,dc=org?uid?sub?(objectClass=posixAccount)
+AuthLDAPGroupAttributeIsDN on
+AuthLDAPGroupAttribute member
+Require ldap-group cn=sysadmin,ou=Group,dc=kde,dc=org
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/syntax-highlighting-5.32.0/autotests/input/apache.conf.syntax
new/syntax-highlighting-5.33.0/autotests/input/apache.conf.syntax
--- old/syntax-highlighting-5.32.0/autotests/input/apache.conf.syntax
1970-01-01 01:00:00.000000000 +0100
+++ new/syntax-highlighting-5.33.0/autotests/input/apache.conf.syntax
2017-04-01 21:45:56.000000000 +0200
@@ -0,0 +1 @@
+Apache Configuration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/syntax-highlighting-5.32.0/autotests/input/clojure.clj
new/syntax-highlighting-5.33.0/autotests/input/clojure.clj
--- old/syntax-highlighting-5.32.0/autotests/input/clojure.clj 1970-01-01
01:00:00.000000000 +0100
+++ new/syntax-highlighting-5.33.0/autotests/input/clojure.clj 2017-04-01
21:45:56.000000000 +0200
@@ -0,0 +1,71 @@
+; Test file, released under MIT License
+(ns ^{:doc "Syntax highlighting test file"
+ :author "Markus Brenneis"}
+ highlighting)
+
+(defn something-else [f xs]
+ #_(map #(apply f (% [%])) (cons 1 xs))
+ (map #(apply f (% xs)) (cons 1 xs))
+ #_[1 '(2)]
+ xs)
+
+(def foo [\a \b \n \ucafe \o123 \n
+ \newline \tab \space \formfeed \backspace])
+
+(def fizz {#{\a \b}
+ #{\n \newline}})
+
+(def fizz' #{{\a \b}
+ {\n \newline}})
+
+(defn bar [xs]
+ (as-> xs <>
+ (cons :a <>)
+ (map #(%1 %2) <>) ; TODO improve
+ (into <> [:konjure.logic.specs/numShips])))
+
+(def x-2-y
+ #_"do \" sth"
+ (domonad set-m
+ [x #{1.1, (+ -2 +4)}
+ y #{1.1, (- -2.0 4.0)}]
+ (*' x y)))
+
+(def bases
+ (and (= -1 -1N)
+ (= 1/4 -2.5e-1)
+ (= -1/2 -0.5M)
+ (= -0x1Ab -0X1ab)
+ (= +2r101010 25R1h)
+ (= 39r13 42R10))) ; FIXME this one is not correct
+
+(def ^{:private true}
+ (= (last #{#{}}) #{{#{}}}))
+
+(def s "#repl\n")
+(def r #"repl")
+
+(defn- stuff!
+ [a]
+ "This is no \"documentation\"!"
+ (= (class #'+) (class #'foo))
+ (let [+ -] [(+ a 1) (@#'+ a 1)]))
+
+(defn- throwIllegalArgumentException!
+ "Throws an \"IllegalArgumentException\" or
+ a js/Error."
+ [message]
+ #?(:clj (throw (IllegalArgumentException. message))
+ :cljs (throw (js/Error. message))))
+
+(defmacro let-fn "a nonsense macro" [one-binding & body]
+ `(+ 1 ~(inc' 1))
+ (let [[identifier & fn-body] one-binding]
+ `(let [~identifier (fn ~identifier ~@fn-body)]
+ ~@body `a#)))
+
+(def state (atom [(= false true) nil]))
+
+(defn something-cool [] (first @state))
+
+(defn- something-different [] (first (into @state [12])))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/syntax-highlighting-5.32.0/autotests/reference/apache.conf.ref
new/syntax-highlighting-5.33.0/autotests/reference/apache.conf.ref
--- old/syntax-highlighting-5.32.0/autotests/reference/apache.conf.ref
1970-01-01 01:00:00.000000000 +0100
+++ new/syntax-highlighting-5.33.0/autotests/reference/apache.conf.ref
2017-04-01 21:45:56.000000000 +0200
@@ -0,0 +1,67 @@
+<Comment># Apache configuration highlighting unit test</Comment><br/>
+<Comment># comment with alters </Comment><Alert Level 2>TODO</Alert Level
2><Comment> </Comment><Alert Level 2>FIXME</Alert Level 2><Comment>
</Comment><Alert Level 3>###</Alert Level 3><br/>
+<dsNormal></dsNormal><br/>
+<Container><IfModule</Container><Attribute>
mod_dav_fs.c</Attribute><Container>></Container><br/>
+<Normal Text> </Normal Text><Directives>DAVLockDB</Directives><String>
/var/lock/apache/DAVLock</String><br/>
+<Container></IfModule></Container><br/>
+<dsNormal></dsNormal><br/>
+<Container><VirtualHost</Container><Attribute>
*:443</Attribute><Container>></Container><br/>
+<Normal Text> </Normal Text><Directives>Include</Directives><String>
something_else.inc</String><br/>
+<dsNormal></dsNormal><br/>
+<Normal Text> </Normal Text><Directives>SSLEngine</Directives><Other>
</Other><Alternates>on</Alternates><br/>
+<Normal Text> </Normal Text><Comment># exclude insecure
protocols</Comment><br/>
+<Normal Text> </Normal Text><Directives>SSLProtocol</Directives><Other>
</Other><Alternates>all</Alternates><Other>
</Other><Alternates>-SSLv2</Alternates><Other>
</Other><Alternates>-SSLv3</Alternates><br/>
+<Normal Text> </Normal
Text><Directives>SSLHonorCipherOrder</Directives><Other>
</Other><Alternates>on</Alternates><br/>
+<Normal Text> </Normal Text><Comment># exclude insecure
ciphers</Comment><br/>
+<Normal Text> </Normal Text><Directives>SSLCipherSuite</Directives><String>
"HIGH !EXP !eNULL !aNULL !LOW !RC4 !3DES !MD5 !EXP !PSK !SRP !DSS !DES
!aECDH"</String><br/>
+<dsNormal></dsNormal><br/>
+<Normal Text> </Normal
Text><Directives>SSLCertificateFile</Directives><String>
/etc/letsencrypt/live/cert.pem</String><br/>
+<Normal Text> </Normal
Text><Directives>SSLCertificateKeyFile</Directives><String>
/etc/letsencrypt/live/privkey.pem</String><br/>
+<Normal Text> </Normal
Text><Directives>SSLCertificateChainFile</Directives><String>
/etc/letsencrypt/live/chain.pem</String><br/>
+<Normal Text> </Normal Text><Directives>CustomLog</Directives><String>
/var/log/apache2/ssl_request_log ssl_combined</String><br/>
+<Container></VirtualHost></Container><br/>
+<dsNormal></dsNormal><br/>
+<Container><Proxy</Container><Attribute>
"http://localhost:10000/";</Attribute><Container>></Container><br/>
+<Normal Text> </Normal Text><Directives>SSLRequireSSL</Directives><br/>
+<Container></Proxy></Container><br/>
+<dsNormal></dsNormal><br/>
+<Container><Directory</Container><Attribute>
"/some/quoted/path"</Attribute><Container>></Container><br/>
+<Normal Text> </Normal Text><Directives>Options</Directives><Other>
</Other><Alternates>-Indexes</Alternates><Other>
</Other><Alternates>-FollowSymLinks</Alternates><br/>
+<Normal Text> </Normal Text><Directives>DirectoryIndex</Directives><String>
index.php</String><br/>
+<Normal Text> </Normal Text><Directives>AllowOverride</Directives><Other>
</Other><Alternates>None</Alternates><br/>
+<Normal Text> </Normal Text><Directives>Order</Directives><Other>
</Other><Alternates>allow,deny</Alternates><br/>
+<Normal Text> </Normal Text><Directives>Allow</Directives><String> from
all</String><br/>
+<dsNormal></dsNormal><br/>
+<Normal Text> </Normal Text><Directives>Options</Directives><Other>
</Other><Alternates>FollowSymLinks</Alternates><br/>
+<Normal Text> </Normal Text><Directives>AllowOverride</Directives><Other>
</Other><Alternates>FileInfo</Alternates><Other>
</Other><Alternates>Options</Alternates><Other>
</Other><Alternates>All</Alternates><br/>
+<Normal Text> </Normal Text><Container><LimitExcept</Container><Attribute>
GET</Attribute><Container>></Container><br/>
+<Normal Text> </Normal Text><Directives>Require</Directives><String>
valid-user</String><br/>
+<Normal Text> </Normal Text><Container></LimitExcept></Container><br/>
+<dsNormal></dsNormal><br/>
+<Normal Text> </Normal Text><Container><Files</Container><Attribute> ~
"\.(cgi|shtml|phtml|php3?)$"</Attribute><Container>></Container><br/>
+<Normal Text> </Normal Text><Directives>ForceType</Directives><String>
text/plain</String><br/>
+<Normal Text> </Normal Text><Container></Files></Container><br/>
+<Container></Directory></Container><br/>
+<dsNormal></dsNormal><br/>
+<Directives>Alias</Directives><String> /foo/
"/srv/www/htdocs/foo/"</String><br/>
+<dsNormal></dsNormal><br/>
+<Directives>AuthType</Directives><Other>
</Other><Alternates>Basic</Alternates><br/>
+<Directives>AuthName</Directives><String> "KDE"</String><br/>
+<Directives>AuthUserFile</Directives><String>
/srv/www/htpasswd.db</String><br/>
+<Directives>Require</Directives><String> user konqui</String><br/>
+<dsNormal></dsNormal><br/>
+<Container><VirtualHost</Container><Attribute>
_default_:80</Attribute><Container>></Container><br/>
+<Normal Text> </Normal Text><Directives>ServerName</Directives><String>
www.kde.org</String><br/>
+<Normal Text> </Normal Text><Directives>ServerAlias</Directives><String>
kde.org</String><br/>
+<dsNormal></dsNormal><br/>
+<Normal Text> </Normal Text><Directives>RewriteEngine</Directives><Other>
</Other><Alternates>On</Alternates><br/>
+<Normal Text> </Normal Text><Directives>RewriteRule</Directives><String> ^
https://%{SERVER_NAME}%{REQUEST_URI} [L,QSA,R=permanent]</String><br/>
+<Container></VirtualHost></Container><br/>
+<dsNormal></dsNormal><br/>
+<Directives>AuthBasicProvider</Directives><String> ldap</String><br/>
+<Directives>AuthLDAPBindDN</Directives><String>
uid=ldapproxy,ou=people,dc=kde,dc=org</String><br/>
+<Directives>AuthLDAPBindPassword</Directives><String> top_secret</String><br/>
+<Directives>AuthLDAPURL</Directives><String>
ldap://localhost:389/ou=people,dc=kde,dc=org?uid?sub?(objectClass=posixAccount)</String><br/>
+<Directives>AuthLDAPGroupAttributeIsDN</Directives><Other>
</Other><Alternates>on</Alternates><br/>
+<Directives>AuthLDAPGroupAttribute</Directives><String> member</String><br/>
+<Directives>Require</Directives><String> ldap-group
cn=sysadmin,ou=Group,dc=kde,dc=org</String><br/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/syntax-highlighting-5.32.0/autotests/reference/clojure.clj.ref
new/syntax-highlighting-5.33.0/autotests/reference/clojure.clj.ref
--- old/syntax-highlighting-5.32.0/autotests/reference/clojure.clj.ref
1970-01-01 01:00:00.000000000 +0100
+++ new/syntax-highlighting-5.33.0/autotests/reference/clojure.clj.ref
2017-04-01 21:45:56.000000000 +0200
@@ -0,0 +1,71 @@
+<Comment>; Test file, released under MIT License</Comment><br/>
+<Brackets1>(</Brackets1><Keyword>ns</Keyword><Normal>
</Normal><BracketsMeta>^{</BracketsMeta><Modifier2>:doc</Modifier2><Normal>
</Normal><Documentation>"Syntax highlighting test file"</Documentation><br/>
+<Normal> </Normal><Modifier2>:author</Modifier2><Normal>
</Normal><Documentation>"Markus
Brenneis"</Documentation><BracketsMeta>}</BracketsMeta><br/>
+<Normal> highlighting</Normal><Brackets1>)</Brackets1><br/>
+<dsNormal></dsNormal><br/>
+<Brackets1>(</Brackets1><Definition>defn</Definition><Function> something-else
</Function><BracketsSquare>[</BracketsSquare><Normal>f
xs</Normal><BracketsSquare>]</BracketsSquare><br/>
+<Normal>
</Normal><Comment>#_</Comment><Brackets2>(</Brackets2><Keyword>map</Keyword><Normal>
</Normal><Brackets3>#(</Brackets3><Keyword>apply</Keyword><Normal> f
</Normal><Brackets4>(</Brackets4><Variable>%</Variable><Normal>
</Normal><BracketsSquare>[</BracketsSquare><Variable>%</Variable><BracketsSquare>]</BracketsSquare><Brackets4>)</Brackets4><Brackets3>)</Brackets3><Normal>
</Normal><Brackets3>(</Brackets3><Keyword>cons</Keyword><Normal>
</Normal><Decimal>1</Decimal><Normal>
xs</Normal><Brackets3>)</Brackets3><Brackets2>)</Brackets2><br/>
+<Normal> </Normal><Brackets2>(</Brackets2><Keyword>map</Keyword><Normal>
</Normal><Brackets3>#(</Brackets3><Keyword>apply</Keyword><Normal> f
</Normal><Brackets4>(</Brackets4><Variable>%</Variable><Normal>
xs</Normal><Brackets4>)</Brackets4><Brackets3>)</Brackets3><Normal>
</Normal><Brackets3>(</Brackets3><Keyword>cons</Keyword><Normal>
</Normal><Decimal>1</Decimal><Normal>
xs</Normal><Brackets3>)</Brackets3><Brackets2>)</Brackets2><br/>
+<Normal>
</Normal><Comment>#_</Comment><BracketsSquare>[</BracketsSquare><Decimal>1</Decimal><Normal>
</Normal><Brackets2>'(</Brackets2><Decimal>2</Decimal><Brackets2>)</Brackets2><BracketsSquare>]</BracketsSquare><br/>
+<Normal> xs</Normal><Brackets1>)</Brackets1><br/>
+<dsNormal></dsNormal><br/>
+<Brackets1>(</Brackets1><Definition>def</Definition><Function> foo
</Function><BracketsSquare>[</BracketsSquare><Char>\a</Char><Normal>
</Normal><Char>\b</Char><Normal> </Normal><Char>\n</Char><Normal>
</Normal><Char>\ucafe</Char><Normal> </Normal><Char>\o123</Char><Normal>
</Normal><Char>\n</Char><br/>
+<Normal> </Normal><Char>\newline</Char><Normal>
</Normal><Char>\tab</Char><Normal> </Normal><Char>\space</Char><Normal>
</Normal><Char>\formfeed</Char><Normal>
</Normal><Char>\backspace</Char><BracketsSquare>]</BracketsSquare><Brackets1>)</Brackets1><br/>
+<dsNormal></dsNormal><br/>
+<Brackets1>(</Brackets1><Definition>def</Definition><Function> fizz
</Function><BracketsMap>{</BracketsMap><BracketsSet>#{</BracketsSet><Char>\a</Char><Normal>
</Normal><Char>\b</Char><BracketsSet>}</BracketsSet><br/>
+<Normal>
</Normal><BracketsSet>#{</BracketsSet><Char>\n</Char><Normal>
</Normal><Char>\newline</Char><BracketsSet>}</BracketsSet><BracketsMap>}</BracketsMap><Brackets1>)</Brackets1><br/>
+<dsNormal></dsNormal><br/>
+<Brackets1>(</Brackets1><Definition>def</Definition><Function> fizz'
</Function><BracketsSet>#{</BracketsSet><BracketsMap>{</BracketsMap><Char>\a</Char><Normal>
</Normal><Char>\b</Char><BracketsMap>}</BracketsMap><br/>
+<Normal>
</Normal><BracketsMap>{</BracketsMap><Char>\n</Char><Normal>
</Normal><Char>\newline</Char><BracketsMap>}</BracketsMap><BracketsSet>}</BracketsSet><Brackets1>)</Brackets1><br/>
+<dsNormal></dsNormal><br/>
+<Brackets1>(</Brackets1><Definition>defn</Definition><Function> bar
</Function><BracketsSquare>[</BracketsSquare><Normal>xs</Normal><BracketsSquare>]</BracketsSquare><br/>
+<Normal> </Normal><Brackets2>(</Brackets2><Keyword>as-></Keyword><Normal> xs
<></Normal><br/>
+<Normal>
</Normal><Brackets3>(</Brackets3><Keyword>cons</Keyword><Normal>
</Normal><Modifier2>:a</Modifier2><Normal>
<></Normal><Brackets3>)</Brackets3><br/>
+<Normal>
</Normal><Brackets3>(</Brackets3><Keyword>map</Keyword><Normal>
</Normal><Brackets4>#(</Brackets4><Variable>%1</Variable><Normal>
</Normal><Variable>%2</Variable><Brackets4>)</Brackets4><Normal>
<></Normal><Brackets3>)</Brackets3><Normal> </Normal><Comment>;
</Comment><Alert>TODO</Alert><Comment> improve</Comment><br/>
+<Normal>
</Normal><Brackets3>(</Brackets3><Keyword>into</Keyword><Normal> <>
</Normal><BracketsSquare>[</BracketsSquare><Modifier2>:konjure.logic.specs/numShips</Modifier2><BracketsSquare>]</BracketsSquare><Brackets3>)</Brackets3><Brackets2>)</Brackets2><Brackets1>)</Brackets1><br/>
+<dsNormal></dsNormal><br/>
+<Brackets1>(</Brackets1><Definition>def</Definition><Function>
x-2-y</Function><br/>
+<Normal> </Normal><Comment>#_</Comment><String>"do
</String><dsNormal>\"</dsNormal><String> sth"</String><br/>
+<Normal> </Normal><Brackets2>(</Brackets2><Normal>domonad set-m</Normal><br/>
+<Normal> </Normal><BracketsSquare>[</BracketsSquare><Normal>x
</Normal><BracketsSet>#{</BracketsSet><Float>1.1</Float><Normal>,
</Normal><Brackets1>(</Brackets1><Keyword>+</Keyword><Normal> -2
+4</Normal><Brackets1>)</Brackets1><BracketsSet>}</BracketsSet><br/>
+<Normal> y
</Normal><BracketsSet>#{</BracketsSet><Float>1.1</Float><Normal>,
</Normal><Brackets1>(</Brackets1><Keyword>-</Keyword><Normal>
-2.</Normal><Decimal>0</Decimal><Normal>
</Normal><Float>4.0</Float><Brackets1>)</Brackets1><BracketsSet>}</BracketsSet><BracketsSquare>]</BracketsSquare><br/>
+<Normal> </Normal><Brackets3>(</Brackets3><Keyword>*'</Keyword><Normal> x
y</Normal><Brackets3>)</Brackets3><Brackets2>)</Brackets2><Brackets1>)</Brackets1><br/>
+<dsNormal></dsNormal><br/>
+<Brackets1>(</Brackets1><Definition>def</Definition><Function>
bases</Function><br/>
+<Normal> </Normal><Brackets2>(</Brackets2><Keyword>and</Keyword><Normal>
</Normal><Brackets3>(</Brackets3><Keyword>=</Keyword><Normal> -1
-1N</Normal><Brackets3>)</Brackets3><br/>
+<Normal> </Normal><Brackets3>(</Brackets3><Keyword>=</Keyword><Normal>
</Normal><Float>1/4</Float><Normal>
-2.</Normal><Decimal>5</Decimal><Normal>e-1</Normal><Brackets3>)</Brackets3><br/>
+<Normal> </Normal><Brackets3>(</Brackets3><Keyword>=</Keyword><Normal>
-</Normal><Float>1/2</Float><Normal>
-0.</Normal><Decimal>5</Decimal><Normal>M</Normal><Brackets3>)</Brackets3><br/>
+<Normal> </Normal><Brackets3>(</Brackets3><Keyword>=</Keyword><Normal>
-</Normal><BaseN>0x1Ab</BaseN><Normal>
-</Normal><BaseN>0X1ab</BaseN><Brackets3>)</Brackets3><br/>
+<Normal> </Normal><Brackets3>(</Brackets3><Keyword>=</Keyword><Normal>
+</Normal><BaseN>2r101010</BaseN><Normal>
</Normal><BaseN>25R1h</BaseN><Brackets3>)</Brackets3><br/>
+<Normal> </Normal><Brackets3>(</Brackets3><Keyword>=</Keyword><Normal>
</Normal><Error>39r13</Error><Normal>
</Normal><Error>42R10</Error><Brackets3>)</Brackets3><Brackets2>)</Brackets2><Brackets1>)</Brackets1><Normal>
</Normal><Comment>; </Comment><Alert>FIXME</Alert><Comment> this one is not
correct</Comment><br/>
+<dsNormal></dsNormal><br/>
+<Brackets1>(</Brackets1><Definition>def</Definition><Function>
</Function><BracketsMeta>^{</BracketsMeta><Modifier2>:private</Modifier2><Normal>
</Normal><Variable>true</Variable><BracketsMeta>}</BracketsMeta><br/>
+<Normal> </Normal><Brackets2>(</Brackets2><Keyword>=</Keyword><Normal>
</Normal><Brackets3>(</Brackets3><Keyword>last</Keyword><Normal>
</Normal><BracketsSet>#{#{}}</BracketsSet><Brackets3>)</Brackets3><Normal>
</Normal><BracketsSet>#{</BracketsSet><BracketsMap>{</BracketsMap><BracketsSet>#{}</BracketsSet><BracketsMap>}</BracketsMap><BracketsSet>}</BracketsSet><Brackets2>)</Brackets2><Brackets1>)</Brackets1><br/>
+<dsNormal></dsNormal><br/>
+<Brackets1>(</Brackets1><Definition>def</Definition><Function> s
</Function><String>"#repl</String><dsNormal>\n</dsNormal><String>"</String><Brackets1>)</Brackets1><br/>
+<Brackets1>(</Brackets1><Definition>def</Definition><Function> r
</Function><Regexpr>#"repl"</Regexpr><Brackets1>)</Brackets1><br/>
+<dsNormal></dsNormal><br/>
+<Brackets1>(</Brackets1><Definition>defn-</Definition><Function>
stuff!</Function><br/>
+<dsNormal>
</dsNormal><BracketsSquare>[</BracketsSquare><Normal>a</Normal><BracketsSquare>]</BracketsSquare><br/>
+<Normal> </Normal><String>"This is no
</String><dsNormal>\"</dsNormal><String>documentation</String><dsNormal>\"</dsNormal><String>!"</String><br/>
+<Normal> </Normal><Brackets2>(</Brackets2><Keyword>=</Keyword><Normal>
</Normal><Brackets3>(</Brackets3><Keyword>class</Keyword><Normal>
</Normal><Variable>#'+</Variable><Brackets3>)</Brackets3><Normal>
</Normal><Brackets3>(</Brackets3><Keyword>class</Keyword><Normal>
</Normal><Variable>#'foo</Variable><Brackets3>)</Brackets3><Brackets2>)</Brackets2><br/>
+<Normal> </Normal><Brackets2>(</Brackets2><Keyword>let</Keyword><Normal>
</Normal><BracketsSquare>[</BracketsSquare><Keyword>+</Keyword><Normal>
</Normal><Keyword>-</Keyword><BracketsSquare>]</BracketsSquare><Normal>
</Normal><BracketsSquare>[</BracketsSquare><Brackets3>(</Brackets3><Keyword>+</Keyword><Normal>
a </Normal><Decimal>1</Decimal><Brackets3>)</Brackets3><Normal>
</Normal><Brackets3>(</Brackets3><Modifier>@#'+</Modifier><Normal> a
</Normal><Decimal>1</Decimal><Brackets3>)</Brackets3><BracketsSquare>]</BracketsSquare><Brackets2>)</Brackets2><Brackets1>)</Brackets1><br/>
+<dsNormal></dsNormal><br/>
+<Brackets1>(</Brackets1><Definition>defn-</Definition><Function>
throwIllegalArgumentException!</Function><br/>
+<dsNormal> </dsNormal><Documentation>"Throws an
</Documentation><dsNormal>\"</dsNormal><Documentation>IllegalArgumentException</Documentation><dsNormal>\"</dsNormal><Documentation>
or</Documentation><br/>
+<Documentation> a js/Error."</Documentation><br/>
+<Normal>
</Normal><BracketsSquare>[</BracketsSquare><Normal>message</Normal><BracketsSquare>]</BracketsSquare><br/>
+<Normal>
</Normal><Readermacro>#?</Readermacro><Brackets2>(</Brackets2><Modifier2>:clj</Modifier2><Normal>
</Normal><Brackets3>(</Brackets3><Keyword>throw</Keyword><Normal>
</Normal><Brackets4>(</Brackets4><Normal>IllegalArgumentException.
message</Normal><Brackets4>)</Brackets4><Brackets3>)</Brackets3><br/>
+<Normal> </Normal><Modifier2>:cljs</Modifier2><Normal>
</Normal><Brackets3>(</Brackets3><Keyword>throw</Keyword><Normal>
</Normal><Brackets4>(</Brackets4><Normal>js/Error.
message</Normal><Brackets4>)</Brackets4><Brackets3>)</Brackets3><Brackets2>)</Brackets2><Brackets1>)</Brackets1><br/>
+<dsNormal></dsNormal><br/>
+<Brackets1>(</Brackets1><Definition>defmacro</Definition><Function> let-fn
</Function><Documentation>"a nonsense macro"</Documentation><Normal>
</Normal><BracketsSquare>[</BracketsSquare><Normal>one-binding &
body</Normal><BracketsSquare>]</BracketsSquare><br/>
+<Normal> </Normal><Brackets2>`(</Brackets2><Keyword>+</Keyword><Normal>
</Normal><Decimal>1</Decimal><Normal>
~</Normal><Brackets3>(</Brackets3><Keyword>inc'</Keyword><Normal>
</Normal><Decimal>1</Decimal><Brackets3>)</Brackets3><Brackets2>)</Brackets2><br/>
+<Normal> </Normal><Brackets2>(</Brackets2><Keyword>let</Keyword><Normal>
</Normal><BracketsSquare>[[</BracketsSquare><Normal>identifier &
fn-body</Normal><BracketsSquare>]</BracketsSquare><Normal>
one-binding</Normal><BracketsSquare>]</BracketsSquare><br/>
+<Normal> </Normal><Brackets3>`(</Brackets3><Keyword>let</Keyword><Normal>
</Normal><BracketsSquare>[</BracketsSquare><Modifier>~identifier</Modifier><Normal>
</Normal><Brackets4>(</Brackets4><Keyword>fn</Keyword><Normal>
</Normal><Modifier>~identifier</Modifier><Normal>
</Normal><Modifier>~@fn-body</Modifier><Brackets4>)</Brackets4><BracketsSquare>]</BracketsSquare><br/>
+<Normal> </Normal><Modifier>~@body</Modifier><Normal>
</Normal><Modifier>`a#</Modifier><Brackets3>)</Brackets3><Brackets2>)</Brackets2><Brackets1>)</Brackets1><br/>
+<dsNormal></dsNormal><br/>
+<Brackets1>(</Brackets1><Definition>def</Definition><Function> state
</Function><Brackets2>(</Brackets2><Keyword>atom</Keyword><Normal>
</Normal><BracketsSquare>[</BracketsSquare><Brackets3>(</Brackets3><Keyword>=</Keyword><Normal>
</Normal><Variable>false</Variable><Normal>
</Normal><Variable>true</Variable><Brackets3>)</Brackets3><Normal>
</Normal><Variable>nil</Variable><BracketsSquare>]</BracketsSquare><Brackets2>)</Brackets2><Brackets1>)</Brackets1><br/>
+<dsNormal></dsNormal><br/>
+<Brackets1>(</Brackets1><Definition>defn</Definition><Function> something-cool
</Function><BracketsSquare>[]</BracketsSquare><Normal>
</Normal><Brackets2>(</Brackets2><Keyword>first</Keyword><Normal>
</Normal><Modifier>@state</Modifier><Brackets2>)</Brackets2><Brackets1>)</Brackets1><br/>
+<dsNormal></dsNormal><br/>
+<Brackets1>(</Brackets1><Definition>defn-</Definition><Function>
something-different </Function><BracketsSquare>[]</BracketsSquare><Normal>
</Normal><Brackets2>(</Brackets2><Keyword>first</Keyword><Normal>
</Normal><Brackets3>(</Brackets3><Keyword>into</Keyword><Normal>
</Normal><Modifier>@state</Modifier><Normal>
</Normal><BracketsSquare>[</BracketsSquare><Decimal>12</Decimal><BracketsSquare>]</BracketsSquare><Brackets3>)</Brackets3><Brackets2>)</Brackets2><Brackets1>)</Brackets1><br/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/syntax-highlighting-5.32.0/data/syntax/apache.xml
new/syntax-highlighting-5.33.0/data/syntax/apache.xml
--- old/syntax-highlighting-5.32.0/data/syntax/apache.xml 2017-03-04
17:24:44.000000000 +0100
+++ new/syntax-highlighting-5.33.0/data/syntax/apache.xml 2017-04-01
21:45:56.000000000 +0200
@@ -13,7 +13,7 @@
-->
<language name="Apache Configuration" section="Configuration"
- version="2" kateversion="5.0"
+ version="3" kateversion="5.0"
extensions="httpd.conf;httpd2.conf;apache.conf;apache2.conf;.htaccess*;.htpasswd*"
mimetype=""
author="Jan Janssen ([email protected])" license="LGPL">
@@ -401,6 +401,7 @@
<item>ServerSignature</item>
<item>ServerTokens</item>
<item>SSLEngine</item>
+<item>SSLHonorCipherOrder</item>
<item>SSLMutex</item>
<item>SSLOptions</item>
<item>SSLProtocol</item>
@@ -609,14 +610,14 @@
<itemDatas>
<itemData name="Normal Text" defStyleNum="dsNormal" />
<itemData name="Comment" defStyleNum="dsComment" />
- <itemData name="Directives" defStyleNum="dsExtension" bold="true" />
+ <itemData name="Directives" defStyleNum="dsExtension" bold="true"
spellChecking="false"/>
<itemData name="String" defStyleNum="dsString" />
<itemData name="Float" defStyleNum="dsFloat" />
<itemData name="Int" defStyleNum="dsFloat" />
- <itemData name="Alternates" defStyleNum="dsKeyword" />
+ <itemData name="Alternates" defStyleNum="dsKeyword" spellChecking="false"/>
<itemData name="Alert" defStyleNum="dsError" />
- <itemData name="Container" defStyleNum="dsFunction" />
- <itemData name="Attribute" defStyleNum="dsAttribute" />
+ <itemData name="Container" defStyleNum="dsFunction" spellChecking="false"/>
+ <itemData name="Attribute" defStyleNum="dsAttribute" spellChecking="false"/>
<itemData name="Other" defStyleNum="dsChar" />
</itemDatas>
</highlighting>
@@ -630,5 +631,3 @@
</general>
</language>
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/syntax-highlighting-5.32.0/data/syntax/clojure.xml
new/syntax-highlighting-5.33.0/data/syntax/clojure.xml
--- old/syntax-highlighting-5.32.0/data/syntax/clojure.xml 2017-03-04
17:24:44.000000000 +0100
+++ new/syntax-highlighting-5.33.0/data/syntax/clojure.xml 2017-04-01
21:45:56.000000000 +0200
@@ -22,7 +22,7 @@
* Boston, MA 02110-1301, USA. *
**********************************************************************
-->
-<language version="5" kateversion="5.0" name="Clojure" section="Sources"
extensions="*.clj;*.cljs" mimetype="" author="Dominik Haumann [lisp] modified
for clojure by Caspar Hasenclever" license="LGPLv2+">
+<language version="6" kateversion="5.0" name="Clojure" section="Sources"
extensions="*.clj;*.cljs;*.cljc" mimetype="" author="Dominik Haumann [lisp]
modified for clojure by Caspar Hasenclever" license="LGPLv2+">
<highlighting>
<list name="definitions">
<item> def </item>
@@ -30,12 +30,8 @@
<item> defalias </item>
<item> defhinted </item>
<item> definline </item>
- <item> defmacro </item>
- <item> defmacro- </item>
<item> defmethod </item>
<item> defmulti </item>
- <item> defn </item>
- <item> defn- </item>
<item> defnk </item>
<item> defn-memo </item>
<item> defonce </item>
@@ -52,6 +48,12 @@
<item> defvar </item>
<item> defvar- </item>
</list>
+ <list name="documentable_definitions">
+ <item> defn </item>
+ <item> defn- </item>
+ <item> defmacro </item>
+ <item> defmacro- </item>
+ </list>
<list name="keywords">
<item> < </item>
<item> <= </item>
@@ -60,17 +62,20 @@
<item> > </item>
<item> >= </item>
<item> - </item>
+ <item> -' </item>
<item> -> </item>
<item> ->> </item>
<item> / </item>
<item> . </item>
<item> .. </item>
<item> * </item>
+ <item> *' </item>
<item> + </item>
+ <item> +' </item>
<item> accessor </item>
<item> aclone </item>
<item> add-classpath </item>
- <item> add-watcher </item>
+ <item> add-watch </item>
<item> agent </item>
<item> agent-errors </item>
<item> aget </item>
@@ -89,6 +94,7 @@
<item> are </item>
<item> areduce </item>
<item> array-map </item>
+ <item> as-> </item>
<item> aset </item>
<item> aset-boolean </item>
<item> aset-byte </item>
@@ -188,6 +194,7 @@
<item> create-struct </item>
<item> cycle </item>
<item> dec </item>
+ <item> dec' </item>
<item> decimal? </item>
<item> declare </item>
<item> delay </item>
@@ -243,6 +250,7 @@
<item> file-position </item>
<item> file-seq </item>
<item> filter </item>
+ <item> filterv </item>
<item> finally </item>
<item> find </item>
<item> find-doc </item>
@@ -257,9 +265,11 @@
<item> fn </item>
<item> fn? </item>
<item> fnext </item>
+ <item> fnil </item>
<item> for </item>
<item> force </item>
<item> format </item>
+ <item> frequencies </item>
<item> function? </item>
<item> future </item>
<item> future? </item>
@@ -281,6 +291,7 @@
<item> get-proxy-class </item>
<item> get-thread-bindings </item>
<item> get-validator </item>
+ <item> group-by </item>
<item> handle </item>
<item> handler-case </item>
<item> hash </item>
@@ -294,6 +305,7 @@
<item> if-not </item>
<item> import </item>
<item> inc </item>
+ <item> inc' </item>
<item> inc-report-counter </item>
<item> index </item>
<item> init-proxy </item>
@@ -364,6 +376,7 @@
<item> map </item>
<item> map? </item>
<item> mapcat </item>
+ <item> mapv </item>
<item> map-invert </item>
<item> max </item>
<item> max-key </item>
@@ -462,6 +475,7 @@
<item> quot </item>
<item> rand </item>
<item> rand-int </item>
+ <item> rand-nth </item>
<item> range </item>
<item> ratio? </item>
<item> rational? </item>
@@ -488,7 +502,7 @@
<item> remove </item>
<item> remove-method </item>
<item> remove-ns </item>
- <item> remove-watcher </item>
+ <item> remove-watch </item>
<item> rename </item>
<item> rename-keys </item>
<item> re-pattern </item>
@@ -607,6 +621,7 @@
<item> unquote </item>
<item> unquote-splicing </item>
<item> up </item>
+ <item> update </item>
<item> update-in </item>
<item> update-proxy </item>
<item> use </item>
@@ -620,6 +635,7 @@
<item> vec </item>
<item> vector </item>
<item> vector? </item>
+ <item> vector-of </item>
<item> walk </item>
<item> when </item>
<item> when-first </item>
@@ -639,6 +655,7 @@
<item> with-test-out </item>
<item> xml-seq </item>
<item> zero? </item>
+ <item> zipmap </item>
</list>
<list name="variables">
<item> *1 </item>
@@ -680,112 +697,174 @@
<item> *test-out* </item>
<item> *use-context-classloader* </item>
<item> *warn-on-reflection* </item>
+ <item> *warn-on-reflection* </item>
+ <item> false </item>
+ <item> nil </item>
+ <item> true </item>
</list>
<contexts>
<context name="Level0" attribute="Normal" lineEndContext="#stay">
<DetectChar attribute="Brackets1" context="Level1" char="("/>
+ <Detect2Chars attribute="Brackets1" context="Level1" char="'"
char1="("/>
+ <Detect2Chars attribute="Brackets1" context="Level1" char="`"
char1="("/>
<Detect2Chars attribute="Brackets1" context="Level1" char="#"
char1="("/>
<IncludeRules context="Default" />
</context>
<context name="Default" attribute="Normal" lineEndContext="#stay">
- <RegExpr attribute="Comment" context="#stay" String=";.*$"/>
+ <DetectChar attribute="Comment" context="Comment" char=";"/>
<Detect2Chars attribute="Comment" context="#stay" char="#" char1="_"/>
- <RegExpr attribute="Modifier" context="#stay" String="[@~]\S+"/>
- <RegExpr attribute="Modifier2" context="#stay"
String="::?[a-zA-Z0-9\-]+"/>
- <Detect2Chars attribute="Brackets" context="#stay" char="#" char1="{"/>
- <Detect2Chars attribute="Brackets" context="#stay" char="^" char1="{"/>
- <DetectChar attribute="BracketsCurly" context="#stay" char="{"/>
- <DetectChar attribute="BracketsCurly" context="#stay" char="}"/>
+ <RegExpr attribute="Readermacro" context="#stay" String="#\?@?"/>
+ <RegExpr attribute="Modifier" context="#stay"
String="[@~'`][^\s\(\)\{\}\[\]]+"/>
+ <RegExpr attribute="Modifier" context="#stay"
String="[^\s"\(\)\{\}\[\]]+#"/>
+ <RegExpr attribute="Modifier2" context="#stay"
String="::?[a-zA-Z0-9\-\./]+"/>
+ <Detect2Chars attribute="BracketsSet" context="BracketsSet" char="#"
char1="{"/>
+ <Detect2Chars attribute="BracketsMeta" context="BracketsMeta" char="^"
char1="{"/>
+ <DetectChar attribute="BracketsMap" context="BracketsMap" char="{"/>
<DetectChar attribute="BracketsSquare" context="#stay" char="["/>
<DetectChar attribute="BracketsSquare" context="#stay" char="]"/>
- <Detect2Chars attribute="Variable" context="#stay" char="#" char1="'"/>
+ <RegExpr attribute="Variable" context="#stay"
String="#'[^\s\(\)\{\}\[\]]+"/>
<keyword attribute="Keyword" context="#stay" String="keywords"/>
+ <RegExpr attribute="Variable" context="#stay" String="%[0-9]*"/>
<keyword attribute="Variable" context="#stay" String="variables"/>
+ <keyword attribute="Definition" context="function_decl_documentable"
String="documentable_definitions"/>
<keyword attribute="Definition" context="function_decl"
String="definitions"/>
- <RegExpr attribute="Char" context="#stay" String="\\."/>
- <Detect2Chars attribute="String" context="String" char="#"
char1="""/>
+ <RegExpr attribute="Char" context="#stay"
String="\\u[0-9A-Fa-f]+|\\o[0-7]+|\\backspace|\\formfeed|\\newline|\\space|\\tab|\\[^\s\(\)\{\}\[\]]"/>
+ <Detect2Chars attribute="Regexpr" context="Regexpr" char="#"
char1="""/>
<DetectChar attribute="String" context="String" char="""/>
- <Float attribute="Float" context="#stay"/>
- <Int attribute="Decimal" context="#stay"/>
+ <RegExpr attribute="Float" context="#stay" String="[0-9]+/[0-9]+"/>
+ <RegExpr attribute="BaseN" context="#stay" String="0[xX][0-9A-Fa-f]+"/>
+ <RegExpr attribute="BaseN" context="#stay"
String="([12]?[0-9]|3[0-6])[rR][0-9a-zA-Z]+"/>
+ <RegExpr attribute="Error" context="#stay"
String="(3[7-9]|[0-9]*[4-9][0-9]+)[rR][0-9a-zA-Z]+"/>
+ <Float attribute="Float" context="#stay">
+ <StringDetect attribute="Decimal" context="#stay" String="M"
insensitive="false"/>
+ </Float>
+ <Int attribute="Decimal" context="#stay">
+ <StringDetect attribute="Decimal" context="#stay" String="N"
insensitive="false"/>
+ </Int>
<DetectChar attribute="Brackets1" context="Level1" char="("/>
</context>
- <context name="function_decl" attribute="Function"
lineEndContext="#stay">
- <RegExpr attribute="Function" context="#pop"
String="\s*[A-Za-z0-9-+\<\>//\*]*\s*"/>
+ <context name="Comment" attribute="Comment" lineEndContext="#pop">
+ <RegExpr String="(FIXME|TODO):?" attribute="Alert" context="#stay"/>
+ </context>
+ <context name="function_decl_documentable" attribute="Function"
lineEndContext="#stay">
+ <RegExpr attribute="Function" context="#pop!DocumentationPossible"
String="\s*[A-Za-z0-9-+\<\>//\*!\?']*\s*"/>
</context>
- <context name="SpecialNumber" attribute="Normal" lineEndContext="#pop">
- <Float attribute="Float" context="#pop"/>
- <Int attribute="Decimal" context="#pop"/>
- <HlCOct attribute="BaseN" context="#pop"/>
- <HlCHex attribute="Float" context="#pop"/>
+ <context name="function_decl" attribute="Function"
lineEndContext="#stay">
+ <RegExpr attribute="Function" context="#pop"
String="\s*[A-Za-z0-9-+\<\>//\*!\?']*\s*"/>
</context>
<context name="String" attribute="String" lineEndContext="#stay">
<RegExpr attribute="Char" context="#stay" String="#\\."/>
<HlCStringChar attribute="String Char" context="#stay"/>
<DetectChar attribute="String" context="#pop" char="""/>
</context>
+ <context name="Regexpr" attribute="Regexpr" lineEndContext="#stay">
+ <RegExpr attribute="Char" context="#stay" String="#\\."/>
+ <HlCStringChar attribute="Regexpr Char" context="#stay"/>
+ <DetectChar attribute="Regexpr" context="#pop" char="""/>
+ </context>
+ <context name="DocumentationPossible" attribute="DocumentationPossible"
lineEndContext="#stay">
+ <DetectChar attribute="Comment" context="Comment" char=";"/>
+ <DetectChar attribute="Documentation" context="#pop!Documentation"
char="""/>
+ <RegExpr attribute="Documentation" context="#pop" String="\S"
lookAhead="true"/>
+ </context>
+ <context name="Documentation" attribute="Documentation"
lineEndContext="#stay">
+ <RegExpr attribute="Char" context="#stay" String="#\\."/>
+ <HlCStringChar attribute="Documentation Char" context="#stay"/>
+ <DetectChar attribute="Documentation" context="#pop" char="""/>
+ </context>
+ <context name="BracketsSet" attribute="Normal" lineEndContext="#stay">
+ <DetectChar attribute="BracketsSet" context="#pop" char="}" />
+ <IncludeRules context="Default" />
+ </context>
+ <context name="BracketsMeta" attribute="Normal" lineEndContext="#stay">
+ <DetectChar attribute="BracketsMeta" context="#pop" char="}" />
+ <DetectChar attribute="Documentation" context="Documentation"
char="""/>
+ <IncludeRules context="Default" />
+ </context>
+ <context name="BracketsMap" attribute="Normal" lineEndContext="#stay">
+ <DetectChar attribute="BracketsMap" context="#pop" char="}" />
+ <IncludeRules context="Default" />
+ </context>
<context name="Level1" attribute="Normal" lineEndContext="#stay">
<DetectChar attribute="Brackets2" context="Level2" char="("/>
+ <Detect2Chars attribute="Brackets2" context="Level2" char="'"
char1="("/>
+ <Detect2Chars attribute="Brackets2" context="Level2" char="`"
char1="("/>
<Detect2Chars attribute="Brackets2" context="Level2" char="#"
char1="("/>
<DetectChar attribute="Brackets1" context="#pop" char=")" />
<IncludeRules context="Default" />
</context>
<context name="Level2" attribute="Normal" lineEndContext="#stay">
<DetectChar attribute="Brackets3" context="Level3" char="("/>
+ <Detect2Chars attribute="Brackets3" context="Level3" char="'"
char1="("/>
+ <Detect2Chars attribute="Brackets3" context="Level3" char="`"
char1="("/>
<Detect2Chars attribute="Brackets3" context="Level3" char="#"
char1="("/>
<DetectChar attribute="Brackets2" context="#pop" char=")" />
<IncludeRules context="Default" />
</context>
<context name="Level3" attribute="Normal" lineEndContext="#stay">
<DetectChar attribute="Brackets4" context="Level4" char="("/>
+ <Detect2Chars attribute="Brackets4" context="Level4" char="'"
char1="("/>
+ <Detect2Chars attribute="Brackets4" context="Level4" char="`"
char1="("/>
<Detect2Chars attribute="Brackets4" context="Level4" char="#"
char1="("/>
<DetectChar attribute="Brackets3" context="#pop" char=")" />
<IncludeRules context="Default" />
</context>
<context name="Level4" attribute="Normal" lineEndContext="#stay">
<DetectChar attribute="Brackets5" context="Level5" char="("/>
+ <Detect2Chars attribute="Brackets5" context="Level5" char="'"
char1="("/>
+ <Detect2Chars attribute="Brackets5" context="Level5" char="`"
char1="("/>
<Detect2Chars attribute="Brackets5" context="Level5" char="#"
char1="("/>
<DetectChar attribute="Brackets4" context="#pop" char=")" />
<IncludeRules context="Default" />
</context>
<context name="Level5" attribute="Normal" lineEndContext="#stay">
<DetectChar attribute="Brackets6" context="Level6" char="("/>
+ <Detect2Chars attribute="Brackets6" context="Level6" char="'"
char1="("/>
+ <Detect2Chars attribute="Brackets6" context="Level6" char="`"
char1="("/>
<Detect2Chars attribute="Brackets6" context="Level6" char="#"
char1="("/>
<DetectChar attribute="Brackets5" context="#pop" char=")" />
<IncludeRules context="Default" />
</context>
<context name="Level6" attribute="Normal" lineEndContext="#stay">
<DetectChar attribute="Brackets1" context="Level1" char="("/>
+ <Detect2Chars attribute="Brackets1" context="Level1" char="'"
char1="("/>
+ <Detect2Chars attribute="Brackets1" context="Level1" char="`"
char1="("/>
<Detect2Chars attribute="Brackets1" context="Level1" char="#"
char1="("/>
<DetectChar attribute="Brackets6" context="#pop" char=")" />
<IncludeRules context="Default" />
</context>
</contexts>
<itemDatas>
- <itemData name="Normal" defStyleNum="dsNormal"/>
- <itemData name="Keyword" defStyleNum="dsKeyword"/>
- <itemData name="Operator" defStyleNum="dsOperator"/>
- <itemData name="Modifier" defStyleNum="dsAttribute"/>
- <itemData name="Modifier2" defStyleNum="dsAttribute"/>
- <itemData name="Variable" defStyleNum="dsVariable" />
- <itemData name="Definition" defStyleNum="dsBuiltIn"/>
- <itemData name="Data" defStyleNum="dsDataType"/>
- <itemData name="Decimal" defStyleNum="dsDecVal"/>
- <itemData name="BaseN" defStyleNum="dsBaseN"/>
- <itemData name="Float" defStyleNum="dsFloat"/>
- <itemData name="Function" defStyleNum="dsFunction"/>
- <itemData name="Char" defStyleNum="dsChar"/>
+ <itemData name="Normal" defStyleNum="dsNormal" spellChecking="false"/>
+ <itemData name="Keyword" defStyleNum="dsKeyword" spellChecking="false"/>
+ <itemData name="Operator" defStyleNum="dsOperator"
spellChecking="false"/>
+ <itemData name="Modifier" defStyleNum="dsAttribute"
spellChecking="false"/>
+ <itemData name="Modifier2" defStyleNum="dsAttribute"
spellChecking="false"/>
+ <itemData name="Variable" defStyleNum="dsVariable"
spellChecking="false"/>
+ <itemData name="Definition" defStyleNum="dsBuiltIn"
spellChecking="false"/>
+ <itemData name="Data" defStyleNum="dsDataType" spellChecking="false"/>
+ <itemData name="Decimal" defStyleNum="dsDecVal" spellChecking="false"/>
+ <itemData name="BaseN" defStyleNum="dsBaseN" spellChecking="false"/>
+ <itemData name="Float" defStyleNum="dsFloat" spellChecking="false"/>
+ <itemData name="Function" defStyleNum="dsFunction"
spellChecking="false"/>
+ <itemData name="Char" defStyleNum="dsChar" spellChecking="false"/>
<itemData name="String" defStyleNum="dsString"/>
+ <itemData name="Regexpr" defStyleNum="dsSpecialString"/>
<itemData name="Comment" defStyleNum="dsComment"/>
- <itemData name="Region Marker" defStyleNum="dsRegionMarker"/>
- <itemData name="Brackets" defStyleNum="dsNormal" color="#0000ff"
selColor="#00ff00" bold="1" italic="0"/>
+ <itemData name="Documentation" defStyleNum="dsDocumentation"/>
+ <itemData name="Alert" defStyleNum="dsAlert" spellChecking="false"/>
+ <itemData name="Error" defStyleNum="dsError" spellChecking="false"/>
+ <itemData name="Readermacro" defStyleNum="dsPreprocessor"/>
+ <itemData name="BracketsSet" defStyleNum="dsNormal" color="#0000ff"
selColor="#00ff00"/>
+ <itemData name="BracketsMeta" defStyleNum="dsNormal" color="#0000ff"
selColor="#00ff00" bold="1" italic="0"/>
+ <itemData name="BracketsMap" defStyleNum="dsNormal" color="#206620"
selColor="#219921"/>
<itemData name="BracketsSquare" defStyleNum="dsNormal" color="#3333ff"
selColor="#3333aa"/>
- <itemData name="BracketsCurly" defStyleNum="dsNormal" color="#206620"
selColor="#219921"/>
- <itemData name="Brackets1" defStyleNum="dsNormal" color="#ff0000"
selColor="#ffaa00" bold="0" italic="0"/>
- <itemData name="Brackets2" defStyleNum="dsNormal" color="#ff8800"
selColor="#ffff00" bold="0" italic="0"/>
- <itemData name="Brackets3" defStyleNum="dsNormal" color="#888800"
selColor="#888888" bold="0" italic="0"/>
- <itemData name="Brackets4" defStyleNum="dsNormal" color="#008800"
selColor="#000000" bold="0" italic="0"/>
- <itemData name="Brackets5" defStyleNum="dsNormal" color="#000088"
selColor="#000000" bold="0" italic="0"/>
- <itemData name="Brackets6" defStyleNum="dsNormal" color="#880088"
selColor="#000000" bold="0" italic="0"/>
+ <itemData name="Brackets1" defStyleNum="dsNormal" color="#ff0000"
selColor="#ffaa00" bold="0" italic="0"/>
+ <itemData name="Brackets2" defStyleNum="dsNormal" color="#ff8800"
selColor="#ffff00" bold="0" italic="0"/>
+ <itemData name="Brackets3" defStyleNum="dsNormal" color="#888800"
selColor="#888888" bold="0" italic="0"/>
+ <itemData name="Brackets4" defStyleNum="dsNormal" color="#008800"
selColor="#000000" bold="0" italic="0"/>
+ <itemData name="Brackets5" defStyleNum="dsNormal" color="#000088"
selColor="#000000" bold="0" italic="0"/>
+ <itemData name="Brackets6" defStyleNum="dsNormal" color="#880088"
selColor="#000000" bold="0" italic="0"/>
</itemDatas>
</highlighting>
<general>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/syntax-highlighting-5.32.0/data/syntax/ocaml.xml
new/syntax-highlighting-5.33.0/data/syntax/ocaml.xml
--- old/syntax-highlighting-5.32.0/data/syntax/ocaml.xml 2017-03-04
17:24:44.000000000 +0100
+++ new/syntax-highlighting-5.33.0/data/syntax/ocaml.xml 2017-04-01
21:45:56.000000000 +0200
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Kate syntax highlighting for Objective Caml version 3.08 in the standard
and revised syntaxes, with Ocamldoc comments. -->
+<!-- Kate syntax highlighting for Objective Caml version 4.02 in the standard
and revised syntaxes, with Ocamldoc comments. -->
<!DOCTYPE language SYSTEM "language.dtd"
[
@@ -15,9 +15,9 @@
]>
<language name="Objective Caml"
extensions="*.ml;*.mli"
- mimetype=""
+ mimetype="text/x-ocaml"
section="Sources"
- version="3"
+ version="4"
priority="10"
kateversion="2.4"
author="Glyn Webster ([email protected]) and Vincent Hugot
([email protected])"
@@ -67,6 +67,7 @@
<item> module </item>
<item> mutable </item>
<item> new </item>
+ <item> nonrec </item>
<item> object </item>
<item> of </item>
<item> open </item>
@@ -114,12 +115,14 @@
<item> close_out </item>
<item> close_out_noerr </item>
<item> compare </item>
+ <item> copysign </item>
<item> cos </item>
<item> cosh </item>
<item> decr </item>
<item> do_at_exit </item>
<item> epsilon_float </item>
<item> exp </item>
+ <item> expm1 </item>
<item> float </item>
<item> float_of_int </item>
<item> float_of_string </item>
@@ -129,6 +132,7 @@
<item> format_of_string </item>
<item> frexp </item>
<item> fst </item>
+ <item> hypot </item>
<item> ignore </item>
<item> in_channel_length </item>
<item> incr </item>
@@ -146,6 +150,7 @@
<item> lnot </item>
<item> log </item>
<item> log10 </item>
+ <item> log1p </item>
<item> max </item>
<item> max_float </item>
<item> max_int </item>
@@ -167,18 +172,22 @@
<item> output </item>
<item> output_binary_int </item>
<item> output_byte </item>
+ <item> output_bytes </item>
<item> output_char </item>
<item> output_string </item>
+ <item> output_substring </item>
<item> output_value </item>
<item> pos_in </item>
<item> pos_out </item>
<item> pred </item>
+ <item> prerr_bytes </item>
<item> prerr_char </item>
<item> prerr_endline </item>
<item> prerr_float </item>
<item> prerr_int </item>
<item> prerr_newline </item>
<item> prerr_string </item>
+ <item> print_bytes </item>
<item> print_char </item>
<item> print_endline </item>
<item> print_float </item>
@@ -189,6 +198,7 @@
<item> read_int </item>
<item> read_line </item>
<item> really_input </item>
+ <item> really_input_string </item>
<item> ref </item>
<item> seek_in </item>
<item> seek_out </item>
@@ -220,14 +230,18 @@
<item> failwith </item>
<item> invalid_arg </item>
<item> raise </item>
+ <item> raise_notrace </item>
</list>
<list name="Pervasive Types">
<item> array </item>
<item> bool </item>
+ <item> bytes </item>
<item> char </item>
<item> exn </item>
+ <item> float </item>
<item> format4 </item>
+ <item> format6 </item>
<item> fpclass </item>
<item> in_channel </item>
<item> int </item>
@@ -253,22 +267,13 @@
<item> FP_zero </item>
<item> None </item>
<item> Open_append </item>
- <item> Open_append </item>
- <item> Open_binary </item>
<item> Open_binary </item>
<item> Open_creat </item>
- <item> Open_creat </item>
- <item> Open_excl </item>
<item> Open_excl </item>
<item> Open_nonblock </item>
- <item> Open_nonblock </item>
- <item> Open_rdonly </item>
<item> Open_rdonly </item>
<item> Open_text </item>
- <item> Open_text </item>
<item> Open_trunc </item>
- <item> Open_trunc </item>
- <item> Open_wronly </item>
<item> Open_wronly </item>
<item> Some </item>
</list>
@@ -294,10 +299,12 @@
<item> Array </item>
<item> ArrayLabels </item>
<item> Buffer </item>
+ <item> Bytes </item>
<item> Callback </item>
<item> Char </item>
<item> Complex </item>
<item> Digest </item>
+ <item> Ephemeron </item>
<item> Filename </item>
<item> Format </item>
<item> Gc </item>
@@ -322,12 +329,14 @@
<item> Scanf </item>
<item> Set </item>
<item> Sort </item>
+ <item> Spacetime </item>
<item> Stack </item>
<item> StdLabels </item>
<item> Stream </item>
<item> String </item>
<item> StringLabels </item>
<item> Sys </item>
+ <item> Uchar </item>
<item> Weak </item>
</list>
@@ -471,7 +480,7 @@
<RegExpr
String="@see\s*(<[^>]*>|"[^"]*"|'[^']*')"
context="#stay" attribute="Ocamldoc Markup" />
<RegExpr String="@(param|raise)\s*" context="Ocamldoc Identifier"
attribute="Ocamldoc Markup" />
- <RegExpr String="@(author|deprecated|return|since|version)"
context="#stay" attribute="Ocamldoc Markup" />
+ <RegExpr String="@(author|before|deprecated|return|since|version)"
context="#stay" attribute="Ocamldoc Markup" />
<RegExpr String="@&IDENT;" context="#stay" attribute="Ocamldoc Custom
Tag" />
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/syntax-highlighting-5.32.0/data/syntax/qml.xml
new/syntax-highlighting-5.33.0/data/syntax/qml.xml
--- old/syntax-highlighting-5.32.0/data/syntax/qml.xml 2017-03-04
17:24:44.000000000 +0100
+++ new/syntax-highlighting-5.33.0/data/syntax/qml.xml 2017-04-01
21:45:56.000000000 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
<!-- Author: Milian Wolff <[email protected]> -->
-<language name="QML" version="2" kateversion="5.0" section="Scripts"
extensions="*.qml"
+<language name="QML" version="3" kateversion="5.0" section="Scripts"
extensions="*.qml;*.qmltypes"
mimetype="text/x-qml;application/x-qml" indenter="cstyle"
author="Milian Wolff ([email protected])" license="LGPL">
<highlighting>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/syntax-highlighting-5.32.0/data/syntax/scala.xml
new/syntax-highlighting-5.33.0/data/syntax/scala.xml
--- old/syntax-highlighting-5.32.0/data/syntax/scala.xml 2017-03-04
17:24:44.000000000 +0100
+++ new/syntax-highlighting-5.33.0/data/syntax/scala.xml 2017-04-01
21:45:56.000000000 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
-<language name="Scala" version="2" kateversion="2.3" section="Sources"
- extensions="*.scala" mimetype="text/x-scala" license="LGPL"
+<language name="Scala" version="3" kateversion="2.3" section="Sources"
+ extensions="*.scala;*.sbt" mimetype="text/x-scala" license="LGPL"
author="Stephane Micheloud ([email protected])">
<!--
First version added to reository was 1.0 downloaded from
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/syntax-highlighting-5.32.0/data/syntax/toml.xml
new/syntax-highlighting-5.33.0/data/syntax/toml.xml
--- old/syntax-highlighting-5.32.0/data/syntax/toml.xml 2017-03-04
17:24:44.000000000 +0100
+++ new/syntax-highlighting-5.33.0/data/syntax/toml.xml 2017-04-01
21:45:56.000000000 +0200
@@ -11,7 +11,7 @@
<!ENTITY datetime "\d\d\d\d-\d\d-\d\d(T&time;)?">
]>
<!-- https://github.com/toml-lang/toml -->
-<language name="TOML" section="Configuration" extensions="*.toml"
mimetype="text/x-toml" version="2" kateversion="5.0"
author="[email protected]" license="LGPLv2+">
+<language name="TOML" section="Configuration" extensions="*.toml"
mimetype="text/x-toml" version="3" kateversion="5.0"
author="[email protected]" license="LGPLv2+">
<highlighting>
<list name="bools">
<item>true</item>
@@ -65,17 +65,23 @@
<!-- Quoted keys and Strings -->
<context attribute="Key" lineEndContext="#pop" name="QuotedKey">
<LineContinue attribute="Escape" context="#stay"/>
- <HlCStringChar attribute="Escape" context="#stay"/>
+ <RegExpr attribute="Escape" String="\\[btnfr"\\]"
context="#stay" />
+ <RegExpr attribute="Escape"
String="\\(u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})" context="#stay" />
+ <RegExpr attribute="Error" String="\\." context="#stay"
/>
<DetectChar attribute="Key" context="#pop"
char="""/>
</context>
<context attribute="String" lineEndContext="#pop" name="String">
<LineContinue attribute="Escape" context="#stay"/>
- <HlCStringChar attribute="Escape" context="#stay"/>
+ <RegExpr attribute="Escape" String="\\[btnfr"\\]"
context="#stay" />
+ <RegExpr attribute="Escape"
String="\\(u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})" context="#stay" />
+ <RegExpr attribute="Error" String="\\." context="#stay"
/>
<DetectChar attribute="String" context="#pop"
char="""/>
</context>
<context attribute="String" lineEndContext="#stay"
name="MultilineString">
<LineContinue attribute="Escape" context="#stay"/>
- <HlCStringChar attribute="Escape" context="#stay"/>
+ <RegExpr attribute="Escape" String="\\[btnfr"\\]"
context="#stay" />
+ <RegExpr attribute="Escape"
String="\\(u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})" context="#stay" />
+ <RegExpr attribute="Error" String="\\." context="#stay"
/>
<StringDetect attribute="String" context="#pop"
String="""""/>
</context>
<context attribute="LitString" lineEndContext="#pop"
name="LitString">
@@ -125,4 +131,4 @@
<comment name="singleLine" start="#" />
</comments>
</general>
-</language>
\ No newline at end of file
+</language>
