kita 0.5.3 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4490982ee2a55cd63614c60c73a8046bfd0b2d25fc8b14178941679de9b13cd2
-  data.tar.gz: 375a7ddd27b6d00757efc0ad32814a1b7f1f6d04fd3c0e6849cb377d59b01d03
+  metadata.gz: e2587cd0c8afbec961b0a3323a1c6b136390ffba4de0950f97e749b613d090c2
+  data.tar.gz: 36590ce876e19db05a03d88bc508e8bcfbc6245a941d0a4c52acb956d67c4afc
 SHA512:
-  metadata.gz: 4628f8eb832ff482c311e96334f48c4dea97f29e16b032ef60ac59a5f27247c42e17aef1853d6ed30a7658b1a0fa4a377249bac49e22c5645ff702112b721bfe
-  data.tar.gz: 45b2216ff06714670eba51f67894e62632c13acdc88a4c12999e3399babe85b2ce4b66c04ae1962ba3f66839bf20ef3bd8fff7cca80137f74141012d48b2d289
+  metadata.gz: 397e143007adfe07eb99dc4ec01f6f7be68b37179dda85fd2a24f7b398be680d868c6540996d0c5c5fb5907873a2abba7167c0ef499ce3b57bd9a74de8da7c2e
+  data.tar.gz: bf44b7edcfd2e6f55bf6c189f110150f7176ebf0ffa61d15f43e83cfc5d8b78f36ad0d0ba0ecd28854c0ddd358f7188f231b08e5a9e0cf850f7e07c9d9a04000

data/.gitignore

@@ -8,6 +8,7 @@ vendor
 /coverage/
 /doc/
 /pkg/
+/prime/
 /spec/reports/
 /tmp/
 

data/CHANGELOG.md

@@ -9,6 +9,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+## 2020-06-02
+### Added
+- Kita randomly selects between two different recordings for each kana
+
+## 2020-05-27
+### Changed
+- Selecting an incorrect answer for a Katakana question, shows the correct Katakana, rather than
+just repeating the Hiragana
+
+## 2020-05-25
+### Changed
+- Improved sounds, neither へ nor は are pronounced in their particle form (e and wa).
+
 ## 2020-05-24
 ### Added
 - First release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kita (0.5.2)
+    kita (0.5.7)
       config (~> 2.2)
       gir_ffi (~> 0.15.2)
       gstreamer (~> 3.4)

data/bin/kita

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-application_root_path = File.expand_path(__dir__)
-require File.join(application_root_path, '../lib/kita.rb')
+RootPath = File.expand_path('../', __dir__)
+require File.join(RootPath, '/lib/kita.rb')
 
 app = Kita::Application.new
 

data/kita.gemspec

@@ -10,9 +10,13 @@ Gem::Specification.new do |spec|
   spec.license       = 'GPLv3+'
 
   spec.summary       = 'A Japanese kana learning tool.'
-  spec.description   = 'A simple tool to help Japanese language learners with hiragana and katakana.'
+  spec.description   = <<-DESC
+    A simple GTK3 app to help Japanese language learners with Hiragana and Katakana. It introduces
+    users to the sounds of the kana and teaches basic recognition of both writing systems.
+  DESC
+
   spec.homepage      = 'https://www.danbishop.org'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/danbishop/kita'

data/lib/kita.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 require 'gtk3'
 require_relative 'kita/audio'
 require_relative 'kita/config'
-require_relative 'kita/hiragana'
-require_relative 'kita/katakana'
+require_relative 'kita/question'
 require_relative 'kita/version'
 
 module Kita
@@ -11,20 +11,15 @@ module Kita
   class Application < Gtk::Application
     def initialize
       super 'uk.danbishop.kita', :handles_open
-      builder_file = "#{File.expand_path(File.dirname(__dir__))}/ui/builder.ui"
       # Construct a Gtk::Builder instance and load our UI description
-      @builder = Gtk::Builder.new(file: builder_file)
-      # Initiate Hiragana class
-      @hiragana = Hiragana.new
-      # Initiate Katakana class
-      @katakana = Katakana.new
-      @types = [@hiragana]
+      @builder = Gtk::Builder.new(file: "#{File.expand_path(File.dirname(__dir__))}/ui/builder.ui")
+      @builder.connect_signals { |handler| method(handler) }
+      # Initiate Question class
+      @question = Question.new
       @button_signals = {}
       @sound = Audio.new
       new_question
       menu_setup
