ssmd 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 221fb4fbe3144a2331545c9ac3ab79a0dc4933b4
-  data.tar.gz: 508c4b8101fad140db26dc76350e45dc0d324d6d
+  metadata.gz: d1ffe3b65bc7397e1f4138e801428aa8c456c2ed
+  data.tar.gz: 9f8276cc70d5a50606d1a0f009a9c1f11819e739
 SHA512:
-  metadata.gz: 511a816ea8a953420f4a7bb7433fed1618c4c68f872add28efc73c38ff2045718fddedd134c5629682e1071d24085e0e484084368db36a1db2d16339ef534725
-  data.tar.gz: 23d2381df4964f49dfb0bf3f377fd2d0a827b6ebcb580a82be145cdf9034008e7a896d3765cf1dc844bef1599e7988c607aa3b98ec4087bb15bcde125a9bd4a9
+  metadata.gz: a68f17a706a90a8f534030c58ac41c00d12eb1bef1bc1eb7a057fb100b09e8d4a7dae9e3faa0ad4f5097951a5b6fb7d4212c36c96e1e1ae1af4eead95721f1bd
+  data.tar.gz: 9f0e8a1c837c1f2b0602bada363fb01061c24248e7b3faacb71d36c2ac43747aa0e97dd18686211faf7ce939bdcf062a0929f22d4d4017a894f1481ec0a0bad3

data/SPECIFICATION.md

@@ -183,7 +183,7 @@ Volume:
 --extra soft--
 -soft-
 medium
-+loud+ or LOUD
++loud+
 ++extra loud++
 
 Rate:
@@ -202,7 +202,6 @@ medium
 ^high^
 ^^extra high^^
 
-++>>^^extra loud, fast and high^^>>++ or
 [extra loud, fast, and high](vrp: 555) or
 [extra loud, fast, and high](v: 5, r: 5, p: 5)
 ```
@@ -215,7 +214,7 @@ Volume:
 <prosody volume="x-soft">extra soft</prosody>
 <prosody volume="soft">soft</prosody>
 medium
-<prosody volume="loud">loud</prosody> or <prosody volume="loud">loud</prosody>
+<prosody volume="loud">loud</prosody>
 <prosody volume="x-loud">extra loud</prosody>
 
 Rate:
@@ -234,9 +233,8 @@ medium
 <prosody pitch="high">high</prosody>
 <prosody pitch="x-high">extra high</prosody>
 
-<prosody volume="x-loud" rate="x-fast" pitch="x-high">extra loud, fast and high</prosody> or
-<prosody volume="x-loud" rate="x-fast" pitch="x-high">extra loud, fast and high</prosody> or
-<prosody volume="x-loud" rate="x-fast" pitch="x-high">extra loud, fast and high</prosody>
+<prosody volume="x-loud" rate="x-fast" pitch="x-high">extra loud, fast, and high</prosody> or
+<prosody volume="x-loud" rate="x-fast" pitch="x-high">extra loud, fast, and high</prosody>
 ```
 
 The shortcuts are listed first. While they can be combined, sometimes it's easier and shorter to just use

data/lib/ssmd/annotations.rb

@@ -5,3 +5,4 @@ end
 require 'ssmd/annotations/annotation'
 require 'ssmd/annotations/language_annotation'
 require 'ssmd/annotations/phoneme_annotation'
+require 'ssmd/annotations/prosody_annotation'

data/lib/ssmd/annotations/prosody_annotation.rb

