tibetan 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ae545936f34ae071778e0c393f2823541fd185a03891a05150e08e1093b82b4
-  data.tar.gz: 121c95c185557a0411164b0ab5cbd742ddeec6a92d10af3935ae5b672c25a82d
+  metadata.gz: 97b9ceebfe79bfcae96bfa37793bddf7f2d860c219efcf7b0329c491e0882d4c
+  data.tar.gz: e3373daa2818419ec64cc69daf0b643f9631d311483e35a281609b495f6ce3d5
 SHA512:
-  metadata.gz: 7c0d643ec58d358e566906907935392656091f537d07f6098877b2a38890a3300cda5ef76295ef6f19ca8e1bdeb23f4ed3900a3e057fc1ece165cda492ed4d86
-  data.tar.gz: 851bae4b76b7b09312619683716e4356d857b20e76846aa1f42f394d8742fe05b684300b6e2ca5ecb176dc9590ea3787a1f3a95c5475f269e8d24f6bdcf78d0c
+  metadata.gz: 6dddc1dde6d9a3db2397dcf0429d32f114e3515c07c5bb67bccabba29de5febe4faa6f06afa0af3880f298c0064924c629fc55b67e4881ee8b451f15dad1cca3
+  data.tar.gz: f98150d13db94c934d0a39bb288c5d8532735595d43ecf75a9d3b17f96e8320e83df9ff30e0e78abcece8c98ae9dd371b6ea9b259c2338dfa4ea8ae660d80f4e

data/Gemfile.lock

@@ -1,22 +1,26 @@
 PATH
   remote: .
   specs:
-    tibetan (0.1.3)
+    tibetan (0.1.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.25.5)
-    rake (13.2.1)
+    drb (2.2.3)
+    minitest (6.0.2)
+      drb (~> 2.0)
+      prism (~> 1.5)
+    prism (1.9.0)
+    rake (13.3.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.6)
-  minitest (~> 5.25)
-  rake (~> 13.2)
+  bundler (>= 2.6)
+  minitest (~> 6.0)
+  rake (~> 13.3)
   tibetan!
 
 BUNDLED WITH
-   2.6.7
+  4.0.9

data/README.md

