From 2ac2aed13623a1a358327ae23f41cf9ca133edf1 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 7 May 2009 14:18:18 -0700
Subject: [PATCH] Add option to disable font size rescaling

---
 src/calibre/ebooks/conversion/cli.py         |   2 +-
 src/calibre/ebooks/conversion/plumber.py     |   7 +
 src/calibre/ebooks/oeb/transforms/flatcss.py |   3 +-
 src/calibre/gui2/convert/look_and_feel.py    |   3 +
 src/calibre/gui2/convert/look_and_feel.ui    | 163 ++++++++++++-------
 5 files changed, 114 insertions(+), 64 deletions(-)

diff --git a/src/calibre/ebooks/conversion/cli.py b/src/calibre/ebooks/conversion/cli.py
index 6c190759f7..4529f060ad 100644
--- a/src/calibre/ebooks/conversion/cli.py
+++ b/src/calibre/ebooks/conversion/cli.py
@@ -107,7 +107,7 @@ def add_pipeline_options(parser, plumber):
               'LOOK AND FEEL' : (
                   _('Options to control the look and feel of the output'),
                   [
-                      'base_font_size',
+                      'base_font_size', 'disable_font_rescaling',
                       'font_size_mapping',
                       'line_height',
                       'linearize_tables',
diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py
index b409198aac..ee26c3001c 100644
--- a/src/calibre/ebooks/conversion/plumber.py
+++ b/src/calibre/ebooks/conversion/plumber.py
@@ -117,6 +117,13 @@ OptionRecommendation(name='font_size_mapping',
                    )
         ),
 
+OptionRecommendation(name='disable_font_rescaling',
+            recommended_value=False, level=OptionRecommendation.LOW,
+            help=_('Disable all rescaling of font sizes.'
+                   )
+        ),
+
+
 OptionRecommendation(name='line_height',
             recommended_value=0, level=OptionRecommendation.LOW,
             help=_('The line height in pts. Controls spacing between consecutive '
diff --git a/src/calibre/ebooks/oeb/transforms/flatcss.py b/src/calibre/ebooks/oeb/transforms/flatcss.py
index 216697ae53..b2831bf448 100644
--- a/src/calibre/ebooks/oeb/transforms/flatcss.py
+++ b/src/calibre/ebooks/oeb/transforms/flatcss.py
@@ -202,7 +202,8 @@ class CSSFlattener(object):
         if 'bgcolor' in node.attrib:
             cssdict['background-color'] = node.attrib['bgcolor']
             del node.attrib['bgcolor']
-        if 'font-size' in cssdict or tag == 'body':
+        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
diff --git a/src/calibre/gui2/convert/look_and_feel.py b/src/calibre/gui2/convert/look_and_feel.py
index e2015dc380..a6fe4efce9 100644
--- a/src/calibre/gui2/convert/look_and_feel.py
+++ b/src/calibre/gui2/convert/look_and_feel.py
@@ -21,8 +21,11 @@ class LookAndFeelWidget(Widget, Ui_Form):
                 ['dont_justify', 'extra_css', 'base_font_size',
                     'font_size_mapping', 'insert_metadata', 'line_height',
                     'linearize_tables', 'remove_first_image',
+                    'disable_font_rescaling',
                     'remove_paragraph_spacing', 'input_encoding']
                 )
         self.db, self.book_id = db, book_id
         self.initialize_options(get_option, get_help, db, book_id)
+        self.opt_disable_font_rescaling.toggle()
+        self.opt_disable_font_rescaling.toggle()
 
diff --git a/src/calibre/gui2/convert/look_and_feel.ui b/src/calibre/gui2/convert/look_and_feel.ui
index c6a1a715a6..e3be914ffa 100644
--- a/src/calibre/gui2/convert/look_and_feel.ui
+++ b/src/calibre/gui2/convert/look_and_feel.ui
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >
  <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
+ <widget class="QWidget" name="Form" >
+  <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
@@ -10,135 +9,142 @@
     <height>500</height>
    </rect>
   </property>
-  <property name="windowTitle">
+  <property name="windowTitle" >
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout" >
    <item>
-    <layout class="QGridLayout" name="gridLayout_6">
-     <item row="0" column="0" colspan="2">
-      <widget class="QLabel" name="label_18">
-       <property name="text">
+    <layout class="QGridLayout" name="gridLayout_6" >
+     <item row="1" column="0" colspan="2" >
+      <widget class="QLabel" name="label_18" >
+       <property name="text" >
         <string>Base &amp;font size:</string>
        </property>
-       <property name="buddy">
+       <property name="buddy" >
         <cstring>opt_base_font_size</cstring>
        </property>
       </widget>
      </item>
-     <item row="0" column="2">
-      <widget class="QDoubleSpinBox" name="opt_base_font_size">
-       <property name="suffix">
+     <item row="1" column="2" >
+      <widget class="QDoubleSpinBox" name="opt_base_font_size" >
+       <property name="suffix" >
         <string> pt</string>
        </property>
-       <property name="decimals">
+       <property name="decimals" >
         <number>1</number>
        </property>
-       <property name="minimum">
+       <property name="minimum" >
         <double>0.000000000000000</double>
        </property>
-       <property name="maximum">
+       <property name="maximum" >
         <double>30.000000000000000</double>
        </property>
-       <property name="singleStep">
+       <property name="singleStep" >
         <double>1.000000000000000</double>
        </property>
-       <property name="value">
+       <property name="value" >
         <double>15.000000000000000</double>
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
+     <item row="3" column="0" >
+      <widget class="QLabel" name="label" >
+       <property name="text" >
         <string>Line &amp;height:</string>
        </property>
-       <property name="buddy">
+       <property name="buddy" >
         <cstring>opt_line_height</cstring>
        </property>
       </widget>
      </item>
-     <item row="2" column="2">
-      <widget class="QDoubleSpinBox" name="opt_line_height">
-       <property name="suffix">
+     <item row="3" column="2" >
+      <widget class="QDoubleSpinBox" name="opt_line_height" >
+       <property name="suffix" >
         <string> pt</string>
        </property>
-       <property name="decimals">
+       <property name="decimals" >
         <number>1</number>
        </property>
       </widget>
      </item>
-     <item row="4" column="0" colspan="2">
-      <widget class="QCheckBox" name="opt_remove_paragraph_spacing">
-       <property name="text">
+     <item row="5" column="0" colspan="2" >
+      <widget class="QCheckBox" name="opt_remove_paragraph_spacing" >
+       <property name="text" >
         <string>Remove &amp;spacing between paragraphs</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="0" colspan="2">
-      <widget class="QCheckBox" name="opt_dont_justify">
-       <property name="text">
+     <item row="6" column="0" colspan="2" >
+      <widget class="QCheckBox" name="opt_dont_justify" >
+       <property name="text" >
         <string>No text &amp;justification</string>
        </property>
       </widget>
      </item>
-     <item row="6" column="0" colspan="2">
-      <widget class="QCheckBox" name="opt_linearize_tables">
-       <property name="text">
+     <item row="7" column="0" colspan="2" >
+      <widget class="QCheckBox" name="opt_linearize_tables" >
+       <property name="text" >
         <string>&amp;Linearize tables</string>
        </property>
       </widget>
      </item>
-     <item row="7" column="0" colspan="2">
-      <widget class="QCheckBox" name="opt_remove_first_image">
-       <property name="text">
+     <item row="8" column="0" colspan="2" >
+      <widget class="QCheckBox" name="opt_remove_first_image" >
+       <property name="text" >
         <string>Remove &amp;first image from source file</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
+     <item row="2" column="0" >
+      <widget class="QLabel" name="label_2" >
+       <property name="text" >
         <string>Font size &amp;key:</string>
        </property>
-       <property name="buddy">
+       <property name="buddy" >
         <cstring>opt_font_size_mapping</cstring>
        </property>
       </widget>
      </item>
-     <item row="1" column="1" colspan="2">
-      <widget class="QLineEdit" name="opt_font_size_mapping"/>
+     <item row="2" column="1" colspan="2" >
+      <widget class="QLineEdit" name="opt_font_size_mapping" />
      </item>
-     <item row="8" column="0" colspan="2">
-      <widget class="QCheckBox" name="opt_insert_metadata">
-       <property name="text">
+     <item row="9" column="0" colspan="2" >
+      <widget class="QCheckBox" name="opt_insert_metadata" >
+       <property name="text" >
         <string>Insert &amp;metadata at start of book</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="0" colspan="2">
-      <widget class="QLabel" name="label_3">
-       <property name="text">
+     <item row="4" column="0" colspan="2" >
+      <widget class="QLabel" name="label_3" >
+       <property name="text" >
         <string>Input character &amp;encoding</string>
        </property>
-       <property name="buddy">
+       <property name="buddy" >
         <cstring>opt_input_encoding</cstring>
        </property>
       </widget>
      </item>
-     <item row="3" column="2">
-      <widget class="QLineEdit" name="opt_input_encoding"/>
+     <item row="4" column="2" >
+      <widget class="QLineEdit" name="opt_input_encoding" />
+     </item>
+     <item row="0" column="0" >
+      <widget class="QCheckBox" name="opt_disable_font_rescaling" >
+       <property name="text" >
+        <string>&amp;Disable font size rescaling</string>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
       <string>Extra &amp;CSS</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_3">
-      <item row="0" column="0">
-       <widget class="QTextEdit" name="opt_extra_css"/>
+     <layout class="QGridLayout" name="gridLayout_3" >
+      <item row="0" column="0" >
+       <widget class="QTextEdit" name="opt_extra_css" />
       </item>
      </layout>
     </widget>
@@ -146,8 +152,41 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../../work/calibre-pluginize/src/calibre/gui2/images.qrc"/>
-  <include location="../images.qrc"/>
+  <include location="../images.qrc" />
+  <include location="../images.qrc" />
  </resources>
- <connections/>
+ <connections>
+  <connection>
+   <sender>opt_disable_font_rescaling</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>opt_base_font_size</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>154</x>
+     <y>16</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>385</x>
+     <y>40</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>opt_disable_font_rescaling</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>opt_font_size_mapping</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>80</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>285</x>
+     <y>72</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>