From fb87b1ad69b37e75d1e2e46c91235aa6b44c2980 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Fri, 10 Apr 2020 12:31:06 -0400
Subject: Add tests

---
 test/test-japanese.js | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

(limited to 'test')

diff --git a/test/test-japanese.js b/test/test-japanese.js
index ca65dde2..ac28a579 100644
--- a/test/test-japanese.js
+++ b/test/test-japanese.js
@@ -394,6 +394,50 @@ function testDistributeFuriganaInflected() {
     }
 }
 
+function testCollapseEmphaticSequences() {
+    const data = [
+        [['かこい', false], ['かこい', [1, 1, 1]]],
+        [['かこい', true], ['かこい', [1, 1, 1]]],
+        [['かっこい', false], ['かっこい', [1, 1, 1, 1]]],
+        [['かっこい', true], ['かこい', [2, 1, 1]]],
+        [['かっっこい', false], ['かっこい', [1, 2, 1, 1]]],
+        [['かっっこい', true], ['かこい', [3, 1, 1]]],
+        [['かっっっこい', false], ['かっこい', [1, 3, 1, 1]]],
+        [['かっっっこい', true], ['かこい', [4, 1, 1]]],
+
+        [['こい', false], ['こい', [1, 1]]],
+        [['こい', true], ['こい', [1, 1]]],
+        [['っこい', false], ['っこい', [1, 1, 1]]],
+        [['っこい', true], ['こい', [2, 1]]],
+        [['っっこい', false], ['っこい', [2, 1, 1]]],
+        [['っっこい', true], ['こい', [3, 1]]],
+        [['っっっこい', false], ['っこい', [3, 1, 1]]],
+        [['っっっこい', true], ['こい', [4, 1]]],
+
+        [['', false], ['', []]],
+        [['', true], ['', []]],
+        [['っ', false], ['っ', [1]]],
+        [['っ', true], ['', [1]]],
+        [['っっ', false], ['っ', [2]]],
+        [['っっ', true], ['', [2]]],
+        [['っっっ', false], ['っ', [3]]],
+        [['っっっ', true], ['', [3]]]
+    ];
+
+    for (const [[text, fullCollapse], [expected, expectedSourceMapping]] of data) {
+        const sourceMap = new TextSourceMap(text);
+        const actual1 = jp.collapseEmphaticSequences(text, fullCollapse, null);
+        const actual2 = jp.collapseEmphaticSequences(text, fullCollapse, sourceMap);
+        assert.strictEqual(actual1, expected);
+        assert.strictEqual(actual2, expected);
+        if (typeof expectedSourceMapping !== 'undefined') {
+            console.log('actual', JSON.stringify(actual1), sourceMap);
+            console.log('expected', JSON.stringify(expected), new TextSourceMap(text, expectedSourceMapping));
+            assert.ok(sourceMap.equals(new TextSourceMap(text, expectedSourceMapping)));
+        }
+    }
+}
+
 function testIsMoraPitchHigh() {
     const data = [
         [[0, 0], false],
@@ -463,6 +507,7 @@ function main() {
     testConvertAlphabeticToKana();
     testDistributeFurigana();
     testDistributeFuriganaInflected();
+    testCollapseEmphaticSequences();
     testIsMoraPitchHigh();
     testGetKanaMorae();
 }
-- 
cgit v1.2.3


From 4e5029f7ec82aaa99e16bd84a0ec2ad19a15c6b0 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Fri, 10 Apr 2020 11:06:55 -0700
Subject: Update license author field to broader to explicitly reflect that
 Yomichan is an ongoing community project. It really does take a village, and
 everyone who contributes code owns a part of it :)

---
 LICENSE                                    | 2 +-
 ext/bg/css/settings.css                    | 3 +--
 ext/bg/js/anki-note-builder.js             | 3 +--
 ext/bg/js/anki.js                          | 3 +--
 ext/bg/js/audio-uri-builder.js             | 3 +--
 ext/bg/js/backend-api-forwarder.js         | 3 +--
 ext/bg/js/backend.js                       | 3 +--
 ext/bg/js/clipboard-monitor.js             | 3 +--
 ext/bg/js/conditions.js                    | 3 +--
 ext/bg/js/context.js                       | 3 +--
 ext/bg/js/database.js                      | 3 +--
 ext/bg/js/deinflector.js                   | 3 +--
 ext/bg/js/dictionary-importer.js           | 3 +--
 ext/bg/js/dictionary.js                    | 3 +--
 ext/bg/js/handlebars.js                    | 3 +--
 ext/bg/js/japanese.js                      | 3 +--
 ext/bg/js/json-schema.js                   | 3 +--
 ext/bg/js/mecab.js                         | 3 +--
 ext/bg/js/options.js                       | 3 +--
 ext/bg/js/page-exit-prevention.js          | 3 +--
 ext/bg/js/profile-conditions.js            | 3 +--
 ext/bg/js/request.js                       | 3 +--
 ext/bg/js/search-frontend.js               | 3 +--
 ext/bg/js/search-query-parser-generator.js | 3 +--
 ext/bg/js/search-query-parser.js           | 3 +--
 ext/bg/js/search.js                        | 3 +--
 ext/bg/js/settings/anki-templates.js       | 3 +--
 ext/bg/js/settings/anki.js                 | 3 +--
 ext/bg/js/settings/audio-ui.js             | 3 +--
 ext/bg/js/settings/audio.js                | 3 +--
 ext/bg/js/settings/backup.js               | 3 +--
 ext/bg/js/settings/conditions-ui.js        | 3 +--
 ext/bg/js/settings/dictionaries.js         | 3 +--
 ext/bg/js/settings/main.js                 | 3 +--
 ext/bg/js/settings/popup-preview-frame.js  | 3 +--
 ext/bg/js/settings/popup-preview.js        | 3 +--
 ext/bg/js/settings/profiles.js             | 3 +--
 ext/bg/js/settings/storage.js              | 3 +--
 ext/bg/js/text-source-map.js               | 3 +--
 ext/bg/js/translator.js                    | 3 +--
 ext/bg/js/util.js                          | 3 +--
 ext/bg/legal.html                          | 2 +-
 ext/fg/css/client.css                      | 3 +--
 ext/fg/js/document.js                      | 3 +--
 ext/fg/js/float.js                         | 3 +--
 ext/fg/js/frame-offset-forwarder.js        | 3 +--
 ext/fg/js/frontend-api-receiver.js         | 3 +--
 ext/fg/js/frontend-api-sender.js           | 3 +--
 ext/fg/js/frontend-initialize.js           | 3 +--
 ext/fg/js/frontend.js                      | 3 +--
 ext/fg/js/popup-nested.js                  | 3 +--
 ext/fg/js/popup-proxy-host.js              | 3 +--
 ext/fg/js/popup-proxy.js                   | 3 +--
 ext/fg/js/popup.js                         | 3 +--
 ext/fg/js/source.js                        | 3 +--
 ext/mixed/css/display-dark.css             | 3 +--
 ext/mixed/css/display-default.css          | 3 +--
 ext/mixed/css/display.css                  | 3 +--
 ext/mixed/js/api.js                        | 3 +--
 ext/mixed/js/audio-system.js               | 3 +--
 ext/mixed/js/core.js                       | 3 +--
 ext/mixed/js/display-context.js            | 3 +--
 ext/mixed/js/display-generator.js          | 3 +--
 ext/mixed/js/display.js                    | 3 +--
 ext/mixed/js/dom.js                        | 3 +--
 ext/mixed/js/japanese.js                   | 3 +--
 ext/mixed/js/object-property-accessor.js   | 3 +--
 ext/mixed/js/scroll.js                     | 3 +--
 ext/mixed/js/template-handler.js           | 3 +--
 ext/mixed/js/text-scanner.js               | 3 +--
 ext/mixed/js/timer.js                      | 3 +--
 test/dictionary-validate.js                | 3 +--
 test/lint/global-declarations.js           | 4 ++--
 test/schema-validate.js                    | 3 +--
 test/test-database.js                      | 3 +--
 test/test-dictionary.js                    | 3 +--
 test/test-document.js                      | 3 +--
 test/test-japanese.js                      | 3 +--
 test/test-object-property-accessor.js      | 3 +--
 test/test-schema.js                        | 3 +--
 test/test-text-source-map.js               | 3 +--
 test/yomichan-test.js                      | 3 +--
 test/yomichan-vm.js                        | 3 +--
 83 files changed, 84 insertions(+), 164 deletions(-)

(limited to 'test')

diff --git a/LICENSE b/LICENSE
index f8531a9f..23c698c5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2016-2020 Alex Yatskov
+Copyright 2016-2020  Yomichan Authors
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/css/settings.css b/ext/bg/css/settings.css
index 6344bd38..f55082e7 100644
--- a/ext/bg/css/settings.css
+++ b/ext/bg/css/settings.css
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/anki-note-builder.js b/ext/bg/js/anki-note-builder.js
index 244aaab8..8a707006 100644
--- a/ext/bg/js/anki-note-builder.js
+++ b/ext/bg/js/anki-note-builder.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/anki.js b/ext/bg/js/anki.js
index a70388bd..c7f7c0cc 100644
--- a/ext/bg/js/anki.js
+++ b/ext/bg/js/anki.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/audio-uri-builder.js b/ext/bg/js/audio-uri-builder.js
index 158006bb..dfd195d8 100644
--- a/ext/bg/js/audio-uri-builder.js
+++ b/ext/bg/js/audio-uri-builder.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2017-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2017-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/backend-api-forwarder.js b/ext/bg/js/backend-api-forwarder.js
index 170a6b32..93db77d7 100644
--- a/ext/bg/js/backend-api-forwarder.js
+++ b/ext/bg/js/backend-api-forwarder.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 1fa7ede1..6386319b 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/clipboard-monitor.js b/ext/bg/js/clipboard-monitor.js
index c67525fc..e7e7378c 100644
--- a/ext/bg/js/clipboard-monitor.js
+++ b/ext/bg/js/clipboard-monitor.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/conditions.js b/ext/bg/js/conditions.js
index d4d1c0e0..eb9582df 100644
--- a/ext/bg/js/conditions.js
+++ b/ext/bg/js/conditions.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/context.js b/ext/bg/js/context.js
index c3e74656..e3d4ad4a 100644
--- a/ext/bg/js/context.js
+++ b/ext/bg/js/context.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2017-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2017-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 4a677fea..ad4e3bad 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/deinflector.js b/ext/bg/js/deinflector.js
index d548d271..6ec6e899 100644
--- a/ext/bg/js/deinflector.js
+++ b/ext/bg/js/deinflector.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/dictionary-importer.js b/ext/bg/js/dictionary-importer.js
index 254fde4f..bf6809ec 100644
--- a/ext/bg/js/dictionary-importer.js
+++ b/ext/bg/js/dictionary-importer.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index 74bd5a64..15cc7615 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/handlebars.js b/ext/bg/js/handlebars.js
index 5fda5baa..860acb14 100644
--- a/ext/bg/js/handlebars.js
+++ b/ext/bg/js/handlebars.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/japanese.js b/ext/bg/js/japanese.js
index 2a2b39fd..5c49cca7 100644
--- a/ext/bg/js/japanese.js
+++ b/ext/bg/js/japanese.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/json-schema.js b/ext/bg/js/json-schema.js
index 58f804fd..f62402f9 100644
--- a/ext/bg/js/json-schema.js
+++ b/ext/bg/js/json-schema.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/mecab.js b/ext/bg/js/mecab.js
index 34ecd728..cd6e6c57 100644
--- a/ext/bg/js/mecab.js
+++ b/ext/bg/js/mecab.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index abb054d4..20df2a68 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/page-exit-prevention.js b/ext/bg/js/page-exit-prevention.js
index be06c495..f55cf024 100644
--- a/ext/bg/js/page-exit-prevention.js
+++ b/ext/bg/js/page-exit-prevention.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/profile-conditions.js b/ext/bg/js/profile-conditions.js
index 1fd78e5d..a0710bd1 100644
--- a/ext/bg/js/profile-conditions.js
+++ b/ext/bg/js/profile-conditions.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/request.js b/ext/bg/js/request.js
index 02eed6fb..957ac0f5 100644
--- a/ext/bg/js/request.js
+++ b/ext/bg/js/request.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2017-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2017-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/search-frontend.js b/ext/bg/js/search-frontend.js
index f130a6fa..9cc1436f 100644
--- a/ext/bg/js/search-frontend.js
+++ b/ext/bg/js/search-frontend.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/search-query-parser-generator.js b/ext/bg/js/search-query-parser-generator.js
index 664858a4..390841c1 100644
--- a/ext/bg/js/search-query-parser-generator.js
+++ b/ext/bg/js/search-query-parser-generator.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/search-query-parser.js b/ext/bg/js/search-query-parser.js
index 9f59f2e5..01a0ace5 100644
--- a/ext/bg/js/search-query-parser.js
+++ b/ext/bg/js/search-query-parser.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index 9250fdde..2ba3e468 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/settings/anki-templates.js b/ext/bg/js/settings/anki-templates.js
index e3852eb4..d5b6e677 100644
--- a/ext/bg/js/settings/anki-templates.js
+++ b/ext/bg/js/settings/anki-templates.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/settings/anki.js b/ext/bg/js/settings/anki.js
index f2e1ca76..b32a9517 100644
--- a/ext/bg/js/settings/anki.js
+++ b/ext/bg/js/settings/anki.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/settings/audio-ui.js b/ext/bg/js/settings/audio-ui.js
index 206539a4..73c64227 100644
--- a/ext/bg/js/settings/audio-ui.js
+++ b/ext/bg/js/settings/audio-ui.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/settings/audio.js b/ext/bg/js/settings/audio.js
index 38dd6349..3c6e126c 100644
--- a/ext/bg/js/settings/audio.js
+++ b/ext/bg/js/settings/audio.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/settings/backup.js b/ext/bg/js/settings/backup.js
index 21417dfb..bdfef658 100644
--- a/ext/bg/js/settings/backup.js
+++ b/ext/bg/js/settings/backup.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/settings/conditions-ui.js b/ext/bg/js/settings/conditions-ui.js
index 9d61d25e..84498b42 100644
--- a/ext/bg/js/settings/conditions-ui.js
+++ b/ext/bg/js/settings/conditions-ui.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/settings/dictionaries.js b/ext/bg/js/settings/dictionaries.js
index 33ced3b9..1a6d452b 100644
--- a/ext/bg/js/settings/dictionaries.js
+++ b/ext/bg/js/settings/dictionaries.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js
index 1653ee35..8fd94562 100644
--- a/ext/bg/js/settings/main.js
+++ b/ext/bg/js/settings/main.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/settings/popup-preview-frame.js b/ext/bg/js/settings/popup-preview-frame.js
index 6a149841..fba114e2 100644
--- a/ext/bg/js/settings/popup-preview-frame.js
+++ b/ext/bg/js/settings/popup-preview-frame.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/settings/popup-preview.js b/ext/bg/js/settings/popup-preview.js
index d1d2ff5e..091872be 100644
--- a/ext/bg/js/settings/popup-preview.js
+++ b/ext/bg/js/settings/popup-preview.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/settings/profiles.js b/ext/bg/js/settings/profiles.js
index b35b6309..867b17aa 100644
--- a/ext/bg/js/settings/profiles.js
+++ b/ext/bg/js/settings/profiles.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/settings/storage.js b/ext/bg/js/settings/storage.js
index ae305e22..d754a109 100644
--- a/ext/bg/js/settings/storage.js
+++ b/ext/bg/js/settings/storage.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/text-source-map.js b/ext/bg/js/text-source-map.js
index 24970978..1776ae07 100644
--- a/ext/bg/js/text-source-map.js
+++ b/ext/bg/js/text-source-map.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 27f91c05..e4441384 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index a7ed4a34..69536f02 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/bg/legal.html b/ext/bg/legal.html
index c1e606d7..78acf79a 100644
--- a/ext/bg/legal.html
+++ b/ext/bg/legal.html
@@ -17,7 +17,7 @@
         <div class="container">
             <h3>Yomichan License</h3>
 <pre>
-Copyright (C) 2016-2020  Alex Yatskov
+Copyright (C) 2016-2020  Yomichan Authors
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/ext/fg/css/client.css b/ext/fg/css/client.css
index 5720d8ac..227f5030 100644
--- a/ext/fg/css/client.css
+++ b/ext/fg/css/client.css
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/fg/js/document.js b/ext/fg/js/document.js
index 490f61bb..3b4cc28f 100644
--- a/ext/fg/js/document.js
+++ b/ext/fg/js/document.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js
index 01055ca6..77e5ea0a 100644
--- a/ext/fg/js/float.js
+++ b/ext/fg/js/float.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/fg/js/frame-offset-forwarder.js b/ext/fg/js/frame-offset-forwarder.js
index 7b417b6e..b3c10bb8 100644
--- a/ext/fg/js/frame-offset-forwarder.js
+++ b/ext/fg/js/frame-offset-forwarder.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/fg/js/frontend-api-receiver.js b/ext/fg/js/frontend-api-receiver.js
index 642d96df..4abd4e81 100644
--- a/ext/fg/js/frontend-api-receiver.js
+++ b/ext/fg/js/frontend-api-receiver.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/fg/js/frontend-api-sender.js b/ext/fg/js/frontend-api-sender.js
index 4431df61..1d539cab 100644
--- a/ext/fg/js/frontend-api-sender.js
+++ b/ext/fg/js/frontend-api-sender.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/fg/js/frontend-initialize.js b/ext/fg/js/frontend-initialize.js
index 4a1409db..0a586ff9 100644
--- a/ext/fg/js/frontend-initialize.js
+++ b/ext/fg/js/frontend-initialize.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index 31843212..6fbbd0fb 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/fg/js/popup-nested.js b/ext/fg/js/popup-nested.js
index 39d91fd8..1b24614b 100644
--- a/ext/fg/js/popup-nested.js
+++ b/ext/fg/js/popup-nested.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/fg/js/popup-proxy-host.js b/ext/fg/js/popup-proxy-host.js
index 4b136e41..958462ff 100644
--- a/ext/fg/js/popup-proxy-host.js
+++ b/ext/fg/js/popup-proxy-host.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/fg/js/popup-proxy.js b/ext/fg/js/popup-proxy.js
index 966198a9..82ad9a8f 100644
--- a/ext/fg/js/popup-proxy.js
+++ b/ext/fg/js/popup-proxy.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index 60dc16dd..42f08afa 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/fg/js/source.js b/ext/fg/js/source.js
index 6dc482bd..3d9afe0f 100644
--- a/ext/fg/js/source.js
+++ b/ext/fg/js/source.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/mixed/css/display-dark.css b/ext/mixed/css/display-dark.css
index 550dff3e..e4549bbf 100644
--- a/ext/mixed/css/display-dark.css
+++ b/ext/mixed/css/display-dark.css
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the entrys of the GNU General Public License as published by
diff --git a/ext/mixed/css/display-default.css b/ext/mixed/css/display-default.css
index 487b8cb8..7bcb1014 100644
--- a/ext/mixed/css/display-default.css
+++ b/ext/mixed/css/display-default.css
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the entrys of the GNU General Public License as published by
diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index a4432016..92ba52c6 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the entrys of the GNU General Public License as published by
diff --git a/ext/mixed/js/api.js b/ext/mixed/js/api.js
index feec94df..066077cf 100644
--- a/ext/mixed/js/api.js
+++ b/ext/mixed/js/api.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/mixed/js/audio-system.js b/ext/mixed/js/audio-system.js
index 31c476b1..45b733fc 100644
--- a/ext/mixed/js/audio-system.js
+++ b/ext/mixed/js/audio-system.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/mixed/js/core.js b/ext/mixed/js/core.js
index db7fc69b..2d11c11a 100644
--- a/ext/mixed/js/core.js
+++ b/ext/mixed/js/core.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/mixed/js/display-context.js b/ext/mixed/js/display-context.js
index c11c2342..5ee78459 100644
--- a/ext/mixed/js/display-context.js
+++ b/ext/mixed/js/display-context.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/mixed/js/display-generator.js b/ext/mixed/js/display-generator.js
index f1122e3d..b0cc2478 100644
--- a/ext/mixed/js/display-generator.js
+++ b/ext/mixed/js/display-generator.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 2f456c3e..bf6990a1 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2017-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2017-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/mixed/js/dom.js b/ext/mixed/js/dom.js
index 807a48e1..03acbb80 100644
--- a/ext/mixed/js/dom.js
+++ b/ext/mixed/js/dom.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/mixed/js/japanese.js b/ext/mixed/js/japanese.js
index e6b9a8a0..79d69946 100644
--- a/ext/mixed/js/japanese.js
+++ b/ext/mixed/js/japanese.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/mixed/js/object-property-accessor.js b/ext/mixed/js/object-property-accessor.js
index 108afc0d..349037b3 100644
--- a/ext/mixed/js/object-property-accessor.js
+++ b/ext/mixed/js/object-property-accessor.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2016-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/mixed/js/scroll.js b/ext/mixed/js/scroll.js
index 72da8b65..840fdb9c 100644
--- a/ext/mixed/js/scroll.js
+++ b/ext/mixed/js/scroll.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/mixed/js/template-handler.js b/ext/mixed/js/template-handler.js
index a5a62937..f17fd60c 100644
--- a/ext/mixed/js/template-handler.js
+++ b/ext/mixed/js/template-handler.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/mixed/js/text-scanner.js b/ext/mixed/js/text-scanner.js
index b8156c01..a1d96320 100644
--- a/ext/mixed/js/text-scanner.js
+++ b/ext/mixed/js/text-scanner.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ext/mixed/js/timer.js b/ext/mixed/js/timer.js
index 1caf7a05..30408e93 100644
--- a/ext/mixed/js/timer.js
+++ b/ext/mixed/js/timer.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2019-2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2019-2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/test/dictionary-validate.js b/test/dictionary-validate.js
index 6496f2ac..f1730852 100644
--- a/test/dictionary-validate.js
+++ b/test/dictionary-validate.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/test/lint/global-declarations.js b/test/lint/global-declarations.js
index 2629cc5e..07ba5570 100644
--- a/test/lint/global-declarations.js
+++ b/test/lint/global-declarations.js
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2020  Yomichan Authors
+ * Author: Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/test/schema-validate.js b/test/schema-validate.js
index eb31aa8d..761f0a1c 100644
--- a/test/schema-validate.js
+++ b/test/schema-validate.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/test/test-database.js b/test/test-database.js
index bab15aa4..d27f92e1 100644
--- a/test/test-database.js
+++ b/test/test-database.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/test/test-dictionary.js b/test/test-dictionary.js
index 74f9e62b..27cc90df 100644
--- a/test/test-dictionary.js
+++ b/test/test-dictionary.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/test/test-document.js b/test/test-document.js
index 80b9719d..0d9026db 100644
--- a/test/test-document.js
+++ b/test/test-document.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/test/test-japanese.js b/test/test-japanese.js
index ca65dde2..f4b084ac 100644
--- a/test/test-japanese.js
+++ b/test/test-japanese.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/test/test-object-property-accessor.js b/test/test-object-property-accessor.js
index 47d2e451..0773ba6e 100644
--- a/test/test-object-property-accessor.js
+++ b/test/test-object-property-accessor.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/test/test-schema.js b/test/test-schema.js
index 5f9915fd..7620ab16 100644
--- a/test/test-schema.js
+++ b/test/test-schema.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/test/test-text-source-map.js b/test/test-text-source-map.js
index 25bd8fc2..f092de2c 100644
--- a/test/test-text-source-map.js
+++ b/test/test-text-source-map.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/test/yomichan-test.js b/test/yomichan-test.js
index 5fa7730b..3351ecdf 100644
--- a/test/yomichan-test.js
+++ b/test/yomichan-test.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/test/yomichan-vm.js b/test/yomichan-vm.js
index ff478844..97faa03e 100644
--- a/test/yomichan-vm.js
+++ b/test/yomichan-vm.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020  Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2020  Yomichan Authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
-- 
cgit v1.2.3


From e7abeb02a64c599474ce47c5a8cde46097882634 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Fri, 10 Apr 2020 18:45:16 -0400
Subject: Add simple check to see if globals are unused

---
 test/lint/global-declarations.js | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/lint/global-declarations.js b/test/lint/global-declarations.js
index 07ba5570..2fc9a5e2 100644
--- a/test/lint/global-declarations.js
+++ b/test/lint/global-declarations.js
@@ -37,6 +37,18 @@ function getNewline(string) {
     }
 }
 
