From b5371c4d1312ee349f55755c5692bfde7801678c Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Thu, 1 Aug 2013 23:22:58 +0200
Subject: [PATCH] [DEV] add json parsing

---
 data/languages/json/highlight.xml     | 26 ++++++++++++++++++++++++++
 data/languages/makefile/highlight.xml |  4 ++--
 sources/lutin_edn.py                  |  1 +
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 data/languages/json/highlight.xml

diff --git a/data/languages/json/highlight.xml b/data/languages/json/highlight.xml
new file mode 100644
index 0000000..8292f13
--- /dev/null
+++ b/data/languages/json/highlight.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EdnLang version="0.1" lang="json">
+	<ext>*.json</ext>
+	<pass1><!-- multiline section & parse all file (now) and when modification retrive previous modification -->
+		<rule name="doubleQuteText">
+			<color>doubleQuoteText</color>
+			<start>"</start>
+			<end>"</end>
+			<EscapeChar>\</EscapeChar>
+		</rule>
+	</pass1>
+	<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
+		<rule name="my keyword">
+			<color>keyword</color>
+			<start>\{|\}|\[|\]</start>
+		</rule>
+		<rule name="separator">
+			<color>error</color>
+			<start>:|,</start>
+		</rule>
+		<rule name="names">
+			<color>functionName</color>
+			<start>([a-zA-Z0-9]|-|_)*</start>
+		</rule>
+	</pass2>
+</EdnLang>
diff --git a/data/languages/makefile/highlight.xml b/data/languages/makefile/highlight.xml
index 95f2ce4..1dacdef 100644
--- a/data/languages/makefile/highlight.xml
+++ b/data/languages/makefile/highlight.xml
@@ -25,7 +25,7 @@
 	<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>
+			<start>\@if|ifeq|ifneq|else|endif|define|endef\@</start>
 		</rule>
 		<rule name="my keyword">
 			<color>keyword</color>
@@ -33,7 +33,7 @@
 		</rule>
 		<rule name="function call">
 			<color>functionName</color>
-			<start>\$\((call|info|error|warning|shell|patsubst|lastword|wildcard|addprefix|foreach|subst|if|word|eval)</start>
+			<start>\$\((call|info|error|warning|shell|patsubst|lastword|wildcard|addprefix|foreach|subst|word|eval)</start>
 		</rule>
 		<rule name="condition">
 			<color>boolean</color>
diff --git a/sources/lutin_edn.py b/sources/lutin_edn.py
index c87b950..87d893a 100755
--- a/sources/lutin_edn.py
+++ b/sources/lutin_edn.py
@@ -64,6 +64,7 @@ def Create(target):
 	myModule.CopyFolder('../data/languages/glsl/*.xml','languages/glsl/')
 	myModule.CopyFolder('../data/languages/in/*.xml','languages/in/')
 	myModule.CopyFolder('../data/languages/java/*.xml','languages/java/')
+	myModule.CopyFolder('../data/languages/json/*.xml','languages/json/')
 	myModule.CopyFolder('../data/languages/lua/*.xml','languages/lua/')
 	myModule.CopyFolder('../data/languages/makefile/*.xml','languages/makefile/')
 	myModule.CopyFolder('../data/languages/matlab/*.xml','languages/matlab/')