From 3caf99adaa994ae01a7accb9a81757bc26a65e0a Mon Sep 17 00:00:00 2001
From: Samuel GOUGEON <sgougeon@free.fr>
Date: Thu, 29 Apr 2021 21:26:59 +0200
Subject: [PATCH] %chars: missing gamma. More chars. %chars in scinotes

Change-Id: Ibcacb5d5313602c390ec3e25146976d79e2f3b3b
---
 .../en_US/variables/predefined/percentchars.xml    |    8 +++++---
 .../ru_RU/variables/predefined/percentchars.xml    |    8 +++++---
 scilab/modules/core/macros/percentchars.sci        |    8 +++++---
 .../modules/scinotes/src/java/jflex/scilab.jflex   |    2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/scilab/modules/core/help/en_US/variables/predefined/percentchars.xml b/scilab/modules/core/help/en_US/variables/predefined/percentchars.xml
index 9ebc9c2..30b6351 100644
--- a/scilab/modules/core/help/en_US/variables/predefined/percentchars.xml
+++ b/scilab/modules/core/help/en_US/variables/predefined/percentchars.xml
@@ -60,8 +60,8 @@
 --> %chars
  %chars  =
   greek: struct with fields:
-      lower = "αβδεϵζηθικλμνξοπρστυφϕχψωάϐέήϑίϊϰόϱςύϋΰϖώ"
-      upper = "ΑΒΓΔΕΖΗΘϴΙΪΚΛΜΝΞΟΠΡΣΤΥΫΦΧΨΩ KΩ℧"
+      lower = "αβγδεϵζηθ ι κλμνξοπρστυφϕχψωάϐέήϑίϊϰόϱςύϋΰϖώ"
+      upper = "ΑΒΓΔΕ ΖΗΘϴΙΪΚΛΜΝΞΟΠΡΣΤΥΫΦΧΨΩ KΩ℧"
   subsupscript = "₀₁₂₃₄₅₆₇₈₉₊₋₌₍ₐₕₖₗₘₙₒₚₛₜₓ₎ ⁰¹²³⁴⁵⁶⁷⁸⁹⁺⁻⁼⁽ªⁱⁿº⁾"
   maths: struct with fields:
       frac = "½ ⅓ ¼ ⅕ ⅙ ⅛ ⅔ ⅖ ¾ ⅗ ⅜ ⅘ ⅚ ⅝ ⅞"
@@ -73,12 +73,14 @@
       logical = "∀∃∄∧∨⋀⋁⊼⊽⊻∁∴∵∎≍"
       misc = "⋮⋰⋯⋱ ′ ″ ∞ ‰ ‱"
   physics = "Å ℃ ℉ ħ"
+  music = "♩ ♪ ♫ ♬ ♭ ♮ ♯"
   arrows: struct with fields:
       base = "←↖↑↗→↘↓↙↔↕↵↱↴☇⇐⇑⇒⇓⇔↺↻⊣⊥⊢⊤"
       thick = "⬅⬆➞⬇➚➙➘➔➜➡➥➦➧➨➼➽"
-  symbols = "…⋈⋔⋄♢◊♤♧♡♦♠♣♥©®℗Ⓢ™℡♀♂⌘✠♻☎«»◬⨺⨹⨻¶"
+  symbols = "…⋈⋔⋄♢◊♤♧♡♦♠♣♥©®℗Ⓢ™℡♀♂⌘✠♻☎«»◬⨺⨹⨻¶⚐⚑⛿☀⛅☁ ⛔"
   stars = "⋆★☆✫✯✰✭✡⊛⍟✪❂✻✼✹✸✶"
   currencies = "¤ $ ¢ € £ ¥ 円 元 ₪ ฿ ¢ ₫ ₣"
+  spaces = " | | | | | | | | | | |"
   lang: struct with fields:
       latin: struct with fields:
           voydiac = "áàâãäāăåéêèëēěėíîïóòôõöőōúùûŭũūůüűýŷÿ"