-      setup_new_question_button
-      setup_repeat_button
       build_main_window
     end
 
@@ -36,64 +31,44 @@ module Kita
     end
 
     def setup_about_box
-      about_box = @builder.get_object('about_box')
+      about_box = @builder['about_box']
       about_box.version = VERSION
-      about_button = @builder.get_object('menu_about')
-      about_button.signal_connect('clicked') do
+      @builder['menu_about'].signal_connect('clicked') do
         about_box.run
         about_box.hide
       end
     end
 
-    def setup_new_question_button
-      new_question_button = @builder.get_object('new_question')
-      new_question_button.signal_connect('clicked') do
-        new_question
-      end
-    end
-
-    def setup_repeat_button
-      new_question_button = @builder.get_object('speak')
-      new_question_button.signal_connect('clicked') do
-        @sound.repeat
-      end
+    def repeat_button_click
+      @sound.repeat
     end
 
     def setup_hiragana_switch
-      @hiragana_switch = @builder.get_object('hiragana_switch')
-      @hiragana_switch.signal_connect('notify::active') do
+      @builder['hiragana_switch'].signal_connect('notify::active') do
         toggle_hiragana
       end
     end
 
     def setup_katakana_switch
-      @katakana_switch = @builder.get_object('katakana_switch')
-      @katakana_switch.signal_connect('notify::active') do
+      @builder['katakana_switch'].signal_connect('notify::active') do
         toggle_katakana
       end
     end
 
     def setup_sound_switch
-      @sound_switch = @builder.get_object('sound_switch')
-      @sound_switch.signal_connect('notify::active') do
+      @builder['sound_switch'].signal_connect('notify::active') do
         toggle_sound
       end
     end
 
     def toggle_katakana
-      # TODO: Switch this to using Settings
-      @types = []
-      @types << @hiragana if @hiragana_switch.active?
-      @types << @katakana if @katakana_switch.active?
-      (@hiragana_switch.set_active(true) && @types = [@hiragana]) if @types.empty?
+      Settings.katakana = !Settings.katakana
+      (@builder['hiragana_switch'].set_active(true) && Settings.hiragana = true) if !Settings.katakana && !Settings.hiragana
     end
 
     def toggle_hiragana
-      # TODO: Switch this to using Settings
-      @types = []
-      @types << @hiragana if @hiragana_switch.active?
-      @types << @katakana if @katakana_switch.active?
-      (@katakana_switch.set_active(true) && @types = [@katakana]) if @types.empty?
+      Settings.hiragana = !Settings.hiragana
+      (@builder['katakana_switch'].set_active(true) && Settings.katakana = true) if !Settings.katakana && !Settings.hiragana
     end
 
     def toggle_sound
@@ -103,7 +78,7 @@ module Kita
     def build_main_window
       signal_connect :activate do
         # Connect signal handlers to the constructed widgets
-        window = @builder.get_object('window')
+        window = @builder['window']
         window.signal_connect('destroy') { Gtk.main_quit }
         window.present
       end
@@ -111,20 +86,18 @@ module Kita
 
     def new_question
       reset_buttons
-      question = @types.sample.question
-      question_label = @builder.get_object('question')
-      question_label.set_markup("<span font='72'>#{question[:question]}</span>")
+      question = @question.new_question
+      @builder['question'].set_markup("<span font='72'>#{question[:question]}</span>")
       buttons = %w[a b c d]
       correct_button(buttons, question)
       wrong_buttons(buttons, question)
-      puts "Playing: #{question[:question].hiragana}"
-      @sound.play(question[:question].hiragana) if Settings.speak
+      @sound.play("#{question[:question].hiragana}#{[1, 2].sample}") if Settings.speak
     end
 
     def correct_button(buttons, question)
       # Choose random letter and remove it from array
       correct = buttons.delete(buttons.sample)
-      correct_button = @builder.get_object("answer_#{correct}")
+      correct_button = @builder["answer_#{correct}"]
       correct_button.set_label(question[:answer])
       correct_signal = correct_button.signal_connect('clicked') do
         new_question
@@ -144,14 +117,17 @@ module Kita
     def wrong_button_click(button)
       button.set_sensitive(false)
       label = button.child
-      label.set_markup("<span color='#d40000'>#{button.label} #{button.label.hiragana}</span>")
+      correction = @question.type == 'hiragana' ? button.label.hiragana : button.label.katakana
+      label.set_markup(
+        "<span color='#d40000'>#{button.label} #{correction}</span>"
+      )
     end
 
     def reset_buttons
       return nil if @button_signals.empty?
 
       @button_signals.each do |letter, signal|