@@ -0,0 +1,97 @@
+require_relative 'annotation'
+
+module SSMD::Annotations
+  class ProsodyAnnotation < Annotation
+    class << self
+      def regex
+        /(?:vrp: ?(\d{3}))|(?:([vrp]): ?(\d))/
+      end
+
+      def volumes
+        {
+          0 => "silent",
+          1 => "x-soft",
+          2 => "soft",
+          3 => "medium",
+          4 => "loud",
+          5 => "x-loud"
+        }
+      end
+
+      def rates
+        {
+          1 => "x-slow",
+          2 => "slow",
+          3 => "medium",
+          4 => "fast",
+          5 => "x-fast"
+        }
+      end
+
+      def pitches
+        {
+          1 => "x-low",
+          2 => "low",
+          3 => "medium",
+          4 => "high",
+          5 => "x-high"
+        }
+      end
+    end
+
+    attr_reader :volume, :rate, :pitch
+
+    def initialize(vrp, *tuples)
+      begin
+        if vrp && vrp.size == 3
+          set_vrp! vrp
+        elsif tuples.compact.size % 2 == 0
+          set_tuples! tuples.take(6)
+        else
+          # ignore invalid values
+        end
+      rescue ArgumentError
+        # ignore if there are invalid values
+      end
+    end
+
+    def wrap(text)
+      attributes = [
+        ("volume=\"#{volume}\"" if volume),
+        ("rate=\"#{rate}\"" if rate),
+        ("pitch=\"#{pitch}\"" if pitch)
+      ]
+
+      "<prosody #{attributes.join(' ')}>#{text}</prosody>"
+    end
+
+    def combine(annotation)
+      @volume ||= annotation.volume
+      @rate ||= annotation.rate
+      @pitch ||= annotation.pitch
+
+      self
+    end
+
+    private
+
+    def set_vrp!(vrp)
+      @volume = self.class.volumes.fetch Integer(vrp[0])
+      @rate = self.class.rates.fetch Integer(vrp[1])
+      @pitch = self.class.pitches.fetch Integer(vrp[2])
+    end
+
+    def set_tuples!(tuples)
+      tuples.each_slice(2).each do |key, value|
+        case key
+        when 'v'
+          @volume = self.class.volumes.fetch Integer(value)
+        when 'r'
+          @rate = self.class.rates.fetch Integer(value)
+        when 'p'
+          @pitch = self.class.pitches.fetch Integer(value)
+        end
+      end
+    end
+  end
+end

data/lib/ssmd/converter.rb

@@ -26,7 +26,8 @@ module SSMD
       p = SSMD::Processors
 
       [
-        p::EmphasisProcessor, p::AnnotationProcessor, p::MarkProcessor
+        p::EmphasisProcessor, p::AnnotationProcessor, p::MarkProcessor,
+        p::ProsodyProcessor
       ]
     end
 

data/lib/ssmd/processors.rb

@@ -5,4 +5,5 @@ end
 require 'ssmd/processors/processor'
 require 'ssmd/processors/annotation_processor'
 require 'ssmd/processors/emphasis_processor'
-require 'ssmd/processors/mark_processor'
+require 'ssmd/processors/mark_processor'
+require 'ssmd/processors/prosody_processor'

data/lib/ssmd/processors/annotation_processor.rb

@@ -21,7 +21,7 @@ module SSMD::Processors
     def self.annotations
       a = SSMD::Annotations
 
-      [a::LanguageAnnotation, a::PhonemeAnnotation]
+      [a::LanguageAnnotation, a::PhonemeAnnotation, a::ProsodyAnnotation]
     end
 
     def ok?
@@ -39,7 +39,7 @@ module SSMD::Processors
         annotation = find_annotation annotation_text
 
         if annotation.nil?
-          @warnings.push "Unknown annotation: #{text}"
+          warnings.push "Unknown annotation: #{text}"
         end
 
         [annotation].compact
@@ -72,7 +72,7 @@ module SSMD::Processors
         \(                              # opening annotations
           ((?:
             (?:
-              #{annotations_regex}
+              #{annotations_regex}      # annotations
             )(?:,\s?)?
           )+)
         \)                              # closing annotations
@@ -82,5 +82,9 @@ module SSMD::Processors
     def annotations_regex
       self.class.annotations.map(&:regex).join("|")
     end
+
+    def warnings
+      @warnings ||= []
+    end
   end
 end

data/lib/ssmd/processors/prosody_processor.rb

