ting 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d7dbea414f62b23124a52f7eb9be4fed2997b92
-  data.tar.gz: 1e179823cb2b4c37c17642d1afe165993ccb0489
+  metadata.gz: 832c9fb34c5415f06ee7a3c11063930e377ba9cf
+  data.tar.gz: 599204c5cec9e06962568922c4c477dd868911ba
 SHA512:
-  metadata.gz: 5aad8f773d7731e222ea7c4c6324af8742954480b9258673a2a6e442b689bbed5b4e8bedbbbcfe058672a6d66782d37ea14be7457cff3a5581cce42e693f16ea
-  data.tar.gz: 35ead7e81254b5294d7bce9c8dcaca965d661780e02702762060e5ab3dd6f15b863909f698627afa8cc6366de8d5941a118507fc59fb8306509d2a461f0927fd
+  metadata.gz: c35bc7b3cd2a40edb9fa89fe00089a1d3791eb640600a17b7de419beaa902e8047c20d24dda3d9fdb11346eeca7b9ecee3688d7010949edfabdc14a16187d11a
+  data.tar.gz: eb3868c3100089e6b9d55e71a7cb0d2f157a7a67ccf81e660422e285954897c3c09b3dd970a9264492823a762b64fdcd7a247fe84bd54ffed041dd1f78dce6c5

data/.travis.yml

@@ -1,12 +1,12 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.1
-  - 2.2.5
-  - 2.3.4
-  - 2.4.2
-  - jruby
+  - ruby-2.0.0
+  - ruby-2.1.1
+  - ruby-2.2.5
+  - ruby-2.3.4
+  - ruby-2.4.2
   - ruby-head
+  - jruby-9.1.9.0
   - jruby-head
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -0,0 +1,24 @@
+# Change Log
+All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).
+
+<!-- (this space deliberately left blank) -->
+<!-- ### Added -->
+<!-- ### Changed -->
+<!-- ### Removed -->
+<!-- ### Fixed -->
+
+## [Unreleased]
+
+## [0.11.0] - released 2017-11-06
+
+### Changed
+- Make `Ting.pretty_tones` work with bopomofo
+- Correct name of Palladius (Cyrilic transcription)
+- Add missing IPA finals
+- Change Palladius transcription of "hui" to хуэй
+
+### Added
+- `bin/ting_table` script
+
+[Unreleased]: https://github.com/lambdaisland/uri/compare/v0.11.0...HEAD
+[0.11.0]: https://github.com/plexus/ting/compare/v0.11.0...v0.10.0

data/README.md

@@ -10,6 +10,10 @@ to pinyin with tones.
 Hanyu Pinyin, Bopomofo, Wade-Giles, Tongyong Pinyin
 and International Phonetic Alphabet (IPA) are supported.
 
+## INSTALL
+
+* gem install ting
+
 ## SYNOPSIS
 
 To parse your strings create a `Reader` object. Ting.reader() takes two
@@ -74,7 +78,7 @@ Generate IPA
    # => "iou˧˩˧ pʰeŋ˧˥ ts˥˩ yɛn˧˥ faŋ˥˥ lai˧˥"
 ````
 
-Since this is such a common use case, a convenience method to add diacritics to pinyin.
+Since this is such a common use case, a convenience method exists to add diacritics to pinyin.
 
 ````ruby
    Ting.pretty_tones "wo3 ai4 ni3"
@@ -82,22 +86,24 @@ Since this is such a common use case, a convenience method to add diacritics to
 ````
 
 Note that syllables need to be separated by spaces, feeding "peng2you3" to the parser
-does not work. The `String#pretty_tones` method does handle these things a bit more gracefully.
+does not work. The `Ting.pretty_tones(string)` method does handle these things a bit more gracefully.
 
 If you need to parse input that does not conform, consider using a regexp to scan for valid
-syllables, then feed the syllables to the parser one by one. Have a look at `#pretty_tones` for
-an example of how to do this.
+syllables, then feed the syllables to the parser one by one. Have a look at `Ting.pretty_tones` for
+an example of how to do this, but note that it does not support special cases like erhua
+(wanr2 = wan2 er) or non-standard Pinyin syllables like 嗯/"ń" or 呣／"ḿ" (which appear in the official
+Unicode data and some textbooks).
 
-## REQUIREMENTS
+### ting_table
 
-* none, Ting uses nothing but Ruby
+The `ting_table` script will spit out a CSV table of all syllables and formats Ting knows about. Useful if you want to do conversion in other languages.
 
