Fix mapping rule issue when there are multiple matches

Author: chaaklau

lib/interscript.rb

@@ -31,16 +31,19 @@ def transliterate(system_code, string)
       output = string.clone
       offsets = Array.new string.to_s.size, 1
 
+      # mapping.rules.each do |r|
+      #   string.to_s.scan(/#{r['pattern']}/) do |matches|
+      #     match = Regexp.last_match
+      #     pos = match.offset(0).first
+      #     result = r['result'].clone
+      #     matches.each.with_index { |v, i| result.sub!(/\\#{i + 1}/, v) } if matches.is_a? Array
+      #     result.upcase! if up_case_around?(string, pos)
+      #     output[offsets[0...pos].sum, match[0].size] = result
+      #     offsets[pos] += result.size - match[0].size
+      #   end
+      # end
       mapping.rules.each do |r|
-        string.to_s.scan(/#{r['pattern']}/) do |matches|
-          match = Regexp.last_match
-          pos = match.offset(0).first
-          result = r['result'].clone
-          matches.each.with_index { |v, i| result.sub!(/\\#{i + 1}/, v) } if matches.is_a? Array
-          result.upcase! if up_case_around?(string, pos)
-          output[offsets[0...pos].sum, match[0].size] = result
-          offsets[pos] += result.size - match[0].size
-        end
+        output.gsub!(/#{r['pattern']}/, r['result'])
       end
 
       charmap.each do |k, v|

maps/bgnpcgn-rus-Cyrl-Latn-1947.yaml

@@ -188,13 +188,13 @@ tests:
 map:
   rules:
     - pattern: (?<=[АаЕеЁёИиОоУуЫыЭэЮюЯяЙйЪъЬь])\u0415 # Е after a, e, ё, и, о, у, ы, э, ю, я, й, ъ, ь
-      result: Ye
+      result: "Y\u0415"
     - pattern: \b\u0415 # Е initially
-      result: Ye
+      result: "Y\u0435"
     - pattern: (?<=[АаЕеЁёИиОоУуЫыЭэЮюЯяЙйЪъЬь])\u0435 # е after a, e, ё, и, о, у, ы, э, ю, я, й, ъ, ь
-      result: ye
+      result: "y\u0435"
     - pattern: \b\u0435 # е initially
-      result: ye
+      result: "y\u0435"
     - pattern: (?<=[АаЕеЁёИиОоУуЫыЭэЮюЯяЙйЪъЬь])\u0401 # Ё after a, e, ё, и, о, у, ы, э, ю, я, й, ъ, ь
       result: "Y\u00eb"
     - pattern: \b\u0401
@@ -207,6 +207,10 @@ map:
       result: "Y\u00b7"
     - pattern: \u0439(?=[АаУуЫыЭэ]) # й before а, у, ы, or э
       result: "y\u00b7"
+    - pattern: (?<=[АаЕеЁёИиОоУуЫыЭэЮюЯя])\u042b(?=[АаУуЫыЭэ]) # Ы after any vowel character and before а, у, ы, or э
+      result: "\u00b7Y\u00b7"
+    - pattern: (?<=[АаЕеЁёИиОоУуЫыЭэЮюЯя])\u044b(?=[АаУуЫыЭэ]) # ы after any vowel character and before а, у, ы, or э
+      result: "\u00b7y\u00b7"
     - pattern: \u042b(?=[АаУуЫыЭэ]) # Ы before а, у, ы, or э
       result: "Y\u00b7"
     - pattern: \u044b(?=[АаУуЫыЭэ]) # ы before а, у, ы, or э
@@ -224,6 +228,15 @@ map:
     - pattern: (Ш|ш)(Ч|ч) # шч => sh·ch
       result: "\\1\u00b7\\2"
 
+  postrules:
+
+    #YE
+    - pattern: "((?<=[A-ZË])Ye(?=[A-ZË])?|(?<=[A-ZË])?Ye(?=[A-ZË]))"
+      result: "YE"
+    #YË
+    - pattern: "((?<=[A-ZË])Yë(?=[A-ZË])?|(?<=[A-ZË])?Yë(?=[A-ZË]))"
+      result: "YË"
+
   characters:
     "\u0410": "A"
     "\u0411": "B"