From 351598a1829930a25a27a007fb3bc69bde251787 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Mon, 23 Dec 2019 17:39:00 -0500 Subject: Add settings to control popup content scale --- ext/bg/settings.html | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'ext/bg/settings.html') diff --git a/ext/bg/settings.html b/ext/bg/settings.html index 4c973674..37ee20aa 100644 --- a/ext/bg/settings.html +++ b/ext/bg/settings.html @@ -237,6 +237,22 @@ +
+
+
+ + +
+
+ + +
+
+
+
-- cgit v1.2.3 From 5d366b722f4104d4f3252fb733fa31a44d4df3df Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Mon, 30 Dec 2019 12:42:12 -0500 Subject: Add option for changing poup scale relative to visual viewport --- ext/bg/data/options-schema.json | 5 +++++ ext/bg/js/options.js | 1 + ext/bg/js/settings/main.js | 6 ++++-- ext/bg/settings.html | 29 +++++++++++++---------------- 4 files changed, 23 insertions(+), 18 deletions(-) (limited to 'ext/bg/settings.html') diff --git a/ext/bg/data/options-schema.json b/ext/bg/data/options-schema.json index 27de2bf9..3cb25218 100644 --- a/ext/bg/data/options-schema.json +++ b/ext/bg/data/options-schema.json @@ -93,6 +93,7 @@ "popupVerticalTextPosition", "popupScalingFactor", "popupScaleRelativeToPageZoom", + "popupScaleRelativeToVisualViewport", "showGuide", "compactTags", "compactGlossaries", @@ -176,6 +177,10 @@ "type": "boolean", "default": false }, + "popupScaleRelativeToVisualViewport": { + "type": "boolean", + "default": true + }, "showGuide": { "type": "boolean", "default": true diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js index cf9af240..c2da76b1 100644 --- a/ext/bg/js/options.js +++ b/ext/bg/js/options.js @@ -281,6 +281,7 @@ function profileOptionsCreateDefaults() { popupVerticalTextPosition: 'before', popupScalingFactor: 1, popupScaleRelativeToPageZoom: false, + popupScaleRelativeToVisualViewport: true, showGuide: true, compactTags: false, compactGlossaries: false, diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js index a5407b75..ac255978 100644 --- a/ext/bg/js/settings/main.js +++ b/ext/bg/js/settings/main.js @@ -45,7 +45,8 @@ async function formRead(options) { options.general.popupHorizontalOffset2 = parseInt($('#popup-horizontal-offset2').val(), 0); options.general.popupVerticalOffset2 = parseInt($('#popup-vertical-offset2').val(), 10); options.general.popupScalingFactor = parseInt($('#popup-scaling-factor').val(), 10); - options.general.popupScaleRelativeToPageZoom = $('#popup-scale-relative-to-page-zoom').val() === 'true'; + options.general.popupScaleRelativeToPageZoom = $('#popup-scale-relative-to-page-zoom').prop('checked'); + options.general.popupScaleRelativeToVisualViewport = $('#popup-scale-relative-to-visual-viewport').prop('checked'); options.general.popupTheme = $('#popup-theme').val(); options.general.popupOuterTheme = $('#popup-outer-theme').val(); options.general.customPopupCss = $('#custom-popup-css').val(); @@ -112,7 +113,8 @@ async function formWrite(options) { $('#popup-horizontal-offset2').val(options.general.popupHorizontalOffset2); $('#popup-vertical-offset2').val(options.general.popupVerticalOffset2); $('#popup-scaling-factor').val(options.general.popupScalingFactor); - $('#popup-scale-relative-to-page-zoom').val(options.general.popupScaleRelativeToPageZoom ? 'true' : 'false'); + $('#popup-scale-relative-to-page-zoom').prop('checked', options.general.popupScaleRelativeToPageZoom); + $('#popup-scale-relative-to-visual-viewport').prop('checked', options.general.popupScaleRelativeToVisualViewport); $('#popup-theme').val(options.general.popupTheme); $('#popup-outer-theme').val(options.general.popupOuterTheme); $('#custom-popup-css').val(options.general.customPopupCss); diff --git a/ext/bg/settings.html b/ext/bg/settings.html index 37ee20aa..a283335c 100644 --- a/ext/bg/settings.html +++ b/ext/bg/settings.html @@ -150,6 +150,14 @@
+
+ +
+ +
+ +
+
@@ -171,6 +179,11 @@
+
+ + +
+
@@ -237,22 +250,6 @@
-
-
-
- - -
-
- - -
-
-
-
-- cgit v1.2.3 From aa5a044dade6a6b4caaa368215b96add53a312b4 Mon Sep 17 00:00:00 2001 From: siikamiika Date: Sat, 25 Jan 2020 02:56:14 +0200 Subject: query parser: add reading mode 'none' --- ext/bg/data/options-schema.json | 2 +- ext/bg/settings.html | 1 + ext/mixed/js/japanese.js | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'ext/bg/settings.html') diff --git a/ext/bg/data/options-schema.json b/ext/bg/data/options-schema.json index 3cb25218..224b93f8 100644 --- a/ext/bg/data/options-schema.json +++ b/ext/bg/data/options-schema.json @@ -398,7 +398,7 @@ }, "readingMode": { "type": "string", - "enum": ["hiragana", "katakana", "romaji"], + "enum": ["hiragana", "katakana", "romaji", "none"], "default": "hiragana" } } diff --git a/ext/bg/settings.html b/ext/bg/settings.html index a283335c..4b73e02c 100644 --- a/ext/bg/settings.html +++ b/ext/bg/settings.html @@ -457,6 +457,7 @@ +
diff --git a/ext/mixed/js/japanese.js b/ext/mixed/js/japanese.js index 23b2bd36..c9bc7b87 100644 --- a/ext/mixed/js/japanese.js +++ b/ext/mixed/js/japanese.js @@ -80,6 +80,8 @@ function jpConvertReading(expressionFragment, readingFragment, readingMode) { } } return readingFragment; + case 'none': + return null; default: return readingFragment; } -- cgit v1.2.3 From fa4004437d8ca5aff34c31f61ce8aea485be24d1 Mon Sep 17 00:00:00 2001 From: siikamiika Date: Sat, 25 Jan 2020 02:57:57 +0200 Subject: query parser: add toggle for term spacing --- ext/bg/data/options-schema.json | 5 +++++ ext/bg/js/search-query-parser.js | 5 +++++ ext/bg/js/settings/main.js | 1 + ext/bg/settings.html | 4 ++++ ext/mixed/css/display.css | 2 +- 5 files changed, 16 insertions(+), 1 deletion(-) (limited to 'ext/bg/settings.html') diff --git a/ext/bg/data/options-schema.json b/ext/bg/data/options-schema.json index 224b93f8..d4bd3c21 100644 --- a/ext/bg/data/options-schema.json +++ b/ext/bg/data/options-schema.json @@ -381,6 +381,7 @@ "enableScanningParser", "enableMecabParser", "selectedParser", + "termSpacing", "readingMode" ], "properties": { @@ -396,6 +397,10 @@ "type": ["string", "null"], "default": null }, + "termSpacing": { + "type": "boolean", + "default": true + }, "readingMode": { "type": "string", "enum": ["hiragana", "katakana", "romaji", "none"], diff --git a/ext/bg/js/search-query-parser.js b/ext/bg/js/search-query-parser.js index 8115dd46..e8e6d11f 100644 --- a/ext/bg/js/search-query-parser.js +++ b/ext/bg/js/search-query-parser.js @@ -88,6 +88,11 @@ class QueryParser extends TextScanner { ]; } + setOptions(options) { + super.setOptions(options); + this.queryParser.dataset.termSpacing = `${options.parsing.termSpacing}`; + } + refreshSelectedParser() { if (this.parseResults.length > 0) { if (this.selectedParser === null) { diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js index ac255978..bed57f7d 100644 --- a/ext/bg/js/settings/main.js +++ b/ext/bg/js/settings/main.js @@ -74,6 +74,7 @@ async function formRead(options) { options.parsing.enableScanningParser = $('#parsing-scan-enable').prop('checked'); options.parsing.enableMecabParser = $('#parsing-mecab-enable').prop('checked'); + options.parsing.termSpacing = $('#parsing-term-spacing').prop('checked'); options.parsing.readingMode = $('#parsing-reading-mode').val(); const optionsAnkiEnableOld = options.anki.enable; diff --git a/ext/bg/settings.html b/ext/bg/settings.html index 4b73e02c..f73f79c8 100644 --- a/ext/bg/settings.html +++ b/ext/bg/settings.html @@ -451,6 +451,10 @@
+
+ +
+
+ + + + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +

Popup Content Scanning Options

-- cgit v1.2.3 From 538d83c5a6d846adfd275462910888572d52caf1 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Thu, 23 Jan 2020 20:28:38 -0500 Subject: Reorganized variants to better reflect usage order --- ext/bg/data/options-schema.json | 14 +++++++------- ext/bg/js/options.js | 4 ++-- ext/bg/js/settings/main.js | 4 ++-- ext/bg/js/translator.js | 14 +++++++++----- ext/bg/settings.html | 16 ++++++++-------- 5 files changed, 28 insertions(+), 24 deletions(-) (limited to 'ext/bg/settings.html') diff --git a/ext/bg/data/options-schema.json b/ext/bg/data/options-schema.json index c65a40df..8385d638 100644 --- a/ext/bg/data/options-schema.json +++ b/ext/bg/data/options-schema.json @@ -354,17 +354,12 @@ "translation": { "type": "object", "required": [ - "convertKatakanaToHiragana", "convertHalfWidthCharacters", "convertNumericCharacters", - "convertAlphabeticCharacters" + "convertAlphabeticCharacters", + "convertKatakanaToHiragana" ], "properties": { - "convertKatakanaToHiragana": { - "type": "string", - "enum": ["false", "true", "variant"], - "default": "variant" - }, "convertHalfWidthCharacters": { "type": "string", "enum": ["false", "true", "variant"], @@ -379,6 +374,11 @@ "type": "string", "enum": ["false", "true", "variant"], "default": "false" + }, + "convertKatakanaToHiragana": { + "type": "string", + "enum": ["false", "true", "variant"], + "default": "variant" } } }, diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js index c4ccd450..fd67ca70 100644 --- a/ext/bg/js/options.js +++ b/ext/bg/js/options.js @@ -320,10 +320,10 @@ function profileOptionsCreateDefaults() { }, translation: { - convertKatakanaToHiragana: 'variant', convertHalfWidthCharacters: 'false', convertNumericCharacters: 'false', - convertAlphabeticCharacters: 'false' + convertAlphabeticCharacters: 'false', + convertKatakanaToHiragana: 'variant' }, dictionaries: {}, diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js index 2130dd5a..900a0a09 100644 --- a/ext/bg/js/settings/main.js +++ b/ext/bg/js/settings/main.js @@ -72,10 +72,10 @@ async function formRead(options) { options.scanning.modifier = $('#scan-modifier-key').val(); options.scanning.popupNestingMaxDepth = parseInt($('#popup-nesting-max-depth').val(), 10); - options.translation.convertKatakanaToHiragana = $('#translation-convert-katakana-to-hiragana').val(); options.translation.convertHalfWidthCharacters = $('#translation-convert-half-width-characters').val(); options.translation.convertNumericCharacters = $('#translation-convert-numeric-characters').val(); options.translation.convertAlphabeticCharacters = $('#translation-convert-alphabetic-characters').val(); + options.translation.convertKatakanaToHiragana = $('#translation-convert-katakana-to-hiragana').val(); options.parsing.enableScanningParser = $('#parsing-scan-enable').prop('checked'); options.parsing.enableMecabParser = $('#parsing-mecab-enable').prop('checked'); @@ -145,10 +145,10 @@ async function formWrite(options) { $('#scan-modifier-key').val(options.scanning.modifier); $('#popup-nesting-max-depth').val(options.scanning.popupNestingMaxDepth); - $('#translation-convert-katakana-to-hiragana').val(options.translation.convertKatakanaToHiragana); $('#translation-convert-half-width-characters').val(options.translation.convertHalfWidthCharacters); $('#translation-convert-numeric-characters').val(options.translation.convertNumericCharacters); $('#translation-convert-alphabetic-characters').val(options.translation.convertAlphabeticCharacters); + $('#translation-convert-katakana-to-hiragana').val(options.translation.convertKatakanaToHiragana); $('#parsing-scan-enable').prop('checked', options.parsing.enableScanningParser); $('#parsing-mecab-enable').prop('checked', options.parsing.enableMecabParser); diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js index cda1099f..6ddf5431 100644 --- a/ext/bg/js/translator.js +++ b/ext/bg/js/translator.js @@ -323,27 +323,31 @@ class Translator { getAllDeinflections(text, options) { const translationOptions = options.translation; const textOptionVariantArray = [ - Translator.getTextOptionEntryVariants(translationOptions.convertKatakanaToHiragana), Translator.getTextOptionEntryVariants(translationOptions.convertHalfWidthCharacters), Translator.getTextOptionEntryVariants(translationOptions.convertNumericCharacters), - Translator.getTextOptionEntryVariants(translationOptions.convertAlphabeticCharacters) + Translator.getTextOptionEntryVariants(translationOptions.convertAlphabeticCharacters), + Translator.getTextOptionEntryVariants(translationOptions.convertKatakanaToHiragana) ]; const deinflections = []; const used = new Set(); - for (const [hiragana, halfWidth, numeric, alphabetic] of Translator.getArrayVariants(textOptionVariantArray)) { + for (const [halfWidth, numeric, alphabetic, hiragana] of Translator.getArrayVariants(textOptionVariantArray)) { let text2 = text; let sourceMapping = null; if (halfWidth) { if (sourceMapping === null) { sourceMapping = Translator.createTextSourceMapping(text2); } text2 = jpConvertHalfWidthKanaToFullWidth(text2, sourceMapping); } - if (numeric) { text2 = jpConvertNumericTofullWidth(text2); } + if (numeric) { + text2 = jpConvertNumericTofullWidth(text2); + } if (alphabetic) { if (sourceMapping === null) { sourceMapping = Translator.createTextSourceMapping(text2); } text2 = jpConvertAlphabeticToKana(text2, sourceMapping); } - if (hiragana) { text2 = jpKatakanaToHiragana(text2); } + if (hiragana) { + text2 = jpKatakanaToHiragana(text2); + } for (let i = text2.length; i > 0; --i) { const text2Substring = text2.substring(0, i); diff --git a/ext/bg/settings.html b/ext/bg/settings.html index d5b53a80..fdc4298b 100644 --- a/ext/bg/settings.html +++ b/ext/bg/settings.html @@ -401,8 +401,8 @@

Translation Options

- - @@ -410,8 +410,8 @@
- - @@ -419,8 +419,8 @@
- - @@ -428,8 +428,8 @@
- - -- cgit v1.2.3 From 67759b7aa3e4be1b90d8244b2337288120a42a4e Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Thu, 23 Jan 2020 20:49:41 -0500 Subject: Add convertHiraganaToKatakana option --- ext/bg/data/options-schema.json | 6 ++++++ ext/bg/js/options.js | 1 + ext/bg/js/settings/main.js | 2 ++ ext/bg/js/translator.js | 6 +++++- ext/bg/settings.html | 9 +++++++++ 5 files changed, 23 insertions(+), 1 deletion(-) (limited to 'ext/bg/settings.html') diff --git a/ext/bg/data/options-schema.json b/ext/bg/data/options-schema.json index 8385d638..c65bb1e9 100644 --- a/ext/bg/data/options-schema.json +++ b/ext/bg/data/options-schema.json @@ -357,6 +357,7 @@ "convertHalfWidthCharacters", "convertNumericCharacters", "convertAlphabeticCharacters", + "convertHiraganaToKatakana", "convertKatakanaToHiragana" ], "properties": { @@ -375,6 +376,11 @@ "enum": ["false", "true", "variant"], "default": "false" }, + "convertHiraganaToKatakana": { + "type": "string", + "enum": ["false", "true", "variant"], + "default": "false" + }, "convertKatakanaToHiragana": { "type": "string", "enum": ["false", "true", "variant"], diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js index fd67ca70..120b34af 100644 --- a/ext/bg/js/options.js +++ b/ext/bg/js/options.js @@ -323,6 +323,7 @@ function profileOptionsCreateDefaults() { convertHalfWidthCharacters: 'false', convertNumericCharacters: 'false', convertAlphabeticCharacters: 'false', + convertHiraganaToKatakana: 'false', convertKatakanaToHiragana: 'variant' }, diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js index 900a0a09..6dccc7e0 100644 --- a/ext/bg/js/settings/main.js +++ b/ext/bg/js/settings/main.js @@ -75,6 +75,7 @@ async function formRead(options) { options.translation.convertHalfWidthCharacters = $('#translation-convert-half-width-characters').val(); options.translation.convertNumericCharacters = $('#translation-convert-numeric-characters').val(); options.translation.convertAlphabeticCharacters = $('#translation-convert-alphabetic-characters').val(); + options.translation.convertHiraganaToKatakana = $('#translation-convert-hiragana-to-katakana').val(); options.translation.convertKatakanaToHiragana = $('#translation-convert-katakana-to-hiragana').val(); options.parsing.enableScanningParser = $('#parsing-scan-enable').prop('checked'); @@ -148,6 +149,7 @@ async function formWrite(options) { $('#translation-convert-half-width-characters').val(options.translation.convertHalfWidthCharacters); $('#translation-convert-numeric-characters').val(options.translation.convertNumericCharacters); $('#translation-convert-alphabetic-characters').val(options.translation.convertAlphabeticCharacters); + $('#translation-convert-hiragana-to-katakana').val(options.translation.convertHiraganaToKatakana); $('#translation-convert-katakana-to-hiragana').val(options.translation.convertKatakanaToHiragana); $('#parsing-scan-enable').prop('checked', options.parsing.enableScanningParser); diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js index 6ddf5431..0f89111f 100644 --- a/ext/bg/js/translator.js +++ b/ext/bg/js/translator.js @@ -326,12 +326,13 @@ class Translator { Translator.getTextOptionEntryVariants(translationOptions.convertHalfWidthCharacters), Translator.getTextOptionEntryVariants(translationOptions.convertNumericCharacters), Translator.getTextOptionEntryVariants(translationOptions.convertAlphabeticCharacters), + Translator.getTextOptionEntryVariants(translationOptions.convertHiraganaToKatakana), Translator.getTextOptionEntryVariants(translationOptions.convertKatakanaToHiragana) ]; const deinflections = []; const used = new Set(); - for (const [halfWidth, numeric, alphabetic, hiragana] of Translator.getArrayVariants(textOptionVariantArray)) { + for (const [halfWidth, numeric, alphabetic, katakana, hiragana] of Translator.getArrayVariants(textOptionVariantArray)) { let text2 = text; let sourceMapping = null; if (halfWidth) { @@ -345,6 +346,9 @@ class Translator { if (sourceMapping === null) { sourceMapping = Translator.createTextSourceMapping(text2); } text2 = jpConvertAlphabeticToKana(text2, sourceMapping); } + if (katakana) { + text2 = jpHiraganaToKatakana(text2); + } if (hiragana) { text2 = jpKatakanaToHiragana(text2); } diff --git a/ext/bg/settings.html b/ext/bg/settings.html index fdc4298b..e9c4d7eb 100644 --- a/ext/bg/settings.html +++ b/ext/bg/settings.html @@ -427,6 +427,15 @@
+
+ + +
+
-- cgit v1.2.3