update

This reverts commit 0633355169.

.travis.yml

@@ -0,0 +1,70 @@
+language:
+  - cpp
+
+sudo: false
+
+compiler:
+  - clang
+  - gcc
+
+os:
+  - linux
+  - osx
+
+branches:
+  only:
+    - master
+    - dev
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.9
+
+install:
+  - echo "BUILDER = $BUILDER"
+  - echo "BOARD = $BOARD"
+  - echo "CONF = $CONF"
+  - pip install --user lutin
+
+env:
+  matrix:
+    - CONF=debug BOARD=Linux
+    #- CONF=debug BOARD=Windows
+    #- CONF=debug BOARD=Android
+    - CONF=release BOARD=Linux
+    #- CONF=release BOARD=Windows
+    #- CONF=release BOARD=Android
+  exclude:
+    - compiler: clang
+      env: BOARD=Windows
+    - compiler: clang
+      env: BOARD=Android
+
+before_script:
+  - cd ..
+  - mkdir bin
+  - curl https://storage.googleapis.com/git-repo-downloads/repo > bin/repo
+  - chmod a+x bin/repo
+  - git config --global user.email "travis@travis.com"
+  - git config --global user.name "Travis"
+  - git config --global color.ui "auto"
+  - git config --global core.editor "vi"
+  - mkdir framework
+  - cd framework
+  - ../bin/repo init -u https://github.com/HeeroYui/manifest.git
+  - ../bin/repo sync -j8
+  - cd ..
+  - pwd
+  - ls -l
+  - if [ "$CXX" == "clang++" ]; then BUILDER=clang; else BUILDER=gcc; fi
+  - if [ "$CXX" == "g++" ]; then COMPILATOR_OPTION="--compilator-version=4.9"; else COMPILATOR_OPTION=""; fi
+
+script: 
+  - lutin -C -P -t $BOARD -c $BUILDER $COMPILATOR_OPTION -m $CONF -p edn
+
+notifications:
+  email:
+    - yui.heero@gmail.com

CMakeLists.txt

@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 2.8)
+
+SUBDIRS(${CMAKE_CURRENT_SOURCE_DIR}/../ewol)
+SUBDIRS(sources)

Makefile

@@ -1,57 +0,0 @@
-#############################################################################"
-# main makefile for a basic application
-# this is minimal application main makefile
-#############################################################################"
-
-# Project name ==> generate the application name [a-z] <== make attention at the case this generate error on Android compilation
-PROJECT_NAME=edn
-
-#Can be manny things, but limit whith no  space no special char and no Maj ... [a-z]
-#	com : Commercial
-#	net : Network??
-#	org : Organisation
-#	gov : Governement
-#	mil : Military
-#	edu : Education
-#	pri : Private
-#	museum : ...
-PROJECT_COMPAGNY_TYPE=org
-
-# Compagny name of the project [a-zA-Z0-9 \-]
-PROJECT_COMPAGNY_NAME=Edouard DUPIN
-
-# List of mainainer that might be contact in problem case : "Mr NAME Surname<mail@host.com>" "second ..."
-PROJECT_MAINTAINER="Mr DUPIN Edouard <yui.heero@gmail.com>"
-
-# the icon of the project is all time needed ... if it is not present the ewol icon might be set (must be a .png file) (and no space in the fileName and filePath)
-PROJECT_ICON=$(shell pwd)/data/icon.png
-
-# project section : (must be separate by coma
-#    refer to : http://packages.debian.org/sid/
-#        admin cli-mono comm database debian-installer
-#        debug doc editors electronics devel embedded
-#        fonts games gnome gnu-r gnustep graphics
-#        hamradio haskell httpd interpreters java
-#        kde kernel libdevel libs lisp localization
-#        mail math misc net news ocaml oldlibs otherosfs
-#        perl php python ruby science shells sound tex
-#        text utils vcs video virtual web x11 xfce zope ...
-PROJECT_SECTION=Development,Editors
-
-# project prority
-#    required : Packages which are necessary for the proper functioning of the system (usually, this means that dpkg functionality depends on these packages). Removing a required package may cause your system to become totally broken and you may not even be able to use dpkg to put things back, so only do so if you know what you are doing. Systems with only the required packages are probably unusable, but they do have enough functionality to allow the sysadmin to boot and install more software.
-#    important : Important programs, including those which one would expect to find on any Unix-like system. If the expectation is that an experienced Unix person who found it missing would say "What on earth is going on, where is foo?", it must be an important package.[6] Other packages without which the system will not run well or be usable must also have priority important. This does not include Emacs, the X Window System, TeX or any other large applications. The important packages are just a bare minimum of commonly-expected and necessary tools.
-#    standard : These packages provide a reasonably small but not too limited character-mode system. This is what will be installed by default if the user doesn't select anything else. It doesn't include many large applications.
-#    optional : (In a sense everything that isn't required is optional, but that's not what is meant here.) This is all the software that you might reasonably want to install if you didn't know what it was and don't have specialized requirements. This is a much larger system and includes the X Window System, a full TeX distribution, and many applications. Note that optional packages should not conflict with each other.
-#    extra : This contains all packages that conflict with others with required, important, standard or optional priorities, or are only likely to be useful if you already know what they are or have specialized requirements (such as packages containing only detached debugging symbols).
-PROJECT_PRIORITY=optional
-
-# description of the current project inside quote and no \n
-PROJECT_DESCRIPTION="Text editor for sources code with ctags management"
-
-# Add package needed :
-# current user packages
-USER_PACKAGES =$(shell pwd)/sources/
-
-# include the basic makefile of ewol :
-include $(shell pwd)/../ewol/Makefile.mk

README.md

@@ -5,71 +5,113 @@ Edn
 
 This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY.
 