-## INSTALL
+## REQUIREMENTS
 
-* gem install ting
+* none, Ting uses nothing but Ruby
 
 ## LICENSE
 
-Copyright (c) 2007-2014, Arne Brasseur. (http://www.arnebrasseur.net)
+Copyright (c) 2007-2017, Arne Brasseur. (http://www.arnebrasseur.net)
 
 Available as Free Software under the GPLv3 License, see LICENSE.txt for details

data/bin/ting_table

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+
+require 'ting'
+require 'csv'
+
+zhuyin = Ting.writer(:zhuyin, :marks)
+pinyin = Ting.writer(:hanyu, :accents)
+pinyin2 = Ting.writer(:hanyu, :numbers)
+
+writers = [
+  [:hanyu, :numbers],
+  [:hanyu, :accents],
+  [:ipa, :ipa],
+  [:tongyong, :accents],
+  [:wadegiles, :supernum],
+  [:zhuyin, :marks],
+  [:palladius, :no_tones]
+].map {|args| Ting.writer(*args)}
+
+
+Ting.all_syllables do |s|
+  puts CSV.generate { |csv|
+    csv.puts writers.map {|w| w.call(s) }
+  }
+end

data/lib/ting.rb

@@ -52,13 +52,13 @@ module Ting
 
 
     def pretty_tones(string)
-      string.gsub('u:','ü').gsub(/[A-Za-züÜ]{1,5}\d/) do |syll|
+      string.gsub('u:','ü').gsub(/[A-Za-züÜ]{1,7}\d?/) do |syll|
         SYLLABLE_CACHE[syll]
       end
     end
 
     def bpmf(string)
-      string.gsub('u:','ü').scan(/[A-Za-züÜ]{1,5}\d/).map do |m|
+      string.gsub('u:','ü').scan(/[A-Za-züÜ]{1,7}\d?/).map do |m|
         Ting.writer(:zhuyin, :marks).(
           Ting.reader(:hanyu, :numbers).(m.downcase)
         )

data/lib/ting/data/final.csv

@@ -2,11 +2,11 @@
 "hanyu","i","a","o","e",,"ai","ei","ao","ou","an","en","ang","eng","ong",,"i","ia",,"ie",,"iao","iu","ian","in","iang","ing","u","ua","uo","uai","ui","uan","un","uang",,"ü","üe","üan","ün","iong"
 "hanyu_standalone",,"a","o","e","ê","ai","ei","ao","ou","an","en","ang","eng",,"er","yi","ya","yo","ye","yai","yao","you","yan","yin","yang","ying","wu","wa","wo","wai","wei","wan","wen","wang","weng","yu","yue","yuan","yun","yong"
 "hanyu_no_abbrev","i","a","o","e",,"ai","ei","ao","ou","an","en","ang","eng","ong",,"i","ia","io","ie","iai","iao","iou","ian","ien","iang","ieng","u","ua","uo","uai","uei","uan","uen","uang","ueng","ü","üe","üan","üen","iong"
-"ipa",,"a","ɔ","ə",,"ai","ei","au","ou","an","en","aŋ","eŋ","ʊŋ","aɻ","i",,,"iɛ",,,"iou","iɛn","ɪn",,"iŋ","u",,"uɔ",,"uei","uan",,,"ueŋ","y","yuɛ","yɛn","yn","yʊŋ"
+"ipa",,"a","ɔ","ə","ɛ","ai","ei","au","ou","an","en","aŋ","eŋ","ʊŋ","aɻ","i","ja","jɔ","iɛ","jai̯","jau̯","iou","iɛn","ɪn","jaŋ","iŋ","u","wa","uɔ","wai̯","uei","uan","wən","waŋ","ueŋ","y","yuɛ","yɛn","yn","yʊŋ"
 "tongyong","ih","a","o","e",,"ai","ei","ao","ou","an","en","ang","eng","ong",,"i","ia",,"ie",,"iao","iou","ian","in","iang","ing","u","ua","uo","uai","uei","uan","un","uang",,"yu","yue","yuan","yun","yong"
 "tongyong_standalone",,"a","o","e","ê","ai","ei","ao","ou","an","en","ang","eng",,"er","yi","ya","yo","ye","yai","yao","you","yan","yin","yang","ying","wu","wa","wo","wai","wei","wan","wun","wang","wong","yu","yue","yuan","yun","yong"
 "wadegiles","ih","a","o","e",,"ai","ei","ao","ou","an","en","ang","eng","ung","erh","i","ia",,"ieh",,"iao","iu","ien","in","iang","ing","u","ua","uo","uai","ui","uan","un","uang",,"ü","üeh","üan","ün","iung"
-"wadegiles_standalone",,,,,,,,,,,,,,,,,"ya","yo","yeh","yai","yao","yu","yan","yin","yang","ying","wu","wa","wo","wai","wei","wan","wen","wang","weng","yü","yüeh","yüan","yün","yung"
+"wadegiles_standalone",,,,,"?",,,,,,,,,,,,"ya","yo","yeh","yai","yao","yu","yan","yin","yang","ying","wu","wa","wo","wai","wei","wan","wen","wang","weng","yü","yüeh","yüan","yün","yung"
 "zhuyin",,"ㄚ","ㄛ","ㄜ","ㄝ","ㄞ","ㄟ","ㄠ","ㄡ","ㄢ","ㄣ","ㄤ","ㄥ","ㄨㄥ","ㄦ","ㄧ","ㄧㄚ","ㄧㄛ","ㄧㄝ","ㄧㄞ","ㄧㄠ","ㄧㄡ","ㄧㄢ","ㄧㄣ","ㄧㄤ","ㄧㄥ","ㄨ","ㄨㄚ","ㄨㄛ","ㄨㄞ","ㄨㄟ","ㄨㄢ","ㄨㄣ","ㄨㄤ","ㄨㄥ","ㄩ","ㄩㄝ","ㄩㄢ","ㄩㄣ","ㄩㄥ"
-"palladin","и","а","о","э",,"ай","эй","ао","оу","ань","энь","ан","эн","ун","эр","и","я","ё","е","яй","яо","ю","янь","инь","ян","ин","у","уа","уо","уай","уй","уaнь","унь","уaн","вэн","юй","юэ","юaнь","юнь","юн"
-"palladin_standalone",,,,,,,,,,,,,,"вэн",,,,,,,,,,,,,,"ва","во","вай","вэй","вaнь","вэнь","вaн",,,,,
+"palladius","и","а","о","э",,"ай","эй","ао","оу","ань","энь","ан","эн","ун","эр","и","я","ё","е","яй","яо","ю","янь","инь","ян","ин","у","уа","уо","уай","уй","уaнь","унь","уaн","вэн","юй","юэ","юaнь","юнь","юн"
+"palladius_standalone",,,,,"?",,,,,,,,,"вэн",,,,,,,,,,,,,,"ва","во","вай","вэй","вaнь","вэнь","вaн",,,,,

data/lib/ting/data/initial.csv

@@ -5,4 +5,4 @@
 "tongyong",,"b","p","m","f","d","t","n","l","g","k","h","j","c","s","jh","ch","sh","r","z","c","s"
 "wadegiles",,"p","p`","m","f","t","t`","n","l","k","k`","h","ch","ch`","hs","ch","ch`","sh","j","ts","ts`","s"
 "zhuyin",,"ㄅ","ㄆ","ㄇ","ㄈ","ㄉ","ㄊ","ㄋ","ㄌ","ㄍ","ㄎ","ㄏ","ㄐ","ㄑ","ㄒ","ㄓ","ㄔ","ㄕ","ㄖ","ㄗ","ㄘ","ㄙ"
-"palladin",,"б","п","м","ф","д","т","н","л","г","к","х","цзи","ци","си","чж","ч","ш","ж","цзы","цы","сы"
+"palladius",,"б","п","м","ф","д","т","н","л","г","к","х","цзи","ци","си","чж","ч","ш","ж","цзы","цы","сы"

data/lib/ting/data/rules.yaml

@@ -23,7 +23,7 @@ wadegiles:
 tongyong: 
   - match: feng
     subst: fong
-palladin:
+palladius:
   - match: (ц|цз|с)ы([^и].{0,2})
     subst: \1\2
   - match: (ц|цз|с)ыи
@@ -33,6 +33,6 @@ palladin:
   - match: (ц|г|х|к|л|н|ж|чж|цз)уо
     subst: \1о
   - match: хуй
-    subst: хой
+    subst: хуэй
   - match: цзюэ
     subst: цзюе

data/lib/ting/version.rb

@@ -1,3 +1,3 @@
 module Ting
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

data/spec/palladius_spec.rb

@@ -0,0 +1,11 @@
+RSpec.describe 'palladius' do
+  let(:converter) { Ting.from(:hanyu, :numbers).to(:palladius, :no_tones) }
+
+  it 'should convert from Hanyu pinyin to Palladius' do
+    expect(converter.call('you3 peng2 zi4 yuan2 fang2 lai2')).to eql 'ю пэн цзы юaнь фан лай'
+  end
+
+  it 'avoids the word for "penis"' do
+    expect(converter.call('hui4')).to eql 'хуэй'
+  end
+end

data/spec/ting_spec.rb

@@ -5,7 +5,7 @@ describe Ting do
   let(:pinyin)   { 'dao4 ke3 dao4 fei1 chang2 dao4'.force_encoding('UTF-8') }
   let(:bopomofo) { 'ㄉㄠˋ ㄎㄜˇ ㄉㄠˋ ㄈㄟ ㄔㄤˊ ㄉㄠˋ'.force_encoding('UTF-8') }
 
-  it 'should convert from Hany Pinyin to Bopomofo' do
+  it 'should convert from Hanyu Pinyin to Bopomofo' do
     expect(Ting.from(:hanyu, :numbers).to(:zhuyin, :marks).convert(pinyin)).to eq(bopomofo)
   end
 
@@ -16,4 +16,9 @@ describe Ting do
   it 'should respect capitalization' do
     expect(Ting.from(:hanyu, :numbers).to(:hanyu, :accents).convert('Bei3 jing1')).to eq('Běi jīng')
   end
+  
+  it 'should parse syllables correctly' do
+    expect(Ting.pretty_tones('wo3 de peng2you3 hen3 zhuang4')).to eq('wǒ de péngyǒu hěn zhuàng')
+    expect(Ting.bpmf('wo3 de peng2you3 hen3 zhuang4')).to eq('ㄨㄛˇ ㄉㄜ˙ ㄆㄥˊ ㄧㄡˇ ㄏㄣˇ ㄓㄨㄤˋ')
+  end
 end

data/ting.gemspec

@@ -13,9 +13,11 @@ Gem::Specification.new do |gem|
   gem.summary = %q{A conversion library for Chinese transcription methods like Hanyu Pinyin, Bopomofo and Wade-Giles.}
 
   gem.require_paths    = %w[ lib ]
+  gem.bindir           = 'bin'
   gem.files            = `git ls-files`.split($/)
   gem.test_files       = `git ls-files -- spec test`.split($/)
   gem.extra_rdoc_files = %w[ README.md History.txt TODO ]
+  gem.executables      << 'ting_table'
 
   gem.add_development_dependency 'rake', '~> 10.1'
   gem.add_development_dependency 'rspec', '~> 2.14'

metadata

@@ -1,61 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: ting
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Arne Brasseur
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: test-unit
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Ting can convert between various phonetic representations of Mandarin Chinese. It can also handle various representation of tones, so it can be used to convert pinyin with numbers to pinyin with tones.
+description: Ting can convert between various phonetic representations of Mandarin
+  Chinese. It can also handle various representation of tones, so it can be used to
+  convert pinyin with numbers to pinyin with tones.
 email:
 - arne@arnebrasseur.net
-executables: []
+executables:
+- ting_table
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -64,6 +67,7 @@ extra_rdoc_files:
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - History.txt
@@ -71,6 +75,7 @@ files:
 - README.md
 - Rakefile
 - TODO
+- bin/ting_table
 - code_of_conduct.md
 - examples/hello.rb
 - lib/ting.rb
@@ -100,6 +105,7 @@ files:
 - lib/ting/version.rb
 - lib/ting/writer.rb
 - spec/jruby_csv_spec.rb
+- spec/palladius_spec.rb
 - spec/spec_helper.rb
 - spec/ting_spec.rb
 - test/test_comparison.rb
@@ -110,7 +116,7 @@ homepage: https://github.com/plexus/ting
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -125,13 +131,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.13
+signing_key: 
 specification_version: 4
-summary: A conversion library for Chinese transcription methods like Hanyu Pinyin, Bopomofo and Wade-Giles.
+summary: A conversion library for Chinese transcription methods like Hanyu Pinyin,
+  Bopomofo and Wade-Giles.
 test_files:
 - spec/jruby_csv_spec.rb
+- spec/palladius_spec.rb
 - spec/spec_helper.rb
 - spec/ting_spec.rb
 - test/test_comparison.rb