ssmd 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecf3d2d52ae18bc5e1c7c996801388fa512866e3495ba546d6258124834c758d
-  data.tar.gz: 951665f3407e4af8b3bf7fd8d6a595fe5c0be4f157ddf7aabf8ce7a0f23d1b0f
+  metadata.gz: 8f97931187a7312f6201c4ce78a63fe5ec3080ee7f4b2f6e24cce97616acc4c9
+  data.tar.gz: 4ee02c2d7331421f9572a65166fba8f5378e61b19b0b9ad6b3227f6d9e7dbbb1
 SHA512:
-  metadata.gz: e95c06cdafd4d7f1db0b9ef48178113f16fc965230532e8881dbb156e8610595bd934dcc44688bb9cbf9c7681f24d2793e758563147efc9b90cf56b05628f647
-  data.tar.gz: 94066e29be12d5a3878de87a8718e7922eeda54865b46cd915eedd8d9891e5c4f3f23e34cdfc5a0aaa6065882245881d2bd39051cf864f81d6accb554b1cd85d
+  metadata.gz: 8954f80d12937fa5de3714c286de4456b3757b35d2fc5995c55df99a5af166e4b9ac3a74dcf13e3df387e0d04528f21aed33c581562747e10265c6f6e7a8e29b
+  data.tar.gz: 16f0810ebe1eee55da7484c5f0d6a0c6c92576d967d4d04cefd29264bab4ece6db31780297ff6d86e55228f2ae5ab99f3eac3b5f9f518dafcca27a47c21f43d9

data/.gitignore

@@ -1,4 +1,5 @@
 /.bundle/
+/.idea/
 /.yardoc
 /Gemfile.lock
 /_yardoc/

data/lib/ssmd/processors/annotation_processor.rb

@@ -6,6 +6,16 @@ module SSMD::Processors
   class AnnotationProcessor < Processor
     attr_reader :annotations
 
+    def self.annotations
+      a = SSMD::Annotations
+
+      [
+        a::LanguageAnnotation, a::PhonemeAnnotation, a::ProsodyAnnotation,
+        a::SubstitutionAnnotation
+      ]
+        .freeze
+    end
+
     def initialize(options = {})
       super
 
@@ -28,16 +38,6 @@ module SSMD::Processors
       end
     end
 
-    def self.annotations
-      a = SSMD::Annotations
-
-      [
-        a::LanguageAnnotation, a::PhonemeAnnotation, a::ProsodyAnnotation,
-        a::SubstitutionAnnotation
-      ]
-        .freeze
-    end
-
     def ok?
       !@text.nil? && Array(@annotations).size > 0
     end

data/lib/ssmd/processors/break_processor.rb

@@ -1,7 +1,10 @@
 require_relative 'processor'
+require_relative 'concerns/no_content'
 
 module SSMD::Processors
   class BreakProcessor < Processor
+    prepend NoContent
+
     def result
       name, value = attribute
 
@@ -13,7 +16,7 @@ module SSMD::Processors
     end
 
     def regex
-      /(?<=\s)\.\.\.(?:(?<comma>c)|(?<sentence>s)|(?<paragraph>p)|(?<s>\d+s)|(?<ms>\d+ms)|(?<num>\d+))?(?=\s)/
+      /(?<=\s|\A)\.\.\.(?:(?<comma>c)|(?<sentence>s)|(?<paragraph>p)|(?<s>\d+s)|(?<ms>\d+ms)|(?<num>\d+))?(?=\s|\z)/
     end
 
     def attribute
@@ -35,18 +38,5 @@ module SSMD::Processors
         ["strength", "x-strong"]
       end
     end
-
-    private
-
-    def join_parts(prefix, text, suffix)
-      leading_ws = /\A\s/
-      trailing_ws = /\s\z/
-
-      if prefix =~ trailing_ws && suffix =~ leading_ws && text == ""
-        prefix.sub(trailing_ws, "") + suffix
-      else
-        super
-      end
-    end
   end
 end

data/lib/ssmd/processors/concerns/no_content.rb

@@ -0,0 +1,27 @@
+##
+# This is for annotations which do not have any content, i.e. no enclosed
+# text or other annotations. This is mostly relevant for stripping where
+# this means that simply removing the annotation would leave an extra space.
+#
+# Prepending this module to processors for these kinds of annotations
+# prevents that.
+module NoContent
+  def join_parts(prefix, text, suffix)
+    leading_ws = /\A\s/
+    trailing_ws = /\s\z/
+
+    if text == ""
+      if prefix =~ trailing_ws && suffix =~ leading_ws
+        prefix.sub(trailing_ws, "") + suffix
+      elsif prefix == ""
+        suffix.sub(leading_ws, "")
+      elsif suffix == ""
+        prefix.sub(trailing_ws, "")
+      else
+        super
+      end
+    else
+      super
+    end
+  end
+end

data/lib/ssmd/processors/mark_processor.rb

@@ -1,9 +1,18 @@
 require_relative 'processor'
+require_relative 'concerns/no_content'
 
 module SSMD::Processors
   class MarkProcessor < Processor
+    prepend NoContent
+
     def result
-      "<mark name=\"#{text}\"/>"
+      name = match.captures.first
+
+      "<mark name=\"#{name}\"/>"
+    end
+
+    def text
+      ""
     end
 
     def regex

data/lib/ssmd/version.rb

@@ -1,3 +1,3 @@
 module SSMD
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssmd
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Markus Kahl
@@ -116,6 +116,7 @@ files:
 - lib/ssmd/processors.rb
 - lib/ssmd/processors/annotation_processor.rb
 - lib/ssmd/processors/break_processor.rb
+- lib/ssmd/processors/concerns/no_content.rb
 - lib/ssmd/processors/emphasis_processor.rb
 - lib/ssmd/processors/mark_processor.rb
 - lib/ssmd/processors/paragraph_processor.rb