diff --git a/src/calibre/ebooks/oeb/transforms/flatcss.py b/src/calibre/ebooks/oeb/transforms/flatcss.py index b2831bf448..bd76af811c 100644 --- a/src/calibre/ebooks/oeb/transforms/flatcss.py +++ b/src/calibre/ebooks/oeb/transforms/flatcss.py @@ -24,6 +24,19 @@ def asfloat(value, default): value = default return float(value) +def dynamic_rescale_factor(node): + classes = node.get('class', '').split(' ') + classes = [x.replace('calibre_rescale_', '') for x in classes if + x.startswith('calibre_rescale_')] + if not classes: return None + factor = 1.0 + for x in classes: + try: + factor *= float(x)/100. + except ValueError: + continue + return factor + class KeyMapper(object): def __init__(self, sbase, dbase, dkey): @@ -202,11 +215,19 @@ class CSSFlattener(object): if 'bgcolor' in node.attrib: cssdict['background-color'] = node.attrib['bgcolor'] del node.attrib['bgcolor'] - if not self.context.disable_font_rescaling and \ - 'font-size' in cssdict or tag == 'body': - fsize = self.fmap[style['font-size']] - cssdict['font-size'] = "%0.5fem" % (fsize / psize) - psize = fsize + if not self.context.disable_font_rescaling: + _sbase = self.sbase if self.sbase is not None else \ + self.context.source.fbase + dyn_rescale = dynamic_rescale_factor(node) + if dyn_rescale is not None: + fsize = self.fmap[_sbase] + fsize *= dyn_rescale + psize = fsize + cssdict['font-size'] = '%0.5fpt'%(fsize) + elif 'font-size' in cssdict or tag == 'body': + fsize = self.fmap[style['font-size']] + cssdict['font-size'] = "%0.5fem" % (fsize / psize) + psize = fsize if cssdict: if self.lineh and self.fbase and tag != 'body': self.clean_edges(cssdict, style, psize) diff --git a/src/calibre/ebooks/oeb/transforms/jacket.py b/src/calibre/ebooks/oeb/transforms/jacket.py index 8c995dadec..c0a656d64d 100644 --- a/src/calibre/ebooks/oeb/transforms/jacket.py +++ b/src/calibre/ebooks/oeb/transforms/jacket.py @@ -25,14 +25,16 @@ class Jacket(object): %(title)s -
-

%(title)s

-

%(jacket)s

-
%(series)s
-
%(tags)s
-
-
- %(comments)s +
+
+

%(title)s

+

%(jacket)s

+
%(series)s
+
%(tags)s
+
+
+ %(comments)s +
diff --git a/src/calibre/web/feeds/news.py b/src/calibre/web/feeds/news.py index b7b0d688d6..36e5829fcd 100644 --- a/src/calibre/web/feeds/news.py +++ b/src/calibre/web/feeds/news.py @@ -231,23 +231,23 @@ class BasicNewsRecipe(Recipe): #: use :member:`extra_css` in your recipe to customize look and feel. template_css = u''' .article_date { - font-size: x-small; color: gray; font-family: monospace; + color: gray; font-family: monospace; } .article_description { - font-size: small; font-family: sans; text-indent: 0pt; + font-family: sans; text-indent: 0pt; } a.article { - font-weight: bold; font-size: large; + font-weight: bold; } a.feed { - font-weight: bold; font-size: large; + font-weight: bold; } .navbar { - font-family:monospace; font-size:8pt + font-family:monospace; } ''' diff --git a/src/calibre/web/feeds/templates.py b/src/calibre/web/feeds/templates.py index 1a6a574129..ede6ec821c 100644 --- a/src/calibre/web/feeds/templates.py +++ b/src/calibre/web/feeds/templates.py @@ -7,7 +7,7 @@ from calibre import preferred_encoding, strftime class Template(MarkupTemplate): - + def generate(self, *args, **kwargs): if not kwargs.has_key('style'): kwargs['style'] = '' @@ -17,20 +17,20 @@ class Template(MarkupTemplate): for arg in args: if isinstance(arg, basestring) and not isinstance(arg, unicode): arg = unicode(arg, 'utf-8', 'replace') - + return MarkupTemplate.generate(self, *args, **kwargs) - + class NavBarTemplate(Template): - + def __init__(self): Template.__init__(self, u'''\ - - -
+

This article was downloaded by ${__appname__} from ${url} @@ -50,7 +50,7 @@ class NavBarTemplate(Template): | Next - | Section menu + | Section menu | Main menu @@ -64,29 +64,29 @@ class NavBarTemplate(Template): ''') - def generate(self, bottom, feed, art, number_of_articles_in_feed, + def generate(self, bottom, feed, art, number_of_articles_in_feed, two_levels, url, __appname__, prefix='', center=True, extra_css=None): if prefix and not prefix.endswith('/'): prefix += '/' return Template.generate(self, bottom=bottom, art=art, feed=feed, - num=number_of_articles_in_feed, + num=number_of_articles_in_feed, two_levels=two_levels, url=url, __appname__=__appname__, prefix=prefix, center=center, extra_css=extra_css) - + class IndexTemplate(Template): - + def __init__(self): Template.__init__(self, u'''\ - - @@ -99,15 +99,17 @@ class IndexTemplate(Template): -

${title}

-

${date}

- +
+

${title}

+

${date}

+ +
''') @@ -118,19 +120,19 @@ class IndexTemplate(Template): date = strftime(datefmt) return Template.generate(self, title=title, date=date, feeds=feeds, extra_css=extra_css) - - + + class FeedTemplate(Template): - + def __init__(self): Template.__init__(self, u'''\ - - @@ -143,61 +145,64 @@ class FeedTemplate(Template): -

${feed.title}

+
+

${feed.title}

${feed.image_alt}
-
+
${feed.description}
-
+
| Up one level |
+
''') - + def generate(self, feed, cutoff, extra_css=None): - return Template.generate(self, feed=feed, cutoff=cutoff, + return Template.generate(self, feed=feed, cutoff=cutoff, extra_css=extra_css) class EmbeddedContent(Template): - + def __init__(self): Template.__init__(self, u'''\ - - ${article.title} - +

${article.title}

${Markup(article.content if len(article.content if article.content else '') > len(article.summary if article.summary else '') else article.summary)}
- + ''') - + def generate(self, article): return Template.generate(self, article=article)