-        button = @builder.get_object("answer_#{letter}")
+        button = @builder["answer_#{letter}"]
         button.signal_handler_disconnect(signal)
         button.set_sensitive(true)
       end

data/lib/kita/audio.rb

@@ -22,7 +22,7 @@ class Audio
 
   def play(uri)
     @playbin.stop
-    @playbin.uri = Gst.filename_to_uri("#{@application_root_path}/sounds/#{uri}.ogg")
+    @playbin.uri = Gst.filename_to_uri("#{RootPath}/sounds/#{uri}.ogg")
     @playbin.play
   end
 

data/lib/kita/hiragana.rb

@@ -48,6 +48,7 @@ class Hiragana
   def build_question(chars)
     {
       question: chars[0],
+      type: 'hiragana',
       answer: chars[0].romaji,
       choices: [
         chars[1].romaji,

data/lib/kita/katakana.rb

@@ -48,6 +48,7 @@ class Katakana
   def build_question(chars)
     {
       question: chars[0],
+      type: 'katakana',
       answer: chars[0].hiragana,
       choices: [
         chars[1].hiragana,

data/lib/kita/question.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_relative 'hiragana'
+require_relative 'katakana'
+
+# Question Class
+class Question
+  attr_accessor :type
+
+  def initialize
+    @hiragana = Hiragana.new
+    @katakana = Katakana.new
+  end
+
+  def new_question
+    question_types = []
+    question_types.push @hiragana if Settings.hiragana
+    question_types.push @katakana if Settings.katakana
+    question = question_types.sample.question
+    @type = question[:type]
+    question
+  end
+end

data/lib/kita/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kita
-  VERSION = '0.5.3'
+  VERSION = '0.5.8'
 end

data/snap/gui/kita.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Kita
+GenericName=Kita
+X-GNOME-FullName=Kita
+Comment=Learn the Japanese kana
+Keywords=Japanese;kana;hiragana;katakana;learn;
+Exec=kita
+Terminal=false
+Type=Application
+Icon=${SNAP}/meta/gui/kita.svg

data/snap/gui/kita.svg

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="50mm"
+   height="50mm"
+   viewBox="0 0 50 50"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="kita.svg">
+  <defs
+     id="defs2">
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter987"
+       inkscape:label="filter0" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Noise Fill"
+       id="filter1667">
+      <feTurbulence
+         type="fractalNoise"
+         baseFrequency="0.02 0.04"
+         numOctaves="5"
+         seed="1"
+         result="turbulence"
+         id="feTurbulence1651" />
+      <feComposite
+         in="SourceGraphic"
+         in2="turbulence"
+         operator="in"
+         result="composite1"
+         id="feComposite1653" />
+      <feColorMatrix
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 3 -1 "
+         result="color"
+         id="feColorMatrix1655" />
+      <feFlood
+         flood-opacity="1"
+         flood-color="rgb(21,40,57)"
+         result="flood"
+         id="feFlood1657" />
+      <feMerge
+         result="merge"
+         id="feMerge1663">
+        <feMergeNode
+           in="flood"
+           id="feMergeNode1659" />
+        <feMergeNode
+           in="color"
+           id="feMergeNode1661" />
+      </feMerge>
+      <feComposite
+         in2="SourceGraphic"
+         operator="in"
+         result="composite2"
+         id="feComposite1665" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="337.63766"
+     inkscape:cy="-256.1795"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="3368"
+     inkscape:window-height="1376"
+     inkscape:window-x="72"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:pagecheckerboard="true" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-25.905403,-105.02035)">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:1.25;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       x="46.869045"
+       y="115.57143"
+       id="text817"><tspan
+         sodipodi:role="line"
+         id="tspan815"
+         x="46.869045"
+         y="125.4403"
+         style="stroke-width:0.26458332" /></text>
+    <circle
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke"
+       id="path3017"
+       cx="50.905403"
+       cy="130.02036"
+       r="25" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38.4786377px;line-height:1.25;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#d40000;fill-opacity:1;stroke:none;stroke-width:0.96196598"
+       x="31.512171"
+       y="144.46909"
+       id="text2913"><tspan
+         sodipodi:role="line"
+         id="tspan2911"
+         x="31.512171"
+         y="144.46909"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Ubuntu;-inkscape-font-specification:'Ubuntu Bold';fill:#d40000;stroke-width:0.96196598">北</tspan></text>
+  </g>
+</svg>

data/snap/snapcraft.yaml

@@ -1,10 +1,10 @@
 name: kita
-version: '0.5.3'
+version: '0.5.7'
 summary: Japanese learning tool
 description: |
   A simple tool to help Japanese language learners.
 
-confinement: devmode
+confinement: strict
 base: core18
 grade: stable
 license: GPL-3.0+
@@ -15,30 +15,25 @@ parts:
     plugin: ruby
     gems:
       - kita
-    ruby-version: 2.7.0
+    ruby-version: 2.7.1
     stage-packages:
-      - gobject-introspection
-      - gir1.2-atk-1.0
-      - gir1.2-atspi-2.0
-      - gir1.2-freedesktop
-      - gir1.2-gdkpixbuf-2.0
-      - gir1.2-glib-2.0
-      - gir1.2-gtk-3.0
-      - gir1.2-pango-1.0
-      - libcanberra-gtk3-0
       - libgstreamer1.0-0
-      - libglib2.0-0
+      - gstreamer1.0-plugins-base
       - libgirepository-1.0-1
       - gir1.2-gstreamer-1.0
-      - gstreamer1.0-plugins-base
 
 apps:
   kita:
     command: bin/kita
     extensions: [gnome-3-28]
     plugs:
-      - desktop
-      - wayland
       - audio-playback
-      # - pulseaudio
+    slots:
+      - dbus-daemon
     common-id: uk.danbishop.kita
+
+slots:
+  dbus-daemon:
+    interface: dbus
+    bus: session
+    name: uk.danbishop.kita

data/ui/builder.ui

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2
+<!-- Generated with glade 3.22.2 
 
 Copyright (C)
 
@@ -30,7 +30,6 @@ Author: Dan Bishop
     <property name="can_focus">False</property>
     <property name="type_hint">dialog</property>
     <property name="program_name">Kita</property>
-    <property name="version"></property>
     <property name="copyright" translatable="yes">© 2020 Dan Bishop</property>
     <property name="comments" translatable="yes">A simple tool to help Japanese language learners.</property>
     <property name="website">danbishop.uk</property>
@@ -245,6 +244,7 @@ Author: Dan Bishop
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="always_show_image">True</property>
+            <signal name="clicked" handler="new_question" swapped="no"/>
           </object>
         </child>
         <child>
@@ -252,6 +252,7 @@ Author: Dan Bishop
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
+            <signal name="clicked" handler="repeat_button_click" swapped="no"/>
             <child>
               <object class="GtkImage">
                 <property name="visible">True</property>
@@ -312,60 +313,60 @@ Author: Dan Bishop
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkButton" id="answer_a">
-                <property name="label">a</property>
+              <object class="GtkButton" id="answer_d">
+                <property name="label">d</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <property name="hexpand">True</property>
-                <accelerator key="a" signal="clicked"/>
-                <accelerator key="KP_1" signal="clicked"/>
-                <accelerator key="1" signal="clicked"/>
+                <accelerator key="4" signal="clicked"/>
+                <accelerator key="KP_4" signal="clicked"/>
+                <accelerator key="f" signal="clicked"/>
               </object>
               <packing>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="answer_b">
-                <property name="label">b</property>
+              <object class="GtkButton" id="answer_c">
+                <property name="label">c</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <property name="hexpand">True</property>
-                <accelerator key="s" signal="clicked"/>
-                <accelerator key="KP_2" signal="clicked"/>
-                <accelerator key="2" signal="clicked"/>
+                <accelerator key="3" signal="clicked"/>
+                <accelerator key="KP_3" signal="clicked"/>
+                <accelerator key="d" signal="clicked"/>
               </object>
               <packing>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="answer_c">
-                <property name="label">c</property>
+              <object class="GtkButton" id="answer_b">
+                <property name="label">b</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <property name="hexpand">True</property>
-                <accelerator key="d" signal="clicked"/>
-                <accelerator key="KP_3" signal="clicked"/>
-                <accelerator key="3" signal="clicked"/>
+                <accelerator key="2" signal="clicked"/>
+                <accelerator key="KP_2" signal="clicked"/>
+                <accelerator key="s" signal="clicked"/>
               </object>
               <packing>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="answer_d">
-                <property name="label">d</property>
+              <object class="GtkButton" id="answer_a">
+                <property name="label">a</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <property name="hexpand">True</property>
-                <accelerator key="f" signal="clicked"/>
-                <accelerator key="KP_4" signal="clicked"/>
-                <accelerator key="4" signal="clicked"/>
+                <accelerator key="1" signal="clicked"/>
+                <accelerator key="KP_1" signal="clicked"/>
+                <accelerator key="a" signal="clicked"/>
               </object>
               <packing>
                 <property name="position">0</property>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kita
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.8
 platform: ruby
 authors:
 - Dan Bishop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-24 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: config
@@ -94,7 +94,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-description: A simple tool to help Japanese language learners with hiragana and katakana.
+description: |2
+      A simple GTK3 app to help Japanese language learners with Hiragana and Katakana. It introduces
+      users to the sounds of the kana and teaches basic recognition of both writing systems.
 email:
 - d@nbishop.uk
 executables:
@@ -118,153 +120,153 @@ files:
 - lib/kita/config.rb
 - lib/kita/hiragana.rb
 - lib/kita/katakana.rb
+- lib/kita/question.rb
 - lib/kita/version.rb
+- snap/gui/kita.desktop
+- snap/gui/kita.svg
 - snap/snapcraft.yaml
-- sounds/he.ogg
-- sounds/he2.ogg
-- sounds/tofix.txt
-- sounds/あ.ogg
+- sounds/あ1.ogg
 - sounds/あ2.ogg
-- sounds/い.ogg
+- sounds/い1.ogg
 - sounds/い2.ogg
-- sounds/う.ogg
+- sounds/う1.ogg
 - sounds/う2.ogg
-- sounds/え.ogg
+- sounds/え1.ogg
 - sounds/え2.ogg
-- sounds/お.ogg
+- sounds/お1.ogg
 - sounds/お2.ogg
-- sounds/か.ogg
+- sounds/か1.ogg
 - sounds/か2.ogg
-- sounds/が.ogg
+- sounds/が1.ogg
 - sounds/が2.ogg
-- sounds/き.ogg
+- sounds/き1.ogg
 - sounds/き2.ogg
-- sounds/ぎ.ogg
+- sounds/ぎ1.ogg
 - sounds/ぎ2.ogg
-- sounds/く.ogg
+- sounds/く1.ogg
 - sounds/く2.ogg
-- sounds/ぐ.ogg
+- sounds/ぐ1.ogg
 - sounds/ぐ2.ogg
-- sounds/け.ogg
+- sounds/け1.ogg
 - sounds/け2.ogg
-- sounds/げ.ogg
+- sounds/げ1.ogg
 - sounds/げ2.ogg
-- sounds/こ.ogg
+- sounds/こ1.ogg
 - sounds/こ2.ogg
 - sounds/これは北です.ogg
-- sounds/ご.ogg
+- sounds/ご1.ogg
 - sounds/ご2.ogg
-- sounds/さ.ogg
+- sounds/さ1.ogg
 - sounds/さ2.ogg
-- sounds/ざ.ogg
+- sounds/ざ1.ogg
 - sounds/ざ2.ogg
-- sounds/し.ogg
+- sounds/し1.ogg
 - sounds/し2.ogg
-- sounds/じ.ogg
+- sounds/じ1.ogg
 - sounds/じ2.ogg
-- sounds/す.ogg
+- sounds/す1.ogg
 - sounds/す2.ogg
-- sounds/ず.ogg
+- sounds/ず1.ogg
 - sounds/ず2.ogg
-- sounds/せ.ogg
+- sounds/せ1.ogg
 - sounds/せ2.ogg
-- sounds/ぜ.ogg
+- sounds/ぜ1.ogg
 - sounds/ぜ2.ogg
-- sounds/そ.ogg
+- sounds/そ1.ogg
 - sounds/そ2.ogg
-- sounds/ぞ.ogg
+- sounds/ぞ1.ogg
 - sounds/ぞ2.ogg
-- sounds/た.ogg
+- sounds/た1.ogg
 - sounds/た2.ogg
-- sounds/だ.ogg
+- sounds/だ1.ogg
 - sounds/だ2.ogg
-- sounds/ち.ogg
+- sounds/ち1.ogg
 - sounds/ち2.ogg
-- sounds/ぢ.ogg
+- sounds/ぢ1.ogg
 - sounds/ぢ2.ogg
-- sounds/つ.ogg
+- sounds/つ1.ogg
 - sounds/つ2.ogg
-- sounds/づ.ogg
+- sounds/づ1.ogg
 - sounds/づ2.ogg
-- sounds/て.ogg
+- sounds/て1.ogg
 - sounds/て2.ogg
-- sounds/で.ogg
+- sounds/で1.ogg
 - sounds/で2.ogg
-- sounds/と.ogg
+- sounds/と1.ogg
 - sounds/と2.ogg
-- sounds/ど.ogg
+- sounds/ど1.ogg
 - sounds/ど2.ogg
-- sounds/な.ogg
+- sounds/な1.ogg
 - sounds/な2.ogg
-- sounds/に.ogg
+- sounds/に1.ogg
 - sounds/に2.ogg
-- sounds/ぬ.ogg
+- sounds/ぬ1.ogg
 - sounds/ぬ2.ogg
-- sounds/ね.ogg
+- sounds/ね1.ogg
 - sounds/ね2.ogg
-- sounds/の.ogg
+- sounds/の1.ogg
 - sounds/の2.ogg
-- sounds/は.ogg
+- sounds/は1.ogg
 - sounds/は2.ogg
-- sounds/ば.ogg
+- sounds/ば1.ogg
 - sounds/ば2.ogg
-- sounds/ぱ.ogg
+- sounds/ぱ1.ogg
 - sounds/ぱ2.ogg
-- sounds/ひ.ogg
+- sounds/ひ1.ogg
 - sounds/ひ2.ogg
-- sounds/び.ogg
+- sounds/び1.ogg
 - sounds/び2.ogg
-- sounds/ぴ.ogg
+- sounds/ぴ1.ogg
 - sounds/ぴ2.ogg
-- sounds/ふ.ogg
+- sounds/ふ1.ogg
 - sounds/ふ2.ogg
-- sounds/ぶ.ogg
+- sounds/ぶ1.ogg
 - sounds/ぶ2.ogg
-- sounds/ぷ.ogg
+- sounds/ぷ1.ogg
 - sounds/ぷ2.ogg
-- sounds/へ.ogg
+- sounds/へ1.ogg
 - sounds/へ2.ogg
-- sounds/べ.ogg
+- sounds/べ1.ogg
 - sounds/べ2.ogg
-- sounds/ぺ.ogg
+- sounds/ぺ1.ogg
 - sounds/ぺ2.ogg
-- sounds/ほ.ogg
+- sounds/ほ1.ogg
 - sounds/ほ2.ogg
-- sounds/ぼ.ogg
+- sounds/ぼ1.ogg
 - sounds/ぼ2.ogg
-- sounds/ぽ.ogg
+- sounds/ぽ1.ogg
 - sounds/ぽ2.ogg
-- sounds/ま.ogg
+- sounds/ま1.ogg
 - sounds/ま2.ogg
-- sounds/み.ogg
+- sounds/み1.ogg
 - sounds/み2.ogg
-- sounds/む.ogg
+- sounds/む1.ogg
 - sounds/む2.ogg
-- sounds/め.ogg
+- sounds/め1.ogg
 - sounds/め2.ogg
-- sounds/も.ogg
+- sounds/も1.ogg
 - sounds/も2.ogg
-- sounds/や.ogg
+- sounds/や1.ogg
 - sounds/や2.ogg
-- sounds/ゆ.ogg
+- sounds/ゆ1.ogg
 - sounds/ゆ2.ogg
-- sounds/よ.ogg
+- sounds/よ1.ogg
 - sounds/よ2.ogg
-- sounds/ら.ogg
+- sounds/ら1.ogg
 - sounds/ら2.ogg
-- sounds/り.ogg
+- sounds/り1.ogg
 - sounds/り2.ogg
-- sounds/る.ogg
+- sounds/る1.ogg
 - sounds/る2.ogg
-- sounds/れ.ogg
+- sounds/れ1.ogg
 - sounds/れ2.ogg
-- sounds/ろ.ogg
+- sounds/ろ1.ogg
 - sounds/ろ2.ogg
-- sounds/わ.ogg
+- sounds/わ1.ogg
 - sounds/わ2.ogg
-- sounds/を.ogg
+- sounds/を1.ogg
 - sounds/を2.ogg
-- sounds/ん.ogg
+- sounds/ん1.ogg
 - sounds/ん2.ogg
 - test-notify.rb
 - ui/builder.ui
@@ -284,7 +286,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/sounds/tofix.txt

@@ -1,2 +0,0 @@
-su
-he - pronounced as particle (e)