diff --git a/data/color/black.xml b/data/color/black.xml
index b746607..7048693 100644
--- a/data/color/black.xml
+++ b/data/color/black.xml
@@ -16,20 +16,20 @@
{ name="error", foreground="#FF0000"},
{ name="doubleQuoteText", foreground="#00fF00"},
- { name="type", foreground="#56bf10", bold="yes"},
+ { name="type", foreground="#56bf10", bold=true},
{ name="storageKeyword", foreground="#5c8fed"},
{ 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="yes"},
- { name="commentDoxygen", foreground="#ef4d00", bold="yes", italic="yes"},
- { name="keyword", foreground="#5c8fed", bold="yes"},
- { name="macro", foreground="#6c09c8", bold="yes"},
- { name="SYNTAX_ERROR", foreground="#000000", background="#FF0000", bold="yes"},
- { name="functionName", foreground="#24d1e0", bold="yes"},
- { name="TestResultOK", foreground="#000000", background="#00FF00", bold="yes"},
- { name="TestResultERROR", FG="#000000", background="#FF0000", bold="yes"}
+ { 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="functionName", foreground="#24d1e0", bold=true},
+ { name="TestResultOK", foreground="#000000", background="#00FF00", bold=true},
+ { name="TestResultERROR", FG="#000000", background="#FF0000", bold=true}
]
}
diff --git a/data/languages/json/highlight.xml b/data/languages/json/highlight.xml
index 8292f13..b324d6d 100644
--- a/data/languages/json/highlight.xml
+++ b/data/languages/json/highlight.xml
@@ -22,5 +22,13 @@
functionName
([a-zA-Z0-9]|-|_)*
+
+ number
+ \@((0(x|X)[0-9a-fA-F]*)|(\d+\.?\d*|\.\d+)((e|E)(\+|\-)?\d+)?)(L|l|UL|ul|u|U|F|f)?\@
+
+
+ boolean
+ \@true|false\@
+
diff --git a/sources/appl/glyphDecoration/GlyphPainting.cpp b/sources/appl/glyphDecoration/GlyphPainting.cpp
index 5761d24..b929a38 100644
--- a/sources/appl/glyphDecoration/GlyphPainting.cpp
+++ b/sources/appl/glyphDecoration/GlyphPainting.cpp
@@ -9,7 +9,7 @@
#include
#include
#include
-#include
+#include
#include
#include
@@ -25,18 +25,65 @@ appl::GlyphPainting::GlyphPainting(const etk::UString& _filename) :
}
appl::GlyphPainting::~GlyphPainting(void) {
- // remove all element
- for (int32_t iii=0; iiisize(); ++iii) {
+ ejson::Object* tmpObj = baseArray->getObject(iii);
+ if (tmpObj == NULL) {
+ APPL_DEBUG(" can not get object in 'ednColor' id=" << iii);
+ continue;
+ }
+ etk::UString name = tmpObj->getString("name");
+ etk::UString background = tmpObj->getString("background");
+ etk::UString foreground = tmpObj->getString("foreground");
+ bool italic = tmpObj->getString("italic");
+ bool bold = tmpObj->getString("bold");
+ bool findElement = false;
+ for (esize_t jjj=0; jjj m_list;
+ etk::Vector m_list;
protected:
GlyphPainting(const etk::UString& _filename);
virtual ~GlyphPainting(void);
@@ -34,13 +34,15 @@ namespace appl {
* @param[in] _name Name of the deco.
* @return id of the deco.
*/
- esize_t registerDeco(const etk::UString& _name);
+ esize_t request(const etk::UString& _name);
/**
* @brief Get Decoration handle.
* @param[in] _id Id of the decoration.
* @return pointer on deco.
*/
- appl::GlyphDecoration* getDeco(esize_t _id);
+ const appl::GlyphDecoration& get(esize_t _id) const {
+ return m_list[_id];
+ };
public:
/**
* @brief keep the resource pointer.
@@ -48,7 +50,7 @@ namespace appl {
* @param[in] _filename Name of the configuration file.
* @return pointer on the resource or NULL if an error occured.
*/
- static appl::GlyphPainting* keep(const etk::UString& _filename = "GlyphPainting::default");
+ static appl::GlyphPainting* keep(const etk::UString& _filename);
/**
* @brief release the keeped resources
* @param[in,out] reference on the object pointer
diff --git a/sources/lutin_edn.py b/sources/lutin_edn.py
index ca3f29f..90a40cd 100755
--- a/sources/lutin_edn.py
+++ b/sources/lutin_edn.py
@@ -40,8 +40,8 @@ def Create(target):
# Generic color management for the text editor :
myModule.AddSrcFile([
- 'appl/glyphDecoration/GlyphDecoration.cpp'])
- # 'appl/Colorize/ColorizeManager.cpp'])
+ 'appl/glyphDecoration/GlyphDecoration.cpp',
+ 'appl/glyphDecoration/GlyphPainting.cpp'])
# syntax coloration for the text editor
#myModule.AddSrcFile([