jkf 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80b961d103b0c7155b4ac36d77e9d3ddb40a03a3
-  data.tar.gz: b22def70291acf60b94fa289614fd8b254c6ac8f
+  metadata.gz: 62e414ef9443049f0ab631af44d70072f7c7e55e
+  data.tar.gz: 2ead76a04ded9f63ed4b0ddf13dfa107d65f2072
 SHA512:
-  metadata.gz: 2f7e92e39cf7caa4de99366b4645de4a42a57d664eb8b10e832d1fa651a03d07d053c3f3f5eb4685a4cde3bc38f65b7c5166b8c0f65acb0d5aee33c5240d0264
-  data.tar.gz: dca0b0cbe829920b2ef816e138592965f4b62e7ca00115de5509558853987b56150f3a11b8af6a3fb7443cfeb8102e87a0710a1bcd4cd8de5ad613ae5e826c53
+  metadata.gz: 2c5e351ed8a6479d9e2b620cba5cdf96da8f82adf818c1243c6a7150cc5178dad6853e108ed97379f351215e758a159f8f860e15b134df80d74494f700177367
+  data.tar.gz: 98ce473672fd1a672b7a1fc35f627508920632ddf7d706f398e8a4f7a03123b731c1e0baf2c6d6fe2f36408ae9b75a30d56d3ed64a4fceb5faa12474101e7832

data/lib/jkf/parser/kif.rb

@@ -883,6 +883,7 @@ module Jkf::Parser
             s4 = match_str("/")
             if s4 != :failed
               s5 = parse_hms
+              s5 = parse_ms(with_hour: true) if s5 == :failed
               if s5 != :failed
                 s6 = match_str(")")
                 if s6 != :failed
@@ -980,7 +981,7 @@ module Jkf::Parser
       s0
     end
 
-    def parse_ms
+    def parse_ms(with_hour: false)
       s0 = @current_pos
       s1 = []
       s2 = match_regexp(/^[0-9]/)
@@ -1007,7 +1008,15 @@ module Jkf::Parser
           end
           if s3 != :failed
             @reported_pos = s0
-            s0 = s1 = { "m" => s1.join.to_i, "s" => s3.join.to_i }
+            m = s1.join.to_i
+            s = s3.join.to_i
+            if with_hour
+              h = m / 60
+              m = m % 60
+              s0 = s1 = { "h" => h, "m" => m, "s" => s }
+            else
+              s0 = s1 = { "m" => m, "s" => s }
+            end
           else
             @current_pos = s0
             s0 = :failed

data/lib/jkf/version.rb

@@ -1,3 +1,3 @@
 module Jkf
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jkf
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - iyuuya