Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

E-book viewer: Load all hyphenation patterns to support multi-lingual books

Browse Source
This commit is contained in:
Kovid Goyal 2010-11-24 22:40:04 -07:00
parent cc3a3fa54b
commit 2999279a51
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/viewer/hyphenate/Hyphenator.js
View File

@ -2022,7 +2022,8 @@ var Hyphenator = (function (window) {
if (n.nodeType === 3 && n.data.length >= min) { //type 3 = #text -> hyphenate!
n.data = n.data.replace(Hyphenator.languages[lang].genRegExp, hyphenate);
} else if (n.nodeType === 1) {
if (n.lang !== '') {
// Modified by Kovid to use element lang only if it has been loaded
if (n.lang !== '' && Hyphenator.languages.hasOwnProperty(n.lang)) {
Hyphenator.hyphenate(n, n.lang);
} else {
Hyphenator.hyphenate(n, lang);
@ -2139,4 +2140,4 @@ if (Hyphenator.isBookmarklet()) {
Hyphenator.config({displaytogglebox: true, intermediatestate: 'visible', doframes: true});
Hyphenator.config(Hyphenator.getConfigFromURI());
Hyphenator.run();
}
}

17
src/calibre/gui2/viewer/documentview.py
View File

@ -23,7 +23,8 @@ from calibre.constants import iswindows
from calibre import prints, guess_type
from calibre.gui2.viewer.keys import SHORTCUTS
bookmarks = referencing = hyphenation = jquery = jquery_scrollTo = hyphenator = images =None
bookmarks = referencing = hyphenation = jquery = jquery_scrollTo = \
hyphenator = images = hyphen_pats = None
def load_builtin_fonts():
base = P('fonts/liberation/*.ttf')
@ -202,7 +203,8 @@ class Document(QWebPage):
self.loaded_javascript = False
def load_javascript_libraries(self):
global bookmarks, referencing, hyphenation, jquery, jquery_scrollTo, hyphenator, images
global bookmarks, referencing, hyphenation, jquery, jquery_scrollTo, \
hyphenator, images, hyphen_pats
if self.loaded_javascript:
return
self.loaded_javascript = True
@ -234,12 +236,19 @@ class Document(QWebPage):
return l.lower().replace('_', '-')
if hyphenator is None:
hyphenator = P('viewer/hyphenate/Hyphenator.js', data=True).decode('utf-8')
self.javascript(hyphenator)
if hyphen_pats is None:
hyphen_pats = []
for x in glob.glob(P('viewer/hyphenate/patterns/*.js',
allow_user_override=False)):
with open(x, 'rb') as f:
hyphen_pats.append(f.read().decode('utf-8'))
hyphen_pats = u'\n'.join(hyphen_pats)
self.javascript(hyphenator+hyphen_pats)
p = P('viewer/hyphenate/patterns/%s.js'%lang_name(lang))
if not os.path.exists(p):
lang = default_lang
p = P('viewer/hyphenate/patterns/%s.js'%lang_name(lang))
self.javascript(open(p, 'rb').read().decode('utf-8'))
self.loaded_lang = lang_name(lang)
@pyqtSignature("")