+function getSubstringCount(string, substring) {
+    let start = 0;
+    let count = 0;
+    while (true) {
+        const pos = string.indexOf(substring, start);
+        if (pos < 0) { break; }
+        ++count;
+        start = pos + substring.length;
+    }
+    return count;
+}
+
 
 function validateGlobals(fileName, fix) {
     const pattern = /\/\*\s*global\s+([\w\W]*?)\*\//g;
@@ -47,6 +59,7 @@ function validateGlobals(fileName, fix) {
     let first = true;
     let endIndex = 0;
     let newSource = '';
+    const allGlobals = [];
     const newline = getNewline(source);
     while ((match = pattern.exec(source)) !== null) {
         if (!first) {
@@ -74,15 +87,27 @@ function validateGlobals(fileName, fix) {
         newSource += source.substring(0, match.index);
         newSource += expected;
         endIndex = match.index + match[0].length;
+
+        allGlobals.push(...parts);
     }
 
     newSource += source.substring(endIndex);
 
+    // This is an approximate check to see if a global variable is unused.
+    // If the global appears in a comment, string, or similar, the check will pass.
+    let errorCount = 0;
+    for (const global of allGlobals) {
+        if (getSubstringCount(newSource, global) <= 1) {
+            console.error(`Global variable ${global} appears to be unused in ${fileName}`);
+            ++errorCount;
+        }
+    }
+
     if (fix) {
         fs.writeFileSync(fileName, newSource, {encoding: 'utf8'});
     }
 
-    return true;
+    return errorCount === 0;
 }
 
 
-- 
cgit v1.2.3


From 92f2466cfff40d47fb5e6350dae5d7ff82770973 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 11 Apr 2020 16:53:29 -0400
Subject: Add tests, remove logs

---
 test/test-japanese.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/test-japanese.js b/test/test-japanese.js
index ac28a579..b1bba9a7 100644
--- a/test/test-japanese.js
+++ b/test/test-japanese.js
@@ -414,6 +414,17 @@ function testCollapseEmphaticSequences() {
         [['っっっこい', false], ['っこい', [3, 1, 1]]],
         [['っっっこい', true], ['こい', [4, 1]]],
 
+        [['すごい', false], ['すごい', [1, 1, 1]]],
+        [['すごい', true], ['すごい', [1, 1, 1]]],
+        [['すごーい', false], ['すごーい', [1, 1, 1, 1]]],
+        [['すごーい', true], ['すごい', [1, 2, 1]]],
+        [['すごーーい', false], ['すごーい', [1, 1, 2, 1]]],
+        [['すごーーい', true], ['すごい', [1, 3, 1]]],
+        [['すっごーい', false], ['すっごーい', [1, 1, 1, 1, 1]]],
+        [['すっごーい', true], ['すごい', [2, 2, 1]]],
+        [['すっっごーーい', false], ['すっごーい', [1, 2, 1, 2, 1]]],
+        [['すっっごーーい', true], ['すごい', [3, 3, 1]]],
+
         [['', false], ['', []]],
         [['', true], ['', []]],
         [['っ', false], ['っ', [1]]],
@@ -431,8 +442,6 @@ function testCollapseEmphaticSequences() {
         assert.strictEqual(actual1, expected);
         assert.strictEqual(actual2, expected);
         if (typeof expectedSourceMapping !== 'undefined') {
-            console.log('actual', JSON.stringify(actual1), sourceMap);
-            console.log('expected', JSON.stringify(expected), new TextSourceMap(text, expectedSourceMapping));
             assert.ok(sourceMap.equals(new TextSourceMap(text, expectedSourceMapping)));
         }
     }
-- 
cgit v1.2.3


From f93dc857107e9b23ec06f1b568aad2c6f870ba4c Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Mon, 13 Apr 2020 22:55:33 +0300
Subject: assume and propagate strings for text parsing

---
 ext/bg/js/backend.js                       | 26 ++++++-------
 ext/bg/js/japanese.js                      | 10 ++---
 ext/bg/js/search-query-parser-generator.js |  2 +-
 ext/bg/js/search-query-parser.js           |  2 +-
 test/test-japanese.js                      | 60 +++++++++---------------------
 5 files changed, 36 insertions(+), 64 deletions(-)

(limited to 'test')

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 65e00f28..d5086af2 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -334,7 +334,7 @@ class Backend {
                 }
                 text = text.substring(source.length);
             } else {
-                const reading = jp.convertReading(text[0], null, options.parsing.readingMode);
+                const reading = jp.convertReading(text[0], '', options.parsing.readingMode);
                 term.push({text: text[0], reading});
                 text = text.substring(1);
             }
@@ -349,24 +349,20 @@ class Backend {
         for (const [mecabName, parsedLines] of Object.entries(rawResults)) {
             const result = [];
             for (const parsedLine of parsedLines) {
-                for (const {expression, reading, source} of parsedLine) {
+                for (let {expression, reading, source} of parsedLine) {
                     const term = [];
-                    if (expression !== null && reading !== null) {
-                        for (const {text: text2, furigana} of jp.distributeFuriganaInflected(
-                            expression,
-                            jp.convertKatakanaToHiragana(reading),
-                            source
-                        )) {
-                            const reading2 = jp.convertReading(text2, furigana, options.parsing.readingMode);
-                            term.push({text: text2, reading: reading2});
-                        }
-                    } else {
-                        const reading2 = jp.convertReading(source, null, options.parsing.readingMode);
-                        term.push({text: source, reading: reading2});
+                    if (expression === '') { expression = source; }
+                    for (const {text: text2, furigana} of jp.distributeFuriganaInflected(
+                        expression,
+                        jp.convertKatakanaToHiragana(reading),
+                        source
+                    )) {
+                        const reading2 = jp.convertReading(text2, furigana, options.parsing.readingMode);
+                        term.push({text: text2, reading: reading2});
                     }
                     result.push(term);
                 }
-                result.push([{text: '\n'}]);
+                result.push([{text: '\n', reading: ''}]);
             }
             results.push([mecabName, result]);
         }
diff --git a/ext/bg/js/japanese.js b/ext/bg/js/japanese.js
index 5fef27a7..c74e4553 100644
--- a/ext/bg/js/japanese.js
+++ b/ext/bg/js/japanese.js
@@ -127,9 +127,9 @@
     function convertReading(expressionFragment, readingFragment, readingMode) {
         switch (readingMode) {
             case 'hiragana':
-                return convertKatakanaToHiragana(readingFragment || '');
+                return convertKatakanaToHiragana(readingFragment);
             case 'katakana':
-                return convertHiraganaToKatakana(readingFragment || '');
+                return convertHiraganaToKatakana(readingFragment);
             case 'romaji':
                 if (readingFragment) {
                     return convertToRomaji(readingFragment);
@@ -140,7 +140,7 @@
                 }
                 return readingFragment;
             case 'none':
-                return null;
+                return '';
             default:
                 return readingFragment;
         }
@@ -300,7 +300,7 @@
                     const readingLeft = reading2.substring(group.text.length);
                     const segs = segmentize(readingLeft, groups.splice(1));
                     if (segs) {
-                        return [{text: group.text}].concat(segs);
+                        return [{text: group.text, furigana: ''}].concat(segs);
                     }
                 }
             } else {
@@ -368,7 +368,7 @@
         }
 
         if (stemLength !== source.length) {
-            output.push({text: source.substring(stemLength)});
+            output.push({text: source.substring(stemLength), furigana: ''});
         }
 
         return output;
diff --git a/ext/bg/js/search-query-parser-generator.js b/ext/bg/js/search-query-parser-generator.js
index d44829f7..527302ed 100644
--- a/ext/bg/js/search-query-parser-generator.js
+++ b/ext/bg/js/search-query-parser-generator.js
@@ -36,7 +36,7 @@ class QueryParserGenerator {
             const termContainer = this._templateHandler.instantiate(preview ? 'term-preview' : 'term');
             for (const segment of term) {
                 if (!segment.text.trim()) { continue; }
-                if (!segment.reading || !segment.reading.trim()) {
+                if (!segment.reading.trim()) {
                     termContainer.appendChild(this.createSegmentText(segment.text));
                 } else {
                     termContainer.appendChild(this.createSegment(segment));
diff --git a/ext/bg/js/search-query-parser.js b/ext/bg/js/search-query-parser.js
index da61b045..692fb1a8 100644
--- a/ext/bg/js/search-query-parser.js
+++ b/ext/bg/js/search-query-parser.js
@@ -140,7 +140,7 @@ class QueryParser extends TextScanner {
         const previewTerms = [];
         for (let i = 0, ii = text.length; i < ii; i += 2) {
             const tempText = text.substring(i, i + 2);
-            previewTerms.push([{text: tempText}]);
+            previewTerms.push([{text: tempText, reading: ''}]);
         }
         this.queryParser.textContent = '';
         this.queryParser.appendChild(this.queryParserGenerator.createParseResult(previewTerms, true));
diff --git a/test/test-japanese.js b/test/test-japanese.js
index 89e41c36..7fd71ba8 100644
--- a/test/test-japanese.js
+++ b/test/test-japanese.js
@@ -176,19 +176,19 @@ function testConvertReading() {
         [['アリガトウ', 'アリガトウ', 'hiragana'], 'ありがとう'],
         [['アリガトウ', 'アリガトウ', 'katakana'], 'アリガトウ'],
         [['アリガトウ', 'アリガトウ', 'romaji'], 'arigatou'],
-        [['アリガトウ', 'アリガトウ', 'none'], null],
+        [['アリガトウ', 'アリガトウ', 'none'], ''],
         [['アリガトウ', 'アリガトウ', 'default'], 'アリガトウ'],
 
         [['ありがとう', 'ありがとう', 'hiragana'], 'ありがとう'],
         [['ありがとう', 'ありがとう', 'katakana'], 'アリガトウ'],
         [['ありがとう', 'ありがとう', 'romaji'], 'arigatou'],
-        [['ありがとう', 'ありがとう', 'none'], null],
+        [['ありがとう', 'ありがとう', 'none'], ''],
         [['ありがとう', 'ありがとう', 'default'], 'ありがとう'],
 
         [['有り難う', 'ありがとう', 'hiragana'], 'ありがとう'],
         [['有り難う', 'ありがとう', 'katakana'], 'アリガトウ'],
         [['有り難う', 'ありがとう', 'romaji'], 'arigatou'],
-        [['有り難う', 'ありがとう', 'none'], null],
+        [['有り難う', 'ありがとう', 'none'], ''],
         [['有り難う', 'ありがとう', 'default'], 'ありがとう'],
 
         // Cases with falsy readings
@@ -196,40 +196,16 @@ function testConvertReading() {
         [['ありがとう', '', 'hiragana'], ''],
         [['ありがとう', '', 'katakana'], ''],
         [['ありがとう', '', 'romaji'], 'arigatou'],
-        [['ありがとう', '', 'none'], null],
+        [['ありがとう', '', 'none'], ''],
         [['ありがとう', '', 'default'], ''],
 
-        [['ありがとう', null, 'hiragana'], ''],
-        [['ありがとう', null, 'katakana'], ''],
-        [['ありがとう', null, 'romaji'], 'arigatou'],
-        [['ありがとう', null, 'none'], null],
-        [['ありがとう', null, 'default'], null],
-
-        [['ありがとう', void 0, 'hiragana'], ''],
-        [['ありがとう', void 0, 'katakana'], ''],
-        [['ありがとう', void 0, 'romaji'], 'arigatou'],
-        [['ありがとう', void 0, 'none'], null],
-        [['ありがとう', void 0, 'default'], void 0],
-
         // Cases with falsy readings and kanji expressions
 
         [['有り難う', '', 'hiragana'], ''],
         [['有り難う', '', 'katakana'], ''],
         [['有り難う', '', 'romaji'], ''],
-        [['有り難う', '', 'none'], null],
-        [['有り難う', '', 'default'], ''],
-
-        [['有り難う', null, 'hiragana'], ''],
-        [['有り難う', null, 'katakana'], ''],
-        [['有り難う', null, 'romaji'], null],
-        [['有り難う', null, 'none'], null],
-        [['有り難う', null, 'default'], null],
-
-        [['有り難う', void 0, 'hiragana'], ''],
-        [['有り難う', void 0, 'katakana'], ''],
-        [['有り難う', void 0, 'romaji'], void 0],
-        [['有り難う', void 0, 'none'], null],
-        [['有り難う', void 0, 'default'], void 0]
+        [['有り難う', '', 'none'], ''],
+        [['有り難う', '', 'default'], '']
     ];
 
     for (const [[expressionFragment, readingFragment, readingMode], expected] of data) {
@@ -303,9 +279,9 @@ function testDistributeFurigana() {
             ['有り難う', 'ありがとう'],
             [
                 {text: '有', furigana: 'あ'},
-                {text: 'り'},
+                {text: 'り', furigana: ''},
                 {text: '難', furigana: 'がと'},
-                {text: 'う'}
+                {text: 'う', furigana: ''}
             ]
         ],
         [
@@ -317,23 +293,23 @@ function testDistributeFurigana() {
         [
             ['お祝い', 'おいわい'],
             [
-                {text: 'お'},
+                {text: 'お', furigana: ''},
                 {text: '祝', furigana: 'いわ'},
-                {text: 'い'}
+                {text: 'い', furigana: ''}
             ]
         ],
         [
             ['美味しい', 'おいしい'],
             [
                 {text: '美味', furigana: 'おい'},
-                {text: 'しい'}
+                {text: 'しい', furigana: ''}
             ]
         ],
         [
             ['食べ物', 'たべもの'],
             [
                 {text: '食', furigana: 'た'},
-                {text: 'べ'},
+                {text: 'べ', furigana: ''},
                 {text: '物', furigana: 'もの'}
             ]
         ],
@@ -341,9 +317,9 @@ function testDistributeFurigana() {
             ['試し切り', 'ためしぎり'],
             [
                 {text: '試', furigana: 'ため'},
-                {text: 'し'},
+                {text: 'し', furigana: ''},
                 {text: '切', furigana: 'ぎ'},
-                {text: 'り'}
+                {text: 'り', furigana: ''}
             ]
         ],
         // Ambiguous
@@ -373,16 +349,16 @@ function testDistributeFuriganaInflected() {
             ['美味しい', 'おいしい', '美味しかた'],
             [
                 {text: '美味', furigana: 'おい'},
-                {text: 'し'},
-                {text: 'かた'}
+                {text: 'し', furigana: ''},
+                {text: 'かた', furigana: ''}
             ]
         ],
         [
             ['食べる', 'たべる', '食べた'],
             [
                 {text: '食', furigana: 'た'},
-                {text: 'べ'},
-                {text: 'た'}
+                {text: 'べ', furigana: ''},
+                {text: 'た', furigana: ''}
             ]
         ]
     ];
-- 
cgit v1.2.3


From 6cc87ec9753d7482af2ff75bed2d405f7c31c072 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Mon, 13 Apr 2020 22:59:56 +0300
Subject: remove "fragment" from jp.convertReading variables

---
 ext/bg/js/japanese.js | 18 +++++++++---------
 test/test-japanese.js |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'test')

diff --git a/ext/bg/js/japanese.js b/ext/bg/js/japanese.js
index c74e4553..ac81acb5 100644
--- a/ext/bg/js/japanese.js
+++ b/ext/bg/js/japanese.js
@@ -124,25 +124,25 @@
         return wanakana.toRomaji(text);
     }
 
-    function convertReading(expressionFragment, readingFragment, readingMode) {
+    function convertReading(expression, reading, readingMode) {
         switch (readingMode) {
             case 'hiragana':
-                return convertKatakanaToHiragana(readingFragment);
+                return convertKatakanaToHiragana(reading);
             case 'katakana':
-                return convertHiraganaToKatakana(readingFragment);
+                return convertHiraganaToKatakana(reading);
             case 'romaji':
-                if (readingFragment) {
-                    return convertToRomaji(readingFragment);
+                if (reading) {
+                    return convertToRomaji(reading);
                 } else {
-                    if (isStringEntirelyKana(expressionFragment)) {
-                        return convertToRomaji(expressionFragment);
+                    if (isStringEntirelyKana(expression)) {
+                        return convertToRomaji(expression);
                     }
                 }
-                return readingFragment;
+                return reading;
             case 'none':
                 return '';
             default:
-                return readingFragment;
+                return reading;
         }
     }
 
diff --git a/test/test-japanese.js b/test/test-japanese.js
index 7fd71ba8..87efdfad 100644
--- a/test/test-japanese.js
+++ b/test/test-japanese.js
@@ -208,8 +208,8 @@ function testConvertReading() {
         [['有り難う', '', 'default'], '']
     ];
 
-    for (const [[expressionFragment, readingFragment, readingMode], expected] of data) {
-        assert.strictEqual(jp.convertReading(expressionFragment, readingFragment, readingMode), expected);
+    for (const [[expression, reading, readingMode], expected] of data) {
+        assert.strictEqual(jp.convertReading(expression, reading, readingMode), expected);
     }
 }
 
-- 
cgit v1.2.3