From 715fbec331bd1f91a8bd5ece992aab66203af222 Mon Sep 17 00:00:00 2001
From: Robin Moussu <robin.moussu+git@gmail.com>
Date: Sun, 8 Apr 2018 01:07:05 +0200
Subject: add all operators in README.md

---
 README.md    | 29 ++++++++++++++++++-----------
 diceparser.h | 15 +--------------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 79561c9..c23ea6c 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Instruction =: Expression
 Expression =: number | number Dice DiceOperation | ScalarOperator Expression | string | variable Expression
 Dice =: DiceOperator Number(faces) | DiceOperator ListOfValues
 DiceOperator =: D | L
-DiceOperation =: Keep | KeepAndExplose | sort | if | explose | jumpbackward | merge | filter | parenthese | count | paint | group
+DiceOperation =: Keep | KeepAndExplose | Sort | Count | Reroll | If | Explose | RerollAndAdd | Jumpbackward | Merge | Filter | Split | Parenthese | Count | Paint | Group
 ScalarOperator =: [x,-,*,x,/]
 number =: [0-9]+ | constantValue
 constantValue =: ${id | label}
@@ -30,16 +30,23 @@ ListOfValue=: String[Range],ListOfValue | String[Range]
 String =: [A-z0-9]+
 Keep =: k Number
 KeepAndExplose =: K number
-sort =: s
-if =: i compareMethod [Validator] {Expression}[{Expression}]
-paint =: p [ count : color ]
-group =: number
-explose =: e Validator
-jumpbackward =: @DiceOperation
-merge =: m | m Expression
-filter =: f Validator
-parenthese =: (expression)
-count =: c Validator
+Reroll =: r
+Explosing =: e
+RerollOnceAndAdd =: a
+RerollAndAdd =: A
+Painter =: p
+Split =: u
+Group =: g
+Sort =: s
+If =: i compareMethod [Validator] {Expression}[{Expression}]
+Paint =: p [ Count : color ]
+Group =: number
+Explose =: e Validator
+Jumpbackward =: @DiceOperation
+Merge =: m | m Expression
+Filter =: f Validator
+Parenthese =: (expression)
+Count =: c Validator
 ```
 
 
diff --git a/diceparser.h b/diceparser.h
index abe19a1..6c59bae 100644
--- a/diceparser.h
+++ b/diceparser.h
@@ -47,20 +47,7 @@ class ExploseDiceNode;
  *
  * @section grammar The Grammar
  *
- * The grammar is something like this:
- *
- * Line =: Command | Command;Command<br/>
- * Command =: Expression | ScalarOperator Expression | ScalarOperator NodeAction Expression<br/>
- * Expression =: number | number Dice | Command<br/>
- * Dice =: DiceOperator Number(faces) | DiceOperator List<br/>
- * List =: [Word[range|percentage],Number[range|percentage],',']+<br/>
- * Persentage =: Number <br/>
- * NodeAction =: @<br/>
- * DiceOperator =: [D,L]<br/>
- * ScalarOperator =: [x,-,*,x,/]<br/>
- * number =: [0-9]+<br/>
- * Word =: [A-z]+<br/>
- *
+ * The grammar is described in Readme.md
  */
 
 /**
-- 
cgit v1.2.3-70-g09d2


From 31030fd5cca1223cb3502120b5c948472a24b2bc Mon Sep 17 00:00:00 2001
From: Robin Moussu <robin.moussu+git@gmail.com>
Date: Sun, 8 Apr 2018 06:20:35 +0200
Subject: Add cli supported colors in HelpMe.md

---
 HelpMe.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/HelpMe.md b/HelpMe.md
index fa635bc..17b417d 100644
--- a/HelpMe.md
+++ b/HelpMe.md
@@ -250,8 +250,8 @@ https://gist.github.com/obiwankennedy/62101383d411e55d205e44df78aa5299
 
 
 The amount of color is depending of client application of DiceParser.
-With Rolisteam, you may set any Qt color's name or set the Hexcode of your color: #ff28AC.
-The cli application supports few colors.
+- With Rolisteam, you may set any Qt color's name or set the Hexcode of your color: #ff28AC.
+- The cli application supports few colors: black, white, blue, red, black, green, yellow.
 
 ### Merge
 
-- 
cgit v1.2.3-70-g09d2