diff --git a/scilab/modules/core/help/ru_RU/variables/predefined/percentchars.xml b/scilab/modules/core/help/ru_RU/variables/predefined/percentchars.xml
index 9fb55d8..d954b6a 100644
--- a/scilab/modules/core/help/ru_RU/variables/predefined/percentchars.xml
+++ b/scilab/modules/core/help/ru_RU/variables/predefined/percentchars.xml
@@ -63,8 +63,8 @@
 --> %chars
  %chars  =
   greek: struct with fields:
-      lower = "αβδεϵζηθικλμνξοπρστυφϕχψωάϐέήϑίϊϰόϱςύϋΰϖώ"
-      upper = "ΑΒΓΔΕΖΗΘϴΙΪΚΛΜΝΞΟΠΡΣΤΥΫΦΧΨΩ KΩ℧"
+      lower = "αβγδεϵζηθ ι κλμνξοπρστυφϕχψωάϐέήϑίϊϰόϱςύϋΰϖώ"
+      upper = "ΑΒΓΔΕ ΖΗΘϴΙΪΚΛΜΝΞΟΠΡΣΤΥΫΦΧΨΩ KΩ℧"
   subsupscript = "₀₁₂₃₄₅₆₇₈₉₊₋₌₍ₐₕₖₗₘₙₒₚₛₜₓ₎ ⁰¹²³⁴⁵⁶⁷⁸⁹⁺⁻⁼⁽ªⁱⁿº⁾"
   maths: struct with fields:
       frac = "½ ⅓ ¼ ⅕ ⅙ ⅛ ⅔ ⅖ ¾ ⅗ ⅜ ⅘ ⅚ ⅝ ⅞"
@@ -76,12 +76,14 @@
       logical = "∀∃∄∧∨⋀⋁⊼⊽⊻∁∴∵∎≍"
       misc = "⋮⋰⋯⋱ ′ ″ ∞ ‰ ‱"
   physics = "Å ℃ ℉ ħ"
+  music = "♩ ♪ ♫ ♬ ♭ ♮ ♯"
   arrows: struct with fields:
       base = "←↖↑↗→↘↓↙↔↕↵↱↴☇⇐⇑⇒⇓⇔↺↻⊣⊥⊢⊤"
       thick = "⬅⬆➞⬇➚➙➘➔➜➡➥➦➧➨➼➽"
-  symbols = "…⋈⋔⋄♢◊♤♧♡♦♠♣♥©®℗Ⓢ™℡♀♂⌘✠♻☎«»◬⨺⨹⨻¶"
+  symbols = "…⋈⋔⋄♢◊♤♧♡♦♠♣♥©®℗Ⓢ™℡♀♂⌘✠♻☎«»◬⨺⨹⨻¶⚐⚑⛿☀⛅☁ ⛔"
   stars = "⋆★☆✫✯✰✭✡⊛⍟✪❂✻✼✹✸✶"
   currencies = "¤ $ ¢ € £ ¥ 円 元 ₪ ฿ ¢ ₫ ₣"
+  spaces = " | | | | | | | | | | |"
   lang: struct with fields:
       latin: struct with fields:
           voydiac = "áàâãäāăåéêèëēěėíîïóòôõöőōúùûŭũūůüűýŷÿ"
diff --git a/scilab/modules/core/macros/percentchars.sci b/scilab/modules/core/macros/percentchars.sci
index d6a7c1b..de1821a 100644
--- a/scilab/modules/core/macros/percentchars.sci
+++ b/scilab/modules/core/macros/percentchars.sci
@@ -12,8 +12,8 @@ function %chars = percentchars()
     // Internal function called by scilab.start
     // http://bugzilla.scilab.org/9221
 
