fixed #94. Thank @pndaza

Rabbit-Converter · Oct 1, 2019 · 492d3dc · 492d3dc
1 parent c76e13e
commit 492d3dc
Show file tree

Hide file tree

Showing 34 changed files with 57 additions and 57 deletions.
diff --git a/Packages/Elixir b/Packages/Elixir
diff --git a/Packages/Go b/Packages/Go
diff --git a/Packages/Node b/Packages/Node
diff --git a/Packages/Objc b/Packages/Objc
diff --git a/Packages/PHP b/Packages/PHP
diff --git a/Packages/Swift b/Packages/Swift
diff --git a/Packages/ruby b/Packages/ruby
diff --git a/index.html b/index.html
@@ -5,7 +5,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<script src="rabbit.js"></script>
 	<link rel="stylesheet" href="style.css"/>
-    <link rel="stylesheet" href='http://mmwebfonts.comquas.com/fonts/?font=mon3' />
+    <link rel="stylesheet" href='http://mmwebfonts.comquas.com/fonts/?font=notosan' />
     <link rel="stylesheet" href='http://mmwebfonts.comquas.com/fonts/?font=zawgyi' />
     <script type="text/javascript">
       function clearText() {

diff --git a/other-lang/csharp/Rabbit.cs b/other-lang/csharp/Rabbit.cs
diff --git a/other-lang/elixir/Rabbit.ex b/other-lang/elixir/Rabbit.ex
diff --git a/other-lang/go/rabbit.go b/other-lang/go/rabbit.go
@@ -189,7 +189,7 @@ func Uni2zg(str string) string  {
         "to": "$2$3\u108d"
     },
     {
-        "from": "(\u1064)([\u1000-\u1021])([\u103b\u103c]?)([\u1031]?)",
+        "from": "(\u1064)([\u1000-\u1021\u1040-\u1049])([\u103b\u103c]?)([\u1031]?)",
         "to": "$2$3$4$1"
     },
     {
@@ -505,7 +505,7 @@ func Zg2uni(str string) string  {
         "to": "\u1064\u103B"
     },
     {
-        "from": "(\u1031)?([\u1000-\u1021])\u1064",
+        "from": "(\u1031)?([\u1000-\u1021\u1040-\u1049])\u1064",
         "to": "\u1004\u103a\u1039$1$2"
     },
     {

diff --git a/other-lang/java/com/comquas/rabbit/Rabbit.java b/other-lang/java/com/comquas/rabbit/Rabbit.java
diff --git a/other-lang/javascript/rabbit.js b/other-lang/javascript/rabbit.js
@@ -182,7 +182,7 @@ function uni2zg(output) {
         "to": "$2$3\u108d"
     },
     {
-        "from": "(\u1064)([\u1000-\u1021])([\u103b\u103c]?)([\u1031]?)",
+        "from": "(\u1064)([\u1000-\u1021\u1040-\u1049])([\u103b\u103c]?)([\u1031]?)",
         "to": "$2$3$4$1"
     },
     {
@@ -497,7 +497,7 @@ function zg2uni(output) {
         "to": "\u1064\u103B"
     },
     {
-        "from": "(\u1031)?([\u1000-\u1021])\u1064",
+        "from": "(\u1031)?([\u1000-\u1021\u1040-\u1049])\u1064",
         "to": "\u1004\u103a\u1039$1$2"
     },
     {

diff --git a/other-lang/kotlin/Rabbit.kt b/other-lang/kotlin/Rabbit.kt
@@ -45,7 +45,7 @@ object Rabbit {
 "(ၤ)([က-အ])([ျြ]?)ိ" to "$2$3ႋ",
 "(ၤ)([က-အ])([ျြ]?)ီ" to "$2$3ႌ",
 "(ၤ)([က-အ])([ျြ]?)ံ" to "$2$3ႍ",
-"(ၤ)([က-အ])([ျြ]?)([ေ]?)" to "$2$3$4$1",
+"(ၤ)([က-အ၀-၉])([ျြ]?)([ေ]?)" to "$2$3$4$1",
 "ရ(?=([ိီ]?)[ုူွႊ])" to "႐",
 "ဏ္ဍ" to "႑",
 "ဋ္ဌ" to "႒",
@@ -125,7 +125,7 @@ object Rabbit {
 "ႉ" to "ှူ",
 "ႊ" to "ွှ",
 "ျၤ" to "ၤျ",
-"(ေ)?([က-အ])ၤ" to "င်္$1$2",
+"(ေ)?([က-အ၀-၉])ၤ" to "င်္$1$2",
 "(ေ)?([က-အ])(ျ)?ႋ" to "င်္$1$2$3ိ",
 "(ေ)?([က-အ])(ျ)?ႌ" to "င်္$1$2$3ီ",
 "(ေ)?([က-အ])ႍ" to "င်္$1$2ံ",

diff --git a/other-lang/objective-c/Rabbit.m b/other-lang/objective-c/Rabbit.m
diff --git a/other-lang/php/Rabbit.php b/other-lang/php/Rabbit.php
diff --git a/other-lang/python/Rabbit.py b/other-lang/python/Rabbit.py
diff --git a/other-lang/ruby/Rabbit.rb b/other-lang/ruby/Rabbit.rb
diff --git a/other-lang/swift4/Rabbit.swift b/other-lang/swift4/Rabbit.swift
diff --git a/rabbit.js b/rabbit.js
@@ -182,7 +182,7 @@ function uni2zg(output) {
         "to": "$2$3\u108d"
     },
     {
-        "from": "(\u1064)([\u1000-\u1021])([\u103b\u103c]?)([\u1031]?)",
+        "from": "(\u1064)([\u1000-\u1021\u1040-\u1049])([\u103b\u103c]?)([\u1031]?)",
         "to": "$2$3$4$1"
     },
     {
@@ -497,7 +497,7 @@ function zg2uni(output) {
         "to": "\u1064\u103B"
     },
     {
-        "from": "(\u1031)?([\u1000-\u1021])\u1064",
+        "from": "(\u1031)?([\u1000-\u1021\u1040-\u1049])\u1064",
         "to": "\u1004\u103a\u1039$1$2"
     },
     {

diff --git a/source/output/csharp/Rabbit.cs b/source/output/csharp/Rabbit.cs
diff --git a/source/output/elixir/Rabbit.ex b/source/output/elixir/Rabbit.ex
diff --git a/source/output/go/rabbit.go b/source/output/go/rabbit.go
@@ -189,7 +189,7 @@ func Uni2zg(str string) string  {
         "to": "$2$3\u108d"
     },
     {
-        "from": "(\u1064)([\u1000-\u1021])([\u103b\u103c]?)([\u1031]?)",
+        "from": "(\u1064)([\u1000-\u1021\u1040-\u1049])([\u103b\u103c]?)([\u1031]?)",
         "to": "$2$3$4$1"
     },
     {
@@ -505,7 +505,7 @@ func Zg2uni(str string) string  {
         "to": "\u1064\u103B"
     },
     {
-        "from": "(\u1031)?([\u1000-\u1021])\u1064",
+        "from": "(\u1031)?([\u1000-\u1021\u1040-\u1049])\u1064",
         "to": "\u1004\u103a\u1039$1$2"
     },
     {

diff --git a/source/output/java/com/comquas/rabbit/Rabbit.java b/source/output/java/com/comquas/rabbit/Rabbit.java
diff --git a/source/output/javascript/rabbit.js b/source/output/javascript/rabbit.js
@@ -182,7 +182,7 @@ function uni2zg(output) {
         "to": "$2$3\u108d"
     },
     {
-        "from": "(\u1064)([\u1000-\u1021])([\u103b\u103c]?)([\u1031]?)",
+        "from": "(\u1064)([\u1000-\u1021\u1040-\u1049])([\u103b\u103c]?)([\u1031]?)",
         "to": "$2$3$4$1"
     },
     {
@@ -497,7 +497,7 @@ function zg2uni(output) {
         "to": "\u1064\u103B"
     },
     {
-        "from": "(\u1031)?([\u1000-\u1021])\u1064",
+        "from": "(\u1031)?([\u1000-\u1021\u1040-\u1049])\u1064",
         "to": "\u1004\u103a\u1039$1$2"
     },
     {

diff --git a/source/output/kotlin/Rabbit.kt b/source/output/kotlin/Rabbit.kt
@@ -45,7 +45,7 @@ object Rabbit {
 "(ၤ)([က-အ])([ျြ]?)ိ" to "$2$3ႋ",
 "(ၤ)([က-အ])([ျြ]?)ီ" to "$2$3ႌ",
 "(ၤ)([က-အ])([ျြ]?)ံ" to "$2$3ႍ",
-"(ၤ)([က-အ])([ျြ]?)([ေ]?)" to "$2$3$4$1",
+"(ၤ)([က-အ၀-၉])([ျြ]?)([ေ]?)" to "$2$3$4$1",
 "ရ(?=([ိီ]?)[ုူွႊ])" to "႐",
 "ဏ္ဍ" to "႑",
 "ဋ္ဌ" to "႒",
@@ -125,7 +125,7 @@ object Rabbit {
 "ႉ" to "ှူ",
 "ႊ" to "ွှ",
 "ျၤ" to "ၤျ",
-"(ေ)?([က-အ])ၤ" to "င်္$1$2",
+"(ေ)?([က-အ၀-၉])ၤ" to "င်္$1$2",
 "(ေ)?([က-အ])(ျ)?ႋ" to "င်္$1$2$3ိ",
 "(ေ)?([က-အ])(ျ)?ႌ" to "င်္$1$2$3ီ",
 "(ေ)?([က-အ])ႍ" to "င်္$1$2ံ",

diff --git a/source/output/objective-c/Rabbit.m b/source/output/objective-c/Rabbit.m
diff --git a/source/output/php/Rabbit.php b/source/output/php/Rabbit.php
diff --git a/source/output/python/Rabbit.py b/source/output/python/Rabbit.py
diff --git a/source/output/ruby/Rabbit.rb b/source/output/ruby/Rabbit.rb
diff --git a/source/output/swift4/Rabbit.swift b/source/output/swift4/Rabbit.swift
diff --git a/source/rule/uni2zg.json b/source/rule/uni2zg.json
@@ -176,7 +176,7 @@
         "to": "$2$3\u108d"
     },
     {
-        "from": "(\u1064)([\u1000-\u1021])([\u103b\u103c]?)([\u1031]?)",
+        "from": "(\u1064)([\u1000-\u1021\u1040-\u1049])([\u103b\u103c]?)([\u1031]?)",
         "to": "$2$3$4$1"
     },
     {

diff --git a/source/rule/zg2uni.json b/source/rule/zg2uni.json
@@ -168,7 +168,7 @@
         "to": "\u1064\u103B"
     },
     {
-        "from": "(\u1031)?([\u1000-\u1021])\u1064",
+        "from": "(\u1031)?([\u1000-\u1021\u1040-\u1049])\u1064",
         "to": "\u1004\u103a\u1039$1$2"
     },
     {

diff --git a/style.css b/style.css
@@ -40,7 +40,7 @@ textarea{
 	display:inline-block;
 	width:48%;
 	padding-left: 10px;
-	font-family: "Pyidaungsu","MON3 Anonta 1";
+	font-family: "Noto Sans Myanmar","Pyidaungsu";