@@ -0,0 +1,102 @@
+require_relative 'processor'
+
+module SSMD::Processors
+  class ProsodyProcessor < Processor
+    def result
+      with_volume || with_rate || with_pitch
+    end
+
+    def regex
+      Regex.prosody
+    end
+
+    private
+
+    def with_volume
+      name, text = volume_keys.map { |k| [k, match[k]] }.find { |k, v| !v.nil? }
+
+      "<prosody volume=\"#{name}\">#{text}</prosody>" if name && text
+    end
+
+    def with_rate
+      name, text = rate_keys.map { |k| [k, match[k]] }.find { |k, v| !v.nil? }
+
+      "<prosody rate=\"#{name}\">#{text}</prosody>" if name && text
+    end
+
+    def with_pitch
+      name, text = pitch_keys.map { |k| [k, match[k]] }.find { |k, v| !v.nil? }
+
+      "<prosody pitch=\"#{name}\">#{text}</prosody>" if name && text
+    end
+
+    def volume_keys
+      ['silent', 'x-soft', 'soft', 'loud', 'x-loud']
+    end
+
+    def rate_keys
+      ['x-slow', 'slow', 'fast', 'x-fast']
+    end
+
+    def pitch_keys
+      ['x-low', 'low', 'high', 'x-high']
+    end
+
+    module Regex
+      module_function
+
+      def prosody
+        %r{
+          (?:#{slow_rate}) |
+          (?:#{fast_rate}) |
+          (?:#{silent_volume}) |
+          (?:#{soft_volume}) |
+          (?:#{loud_volume}) |
+          (?:#{low_pitch}) |
+          (?:#{high_pitch})
+        }x
+      end
+
+      def silent_volume
+        /~#{content('silent')}~/
+      end
+
+      def soft_volume
+        /(?:#{ws_start}--#{content('x-soft')}--#{ws_end})|(?:#{ws_start}-#{content('soft')}-#{ws_end})/
+      end
+
+      def loud_volume
+        /(?:#{ws_start}\+\+#{content('x-loud')}\+\+#{ws_end})|(?:#{ws_start}\+#{content('loud')}\+#{ws_end})/
+      end
+
+      def slow_rate
+        /(?:#{ws_start}&lt;&lt;#{content('x-slow')}&lt;&lt;#{ws_end})|(?:#{ws_start}&lt;#{content('slow')}&lt;#{ws_end})/
+      end
+
+      def fast_rate
+        /(?:#{ws_start}&gt;&gt;#{content('x-fast')}&gt;&gt;#{ws_end})|(?:#{ws_start}&gt;#{content('fast')}&gt;#{ws_end})/
+      end
+
+      def low_pitch
+        /(?:#{ws_start}__#{content('x-low')}__#{ws_end})|(?:#{ws_start}_#{content('low')}_#{ws_end})/
+      end
+
+      def high_pitch
+        /(?:#{ws_start}\^\^#{content('x-high')}\^\^#{ws_end})|(?:#{ws_start}\^#{content('high')}\^#{ws_end})/
+      end
+
+      def content(name = nil)
+        id = name ? "?<#{name}>" : ""
+        /(#{id}(?:[^\s])|(?:[^\s].*[^\s]))/
+      end
+
+      def ws_start
+        /(?<=(\A)|(?:\s))/
+      end
+
+      def ws_end
+        /(?=(\Z)|(?:\s))/
+      end
+    end
+  end
+end

data/lib/ssmd/version.rb

@@ -1,3 +1,3 @@
 module SSMD
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssmd
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Markus Kahl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-14 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,6 +109,7 @@ files:
 - lib/ssmd/annotations/annotation.rb
 - lib/ssmd/annotations/language_annotation.rb
 - lib/ssmd/annotations/phoneme_annotation.rb
+- lib/ssmd/annotations/prosody_annotation.rb
 - lib/ssmd/annotations/xsampa_to_ipa_table.txt
 - lib/ssmd/converter.rb
 - lib/ssmd/processors.rb
@@ -116,6 +117,7 @@ files:
 - lib/ssmd/processors/emphasis_processor.rb
 - lib/ssmd/processors/mark_processor.rb
 - lib/ssmd/processors/processor.rb
+- lib/ssmd/processors/prosody_processor.rb
 - lib/ssmd/version.rb
 - ssmd.gemspec
 homepage: https://github.com/machisuji/ssmd