diff --git a/gajim/htmltextview.py b/gajim/htmltextview.py
index ac8ce38ba3fdb34643bcacff42eaffd2681b631e..ef22227f1163715afa4483d4841f90a762ef7255 100644
--- a/gajim/htmltextview.py
+++ b/gajim/htmltextview.py
@@ -230,13 +230,6 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
tag.set_property('background-gdk', color)
tag.set_property('paragraph-background-gdk', color)
- def _get_current_attributes(self):
- attrs = self.textview.get_default_attributes()
- self.iter.backward_char()
- attrs = (self.iter.get_attributes())[1]
- self.iter.forward_char()
- return attrs
-
def __parse_length_frac_size_allocate(self, textview, allocation, frac,
callback, args):
callback(allocation.width*frac, *args)
@@ -338,30 +331,19 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
def _parse_style_font_size(self, tag, value):
try:
- # see http://developer.gnome.org/pango/stable/pango-Text-Attributes.html#PANGO-SCALE-XX-SMALL:CAPS
- # http://consciouslyusing.blogspot.ru/2012/01/heads-up-missing-pango-text-scale.html
scale = {
- #'xx-small': Pango.SCALE_XX_SMALL,
- #'x-small': Pango.SCALE_X_SMALL,
- #'small': Pango.SCALE_SMALL,
- #'medium': Pango.SCALE_MEDIUM,
- #'large': Pango.SCALE_LARGE,
- #'x-large': Pango.SCALE_X_LARGE,
- #'xx-large': Pango.SCALE_XX_LARGE,
- 'xx-small': 0.5787037037037,
- 'x-small': 0.6444444444444,
- 'small': 0.8333333333333,
- 'medium': 1.0,
- 'large': 1.2,
- 'x-large': 1.4399999999999,
- 'xx-large': 1.728,
- }[value]
+ 'xx-small': 0.5787037037037,
+ 'x-small': 0.6444444444444,
+ 'small': 0.8333333333333,
+ 'medium': 1.0,
+ 'large': 1.2,
+ 'x-large': 1.4399999999999,
+ 'xx-large': 1.728,
+ }[value]
except KeyError:
pass
else:
- attrs = self._get_current_attributes()
- if attrs.font_scale == 0:
- tag.set_property('scale', scale)
+ tag.set_property('scale', scale)
return
if value == 'smaller':
tag.set_property('scale', 0.8333333333333)
diff --git a/test/gtk/htmltextview.py b/test/gtk/htmltextview.py
index 6b296c7798342ef7110bde1e7bd1568eb3bf9dd7..48ecb0b3f4d87deb6f6d7100040871bf4e44ab7f 100644
--- a/test/gtk/htmltextview.py
+++ b/test/gtk/htmltextview.py
@@ -19,6 +19,10 @@ app.interface = Interface()
XHTML = [
+ '''
+ <body xmlns='http://www.w3.org/1999/xhtml'><p><span style='font-size: xx-large;'>rexxnor: i nimes chum a...</span></p></body>
+ ''',
+
'''
<div>
<span style="color: red; text-decoration:underline">Hello</span>