-    %chars.greek.lower       = "αβδεϵζηθικλμνξοπρστυφϕχψωάϐέήϑίϊϰόϱςύϋΰϖώ";
-    %chars.greek.upper       = "ΑΒΓΔΕΖΗΘϴΙΪΚΛΜΝΞΟΠΡΣΤΥΫΦΧΨΩ KΩ℧";
+    %chars.greek.lower       = "αβγδεϵζηθ ι κλμνξοπρστυφϕχψωάϐέήϑίϊϰόϱςύϋΰϖώ";
+    %chars.greek.upper       = "ΑΒΓΔΕ ΖΗΘϴΙΪΚΛΜΝΞΟΠΡΣΤΥΫΦΧΨΩ KΩ℧";
     %chars.subsupscript      = "₀₁₂₃₄₅₆₇₈₉₊₋₌₍ₐₕₖₗₘₙₒₚₛₜₓ₎ ⁰¹²³⁴⁵⁶⁷⁸⁹⁺⁻⁼⁽ªⁱⁿº⁾";
     %chars.maths.frac        = "½ ⅓ ¼ ⅕ ⅙ ⅛ ⅔ ⅖ ¾ ⅗ ⅜ ⅘ ⅚ ⅝ ⅞";
     %chars.maths.sets        = "ℂⅅℍℕℙℚℝℤ∉∈∊∍∋∌∅∖⋂∩⋃∪⊂⊆⊄⊅⊇⊃⋐⋑⋒⋓";
@@ -24,11 +24,13 @@ function %chars = percentchars()
     %chars.maths.logical     = "∀∃∄∧∨⋀⋁⊼⊽⊻∁∴∵∎≍";
     %chars.maths.misc        = "⋮⋰⋯⋱ ′ ″ ∞ ‰ ‱";
     %chars.physics           = "Å ℃ ℉ ħ";
+    %chars.music             = "♩ ♪ ♫ ♬ ♭ ♮ ♯";
     %chars.arrows.base       = "←↖↑↗→↘↓↙↔↕↵↱↴☇⇐⇑⇒⇓⇔↺↻⊣⊥⊢⊤";
     %chars.arrows.thick      = "⬅⬆➞⬇➚➙➘➔➜➡➥➦➧➨➼➽";
-    %chars.symbols           = "…⋈⋔⋄♢◊♤♧♡♦♠♣♥©®℗Ⓢ™℡♀♂⌘✠♻☎«»◬⨺⨹⨻¶";
+    %chars.symbols           = "…⋈⋔⋄♢◊♤♧♡♦♠♣♥©®℗Ⓢ™℡♀♂⌘✠♻☎«»◬⨺⨹⨻¶⚐⚑⛿☀⛅☁ ⛔";
     %chars.stars             = "⋆★☆✫✯✰✭✡⊛⍟✪❂✻✼✹✸✶";
     %chars.currencies        = "¤ $ ¢ € £ ¥ 円 元 ₪ ฿ ¢ ₫ ₣";
+    %chars.spaces            = " | | | | | | | | | | |";
 
     %chars.lang.latin = "abcdefghijklmnopqrstuvwxyz";
     %chars.lang.LATIN = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
diff --git a/scilab/modules/scinotes/src/java/jflex/scilab.jflex b/scilab/modules/scinotes/src/java/jflex/scilab.jflex
index 69698e5..0002484 100644
--- a/scilab/modules/scinotes/src/java/jflex/scilab.jflex
+++ b/scilab/modules/scinotes/src/java/jflex/scilab.jflex
@@ -221,7 +221,7 @@ quote = "'"
 
 dquote = "\""
 
-cstes = "%t" | "%T" | "%f" | "%F" | "%e" | "%pi" | "%inf" | "%i" | "%z" | "%s" | "%nan" | "%eps" | "SCI" | "WSCI" | "SCIHOME" | "TMPDIR"
+cstes = "%t" | "%T" | "%f" | "%F" | "%e" | "%pi" | "%inf" | "%i" | "%z" | "%s" | "%nan" | "%eps" | "%chars" | "SCI" | "WSCI" | "SCIHOME" | "TMPDIR"
 
 operator = ".'" | ".*" | "./" | ".\\" | ".^" | ".**" | "+" | "-" | "/" | "\\" | "*" | "^" | "**" | "==" | "~=" | "<>" | "<" | ">" | "<=" | ">=" | ".*." | "./." | ".\\." | "/." | "=" | "&" | "|" | "@" | "@=" | "~" | "&&" | "||"
 
-- 
1.7.9.5