+
+[![Build Status](https://travis-ci.org/HeeroYui/edn.svg?branch=dev)](https://travis-ci.org/HeeroYui/edn)
+
 Instructions
 ============
 
-download the software :
+need google repo:
+-----------------
 
-	mkdir yourDevFolder
-	cd yourDevFolder
-	git clone git://github.com/HeeroYui/ewol.git
-	cd ewol
-	git submodule init
-	git submodule update
-	cd ..
-	git clone git://github.com/HeeroYui/edn.git
-	cd edn
+see: http://source.android.com/source/downloading.html#installing-repo
+
+	mkdir ~/.bin
+	PATH=~/.bin:$PATH
+	curl https://storage.googleapis.com/git-repo-downloads/repo > ~/.bin/repo
+	chmod a+x ~/.bin/repo
+
+download Build system:
+----------------------
+
+	sudo pip install lutin
+	sudo pip install pillow
+
+
+download the Framework:
+----------------------
+
+	mkdir -p WORKING_DIRECTORY/framework
+	cd WORKING_DIRECTORY/framework
+	repo init -u git://github.com/atria-soft/manifest.git
+	repo sync -j8
+	cd ../..
+
+download the software:
+----------------------
+
+	mkdir -p WORKING_DIRECTORY/application
+	cd WORKING_DIRECTORY/application
+	git clone https://github.com/HeeroYui/edn.git
+	cd ../..
+
+Compile software:
+-----------------
+
+	cd WORKING_DIRECTORY
+	lutin -C -P edn
 
 (debug) Compile software & Run debug version:
 
-	make DEBUG=1
-	or
-	make CLANG=1 DEBUG=1
-	./out/Linux/debug/staging/edn/usr/bin/edn -l6 yourFile.txt
-	Note : -l6 corespond at the LOG level to display.
-	Note : If you not compile in debug mode, you must install it to execure it.
+	lutin -C -P -m debug edn
+	# or
+	lutin -C -P -c clang -m debug edn
+
 
 (release) Compile software & install & run:
 
-	# generate binary and tree
-	make
-	# generate .deb packages
-	make final
-	# install .deb packages
-	make install
-	edn exemple.txt
+	# generate binary, tree, package and install it ...
+	lutin -C -P edn?install
+
 
 (Android) Compile software & install
 
-	cd yourDevFolder
 	mkdir andoid
 	cd android
 	download here in "sdk" and "ndk" the coresponding SDK and NDK of Android:
 		http://developer.android.com/tools/sdk/ndk/index.html
 		http://developer.android.com/sdk/index.html
 		==> you need to download sub package of the NDK (refer to the NDK doccumentation) but only supported android version >4.0
-	cd ../edn
-	# generate .so
-	make PLATFORM=Android
-	# generate .apk
-	make PLATFORM=Android final
-	# To send it on the board :
-	make PLATFORM=Android install
+	cd ..
+	# Generate package and install on Android device (in debug mode a generic key is set)
+	lutin -C -P -t Android -m debug edn?install
 	# to show the log :
-	make PLATFORM=Android log
+	lutin -C -P -t Android edn?log
 
 
 (Windows) Compile software & install
 
-	cd yourDevFolder/edn
-	make PLATFORM=Windows
-	# generate ...
-	make PLATFORM=Windows final
+	lutin -C -P -t Windows -m debug edn
 
 
+(MAC) All needed and some useful packages
+
+	- Git access (client you want or : http://code.google.com/p/git-osx-installer/ ==>need a ctrl+click to remove the normal installation control)
+	- Xcode ==> for all developement packages
+		- in Xcode : XCode->Setting->Download and install component: "Command Line Tools"
+	
+	lutin -C -P -m debug edn
+
+
+(IOs) All needed and some useful packages
+
+	- Git access (client you want or : http://code.google.com/p/git-osx-installer/ ==>need a ctrl+click to remove the normal installation control)
+	- Xcode ==> for all developement packages
+		- in Xcode : XCode->Setting->Download and install component: "Command Line Tools"
+	
+	for porting on IOs you need a developper account
+	
+	# compile and install on simulator (no developper account needed)
+	lutin -C -P -t IOs -m debug --simulation edn?install
+	# launch IOs simulator in xcode, and your application will appear on the second page (32 bit mode only)
+	
+	# compile and install on board
+	lutin -C -P -t IOs -m debug edn?install
+	# compile and install on board and debug mode :
+	lutin -C -P -t IOs -m debug --simulation edn?log
+
 Dependency packages
 ===================
-
 	sudo apt-get install g++ libgl1-mesa-dev zlib1g-dev libasound2-dev
 	# if you want to compile with clang :
 	sudo apt-get install clang
@@ -77,7 +119,7 @@ Dependency packages
 	sudo apt-get install mingw32
 
 
-License (GPL)
+License (GPLv3)
 ==================
 
 	Edn (Editeur De N'ours) : Source code editor
@@ -95,3 +137,7 @@ License (GPL)
 	
 	You should have received a copy of the GNU General Public License
 	along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Annexe
+==================
+	sudo cp data/edn.desktop /usr/share/applications/

config/Android.config

@@ -1,71 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 
-#
-
-#
-# Modules
-#
-CONFIG_BUILD_EDN=y
-# CONFIG_BUILD_AGG is not set
-# CONFIG_BUILD_ETK is not set
-# CONFIG_BUILD_EWOL is not set
-# CONFIG_BUILD_FREETYPE is not set
-# CONFIG_BUILD_LUA is not set
-# CONFIG_BUILD_OGG is not set
-# CONFIG_BUILD_PARSERSVG is not set
-# CONFIG_BUILD_LIBPNG is not set
-# CONFIG_BUILD_PORTAUDIO is not set
-# CONFIG_BUILD_TINYXML is not set
-# CONFIG_BUILD_ZLIB is not set
-# CONFIG_BUILD_LIBZIP is not set
-
-#
-# edn
-#
-
-#
-# General
-#
-CONFIG_APPL_BUFFER_FONT_NORMAL=y
-# CONFIG_APPL_BUFFER_FONT_DISTANCE_FIELD is not set
-
-
-#
-# Android
-#
-CONFIG___EWOL_ANDROID_MINIMUM_SDK_VERSION__=9
-# CONFIG___EWOL_ANDROID_SHOW_TITLE__ is not set
-CONFIG___EWOL_ANDROID_ORIENTATION_AUTO__=y
-# CONFIG___EWOL_ANDROID_ORIENTATION_LANDSCAPE__ is not set
-# CONFIG___EWOL_ANDROID_ORIENTATION_PORTRAIT__ is not set
-
-
-#
-# Permissions
-#
-CONFIG___ANDROID_PERMISSION__WRITE_EXTERNAL_STORAGE__=y
-# CONFIG___ANDROID_PERMISSION__CAMERA__ is not set
-# CONFIG___ANDROID_PERMISSION__INTERNET__ is not set
-# CONFIG___ANDROID_PERMISSION__MODIFY_AUDIO_SETTINGS__ is not set
-# CONFIG___ANDROID_PERMISSION__READ_CALENDAR__ is not set
-# CONFIG___ANDROID_PERMISSION__READ_CONTACTS__ is not set
-# CONFIG___ANDROID_PERMISSION__READ_FRAME_BUFFER__ is not set
-# CONFIG___ANDROID_PERMISSION__READ_PROFILE__ is not set
-# CONFIG___ANDROID_PERMISSION__RECORD_AUDIO__ is not set
-# CONFIG___ANDROID_PERMISSION__SET_ORIENTATION__ is not set
-# CONFIG___ANDROID_PERMISSION__VIBRATE__ is not set
-# CONFIG___ANDROID_PERMISSION__ACCESS_COARSE_LOCATION__ is not set
-# CONFIG___ANDROID_PERMISSION__ACCESS_FINE_LOCATION__ is not set
-# CONFIG___VIDEO__OPENGL_ES_1 is not set
-
-
-#
-# ewol
-#
-
-#
-# General
-#
-CONFIG___EWOL_INTEGRATED_FONT__=y
-CONFIG___EWOL_APPL_BASIC_TITLE__="Edn : Sources Code Editor"

config/Linux.config

@@ -1,49 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux Kernel Configuration
-#
-
-#
-# Modules
-#
-CONFIG_BUILD_EDN=y
-# CONFIG_BUILD_AGG is not set
-CONFIG_BUILD_LINEARMATH=y
-CONFIG_BUILD_BULLET=y
-# CONFIG_BUILD_ETK is not set
-# CONFIG_BUILD_FREETYPE is not set
-# CONFIG_BUILD_LUA is not set
-# CONFIG_BUILD_OGG is not set
-# CONFIG_BUILD_PARSERSVG is not set
-# CONFIG_BUILD_LIBPNG is not set
-# CONFIG_BUILD_PORTAUDIO is not set
-# CONFIG_BUILD_TINYXML is not set
-# CONFIG_BUILD_ZLIB is not set
-# CONFIG_BUILD_LIBZIP is not set
-# CONFIG_BUILD_EWOL is not set
-
-#
-# edn
-#
-
-#
-# General
-#
-CONFIG_APPL_BUFFER_FONT_NORMAL=y
-# CONFIG_APPL_BUFFER_FONT_DISTANCE_FIELD is not set
-
-#
-# ewol
-#
-
-#
-# General
-#
-CONFIG___EWOL_APPL_BASIC_TITLE__="Edn : Sources Code Editor"
-# CONFIG___EWOL_INTEGRATED_FONT__ is not set
-
-#
-# Linux
-#
-CONFIG___EWOL_LINUX_GUI_MODE_X11__=y
-# CONFIG___EWOL_LINUX_GUI_MODE_DIRECT_FB__ is not set

config/Windows.config

@@ -1,40 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-
-#
-# Modules
-#
-CONFIG_BUILD_EDN=y
-# CONFIG_BUILD_AGG is not set
-# CONFIG_BUILD_ETK is not set
-# CONFIG_BUILD_FREETYPE is not set
-CONFIG_BUILD_GLEW=y
-# CONFIG_BUILD_LUA is not set
-# CONFIG_BUILD_OGG is not set
-# CONFIG_BUILD_PARSERSVG is not set
-# CONFIG_BUILD_LIBPNG is not set
-# CONFIG_BUILD_TINYXML is not set
-# CONFIG_BUILD_ZLIB is not set
-# CONFIG_BUILD_LIBZIP is not set
-# CONFIG_BUILD_EWOL is not set
-
-#
-# edn
-#
-
-#
-# General
-#
-CONFIG_APPL_BUFFER_FONT_NORMAL=y
-# CONFIG_APPL_BUFFER_FONT_DISTANCE_FIELD is not set
-
-#
-# ewol
-#
-
-#
-# General
-#
-CONFIG___EWOL_APPL_BASIC_TITLE__="Ewol Basic Title"
-CONFIG___EWOL_INTEGRATED_FONT__=y

data/GUI-Parameter-global.xml

@@ -0,0 +1,18 @@
+<sizer mode="vert" fill="true" expand="true">
+	<spacer fill="true" expand="true"/>
+	<checkbox name="[{ID}]appl-param:auto-indent" fill="true" expand="true,false">
+		<label>_T{Automatic Indentation}</label>
+	</checkbox>
+	<checkbox name="[{ID}]appl-param:display-space-char" fill="true" expand="true,false">
+		<label>_T{Display space char (' ')}</label>
+	</checkbox>
+	<checkbox name="[{ID}]appl-param:display-tab" fill="true" expand="true,false">
+		<label>_T{Display tabulation char ('\\t')}</label>
+	</checkbox>
+	<checkbox name="[{ID}]appl-param:display-eol" fill="true" expand="true,false">
+		<label>_T{Display end of line ('\\n')}</label>
+	</checkbox>
+	<checkbox name="[{ID}]appl-param:display-shape" fill="true" expand="true,false">
+		<label>_T{switch Rounded/default}</label>
+	</checkbox>
+</sizer>

data/GUI-Search.egi

@@ -0,0 +1,83 @@
+sizer {
+	mode: "hori"
+	expand: "true,false"
+	fill: true
+	lock: true
+	button {
+		name: "[{ID}]SEARCH:close"
+		image {
+			src: "THEME_GUI:///Remove.svg"
+			fill: true
+			size: "7,7mm"
+			hover: "_T(Close search bar)"
+		}
+	}
+	entry {
+		name: "[{ID}]SEARCH:search-entry"
+		expand: true
+		fill: true
+	}
+	button {
+		name: "[{ID}]SEARCH:search"
+		image {
+			src: "THEME_GUI:///Search.svg"
+			fill: true
+			size: "7,7mm"
+		}
+	}
+	entry {
+		name: "[{ID}]SEARCH:replace-entry"
+		expand: true
+		fill: true
+	}
+	button {
+		name: "[{ID}]SEARCH:replace"
+		image {
+			src: "THEME_GUI:///Replace.svg?lib=ewol"
+			fill: true
+			size: "7,7mm"
+		}
+	}
+	button {
+		name: "[{ID}]SEARCH:case"
+		toggle: true
+		image {
+			src: "THEME_GUI:///CaseSensitive.svg?lib=ewol"
+			fill: true
+			size: "7,7mm"
+		}
+		image {
+			src: "THEME_GUI:///CaseSensitive.svg?lib=ewol"
+			fill: true
+			size: "7,7mm"
+		}
+	}
+	button {
+		name: "[{ID}]SEARCH:wrap"
+		toggle: true
+		image {
+			src: "THEME_GUI:///WrapAround.svg?lib=ewol"
+			fill: true
+			size: "7,7mm"
+		}
+		image {
+			src: "THEME_GUI:///WrapAround.svg?lib=ewol"
+			fill: true
+			size: "7,7mm"
+		}
+	}
+	button {
+		name: "[{ID}]SEARCH:up-down"
+		toggle: true
+		image {
+			src: "THEME_GUI:///Up.svg?lib=ewol"
+			fill: true
+			size: "7,7mm"
+		}
+		image {
+			src: "THEME_GUI:///Down.svg?lib=ewol"
+			fill: true
+			size: "7,7mm"
+		}
+	}
+}

data/GUI-Search.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sizer mode="hori" expand="true,false" fill="true" lock="true">
+	<button name="[{ID}]SEARCH:close">
+		<image src="THEME_GUI:///Remove.svg" fill="true" size="7,7mm"/>
+	</button>
+	<entry name="[{ID}]SEARCH:search-entry" expand="true" fill="true"/>
+	<button name="[{ID}]SEARCH:search">
+		<image src="THEME_GUI:///Search.svg" fill="true" size="7,7mm"/>
+	</button>
+	<entry name="[{ID}]SEARCH:replace-entry" expand="true" fill="true"/>
+	<button name="[{ID}]SEARCH:replace">
+		<image src="THEME_GUI:///Replace.svg?lib=ewol" fill="true" size="7,7mm"/>
+	</button>
+	<button name="[{ID}]SEARCH:case" toggle="true">
+		<image src="THEME_GUI:///CaseSensitive.svg?lib=ewol" fill="true" size="7,7mm" hover="_T(Close search bar)"/>
+		<image src="THEME_GUI:///CaseSensitive.svg?lib=ewol" fill="true" size="7,7mm" hover="_T(Close search bar)"/>
+	</button>
+	<button name="[{ID}]SEARCH:wrap" toggle="true">
+		<image src="THEME_GUI:///WrapAround.svg?lib=ewol" fill="true" size="7,7mm" hover="_T(Close search bar)"/>
+		<image src="THEME_GUI:///WrapAround.svg?lib=ewol" fill="true" size="7,7mm" hover="_T(Close search bar)"/>
+	</button>
+	<button name="[{ID}]SEARCH:up-down" toggle="true">
+		<image src="THEME_GUI:///Up.svg?lib=ewol" fill="true" size="7,7mm" hover="_T(Close search bar)"/>
+		<image src="THEME_GUI:///Down.svg?lib=ewol" fill="true" size="7,7mm" hover="_T(Close search bar)"/>
+	</button>
+</sizer>

data/color/black.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EdnColor version="0.1">
-	<gui> <!-- Doivent tous y <20>tre de prf<72>rence ... global system acces -->
-		<color name="CODE_basicBackgroung"		val="#151515"/>
-		<color name="CODE_space" 				val="#333333"/>
-		<color name="CODE_tabulation"			val="#444444"/>
-		<color name="CODE_cursor"				val="#eadd05"/>
-		<color name="CODE_lineNumber"			val="#fff725"/>
-		<!-- Buffer list property -->
-		<color name="LIST_backgroung1"			val="#202020"/>
-		<color name="LIST_backgroung2"			val="#000000"/>
-		<color name="LIST_backgroungSelected"	val="#2f0ba4"/>
-		<color name="LIST_textNormal"			val="#EEEEEE"/>
-		<color name="LIST_textModify"			val="#FF0000"/>
-	</gui>
-	<syntax>
-		<color name="normal"				FG="#EEEEEE"/>
-		<color name="SelectedText"			FG="#AAAAAA" BG="#225a09"/>
-		<color name="error"					FG="#FF0000"/>
-		<color name="doubleQuoteText"		FG="#00fF00"/>
- 
-		<!-- hightline description : -->
-		<color name="type"					FG="#56bf10" bold="yes"/>
-		<color name="storageKeyword"		FG="#5c8fed"/>
-		<color name="number"				FG="#00ff00"/>
-		<color name="systemFunction"		FG="#ffff00"/>
-		<color name="commonDefine"			FG="#56bf10"/>
-		<color name="boolean"				FG="#214cf1"/>
-		<color name="preprocesseur"			FG="#FF0000"/>
-		<color name="comment"				FG="#ef4def" italic="yes"/>
-		<color name="commentDoxygen"		FG="#ef4d00" bold="yes" italic="yes"/>
-		<color name="keyword"				FG="#5c8fed" bold="yes"/>
-		<color name="macro" 				FG="#6c09c8" bold="yes"/>
-		<color name="SYNTAX_ERROR"  		FG="#000000" BG="#FF0000" bold="yes"/>
-		<color name="functionName"  		FG="#24d1e0" bold="yes"/>
-		<color name="TestResultOK"			FG="#000000" BG="#00FF00" bold="yes"/>
-		<color name="TestResultERROR"		FG="#000000" BG="#FF0000" bold="yes"/>
-	</syntax>
-</EdnColor>
-

data/color/white.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EdnColor version="0.1">
-	<gui> <!-- Doivent tous y <20>tre de prf<72>rence ... global system acces -->
-		<color name="CODE_basicBackgroung"		val="#d9d7d7"/>
-		<color name="CODE_space" 				val="#b7b6b6"/>
-		<color name="CODE_tabulation"			val="#a7a5a5"/>
-		<color name="CODE_cursor"				val="#2a00ff"/>
-		<color name="CODE_lineNumber"			val="#1a00a0"/>
-		<!-- Buffer list property -->
-		<color name="LIST_backgroung1"			val="#d9d7d7"/>
-		<color name="LIST_backgroung2"			val="#b7b6b6"/>
-		<color name="LIST_backgroungSelected"	val="#3da3f9"/>
-		<color name="LIST_textNormal"			val="#000000"/>
-		<color name="LIST_textModify"			val="#FF0000"/>
-	</gui>
-	<syntax>
-		<color name="normal"				FG="#000000"/>
-		<color name="SelectedText"			FG="#292929" BG="#009ce7"/>
-		<color name="error"					FG="#FF0000"/>
-		<color name="doubleQuoteText"		FG="#008e00"/>
-
-		<!-- hightline description : -->
-		<color name="type"					FG="#376d0a" bold="yes"/>
-		<color name="storageKeyword"		FG="#466cb4"/>
-		<color name="number"				FG="#007b00"/>
-		<color name="systemFunction"		FG="#acaa00"/>
-		<color name="commonDefine"			FG="#3c850b"/>
-		<color name="boolean"				FG="#1633a3"/>
-		<color name="preprocesseur"			FG="#ac0000"/>
-		<color name="comment"				FG="#b704b5" italic="yes"/>
-		<color name="commentDoxygen"		FG="#bf3e00" bold="yes" italic="yes"/>
-		<color name="keyword"				FG="#215eb8" bold="yes"/>
-		<color name="macro" 				FG="#571793" bold="yes"/>
-		<color name="SYNTAX_ERROR"  		FG="#000000" BG="#c20000" bold="yes"/>
-		<color name="functionName"  		FG="#09857e" bold="yes"/>
-		<color name="TestResultOK"			FG="#000000" BG="#009c00" bold="yes"/>
-		<color name="TestResultERROR"		FG="#000000" BG="#c20000" bold="yes"/>
-	</syntax>
-</EdnColor>
-

data/edn.desktop

@@ -1,14 +1,27 @@
 [Desktop Entry]
-Version=0.3.0
 Name=Edn : Editeur de N'ours
-Exec=edn
-Icon=Edn
+Exec=edn %U
+Icon=/usr/share/edn/icon.png
 Terminal=false
 Type=Application
-Categories=Development;Utility;TextEditor;
+Categories=Development;
 GenericName=Text editor
 GenericName[en]=Text editor
 GenericName[nl]=Tekst verwerker
-GenericName[fr]=éditeur de text
+GenericName[fr]=Éditeur de text
 Comment=Code editor for c, c++, php, bash, xml ...
 Comment[fr]=éditeur de text pour les language c, c++, php, bash, xml ...
+OnlyShowIn=GNOME;Unity;
+MimeType=text/html;text/xml;application/xhtml_xml;x-scheme-handler/http;x-scheme-handler/https;
+StartupNotify=true
+Actions=New;
+
+[Desktop Action New]
+Name=Open a New Window
+Name[fr]=Ouvrir une nouvelle fenêtre
+Name[nl]=Nieuw venster openen
+Name[en]=Open a New Window
+Exec=edn
+
+#desktop-file-validate edn.desktop
+#sudo cp xxx /usr/share/applications/

data/languages/TypeScript/highlight.xml

@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EdnLang version="0.1" lang="TypeScript">
+	<ext>(ts)</ext>
+	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
+		<rule name="doxygen multiline">
+			<color>commentDoxygen</color>
+			<regex>
+				<start>/\*(\*|!)</start>
+				<stop>\*/</stop>
+			</regex>
+			<sub>doxyparse</sub>
+		</rule>
+		<rule name="comment multiline">
+			<color>comment</color>
+			<regex>
+				<start>/\*</start>
+				<stop>\*/</stop>
+			</regex>
+			<sub>TODO</sub>
+		</rule>
+		<rule name="comment multiline ERROR">
+			<color>SYNTAX_ERROR</color>
+			<regex>
+				<start>/\*</start>
+			</regex>
+		</rule>
+		<rule name="inline doxygen">
+			<color>commentDoxygen</color>
+			<regex>//!.*$</regex>
+			<sub>doxyparse</sub>
+		</rule>
+		<rule name="inline comment">
+			<color>comment</color>
+			<regex>//.*$</regex>
+			<sub>TODO</sub>
+		</rule>
+		<rule name="double quote text">
+			<color>doubleQuoteText</color>
+			<regex>&quot;(\\(n|t|v|b|r|f|a|\\|\?|&quot;|0|o[0-7]{2}|x[0-9a-fA-F]{2}|u[0-9]{4}|U[0-9]{8})|.)*&quot;</regex>
+		</rule>
+		<rule name="simple quote text">
+			<color>doubleQuoteText</color>
+			<regex>&apos;(\\(n|t|v|b|r|f|a|\\|\?|&apos;|0|o[0-7]{2}|x[0-9a-fA-F]{2}|u[0-9]{4}|U[0-9]{8})|.)*&apos;</regex>
+		</rule>
+	</pass1>
+	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
+		
+		<rule name="my keyword">
+			<color>keyword</color>
+			<regex>\{|\}|\[|\]</regex>
+		</rule>
+		<rule name="separator">
+			<color>error</color>
+			<regex>:|,</regex>
+		</rule>
+		<rule name="numeric constant">
+			<color>number</color>
+			<regex>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</regex>
+		</rule>
+		<rule name="my boolean">
+			<color>boolean</color>
+			<regex>\@true|false\@</regex>
+		</rule>
+		<rule name="my keyword">
+			<color>keyword</color>
+			<regex>\@let|function|typeof|alert|never|implements|as|export|import|from\@</regex>
+		</rule>
+		<rule name="etk type">
+			<color>type</color>
+			<regex>\@(Array|string|any|boolean|number|void)\@</regex>
+		</rule>
+		<rule name="my storage keyword">
+			<color>storageKeyword</color>
+			<regex>\@const|class|private|public|protected|undefined|null|enum|interface|class\@</regex>
+		</rule>
+		<rule name="json member">
+			<color>memberClass</color>
+			<regex>\@[a-zA-Z_0-9_\-]+:\@</regex>
+		</rule>
+		<rule name="json member2">
+			<color>memberClass</color>
+			<regex>\@this\.[a-zA-Z_0-9_\-]+\@</regex>
+		</rule>
+		<rule name="decorator">
+			<color>systemFunction</color>
+			<regex>\@@[a-zA-Z_0-9_\-]+\(?\)?\@</regex>
+		</rule>
+		<rule name="BIG LETTER">
+			<color>macro</color>
+			<regex>\@[A-Z_][A-Z_0-9]{3,500}\@</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\@_\w+\@</regex>
+		</rule>
+		<rule name="Function name">
+			<color>functionName</color>
+			<regex>\@((\w|_)+[ \t]*\()</regex>
+		</rule>
+		<rule name="lambda">
+			<color>boolean</color>
+			<regex>=&gt;</regex>
+		</rule>
+		<rule name="condition">
+			<color>boolean</color>
+			<regex>===|==|&lt;==|&lt;=|&gt;==|&gt;=|!==|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}</regex>
+		</rule>
+		<rule name="simple operator">
+			<color>preprocesseur</color>
+			<regex>=|\+|-|&amp;|\|</regex>
+		</rule>
+		<rule name="simpleQuteTextError">
+			<color>SYNTAX_ERROR</color>
+			<regex>&apos;|&quot;</regex>
+		</rule>
+		<rule name="my keyword deprecated">
+			<color>SYNTAX_ERROR</color>
+			<regex>\@var\@</regex>
+		</rule>
+	</pass2>
+	<pass name="doxyparse">
+		<rule name="knownkey">
+			<color>doxygen-key-known</color>
+			<regex>(\@|\\)[\t ]*(addindex|addtogroup|anchor|arg|attention|author|authors|a|brief|bug|b|callgraph|category|cite|class|code|cond|copybrief|copydetails|copydoc|copyright|date|def|defgroup|deprecated|details|diafile|dir|docbookonly|dontinclude|dot|dotfile|else|elseif|em|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endif|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|endverbatim|enduml|endxmlonly|enum|example|exception|extends|e|file|fn|headerfile|hidecallergraph|hidecallgraph|hideinitializer|htmlinclude|htmlonly|idlexcept|ifnot|if|image|implements|includelineno|include|ingroup|internal|invariant|interface|latexinclude|latexonly|line|link|license|li|mainpage|manonly|memberof|msc|mscfile|name|namespace|nosubgrouping|note|n|overload|package|page|paragraph|param|parblock|par|post|pre|private|privatesection|property|protected|protectedsection|protocol|public|publicsection|pure|p|refitem|ref|related|relates|relatedalso|relatesalso|remark|remarks|result|return|returns|retval|rtfonly|sa|secreflist|section|see|short|showinitializer|since|skip|skipline|snippet|startuml|struct|subpage|subsection|subsubsection|tableofcontents|test|throw|throws|todo|tparam|typedef|union|until|var|verbatim|verbinclude|version|vhdlflow|warning|weakgroup|xmlonly|xrefitem)</regex>
+		</rule>
+		<rule name="key">
+			<color>doxygen-key</color>
+			<regex>(\@|\\)[\t ]*\w+</regex>
+		</rule>
+		<rule name="in-out">
+			<color>doxygen-in-out</color>
+			<regex>\[(in|in,out|out)\]</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\@_\w+\@</regex>
+		</rule>
+	</pass>
+	<pass name="TODO">
+		<rule name="function input">
+			<color>SYNTAX_ERROR</color>
+			<regex>TODO[ \t]*:.*$</regex>
+		</rule>
+	</pass>
+</EdnLang>

data/languages/asm/highlight.xml

@@ -1,57 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EdnLang version="0.1" lang="Assembleur">
-	<ext>*.s</ext>
-	<ext>*.S</ext>
-	<ext>*.asm</ext>
+	<ext>(s|S|asm|ASM)</ext>
 	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
 		<rule name="my comment multiline doxygen">
 			<color>commentDoxygen</color>
-			<start>/\*\*</start>
-			<end>\*/</end>
+			<regex>
+				<start>/\*(\*|!)</start>
+				<stop>\*/</stop>
+			</regex>
 		</rule>
 		<rule name="my comment multiline">
 			<color>comment</color>
-			<start>/\*</start>
-			<end>\*/</end>
+			<regex>
+				<start>/\*</start>
+				<stop>\*/</stop>
+			</regex>
 		</rule>
 		<rule name="my if 0">
 			<color>preprocesseur</color>
-			<start>#[ \t]*if 0</start>
-			<end>#endif|#else</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>
+				<start>#[ \t]*if 0</start>
+				<stop>#(endif|else)</stop>
+			</regex>
 		</rule>
 		<rule name="my preprocesseur">
 			<color>preprocesseur</color>
-			<start>#</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>#.*$</regex>
 		</rule>
 		<rule name="my comment doxygen">
 			<color>commentDoxygen</color>
-			<start>//!</start>
-			<end>\n</end>
+			<regex>//!.*$</regex>
 		</rule>
 		<rule name="my todo comment">
 			<color>SYNTAX_ERROR</color>
-			<start>//[ \t]*TODO[ \t]*:</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>//[ \t]*TODO[ \t]*:.*$</regex>
 		</rule>
 		<rule name="my comment">
 			<color>comment</color>
-			<start>(//|@)</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>(//|@).*$</regex>
 		</rule>
 	</pass1>
 	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
 		<rule name="my keyword">
 			<color>keyword</color>
-			<start>\@smull|ldrsh|smlal|stmdb|mul|mla|umull|ldr|add|str|mov|subs|bgt|ldmia|stmia|ldmfd|cmp|sub|strd|stmfd|bne|bhi|ldrd|mvn\@</start>
+			<regex>\@smull|ldrsh|smlal|stmdb|mul|mla|umull|ldr|add|str|mov|subs|bgt|ldmia|stmia|ldmfd|cmp|sub|strd|stmfd|bne|bhi|ldrd|mvn\@</regex>
 		</rule>
 		<rule name="register list">
 			<color>type</color>
-			<start>\@r(10|11|12|[0-9]?)|sp|lp|lr|pc\@</start>
+			<regex>\@r(10|11|12|[0-9]?)|sp|lp|lr|pc\@</regex>
 		</rule>
 	</pass2>
 </EdnLang>

data/languages/bash/highlight.xml

@@ -1,48 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EdnLang version="0.1" lang="Bash script">
-	<ext>*.sh</ext>
+	<ext>(sh|bash|zsh)</ext>
 	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
-		<rule name="first line">
-			<color>commentDoxygen</color>
-			<start>#!</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
+		<rule name="main declaration of executable">
+			<color>DECLARE_EXECUTABLE</color>
+			<regex>#!.*$</regex>
 		</rule>
 		<rule name="comment line">
 			<color>comment</color>
-			<start>#</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>#(\\[\\\n]|.)*$</regex>
 		</rule>
 		<rule name="doubleQuteText">
 			<color>doubleQuoteText</color>
-			<start>"</start>
-			<end>"</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>&quot;(.|\\[\\&quot;])*?&quot;</regex>
 		</rule>
 		<rule name="simpleQuteText">
 			<color>doubleQuoteText</color>
-			<start>'</start>
-			<end>'</end>
-			<!--<EscapeChar>\</EscapeChar>-->
+			<regex>&apos;(.|\\[\\&apos;])*?&apos;</regex>
 		</rule>
 	</pass1>
 	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
 		<rule name="my keyword">
 			<color>keyword</color>
-			<start>\@for|done|do|while|in|if|elif|then|else|fi\@</start>
+			<regex>\@for|done|do|while|in|if|elif|then|else|fi\@</regex>
 		</rule>
 		<rule name="my Variable">
 			<color>keyword</color>
-			<start>[\$]+[a-zA-Z_][a-zA-Z0-9_]*</start>
+			<regex>[\$]+[a-zA-Z_][a-zA-Z0-9_]*</regex>
 		</rule>
 		<rule name="Function name">
 			<color>functionName</color>
-			<start>function (\w|_)+[ \t]*\(</start>
+			<regex>function (\w|_)+[ \t]*\(</regex>
 		</rule>
 		<rule name="condition">
 			<color>boolean</color>
-			<start>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}|</start>
+			<regex>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}</regex>
 		</rule>
 	</pass2>
 </EdnLang>

data/languages/boo/highlight.xml

@@ -1,60 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EdnLang version="0.1" lang="boulou log">
-	<ext>*.boo</ext>
+<EdnLang version="0.1" lang="Boulou log">
+	<ext>(boo|BOO)</ext>
 	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
 		<rule name="comment ##">
 			<color>SYNTAX_ERROR</color>
-			<start>##</start>
-			<end>\n</end>
+			<regex>##.*$</regex>
 		</rule>
 		<rule name="comment #">
 			<color>comment</color>
-			<start>#</start>
-			<end>\n</end>
+			<regex>#.*$</regex>
 		</rule>
 		<rule name="notes ... ">
 			<color>preprocesseur</color>
-			<start>(NOTE|TODO) : </start>
-			<end>\n</end>
+			<regex>(NOTE|TODO) : .*$</regex>
 		</rule>
 		<rule name="doubleQuteText">
 			<color>doubleQuoteText</color>
-			<start>"</start>
-			<end>"</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>&quot;(.|\\[\\&quot;])*$</regex>
 		</rule>
 		<rule name="simpleQuteText">
 			<color>doubleQuoteText</color>
-			<start>\@'</start>
-			<end>'</end>
-			<!--<EscapeChar>\</EscapeChar>-->
+			<regex>\@&apos;(.|\\[\\&apos;])*$</regex>
 		</rule>
 	</pass1>
 	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
-
 		<rule name="pourcentage OK">
 			<color>TestResultOK</color>
-			<start>100%</start>
+			<regex>100%</regex>
 		</rule>
 		<rule name="pourcentage">
 			<color>number</color>
-			<start>[0-9]*%</start>
+			<regex>[0-9]*%</regex>
 		</rule>
-		<rule name="R<EFBFBD>sultat OK">
+		<rule name="Résultat OK">
 			<color>TestResultOK</color>
-			<start>\[( )*(OK|Ok|ok)( )*\]</start>
+			<regex>\[(\t| )*(OK|Ok|ok|DONE|Done|done)(\t| )*\]</regex>
 		</rule>
 		<rule name="resultat en erreur">
 			<color>TestResultERROR</color>
-			<start>\[(ERREUR|Erreur|erreur)\]</start>
+			<regex>\[(\t| )*(ERREUR|Erreur|erreur)(\t| )*\]</regex>
+		</rule>
+		<rule name="to do">
+			<color>TestResultTODO</color>
+			<regex>\[(\t| )*(TODO|Todo|todo)(\t| )*\]</regex>
 		</rule>
 		<rule name="resultat vide">
 			<color>number</color>
-			<start>\[( )*\]</start>
+			<regex>\[(\t| )*\]</regex>
 		</rule>
 		<rule name="notes ... ">
 			<color>macro</color>
-			<start>==&gt;</start>
+			<regex>==&gt;</regex>
 		</rule>
 	</pass2>
 </EdnLang>

data/languages/c/highlight.xml

@@ -1,125 +1,134 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EdnLang version="0.1" lang="c">
-	<ext>*.c</ext>
-	<ext>*.cpp</ext>
-	<ext>*.cc</ext>
-	<ext>*.h</ext>
-	<ext>*.hpp</ext>
+<EdnLang version="0.1" lang="C">
+	<ext>(c|C|m|M)</ext>
+	<!--might be : <ext>.*\.(c|h|m)</ext>-->
 	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
-		<rule name="my comment multiline doxygen">
+		<rule name="doxygen multiline">
 			<color>commentDoxygen</color>
-			<start>/\*\*</start>
-			<end>\*/</end>
-			<rule name="macro">
-				<color>macro</color>
-				<start>\@[A-Z_]{4,500}\@</start>
-			</rule>
-			<rule name="keyword">
-				<color>keyword</color>
-				<start>@\w*[ \t]*(\[(in|out| |,)*\])?[ \t]*([a-zA-Z0-9\-_]*)</start>
-				<underColor idPThese="1"></underColor><!-- (\[(in|out| |,)*\]) -->
-				<underColor idPThese="3"></underColor><!-- (([a-zA-Z0-9\-_])*) -->
-			</rule>
+			<regex>
+				<start>/\*(\*|!)</start>
+				<stop>\*/</stop>
+			</regex>
+			<sub>doxyparse</sub>
 		</rule>
-		<rule name="code Review">
-			<color>SYNTAX_ERROR</color>
-			<start>/\*[ \t]*@review</start>
-			<end>\*/</end>
-		</rule>
-		<rule name="my comment multiline">
+		<rule name="comment multiline">
 			<color>comment</color>
-			<start>/\*</start>
-			<end>\*/</end>
+			<regex>
+				<start>/\*</start>
+				<stop>\*/</stop>
+			</regex>
+			<sub>TODO</sub>
 		</rule>
-		<rule name="my if 0">
+		<rule name="comment multiline ERROR">
+			<color>SYNTAX_ERROR</color>
+			<regex>
+				<start>/\*</start>
+			</regex>
+		</rule>
+		<rule name="#if 0">
 			<color>preprocesseur</color>
-			<start>#[ \t]*if 0</start>
-			<end>#endif|#else</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>
+				<start>#[ \t]*if 0</start>
+				<stop>#(endif|else)</stop>
+			</regex>
 		</rule>
-		<rule name="my preprocesseur">
+		<rule name="#if 0 ERROR">
+			<color>SYNTAX_ERROR</color>
+			<regex>
+				<start>#[ \t]*if 0</start>
+			</regex>
+		</rule>
+		<rule name="#preproc">
 			<color>preprocesseur</color>
-			<start>#</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>#(.|\\[\\\n])*</regex>
 		</rule>
-		<rule name="my comment doxygen">
+		<rule name="inline doxygen">
 			<color>commentDoxygen</color>
-			<start>//!</start>
-			<end>\n</end>
+			<regex>//!.*</regex>
+			<sub>doxyparse</sub>
 		</rule>
-		<rule name="my todo comment">
-			<color>SYNTAX_ERROR</color>
-			<start>//[ \t]*TODO[ \t]*:</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
-		</rule>
-		<rule name="my comment">
+		<rule name="inline comment">
 			<color>comment</color>
-			<start>//</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>//.*</regex>
+			<sub>TODO</sub>
 		</rule>
-		<rule name="doubleQuteText">
+		<rule name="double quote text">
 			<color>doubleQuoteText</color>
-			<start>"</start>
-			<end>"</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>&quot;(.|\\[\\&quot;])*?&quot;</regex> <!-- " -->
 		</rule>
-		<rule name="simpleQuteText">
+		<rule name="simple quote text">
 			<color>doubleQuoteText</color>
-			<start>'</start>
-			<end>'</end>
-			<!--<EscapeChar>\</EscapeChar>-->
+			<regex>&apos;\\?.&apos;</regex>
 		</rule>
 	</pass1>
 	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
 		<rule name="my keyword">
 			<color>keyword</color>
-			<start>\@return|goto|if|else|case|default|switch|break|continue|while|do|for|sizeof\@</start>
+			<regex>\@return|goto|if|else|case|default|switch|break|continue|while|do|for|sizeof\@</regex>
 		</rule>
 		<rule name="my function keyword">
 			<color>systemFunction</color>
-			<start>\@new|delete|try|catch|memset|fopen|fread|fwrite|fgets|fclose|printf|(f|s|diag_)printf|calloc|malloc|realloc|(cyg|sup)_([a-z]|[A-Z]|[0-9]|_)+\@</start>
+			<regex>\@memset|fopen|fread|fwrite|fgets|fclose|printf|(f|s|diag_)printf|calloc|malloc|realloc\@</regex>
 		</rule>
 		<rule name="my type">
 			<color>type</color>
-			<start>\@bool|BOOL|char|double|float|u?int(8|16|32|64|128)?(_t)?|long|short|signed|size_t|unsigned|void|(I|U)(8|16|32|64|128)\@</start>
+			<regex>\@bool|char(16_t|32_t)?|double|float|u?int(8|16|32|64|128)?(_t)?|long|short|signed|size_t|unsigned|void|(I|U)(8|16|32|64|128)\@</regex>
 		</rule>
 		<rule name="my storage keyword">
 			<color>storageKeyword</color>
-			<start>\@const|class|virtual|private|public|protected|friend|const|extern|auto|register|static|unsigned|signed|volatile|char|double|float|int|long|short|void|typedef|struct|union|enum\@</start>
+			<regex>\@inline|const|const|extern|register|static|unsigned|signed|volatile|char|double|float|int|long|short|void|typedef|struct|union|enum\@</regex>
 		</rule>
 		<rule name="my common Define">
 			<color>commonDefine</color>
-			<start>\@NULL|MAX|MIN|__LINE__|__DATA__|__FILE__|__func__|__TIME__|__STDC__\@</start>
+			<regex>\@NULL|MAX|MIN|__(LINE|DATA|FILE|func|TIME|STDC|PRETTY_FUNCTION|FUNCTION)__\@</regex>
 		</rule>
 		<rule name="numeric constant">
 			<color>number</color>
-			<start>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</start>
+			<regex>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</regex>
 		</rule>
 		<rule name="my boolean">
 			<color>boolean</color>
-			<start>\@true|TRUE|false|FALSE\@</start>
+			<regex>\@TRUE|FALSE\@</regex>
 		</rule>
 		<rule name="BIG LETTER">
 			<color>macro</color>
-			<start>\@[A-Z_][A-Z_0-9]{3,500}\@</start>
+			<regex>\@([A-Z_][A-Z_0-9]{3,500})\@</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\@_\w+\@</regex>
 		</rule>
 		<rule name="Function name">
 			<color>functionName</color>
-			<start>\@(\w|_)+[ \t]*\(</start>
+			<regex>\@((\w|_)+[ \t]*\()</regex>
 		</rule>
 		<rule name="condition">
 			<color>boolean</color>
-			<start>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}|</start>
+			<regex>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}</regex>
 		</rule>
-        <!-- With all elementes : 
-		<rule name="BIG LETTER">
-			<color>macro</color>
-			<start>([A-Z]|_){4,500}</start>
-            <elemSubColor id="1">doxElem</elemSubColor>
+		<rule name="simpleQuteTextError">
+			<color>SYNTAX_ERROR</color>
+			<regex>&apos;|&quot;</regex>
 		</rule>
-        -->
 	</pass2>
+	<pass name="doxyparse">
+		<rule name="key">
+			<color>doxygen-key</color>
+			<regex>(@|\\)[\t ]*\w+</regex>
+		</rule>
+		<rule name="in-out">
+			<color>doxygen-in-out</color>
+			<regex>\[(in|in,out|out)\]</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\@_\w+\@</regex>
+		</rule>
+	</pass>
+	<pass name="TODO">
+		<rule name="function input">
+			<color>SYNTAX_ERROR</color>
+			<regex>TODO[ \t]*:.*</regex>
+		</rule>
+	</pass>
 </EdnLang>

data/languages/cmake/highlight.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EdnLang version="0.1" lang="cmake">
+	<file>CMakeLists.txt</file>
+	<file>CMakeCache.txt</file>
+	<ext>(cmake)</ext>
+	<pass1>
+		<rule name="my comment doxygen">
+			<color>commentDoxygen</color>
+			<regex>##.*$</regex>
+			<sub>doxyparse</sub>
+		</rule>
+		<rule name="my comment">
+			<color>comment</color>
+			<regex>#(.|\\[\\\n])*$</regex>
+			<sub>TODO</sub>
+		</rule>
+		<rule name="doubleQuteText">
+			<color>doubleQuoteText</color>
+			<regex>&quot;(.|\\[\\&quot;])*&quot;</regex>
+			<sub>parameters</sub>
+		</rule>
+	</pass1>
+	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
+		<rule name="files path">
+			<color>memberClass</color>
+			<regex>\@[0-9a-zA-Z\-\.]+((\.|/)\w)+\@</regex>
+		</rule>
+		<rule name="my keyword">
+			<color>keyword</color>
+			<regex>\@foreach|message|endforeach|if|else|endif|list|file|string\@</regex>
+		</rule>
+		<rule name="my function keyword">
+			<color>systemFunction</color>
+			<regex>\@set|include_directories|add_definitions|add_library|include_directories|target_link_libraries|project|include|check_include_file|enable_testing|option|cmake_minimum_required|add_definitions|check_include_file|configure_file|include_directories|add_custom_command|add_executable|add_test|find_package|pkg_check_modules|set_target_properties|source_group\@</regex>
+		</rule>
+		<rule name="Variable">
+			<color>inputFunction</color>
+			<regex>\$\{.*\}</regex>
+		</rule>
+		<rule name="numeric constant">
+			<color>number</color>
+			<regex>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</regex>
+		</rule>
+		<rule name="BIG LETTER">
+			<color>macro</color>
+			<regex>\@[A-Z_][A-Z_0-9]{3,500}\@</regex>
+		</rule>
+		<rule name="Function name">
+			<color>functionName</color>
+			<regex>\@(\w|_)+[ \t]*\(</regex>
+		</rule>
+	</pass2>
+	<pass name="doxyparse">
+		<rule name="knownkey">
+			<color>doxygen-key-known</color>
+			<regex>(\@|\\)[\t ]*(addindex|addtogroup|anchor|arg|attention|author|authors|a|brief|bug|b|callgraph|category|cite|class|code|cond|copybrief|copydetails|copydoc|copyright|date|def|defgroup|deprecated|details|diafile|dir|docbookonly|dontinclude|dot|dotfile|else|elseif|em|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endif|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|endverbatim|enduml|endxmlonly|enum|example|exception|extends|e|file|fn|headerfile|hidecallergraph|hidecallgraph|hideinitializer|htmlinclude|htmlonly|idlexcept|ifnot|if|image|implements|includelineno|include|ingroup|internal|invariant|interface|latexinclude|latexonly|line|link|license|li|mainpage|manonly|memberof|msc|mscfile|name|namespace|nosubgrouping|note|n|overload|package|page|paragraph|param|parblock|par|post|pre|private|privatesection|property|protected|protectedsection|protocol|public|publicsection|pure|p|refitem|ref|related|relates|relatedalso|relatesalso|remark|remarks|result|return|returns|retval|rtfonly|sa|secreflist|section|see|short|showinitializer|since|skip|skipline|snippet|startuml|struct|subpage|subsection|subsubsection|tableofcontents|test|throw|throws|todo|tparam|typedef|union|until|var|verbatim|verbinclude|version|vhdlflow|warning|weakgroup|xmlonly|xrefitem)</regex>
+		</rule>
+		<rule name="key">
+			<color>doxygen-key</color>
+			<regex>(\@|\\)[\t ]*\w+</regex>
+		</rule>
+		<rule name="in-out">
+			<color>doxygen-in-out</color>
+			<regex>\[(in|in,out|out)\]</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\@_\w+\@</regex>
+		</rule>
+	</pass>
+	<pass name="TODO">
+		<rule name="function input">
+			<color>SYNTAX_ERROR</color>
+			<regex>TODO[ \t]*:.*$</regex>
+		</rule>
+	</pass>
+	<pass name="parameters">
+		<rule name="Variable">
+			<color>inputFunction</color>
+			<regex>\$\{.*\}</regex>
+		</rule>
+	</pass>
+</EdnLang>

data/languages/cpp/highlight.xml

@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EdnLang version="0.1" lang="C++">
+	<ext>(cpp|CPP|cxx|CXX|cc|CC|hpp|HPP|hxx|HXX|hh|h|H|mm|MM|c\+\+|C\+\+|m\+\+|M\+\+|mpp|MPP)</ext>
+	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
+		<rule name="doxygen multiline">
+			<color>commentDoxygen</color>
+			<regex>
+				<start>/\*(\*|!)</start>
+				<stop>\*/</stop>
+			</regex>
+			<sub>doxyparse</sub>
+		</rule>
+		<rule name="comment multiline">
+			<color>comment</color>
+			<regex>
+				<start>/\*</start>
+				<stop>\*/</stop>
+			</regex>
+			<sub>TODO</sub>
+		</rule>
+		<rule name="RawText">
+			<color>doubleQuoteText</color>
+			<regex>
+				<start>R&quot;#\(</start>
+				<stop>\)#&quot;</stop>
+			</regex>
+		</rule>
+		<rule name="comment multiline ERROR">
+			<color>SYNTAX_ERROR</color>
+			<regex>
+				<start>/\*</start>
+			</regex>
+		</rule>
+		<rule name="#if 0">
+			<color>preprocesseur</color>
+			<regex>
+				<start>#[ \t]*if 0</start>
+				<stop>#e(ndif|lse)</stop>
+			</regex>
+		</rule>
+		<rule name="#if 0 ERROR">
+			<color>SYNTAX_ERROR</color>
+			<regex>
+				<start>#[ \t]*if 0</start>
+			</regex>
+		</rule>
+		<rule name="#preproc">
+			<color>preprocesseur</color>
+			<regex>#(\\[\\\n]|.)*$</regex>
+		</rule>
+		<rule name="inline doxygen">
+			<color>commentDoxygen</color>
+			<regex>//(!|/).*$</regex>
+			<sub>doxyparse</sub>
+		</rule>
+		<rule name="inline comment">
+			<color>comment</color>
+			<regex>//.*$</regex>
+			<sub>TODO</sub>
+		</rule>
+		<rule name="double quote text">
+			<color>doubleQuoteText</color>
+			<regex>(U|u|u8)?&quot;(\\(n|t|v|b|r|f|a|\\|\?|&quot;|0|o[0-7]{2}|x[0-9a-fA-F]{2}|u[0-9]{4}|U[0-9]{8})|.)*&quot;</regex>
+		</rule>
+		<rule name="simple quote text">
+			<color>doubleQuoteText</color>
+			<regex>&apos;(\\(n|t|v|b|r|f|a|\\|\?|&apos;|0|o[0-7]{2}|x[0-9a-fA-F]{2}|u[0-9]{4}|U[0-9]{8})|[^\n])&apos;</regex>
+		</rule>
+	</pass1>
+	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
+		<rule name="old school elements">
+			<color>SYNTAX_ERROR</color>
+			<regex>&apos;|&quot;|NULL|MAX|MIN|TRUE|FALSE|calloc|malloc|realloc|free|BOOL</regex>
+		</rule>
+		<rule name="my keyword">
+			<color>keyword</color>
+			<regex>\@return|goto|if|else|case|default|switch|break|continue|while|do|for|sizeof\@</regex>
+		</rule>
+		<rule name="my function keyword">
+			<color>systemFunction</color>
+			<regex>\@new|delete|try|catch|memset|fopen|fread|fwrite|fgets|fclose|printf|(f|s|diag_)printf|(reinterpret|static|dynamic|const)_cast\@</regex>
+		</rule>
+		<rule name="my type">
+			<color>type</color>
+			<regex>\@bool|char(16_t|32_t)?|double|float|u?int(8|16|32|64|128)?(_t)?|long|short|signed|size_t|unsigned|void|(I|U)(8|16|32|64|128)\@</regex>
+		</rule>
+		<rule name="std type">
+			<color>type</color>
+			<regex>\@std::[a-zA-Z_:][\w:]*\@</regex>
+		</rule>
+		<rule name="etk type">
+			<color>type</color>
+			<regex>\@etk::(Map|Set|Path|Uri|Vector|Array|List|Function|String|UString|RegEx|Pair|NullPtr|Color|Exception|exception::(InvalidArgument|DomainError|LengthError|OutOfRange|RangeError|OverflowError|UnderflowError|CastError|AllocationError|RuntimeError))\@</regex>
+		</rule>
+		<rule name="ememory type">
+			<color>type</color>
+			<regex>\@ememory::(SharedPtr|WeakPtr|EnableSharedFromThis|Counter|RefCounter|RefPtr|UniquePtr)\@</regex>
+		</rule>
+		<rule name="my storage keyword">
+			<color>storageKeyword</color>
+			<regex>\@inline|const|class|namespace|virtual|private|public|protected|friend|const|extern|mutable|auto|register|static|unsigned|signed|volatile|char|double|float|int|long|short|void|typedef|struct|union|enum|override|final\@</regex>
+		</rule>
+		<rule name="my common Define">
+			<color>commonDefine</color>
+			<regex>\@nullptr|null|__(LINE|DATA|FILE|func|TIME|STDC|PRETTY_FUNCTION|FUNCTION)__\@</regex>
+		</rule>
+		<rule name="numeric constant">
+			<color>number</color>
+			<regex>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(LL|L|l|UL|ul|u|U|F|f)?\@</regex>
+		</rule>
+		<rule name="my boolean">
+			<color>boolean</color>
+			<regex>\@true|false\@</regex>
+		</rule>
+		<rule name="BIG LETTER">
+			<color>macro</color>
+			<regex>\@[A-Z_][A-Z_0-9]{3,500}\@</regex>
+		</rule>
+		<rule name="CPP member">
+			<color>memberClass</color>
+			<regex>\@((m|s|p|s|g)_|property|signal)\w+\@</regex>
+		</rule>
+		<rule name="CPP member (bad version)">
+			<color>memberClass</color>
+			<regex>\@\w+_\@</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\@_\w+\@</regex>
+		</rule>
+		<rule name="Function name">
+			<color>functionName</color>
+			<regex>\@((\w|_)+[ \t]*\()</regex>
+		</rule>
+		<rule name="condition">
+			<color>boolean</color>
+			<regex>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}</regex>
+		</rule>
+		<rule name="simpleQuteTextError">
+			<color>SYNTAX_ERROR</color>
+			<regex>&apos;|&quot;</regex>
+		</rule>
+	</pass2>
+	<pass name="doxyparse">
+		<rule name="knownkey">
+			<color>doxygen-key-known</color>
+			<regex>(\@|\\)[\t ]*(addindex|addtogroup|anchor|arg|attention|author|authors|a|brief|bug|b|callgraph|category|cite|class|code|cond|copybrief|copydetails|copydoc|copyright|date|def|defgroup|deprecated|details|diafile|dir|docbookonly|dontinclude|dot|dotfile|else|elseif|em|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endif|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|endverbatim|enduml|endxmlonly|enum|example|exception|extends|e|file|fn|headerfile|hidecallergraph|hidecallgraph|hideinitializer|htmlinclude|htmlonly|idlexcept|ifnot|if|image|implements|includelineno|include|ingroup|internal|invariant|interface|latexinclude|latexonly|line|link|license|li|mainpage|manonly|memberof|msc|mscfile|name|namespace|nosubgrouping|note|n|overload|package|page|paragraph|param|parblock|par|post|pre|private|privatesection|property|protected|protectedsection|protocol|public|publicsection|pure|p|refitem|ref|related|relates|relatedalso|relatesalso|remark|remarks|result|return|returns|retval|rtfonly|sa|secreflist|section|see|short|showinitializer|since|skip|skipline|snippet|startuml|struct|subpage|subsection|subsubsection|tableofcontents|test|throw|throws|todo|tparam|typedef|union|until|var|verbatim|verbinclude|version|vhdlflow|warning|weakgroup|xmlonly|xrefitem)</regex>
+		</rule>
+		<rule name="key">
+			<color>doxygen-key</color>
+			<regex>(\@|\\)[\t ]*\w+</regex>
+		</rule>
+		<rule name="in-out">
+			<color>doxygen-in-out</color>
+			<regex>\[(in|in,out|out)\]</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\@_\w+\@</regex>
+		</rule>
+	</pass>
+	<pass name="TODO">
+		<rule name="function input">
+			<color>SYNTAX_ERROR</color>
+			<regex>TODO[ \t]*:.*$</regex>
+		</rule>
+	</pass>
+</EdnLang>

data/languages/css/highlight.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EdnLang version="0.1" lang="JavaScript">
+	<ext>(css|less|scss)</ext>
+	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
+		<rule name="doxygen multiline">
+			<color>commentDoxygen</color>
+			<regex>
+				<start>/\*(\*|!)</start>
+				<stop>\*/</stop>
+			</regex>
+			<sub>doxyparse</sub>
+		</rule>
+		<rule name="comment multiline">
+			<color>comment</color>
+			<regex>
+				<start>/\*</start>
+				<stop>\*/</stop>
+			</regex>
+			<sub>TODO</sub>
+		</rule>
+		<rule name="comment multiline ERROR">
+			<color>SYNTAX_ERROR</color>
+			<regex>
+				<start>/\*</start>
+			</regex>
+		</rule>
+		<rule name="inline doxygen">
+			<color>commentDoxygen</color>
+			<regex>//!.*$</regex>
+			<sub>doxyparse</sub>
+		</rule>
+		<rule name="inline comment">
+			<color>comment</color>
+			<regex>//.*$</regex>
+			<sub>TODO</sub>
+		</rule>
+		<rule name="double quote text">
+			<color>doubleQuoteText</color>
+			<regex>&quot;(\\(n|t|v|b|r|f|a|\\|\?|&quot;|0|o[0-7]{2}|x[0-9a-fA-F]{2}|u[0-9]{4}|U[0-9]{8})|.)*&quot;</regex>
+		</rule>
+		<rule name="simple quote text">
+			<color>doubleQuoteText</color>
+			<regex>&apos;(\\(n|t|v|b|r|f|a|\\|\?|&apos;|0|o[0-7]{2}|x[0-9a-fA-F]{2}|u[0-9]{4}|U[0-9]{8})|.)*&apos;</regex>
+		</rule>
+	</pass1>
+	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
+		
+		<rule name="my keyword">
+			<color>keyword</color>
+			<regex>\{|\}|\[|\]</regex>
+		</rule>
+		<rule name="numeric constant">
+			<color>number</color>
+			<regex>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</regex>
+		</rule>
+		<rule name="my boolean">
+			<color>boolean</color>
+			<regex>\@true|false\@</regex>
+		</rule>
+		<rule name="class element">
+			<color>keyword</color>
+			<regex>\.[a-zA-Z0-9\-_\.]+\@</regex>
+		</rule>
+		<rule name="decorator">
+			<color>macro</color>
+			<regex>:[a-zA-Z0-9\-_\.]+\@</regex>
+		</rule>
+		<rule name="systemKey">
+			<color>type</color>
+			<regex>#[a-zA-Z0-9\-_\.]+\@</regex>
+		</rule>
+		<rule name="keyword">
+			<color>systemFunction</color>
+			<regex>(position|margin|width|float|display|height|border|background|padding):</regex>
+		</rule>
+		<rule name="keyword">
+			<color>functionName</color>
+			<regex>\@[a-zA-Z0-9\-_\.]+:</regex>
+		</rule>
+		<rule name="condition">
+			<color>boolean</color>
+			<regex>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}</regex>
+		</rule>
+		<rule name="simple operator">
+			<color>preprocesseur</color>
+			<regex>=|\+|-|&amp;|\|</regex>
+		</rule>
+		<rule name="dimentionPX">
+			<color>commonDefine</color>
+			<regex>\@[0-9]+px\@</regex>
+		</rule>
+		<rule name="simpleQuteTextError">
+			<color>SYNTAX_ERROR</color>
+			<regex>&apos;|&quot;</regex>
+		</rule>
+	</pass2>
+	<pass name="doxyparse">
+		<rule name="knownkey">
+			<color>doxygen-key-known</color>
+			<regex>(\@|\\)[\t ]*(addindex|addtogroup|anchor|arg|attention|author|authors|a|brief|bug|b|callgraph|category|cite|class|code|cond|copybrief|copydetails|copydoc|copyright|date|def|defgroup|deprecated|details|diafile|dir|docbookonly|dontinclude|dot|dotfile|else|elseif|em|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endif|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|endverbatim|enduml|endxmlonly|enum|example|exception|extends|e|file|fn|headerfile|hidecallergraph|hidecallgraph|hideinitializer|htmlinclude|htmlonly|idlexcept|ifnot|if|image|implements|includelineno|include|ingroup|internal|invariant|interface|latexinclude|latexonly|line|link|license|li|mainpage|manonly|memberof|msc|mscfile|name|namespace|nosubgrouping|note|n|overload|package|page|paragraph|param|parblock|par|post|pre|private|privatesection|property|protected|protectedsection|protocol|public|publicsection|pure|p|refitem|ref|related|relates|relatedalso|relatesalso|remark|remarks|result|return|returns|retval|rtfonly|sa|secreflist|section|see|short|showinitializer|since|skip|skipline|snippet|startuml|struct|subpage|subsection|subsubsection|tableofcontents|test|throw|throws|todo|tparam|typedef|union|until|var|verbatim|verbinclude|version|vhdlflow|warning|weakgroup|xmlonly|xrefitem)</regex>
+		</rule>
+		<rule name="key">
+			<color>doxygen-key</color>
+			<regex>(\@|\\)[\t ]*\w+</regex>
+		</rule>
+		<rule name="in-out">
+			<color>doxygen-in-out</color>
+			<regex>\[(in|in,out|out)\]</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\@_\w+\@</regex>
+		</rule>
+	</pass>
+	<pass name="TODO">
+		<rule name="function input">
+			<color>SYNTAX_ERROR</color>
+			<regex>TODO[ \t]*:.*$</regex>
+		</rule>
+	</pass>
+</EdnLang>

data/languages/gcov/highlight.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EdnLang version="0.1" lang="gcov">
+	<ext>(gcov)</ext>
+	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
+		<rule name="Not parsed">
+			<color>normal</color>
+			<regex>( )+\-:.*</regex>
+		</rule>
+		<rule name="Not executed">
+			<color>SYNTAX_ERROR</color>
+			<regex>( )+(#)+:.*</regex>
+		</rule>
+		<rule name="Not parsed">
+			<color>number</color>
+			<regex>( )+[0-9]+:.*</regex>
+		</rule>
+	</pass1>
+	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
+	</pass2>
+</EdnLang>

data/languages/glsl/highlight.xml

@@ -1,82 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EdnLang version="0.1" lang="glsl">
-	<ext>*.glsl</ext>
-	<ext>*.vert</ext>
-	<ext>*.frag</ext>
-	<ext>*.prog</ext>
+<EdnLang version="0.1" lang="Glsl">
+	<ext>(glsl|vert|frag|prog)</ext>
 	<pass1>
 		<rule name="my comment multiline doxygen">
 			<color>commentDoxygen</color>
-			<start>/\*\*</start>
-			<end>\*/</end>
+			<regex>
+				<start>/\*(\*|!)</start>
+				<stop>\*/</stop>
+			</regex>
 		</rule>
 		<rule name="my comment multiline">
 			<color>comment</color>
-			<start>/\*</start>
-			<end>\*/</end>
+			<regex>
+				<start>/\*</start>
+				<stop>\*/</stop>
+			</regex>
 		</rule>
 		<rule name="my if 0">
 			<color>preprocesseur</color>
-			<start>#[ \t]*if 0</start>
-			<end>#endif|#else</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>
+				<start>#[ \t]*if 0</start>
+				<stop>#(endif|else)</stop>
+			</regex>
 		</rule>
 		<rule name="my preprocesseur">
 			<color>preprocesseur</color>
-			<start>#</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>#(.|\\[\\\n])*$</regex>
 		</rule>
 		<rule name="my comment doxygen">
 			<color>commentDoxygen</color>
-			<start>//!</start>
-			<end>\n</end>
+			<regex>//!(.|\\[\\\n])*$</regex>
 		</rule>
 		<rule name="my todo comment">
 			<color>SYNTAX_ERROR</color>
-			<start>//[ \t]*TODO[ \t]*:</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>//[ \t]*TODO[ \t]*:(.|\\[\\\n])*$</regex>
 		</rule>
 		<rule name="my comment">
 			<color>comment</color>
-			<start>//</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>//(.|\\[\\\n])*$</regex>
 		</rule>
 	</pass1>
 	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
 		<rule name="my keyword">
 			<color>keyword</color>
-			<start>\@return|goto|if|else|case|default|switch|break|continue|while|do|for|sizeof\@</start>
+			<regex>\@return|goto|if|else|case|default|switch|break|continue|while|do|for|sizeof\@</regex>
 		</rule>
 		<rule name="my type">
 			<color>type</color>
-			<start>\@void|bool|float|int|(vec|mat|ivect|bvect)[2-4]\@</start>
+			<regex>\@void|bool|float|int|(vec|mat|ivec|bvec)[2-4]\@</regex>
 		</rule>
 		<rule name="my storage keyword">
 			<color>storageKeyword</color>
-			<start>\@varying|uniform|attribute|precision|mediump\@</start>
+			<regex>\@varying|uniform|attribute|precision|mediump\@</regex>
 		</rule>
 		<rule name="numeric constant">
 			<color>number</color>
-			<start>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</start>
+			<regex>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</regex>
 		</rule>
 		<rule name="my boolean">
 			<color>boolean</color>
-			<start>\@true|false\@</start>
+			<regex>\@true|false\@</regex>
 		</rule>
 		<rule name="BIG LETTER">
 			<color>macro</color>
-			<start>\@[A-Z_][A-Z_0-9]{3,500}\@</start>
+			<regex>\@[A-Z_][A-Z_0-9]{3,500}\@</regex>
 		</rule>
 		<rule name="Function name">
 			<color>functionName</color>
-			<start>\@(\w|_)+[ \t]*\(</start>
+			<regex>\@(\w|_)+[ \t]*\(</regex>
 		</rule>
 		<rule name="condition">
 			<color>boolean</color>
-			<start>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}|</start>
+			<regex>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}</regex>
 		</rule>
 	</pass2>
 </EdnLang>

data/languages/in/highlight.xml

@@ -1,46 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EdnLang version="0.1" lang="qconf configuration file">
-	<ext>*.in</ext>
+<EdnLang version="0.1" lang="Kernel conf file">
+	<ext>in</ext>
 	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
 		<rule name="my preprocesseur">
 			<color>preprocesseur</color>
-			<start>#</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>#(.|\\[\\\n])*$</regex>
 		</rule>
 		<rule name="doubleQuteText">
 			<color>doubleQuoteText</color>
-			<start>"</start>
-			<end>"</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>&quot;(.|\\[\\&quot;])*$</regex>
 		</rule>
 		<rule name="simpleQuteText">
 			<color>doubleQuoteText</color>
-			<start>'</start>
-			<end>'</end>
-			<!--<EscapeChar>\</EscapeChar>-->
+			<regex>&apos;(.|\\[\\&apos;])*$</regex>
 		</rule>
 	</pass1>
 	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
 		<rule name="my keyword">
 			<color>keyword</color>
-			<start>\@menu|endmenu|comment|if|endif|help|default|choice|endchoice|prompt|depends on|config\@</start>
+			<regex>\@menu|endmenu|comment|if|endif|help|default|choice|endchoice|prompt|depends on|config\@</regex>
 		</rule>
 		<rule name="my type">
 			<color>type</color>
-			<start>\@int|hex|bool|string\@</start>
+			<regex>\@int|hex|bool|string\@</regex>
 		</rule>
 		<rule name="numeric constant">
 			<color>number</color>
-			<start>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</start>
+			<regex>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</regex>
 		</rule>
 		<rule name="BIG LETTER">
 			<color>macro</color>
-			<start>\@[A-Z_][A-Z_0-9]{3,500}\@</start>
+			<regex>\@[A-Z_][A-Z_0-9]{3,500}\@</regex>
 		</rule>
 		<rule name="condition">
 			<color>boolean</color>
-			<start>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}|</start>
+			<regex>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}</regex>
 		</rule>
 	</pass2>
 </EdnLang>

data/languages/java/highlight.xml

@@ -1,87 +1,116 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EdnLang version="0.1" lang="java">
-	<ext>*.java</ext>
+<EdnLang version="0.1" lang="Java">
+	<ext>(java|JAVA)</ext>
 	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
-		<rule name="my comment multiline doxygen">
+		<rule name="doxygen multiline">
 			<color>commentDoxygen</color>
-			<start>/\*\*</start>
-			<end>\*/</end>
+			<regex>
+				<start>/\*(\*|!)</start>
+				<stop>\*/</stop>
+			</regex>
+			<sub>doxyparse</sub>
 		</rule>
-		<rule name="my comment multiline">
+		<rule name="comment multiline">
 			<color>comment</color>
-			<start>/\*</start>
-			<end>\*/</end>
+			<regex>
+				<start>/\*</start>
+				<stop>\*/</stop>
+			</regex>
+			<sub>TODO</sub>
 		</rule>
-		<rule name="my comment doxygen">
-			<color>commentDoxygen</color>
-			<start>//!</start>
-			<end>\n</end>
-		</rule>
-		<rule name="my todo comment">
+		<rule name="comment multiline ERROR">
 			<color>SYNTAX_ERROR</color>
-			<start>//[ \t]*TODO[ \t]*:</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>
+				<start>/\*(\*|!)</start>
+			</regex>
 		</rule>
-		<rule name="my comment">
+		<rule name="inline doxygen">
+			<color>commentDoxygen</color>
+			<regex>//!.*$</regex>
+			<sub>doxyparse</sub>
+		</rule>
+		<rule name="inline comment">
 			<color>comment</color>
-			<start>//</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>//.*$</regex>
+			<sub>TODO</sub>
 		</rule>
-		<rule name="doubleQuteText">
+		<rule name="double quote text">
 			<color>doubleQuoteText</color>
-			<start>"</start>
-			<end>"</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>(U|u|u8)?&quot;(.|\\[\\&quot;])*&quot;</regex> <!-- " -->
 		</rule>
-		<rule name="simpleQuteText">
+		<rule name="simple quote text">
 			<color>doubleQuoteText</color>
-			<start>'</start>
-			<end>'</end>
-			<!--<EscapeChar>\</EscapeChar>-->
+			<regex>&apos;\\?.&apos;</regex>
 		</rule>
 	</pass1>
 	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
 		<rule name="my keyword">
 			<color>keyword</color>
-			<start>\@return|goto|if|else|case|default|switch|break|continue|while|do|for\@</start>
+			<regex>\@return|goto|if|else|case|default|switch|break|continue|while|do|for\@</regex>
 		</rule>
 		<rule name="my function keyword">
 			<color>systemFunction</color>
-			<start>\@new|try|catch|print\@</start>
+			<regex>\@new|try|catch|print\@</regex>
 		</rule>
 		<rule name="my type">
 			<color>type</color>
-			<start>\@boolean|byte|char|double|float|int|long|short|String|Object|Thread|void|enum\@</start>
+			<regex>\@boolean|byte|char|double|float|int|long|short|String|Object|Thread|void|enum\@</regex>
 		</rule>
 		<rule name="my storage keyword">
 			<color>storageKeyword</color>
-			<start>\@import|package|extends|Override|implements|const|class|abstract|private|public|protected|final|const|static|transiant|volatile|interface@</start>
+			<regex>\@import|package|extends|Override|implements|const|class|abstract|private|public|protected|final|const|static|transiant|volatile|interface@</regex>
 		</rule>
 		<rule name="my common Define">
 			<color>commonDefine</color>
-			<start>\@null\@</start>
+			<regex>\@null\@</regex>
 		</rule>
 		<rule name="numeric constant">
 			<color>number</color>
-			<start>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</start>
+			<regex>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</regex>
 		</rule>
 		<rule name="my boolean">
 			<color>boolean</color>
-			<start>\@true|false\@</start>
+			<regex>\@true|false\@</regex>
 		</rule>
 		<rule name="BIG LETTER">
 			<color>macro</color>
-			<start>\@[A-Z_][A-Z_0-9]{3,500}\@</start>
+			<regex>\@[A-Z_][A-Z_0-9]{3,500}\@</regex>
+		</rule>
+		<rule name="java member">
+			<color>memberClass</color>
+			<regex>\@m_\w+\@</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\@_\w+\@</regex>
 		</rule>
 		<rule name="Function name">
 			<color>functionName</color>
-			<start>\@(\w|_)+[ \t]*\(</start>
+			<regex>\@((\w|_)+[ \t]*\()</regex>
 		</rule>
 		<rule name="condition">
 			<color>boolean</color>
-			<start>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}|</start>
+			<regex>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}</regex>
 		</rule>
 	</pass2>
+	<pass name="doxyparse">
+		<rule name="key">
+			<color>doxygen-key</color>
+			<regex>(\@|\\)[\t ]*\w+</regex>
+		</rule>
+		<rule name="in-out">
+			<color>doxygen-in-out</color>
+			<regex>\[(in|in,out|out)\]</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\@_\w+\@</regex>
+		</rule>
+	</pass>
+	<pass name="TODO">
+		<rule name="function input">
+			<color>SYNTAX_ERROR</color>
+			<regex>TODO[ \t]*:.*</regex>
+		</rule>
+	</pass>
 </EdnLang>

data/languages/js/highlight.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EdnLang version="0.1" lang="JavaScript">
+	<ext>(js)</ext>
+	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
+		<rule name="doxygen multiline">
+			<color>commentDoxygen</color>
+			<regex>
+				<start>/\*(\*|!)</start>
+				<stop>\*/</stop>
+			</regex>
+			<sub>doxyparse</sub>
+		</rule>
+		<rule name="comment multiline">
+			<color>comment</color>
+			<regex>
+				<start>/\*</start>
+				<stop>\*/</stop>
+			</regex>
+			<sub>TODO</sub>
+		</rule>
+		<rule name="comment multiline ERROR">
+			<color>SYNTAX_ERROR</color>
+			<regex>
+				<start>/\*</start>
+			</regex>
+		</rule>
+		<rule name="inline doxygen">
+			<color>commentDoxygen</color>
+			<regex>//!.*$</regex>
+			<sub>doxyparse</sub>
+		</rule>
+		<rule name="inline comment">
+			<color>comment</color>
+			<regex>//.*$</regex>
+			<sub>TODO</sub>
+		</rule>
+		<rule name="double quote text">
+			<color>doubleQuoteText</color>
+			<regex>&quot;(\\(n|t|v|b|r|f|a|\\|\?|&quot;|0|o[0-7]{2}|x[0-9a-fA-F]{2}|u[0-9]{4}|U[0-9]{8})|.)*&quot;</regex>
+		</rule>
+		<rule name="simple quote text">
+			<color>doubleQuoteText</color>
+			<regex>&apos;(\\(n|t|v|b|r|f|a|\\|\?|&apos;|0|o[0-7]{2}|x[0-9a-fA-F]{2}|u[0-9]{4}|U[0-9]{8})|.)*&apos;</regex>
+		</rule>
+	</pass1>
+	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
+		
+		<rule name="my keyword">
+			<color>keyword</color>
+			<regex>\{|\}|\[|\]</regex>
+		</rule>
+		<rule name="separator">
+			<color>error</color>
+			<regex>:|,</regex>
+		</rule>
+		<rule name="numeric constant">
+			<color>number</color>
+			<regex>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</regex>
+		</rule>
+		<rule name="my boolean">
+			<color>boolean</color>
+			<regex>\@true|false\@</regex>
+		</rule>
+		<rule name="my keyword">
+			<color>keyword</color>
+			<regex>\@let|var|function|typeof|alert\@</regex>
+		</rule>
+		<rule name="BIG LETTER">
+			<color>macro</color>
+			<regex>\@[A-Z_][A-Z_0-9]{3,500}\@</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\@_\w+\@</regex>
+		</rule>
+		<rule name="Function name">
+			<color>functionName</color>
+			<regex>\@((\w|_)+[ \t]*\()</regex>
+		</rule>
+		<rule name="lambda">
+			<color>boolean</color>
+			<regex>=&gt;</regex>
+		</rule>
+		<rule name="condition">
+			<color>boolean</color>
+			<regex>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}</regex>
+		</rule>
+		<rule name="simple operator">
+			<color>preprocesseur</color>
+			<regex>=|\+|-|&amp;|\|</regex>
+		</rule>
+		<rule name="simpleQuteTextError">
+			<color>SYNTAX_ERROR</color>
+			<regex>&apos;|&quot;</regex>
+		</rule>
+	</pass2>
+	<pass name="doxyparse">
+		<rule name="knownkey">
+			<color>doxygen-key-known</color>
+			<regex>(\@|\\)[\t ]*(addindex|addtogroup|anchor|arg|attention|author|authors|a|brief|bug|b|callgraph|category|cite|class|code|cond|copybrief|copydetails|copydoc|copyright|date|def|defgroup|deprecated|details|diafile|dir|docbookonly|dontinclude|dot|dotfile|else|elseif|em|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endif|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|endverbatim|enduml|endxmlonly|enum|example|exception|extends|e|file|fn|headerfile|hidecallergraph|hidecallgraph|hideinitializer|htmlinclude|htmlonly|idlexcept|ifnot|if|image|implements|includelineno|include|ingroup|internal|invariant|interface|latexinclude|latexonly|line|link|license|li|mainpage|manonly|memberof|msc|mscfile|name|namespace|nosubgrouping|note|n|overload|package|page|paragraph|param|parblock|par|post|pre|private|privatesection|property|protected|protectedsection|protocol|public|publicsection|pure|p|refitem|ref|related|relates|relatedalso|relatesalso|remark|remarks|result|return|returns|retval|rtfonly|sa|secreflist|section|see|short|showinitializer|since|skip|skipline|snippet|startuml|struct|subpage|subsection|subsubsection|tableofcontents|test|throw|throws|todo|tparam|typedef|union|until|var|verbatim|verbinclude|version|vhdlflow|warning|weakgroup|xmlonly|xrefitem)</regex>
+		</rule>
+		<rule name="key">
+			<color>doxygen-key</color>
+			<regex>(\@|\\)[\t ]*\w+</regex>
+		</rule>
+		<rule name="in-out">
+			<color>doxygen-in-out</color>
+			<regex>\[(in|in,out|out)\]</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\@_\w+\@</regex>
+		</rule>
+	</pass>
+	<pass name="TODO">
+		<rule name="function input">
+			<color>SYNTAX_ERROR</color>
+			<regex>TODO[ \t]*:.*$</regex>
+		</rule>
+	</pass>
+</EdnLang>

data/languages/json/highlight.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EdnLang version="0.1" lang="Json">
+	<ext>(json|JSON)</ext>
+	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
+		<rule name="doubleQuteText">
+			<color>doubleQuoteText</color>
+			<regex>&quot;(.|\\[\\&quot;])*?&quot;</regex>
+		</rule>
+		<rule name="my comment">
+			<color>comment</color>
+			<regex>#.*</regex>
+		</rule>
+	</pass1>
+	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
+		<rule name="my keyword">
+			<color>keyword</color>
+			<regex>\{|\}|\[|\]</regex>
+		</rule>
+		<rule name="separator">
+			<color>error</color>
+			<regex>:|,</regex>
+		</rule>
+		<rule name="names">
+			<color>functionName</color>
+			<regex>[a-zA-Z0-9\-_]+</regex>
+		</rule>
+		<rule name="numeric constant">
+			<color>number</color>
+			<regex>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</regex>
+		</rule>
+		<rule name="my boolean">
+			<color>boolean</color>
+			<regex>\@true|false\@</regex>
+		</rule>
+	</pass2>
+</EdnLang>

data/languages/lua/highlight.xml

@@ -1,60 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EdnLang version="0.1" lang="c">
-	<ext>*.lua</ext>
+<EdnLang version="0.1" lang="Lua">
+	<ext>lua</ext>
 	<pass1>
 		<rule name="Comment multiline">
 			<color>comment</color>
-			<start>\-\-\[\[</start>
-			<end>\-\-\]\]</end>
+			<regex>
+				<start>\-\-\[\[</start>
+				<stop>\-\-\]\]</stop>
+			</regex>
 		</rule>
 		<rule name="my todo comment">
 			<color>SYNTAX_ERROR</color>
-			<start>\-\-[ \t]*TODO[ \t]*:</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>\-\-[ \t]*TODO[ \t]*:(.|\\[\\\n])*$</regex>
 		</rule>
 		<rule name="my comment">
 			<color>comment</color>
-			<start>\-\-</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>\-\-(.|\\[\\\n])*$</regex>
 		</rule>
 		<rule name="doubleQuteText">
 			<color>doubleQuoteText</color>
-			<start>"</start>
-			<end>"</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>&quot;(.|\\[\\&quot;])*&quot;</regex>
 		</rule>
 		<rule name="simpleQuteText">
 			<color>doubleQuoteText</color>
-			<start>'</start>
-			<end>'</end>
+			<regex>&apos;(.|\\[\\&apos;])*&apos;</regex>
 		</rule>
 	</pass1>
 	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
 		<rule name="my keyword">
 			<color>keyword</color>
-			<start>\@and|break|do|else|elseif|end|for|function|if|in|local|nil|not|or|repeat|return|then|until|while\@</start>
+			<regex>\@and|break|do|elseif|else|end|for|function|if|in|local|nil|not|or|repeat|return|then|until|while|require\@</regex>
 		</rule>
 		<rule name="numeric constant">
 			<color>number</color>
-			<start>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</start>
+			<regex>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</regex>
 		</rule>
 		<rule name="my boolean">
 			<color>boolean</color>
-			<start>\@true|false\@</start>
+			<regex>\@true|false\@</regex>
 		</rule>
 		<rule name="BIG LETTER">
 			<color>macro</color>
-			<start>\@[A-Z_][A-Z_0-9]{3,500}\@</start>
+			<regex>\@[A-Z_][A-Z_0-9]{3,500}\@</regex>
 		</rule>
 		<rule name="Function name">
 			<color>functionName</color>
-			<start>\@(\w|_)+[ \t]*\(</start>
+			<regex>\@(\w|_)+[ \t]*\(</regex>
 		</rule>
 		<rule name="condition">
 			<color>boolean</color>
-			<start>==|&lt;=|&gt;=|~=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}|</start>
+			<regex>==|&lt;=|&gt;=|~=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}</regex>
 		</rule>
 	</pass2>
 </EdnLang>

data/languages/makefile/highlight.xml

@@ -1,43 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EdnLang version="0.1" lang="Makefiles">
-	<ext>Makefile</ext>
-	<ext>*.mk</ext>
-	<ext>*.global</ext>
+	<file>Makefile</file>
+	<ext>(mk|global)</ext>
 	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
 		<rule name="my preprocesseur">
 			<color>preprocesseur</color>
-			<start>#</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>#(.|\\[\\\n])*$</regex>
 		</rule>
 		<rule name="doubleQuteText">
 			<color>doubleQuoteText</color>
-			<start>"</start>
-			<end>"</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>&quot;(.|\\[\\&quot;])*&quot;</regex>
 		</rule>
 		<rule name="simpleQuteText">
 			<color>doubleQuoteText</color>
-			<start>'</start>
-			<end>'</end>
+			<regex>&apos;(.|\\[\\&apos;])*&apos;</regex>
 		</rule>
 	</pass1>
 	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
 		<rule name="confition">
 			<color>type</color>
-			<start>\@if|ifed|ifneq|else|endif\@</start>
+			<regex>\@if|ifeq|ifneq|else|endif|define|endef\@</regex>
 		</rule>
 		<rule name="my keyword">
 			<color>keyword</color>
-			<start>\$\([a-zA-Z_][a-zA-Z0-9_]*\)</start>
+			<regex>\$\([a-zA-Z_][a-zA-Z0-9_]*\)</regex>
 		</rule>
 		<rule name="function call">
 			<color>functionName</color>
-			<start>\$\((call|info|error|warning|shell|patsubst|lastword|wildcard|addprefix|foreach|subst|if|word|eval)</start>
+			<regex>\$\((call|info|error|warning|shell|patsubst|lastword|wildcard|addprefix|foreach|subst|word|eval)</regex>
 		</rule>
 		<rule name="condition">
 			<color>boolean</color>
-			<start>:=|?=|!=|=</start>
+			<regex>:=|\?=|!=|=</regex>
 		</rule>
 	</pass2>
 </EdnLang>

data/languages/matlab/highlight.xml

@@ -1,62 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EdnLang version="0.1" lang="matlab">
-	<ext>*.m</ext>
-	<ext>*.M</ext>
+<EdnLang version="0.1" lang="Matlab">
+	<ext>(m|M)</ext>
 	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
 		<rule name="my comment doxygen">
 			<color>commentDoxygen</color>
-			<start>%%</start>
-			<end>\n</end>
+			<regex>%%(.|\\[\\\n])*$</regex>
 		</rule>
 		<rule name="my comment">
 			<color>comment</color>
-			<start>%</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>%(.|\\[\\\n])*$</regex>
 		</rule>
 		<rule name="doubleQuteText">
 			<color>doubleQuoteText</color>
-			<start> "</start>
-			<end>("|\n)</end>
-			<EscapeChar>\</EscapeChar>
+			<regex> &quot;.*($|&quot;)</regex>
 		</rule>
 		<rule name="simpleQuteText">
 			<color>doubleQuoteText</color>
-			<start> '</start>
-			<end>('|\n)</end>
-			<!--<EscapeChar>\</EscapeChar>-->
+			<regex> &apos;.*($|&apos;)</regex>
 		</rule>
 		<rule name="global inclusion">
 			<color>preprocesseur</color>
-			<start>global( |\t)+</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>global( |\t)+(.|\\[\\\n])*$</regex>
 		</rule>
 	</pass1>
 	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
 		<rule name="my keyword">
 			<color>keyword</color>
-			<start>\@return|goto|if|else|case|default|switch|break|continue|while|do|for|otherwise|end\@</start>
+			<regex>\@return|goto|if|else|case|default|switch|break|continue|while|do|for|otherwise|end\@</regex>
 		</rule>
 		<rule name="my boolean">
 			<color>boolean</color>
-			<start>\@true|false\@</start>
+			<regex>\@true|false\@</regex>
 		</rule>
 		<rule name="Function name">
 			<color>functionName</color>
-			<start>\@(\w|_)+[ \t]*\(</start>
+			<regex>\@(\w|_)+[ \t]*\(</regex>
 		</rule>
 		<rule name="condition">
 			<color>boolean</color>
-			<start>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}|</start>
+			<regex>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}</regex>
 		</rule>
 		<rule name="numeric constant">
 			<color>number</color>
-			<start>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</start>
+			<regex>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</regex>
 		</rule>
 		<rule name="BIG LETTER">
 			<color>macro</color>
-			<start>\@[A-Z_][A-Z_0-9]{3,500}\@</start>
+			<regex>\@[A-Z_][A-Z_0-9]{3,500}\@</regex>
 		</rule>
 	</pass2>
 </EdnLang>

data/languages/perl/highlight.xml

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EdnLang version="0.1" lang="perl">
+	<ext>pl</ext>
+	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
+		<rule name="comment multiline">
+			<color>comment</color>
+			<regex>
+				<start>=begin</start>
+				<stop>=cut</stop>
+			</regex>
+			<sub>TODO</sub>
+		</rule>
+		<rule name="main declaration of executable">
+			<color>DECLARE_EXECUTABLE</color>
+			<regex>#!.*$</regex>
+		</rule>
+		<rule name="inline doxygen">
+			<color>commentDoxygen</color>
+			<regex>##.*$</regex>
+			<sub>doxyparse</sub>
+		</rule>
+		<rule name="inline comment">
+			<color>comment</color>
+			<regex>#.*$</regex>
+			<sub>TODO</sub>
+		</rule>
+		<rule name="doubleQuteText">
+			<color>doubleQuoteText</color>
+			<regex>&quot;(.|\\[\\&quot;])*&quot;</regex>
+		</rule>
+		<rule name="simpleQuteText">
+			<color>doubleQuoteText</color>
+			<regex>&apos;(.|\\[\\&apos;])*&apos;</regex>
+		</rule>
+	</pass1>
+	<pass2>
+		<rule name="my keyword">
+			<color>inputFunction</color>
+			<regex>(\$|%|@)_[a-zA-Z_][a-zA-Z0-9_]*\@</regex>
+		</rule>
+		<rule name="my keyword">
+			<color>keyword</color>
+			<regex>(\$|%|@)[a-zA-Z_][a-zA-Z0-9_]*\@</regex>
+		</rule>
+		<!--
+		<rule name="my type">
+			<color>type</color>
+			<regex>\@array|bool|boolean|double|float|int|integer|numeric|object|resource|string|unset\@</regex>
+		</rule>
+		-->
+		<rule name="my storage keyword">
+			<color>storageKeyword</color>
+			<regex>\@if|else|elseif|unless|switch|case|while|until|foreach|for|do|next|last|continue|redo|goto|scalar|sub|my|locale|return|use\@</regex>
+		</rule>
+		<rule name="SYSTEM function">
+			<color>systemFunction</color>
+			<regex>\@print|push|pop|shift|unshift|splice|split|join|sort|keys|values|exists|delete\@</regex>
+		</rule>
+		<rule name="my common Define">
+			<color>commonDefine</color>
+			<regex>\@__FILE__|__LINE__|__PACKAGE__\@</regex>
+		</rule>
+		<rule name="numeric constant">
+			<color>number</color>
+			<regex>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</regex>
+		</rule>
+		<rule name="my boolean">
+			<color>boolean</color>
+			<regex>\@true|false\@</regex>
+		</rule>
+		<rule name="BIG LETTER">
+			<color>macro</color>
+			<regex>\@([A-Z_][A-Z_0-9]{3,500})\@</regex>
+		</rule>
+		<rule name="condition">
+			<color>boolean</color>
+			<regex>&lt;=&gt;|==|&lt;=|&gt;=|!=|&lt;|&gt;|&amp;&amp;|\{|\}</regex>
+		</rule>
+		<rule name="condition2">
+			<color>boolean</color>
+			<regex>\@gt|lt|le|ge|eq|ne|cmp\@</regex>
+		</rule>
+		<rule name="simpleQuteTextError">
+			<color>SYNTAX_ERROR</color>
+			<regex>&apos;|&quot;</regex>
+		</rule>
+		<rule name="Function name">
+			<color>functionName</color>
+			<regex>\@((\w|_)+[ \t]*\()</regex>
+		</rule>
+	</pass2>
+	<pass name="doxyparse">
+		<rule name="knownkey">
+			<color>doxygen-key-known</color>
+			<regex>(@|\\)[\t ]*(addindex|addtogroup|anchor|arg|attention|author|authors|a|brief|bug|b|callgraph|category|cite|class|code|cond|copybrief|copydetails|copydoc|copyright|date|def|defgroup|deprecated|details|diafile|dir|docbookonly|dontinclude|dot|dotfile|else|elseif|em|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endif|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|endverbatim|enduml|endxmlonly|enum|example|exception|extends|e|file|fn|headerfile|hidecallergraph|hidecallgraph|hideinitializer|htmlinclude|htmlonly|idlexcept|ifnot|if|image|implements|includelineno|include|ingroup|internal|invariant|interface|latexinclude|latexonly|line|link|license|li|mainpage|manonly|memberof|msc|mscfile|name|namespace|nosubgrouping|note|n|overload|package|page|paragraph|param|parblock|par|post|pre|private|privatesection|property|protected|protectedsection|protocol|public|publicsection|pure|p|refitem|ref|related|relates|relatedalso|relatesalso|remark|remarks|result|return|returns|retval|rtfonly|sa|secreflist|section|see|short|showinitializer|since|skip|skipline|snippet|startuml|struct|subpage|subsection|subsubsection|tableofcontents|test|throw|throws|todo|tparam|typedef|union|until|var|verbatim|verbinclude|version|vhdlflow|warning|weakgroup|xmlonly|xrefitem)</regex>
+		</rule>
+		<rule name="key">
+			<color>doxygen-key</color>
+			<regex>(@|\\)[\t ]*\w+</regex>
+		</rule>
+		<rule name="in-out">
+			<color>doxygen-in-out</color>
+			<regex>\[(in|in,out|out)\]</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\@_\w+\@</regex>
+		</rule>
+	</pass>
+	<pass name="TODO">
+		<rule name="function input">
+			<color>SYNTAX_ERROR</color>
+			<regex>TODO[ \t]*:.*</regex>
+		</rule>
+	</pass>
+</EdnLang>

data/languages/php/highlight.xml

@@ -1,76 +1,120 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EdnLang version="0.1" lang="php: pretty home page">
-	<ext>*.php</ext>
-	<ext>*.php3</ext>
-	<ext>*.php4</ext>
-	<ext>*.phtml</ext>
+<EdnLang version="0.1" lang="PHP">
+	<ext>(php(3|4|5|6|7|8)|PHP(3|4|5|6|7|8)|phtml|php|PHP)</ext>
 	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
-		<rule name="my comment multiline">
-			<color>comment</color>
-			<start>/\*</start>
-			<end>\*/</end>
+		<rule name="doxygen multiline">
+			<color>commentDoxygen</color>
+			<regex>
+				<start>/\*(\*|!)</start>
+				<stop>\*/</stop>
+			</regex>
+			<sub>doxyparse</sub>
 		</rule>
-		<rule name="my todo comment">
+		<rule name="comment multiline">
+			<color>comment</color>
+			<regex>
+				<start>/\*</start>
+				<stop>\*/</stop>
+			</regex>
+			<sub>TODO</sub>
+		</rule>
+		<rule name="comment multiline ERROR">
 			<color>SYNTAX_ERROR</color>
-			<start>//[ \t]*TODO[ \t]*:</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>
+				<start>/\*(\*|!)</start>
+			</regex>
 		</rule>
-		<rule name="my comment inline">
-			<color>comment</color>
-			<start>#</start>
-			<end>\n</end>
+		<rule name="inline doxygen">
+			<color>commentDoxygen</color>
+			<regex>//(!|/).*$</regex>
+			<sub>doxyparse</sub>
 		</rule>
-		<rule name="my comment">
+		<rule name="inline comment">
 			<color>comment</color>
-			<start>//</start>
-			<end>\n</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>(//|#).*$</regex>
+			<sub>TODO</sub>
 		</rule>
 		<rule name="doubleQuteText">
 			<color>doubleQuoteText</color>
-			<start>"</start>
-			<end>"</end>
-			<EscapeChar>\</EscapeChar>
+			<regex>&quot;(\\[\\&quot;]|.)*&quot;</regex>
 		</rule>
 		<rule name="simpleQuteText">
 			<color>doubleQuoteText</color>
-			<start>'</start>
-			<end>'</end>
+			<regex>&apos;(\\[\\&apos;]|.)*&apos;</regex>
 		</rule>
 	</pass1>
 	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
+		<rule name="start-stop-php">
+			<color>macro</color>
+			<regex>(&lt;\?\w+|\?&gt;)</regex>
+		</rule>
+		<rule name="my keyword">
+			<color>inputFunction</color>
+			<regex>\$_[a-zA-Z_][a-zA-Z0-9_]*\@</regex>
+		</rule>
 		<rule name="my keyword">
 			<color>keyword</color>
-			<start>[\$]+[a-zA-Z_][a-zA-Z0-9_]*</start>
+			<regex>\$[a-zA-Z_][a-zA-Z0-9_]*\@</regex>
 		</rule>
 		<rule name="my type">
 			<color>type</color>
-			<start>\@array|bool|boolean|double|float|int|integer|numeric|object|resource|string|unset\@</start>
+			<regex>\@array|bool|boolean|double|float|int|integer|numeric|object|resource|string|unset\@</regex>
 		</rule>
 		<rule name="my storage keyword">
 			<color>storageKeyword</color>
-			<start>\@abstract|and|as|break|case|catch|class|clone|const|continue|declare|default|die|do|echo|else|elseif|empty|enddeclare|endfor|endforeach|endif|endswitch|endwhile|eval|exit|extends|final|for|foreach|function|global|goto|if|implements|include|include_once|instanceof|interface|isset|list|namespace|new|or|print|private|protected|public|require|require_once|return|static|switch|throw|trait|try|unset|use|var|while|xor\@</start>
+			<regex>\@abstract|and|as|break|case|catch|class|clone|const|continue|declare|default|die|do|echo|else|elseif|empty|enddeclare|endfor|endforeach|endif|endswitch|endwhile|eval|exit|extends|final|for|foreach|function|global|goto|if|implements|include|include_once|instanceof|interface|isset|list|namespace|new|or|print|private|protected|public|require|require_once|return|static|switch|throw|trait|try|unset|use|var|while|xor\@</regex>
 		</rule>
 		<rule name="my common Define">
 			<color>commonDefine</color>
-			<start>\@doubleval|floatval|gettype|intval|print_r|serialize|settype|strval|unserialize|var_dump|var_export\@</start>
+			<regex>\@doubleval|floatval|gettype|intval|print_r|serialize|settype|strval|unserialize|var_dump|var_export\@</regex>
 		</rule>
 		<rule name="numeric constant">
 			<color>number</color>
-			<start>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</start>
+			<regex>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</regex>
 		</rule>
 		<rule name="my boolean">
 			<color>boolean</color>
-			<start>\@true|TRUE|false|FALSE\@</start>
+			<regex>\@TRUE|FALSE\@</regex>
+		</rule>
+		<rule name="BIG LETTER">
+			<color>macro</color>
+			<regex>\@([A-Z_][A-Z_0-9]{3,500})\@</regex>
 		</rule>
 		<rule name="Function name">
 			<color>functionName</color>
-			<start>\@(\w|_)+[ \t]*\(</start>
+			<regex>\@(\w|_)+[ \t]*\(</regex>
 		</rule>
 		<rule name="condition">
 			<color>boolean</color>
-			<start>==|&lt;=|&gt;=|!=|&lt;|&gt;|&amp;&amp;|\{|\}|</start>
+			<regex>==|&lt;=|&gt;=|!=|&lt;|&gt;|&amp;&amp;|\{|\}</regex>
+		</rule>
+		<rule name="simpleQuteTextError">
+			<color>SYNTAX_ERROR</color>
+			<regex>&apos;|&quot;</regex>
 		</rule>
 	</pass2>
+	<pass name="doxyparse">
+		<rule name="knownkey">
+			<color>doxygen-key-known</color>
+			<regex>(@|\\)[\t ]*(addindex|addtogroup|anchor|arg|attention|author|authors|a|brief|bug|b|callgraph|category|cite|class|code|cond|copybrief|copydetails|copydoc|copyright|date|def|defgroup|deprecated|details|diafile|dir|docbookonly|dontinclude|dot|dotfile|else|elseif|em|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endif|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|endverbatim|enduml|endxmlonly|enum|example|exception|extends|e|file|fn|headerfile|hidecallergraph|hidecallgraph|hideinitializer|htmlinclude|htmlonly|idlexcept|ifnot|if|image|implements|includelineno|include|ingroup|internal|invariant|interface|latexinclude|latexonly|line|link|license|li|mainpage|manonly|memberof|msc|mscfile|name|namespace|nosubgrouping|note|n|overload|package|page|paragraph|param|parblock|par|post|pre|private|privatesection|property|protected|protectedsection|protocol|public|publicsection|pure|p|refitem|ref|related|relates|relatedalso|relatesalso|remark|remarks|result|return|returns|retval|rtfonly|sa|secreflist|section|see|short|showinitializer|since|skip|skipline|snippet|startuml|struct|subpage|subsection|subsubsection|tableofcontents|test|throw|throws|todo|tparam|typedef|union|until|var|verbatim|verbinclude|version|vhdlflow|warning|weakgroup|xmlonly|xrefitem)</regex>
+		</rule>
+		<rule name="key">
+			<color>doxygen-key</color>
+			<regex>(@|\\)[\t ]*\w+</regex>
+		</rule>
+		<rule name="in-out">
+			<color>doxygen-in-out</color>
+			<regex>\[(in|in,out|out)\]</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\@_\w+\@</regex>
+		</rule>
+	</pass>
+	<pass name="TODO">
+		<rule name="function input">
+			<color>SYNTAX_ERROR</color>
+			<regex>TODO[ \t]*:.*</regex>
+		</rule>
+	</pass>
 </EdnLang>

data/languages/python/highlight.xml

@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EdnLang version="0.1" lang="Python">
+	<ext>(py|PY)</ext>
+	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
+		<rule name="my comment multiline">
+			<color>comment</color>
+			<regex>
+				<start>&quot;&quot;&quot;</start>
+				<stop>&quot;&quot;&quot;</stop>
+			</regex>
+		</rule>
+		<rule name="my comment multiline">
+			<color>comment</color>
+			<regex>
+				<start>'''</start>
+				<stop>'''</stop>
+			</regex>
+		</rule>
+		<rule name="comment multiline Error">
+			<color>SYNTAX_ERROR</color>
+			<regex>
+				<start>(&quot;&quot;&quot;|''')</start>
+			</regex>
+		</rule>
+		<rule name="main declaration of executable">
+			<color>DECLARE_EXECUTABLE</color>
+			<regex>#!.*$</regex>
+		</rule>
+		<rule name="my comment doxygen">
+			<color>commentDoxygen</color>
+			<regex>##.*$</regex>
+			<sub>doxyparse</sub>
+		</rule>
+		<rule name="my comment">
+			<color>comment</color>
+			<regex>#.*$</regex>
+			<sub>TODO</sub>
+		</rule>
+		<rule name="doubleQuteText">
+			<color>doubleQuoteText</color>
+			<regex>&quot;(.|\\[\\&quot;])*&quot;</regex>
+		</rule>
+		<rule name="simpleQuteText">
+			<color>doubleQuoteText</color>
+			<regex>&apos;((\\[\\&apos;])|.)*&apos;</regex>
+		</rule>
+		<rule name="internalParameter">
+			<color>normal</color>
+			<regex>self\.\w*\@</regex>
+			<sub>parameter_internal</sub>
+		</rule>
+		<rule name="Function name private">
+			<color>functionNamePrivate</color>
+			<regex>\@_(\w|_)+[ \t]*\(</regex>
+			<sub>checkCamelCaseError</sub>
+		</rule>
+		<rule name="Function name">
+			<color>functionName</color>
+			<regex>\@(\w|_)+[ \t]*\(</regex>
+			<sub>checkCamelCaseError</sub>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\@_(\w|_)+\@</regex>
+			<sub>checkCamelCaseError</sub>
+		</rule>
+	</pass1>
+	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
+		<rule name="my keyword">
+			<color>keyword</color>
+			<regex>\@if|else|elif|break|pass|continue|while|do|for|in|return\@</regex>
+		</rule>
+		<rule name="my function keyword">
+			<color>systemFunction</color>
+			<regex>\@print|len|range|del|__init__|self|os\.|sys\.|path\.\@</regex>
+		</rule>
+		<rule name="my type">
+			<color>type</color>
+			<regex>\@bool|BOOL|char|double|float\@</regex>
+		</rule>
+		<rule name="my storage keyword">
+			<color>storageKeyword</color>
+			<regex>\@def|class|import|from|as|try|except\@</regex>
+		</rule>
+		<rule name="numeric constant">
+			<color>number</color>
+			<regex>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</regex>
+		</rule>
+		<rule name="my boolean">
+			<color>boolean</color>
+			<regex>\@True|False\@</regex>
+		</rule>
+		<rule name="BIG LETTER">
+			<color>macro</color>
+			<regex>\@[A-Z_][A-Z_0-9]{3,500}\@</regex>
+		</rule>
+		<rule name="condition">
+			<color>boolean</color>
+			<regex>==|&lt;=|&gt;=|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}</regex>
+		</rule>
+		<rule name="simpleQuteTextError">
+			<color>SYNTAX_ERROR</color>
+			<regex>&apos;|&quot;</regex>
+		</rule>
+	</pass2>
+	<pass name="doxyparse">
+		<rule name="knownkey">
+			<color>doxygen-key-known</color>
+			<regex>(\@|\\)[\t ]*(addindex|addtogroup|anchor|arg|attention|author|authors|a|brief|bug|b|callgraph|category|cite|class|code|cond|copybrief|copydetails|copydoc|copyright|date|def|defgroup|deprecated|details|diafile|dir|docbookonly|dontinclude|dot|dotfile|else|elseif|em|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endif|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|endverbatim|enduml|endxmlonly|enum|example|exception|extends|e|file|fn|headerfile|hidecallergraph|hidecallgraph|hideinitializer|htmlinclude|htmlonly|idlexcept|ifnot|if|image|implements|includelineno|include|ingroup|internal|invariant|interface|latexinclude|latexonly|line|link|license|li|mainpage|manonly|memberof|msc|mscfile|name|namespace|nosubgrouping|note|n|overload|package|page|paragraph|param|parblock|par|post|pre|private|privatesection|property|protected|protectedsection|protocol|public|publicsection|pure|p|refitem|ref|related|relates|relatedalso|relatesalso|remark|remarks|result|return|returns|retval|rtfonly|sa|secreflist|section|see|short|showinitializer|since|skip|skipline|snippet|startuml|struct|subpage|subsection|subsubsection|tableofcontents|test|throw|throws|todo|tparam|typedef|union|until|var|verbatim|verbinclude|version|vhdlflow|warning|weakgroup|xmlonly|xrefitem)</regex>
+		</rule>
+		<rule name="key">
+			<color>doxygen-key</color>
+			<regex>(\@|\\)[\t ]*\w+</regex>
+		</rule>
+		<rule name="in-out">
+			<color>doxygen-in-out</color>
+			<regex>\[(in|in,out|out)\]</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\@_\w+\@</regex>
+		</rule>
+	</pass>
+	<pass name="TODO">
+		<rule name="function input">
+			<color>SYNTAX_ERROR</color>
+			<regex>TODO[ \t]*:.*</regex>
+		</rule>
+	</pass>
+	<pass name="parameter_internal">
+		<rule name="self">
+			<color>systemFunction</color>
+			<regex>self</regex>
+		</rule>
+		<rule name="function input">
+			<color>memberClassPrivate</color>
+			<regex>_[a-z0-9_]+</regex>
+		</rule>
+		<rule name="function input">
+			<color>memberClass</color>
+			<regex>[a-z0-9_]+</regex>
+		</rule>
+		<rule name="function input">
+			<color>SYNTAX_ERROR</color>
+			<regex>_\w+</regex>
+		</rule>
+		<rule name="function input">
+			<color>SYNTAX_ERROR</color>
+			<regex>\w+</regex>
+		</rule>
+	</pass>
+	<pass name="checkCamelCaseError">
+		<rule name="Function name ERROR (camel case ...)">
+			<color>SYNTAX_ERROR</color>
+			<regex>[A-Z]</regex>
+		</rule>
+	</pass>
+</EdnLang>

data/languages/qml/highlight.xml

@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EdnLang version="0.1" lang="QML">
+	<ext>(qml)</ext>
+	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
+		<rule name="doxygen multiline">
+			<color>commentDoxygen</color>
+			<regex>
+				<start>/\*(\*|!)</start>
+				<stop>\*/</stop>
+			</regex>
+			<sub>doxyparse</sub>
+		</rule>
+		<rule name="comment multiline">
+			<color>comment</color>
+			<regex>
+				<start>/\*</start>
+				<stop>\*/</stop>
+			</regex>
+			<sub>TODO</sub>
+		</rule>
+		<rule name="comment multiline ERROR">
+			<color>SYNTAX_ERROR</color>
+			<regex>
+				<start>/\*</start>
+			</regex>
+		</rule>
+		<rule name="inline doxygen">
+			<color>commentDoxygen</color>
+			<regex>//!.*$</regex>
+			<sub>doxyparse</sub>
+		</rule>
+		<rule name="inline comment">
+			<color>comment</color>
+			<regex>//.*$</regex>
+			<sub>TODO</sub>
+		</rule>
+		<rule name="double quote text">
+			<color>doubleQuoteText</color>
+			<regex>&quot;(\\(n|t|v|b|r|f|a|\\|\?|&quot;|0|o[0-7]{2}|x[0-9a-fA-F]{2}|u[0-9]{4}|U[0-9]{8})|.)*&quot;</regex>
+		</rule>
+		<rule name="simple quote text">
+			<color>doubleQuoteText</color>
+			<regex>&apos;(\\(n|t|v|b|r|f|a|\\|\?|&apos;|0|o[0-7]{2}|x[0-9a-fA-F]{2}|u[0-9]{4}|U[0-9]{8})|.)*&apos;</regex>
+		</rule>
+	</pass1>
+	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
+		
+		<rule name="my keyword">
+			<color>keyword</color>
+			<regex>\{|\}|\[|\]</regex>
+		</rule>
+		<rule name="numeric constant">
+			<color>number</color>
+			<regex>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</regex>
+		</rule>
+		<rule name="my boolean">
+			<color>boolean</color>
+			<regex>\@true|false\@</regex>
+		</rule>
+		<rule name="my keyword special">
+			<color>keyword</color>
+			<regex>\@return|if|else|case|default|switch|break|continue|while|do|for|let|var|function|typeof|alert\@</regex>
+		</rule>
+		<rule name="my storage keyword">
+			<color>storageKeyword</color>
+			<regex>\@import|property|string|bool|int|as|signal|readonly|alias\@</regex>
+		</rule>
+		<rule name="property name">
+			<color>memberClass</color>
+			<regex>\@(\w|_)(\w|_|\.)+[ \t]*:</regex>
+		</rule>
+		<rule name="Object Name">
+			<color>memberClassPrivate</color>
+			<regex>\@(\w|_)(\w|_|\.)+[ \t]*\{</regex>
+		</rule>
+		<rule name="BIG LETTER">
+			<color>macro</color>
+			<regex>\@[A-Z_][A-Z_0-9]{3,500}\@</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\@_\w+\@</regex>
+		</rule>
+		<rule name="Function name">
+			<color>functionName</color>
+			<regex>\@((\w|_)+[ \t]*\()</regex>
+		</rule>
+		<rule name="object Name">
+			<color>error</color>
+			<regex>:|,</regex>
+		</rule>
+		<rule name="lambda">
+			<color>boolean</color>
+			<regex>=&gt;</regex>
+		</rule>
+		<rule name="condition">
+			<color>boolean</color>
+			<regex>===|==|&lt;=|&gt;=|!==|!=|&lt;{1,2}|&gt;{1,2}|&amp;&amp;|\{|\}</regex>
+		</rule>
+		<rule name="simple operator">
+			<color>preprocesseur</color>
+			<regex>=|\+|\-|&amp;|\|</regex>
+		</rule>
+		<rule name="simpleQuteTextError">
+			<color>SYNTAX_ERROR</color>
+			<regex>&apos;|&quot;</regex>
+		</rule>
+	</pass2>
+	<pass name="doxyparse">
+		<rule name="knownkey">
+			<color>doxygen-key-known</color>
+			<regex>(\@|\\)[\t ]*(addindex|addtogroup|anchor|arg|attention|author|authors|a|brief|bug|b|callgraph|category|cite|class|code|cond|copybrief|copydetails|copydoc|copyright|date|def|defgroup|deprecated|details|diafile|dir|docbookonly|dontinclude|dot|dotfile|else|elseif|em|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endif|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|endverbatim|enduml|endxmlonly|enum|example|exception|extends|e|file|fn|headerfile|hidecallergraph|hidecallgraph|hideinitializer|htmlinclude|htmlonly|idlexcept|ifnot|if|image|implements|includelineno|include|ingroup|internal|invariant|interface|latexinclude|latexonly|line|link|license|li|mainpage|manonly|memberof|msc|mscfile|name|namespace|nosubgrouping|note|n|overload|package|page|paragraph|param|parblock|par|post|pre|private|privatesection|property|protected|protectedsection|protocol|public|publicsection|pure|p|refitem|ref|related|relates|relatedalso|relatesalso|remark|remarks|result|return|returns|retval|rtfonly|sa|secreflist|section|see|short|showinitializer|since|skip|skipline|snippet|startuml|struct|subpage|subsection|subsubsection|tableofcontents|test|throw|throws|todo|tparam|typedef|union|until|var|verbatim|verbinclude|version|vhdlflow|warning|weakgroup|xmlonly|xrefitem)</regex>
+		</rule>
+		<rule name="key">
+			<color>doxygen-key</color>
+			<regex>(\@|\\)[\t ]*\w+</regex>
+		</rule>
+		<rule name="in-out">
+			<color>doxygen-in-out</color>
+			<regex>\[(in|in,out|out)\]</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\@_\w+\@</regex>
+		</rule>
+	</pass>
+	<pass name="TODO">
+		<rule name="function input">
+			<color>SYNTAX_ERROR</color>
+			<regex>TODO[ \t]*:.*$</regex>
+		</rule>
+	</pass>
+</EdnLang>

data/languages/xml/highlight.xml

@@ -1,35 +1,80 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EdnLang version="0.2" lang="XML">
-	<ext>*.xml</ext>
-	<ext>*.svg</ext>
+	<ext>(xml|XML|svg|SVG|html|HTML|htm|HTM|tpl|TPL|xhtml|XHTML)</ext>
 	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
 		<rule name="Comment">
 			<color>comment</color>
-			<start>&lt;!\-\-</start>
-			<end>\-\-&gt;</end>
+			<regex>
+				<start>&lt;!\-\-</start>
+				<stop>\-\-&gt;</stop>
+			</regex>
 		</rule>
-		<rule name="doubleQuteText">
-			<color>doubleQuoteText</color>
-			<start>"</start>
-			<end>"</end>
-			<EscapeChar>\</EscapeChar>
+		<rule name="CDATA">
+			<color>macro</color>
+			<regex>
+				<start>&lt;!\[CDATA\[</start>
+				<stop>\]\]&gt;</stop>
+			</regex>
 		</rule>
-		<rule name="simpleQuteText">
-			<color>doubleQuoteText</color>
-			<start>\@'</start>
-			<end>('|\n)</end>
-			<!--<EscapeChar>\</EscapeChar>-->
+		<rule name="stop balise">
+			<color>functionName</color>
+			<regex>&lt;/[ \t]*[a-zA-Z0-9\-_:\.]+[ \t]*&gt;</regex>
+		</rule>
+		<rule name="stop balise">
+			<color>SYNTAX_ERROR</color>
+			<regex>
+				<start>&lt;/</start>
+				<stop>&gt;</stop>
+			</regex>
+		</rule>
+		<rule name="start balise">
+			<color>normal</color>
+			<regex>
+				<start>&lt;</start>
+				<stop>&gt;</stop>
+			</regex>
+			<sub>parseInsideBalise</sub>
 		</rule>
 	</pass1>
 	<pass2>
-		<rule name="special Balise">
-			<color>error</color>
-			<start>&lt;\?\w*|\?&gt;</start>
+		<rule name="start balise">
+			<color>commonDefine</color>
+			<regex>&amp;(gt|lt|amp|apos|quot);</regex>
 		</rule>
-		<rule name="normale Balise">
-			<color>functionName</color>
-			<start>&lt;/[0-9a-fA-F_]*|&lt;[0-9a-fA-F_]*|/&gt;|&gt;</start>
+		<rule name="start balise">
+			<color>error</color>
+			<regex>&gt;|&lt;|&amp;|&apos;|&quot;</regex>
 		</rule>
 	</pass2>
+	<pass name="parseInsideBalise">
+		<rule name="special Balise">
+			<color>error</color>
+			<regex>&lt;\?\w*|\?&gt;</regex>
+		</rule>
+		<rule name="open balise">
+			<color>functionName</color>
+			<regex>&lt;[ \t]*[a-zA-Z0-9\-_:\.]+\@</regex>
+		</rule>
+		<rule name="close balise">
+			<color>functionName</color>
+			<regex>/?&gt;</regex>
+		</rule>
+		<rule name="doubleQuteText">
+			<color>doubleQuoteText</color>
+			<regex>&quot;(\r|\n|\\\\|\\&quot;|.)*&quot;</regex>
+		</rule>
+		<rule name="simpleQuteText">
+			<color>doubleQuoteText</color>
+			<regex>\@&apos;(\r|\n)*?(&apos;|\n|.)</regex>
+		</rule>
+		<rule name="condition">
+			<color>boolean</color>
+			<regex>=</regex>
+		</rule>
+		<rule name="condition">
+			<color>keyword</color>
+			<regex>\w+</regex>
+		</rule>
+	</pass>
 </EdnLang>
 

data/languages/zeus.idl/highlight.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EdnLang version="0.1" lang="Zeus-IDL">
+	<ext>(zeus|idl)</ext>
+	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
+		<rule name="comment multiline">
+			<color>comment</color>
+			<regex>
+				<start>/\*</start>
+				<stop>\*/</stop>
+			</regex>
+			<sub>TODO</sub>
+		</rule>
+		<rule name="comment multiline Error">
+			<color>SYNTAX_ERROR</color>
+			<regex>
+				<start>/\*</start>
+			</regex>
+		</rule>
+		<rule name="documantation">
+			<color>commentDoxygen</color>
+			<regex>#.*$</regex>
+			<sub>docparse</sub>
+		</rule>
+		<rule name="inline comment">
+			<color>comment</color>
+			<regex>//.*$</regex>
+			<sub>TODO</sub>
+		</rule>
+	</pass1>
+	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
+		<rule name="my type">
+			<color>type</color>
+			<regex>\@import|void|bool|path|uri|string|int(8|16|32|64)|uint(8|16|32|64)|float(32|64)|vector:(bool|string|int(8|16|32|64)|uint(8|16|32|64)|float(32|64))|time|duration|file|stream\@</regex>
+		</rule>
+		<rule name="numeric constant">
+			<color>number</color>
+			<regex>\@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@</regex>
+		</rule>
+		<rule name="Function name">
+			<color>functionName</color>
+			<regex>\@((\w|_)+[ \t]*\()</regex>
+		</rule>
+	</pass2>
+	<pass name="docparse">
+		<rule name="knownkey">
+			<color>doxygen-key-known</color>
+			<regex>(srv\-brief|srv\-version|srv\-type|srv\-author|brief|param|return|note):</regex>
+		</rule>
+		<rule name="function input">
+			<color>inputFunction</color>
+			<regex>\@\w+:\@</regex>
+		</rule>
+	</pass>
+	<pass name="TODO">
+		<rule name="function input">
+			<color>SYNTAX_ERROR</color>
+			<regex>TODO[ \t]*:.*</regex>
+		</rule>
+	</pass>
+</EdnLang>

data/theme/colorBlack/bufferList.json

@@ -0,0 +1,11 @@
+{
+	"ednColor": [
+		{ name:"backgroung1", foreground:"#202020" },
+		{ name:"backgroung2", foreground:"#000000" },
+		{ name:"backgroundhide", foreground:"#606060" },
+		{ name:"backgroungSelected", foreground:"#2f0ba4" },
+		{ name:"textNormal", foreground:"#EEEEEE" },
+		{ name:"textModify", foreground:"#FF0000" },
+		{ name:"textNotOpen", foreground:"#808080"},
+	]
+}

data/theme/colorBlack/textViewer.json

@@ -0,0 +1,38 @@
+{
+	"ednColor": [
+		{ name:"CODE_basicBackgroung", foreground:"#151515" },
+		{ name:"CODE_space", foreground:"#333333" },
+		{ name:"CODE_tabulation", foreground:"#444444" },
+		{ name:"CODE_cursor", foreground:"#eadd05" },
+		{ name:"CODE_lineNumber", foreground:"#fff725", background:"#464646"},
+		{ name:"normal", foreground:"#EEEEEE"},
+		{ name:"SelectedText", foreground:"#AAAAAA", background:"#225a09"},
+		{ name:"error", foreground:"#FF0000"},
+		{ name:"doubleQuoteText", foreground:"#00FF00"},
+		
+		{ name:"type", foreground:"#56bf10", bold:true},
+		{ name:"storageKeyword", foreground:"#5c8fed"},
+		{ name:"inputFunction", foreground:"#B80000", bold:true, italic:true},
+		{ name:"memberClass", foreground:"#7c5406", bold:true},
+		{ name:"memberClassPrivate", foreground:"#7c2400", bold:true},
+		{ name:"number", foreground:"#00ff00"},
+		{ name:"systemFunction", foreground:"#ffff00"},
+		{ name:"commonDefine", foreground:"#56bf10"},
+		{ name:"boolean", foreground:"#214cf1"},
+		{ name:"preprocesseur", foreground:"#FF0000"},
+		{ name:"comment", foreground:"#ef4def", italic:true},
+		{ name:"commentDoxygen", foreground:"#ef4d00", bold:true, italic:true},
+		{ name:"keyword", foreground:"#5c8fed", bold:true},
+		{ name:"macro", foreground:"#6c09c8", bold:true},
+		{ name:"SYNTAX_ERROR", foreground:"#000000", background:"#FF0000", bold:true},
+		{ name:"DECLARE_EXECUTABLE", foreground:"#000000", background:"#ef4d00", bold:true},
+		{ name:"functionName", foreground:"#24d1e0", bold:true},
+		{ name:"functionNamePrivate", foreground:"#24d190", bold:true},
+		{ name:"TestResultOK", foreground:"#000000", background:"#00FF00", bold:true},
+		{ name:"TestResultERROR", FG:"#000000", background:"#FF0000", bold:true}
+
+		{ name:"doxygen-key-known", foreground:"#Fc4700", bold:true, italic:false},
+		{ name:"doxygen-key", foreground:"#dc3700", bold:true, italic:false},
+		{ name:"doxygen-in-out", foreground:"#dc7000", bold:true, italic:false},
+	]
+}

data/theme/colorWhite/bufferList.json

@@ -0,0 +1,11 @@
+{
+	"ednColor": [
+		{ name:"backgroung1", foreground:"#d9d7d7"},
+		{ name:"backgroung2", foreground:"#b7b6b6"},
+		{ name:"backgroundhide", foreground:"#606060" },
+		{ name:"backgroungSelected", foreground:"#3da3f9"},
+		{ name:"textNormal", foreground:"#000000"},
+		{ name:"textModify", foreground:"#FF0000"},
+		{ name:"textNotOpen", foreground:"#808080"}
+	]
+}

data/theme/colorWhite/textViewer.json

@@ -0,0 +1,40 @@
+{
+	"ednColor": [
+		{ name:"CODE_basicBackgroung", foreground:"#d9d7d7"},
+		{ name:"CODE_space", foreground:"#b7b6b6"},
+		{ name:"CODE_tabulation", foreground:"#a7a5a5"},
+		{ name:"CODE_cursor", foreground:"#2a00ff"},
+		{ name:"CODE_lineNumber", foreground:"#1a00a0", background:"#a2a2a2"},
+		{ name:"normal", foreground:"#000000"},
+		{ name:"SelectedText", foreground:"#292929", background:"#009ce7"},
+		{ name:"error", foreground:"#FF0000"},
+		{ name:"doubleQuoteText", foreground:"#008e00"},
+		
+		{ name:"type", foreground:"#376d0a", bold:true},
+		{ name:"memberClass", foreground:"#7c5406", bold:true},
+		{ name:"memberClassPrivate", foreground:"#7c2400", bold:true},
+		{ name:"inputFunction", foreground:"#B80000", bold:true, italic:true},
+		{ name:"storageKeyword", foreground:"#466cb4"},
+		{ name:"number", foreground:"#007b00"},
+		{ name:"systemFunction", foreground:"#acaa00"},
+		{ name:"commonDefine", foreground:"#3c850b"},
+		{ name:"boolean", foreground:"#1633a3"},
+		{ name:"preprocesseur", foreground:"#ac0000"},
+		{ name:"comment", foreground:"#b704b5", italic:true},
+		{ name:"commentDoxygen", foreground:"#bf3e00", bold:true, italic:true},
+		{ name:"keyword", foreground:"#215eb8", bold:true},
+		{ name:"macro", foreground:"#571793", bold:true},
+		{ name:"SYNTAX_ERROR", foreground:"#000000", background:"#c20000", bold:true},
+		{ name:"DECLARE_EXECUTABLE", foreground:"#000000", background:"#bf3e00", bold:true},
+		{ name:"functionName", foreground:"#09857e", bold:true},
+		{ name:"functionNamePrivate", foreground:"#09854e", bold:true},
+		{ name:"TestResultOK", foreground:"#000000", background:"#009c00", bold:true},
+		{ name:"TestResultERROR", foreground:"#000000", background:"#c20000", bold:true},
+		{ name:"TestResultTODO", foreground:"#000000", background:"#bf3e00", bold:true},
+
+		{ name:"doxygen-key-known", foreground:"#Fc4700", bold:true, italic:false},
+		{ name:"doxygen-key", foreground:"#dc3700", bold:true, italic:false},
+		{ name:"doxygen-in-out", foreground:"#dc7000", bold:true, italic:false},
+	]
+}
+

data/theme/default/Add.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.2,0,0,1.2,-579.7336,-567.9832)">
-		<path d="m 509.778,477.486 c -12.426,0 -22.5,10.072 -22.5,22.5 0,12.426 10.074,22.5 22.5,22.5 12.428,0 22.5,-10.074 22.5,-22.5 0,-12.427 -10.072,-22.5 -22.5,-22.5 z m 11.5,25 c 0,0.549 -0.451,1 -1,1 h -6 c -0.551,0 -1.001,0.449 -1.001,1 v 6 c 0,0.549 -0.45,1 -1,1 h -5 c -0.55,0 -1,-0.451 -1,-1 v -6 c 0,-0.551 -0.45,-1 -1,-1 h -6 c -0.55,0 -1,-0.451 -1,-1 v -5 c 0,-0.551 0.45,-1 1,-1 h 6 c 0.55,0 1,-0.451 1,-1 v -6 c 0,-0.551 0.45,-1 1,-1 h 5 c 0.55,0 1,0.449 1,1 v 6 c 0,0.549 0.45,1 1.001,1 h 6 c 0.549,0 1,0.449 1,1 v 5 z"
-		      style="fill:#333333;fill-rule:evenodd" />
-	</g>
-</svg>

data/theme/default/AtoZ.svg

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.2,0,0,1.2,-651.9616,-494.5316)">
-		<path d="m 562.663,451.271 -1.24,-3.193 h -0.188 c -0.463,0.631 -0.926,1.174 -1.389,1.629 -0.463,0.457 -0.967,0.832 -1.514,1.125 -0.547,0.295 -1.16,0.512 -1.838,0.65 -0.682,0.143 -1.469,0.211 -2.365,0.211 -0.953,0 -1.836,-0.148 -2.648,-0.455 -0.813,-0.299 -1.516,-0.756 -2.111,-1.361 -0.596,-0.611 -1.061,-1.381 -1.396,-2.314 -0.336,-0.932 -0.506,-2.035 -0.506,-3.311 0,-2.494 0.799,-4.332 2.396,-5.518 1.598,-1.184 3.986,-1.838 7.168,-1.965 l 3.74,-0.125 v -1.766 c 0,-0.967 -0.279,-1.682 -0.842,-2.145 -0.559,-0.461 -1.344,-0.693 -2.354,-0.693 -1.01,0 -1.994,0.146 -2.953,0.441 -0.959,0.295 -1.924,0.688 -2.891,1.178 l -2.08,-4.246 c 1.178,-0.658 2.48,-1.177 3.908,-1.554 1.43,-0.379 2.93,-0.568 4.498,-0.568 2.93,0 5.174,0.688 6.736,2.06 1.563,1.373 2.344,3.461 2.344,6.264 v 15.658 h -4.477 v -0.002 z m -1.891,-10.887 -2.123,0.084 c -0.854,0.027 -1.578,0.141 -2.164,0.336 -0.59,0.195 -1.063,0.457 -1.42,0.787 -0.357,0.33 -0.615,0.721 -0.777,1.178 -0.16,0.455 -0.24,0.963 -0.24,1.523 0,0.98 0.238,1.678 0.713,2.092 0.477,0.412 1.102,0.619 1.871,0.619 0.59,0 1.135,-0.102 1.641,-0.305 0.504,-0.203 0.941,-0.504 1.313,-0.902 0.373,-0.4 0.662,-0.891 0.873,-1.471 0.211,-0.582 0.314,-1.252 0.314,-2.01 v -1.931 l -10e-4,0 z"
-		      style="fill:#333333" />
-		<path d="m 568.976,440.552 v -4.244 h 9.549 v 4.244 h -9.549 z"
-		      style="fill:#333333" />
-		<path d="m 592.468,451.241 h -17.279 v -3.785 l 9.607,-14.816 h -8.953 v -4.896 h 16.225 v 4.159 l -9.289,14.441 h 9.689 v 4.897 z"
-		      style="fill:#333333" />
-	</g>
-</svg>

data/theme/default/Attache.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.199923,0,0,1.199923,-436.75556,-134.85476)">
-		<path d="m 374.192,161.556 c -1.619,0 -3.152,-0.607 -4.269,-1.707 -1.237,-1.221 -1.877,-2.961 -1.755,-4.776 l 0.501,-7.477 c 0.198,-2.952 1.959,-6.933 4.009,-9.065 l 20.588,-21.415 c 0.854,-0.89 2.268,-0.916 3.154,-0.063 0.886,0.853 0.916,2.266 0.063,3.154 l -20.589,21.416 c -1.347,1.401 -2.644,4.331 -2.772,6.271 l -0.502,7.477 c -0.035,0.526 0.119,0.988 0.436,1.3 0.317,0.312 0.776,0.465 1.306,0.417 l 6.095,-0.496 c 1.936,-0.158 4.842,-1.497 6.219,-2.865 l 21.382,-21.251 c 0.413,-0.411 0.64,-0.957 0.637,-1.537 -0.005,-0.58 -0.236,-1.123 -0.655,-1.529 l -4.043,-3.92 c -0.874,-0.847 -2.334,-0.832 -3.189,0.037 l -16.287,16.555 c -0.512,0.521 -0.809,1.177 -0.794,1.759 0.007,0.303 0.097,0.537 0.268,0.693 0.524,0.485 1.872,0.332 2.826,-0.589 l 12.685,-12.247 c 0.886,-0.856 2.297,-0.831 3.154,0.056 0.855,0.886 0.83,2.298 -0.057,3.153 l -12.684,12.248 c -2.605,2.517 -6.623,2.811 -8.952,0.656 -1.06,-0.979 -1.664,-2.352 -1.7,-3.865 -0.043,-1.788 0.713,-3.608 2.072,-4.992 l 16.289,-16.556 c 2.582,-2.623 6.83,-2.675 9.475,-0.111 l 4.043,3.92 c 1.285,1.246 2,2.917 2.01,4.705 0.012,1.788 -0.682,3.467 -1.952,4.729 l -21.382,21.25 c -2.098,2.086 -6.053,3.907 -9.002,4.148 l -6.094,0.496 c -0.18,0.013 -0.358,0.021 -0.534,0.021 l 0,0 z"
-		      style="fill:#333333" />
-	</g>
-</svg>

data/theme/default/CaseSensitive.svg

@@ -1,13 +0,0 @@
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-	<metadata>
-		<rdf:RDF>
-			<cc:Work rdf:about="">
-				<dc:format>image/svg+xml</dc:format>
-				<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-				<dc:title/>
-			</cc:Work>
-		</rdf:RDF>
-	</metadata>
-	<path d="M57.268,52.064,55.78,48.233h-0.2256c-0.5556,0.7572-1.1112,1.4088-1.6668,1.9548-0.5556,0.5484-1.1604,0.9984-1.8168,1.35-0.6564,0.354-1.392,0.6144-2.2056,0.78-0.8184,0.1716-1.7628,0.2532-2.838,0.2532-1.1436,0-2.2032-0.1776-3.1776-0.546-0.9756-0.3588-1.8192-0.9072-2.5332-1.6332-0.7152-0.7332-1.2732-1.6572-1.6752-2.7768-0.4032-1.1184-0.6072-2.442-0.6072-3.9732,0-2.9928,0.9588-5.1984,2.8752-6.6216,1.9176-1.4208,4.7832-2.2056,8.6016-2.358l4.488-0.15v-2.1192c0-1.1604-0.3348-2.0184-1.0104-2.574-0.6708-0.5532-1.6128-0.8316-2.8248-0.8316s-2.3928,0.1752-3.5436,0.5292-2.3088,0.8256-3.4692,1.4136l-2.496-5.0952c1.4136-0.7896,2.976-1.4124,4.6896-1.8648,1.716-0.4548,3.516-0.6816,5.3976-0.6816,3.516,0,6.2088,0.8256,8.0832,2.472,1.8756,1.6476,2.8128,4.1532,2.8128,7.5168v18.79h-5.3724v-0.0024zm-0.781-9.233-2.548,0.101c-1.0248,0.0324-1.8936,0.1692-2.5968,0.4032-0.708,0.234-1.2756,0.5484-1.704,0.9444s-0.738,0.8652-0.9324,1.4136c-0.192,0.546-0.288,1.1556-0.288,1.8276,0,1.176,0.2856,2.0136,0.8556,2.5104,0.5724,0.4944,1.3224,0.7428,2.2452,0.7428,0.708,0,1.362-0.1224,1.9692-0.366,0.6048-0.2436,1.1292-0.6048,1.5756-1.0824,0.4476-0.48,0.7944-1.0692,1.0476-1.7652,0.252-0.699,0.376-1.503,0.376-2.413v-2.317h-0.0012z" fill="#333"/>
-	<path d="M26,38,14,38,9,54,3,54,17,9h6l8,25h-6l-5-18-5,18h16l6,20h-6z" fill="#333"/>
-</svg>

data/theme/default/Close.svg

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.2,0,0,1.2,-579.7336,-495.3904)">
-		<path d="m 514.172,439.484 4.041,-4.041 c 0.26,-0.26 0.404,-0.605 0.404,-0.975 0,-0.371 -0.143,-0.717 -0.404,-0.977 l -2.441,-2.443 c -0.521,-0.521 -1.434,-0.52 -1.949,0 l -4.044,4.043 -4.043,-4.043 c -0.52,-0.52 -1.429,-0.52 -1.949,0 l -2.443,2.443 c -0.26,0.26 -0.402,0.605 -0.402,0.975 0,0.37 0.143,0.717 0.402,0.977 l 4.043,4.041 -4.041,4.041 c -0.261,0.26 -0.404,0.605 -0.404,0.975 0,0.371 0.143,0.717 0.402,0.979 l 2.444,2.443 c 0.521,0.52 1.429,0.52 1.95,-0.002 l 4.041,-4.041 4.042,4.041 c 0.26,0.26 0.605,0.404 0.975,0.404 0.37,0 0.715,-0.145 0.975,-0.404 l 2.441,-2.439 c 0.262,-0.262 0.406,-0.609 0.406,-0.98 0,-0.369 -0.145,-0.717 -0.404,-0.973 l -4.042,-4.044 z"
-		      style="fill:#333333" />
-		<path d="m 509.778,425.027 c 7.976,0 14.464,6.488 14.464,14.465 0,7.975 -6.488,14.463 -14.464,14.463 -7.975,0 -14.464,-6.488 -14.464,-14.463 0,-7.976 6.489,-14.465 14.464,-14.465 m 0,-8.035 c -12.426,0 -22.5,10.073 -22.5,22.5 0,12.426 10.074,22.5 22.5,22.5 12.427,0 22.5,-10.074 22.5,-22.5 -10e-4,-12.428 -10.073,-22.5 -22.5,-22.5 l 0,0 z"
-		      style="fill:#333333" />
-	</g>
-</svg>

data/theme/default/Contact.svg

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<svg width="64" height="64">
-	<g transform="matrix(1.1999733,0,0,1.1999733,-436.77498,-206.48907)">
-		<path d="m 412.51,211.853 c 0.354,0.375 0.645,0.26 0.645,-0.256 v -24.754 c 0,-0.516 -0.321,-0.664 -0.714,-0.329 l -12.536,10.671 c -0.394,0.334 -0.425,0.914 -0.07,1.289 l 12.675,13.379 z"
-		      style="fill:#333333" />
-		<path d="m 410.761,184.249 c 0.394,-0.334 0.292,-0.607 -0.223,-0.607 h -40.092 c -0.515,0 -0.614,0.271 -0.219,0.602 l 19.701,16.524 c 0.396,0.331 1.041,0.329 1.434,-0.006 l 19.399,-16.513 z"
-		      style="fill:#333333" />
-		<path d="m 368.154,211.597 c 0,0.516 0.29,0.631 0.645,0.256 l 12.625,-13.326 c 0.354,-0.375 0.321,-0.951 -0.074,-1.283 l -12.477,-10.465 c -0.396,-0.332 -0.719,-0.181 -0.719,0.335 v 24.483 z"
-		      style="fill:#333333" />
-		<path d="m 392.28,203.674 c -0.393,0.335 -0.979,0.759 -1.302,0.943 0,0 0,0 -0.324,0 -0.321,0 -0.321,0 -0.321,0 -0.32,-0.181 -0.905,-0.6 -1.301,-0.931 l -4.086,-3.428 c -0.396,-0.332 -1.009,-0.297 -1.363,0.078 l -12.847,13.561 c -0.354,0.375 -0.223,0.682 0.293,0.682 h 39.25 c 0.516,0 0.647,-0.307 0.293,-0.682 l -12.883,-13.599 c -0.354,-0.374 -0.966,-0.407 -1.358,-0.073 l -4.051,3.449 z"
-		      style="fill:#333333" />
-	</g>
-</svg>

data/theme/default/Down.svg

@@ -1,14 +0,0 @@
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-	<metadata>
-		<rdf:RDF>
-			<cc:Work rdf:about="">
-				<dc:format>image/svg+xml</dc:format>
-				<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-				<dc:title/>
-			</cc:Work>
-		</rdf:RDF>
-	</metadata>
-	<g transform="matrix(0,1.2,-1.2,0,631.9838,-722.6014)">
-		<polygon points="629.89,509.46,607.39,509.46,607.39,490.51,629.89,490.51,629.89,481.04,652.39,499.94,629.89,518.93" fill="#333"/>
-	</g>
-</svg>

data/theme/default/FavoriteDisable.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.2136037,0,0,1.2136037,-732.43441,-64.413778)">
-		<path d="m 617.617,100.868 c -0.703,0 -1.336,-0.279 -1.781,-0.785 -0.496,-0.56 -0.707,-1.346 -0.6,-2.215 l 1.354,-10.822 c 0.074,-0.585 -0.262,-1.62 -0.666,-2.049 l -7.453,-7.961 c -0.742,-0.792 -1.004,-1.754 -0.717,-2.637 0.287,-0.883 1.063,-1.508 2.129,-1.712 l 10.709,-2.056 c 0.578,-0.111 1.459,-0.752 1.746,-1.27 l 5.08,-9.213 c 0.199,-0.404 0.988,-1.78 2.469,-1.78 1.557,0 2.383,1.58 2.531,1.897 l 5.02,9.097 c 0.285,0.517 1.168,1.157 1.746,1.269 l 10.709,2.056 c 1.066,0.205 1.842,0.829 2.129,1.712 0.287,0.883 0.025,1.844 -0.717,2.637 l -7.453,7.96 c -0.404,0.43 -0.74,1.465 -0.668,2.051 l 1.352,10.822 c 0.109,0.866 -0.102,1.652 -0.596,2.213 -0.723,0.816 -1.939,1.017 -3.1,0.475 l -9.873,-4.633 c -0.197,-0.092 -0.582,-0.189 -1.08,-0.189 -0.498,0 -0.883,0.098 -1.078,0.188 l -9.873,4.633 c -0.444,0.207 -0.887,0.312 -1.319,0.312 l 0,0 z m 12.27,-8.239 c 0.883,0 1.734,0.172 2.398,0.484 l 9.057,4.249 -1.238,-9.932 c -0.186,-1.498 0.451,-3.457 1.482,-4.557 l 6.84,-7.304 -9.828,-1.891 c -1.48,-0.284 -3.148,-1.495 -3.879,-2.817 l -4.832,-8.764 -4.832,8.763 c -0.73,1.323 -2.396,2.534 -3.879,2.818 l -9.824,1.887 6.838,7.309 c 1.031,1.101 1.668,3.06 1.48,4.558 l -1.242,9.928 9.063,-4.247 c 0.663,-0.312 1.515,-0.484 2.396,-0.484 l 0,0 z"
-		      style="fill:#333369" />
-	</g>
-</svg>

data/theme/default/FavoriteEnable.svg

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.1999726,0,0,1.1999726,-723.8473,-206.71515)">
-	<path d="m 617.479,220.601 c -0.711,0 -1.352,-0.282 -1.803,-0.794 -0.5,-0.566 -0.715,-1.361 -0.605,-2.24 l 1.369,-10.944 c 0.074,-0.592 -0.266,-1.638 -0.674,-2.073 l -7.539,-8.051 c -0.75,-0.801 -1.016,-1.773 -0.725,-2.667 0.291,-0.893 1.074,-1.524 2.152,-1.731 l 10.832,-2.08 c 0.584,-0.112 1.477,-0.76 1.766,-1.284 l 5.137,-9.317 c 0.201,-0.408 1,-1.799 2.498,-1.799 1.574,0 2.408,1.598 2.561,1.918 l 5.074,9.2 c 0.289,0.523 1.182,1.171 1.766,1.283 l 10.832,2.08 c 1.078,0.207 1.861,0.838 2.152,1.731 0.291,0.893 0.027,1.866 -0.725,2.667 l -7.539,8.05 c -0.408,0.436 -0.748,1.482 -0.674,2.075 l 1.367,10.944 c 0.109,0.876 -0.104,1.671 -0.604,2.238 -0.73,0.826 -1.961,1.028 -3.135,0.48 l -9.984,-4.685 c -0.199,-0.093 -0.588,-0.192 -1.092,-0.192 -0.504,0 -0.895,0.099 -1.092,0.191 l -9.982,4.685 c -0.45,0.209 -0.897,0.315 -1.333,0.315 l 0,0 z m 12.409,-8.331 c 0.893,0 1.752,0.174 2.424,0.489 l 9.16,4.297 -1.252,-10.044 c -0.189,-1.515 0.455,-3.496 1.498,-4.609 l 6.918,-7.387 -9.939,-1.913 c -1.498,-0.288 -3.184,-1.512 -3.922,-2.85 l -4.887,-8.863 -4.887,8.862 c -0.738,1.338 -2.426,2.563 -3.924,2.851 l -9.936,1.908 6.916,7.391 c 1.043,1.113 1.688,3.094 1.498,4.61 l -1.256,10.041 9.164,-4.295 c 0.673,-0.315 1.532,-0.488 2.425,-0.488 l 0,0 z"
-	      style="fill:#333369" />
-	<path d="m 629.28,189.527 c 0,0 0.244,-0.523 0.607,-0.523 0.363,0 0.627,0.56 0.627,0.56 l 2.816,5.108 c 0.285,0.514 0.988,1.026 1.564,1.137 l 5.955,1.144 c 0.578,0.111 0.721,0.553 0.32,0.981 l -4.146,4.427 c -0.402,0.428 -0.67,1.256 -0.598,1.838 l 0.752,6.02 c 0.074,0.581 -0.303,0.855 -0.834,0.606 l -5.49,-2.577 c -0.533,-0.249 -1.402,-0.249 -1.934,0 l -5.49,2.577 c -0.533,0.249 -0.908,-0.024 -0.836,-0.606 l 0.754,-6.02 c 0.072,-0.582 -0.197,-1.41 -0.598,-1.838 l -4.146,-4.427 c -0.402,-0.429 -0.258,-0.871 0.318,-0.981 l 5.957,-1.144 c 0.576,-0.111 1.279,-0.623 1.564,-1.137 l 2.838,-5.145 z"
-	      style="fill:#333369;fill-rule:evenodd" />
-	</g>
-</svg>

data/theme/default/FavoriteMiddle.svg

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.2135952,0,0,1.2135952,-732.42924,-136.47014)">
-		<path d="m 617.617,160.243 c -0.701,0 -1.334,-0.279 -1.781,-0.785 -0.494,-0.56 -0.707,-1.346 -0.598,-2.215 l 1.354,-10.822 c 0.072,-0.585 -0.264,-1.62 -0.668,-2.049 l -7.453,-7.961 c -0.742,-0.792 -1.004,-1.753 -0.717,-2.637 0.287,-0.883 1.063,-1.507 2.129,-1.712 l 10.709,-2.056 c 0.578,-0.111 1.461,-0.751 1.746,-1.27 l 5.08,-9.213 c 0.199,-0.404 0.99,-1.779 2.469,-1.779 1.557,0 2.383,1.58 2.531,1.896 l 5.02,9.097 c 0.287,0.517 1.168,1.158 1.746,1.269 l 10.709,2.056 c 1.066,0.205 1.842,0.829 2.129,1.712 0.287,0.883 0.027,1.845 -0.717,2.637 l -7.453,7.96 c -0.404,0.431 -0.74,1.465 -0.668,2.051 l 1.354,10.822 c 0.107,0.866 -0.104,1.652 -0.598,2.213 -0.723,0.817 -1.939,1.017 -3.1,0.475 l -9.873,-4.633 c -0.195,-0.092 -0.582,-0.19 -1.08,-0.19 -0.496,0 -0.883,0.098 -1.078,0.189 l -9.871,4.633 c -0.446,0.207 -0.889,0.312 -1.321,0.312 l 0,0 z m 12.27,-8.238 c 0.883,0 1.734,0.171 2.398,0.484 l 9.057,4.249 -1.238,-9.932 c -0.186,-1.498 0.451,-3.457 1.482,-4.557 l 6.84,-7.304 -9.828,-1.891 c -1.48,-0.285 -3.148,-1.496 -3.879,-2.818 l -4.832,-8.764 -4.832,8.763 c -0.73,1.323 -2.396,2.534 -3.877,2.819 l -9.826,1.886 6.838,7.309 c 1.031,1.101 1.668,3.06 1.48,4.559 l -1.24,9.928 9.061,-4.247 c 0.663,-0.313 1.515,-0.484 2.396,-0.484 l 0,0 z"
-		      style="fill:#333369" />
-		<path d="m 641.045,137.83 c 0.396,-0.424 0.254,-0.861 -0.316,-0.971 l -5.891,-1.131 c -0.568,-0.109 -1.264,-0.616 -1.547,-1.124 l -2.783,-5.05 c 0,0 -0.262,-0.554 -0.621,-0.554 -0.357,0 -0.6,0.518 -0.6,0.518 l -2.805,5.087 c -0.281,0.508 -0.977,1.015 -1.547,1.124 l -5.889,1.131 c -0.57,0.11 -0.713,0.547 -0.314,0.971 l 4.098,4.377 c 0.398,0.424 0.664,1.242 0.592,1.817 l -0.744,5.952 c -0.072,0.576 0.299,0.846 0.824,0.599 l 5.43,-2.547 c 0.264,-0.123 0.609,-0.185 0.955,-0.185 0.348,0 0.693,0.062 0.957,0.185 l 5.428,2.547 c 0.133,0.062 0.254,0.091 0.363,0.091 0.322,0 0.518,-0.26 0.463,-0.69 l -0.742,-5.952 c -0.074,-0.576 0.191,-1.394 0.59,-1.817 l 4.099,-4.378 z m -9.563,-2.222 c 0.578,1.042 1.797,1.928 2.967,2.153 l 3.242,0.623 -2.256,2.408 c -0.818,0.871 -1.283,2.308 -1.135,3.49 l 0.408,3.275 -2.988,-1.402 c -0.67,-0.314 -1.367,-0.38 -1.834,-0.38 v -13.059 l 1.596,2.892 z"
-		      style="fill:#333369" />
-	</g>
-</svg>

data/theme/default/File.svg

@@ -1,4 +0,0 @@
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-	<path fill="#333" d="m50.318,5.003h-21.273c-5.515,6-11.03,12-16.545,18v34.714c0.10749,1.7195,2.0191,1.2097,3.1801,1.2857h34.638c1.6346-0.23497,1.0847-2.1237,1.1818-3.284v-49.431c0.018-0.6455-0.51-1.2961-1.182-1.285z"/>
-	<path fill="#FFF" d="m29.038,22.993h-14.182c4.7273-5.143,9.4547-10.286,14.182-15.429v15.429z"/>
-</svg>

data/theme/default/Folder.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64px" height="64px">
-	<g transform="matrix(1.199961,0,0,1.2222222,-436.76926,-579.09522)">
-		<path d="m 378.923,493.986 c -1.41,0 -2.684,1.188 -2.781,2.594 l -0.932,12.574 c -0.059,0.787 -0.717,1.389 -1.495,1.389 -0.037,0 -0.075,-0.002 -0.112,-0.004 -0.826,-0.063 -1.446,-0.781 -1.385,-1.607 l 0.932,-12.566 c 0.205,-2.963 2.796,-5.379 5.773,-5.379 h 28.369 c 0,-0.465 0,-0.873 0,-1.031 0,-1.635 -1.654,-2.973 -3.309,-2.973 h -17.744 c 0,0 0,-1.193 0,-2.543 0,-1.35 -1.354,-2.453 -3.008,-2.453 h -12.07 c -1.654,0 -3.008,1.35 -3.008,3 v 30 c 0,1.65 1.354,3 3.008,3 h 37.098 c 1.655,0 3.122,-1.346 3.262,-2.99 l 1.623,-19.021 c 0.065,-0.766 -0.177,-1.459 -0.612,-1.988 h -33.609 z"
-		      style="fill:#333333" />
-	</g>
-</svg>

data/theme/default/Forbidden.svg

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   id="svg3028"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Forbidden.svg">
-  <metadata
-     id="metadata3038">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3036" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1340"
-     inkscape:window-height="892"
-     id="namedview3034"
-     showgrid="false"
-     inkscape:zoom="8"
-     inkscape:cx="52.794424"
-     inkscape:cy="15.718112"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg3028" />
-  <g
-     transform="matrix(1.2,0,0,1.2,-579.7324,-351.106)"
-     id="g3030">
-    <path
-       d="m 532.27833,319.25811 c 0,-12.427 -10.07533,-22.50311 -22.50133,-22.50311 -12.426,0 -22.5,10.073 -22.5,22.5 0,12.427 10.074,22.5 22.5,22.5 l 0.021,-8.437 c -7.755,0 -14.08298,-6.308 -14.08298,-14.063 0,-2.343 0.584,-4.55 1.602,-6.493 l 18.955,18.953 c -1.943,1.019 -4.15,1.603 -6.494,1.603 l -0.001,8.45698 c 12.426,0 22.5,-10.09298 22.5,-22.51998 l -8.43744,5.9e-4 c 0,2.344 -0.58356,4.54941 -1.60156,6.49441 l -18.955,-18.955 c 1.945,-1.019 4.151,-1.603 6.494,-1.603 7.754,10e-4 14.063,6.309 14.063,14.063 z"
-       style="fill:#333333"
-       id="path3032"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cssccsccccccccccc" />
-  </g>
-</svg>

data/theme/default/Help.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.2,0,0,1.2,-579.7336,-711.5908)">
-		<path d="m 509.778,597.159 c -12.427,0 -22.5,10.074 -22.5,22.5 0,12.428 10.073,22.5 22.5,22.5 12.427,0 22.5,-10.072 22.5,-22.5 -10e-4,-12.426 -10.073,-22.5 -22.5,-22.5 z m -0.559,36.414 c -1.676,0 -3.054,-1.379 -3.054,-3.055 0,-1.676 1.378,-3.053 3.054,-3.053 1.677,0 3.054,1.377 3.054,3.053 0,1.676 -1.377,3.055 -3.054,3.055 z m 2.904,-11.791 c -0.892,1.305 -0.594,3.129 -3.052,3.129 -1.602,0 -2.385,-1.305 -2.385,-2.496 0,-4.432 6.519,-5.436 6.519,-9.086 0,-2.012 -1.34,-3.203 -3.576,-3.203 -4.767,0 -2.905,4.916 -6.518,4.916 -1.304,0 -2.421,-0.783 -2.421,-2.271 0,-3.65 4.172,-6.891 8.714,-6.891 4.769,0 9.46,2.197 9.46,7.449 10e-4,4.842 -5.55,6.703 -6.741,8.453 z"
-		      style="fill:#333333" />
-	</g>
-</svg>

data/theme/default/Home.svg

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.1999968,0,0,1.3606385,-147.9521,-648.3007)">
-		<path d="m 170.351,504.021 c -0.343,0.365 -0.922,0.385 -1.288,0.043 L 150.392,486.63 c -0.365,-0.342 -0.966,-0.342 -1.332,0 l -18.204,16.97 c -0.367,0.344 -0.945,0.322 -1.287,-0.045 l -1.865,-2 c -0.342,-0.365 -0.321,-0.945 0.045,-1.287 l 21.313,-19.869 c 0.367,-0.342 0.967,-0.342 1.334,0.002 l 21.777,20.334 c 0.365,0.342 0.386,0.922 0.043,1.289 l -1.865,1.997 z"
-		      style="fill:#333333"/>
-		<path d="m 149.725,489.777 -15.345,14.305 v 14.83 c 0,0.504 0.414,0.918 0.919,0.918 h 10.085 v -12.857 c 0,-0.504 0.414,-0.918 0.919,-0.918 h 7.347 c 0.506,0 0.918,0.414 0.918,0.918 v 12.857 h 10.119 c 0.505,0 0.918,-0.414 0.918,-0.918 v -14.307 l -15.88,-14.828 z"
-		      style="fill:#333333"/>
-		<path d="m 165.543,482.311 c 0,-0.506 -0.414,-0.92 -0.919,-0.92 h -5.51 c -0.505,0 -0.918,0.414 -0.918,0.92 v 1.604 l 7.347,6.918 v -8.522 z"
-		      style="fill:#333333"/>
-	</g>
-</svg>

data/theme/default/Info.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.2,0,0,1.2,-579.7336,-639.148)">
-		<path d="m 509.778,536.79 c -12.427,0 -22.5,10.074 -22.5,22.5 0,12.428 10.073,22.5 22.5,22.5 12.426,0 22.5,-10.072 22.5,-22.5 0,-12.426 -10.074,-22.5 -22.5,-22.5 z m 3.749,35.66 c 0,0.516 -0.422,0.938 -0.937,0.938 h -5.625 c -0.516,0 -0.938,-0.422 -0.938,-0.938 v -15 c 0,-0.514 0.422,-0.938 0.938,-0.938 h 5.625 c 0.515,0 0.937,0.424 0.937,0.938 v 15 z m 0,-19.758 c 0,0.516 -0.422,0.938 -0.937,0.938 h -5.625 c -0.516,0 -0.938,-0.422 -0.938,-0.938 v -6.563 c 0,-0.516 0.422,-0.938 0.938,-0.938 h 5.625 c 0.515,0 0.937,0.422 0.937,0.938 v 6.563 z"
-		      style="fill:#333333" />
-	</g>
-</svg>

data/theme/default/List.svg

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.1999733,0,0,1.1999733,-364.43055,-494.42419)">
-		<path d="m 352.572,429.142 c 0,0.494 -0.406,0.9 -0.9,0.9 h -43.201 c -0.494,0 -0.9,-0.406 -0.9,-0.9 v -8.099 c 0,-0.496 0.406,-0.9 0.9,-0.9 h 43.201 c 0.494,0 0.9,0.404 0.9,0.9 v 8.099 z"
-		      style="fill:#333333" />
-		<path d="m 352.572,443.542 c 0,0.494 -0.406,0.9 -0.9,0.9 h -43.201 c -0.494,0 -0.9,-0.406 -0.9,-0.9 v -8.1 c 0,-0.496 0.406,-0.9 0.9,-0.9 h 43.201 c 0.494,0 0.9,0.404 0.9,0.9 v 8.1 z"
-		      style="fill:#333333" />
-		<path d="m 352.572,457.942 c 0,0.494 -0.406,0.898 -0.9,0.898 h -43.201 c -0.494,0 -0.9,-0.404 -0.9,-0.898 v -8.102 c 0,-0.494 0.406,-0.898 0.9,-0.898 h 43.201 c 0.494,0 0.9,0.404 0.9,0.898 v 8.102 z"
-		      style="fill:#333333" />
-	</g>
-</svg>

data/theme/default/Load.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.1818182,0,0,1.2857143,-429.68201,-454.27086)">
-		<path d="m 406.154,357.213 h -18 l -14,14 v 27 c 0,0.55 0.449,1 1,1 h 11 v -11 h -4 c -1.1,0 -1.418,-0.688 -0.709,-1.526 l 8.416,-9.947 c 0.711,-0.84 1.875,-0.84 2.584,0 l 8.416,9.947 c 0.711,0.839 0.393,1.526 -0.707,1.526 h -4 v 11 h 10 c 0.549,0 1,-0.45 1,-1 v -40 c 0,-0.551 -0.451,-1 -1,-1 z m -18,14 h -12 l 12,-12 v 12 z"
-		      style="fill:#333333"/>
-	</g>
-</svg>

data/theme/default/Lock.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.2,0,0,1.2,-3.2008856,-206.932)">
-		<path d="m 43.688,193.586 h -1.077 v -8.353 c 0,-4.743 -3.881,-8.623 -8.623,-8.623 h -8.623 c -4.742,0 -8.623,3.88 -8.623,8.623 v 8.353 h -1.078 c -1.778,0 -3.232,1.455 -3.232,3.234 v 21.557 c 0,1.778 1.454,3.233 3.232,3.233 h 28.024 c 1.779,0 3.233,-1.455 3.233,-3.233 V 196.82 c 10e-4,-1.779 -1.453,-3.234 -3.233,-3.234 z m -11.856,14.928 v 6.81 h -4.311 v -6.81 c -1.413,-0.769 -2.383,-2.248 -2.383,-3.969 0,-2.506 2.031,-4.538 4.538,-4.538 2.505,0 4.536,2.032 4.536,4.538 10e-4,1.721 -0.968,3.2 -2.38,3.969 z m 4.516,-14.928 H 23.006 v -7.545 c 0,-2.371 1.938,-4.31 4.311,-4.31 h 4.721 c 2.37,0 4.311,1.939 4.311,4.31 v 7.545 z"
-		      style="fill:#333333" />
-	</g>
-</svg>

data/theme/default/Next.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.2,0,0,1.2,-723.8644,-566.7208)">
-		<polygon points="629.887,481.039 652.387,499.941 629.887,518.934 629.887,509.459 607.387,509.459 607.387,490.512 629.887,490.512 "
-		         style="fill:#333333" />
-	</g>
-</svg>

data/theme/default/OpenMenu.svg

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.2,0,0,1.2,-579.7336,-421.8556)">
-		<path d="m 509.778,363.895 c 7.908,0 14.318,6.411 14.318,14.318 0,7.907 -6.41,14.318 -14.318,14.318 -7.908,0 -14.318,-6.411 -14.318,-14.318 0,-7.907 6.41,-14.318 14.318,-14.318 m 0,-8.182 c -12.406,0 -22.5,10.094 -22.5,22.5 0,12.406 10.094,22.5 22.5,22.5 12.406,0 22.5,-10.094 22.5,-22.5 0,-12.406 -10.094,-22.5 -22.5,-22.5 l 0,0 z"
-		      style="fill:#333333" />
-		<polygon points="498.698,373.228 509.778,387.162 520.857,373.228 "
-		         style="fill:#333333" />
-	</g>
-</svg>

data/theme/default/Parameter.svg

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="64"
-   width="64"
-   version="1.1"
-   id="svg3026"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Parameter.svg">
-  <defs
-     id="defs3034" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1680"
-     inkscape:window-height="968"
-     id="namedview3032"
-     showgrid="true"
-     showguides="false"
-     inkscape:zoom="10.429825"
-     inkscape:cx="15.854083"
-     inkscape:cy="35.324394"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3026">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3036" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3028">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     style="color:#000000;fill:#333333;enable-background:accumulate"
-     d="m 4,51 c 6,-6 6,-6 6,-6 l 9,0 0,9 -6,6 C 23,63 28,51 26,45 33.5363,37.4993 38.48,32.485 46,25 52,27 63,24 60,14 L 55,19 45,19 45,9 50,4 C 40,1 37,12 39,18 31.467,25.472 26.513,30.476 19,38 13,36 1,41 4,51 z"
-     id="path3030"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccccccccccccc" />
-</svg>

data/theme/default/Previous.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(-1.2,0,0,1.2,787.8644,-566.7208)">
-		<polygon points="652.387,499.941 629.887,518.934 629.887,509.459 607.387,509.459 607.387,490.512 629.887,490.512 629.887,481.039 "
-		         style="fill:#333333" />
-	</g>
-</svg>

data/theme/default/Quit.svg

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.2000267,0,0,1.2000267,-3.5226163,-279.15673)">
-		<path d="m 36.314,239.696 v 8.396 c 4.282,2.353 7.191,6.905 7.191,12.126 0,7.626 -6.203,13.829 -13.829,13.829 -7.626,0 -13.829,-6.203 -13.829,-13.829 0,-5.221 2.91,-9.773 7.191,-12.126 v -8.396 c -8.664,2.802 -14.936,10.925 -14.936,20.522 0,11.915 9.658,21.573 21.573,21.573 11.915,0 21.573,-9.658 21.573,-21.573 0.002,-9.596 -6.269,-17.72 -14.934,-20.522 z"
-		      style="fill:#333333"/>
-		<path d="m 32.998,256.706 c 0,1.218 -0.995,2.213 -2.213,2.213 h -2.217 c -1.218,0 -2.213,-0.995 -2.213,-2.213 v -17.701 c 0,-1.218 0.995,-2.213 2.213,-2.213 h 2.217 c 1.218,0 2.213,0.995 2.213,2.213 v 17.701 z"
-		      style="fill:#333333"/>
-	</g>
-</svg>

data/theme/default/Redo.svg

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.3012048,0,0,1.255814,-631.32431,-293.62251)">
-		<circle d="m 514.52701,259.29199 c 0,2.20914 -1.79086,4 -4,4 -2.20914,0 -4,-1.79086 -4,-4 0,-2.20914 1.79086,-4 4,-4 2.20914,0 4,1.79086 4,4 z"
-		        style="fill:#333333"
-		        cx="510.52701"
-		        cy="259.29199"
-		        r="4"/>
-		<path d="m 530.527,254.292 v -13 l -4.098,3.514 c -4.137,-4.393 -10.08,-7.014 -15.902,-7.014 -11.855,0 -21.5,9.646 -21.5,21.5 0,11.854 9.645,21.5 21.5,21.5 8.551,0 16.287,-5.064 19.711,-12.902 l -6.416,-2.801 c -2.309,5.287 -7.527,8.703 -13.295,8.703 -7.996,0 -14.5,-6.504 -14.5,-14.5 0,-7.994 6.504,-14.5 14.5,-14.5 3.824,0 7.744,1.715 10.568,4.584 l -4.568,3.916 14,1 z"
-		      style="fill:#333333"/>
-	</g>
-</svg>

data/theme/default/Remove.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.2000267,0,0,1.2000267,-651.9777,-351.11481)">
-		<path d="m 579.088,319.255 12.91,-12.908 c 0.627,-0.627 0.627,-1.654 0,-2.281 l -6.84,-6.842 c -0.627,-0.625 -1.652,-0.625 -2.279,0 l -12.91,12.91 -12.91,-12.91 c -0.627,-0.625 -1.654,-0.625 -2.281,0 l -6.84,6.842 c -0.625,0.627 -0.625,1.654 0,2.281 l 12.91,12.908 -12.908,12.908 c -0.627,0.627 -0.627,1.654 0,2.281 l 6.84,6.842 c 0.627,0.625 1.654,0.625 2.281,0 l 12.908,-12.91 12.908,12.91 c 0.627,0.625 1.652,0.625 2.279,0 l 6.84,-6.842 c 0.627,-0.627 0.627,-1.654 0,-2.281 l -12.908,-12.908 z"
-		      style="fill:#333333" />
-	</g>
-</svg>

data/theme/default/Remove2.svg

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   id="svg3028"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Remove2.svg">
-  <metadata
-     id="metadata3038">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3036" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1680"
-     inkscape:window-height="968"
-     id="namedview3034"
-     showgrid="true"
-     inkscape:zoom="9.0377085"
-     inkscape:cx="14.895958"
-     inkscape:cy="28.796248"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3028">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3040" />
-  </sodipodi:namedview>
-  <g
-     transform="matrix(1.2000267,0,0,1.2000267,-651.9777,-351.11481)"
-     id="g3030">
-    <path
-       d="m 576.63525,319.25524 15.35699,-15.27674 c 0.627,-0.627 0.627,-1.654 0,-2.281 l -4.29338,-4.3352 c -0.627,-0.625 -1.652,-0.625 -2.279,0 l -15.45113,15.22642 -15.83298,-15.45692 c -0.627,-0.625 -1.654,-0.625 -2.281,0 l -3.9859,4.00946 c -0.625,0.627 -0.625,1.654 0,2.281 l 15.43337,15.83298 -15.31612,15.67389 c -0.61972,0.63419 -0.627,1.654 0,2.281 l 4.14303,4.07587 c 0.627,0.625 1.654,0.625 2.281,0 l 15.5586,-15.36424 16.05393,15.36226 c 0.627,0.625 1.652,0.625 2.279,0 l 3.69434,-4.06095 c 0.627,-0.627 0.62038,-1.64745 0,-2.281 z"
-       style="fill:#fe0000;fill-opacity:0.88627452"
-       id="path3032"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccscccccccsc" />
-  </g>
-</svg>

data/theme/default/Replace.svg

@@ -1,15 +0,0 @@
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-	<metadata>
-		<rdf:RDF>
-			<cc:Work rdf:about="">
-				<dc:format>image/svg+xml</dc:format>
-				<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-				<dc:title/>
-			</cc:Work>
-		</rdf:RDF>
-	</metadata>
-	<path d="M56.308,30.297c-0.34-11.332-7.1-21.282-17.44-25.505-10.575-4.3193-22.883-1.4808-30.624,7.062l6.7808,6.444c5.1608-5.6978,13.367-7.5874,20.417-4.7076,6.802,2.7782,11.249,9.2808,11.584,16.709l-6.7794,0.0046,11.511,14.941,10.893-14.949-6.3435-0.000321z" fill="#333"/>
-	<g transform="matrix(0.71188026,0,0,0.77215001,-386.35967,-207.86869)">
-		<path fill="#333" d="m579.09,319.26,12.91-12.908c0.627-0.627,0.627-1.654,0-2.281l-6.84-6.842c-0.627-0.625-1.652-0.625-2.279,0l-12.91,12.91-12.91-12.91c-0.627-0.625-1.654-0.625-2.281,0l-6.84,6.842c-0.625,0.627-0.625,1.654,0,2.281l12.91,12.908-12.908,12.908c-0.627,0.627-0.627,1.654,0,2.281l6.84,6.842c0.627,0.625,1.654,0.625,2.281,0l12.908-12.91,12.908,12.91c0.627,0.625,1.652,0.625,2.279,0l6.84-6.842c0.627-0.627,0.627-1.654,0-2.281l-12.908-12.908z"/>
-	</g>
-</svg>

data/theme/default/SDCard.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.1999941,0,0,1.2,-75.451168,-351.106)">
-		<path d="m 104.793,296.755 h -24.75 c -1.237,0 -2.25,1.013 -2.25,2.25 v 9 c 0,1.237 -0.562,3.093 -1.248,4.122 l -2.004,3.005 c -0.687,1.029 -1.248,2.885 -1.248,4.123 0,1.236 0.905,1.797 2.013,1.244 l 0.475,-0.238 c 1.107,-0.554 2.013,0.006 2.013,1.244 v 2.25 c 0,1.236 -0.717,2.967 -1.591,3.84 l -1.318,1.318 c -0.874,0.875 -1.591,2.604 -1.591,3.842 v 6.75 c 0,1.236 1.013,2.25 2.25,2.25 h 24.75 c 4.359,0 6.75,-2.25 6.75,-6.75 v -36 c -10e-4,-1.237 -1.014,-2.25 -2.251,-2.25 z m -20.25,13 c 0,0.275 -0.225,0.5 -0.5,0.5 h -1.25 c -0.275,0 -0.5,-0.225 -0.5,-0.5 v -8 c 0,-0.275 0.225,-0.5 0.5,-0.5 h 1.25 c 0.275,0 0.5,0.225 0.5,0.5 v 8 z m 4.5,0 c 0,0.275 -0.225,0.5 -0.5,0.5 h -1.25 c -0.275,0 -0.5,-0.225 -0.5,-0.5 v -8 c 0,-0.275 0.225,-0.5 0.5,-0.5 h 1.25 c 0.275,0 0.5,0.225 0.5,0.5 v 8 z m 4.5,0 c 0,0.275 -0.225,0.5 -0.5,0.5 h -1.25 c -0.275,0 -0.5,-0.225 -0.5,-0.5 v -8 c 0,-0.275 0.225,-0.5 0.5,-0.5 h 1.25 c 0.275,0 0.5,0.225 0.5,0.5 v 8 z m 4.5,0 c 0,0.275 -0.225,0.5 -0.5,0.5 h -1.25 c -0.275,0 -0.5,-0.225 -0.5,-0.5 v -8 c 0,-0.275 0.225,-0.5 0.5,-0.5 h 1.25 c 0.275,0 0.5,0.225 0.5,0.5 v 8 z m 4.5,0 c 0,0.275 -0.225,0.5 -0.5,0.5 h -1.25 c -0.275,0 -0.5,-0.225 -0.5,-0.5 v -8 c 0,-0.275 0.225,-0.5 0.5,-0.5 h 1.25 c 0.275,0 0.5,0.225 0.5,0.5 v 8 z"
-		      style="fill:#333333" />
-	</g>
-</svg>

data/theme/default/Save.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64px" height="64px">
-	<g transform="matrix(1.2,0,0,1.2000267,-436.7836,-495.40152)">
-		<rect style="fill:#333333"
-		      x="386.36899"
-		      y="419.13501"
-		      width="8.5719995"
-		      height="10.714"
-		/>
-		<path style="fill:#333333"
-		      d="m 403.435,416.992 h -3.139 v 16.071 h -25.713 v -16.071 h -5.893 c -0.295,0 -0.537,0.241 -0.537,0.535 v 43.929 c 0,0.295 0.242,0.535 0.537,0.535 h 43.928 c 0.295,0 0.535,-0.24 0.535,-0.535 V 426.71 l -9.718,-9.718 z m 3.291,41.784 h -32.143 v -21.428 h 32.143 v 21.428 z"
-		/>
-		<polygon style="fill:#333333" points="403.511,445.921 403.511,445.921 377.798,445.921 377.798,442.706 403.511,442.706 " />
-		<polygon style="fill:#333333" points="403.511,453.421 403.511,453.421 377.798,453.421 377.798,450.206 403.511,450.206 " />
-	</g>
-</svg>

data/theme/default/Search.svg

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg height="64"
-     width="64" >
-  <metadata
-     id="metadata3975">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3973" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1680"
-     inkscape:window-height="968"
-     id="namedview3971"
-     showgrid="false"
-     inkscape:zoom="16"
-     inkscape:cx="27.03623"
-     inkscape:cy="33.687368"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3965" />
-  <path
-     d="M 39.436904,24.062448 C 39.915614,33.278293 29.16429,41.203307 19.736168,37.727362 10.452887,34.884476 6.7103607,23.258769 12.262163,15.90798 17.329733,7.8698857 31.048441,7.5763012 36.47627,15.419465 c 1.929199,2.496703 2.965789,5.568455 2.960389,8.64209 z"
-     id="path3969"
-     style="fill:#ffffff;fill-opacity:0.87450981"
-     inkscape:connector-curvature="0" />
-  <path
-     d="M 58.168,50.56 46.013,38.407 c -0.91442,-0.91442 -2.3016,-1.0644 -3.3865,-0.47161 l -2.592,-2.592 c 2.208,-3.1357 3.5185,-6.9493 3.5185,-11.068 0,-10.629 -8.6485,-19.276 -19.277,-19.276 -10.629,0 -19.276,8.6461 -19.276,19.276 0,10.6299 8.6461,19.277 19.276,19.277 4.1017,0 7.8985,-1.296 11.026,-3.4873 0,0 0.596082,-5.606306 -5.038478,-5.016691 -4.69706,2.902115 -12.054397,2.017375 -15.875086,-3.769003 -3.142722,-4.56604 -2.630816,-13.100523 2.668347,-16.731928 5.299163,-3.631405 14.142128,-3.981951 18.471312,4.363412 2.363082,6.040278 0.78609,12.603632 -5.311526,16.1632 7.665096,7.559567 7.694231,7.60221 7.694231,7.60221 -0.56041,1.0752 -0.40321,2.4348 0.49681,3.3373 l 12.155,12.153 c 1.1088,1.1112 2.9268,1.1112 4.0357,0 l 3.5725,-3.5701 c 1.1064,-1.1088 1.1064,-2.9256 -0.0024,-4.0369 z"
-     id="path3967"
-     inkscape:connector-curvature="0"
-     style="fill:#333333"
-     sodipodi:nodetypes="ccccssssccczccccccccc" />
-</svg>

data/theme/default/Trash.svg

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.2,0,0,1.2,-436.9344,-711.5908)">
-		<path d="m 408.302,604.218 h -7.95 c 0.002,-0.055 0.009,-0.109 0.009,-0.166 v -1.6 c 0,-2.91 -2.384,-5.293 -5.294,-5.293 h -8.824 c -2.912,0 -5.294,2.383 -5.294,5.293 v 1.6 c 0,0.057 0.007,0.111 0.009,0.166 h -7.95 c -1.456,0 -2.646,1.191 -2.646,2.646 v 2.646 c 0,1.457 1.19,2.648 2.646,2.648 h 0.883 v -1.766 h 33.529 v 1.766 h 0.883 c 1.455,0 2.646,-1.191 2.646,-2.648 v -2.646 c -0.001,-1.455 -1.192,-2.646 -2.647,-2.646 z m -22.969,-2.647 h 10.588 v 2.646 h -10.588 v -2.646 z"
-		      style="fill:#333333"/>
-		<path d="m 375.654,613.042 v 26.469 c 0,1.457 1.19,2.648 2.647,2.648 h 24.705 c 1.456,0 2.647,-1.191 2.647,-2.648 v -26.469 h -29.999 z m 8.824,23.381 c 0,0.486 -0.397,0.883 -0.882,0.883 h -1.765 c -0.486,0 -0.883,-0.396 -0.883,-0.883 v -17.646 c 0,-0.484 0.396,-0.883 0.883,-0.883 h 1.765 c 0.484,0 0.882,0.398 0.882,0.883 v 17.646 z m 7.941,0 c 0,0.486 -0.398,0.883 -0.882,0.883 h -1.766 c -0.485,0 -0.882,-0.396 -0.882,-0.883 v -17.646 c 0,-0.484 0.396,-0.883 0.882,-0.883 h 1.766 c 0.483,0 0.882,0.398 0.882,0.883 v 17.646 z m 7.941,0 c 0,0.486 -0.398,0.883 -0.883,0.883 h -1.765 c -0.485,0 -0.882,-0.396 -0.882,-0.883 v -17.646 c 0,-0.484 0.396,-0.883 0.882,-0.883 h 1.765 c 0.484,0 0.883,0.398 0.883,0.883 v 17.646 z"
-		      style="fill:#333333"/>
-	</g>
-</svg>

data/theme/default/Undo.svg

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(-1.3012048,0,0,1.255814,695.32425,-293.62251)">
-		<circle d="m 514.52701,259.29199 c 0,2.20914 -1.79086,4 -4,4 -2.20914,0 -4,-1.79086 -4,-4 0,-2.20914 1.79086,-4 4,-4 2.20914,0 4,1.79086 4,4 z"
-		        style="fill:#333333"
-		        cx="510.52701"
-		        cy="259.29199"
-		        r="4"/>
-		<path d="m 530.527,254.292 v -13 l -4.098,3.514 c -4.137,-4.393 -10.08,-7.014 -15.902,-7.014 -11.855,0 -21.5,9.646 -21.5,21.5 0,11.854 9.645,21.5 21.5,21.5 8.551,0 16.287,-5.064 19.711,-12.902 l -6.416,-2.801 c -2.309,5.287 -7.527,8.703 -13.295,8.703 -7.996,0 -14.5,-6.504 -14.5,-14.5 0,-7.994 6.504,-14.5 14.5,-14.5 3.824,0 7.744,1.715 10.568,4.584 l -4.568,3.916 14,1 z"
-		      style="fill:#333333"/>
-	</g>
-</svg>

data/theme/default/Up.svg

@@ -1,14 +0,0 @@
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-	<metadata>
-		<rdf:RDF>
-			<cc:Work rdf:about="">
-				<dc:format>image/svg+xml</dc:format>
-				<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-				<dc:title/>
-			</cc:Work>
-		</rdf:RDF>
-	</metadata>
-	<g transform="matrix(0,-1.2,1.2,0,-567.9838,789.1274)">
-		<polygon points="652.39,499.94,629.89,518.93,629.89,509.46,607.39,509.46,607.39,490.51,629.89,490.51,629.89,481.04" fill="#333"/>
-	</g>
-</svg>

data/theme/default/Update.svg

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.1999733,0,0,1.1999733,-579.72065,-63.509343)">
-		<path d="m 528.054,71.68 c -3.166,-7.28 -10.25,-11.956 -18.232,-11.956 -8.164,0 -15.625,5.116 -18.564,12.729 l 6.188,2.39 c 1.959,-5.077 6.934,-8.486 12.377,-8.486 5.251,0 9.9,3.048 12.05,7.791 l -4.514,1.804 11.543,6.66 3.377,-12.617 -4.225,1.685 z"
-		      style="fill:#333333"/>
-		<path d="m 509.822,92.88 c -5.205,0 -9.952,-3.14 -12.074,-7.853 l 4.45,-1.721 -11.423,-6.515 -3.497,12.281 4.26,-1.646 c 3.106,7.252 10.357,12.084 18.284,12.084 8.193,0 15.449,-4.917 18.484,-12.524 l -6.158,-2.457 c -2.026,5.073 -6.862,8.351 -12.326,8.351 z"
-		      style="fill:#333333"/>
-	</g>
-</svg>

data/theme/default/Validate.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.2,0,0,1.2,-651.9628,-63.5416)">
-		<path d="m 569.969,57.117 c -12.428,0 -22.5,10.073 -22.5,22.501 0,12.426 10.072,22.5 22.5,22.5 12.426,0 22.5,-10.074 22.5,-22.5 0,-12.428 -10.074,-22.501 -22.5,-22.501 z m 11.324,21.029 -10.391,10.391 c -0.514,0.514 -1.357,0.514 -1.871,0 L 558.642,78.148 c -0.514,-0.514 -0.514,-1.355 0,-1.869 l 2.279,-2.281 c 0.867,-0.867 2.174,-0.752 2.943,0.02 l 5.166,5.164 c 0.514,0.516 1.357,0.516 1.871,0 l 5.182,-5.18 c 0.867,-0.869 2.121,-0.816 2.934,-0.002 l 2.275,2.275 c 0.515,0.513 0.515,1.357 10e-4,1.871 z"
-		      style="fill:#333333;fill-rule:evenodd" />
-	</g>
-</svg>

data/theme/default/VolumeMax.svg

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.300523,0,0,1.300523,-4.3338536,-458.79144)">
-		<polygon points="16.142,372.236 26.103,362.274 26.103,394.151 16.142,384.189 7.177,384.189 7.177,372.236 "
-		         style="fill:#333333" />
-		<path d="m 34.567,369.749 -2.816,2.816 c 1.447,1.446 2.344,3.444 2.344,5.647 0,2.203 -0.896,4.201 -2.344,5.646 l 2.816,2.816 c 2.168,-2.168 3.512,-5.161 3.512,-8.463 0,-3.302 -1.344,-6.293 -3.512,-8.462 z"
-		      style="fill:#333333" />
-		<path d="m 39.704,365.025 -2.816,2.816 c 2.645,2.645 4.283,6.297 4.283,10.324 0,4.027 -1.639,7.68 -4.283,10.324 l 2.816,2.816 c 3.365,-3.367 5.451,-8.015 5.451,-13.141 0,-5.123 -2.086,-9.771 -5.451,-13.139 z"
-		      style="fill:#333333" />
-		<path d="m 44.56,359.854 -2.816,2.816 c 3.982,3.982 6.449,9.48 6.449,15.543 0,6.063 -2.467,11.561 -6.447,15.543 l 2.814,2.816 c 4.705,-4.704 7.617,-11.197 7.617,-18.359 0,-7.162 -2.914,-13.655 -7.617,-18.359 z"
-		      style="fill:#333333" />
-	</g>
-</svg>

data/theme/default/VolumeMute.svg

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.2249898,0,0,1.2249898,-3.7905268,-358.08412)">
-		<polygon points="16.82,325.684 7.176,325.684 7.176,312.827 16.82,312.827 27.534,302.112 27.534,336.398 "
-		    style="fill:#333333" />
-		<path d="m 47.081,319.255 4.918,-4.917 c 0.238,-0.24 0.238,-0.631 0,-0.87 l -2.607,-2.606 c -0.237,-0.238 -0.629,-0.238 -0.866,0 l -4.919,4.918 -4.92,-4.918 c -0.236,-0.238 -0.629,-0.238 -0.867,0 l -2.605,2.606 c -0.239,0.239 -0.239,0.63 0,0.87 l 4.917,4.917 -4.917,4.917 c -0.239,0.24 -0.239,0.632 0,0.87 l 2.607,2.607 c 0.236,0.236 0.629,0.236 0.867,0 l 4.918,-4.919 4.916,4.919 c 0.24,0.236 0.632,0.236 0.869,0 l 2.607,-2.607 c 0.236,-0.237 0.236,-0.63 0,-0.87 l -4.918,-4.917 z"
-		    style="fill:#333333" />
-	</g>
-</svg>

data/theme/default/Warning.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.2000035,0,0,1.2000035,-76.201658,-63.592236)">
-		<path d="M 111.858,93.287 93.524,62.64 C 91.67,59.542 88.639,59.543 86.789,62.641 L 68.476,93.286 c -1.851,3.098 -0.413,5.633 3.197,5.633 h 36.993 c 3.608,-10e-4 5.045,-2.535 3.192,-5.632 z M 88.2,73.367 c 0,-1.084 0.887,-1.969 1.969,-1.969 1.083,0 1.969,0.885 1.969,1.969 v 9.192 c 0,1.085 -0.886,1.969 -1.969,1.969 -1.082,0 -1.969,-0.884 -1.969,-1.969 v -9.192 z m 1.969,19.596 c -1.449,0 -2.625,-1.177 -2.625,-2.625 0,-1.451 1.176,-2.624 2.625,-2.624 1.45,0 2.625,1.173 2.625,2.624 0,1.449 -1.175,2.625 -2.625,2.625 z"
-		      style="fill:#333333" />
-	</g>
-</svg>

data/theme/default/WhereAmI.svg

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.2000267,0,0,1.2000267,-220.089,-63.543123)">
-		<path d="m 232.569,79.617 -16.755,-3.49 2.864,-5.115 -5.023,3.029 -3.585,-16.924 -3.585,16.924 -5.023,-3.029 2.864,5.115 -16.755,3.49 h -0.001 l 0.001,0 0,0 16.755,3.49 -2.864,5.114 5.023,-3.029 3.585,16.925 3.585,-16.925 5.023,3.029 -2.864,-5.114 16.755,-3.49 0,0 0,0 0,0 z m -22.499,4.302 c -2.376,0 -4.302,-1.925 -4.302,-4.301 0,-2.375 1.926,-4.301 4.302,-4.301 2.376,0 4.302,1.926 4.302,4.301 0,2.376 -1.926,4.301 -4.302,4.301 z"
-		      style="fill:#451c54" />
-		<g>
-			<path d="m 199.03,75.203 c 1.204,-2.997 3.589,-5.393 6.58,-6.609 l 1.242,-5.866 c -6.921,1.314 -12.371,6.771 -13.676,13.694 l 5.854,-1.219 z"
-			      style="fill:#451c54" />
-			<path d="m 221.139,84.026 c -1.204,3.017 -3.604,5.428 -6.615,6.644 l -1.24,5.861 c 6.939,-1.307 12.404,-6.779 13.703,-13.723 l -5.848,1.218 z"
-			      style="fill:#451c54" />
-			<path d="m 214.529,68.586 c 3.002,1.214 5.396,3.615 6.603,6.622 l 5.852,1.219 C 225.679,69.495 220.22,64.032 213.289,62.725 l 1.24,5.861 z"
-			      style="fill:#451c54" />
-			<path d="m 205.614,90.663 c -3,-1.219 -5.391,-3.624 -6.592,-6.632 l -5.85,-1.218 c 1.299,6.935 6.754,12.402 13.684,13.715 l -1.242,-5.865 z"
-			      style="fill:#451c54" />
-		</g>
-	</g>
-</svg>

data/theme/default/WrapAround.svg

@@ -1,13 +0,0 @@
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-	<metadata>
-		<rdf:RDF>
-			<cc:Work rdf:about="">
-				<dc:format>image/svg+xml</dc:format>
-				<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-				<dc:title/>
-			</cc:Work>
-		</rdf:RDF>
-	</metadata>
-	<path d="m36.594,31.471,9.9047,12.555,9.3732-12.561-9.4514,0.0011z" fill="#333"/>
-	<path fill="#353535" d="m31.724,51.573c-6.6423,0-11.845-9.0656-11.845-20.048s5.203-20.048,11.845-20.048c7.389,0,12.257,7.595,11.625,20.494,3.1648,0.01798,3.0508-0.01346,7.1142-0.17954,0.674-20.911-8.501-28.985-18.739-28.985-9.0867,0-18.935,12.636-18.935,28.584s9.849,29.002,18.935,28.855"/>
-</svg>

data/theme/default/ZoomIn.svg

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.20002,0,0,1.20002,-651.97375,-639.15903)">
-		<path d="m 591.775,574.756 -10.129,-10.127 c -0.762,-0.762 -1.918,-0.887 -2.822,-0.393 l -2.16,-2.16 c 1.84,-2.613 2.932,-5.791 2.932,-9.223 0,-8.857 -7.207,-16.063 -16.064,-16.063 -8.857,0 -16.063,7.205 -16.063,16.063 0,8.858 7.205,16.064 16.063,16.064 3.418,0 6.582,-1.08 9.188,-2.906 l 2.174,2.176 c -0.467,0.896 -0.336,2.029 0.414,2.781 l 10.129,10.127 c 0.924,0.926 2.439,0.926 3.363,0 l 2.977,-2.975 c 0.922,-0.925 0.922,-2.438 -0.002,-3.364 z m -28.244,-11.787 c -5.584,0 -10.113,-4.529 -10.113,-10.115 0,-5.584 4.529,-10.113 10.113,-10.113 5.586,0 10.115,4.529 10.115,10.113 0,5.585 -4.529,10.115 -10.115,10.115 z"
-		      style="fill:#333333" />
-		<path d="m 568.498,550.863 h -3 v -3 c 0,-1.104 -0.895,-2 -2,-2 -1.104,0 -2,0.896 -2,2 v 3 h -3 c -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 h 3 v 3 c 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2 v -3 h 3 c 1.105,0 2,-0.895 2,-2 0,-1.103 -0.894,-2 -2,-2 z"
-		      style="fill:#333333" />
-	</g>
-</svg>

install.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-#really simple to install
-echo "- copy binary /usr/bin/edn"
-sudo cp -vf out/Linux/release/staging/edn/usr/bin/edn /usr/bin/edn
-sudo mkdir -p /usr/share/edn
-echo "- Remove the folder /usr/share/edn/*"
-sudo rm -rf /usr/share/edn/*
-sudo cp -rfv out/Linux/release/staging/edn/usr/share/* /usr/share/

lutin_edn.py

@@ -0,0 +1,140 @@
+#!/usr/bin/python
+import lutin.module as module
+import lutin.tools as tools
+import realog.debug as debug
+import os
+
+def get_type():
+	return "BINARY"
+
+def get_name():
+	return "Editeur de N'ours"
+
+def get_desc():
+	return "Text editor for sources code with ctags management"
+
+def get_licence():
+	return "GPL-3"
+
+def get_compagny_type():
+	return "org"
+
+def get_compagny_name():
+	return "Edouard DUPIN"
+
+def get_maintainer():
+	return ["Mr DUPIN Edouard <yui.heero@gmail.com>"]
+
+def get_version():
+	return [1,3,"dev"]
+
+def get_version_id():
+	return 6
+
+def configure(target, my_module):
+	my_module.add_extra_flags()
+	my_module.add_src_file([
+		'sources/appl/ctags/readtags.cpp'
+		])
+	my_module.add_src_file([
+		'sources/appl/debug.cpp',
+		'sources/appl/global.cpp',
+		'sources/appl/globalMsg.cpp',
+		'sources/appl/init.cpp'
+		])
+	# Gui:
+	my_module.add_src_file([
+		'sources/appl/widget/BufferList.cpp',
+		'sources/appl/widget/BufferTree.cpp',
+		'sources/appl/Gui/TextViewer.cpp',
+		'sources/appl/Gui/ViewerManager.cpp',
+		'sources/appl/Gui/MainWindows.cpp',
+		'sources/appl/Gui/Search.cpp',
+		'sources/appl/Gui/TagFileSelection.cpp',
+		'sources/appl/Gui/TagFileList.cpp',
+		'sources/appl/Gui/WorkerSaveFile.cpp',
+		'sources/appl/Gui/WorkerSaveAllFile.cpp',
+		'sources/appl/Gui/WorkerCloseFile.cpp',
+		'sources/appl/Gui/WorkerCloseAllFile.cpp'
+		])
+	# All needed for the buffer management :
+	my_module.add_src_file([
+		'sources/appl/Buffer.cpp',
+		'sources/appl/BufferManager.cpp',
+		'sources/appl/TextPlugin.cpp',
+		'sources/appl/TextPluginCopy.cpp',
+		'sources/appl/TextPluginMultiLineTab.cpp',
+		'sources/appl/TextPluginAutoIndent.cpp',
+		'sources/appl/TextPluginHistory.cpp',
+		'sources/appl/TextPluginRmLine.cpp',
+		'sources/appl/TextPluginSelectAll.cpp',
+		'sources/appl/TextPluginCtags.cpp',
+		'sources/appl/TextPluginManager.cpp'
+		])
+	# Generic color management for the text editor : 
+	my_module.add_src_file([
+		'sources/appl/GlyphDecoration.cpp',
+		'sources/appl/GlyphPainting.cpp'
+		])
+	# syntax coloration for the text editor
+	my_module.add_src_file([
+		'sources/appl/HighlightPattern.cpp',
+		'sources/appl/Highlight.cpp',
+		'sources/appl/HighlightManager.cpp'
+		])
+	my_module.add_depend(['ewol'])
+	my_module.copy_path('data/icon.*','')
+	my_module.copy_path('data/languages/gcov/*.xml','languages/gcov/')
+	my_module.copy_path('data/languages/asm/*.xml','languages/asm/')
+	my_module.copy_path('data/languages/bash/*.xml','languages/bash/')
+	my_module.copy_path('data/languages/boo/*.xml','languages/boo/')
+	my_module.copy_path('data/languages/cpp/*.xml','languages/cpp/')
+	my_module.copy_path('data/languages/c/*.xml','languages/c/')
+	my_module.copy_path('data/languages/cmake/*.xml','languages/cmake/')
+	my_module.copy_path('data/languages/glsl/*.xml','languages/glsl/')
+	my_module.copy_path('data/languages/in/*.xml','languages/in/')
+	my_module.copy_path('data/languages/java/*.xml','languages/java/')
+	my_module.copy_path('data/languages/js/*.xml','languages/js/')
+	my_module.copy_path('data/languages/qml/*.xml','languages/qml/')
+	my_module.copy_path('data/languages/json/*.xml','languages/json/')
+	my_module.copy_path('data/languages/lua/*.xml','languages/lua/')
+	my_module.copy_path('data/languages/makefile/*.xml','languages/makefile/')
+	my_module.copy_path('data/languages/matlab/*.xml','languages/matlab/')
+	my_module.copy_path('data/languages/php/*.xml','languages/php/')
+	my_module.copy_path('data/languages/xml/*.xml','languages/xml/')
+	my_module.copy_path('data/languages/python/*.xml','languages/python/')
+	my_module.copy_path('data/languages/zeus.idl/*.xml','languages/zeus.idl/')
+	my_module.copy_path('data/languages/perl/*.xml','languages/perl/')
+	my_module.copy_path('data/languages/TypeScript/*.xml','languages/TypeScript/')
+	my_module.copy_path('data/languages/css/*.xml','languages/css/')
+	my_module.copy_path('data/theme/colorWhite/*.json','theme/color/white/')
+	my_module.copy_path('data/theme/colorBlack/*.json','theme/color/black/')
+	my_module.copy_path('data/GUI-*.xml')
+	
+	my_module.add_path("sources")
+	
+	my_module.copy_file("data/Font/freefont/FreeSerif.ttf","fonts/FreeSerif.ttf")
+	my_module.copy_path("data/Font/freefont/FreeMon*.ttf","fonts/")
+	
+	my_module.add_flag('c', [
+		"-DPROJECT_NAME=\"\\\""+my_module.get_name()+"\\\"\"",
+		"-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\""
+		])
+	versionIDCode = str(get_version_id())
+	
+	my_module.compile_version("c++", 2014)
+	
+	# set the package properties:
+	my_module.set_pkg("VERSION_CODE", versionIDCode)
+	if "MacOs" in target.get_type():
+		my_module.set_pkg("ICON", "data/icon.icns")
+	else:
+		my_module.set_pkg("ICON", "data/icon.png")
+	
+	my_module.set_pkg("SECTION", ["Development", "Editors"])
+	my_module.set_pkg("PRIORITY", "optional")
+	my_module.add_pkg("RIGHT", "WRITE_EXTERNAL_STORAGE")
+	my_module.add_pkg("RIGHT", "SET_ORIENTATION")
+	
+	return True
+

sources/Android.mk

@@ -1,31 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# load the common sources file of the platform
-include $(LOCAL_PATH)/file.mk
-
-LOCAL_CONFIG_FILES := Config.in
-
-# name of the librairy
-LOCAL_MODULE := edn
-
-# get the tag of the current project : 
-LOCAL_VERSION=$(shell cat $(LOCAL_PATH)/../tag)
-$(info [TAG:$(LOCAL_MODULE)] $(LOCAL_VERSION))
-
-# name of the dependency
-LOCAL_LIBRARIES := ewol freetype libpng parsersvg tinyxml lua etk libzip
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(addprefix $(LOCAL_PATH)/, $(sort $(dir $(FILE_LIST))))
-
-LOCAL_SRC_FILES := $(FILE_LIST)
-
-LOCAL_LDLIBS    := -llog -landroid
-
-LOCAL_CFLAGS    :=  -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
-                    -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION)-$(BUILD_DIRECTORY_MODE)\""
-
-
-include $(BUILD_SHARED_LIBRARY)
-

sources/CMakeLists.txt

@@ -0,0 +1,110 @@
+cmake_minimum_required(VERSION 2.8)
+
+# Declare the project
+project(edn)
+
+##
+## Include C++ X11 dependency ... (check correct flags)
+##
+include(CheckCXXCompilerFlag)
+CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+if(COMPILER_SUPPORTS_CXX11)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+else()
+	CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
+	if(COMPILER_SUPPORTS_CXX0X)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+	else()
+		message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+	endif()
+endif()
+
+
+# set output path:
+set(LIBRARY_OUTPUT_PATH lib/${CMAKE_BUILD_TYPE})
+
+include_directories(.)
+
+#Create src file list
+set(src_files
+	appl/ctags/readtags.cpp
+	appl/debug.cpp
+	appl/global.cpp
+	appl/globalMsg.cpp
+	appl/init.cpp
+	appl/Gui/BufferView.cpp
+	appl/Gui/TextViewer.cpp
+	appl/Gui/ViewerManager.cpp
+	appl/Gui/MainWindows.cpp
+	appl/Gui/Search.cpp
+	appl/Gui/TagFileSelection.cpp
+	appl/Gui/TagFileList.cpp
+	appl/Gui/WorkerSaveFile.cpp
+	appl/Gui/WorkerSaveAllFile.cpp
+	appl/Gui/WorkerCloseFile.cpp
+	appl/Gui/WorkerCloseAllFile.cpp
+	appl/Buffer.cpp
+	appl/BufferManager.cpp
+	appl/TextPlugin.cpp
+	appl/TextPluginCopy.cpp
+	appl/TextPluginMultiLineTab.cpp
+	appl/TextPluginAutoIndent.cpp
+	appl/TextPluginHistory.cpp
+	appl/TextPluginRmLine.cpp
+	appl/TextPluginSelectAll.cpp
+	appl/TextPluginCtags.cpp
+	appl/TextPluginManager.cpp
+	appl/GlyphDecoration.cpp
+	appl/GlyphPainting.cpp
+	appl/HighlightPattern.cpp
+	appl/Highlight.cpp
+	appl/HighlightManager.cpp
+)
+
+add_definitions( -DDEBUG_LEVEL=3 )
+add_definitions( -DDEBUG=1 )
+add_definitions( -DPROJECT_NAME="edn" )
+if (APPLE)
+	add_definitions( -D__TARGET_OS__MacOs )
+elseif (UNIX)
+	add_definitions( -D__TARGET_OS__Linux )
+elseif (WIN32)
+	add_definitions( -D__TARGET_OS__Windows )
+endif ()
+# read version :
+file (STRINGS "tag" BUILD_VERSION)
+add_definitions( -DAPPL_VERSION="${BUILD_VERSION}" )
+
+#Create a static Lib:
+add_executable(edn ${src_files} )
+
+include_directories(${zlib_SOURCE_DIR}/contrib/)
+include_directories(${linearmath_SOURCE_DIR}/bullet/src/)
+include_directories(${etk_SOURCE_DIR})
+include_directories(${freetype_SOURCE_DIR})
+include_directories(${exml_SOURCE_DIR})
+include_directories(${ejson_SOURCE_DIR})
+include_directories(${egami_SOURCE_DIR})
+include_directories(${edtaa3_SOURCE_DIR})
+include_directories(${date_SOURCE_DIR})
+include_directories(${agg_SOURCE_DIR})
+include_directories(${ewol_SOURCE_DIR})
+
+
+#target_link_libraries(edn ewol)
+target_link_libraries(edn ewol linearmath zlib etk freetype exml ejson egami edtaa3 date esvg png)
+
+if (APPLE)
+	target_link_libraries(edn
+		"-framework Cocoa"
+		"-framework OpenGL"
+		"-framework QuartzCore"
+		"-framework AppKit"
+	)
+elseif (UNIX)
+target_link_libraries(edn -lGL -lX11 -lpthread)
+elseif (WIN32)
+
+endif ()
+
+

sources/Config.in

@@ -1,16 +0,0 @@
-menu "General"
-	choice
-		prompt "Buffer text configuration"
-		default APPL_BUFFER_FONT_NORMAL
-		help
-			Buffer display mode :
-				0 : Basic Sprite font mode.
-				    ==> Old standard mode fast but need to reaload distint font for every size
-				1 : Distance Field.
-				    ==> New theoric mode for the display of the font ==> really slow but insteresting ...
-		config APPL_BUFFER_FONT_NORMAL
-			bool "0: Basic Sprite font mode"
-		config APPL_BUFFER_FONT_DISTANCE_FIELD
-			bool "1: Distance Field"
-	endchoice
-endmenu

sources/Linux.mk

@@ -1,32 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# load the common sources file of the platform
-include $(LOCAL_PATH)/file.mk
-
-LOCAL_CONFIG_FILES := Config.in
-
-# name of the librairy
-LOCAL_MODULE := edn
-# get the tag of the current project : 
-LOCAL_VERSION=$(shell cat $(LOCAL_PATH)/../tag)
-$(info [TAG:$(LOCAL_MODULE)] $(LOCAL_VERSION))
-
-# name of the dependency
-LOCAL_STATIC_LIBRARIES := ewol
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(addprefix $(LOCAL_PATH)/, $(sort $(dir $(FILE_LIST))))
-
-LOCAL_SRC_FILES := $(FILE_LIST)
-
-
-LOCAL_LDLIBS    := 
-
-LOCAL_CFLAGS    :=  -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
-                    -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION)-$(BUILD_DIRECTORY_MODE)\""
-
-LOCAL_COPY_FILES += ../data/icon.png:icon.png
-
-include $(BUILD_EXECUTABLE)
-

sources/Windows.mk

@@ -1,30 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# load the common sources file of the platform
-include $(LOCAL_PATH)/file.mk
-
-LOCAL_CONFIG_FILES := Config.in
-
-# name of the librairy
-LOCAL_MODULE := edn
-
-# get the tag of the current project : 
-LOCAL_VERSION=$(shell cat $(LOCAL_PATH)/../tag)
-$(info [TAG:$(LOCAL_MODULE)] $(LOCAL_VERSION))
-
-# name of the dependency
-LOCAL_STATIC_LIBRARIES := ewol
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(addprefix $(LOCAL_PATH)/, $(sort $(dir $(FILE_LIST))))
-
-LOCAL_SRC_FILES := $(FILE_LIST)
-
-
-LOCAL_LDLIBS    := 
-
-LOCAL_CFLAGS    :=  -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
-                    -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION)-$(BUILD_DIRECTORY_MODE)\""
-
-include $(BUILD_EXECUTABLE)

sources/appl/Buffer.hpp

@@ -0,0 +1,635 @@
+/** @file
+ * @author Edouard DUPIN
+ * @copyright 2010, Edouard DUPIN, all right reserved
+ * @license GPL v3 (see license file)
+ */
+#pragma once
+
+#include <etk/types.hpp>
+#include <ewol/ewol.hpp>
+#include <etk/Buffer.hpp>
+#include <ewol/object/Object.hpp>
+#include <ewol/widget/Widget.hpp>
+#include <ewol/compositing/Text.hpp>
+#include <appl/Highlight.hpp>
+#include <esignal/Signal.hpp>
+
+namespace appl {
+
+	class DisplayHLData {
+		public:
+			etk::Vector<appl::HighlightInfo> HLData;
+			int64_t posHLPass1;
+			int64_t posHLPass2;
+	};
+	class Buffer;
+	using BufferShared = ememory::SharedPtr<appl::Buffer>;
+	using BufferWeak = ememory::WeakPtr<appl::Buffer>;
+	class Buffer : public ewol::Object {
+		public:
+			class Iterator {
+				// Private data :
+				private:
+					int64_t m_current; //!< curent Id in the Buffer
+					appl::Buffer* m_data; //!< Pointer on the curent Buffer
+					char32_t m_value; //!< store vlue to prevent multiple calcule of getting the data
+				public:
+					/**
+					 * @brief Basic itarator constructor with no link.
+					 */
+					Iterator():
+					  m_current(0),
+					  m_data(null),
+					  m_value(u32char::Null) {
+						// nothing to do ...
+					};
+					/**
+					 * @brief Recopy constructor.
+					 * @param[in] _obj The Iterator that might be copy
+					 */
+					Iterator(const Iterator & _obj):
+					  m_current(_obj.m_current),
+					  m_data(_obj.m_data),
+					  m_value(u32char::Null) {
+						// nothing to do ...
+					};
+					/**
+					 * @brief Asignation operator.
+					 * @param[in] _otherIterator The Iterator that might be copy
+					 * @return reference on the curent Iterator
+					 */
+					Iterator& operator=(const Iterator & _obj) {
+						m_current = _obj.m_current;
+						m_data = _obj.m_data;
+						m_value = u32char::Null;
+						return *this;
+					};
+					/**
+					 * @brief Basic destructor
+					 */
+					virtual ~Iterator() {
+						m_current = 0;
+						m_data = null;
+						m_value = u32char::Null;
+					};
+					/**
+					 * @brief basic boolean cast
+					 * @return true if the element is present in buffer
+					 */
+					operator bool () const {
+						if (m_data == null) {
+							return false;
+						}
+						if (m_current >= (int64_t)m_data->m_data.size()) {
+							return false;
+						}
+						if (m_current < 0) {
+							return false;
+						}
+						return true;
+					};
+					/**
+					 * @brief basic boolean cast
+					 * @return true if the element is present in buffer
+					 */
+					operator int64_t () const {
+						if (m_data == null) {
+							return 0;
+						}
+						if (m_current < 0) {
+							return 0;
+						}
+						if (m_current > (int64_t)m_data->m_data.size()) {
+							return (int64_t)m_data->m_data.size();
+						}
+						return m_current;
+					};
+					/**
+					 * @brief Incremental operator
+					 * @return Reference on the current iterator incremented
+					 */
+					Iterator& operator++ ();
+					/**
+					 * @brief Decremental operator
+					 * @return Reference on the current iterator decremented
+					 */
+					Iterator& operator-- ();
+					/**
+					 * @brief Incremental operator
+					 * @return Reference on a new iterator and increment the other one
+					 */
+					Iterator operator++ (int32_t) {
+						Iterator it(*this);
+						++(*this);
+						return it;
+					};
+					/**
+					 * @brief Decremental operator
+					 * @return Reference on a new iterator and decrement the other one
+					 */
+					Iterator operator-- (int32_t) {
+						Iterator it(*this);
+						--(*this);
+						return it;
+					};
+					/**
+					 * @brief egality iterator
+					 * @return true if the iterator is identical pos
+					 */
+					bool operator== (const Iterator& _obj) const {
+						if (    m_current == _obj.m_current
+						     && m_data == _obj.m_data) {
+							return true;
+						}
+						return false;
+					};
+					/**
+					 * @brief egality iterator
+					 * @return true if the iterator is identical pos
+					 */
+					bool operator!= (const Iterator& _obj) const {
+						if (    m_current != _obj.m_current
+						     || m_data != _obj.m_data) {
+							return true;
+						}
+						return false;
+					};
+					/**
+					 * @brief <= iterator
+					 * @return true if the iterator is identical pos
+					 */
+					bool operator<= (const Iterator& _obj) const {
+						if (m_data != _obj.m_data) {
+							return false;
+						}
+						if (m_current <= _obj.m_current) {
+							return true;
+						}
+						return false;
+					};
+					/**
+					 * @brief >= iterator
+					 * @return true if the iterator is identical pos
+					 */
+					bool operator>= (const Iterator& _obj) const {
+						if (m_data != _obj.m_data) {
+							return false;
+						}
+						if (m_current >= _obj.m_current) {
+							return true;
+						}
+						return false;
+					};
+					/**
+					 * @brief < iterator
+					 * @return true if the iterator is identical pos
+					 */
+					bool operator< (const Iterator& _obj) const {
+						if (m_data != _obj.m_data) {
+							return false;
+						}
+						if (m_current < _obj.m_current) {
+							return true;
+						}
+						return false;
+					};
+					/**
+					 * @brief > iterator
+					 * @return true if the iterator is identical pos
+					 */
+					bool operator> (const Iterator& _obj) const {
+						if (m_data != _obj.m_data) {
+							return false;
+						}
+						if (m_current > _obj.m_current) {
+							return true;
+						}
+						return false;
+					};
+					/**
+					 * @brief Get the value on the current element
+					 * @return The request element value
+					 */
+					char32_t operator* ();
+					/**
+					 * @brief Get the position in the buffer
+					 * @return The requested position.
+					 */
+					int64_t getPos() const {
+						if (m_data == null) {
+							return 0;
+						}
+						if (m_current < 0) {
+							return 0;
+						}
+						if (m_current >= (int64_t)m_data->m_data.size()) {
+							return m_data->m_data.size()-1;
+						}
+						return m_current;
+					};
+					/**
+					 * @brief move the element position
+					 * @return a new iterator.
+					 */
+					Iterator operator+ (const int64_t _val) const {
+						Iterator tmpp(*this);
+						for (int64_t iii=0; iii<_val; ++iii) {
+							++tmpp;
+						}
+						return tmpp;
+					};
+					Iterator operator+ (const int32_t _val) const {
+						Iterator tmpp(*this);
+						for (int64_t iii=0; iii<_val; ++iii) {
+							++tmpp;
+						}
+						return tmpp;
+					};
+					Iterator operator+ (const size_t _val) const {
+						Iterator tmpp(*this);
+						for (int64_t iii=0; iii<(int64_t)_val; ++iii) {
+							++tmpp;
+						}
+						return tmpp;
+					};
+					/**
+					 * @brief move the element position
+					 * @return a new iterator.
+					 */
+					Iterator operator- (const int64_t _val) const {
+						Iterator tmpp(*this);
+						for (int64_t iii=0; iii<_val; ++iii) {
+							--tmpp;
+						}
+						return tmpp;
+					};
+					Iterator operator- (const int32_t _val) const {
+						Iterator tmpp(*this);
+						for (int64_t iii=0; iii<_val; ++iii) {
+							--tmpp;
+						}
+						return tmpp;
+					};
+					Iterator operator- (const size_t _val) const {
+						Iterator tmpp(*this);
+						for (int64_t iii=0; iii<(int64_t)_val; ++iii) {
+							--tmpp;
+						}
+						return tmpp;
+					};
+				private:
+					Iterator(Buffer* _obj, int64_t _pos) :
+					  m_current(_pos),
+					  m_data(_obj),
+					  m_value(u32char::Null) {
+						// nothing to do ...
+					};
+					friend class Buffer;
+			};
+		public: // signals
+			esignal::Signal<> signalFileIsModify;
+			esignal::Signal<> signalIsModify;
+			esignal::Signal<> signalIsSave;
+			esignal::Signal<> signalSelectChange;
+			esignal::Signal<> signalChangeName;
+		protected:
+			Buffer();
+			void init();
+		public:
+			DECLARE_FACTORY(Buffer);
+			virtual ~Buffer();
+		private:
+			bool m_fileIsModify = false; //!< The file has been modify and the buffer is not synchronous
+		public:
+			/**
+			 * @brief get the curent filename of the Buffer
+			 */
+			bool getFileModify() const {
+				return m_fileIsModify;
+			}
+		private:
+			bool m_hasFileName; //!< When new file, the buffer has no name ==> but it might be reference with a single name ...
+			etk::Path m_fileName; //!< name of the file (with his path)
+		public:
+			/**
+			 * @brief get the curent filename of the Buffer
+			 */
+			const etk::Path& getFileName() const {
+				return m_fileName;
+			}
+			/**
+			 * @brief Check if the buffer has a real filename.
+			 * @return the status of the existance of a name.
+			 */
+			bool hasFileName() const {
+				return m_hasFileName;
+			}
+			/**
+			 * @brief Load A specific file in this buffer.
+			 * @param[in] _name name of the file.
+			 * @return true if file corectly opened.
+			 */
+			bool loadFile(const etk::Path& _name);
+			/**
+			 * @brief Set a file name at this buffer (no saving ...)
+			 * @param[in] _name name of the file.
+			 */
+			void setFileName(const etk::Path& _name);
+			/**
+			 * @brief save the file in the specify path.
+			 * @return true is saving well done
+			 */
+			bool storeFile();
+		protected:
+			bool m_isModify; //!< true if the file is modify
+		public:
+			/**
+			 * @breif get the status of file modification.
+			 * @return true if file is modify.
+			 */
+			bool isModify() const {
+				return m_isModify;
+			}
+			/**
+			 * @brief Set the file modification status.
+			 * @param[in] _status New modification status.
+			 */
+			void setModification(bool _status);
+		protected:
+			etk::Buffer m_data; //!< copy of the file buffer
+		public:
+			etk::Buffer& getData() {
+				return m_data;
+			};
+		protected:
+			int64_t m_cursorPos; //!< cursor position.
+		public:
+			void moveCursor(int64_t _pos);
+		protected:
+			int64_t m_cursorSelectPos; //!< cursor position.
+		public:
+			/**
+			 * @brief Set the selection position in the buffer.
+			 * @param[in] _pos Position of the selection.
+			 */
+			void setSelectionPos(const Iterator& _pos);
+			/**
+			 * @brief Remove Selection of the buffer.
+			 */
+			void unSelect();
+			/**
+			 * @brief Remove the selection of the buffer. (do nothing if no secection)
+			 */
+			void removeSelection();
+			/**
+			 * @brief Get the status of selection.
+			 * @return true if we have a curent selection, false otherwise.
+			 */
+			bool hasTextSelected() {
+				return m_cursorSelectPos >= 0;
+			}
+			/**
+			 * @brief Get the Start position of the selection.
+			 * @return position of the start selection.
+			 */
+			int64_t getStartSelectionPos() {
+				return etk::min(m_cursorPos, m_cursorSelectPos);
+			}
+			/**
+			 * @brief Get the Stop position of the selection.
+			 * @return position of the stop selection.
+			 */
+			int64_t getStopSelectionPos() {
+				return etk::max(m_cursorPos, m_cursorSelectPos);
+			}
+		protected:
+			float m_cursorPreferredCol; //!< position of the cursor when up and down is done.
+		public:
+			/**
+			 * @brief Set the favorite up and down position (distance from the left of the screen.
+			 * @param[in] _val New distance (in pixels).
+			 */
+			void setFavoriteUpDownPos(float _val) {
+				m_cursorPreferredCol = _val;
+			}
+			/**
+			 * @brief Get the favorite distance from the left screen (For up and down moving).
+			 * @return The distance in pixels.
+			 */
+			float getFavoriteUpDownPos() {
+				return m_cursorPreferredCol;
+			}
+		protected:
+			bool m_selectMode; //!< when true, the select mode keep the moving selecting
+		public:
+			/**
+			 * @brief Set the selection mode (if true, the move event creata a selection)
+			 * @param[in] _status New status of the section.
+			 */
+			void setSelectMode(bool _status) {
+				m_selectMode = _status;
+			}
+			/**
+			 * @brief Get the selection mode (if true, the move event creata a selection)
+			 * @return The selecting mode.
+			 */
+			bool getSelectMode() {
+				return m_selectMode;
+			}
+		public:
+			/**
+			 * @brief Get the position of selection around (select word).
+			 * @param[in] _startPos Position to start the selection.
+			 * @param[out] _beginPos Position where the element start.
+			 * @param[out] _endPos Position where the element stop.
+			 * @return true if we find a selection around.
+			 */
+			bool getPosAround(const Iterator& _startPos, Iterator &_beginPos, Iterator &_endPos);
+			/**
+			 * @brief Expand the specify char to have a user frendly display for special char and tabs
+			 * @param[in] _indent Curent indentation in the line
+			 * @param[in] _value Current value to transform
+			 * @param[out] _out String that represent the curent value to display
+			 */
+			void expand(int32_t& _indent, const char32_t& _value, etk::UString& _out) const;
+			/**
+			 * @brief get the start of a line with the position in the buffer.
+			 * @param[in] _pos position in the buffer.
+			 * @return The position in the buffer of the start of the line.
+			 */
+			Iterator getStartLine(const Iterator& _pos);
+			/**
+			 * @brief get the end of a line with the position in the buffer.
+			 * @param[in] _pos position in the buffer.
+			 * @return The position in the buffer of the end of the line.
+			 */
+			Iterator getEndLine(const Iterator& _pos);
+			/**
+			 * @brief Search a character in the buffer.
+			 * @param[in] _pos Position to start the search of the element.
+			 * @param[in] _search Character to search.
+			 * @param[out] _result Research position.
+			 * @return true if pos if fined.
+			 */
+			// TODO : rename find
+			bool search(const Iterator& _pos, const char32_t& _search, Iterator& _result);
+			/**
+			 * @brief Search a character in the buffer in back mode.
+			 * @param[in] _pos Position to start the search of the element.
+			 * @param[in] _search Character to search.
+			 * @param[out] _result Research position.
+			 * @return true if pos if fined.
+			 */
+			// TODO : rename rfind
+			bool searchBack(const Iterator& _pos, const char32_t& _search, Iterator& _result);
+			/**
+			 * @brief Search a string in the buffer.
+			 * @param[in] _pos Position to start the search of the element.
+			 * @param[in] _search String to search.
+			 * @param[out] _result Research position.
+			 * @param[in] _caseSensitive (optional) Search making attention of the case [default true]
+			 * @return true if pos if fined.
+			 */
+			// TODO : rename find
+			bool search(const Iterator& _pos, const etk::UString& _search, Iterator& _result, bool _caseSensitive = true);
+			/**
+			 * @brief Search a string in the buffer in back mode.
+			 * @param[in] _pos Position to start the search of the element.
+			 * @param[in] _search String to search.
+			 * @param[out] _result Research position.
+			 * @param[in] _caseSensitive (optional) Search making attention of the case [default true]
+			 * @return true if pos if fined.
+			 */
+			// TODO : rename rfind
+			bool searchBack(const Iterator& _pos, const etk::UString& _search, Iterator& _result, bool _caseSensitive = true);
+			/**
+			 * @brief find the first character of the line "nLines" forward
+			 * @param[in] _startPos Start position.
+			 * @param[in] _nLines Number of line to count.
+			 * @return position of the starting the line.
+			 */
+			Iterator countForwardNLines(const Iterator& _startPos, int32_t _nLines);
+			/**
+			 * @brief find the first character of the line "nLines" backwards
+			 * @param[in] _startPos Start position to count (this caracter is not counted)
+			 * @param[in] _nLines Number of line to count (if  == 0 means find the beginning of the line)
+			 * @return position of the starting the line
+			 */
+			Iterator countBackwardNLines(const Iterator& _startPos, int32_t _nLines);
+		public:
+			/**
+			 * @brief copy data in the _data ref value.
+			 * @param[out] _data Output stream to copy.
+			 * @return true of no error occured.
+			 */
+			bool copy(etk::String& _data);
+			/**
+			 * @brief copy data in the _data ref value.
+			 * @param[out] _data Output stream to copy.
+			 * @param[in] _pos Position to add the data.
+			 * @param[in] _posEnd End position to end replace the data.
+			 */
+			void copy(etk::String& _data, const appl::Buffer::Iterator& _pos, const appl::Buffer::Iterator& _posEnd);
+			/**
+			 * @brief Write data at a specific position
+			 * @param[in] _data Data to insert in the buffer
+			 * @param[in] _pos Position to add the data.
+			 * @return true if the write is done corectly
+			 */
+			bool write(const etk::String& _data, const appl::Buffer::Iterator& _pos);
+			/**
+			 * @brief Write data at a specific position
+			 * @param[in] _data Data to insert in the buffer
+			 * @param[in] _pos Position to add the data.
+			 * @param[in] _posEnd End position to end replace the data.
+			 * @return true if the write is done corectly
+			 */
+			bool replace(const etk::String& _data, const appl::Buffer::Iterator& _pos, const appl::Buffer::Iterator& _posEnd);
+		public: // iterator section :
+			/**
+			 * @brief Get an iterator an an specific position
+			 * @param[in] _pos Requested position of the iterator.
+			 * @return The Iterator
+			 */
+			Iterator position(int64_t _pos);
+			/**
+			 * @brief Get an Iterator on the start position.
+			 * @return The Iterator
+			 */
+			Iterator begin();
+			/**
+			 * @brief Get an Iterator on the end position.
+			 * @return The Iterator
+			 */
+			Iterator end();
+			/**
+			 * @brief Get an Iterator on the cursor position.
+			 * @return The Iterator
+			 */
+			Iterator cursor();
+			/**
+			 * @brief Get an Iterator on the start selection.
+			 * @return The Iterator
+			 */
+			Iterator selectStart();
+			/**
+			 * @brief Get an Iterator on the stop selection.
+			 * @return The Iterator
+			 */
+			Iterator selectStop();
+		protected:
+			int32_t m_nbLines; //!< number of line in the buffer
+		public:
+			/**
+			 * @brief Get the number of line in the buffer.
+			 * @return number of line in the Buffer.
+			 */
+			int32_t getNumberOfLines() {
+				return m_nbLines;
+			}
+			/**
+			 * @brief Get the cursor line numberin the buffer.
+			 * @return the line id in the Buffer.
+			 */
+			uint32_t getCursorLinesId();
+		protected:
+			/**
+			 * @brief Count the number of line in the buffer
+			 */
+			void countNumberofLine();
+		protected:
+			etk::String m_highlightType; //!< Name of the highlight type
+			
+			ememory::SharedPtr<appl::Highlight> m_highlight; //!< internal link with the Highlight system
+			etk::Vector<appl::HighlightInfo> m_HLDataPass1; //!< colorisation position in the current buffer pass 1
+		public:
+			/**
+			 * @brief Find the Highligh capability
+			 */
+			void tryFindHighlightType();
+			/**
+			 * @brief Set type of highlight
+			 * @param[in] _type type of the highlight
+			 */
+			void setHighlightType(const etk::String& _type);
+			/**
+			 * @brief Get type of highlight
+			 * @return Type of the highlight
+			 */
+			const etk::String& setHighlightType() {
+				return m_highlightType;
+			};
+			
+			void regenerateHighLightAt(int64_t _pos, int64_t _nbDeleted, int64_t _nbAdded);
+			void findMainHighLightPosition(int64_t _startPos,
+			                               int64_t _endPos,
+			                               int64_t& _startId,
+			                               int64_t& _stopId,
+			                               bool _backPreviousNotEnded);
+			void generateHighLightAt(int64_t _pos, int64_t _endPos, int64_t _addingPos=0);
+			void cleanHighLight();
+			appl::HighlightInfo* getElementColorAtPosition(int64_t _pos, int64_t &_starPos);
+			void hightlightGenerateLines(appl::DisplayHLData& _MData, const appl::Buffer::Iterator& _HLStart, int64_t _nbLines);
+			appl::HighlightInfo* getElementColorAtPosition(appl::DisplayHLData& _MData, int64_t _pos);
+	};
+}

sources/appl/Buffer/BufferManager.cpp

@@ -1,586 +0,0 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license GPL v3 (see license file)
- */
-
-#include <appl/Debug.h>
-#include <appl/global.h>
-#include <BufferManager.h>
-#include <ewol/eObject/EObject.h>
-#include <ewol/eObject/EObjectManager.h>
-
-#undef __class__
-#define __class__	"classBufferManager"
-
-class classBufferManager: public ewol::EObject
-{
-	public:
-		// Constructeur
-		classBufferManager(void);
-		~classBufferManager(void);
-		/**
-		 * @brief Get the current Object type of the EObject
-		 * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
-		 * @param[in] objectType type description
-		 * @return true if the object is compatible, otherwise false
-		 */
-		const char * const GetObjectType(void)
-		{
-			return "ApplBufferManager";
-		}
-	public:
-		/**
-		 * @brief Receive a message from an other EObject with a specific eventId and data
-		 * @param[in] CallerObject Pointer on the EObject that information came from
-		 * @param[in] eventId Message registered by this class
-		 * @param[in] data Data registered by this class
-		 * @return ---
-		 */
-		virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data);
-	private:
-		// return the ID of the buffer allocated
-		// create a buffer with no element
-		int32_t     Create(void);
-		// open curent filename
-		int32_t     Open(etk::FSNode &myFile);
-		bool        Remove(int32_t BufferID);
-	public:
-		int32_t     GetSelected(void) { return m_idSelected;};
-		//void        SetSelected(int32_t id) {m_idSelected = id;};
-		BufferText* Get(int32_t BufferID);
-		bool        Exist(int32_t BufferID);
-		bool        Exist(etk::FSNode &myFile);
-		int32_t     GetId(etk::FSNode &myFile);
-		// return the number of buffer (open in the past) if 5 buffer open and 4 close ==> return 5
-		uint32_t    Size(void);
-		uint32_t    SizeOpen(void);
-		int32_t     WitchBuffer(int32_t iEmeElement);
-		
-
-	private:
-		
-		etk::Vector<BufferText*> listBuffer;  //!< element List of the char Elements
-		
-		void        RemoveAll(void);          //!< remove all buffer
-		int32_t     m_idSelected;
-};
-
-
-// Constructeur
-/**
- * @brief
- *
- * @param[in,out] ---
- *
- * @return ---
- *
- */
-classBufferManager::classBufferManager(void)
-{
-	m_idSelected = -1;
-	RegisterMultiCast(ednMsgGuiNew);
-	RegisterMultiCast(ednMsgOpenFile);
-	RegisterMultiCast(ednMsgGuiClose);
-	RegisterMultiCast(ednMsgGuiSave);
-	RegisterMultiCast(ednMsgCodeViewSelectedId);
-	RegisterMultiCast(ednMsgBufferId);
-}
-
-/**
- * @brief
- *
- * @param[in,out] ---
- *
- * @return ---
- *
- */
-classBufferManager::~classBufferManager(void)
-{
-	//clean All Buffer
-	APPL_INFO("~classBufferManager::RemoveAll();");
-	RemoveAll();
-	// clear The list of Buffer
-	APPL_INFO("~classBufferManager::listBuffer.Clear();");
-	listBuffer.Clear();
-}
-
-
-/**
- * @brief Receive a message from an other EObject with a specific eventId and data
- * @param[in] CallerObject Pointer on the EObject that information came from
- * @param[in] eventId Message registered by this class
- * @param[in] data Data registered by this class
- * @return ---
- */
-void classBufferManager::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data)
-{
-	ewol::EObject::OnReceiveMessage(CallerObject, eventId, data);
-	
-	if (eventId == ednMsgBufferId) {
-		// select a new buffer ID :
-		if (data == "") {
-			APPL_ERROR("Request select buffer ID = \"\" ");
-		} else {
-			int32_t newID = -1;
-			sscanf(data.c_str(), "%d", &newID);
-			if(true == Exist(newID)) {
-				m_idSelected = newID;
-			} else {
-				m_idSelected = -1;
-				APPL_ERROR("Request a non existant ID : " << newID << " reset to -1...");
-			}
-		}
-	} else if (eventId == ednMsgGuiNew) {
-		int32_t newOne = Create();
-		if (-1 != newOne) {
-			m_idSelected = newOne;
-			SendMultiCast(ednMsgBufferId, m_idSelected);
-			SendMultiCast(ednMsgBufferListChange);
-		}
-	} else if (eventId == ednMsgOpenFile) {
-		if (data != "" ) {
-			etk::FSNode myFile(data);
-			APPL_DEBUG("request open file = \"" <<data << "\" ?= \"" << myFile << "\"");
-			int32_t newOne = Open(myFile);
-			if (-1 != newOne) {
-				m_idSelected = newOne;
-				SendMultiCast(ednMsgBufferId, m_idSelected);
-				SendMultiCast(ednMsgBufferListChange);
-			} else {
-				// TODO : notify user that we can not open the request file...
-				APPL_ERROR("Can not open the file : \"" << myFile << "\"");
-			}
-		}
-	} else if (eventId == ednMsgGuiSave) {
-		if (data == "") {
-			APPL_ERROR("Null data for close file ... ");
-		} else {
-			if (data == "current") {
-				// Check buffer existence
-				if(true == Exist(m_idSelected)) {
-					// If no name ==> request a Gui display ...
-					if (Get(m_idSelected)->HaveName() == false) {
-						SendMultiCast(ednMsgGuiSaveAs, "current");
-					} else {
-						Get(m_idSelected)->Save();
-					}
-				}
-			} else {
-				int32_t newId;
-				sscanf(data.c_str(), "%d", &newId);
-				if (false == Exist(newId)) {
-					APPL_ERROR("Request a save As with a non existant ID=" << newId);
-				} else {
-					// If no name ==> request a Gui display ...
-					if (Get(newId)->HaveName() == false) {
-						SendMultiCast(ednMsgGuiSaveAs, newId);
-					} else {
-						Get(m_idSelected)->Save();
-					}
-				}
-				SendMultiCast(ednMsgBufferState, "saved");
-			}
-		}
-	} else if (eventId == ednMsgGuiClose) {
-		if (data == "") {
-			APPL_ERROR("Null data for close file ... ");
-		} else {
-			if (data == "All") {
-				
-			} else {
-				int32_t closeID = -1;
-				if (data == "current") {
-					closeID = m_idSelected;
-					APPL_DEBUG("Close specific buffer ID" << closeID);
-				} else {
-					// close specific buffer ...
-					sscanf(data.c_str(), "%d", &closeID);
-					APPL_DEBUG("Close specific buffer ID="<< closeID);
-				}
-				if(true == Exist(closeID)) {
-					// Get the new display buffer 
-					if (m_idSelected == closeID) {
-						// Try previous buffer
-						int32_t destBuffer = -1;
-						for(int32_t ii=closeID-1; ii >= 0; ii--) {
-							if (true == Exist(ii) ) {
-								destBuffer = ii;
-								break;
-							}
-						}
-						// try next buffer
-						if (-1 == destBuffer) {
-							for(int32_t ii=closeID+1; ii < listBuffer.Size(); ii++) {
-								if (true == Exist(ii) ) {
-									destBuffer = ii;
-									break;
-								}
-							}
-						}
-						// set it to the currect display
-						m_idSelected = destBuffer;
-						SendMultiCast(ednMsgBufferId, destBuffer);
-					}
-					// Remove requested buffer
-					Remove(closeID);
-					SendMultiCast(ednMsgBufferListChange);
-				} else {
-					APPL_ERROR("Request Close of a non existant ID : " << closeID);
-				}
-			}
-		}
-	} else if (eventId == ednMsgCodeViewSelectedId) {
-		//Change the selected buffer
-		if (data == "") {
-			APPL_ERROR("Null data for changing buffer ID file ... ");
-		} else {
-			int32_t newId;
-			sscanf(data.c_str(), "%d", &newId);
-			if (true == Exist(newId)) {
-				m_idSelected = newId;
-			} else {
-				APPL_ERROR("code biew request the selection of an non -existant buffer ==> reset to -1");
-				m_idSelected = -1;
-			}
-			SendMultiCast(ednMsgBufferId, m_idSelected);
-			SendMultiCast(ednMsgBufferListChange);
-		}
-	}
-	/*
-	switch (id)
-	{
-			// Check buffer existence
-			if(true == Exist(dataID)) {
-				// If no name ==> request a Gui display ...
-				if (Get(dataID)->HaveName() == false) {
-					SendMessage(APPL_MSG__GUI_SHOW_SAVE_AS, dataID);
-				} else {
-					Get(dataID)->Save();
-				}
-			}
-			break;
-	}
-	*/
-}
-
-
-
-
-
-
-
-/**
- * @brief Remove all buffer opened
- *
- * @param[in,out] ---
- *
- * @return ---
- *
- */
-void classBufferManager::RemoveAll(void)
-{
-	int32_t i;
-	for (i=0; i<listBuffer.Size(); i++) {
-		Remove(i);
-	}
-	SendMultiCast(ednMsgGuiClose, "All");
-}
-
-
-
-/**
- * @brief Create a new buffer with no name and empty
- *
- * @param[in,out] ---
- *
- * @return The ID of the curent buffer where the file is loaded
- *
- */
-int32_t	classBufferManager::Create(void)
-{
-	// allocate a new Buffer
-	BufferText *myBuffer = new BufferText();
-	// Add at the list of element
-	listBuffer.PushBack(myBuffer);
-	int32_t basicID = listBuffer.Size() - 1;
-	return basicID;
-}
-
-
-/**
- * @brief open a file with the name set in parameters
- *
- * @param[in]		filename			curent filename
- *
- * @return The ID of the curent buffer where the file is loaded
- *
- * @todo : check if this file is not curently open and return the old ID
- *
- */
-int32_t classBufferManager::Open(etk::FSNode &myFile)
-{
-	if (false == Exist(myFile)) {
-		// allocate a new Buffer
-		BufferText *myBuffer = new BufferText(myFile);
-		// Add at the list of element
-		listBuffer.PushBack(myBuffer);
-		return listBuffer.Size() - 1;
-	} else {
-		// the buffer already existed ==> we open it ...
-		return GetId(myFile);
-	}
-}
-
-
-
-BufferText * classBufferManager::Get(int32_t BufferID)
-{
-	// possible special case : -1;
-	if (-1 >= BufferID) {
-		return NULL;
-	}
-	// check if the Buffer existed
-	if (BufferID < listBuffer.Size()) {
-		// check if the buffer already existed
-		if (NULL != listBuffer[BufferID]) {
-			return listBuffer[BufferID];
-		} else {
-			APPL_ERROR("non existing Buffer " << BufferID);
-		}
-	} else {
-		APPL_ERROR("call an non existing Buffer number too hight : " << BufferID << " > " << listBuffer.Size());
-	}
-	return NULL;
-}
-
-
-bool classBufferManager::Exist(int32_t BufferID)
-{
-	if (-1 >= BufferID) {
-		return false;
-	}
-	// check if the Buffer existed
-	if (BufferID < listBuffer.Size()) {
-		// check if the buffer already existed
-		if (NULL != listBuffer[BufferID]) {
-			return true;
-		}
-	}
-	return false;
-}
-
-
-bool classBufferManager::Exist(etk::FSNode &myFile )
-{
-	if (-1 == GetId(myFile)) {
-		return false;
-	}
-	return true;
-}
-
-
-int32_t classBufferManager::GetId(etk::FSNode &myFile)
-{
-	int32_t iii;
-	// check if the Buffer existed
-	for (iii=0; iii < listBuffer.Size(); iii++) {
-		// check if the buffer already existed
-		if (NULL != listBuffer[iii]) {
-			if ( listBuffer[iii]->GetFileName() == myFile) {
-				return iii;
-			}
-		}
-	}
-	return -1;
-}
-
-
-// return the number of buffer (open in the past) if 5 buffer open and 4 close ==> return 5
-uint32_t classBufferManager::Size(void)
-{
-	return listBuffer.Size();
-}
-
-// nb of opens file Now ...
-uint32_t classBufferManager::SizeOpen(void)
-{
-	uint32_t jjj = 0;
-	// check if the Buffer existed
-	for (int32_t iii=0; iii<listBuffer.Size(); iii++) {
-		// check if the buffer already existed
-		if (NULL != listBuffer[iii]) {
-			jjj++;
-		}
-	}
-	return jjj;
-}
-
-/**
- * @brief
- *
- * @param[in,out] ---
- *
- * @return ---
- *
- */
-bool classBufferManager::Remove(int32_t BufferID)
-{
-	if (-1 >= BufferID) {
-		return false;
-	}
-	// check if the Buffer existed
-	if (BufferID < listBuffer.Size()) {
-		// check if the buffer already existed
-		if (NULL != listBuffer[BufferID]) {
-			// TODO : Check if it saved...
-			/*
-			if (false == IsSaved(BufferID) ) {
-				APPL_INFO("Buffer " << BufferID << " : Not Saved", BufferID);
-			}
-			*/
-			// Delete the Buffer
-			delete( listBuffer[BufferID] );
-			listBuffer[BufferID] = NULL;
-			/*
-			ewol::widgetMessageMultiCast::Send(GetWidgetId(), ednMsgBufferListChange);
-			*/
-			return true;
-		} else {
-			APPL_INFO("non existing Buffer " << BufferID);
-			return false;
-		}
-	} else {
-		APPL_INFO("call an non existing Buffer number too hight : " << BufferID << " > " << listBuffer.Size());
-		return false;
-	}
-}
-
-/**
- * @brief to get the element 14 in the buffer 
- *
- * @param[in,out] ---
- *
- * @return ---
- *
- */
-int32_t classBufferManager::WitchBuffer(int32_t iEmeElement)
-{
-	int32_t i;
-	for (i=0; i<listBuffer.Size(); i++) {
-		if (NULL != listBuffer[i]) {
-			iEmeElement--;
-			// find the element : 
-			if (0 == iEmeElement) {
-				return i;
-			}
-		}
-	}
-	return -1;
-}
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//  Namespace part : 
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-static classBufferManager * localManager = NULL;
-
-void BufferManager::Init(void)
-{
-	if (NULL != localManager) {
-		EWOL_ERROR("classBufferManager ==> already exist, just unlink the previous ...");
-		localManager = NULL;
-	}
-	localManager = new classBufferManager();
-	
-	if (NULL == localManager) {
-		EWOL_CRITICAL("Allocation of classBufferManager not done ...");
-	}
-}
-
-void BufferManager::UnInit(void)
-{
-	if (NULL == localManager) {
-		EWOL_ERROR("classBufferManager ==> request UnInit, but does not exist ...");
-		return;
-	}
-	delete(localManager);
-	localManager = NULL;
-}
-
-int32_t BufferManager::GetSelected(void)
-{
-	if (NULL == localManager) {
-		EWOL_ERROR("classBufferManager ==> request UnInit, but does not exist ...");
-		return -1;
-	}
-	return localManager->GetSelected();
-}
-
-BufferText * BufferManager::Get(int32_t BufferID)
-{
-	if (NULL == localManager) {
-		EWOL_ERROR("classBufferManager ==> request UnInit, but does not exist ...");
-		return NULL;
-	}
-	return localManager->Get(BufferID);
-}
-
-bool BufferManager::Exist(int32_t BufferID)
-{
-	if (NULL == localManager) {
-		EWOL_ERROR("classBufferManager ==> request UnInit, but does not exist ...");
-		return false;
-	}
-	return localManager->Exist(BufferID);
-}
-
-bool BufferManager::Exist(etk::FSNode &myFile)
-{
-	if (NULL == localManager) {
-		EWOL_ERROR("classBufferManager ==> request UnInit, but does not exist ...");
-		return false;
-	}
-	return localManager->Exist(myFile);
-}
-
-int32_t BufferManager::GetId(etk::FSNode &myFile)
-{
-	if (NULL == localManager) {
-		EWOL_ERROR("classBufferManager ==> request UnInit, but does not exist ...");
-		return -1;
-	}
-	return localManager->GetId(myFile);
-}
-
-uint32_t BufferManager::Size(void)
-{
-	if (NULL == localManager) {
-		EWOL_ERROR("classBufferManager ==> request UnInit, but does not exist ...");
-		return 0;
-	}
-	return localManager->Size();
-}
-
-uint32_t BufferManager::SizeOpen(void)
-{
-	if (NULL == localManager) {
-		EWOL_ERROR("classBufferManager ==> request UnInit, but does not exist ...");
-		return 0;
-	}
-	return localManager->SizeOpen();
-}
-
-int32_t BufferManager::WitchBuffer(int32_t iEmeElement)
-{
-	if (NULL == localManager) {
-		EWOL_ERROR("classBufferManager ==> request UnInit, but does not exist ...");
-		return -1;
-	}
-	return localManager->WitchBuffer(iEmeElement);
-}
-
-

sources/appl/Buffer/BufferManager.h

@@ -1,32 +0,0 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license GPL v3 (see license file)
- */
-
-#ifndef __BUFFER_MANAGER_H__
-#define __BUFFER_MANAGER_H__
-
-#include <BufferText.h>
-#include <appl/globalMsg.h>
-#include <ewol/widget/Widget.h>
-
-namespace BufferManager
-{
-	void        Init(void);
-	void        UnInit(void);
-	int32_t     GetSelected(void);
-	BufferText* Get(int32_t BufferID);
-	bool        Exist(int32_t BufferID);
-	bool        Exist(etk::FSNode &myFile);
-	int32_t     GetId(etk::FSNode &myFile);
-	// return the number of buffer (open in the past) if 5 buffer open and 4 close ==> return 5
-	uint32_t    Size(void);
-	uint32_t    SizeOpen(void);
-	int32_t     WitchBuffer(int32_t iEmeElement);
-};
-
-#endif
-

sources/appl/Buffer/BufferText.h

@@ -1,159 +0,0 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license GPL v3 (see license file)
- */
-
-#ifndef __BUFFER_TEXT_H__
-#define __BUFFER_TEXT_H__
-
-#include <etk/UString.h>
-#include <etk/os/FSNode.h>
-#include <etk/unicode.h>
-#include <ewol/ewol.h>
-#include <ewol/compositing/Drawing.h>
-#include <ewol/compositing/Text.h>
-
-#include "ColorizeManager.h"
-#include "EdnBuf.h"
-
-typedef enum {
-	CURSOR_DISPLAY_MODE_NORMAL = 259,
-	CURSOR_DISPLAY_MODE_INSERT,
-	CURSOR_DISPLAY_MODE_NOT_FOCUS,
-} cursorDisplayMode_te;
-
-class CharElement
-{
-	public:
-		float    m_LineOffset; // TODO : DEPRECATED ...
-		int16_t  m_yOffset;
-		int16_t  m_xOffset;
-		int16_t  m_ySize;
-		int32_t  m_bufferPos;
-};
-
-
-typedef struct{
-	uint32_t nbTotalLine;				//!< Number of line in the buffer
-	uint32_t nbTotalColomn;				//!< Number of line in the buffer
-	uint32_t startLineDisplay;			//!< First line display.
-	uint32_t startColomnDisplay;		//!< First Colomn displayed
-	uint32_t diplayableColomn;			//!< NB colomn that can be displayed
-	uint32_t diplayableLine;			//!< NB Line that can be displayed
-}infoStatBuffer_ts;
-
-
-class BufferText
-{
-	private:
-		bool                  m_fileModify;              //!< 
-		// naming
-		etk::FSNode           m_fileName;                //!< filename of the curent buffer
-		bool                  m_haveName;                //!< to know if the file have a name or NOT
-		bool                  m_updatePositionRequested; //!< if a position xhange in the windows ...
-		vec2  m_maximumSize;             //!< current maxSize of the buffer
-	public:
-		void SetModify(bool status);
-		virtual vec2 GetBorderSize(void);
-		void RequestUpdateOfThePosition(void) { m_updatePositionRequested = true; };
-		void SetMaximumSize(vec2  maxSize) { m_maximumSize = maxSize; };
-		bool NeedToUpdateDisplayPosition(void);
-		vec2 GetMaxSize(void) { return m_maximumSize; };
-		bool IsModify(void);
-	public:
-		etk::FSNode       GetFileName(void)
-		{
-			return m_fileName;
-		};
-		
-		void SetFileName(etk::FSNode &newName)
-		{
-			m_fileName = newName;
-			m_haveName = true;
-			NameChange();
-		};
-		
-		void SetFileName(etk::UString &newName)
-		{
-			m_fileName.SetName(newName);
-			m_haveName = true;
-			NameChange();
-		};
-		
-		bool HaveName(void)
-		{
-			return m_haveName;
-		}
-	public:
-		          BufferText(void);
-		          BufferText(etk::FSNode &fileName);
-		virtual  ~BufferText(void);
-		void      Save(void);
-		
-		void      GetInfo(infoStatBuffer_ts &infoToUpdate);
-		void      SetLineDisplay(uint32_t lineNumber);
-		int32_t   Display(ewol::Text& OOText,
-		                  int32_t offsetX, int32_t offsetY,
-		                  int32_t sizeX, int32_t sizeY);
-		void      AddChar(uniChar_t unicodeData);
-		void      cursorMove(ewol::keyEvent::keyboard_te  moveTypeEvent);
-		void      MouseSelectFromCursorTo(vec2 pos);
-		void      MouseEvent(vec2 pos);
-		void      MouseEventDouble(void);
-		void      MouseEventTriple(void);
-
-		void      Copy(ewol::clipBoard::clipboardListe_te clipboardID);
-		void      Cut(ewol::clipBoard::clipboardListe_te clipboardID);
-		void      Paste(ewol::clipBoard::clipboardListe_te clipboardID);
-
-		void      Search(etk::UString &data, bool back, bool caseSensitive, bool wrap, bool regExp);
-		void      Replace(etk::UString &data);
-		int32_t   FindLine(etk::UString &data);
-		void      JumpAtLine(int32_t newLine);
-		int32_t   GetCurrentLine(void);
-		
-		void      RemoveLine(void);
-		void      SelectAll(void);
-		void      SelectNone(void);
-		void      Undo(void);
-		void      Redo(void);
-		void      SetCharset(unicode::charset_te newCharset);
-		int32_t   GetNumberOfLine(void);
-	protected:
-		void      NameChange(void);
-
-	private:
-		int32_t   GetLineNumberNumberOfElement(void);
-		
-		// Direct buffer IO
-		EdnBuf                          m_EdnBuf;             //!< buffer associated on this displayer
-		vec2            m_displaySize;        //!< number of char displayable in the screan
-		// Cursor :
-		int32_t                         m_cursorPos;          //!< position in the buffer of the cursor
-		int32_t                         m_cursorPreferredCol; //!< colomn of the last up and down ...
-		cursorDisplayMode_te            m_cursorMode;         //!< type of cursor Selected
-		etk::Vector<CharElement>        m_elmentList;         //!< Elemnt position for every char displayed
-		
-		// internal function
-		void                    BasicInit(void);
-	private:
-		bool m_centerRequested;
-	public:
-		virtual vec2 GetPosition(int32_t fontId, bool& centerRequested);
-	private:
-		bool     TextDMoveUp(int32_t offset);
-		bool     TextDMoveDown(int32_t offset);
-		void     SetInsertPosition(int32_t newPosition, bool insertChar = false);
-		
-		int32_t  GetMousePosition(vec2 pos);
-		
-		void     DrawLineNumber(ewol::Text* OOText, int32_t sizeX, int32_t sizeY, int32_t nbColomn, int32_t lineNumber, int32_t positionY);
-
-};
-
-#endif
-
-

sources/appl/Buffer/EdnBuf/EdnBuf.h

@@ -1,193 +0,0 @@
-/**
- * @author Edouard DUPIN
- * 
- * @copyright 2010, Edouard DUPIN, all right reserved
- * 
- * @license GPL v3 (see license file)
- */
-
-#ifndef __EDN_BUF_H__
-#define __EDN_BUF_H__
-
-/* Maximum length in characters of a tab or control character expansion
-   of a single buffer character */
-#define MAX_EXP_CHAR_LEN 20*4
-
-class EdnBuf;
-
-#include <etk/Buffer.h>
-#include <EdnBufHistory.h>
-#include <HighlightManager.h>
-#include <etk/unicode.h>
-
-/*
-                                                                                                    
-               rectStart                       rectStart                                            
-start          *************                   *************                                        
-      **********           *               xxxx*xxxxxx     *                                        
-      *             ********               xxxx*xxxxxxxxxxx*xxxxx                                   
-end   ***************                          *************                                        
-                    rectEnd                                rectEnd                                  
-                                                                                                    
-                                                                                                    
-                                                                                                    
-*/
-typedef struct {
-	bool selected;          //!< True if the selection is active
-	bool rectangular;       //!< True if the selection is rectangular
-	bool zeroWidth;         //!< Width 0 selections aren't "real" selections, but they can be useful when creating rectangular selections from the keyboard.
-	int32_t start;          //!< Pos. of start of selection, or if rectangular start of line containing it.
-	int32_t end;            //!< Pos. of end of selection, or if rectangular end of line containing it.
-	int32_t rectStart;      //!< Indent of left edge of rect. selection
-	int32_t rectEnd;        //!< Indent of right edge of rect. selection
-} selection;
-
-typedef struct {
-	etk::Vector<colorInformation_ts>    HLData;
-	int32_t                                 posHLPass1;
-	int32_t                                 posHLPass2;
-}displayHLData_ts;
-
-
-
-class EdnBuf {
-	// TODO : Set an iterator to acces at every data without knowin the system ...
-	public:
-		// constructer
-		EdnBuf(void);
-		// destructer
-		~EdnBuf(void);
-		// public function :
-		void    GetAll(                 etk::Vector<int8_t> &text);
-		void    SetAll(                 etk::Vector<int8_t> &text);
-		void    GetRange(               int32_t start, int32_t end, etk::Vector<int8_t> &output);
-		void    GetRange(               int32_t start, int32_t end, etk::UString &output);
-		bool    DumpIn(                 etk::FSNode &file);
-		bool    DumpFrom(               etk::FSNode &file);
-		// replace with operator [] ...
-		int8_t  operator[] (int32_t);
-		int32_t Insert(                 int32_t pos, etk::Vector<int8_t> &insertText);
-		int32_t Insert(                 int32_t pos, etk::UString &insertText);
-		int32_t Replace(                int32_t start, int32_t end, etk::Vector<int8_t> &insertText);
-		int32_t Replace(                int32_t start, int32_t end, etk::UString &insertText);
-		void    Remove(                 int32_t start, int32_t end);
-		int32_t Indent(                 void);
-		int32_t UnIndent(               void);
-		
-		
-		void    GetLineText(            int32_t pos, etk::Vector<int8_t> &text);
-		int32_t StartOfLine(            int32_t pos);
-		int32_t EndOfLine(              int32_t pos);
-		
-		int32_t GetExpandedChar(        int32_t &pos, int32_t indent, uniChar_t outUnicode[MAX_EXP_CHAR_LEN], uint32_t &currentChar);
-		int32_t GetExpandedChar(        int32_t &pos, int32_t indent, char      outUTF8[MAX_EXP_CHAR_LEN], uint32_t &currentChar);
-		int32_t ExpandCharacter(        char c,       int32_t indent, char      outUTF8[MAX_EXP_CHAR_LEN]); // TODO : Remove
-		int32_t CharWidth(              char c,       int32_t indent); 	// TODO : rework this
-		int32_t CountDispChars(         int32_t lineStartPos, int32_t targetPos);
-		int32_t CountForwardDispChars(  int32_t lineStartPos, int32_t nChars);
-		int32_t CountLines(             int32_t startPos, int32_t endPos);
-		int32_t CountLines(             void);
-		int32_t CountLines(             etk::Vector<int8_t> &data);
-		int32_t CountForwardNLines(     int32_t startPos, int32_t nLines);
-		int32_t CountBackwardNLines(    int32_t startPos, int32_t nLines);
-		
-		bool    SearchForward(          int32_t startPos, etk::UString &search, int32_t *foundPos, int32_t *foundPosEnd, bool caseSensitive = true);
-		bool    SearchBackward(         int32_t startPos, etk::UString &search, int32_t *foundPos, int32_t *foundPosEnd, bool caseSensitive = true);
-		bool    SearchForward(          int32_t startPos, char searchChar, int32_t *foundPos);
-		bool    SearchBackward(         int32_t startPos, char searchChar, int32_t *foundPos);
-		bool    SelectAround(           int32_t startPos, int32_t &beginPos, int32_t &endPos);
-
-		// Buffer Size system :
-		int32_t Size(void)              { return m_data.Size(); };
-		int32_t NumberOfLines(void)     { return m_nbLine; };
-
-	// -----------------------------------------
-	// selection remember...
-	// -----------------------------------------
-	public:
-		bool        SelectHasSelection(void);
-		void        Select(            int32_t start, int32_t end);
-		void        Unselect(          void);
-		void        RectSelect(        int32_t start, int32_t end, int32_t rectStart, int32_t rectEnd);
-		bool        GetSelectionPos(   int32_t &start, int32_t &end, bool &isRect, int32_t &rectStart, int32_t &rectEnd);
-		void        GetSelectionText(  etk::Vector<int8_t> &text);
-		void        GetSelectionText(  etk::UString &text);
-		void        RemoveSelected(    void);
-		int32_t     ReplaceSelected(   etk::Vector<int8_t> &text);
-		int32_t     ReplaceSelected(   etk::UString &text);
-	private:
-		// current selection of the buffer
-		selection   m_selectionList;   //!< Selection area of the buffer
-		void        UpdateSelection(   int32_t pos, int32_t nDeleted, int32_t nInserted);
-
-	// -----------------------------------------
-	// History section : 
-	// -----------------------------------------
-	public:
-		int32_t                                 Undo(void);
-		int32_t                                 Redo(void);
-	private:
-		bool                                    m_isUndoProcessing;
-		bool                                    m_isRedoProcessing;
-		etk::Vector<EdnBufHistory*>         m_historyUndo;
-		etk::Vector<EdnBufHistory*>         m_historyRedo;
-
-	// -----------------------------------------
-	// hightlight section : 
-	// -----------------------------------------
-	private:
-		Highlight *                             m_Highlight;         //!< internal link with the Highlight system
-		etk::Vector<colorInformation_ts>    m_HLDataPass1;       //!< colorisation position in the current buffer pass 1
-		void                                    RegenerateHighLightAt(int32_t pos, int32_t nbDeleted, int32_t nbAdded);
-		void                                    GenerateHighLightAt(int32_t pos, int32_t endPos, int32_t addinPos=0);
-		void                                    CleanHighLight(void);
-		void                                    FindMainHighLightPosition(int32_t startPos, int32_t endPos, int32_t &startId, int32_t &stopId, bool backPreviousNotEnded);
-	public:
-		void                                    SetHLSystem(  Highlight * newHLSystem);
-		void                                    HightlightGenerateLines(displayHLData_ts & MData, int32_t startPos, int32_t nbLines);
-		colorInformation_ts *                   GetElementColorAtPosition(displayHLData_ts & MData, int32_t pos);
-	private:
-		colorInformation_ts *                   GetElementColorAtPosition(int32_t pos, int32_t &starPos);
-
-	private:
-		etk::Buffer                             m_data;                     //!< buffer of the data in the mode int8_t
-		void                                    CountNumberOfLines(void);
-		int32_t                                 m_nbLine;                   //!< Number of line in the biffer
-
-	// -----------------------------------------
-	// Display property and charset ...
-	// -----------------------------------------
-	public:
-		int32_t              GetTabDistance(void)                       { return m_tabDist; } ;
-		void                 SetTabDistance(int32_t tabDist)            { m_tabDist = tabDist; };
-		unicode::charset_te  GetCharsetType(void)                       { return m_charsetType; };
-		void                 SetCharsetType(unicode::charset_te newOne) { m_charsetType = newOne; if (unicode::EDN_CHARSET_UTF8==newOne){m_isUtf8=true;} else {m_isUtf8=false;} };
-		bool                 GetUTF8Mode(void)                          { return m_isUtf8; };
-		void                 SetUTF8Mode(bool newOne)                   { m_isUtf8 = newOne; m_charsetType=unicode::EDN_CHARSET_UTF8; };
-	private:
-		// Special mode of the buffer :
-		bool                 m_isUtf8;           //!< true if we are in UTF8 mode ==> if true the size of a char is 0, otherwise .. 1->4 ( TODO : not now)
-		unicode::charset_te  m_charsetType;      //!< if UTF8 mode is at false : the charset type of the buffer
-		// Local Tabulation policies
-		int32_t              m_tabDist;          //!< equiv. number of characters in a tab
-		bool                 m_useTabs;          //!< True if buffer routines are allowed to use tabs for padding in rectangular operations
-	
-	// -----------------------------------------
-	// Local function : 
-	// -----------------------------------------
-	private:
-		void    findRectSelBoundariesForCopy(   int32_t lineStartPos, int32_t rectStart, int32_t rectEnd, int32_t *selStart, int32_t *selEnd);
-		char *  getSelectionText(               selection &sel);
-		void    removeSelected(                 selection &sel);
-		void    replaceSelected(                selection &sel, const char *text);
-
-		void    eventModification(              int32_t pos, int32_t nInserted, etk::Vector<int8_t> &deletedText);
-
-
-		int32_t LocalInsert(                    int32_t pos, etk::Vector<int8_t> &insertText);
-		int32_t LocalInsert(                    int32_t pos, etk::UString &insertText);
-		
-		bool    charMatch(                      char first, char second, bool caseSensitive = true);
-};
-
-#endif