Add hyphenation and text appearance options for EPUBs (#4256)

And remove duplicate string

chrome/content/zotero/preferences/preferences_general.xhtml

@@ -189,6 +189,13 @@
 					<menupopup/>
 				</menulist>
 			</hbox>
+
+			<checkbox
+				class="indented-pref"
+				preference="extensions.zotero.reader.ebookHyphenate"
+				data-l10n-id="preferences-reader-ebook-hyphenate"
+				native="true"
+			/>
 		</groupbox>
 		
 		<groupbox id="zotero-prefpane-locate-groupbox">

chrome/content/zotero/xpcom/reader.js

@@ -202,6 +202,7 @@ class ReaderInstance {
 			showAnnotations: true,
 			useDarkModeForContent: Zotero.Prefs.get('reader.contentDarkMode'),
 			fontFamily: Zotero.Prefs.get('reader.ebookFontFamily'),
+			hyphenation: Zotero.Prefs.get('reader.ebookHyphenate'),
 			onOpenContextMenu: () => {
 				// Functions can only be passed over wrappedJSObject (we call back onClick for context menu items)
 				this._openContextMenu(this._iframeWindow.wrappedJSObject.contextMenuParams);
@@ -527,7 +528,8 @@ class ReaderInstance {
 			Zotero.Prefs.registerObserver('fontSize', this._handleFontSizeChange),
 			Zotero.Prefs.registerObserver('tabs.title.reader', this._handleTabTitlePrefChange),
 			Zotero.Prefs.registerObserver('reader.contentDarkMode', this._handleContentDarkModeChange),
-			Zotero.Prefs.registerObserver('reader.ebookFontFamily', this._handleFontFamilyChange),
+			Zotero.Prefs.registerObserver('reader.ebookFontFamily', this._handleEbookPrefChange),
+			Zotero.Prefs.registerObserver('reader.ebookHyphenate', this._handleEbookPrefChange),
 		];
 
 		return true;
@@ -858,8 +860,9 @@ class ReaderInstance {
 		this._internalReader.useDarkModeForContent(Zotero.Prefs.get('reader.contentDarkMode'));
 	};
 
-	_handleFontFamilyChange = () => {
+	_handleEbookPrefChange = () => {
 		this._internalReader.setFontFamily(Zotero.Prefs.get('reader.ebookFontFamily'));
+		this._internalReader.setHyphenate(Zotero.Prefs.get('reader.ebookHyphenate'));
 	};
 
 	_dataURLtoBlob(dataurl) {

chrome/locale/en-US/zotero/preferences.ftl

@@ -24,6 +24,8 @@ preferences-reader-open-snapshots-using = Open snapshots using
 preferences-reader-open-in-new-window =
     .label = Open files in new windows instead of tabs
 preferences-reader-ebook-font = Ebook font:
+preferences-reader-ebook-hyphenate =
+    .label = Enable automatic hyphenation
 
 preferences-color-scheme = Color Scheme:
 preferences-color-scheme-auto =

chrome/locale/en-US/zotero/zotero.properties

@@ -1438,7 +1438,6 @@ pdfReader.phraseNotFound = Phrase not found
 pdfReader.find = Find
 pdfReader.close = Close
 pdfReader.showThumbnails = Show Thumbnails
-pdfReader.showAnnotations = Show Annotations
 pdfReader.showOutline = Show Outline
 pdfReader.findPrevious = Find the previous occurrence of the phrase
 pdfReader.findNext = Find the next occurrence of the phrase
@@ -1448,6 +1447,13 @@ pdfReader.toggleContextPane = Toggle Context Pane
 pdfReader.highlightAll = Highlight all
 pdfReader.matchCase = Match case
 pdfReader.wholeWords = Whole words
+pdfReader.epubAppearance = Appearance
+pdfReader.epubAppearance.lineHeight = Line height
+pdfReader.epubAppearance.wordSpacing = Word spacing
+pdfReader.epubAppearance.letterSpacing = Letter spacing
+pdfReader.epubAppearance.lineHeight.revert = Use default line height
+pdfReader.epubAppearance.wordSpacing.revert = Use default word spacing
+pdfReader.epubAppearance.letterSpacing.revert = Use default letter spacing
 
 spellCheck.checkSpelling = Check Spelling
 spellCheck.addRemoveDictionaries = Add/Remove Dictionaries…

defaults/preferences/zotero.js

@@ -224,6 +224,7 @@ pref("extensions.zotero.tabs.title.reader", "titleCreatorYear");
 // Reader
 pref("extensions.zotero.reader.contentDarkMode", true);
 pref("extensions.zotero.reader.ebookFontFamily", "Georgia, serif");
+pref("extensions.zotero.reader.ebookHyphenate", true);
 
 // Set color scheme to auto by default
 pref("browser.theme.toolbar-theme", 2);

reader

@@ -1 +1 @@
-Subproject commit d90650c9125ef68488ffadfe737c9d9715555d73
+Subproject commit be7deca7cebdb6d14a9bb4440b5b09edc456338b