@@ -40,6 +40,9 @@ Tibetan.t("༪") # => "0.5"
 ```
 
 ## References
+https://rywiki.tsadra.org/index.php/Wylie
+https://sorig.info/images/my-pages/about/transliteration-en.pdf
+https://resources.christian-steinert.de/download/WylieTransliteration.pdf
 http://www.thlib.org/reference/transliteration/#!essay=/thl/ewts/meta/
 http://www.thlib.org/reference/transliteration/teachingewts.pdf
 http://www.thlib.org/reference/transliteration/phconverter.php

data/lib/tibetan/version.rb

@@ -1,3 +1,3 @@
 module Tibetan
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/tibetan.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "tibetan/version"
 
 module Tibetan
@@ -107,6 +109,12 @@ module Tibetan
     "ྷ" => "h",
     "ཨ" => "a",
     "ྸ" => "a",
+    # Retroflex Consonants
+    "ཊ" => "T", "ྚ" => "T",
+    "ཋ" => "Th", "ྛ" => "Th",
+    "ཌ" => "Da", "ྜ" => "D",
+    "ཎ" => "N", "ྞ" => "N",
+    "ཥ" => "S", "ྵ" => "S",
     # Vowels
     "ི"  => "i",
     "ུ" => "u",
@@ -124,25 +132,37 @@ module Tibetan
     "ཹ" => "ḹ",
   }
   
-  CONSONANTS = %w(ཀ ཁ ག ང ཅ ཆ ཇ ཉ ཏ ཐ ད ན པ ཕ བ མ ཙ ཚ ཛ ཝ ཞ ཟ འ ཡ ར ལ ཤ ས ཧ)
-  SUBSCRIPTS = %w(ྐ ྑ ྒ ྔ ྕ ྖ ྗ ྙ ྟ ྠ ྡ ྣ ྤ ྥ ྦ ྨ ྩ ྪ ྫ ྭ ྮ ྯ ྰ ྱ ྲ ླ ྴ ྶ ྷ)
+  CONSONANTS = %w(ཀ ཁ ག ང ཅ ཆ ཇ ཉ ཏ ཐ ད ན པ ཕ བ མ ཙ ཚ ཛ ཝ ཞ ཟ འ ཡ ར ལ ཤ ས ཧ ཊ ཋ ཌ ཎ ཥ)
+  SUBSCRIPTS = %w(ྐ ྑ ྒ ྔ ྕ ྖ ྗ ྙ ྟ ྠ ྡ ྣ ྤ ྥ ྦ ྨ ྩ ྪ ྫ ྭ ྮ ྯ ྰ ྱ ྲ ླ ྴ ྶ ྷ ྚ ྛ ྜ ྞ ྵ)
   VOWELS = %w(ྸ  ི  ུ  ེ  ོ a)
   SEP = "་"
   DEFAULT_VOWEL = "a"
 
   class << self
     def transliterate(string="", to=:tibetan)
-      string = string.to_s
+      string = string.to_s.dup
       
       # Split long phrase into small parts and transliterate separately
-      if string.split(SEP).size > 1
-        string = string.split(SEP).map do |str|
+      # Split by anything that isn't a Tibetan consonant, subscript, or vowel
+      parts = string.split(/([^#{CONSONANTS.join}#{SUBSCRIPTS.join}#{VOWELS.join}]+)/).reject(&:empty?)
+      if parts.size > 1
+        res = parts.map do |str|
           transliterate(str)
-        end.join(SEP)
+        end.join
+        # During mapping, trailing tseks become spaces. This cleans up erroneous spaces 
+        # before closing punctuation (e.g. «pe » -> «pe») and drops trailing spaces.
+        res.gsub!(/ +([»\]\)]|\Z)/, '\1')
+        return res
       end
-      
+
+      # Implicit vowel 'a' before 'a-chung preceded by a consonant/subscript
+      string.gsub!(/([#{CONSONANTS.join}#{SUBSCRIPTS.join}])འ/, '\1aའ')
+
       insert_default_vowel!(string)
 
+      # Exception: distinguish prefix 'g' and root 'y' (g.y) from root 'g' and subjoined 'y' (gy)
+      string.gsub!("གཡ", "ག.ཡ")
+
       character_table = Module.const_get(to.to_s.capitalize)::CHARACTER_TABLE
       string.to_s.gsub(/#{Regexp.union(character_table.keys).source}/i, character_table)      
     end
@@ -151,13 +171,30 @@ module Tibetan
     def insert_default_vowel!(string="")
       # 1. after subscript
       if (string.chars & VOWELS).empty?
-        index = string.rindex(/#{SUBSCRIPTS.join('|')}/)
-        string = string.insert(index+1, DEFAULT_VOWEL) unless index.nil?
-      end
-      # 2. after consonant, if not added in 1st step
-      if (string.chars & VOWELS).empty? && (string.chars & CONSONANTS).any?
-        index = string.size > 2 ? 1 : 0
-        string = string.insert(index+1, DEFAULT_VOWEL) unless index.nil?
+        if (sub_idx = string.rindex(/#{SUBSCRIPTS.join('|')}/))
+          string = string.insert(sub_idx+1, DEFAULT_VOWEL)
+        elsif (string.chars & CONSONANTS).any?
+          # 2. after consonant, if not added in 1st step
+          # Count ONLY Tibetan consonants/subscripts to identify the root letter.
+          # We ignore inline punctuation (like ») to avoid inflating the string size 
+          # and placing the implicit 'a' in the wrong position.
+          tibetan_chars_count = string.chars.count { |c| CONSONANTS.include?(c) || SUBSCRIPTS.include?(c) }
+          root_idx = tibetan_chars_count > 2 ? 1 : 0
+          
+          # Find the actual string index corresponding to the root consonant
+          current = -1
+          actual_index = -1
+          string.chars.each_with_index do |c, i|
+            if CONSONANTS.include?(c) || SUBSCRIPTS.include?(c)
+              current += 1
+              if current == root_idx
+                actual_index = i
+                break
+              end
+            end
+          end
+          string = string.insert(actual_index+1, DEFAULT_VOWEL) if actual_index >= 0
+        end
       end
     end
   end

data/tibetan.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.6"
-  spec.add_development_dependency "rake", "~> 13.2"
-  spec.add_development_dependency "minitest", "~> 5.25"
+  spec.add_development_dependency "bundler", ">= 2.6"
+  spec.add_development_dependency "rake", "~> 13.3"
+  spec.add_development_dependency "minitest", "~> 6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tibetan
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - rovetz
@@ -13,14 +13,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
@@ -29,28 +29,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.2'
+        version: '13.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.2'
+        version: '13.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.25'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.25'
+        version: '6.0'
 description: Romanization (transliteration) of Tibetan. Converts Tibetan text to the
   Roman (Latin) script using THL EWTS (Extended Wylie Transliteration Scheme)
 email:
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Romanization (transliteration) of Tibetan
 test_files: []