newsworthycharts 1.65.2__tar.gz → 1.65.4__tar.gz

{newsworthycharts-1.65.2/newsworthycharts.egg-info → newsworthycharts-1.65.4}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.65.2
+Version: 1.65.4
 Summary: Matplotlib wrapper to create charts and publish them on Amazon S3
 Home-page: https://github.com/jplusplus/newsworthycharts
-Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.65.2.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.65.4.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -259,6 +259,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.65.4
+
+  - Revert some of the title margin changes
+
+- 1.65.3
+
+  - Dynamic title font size adjustments
+  - Further title margin adjustments
+
 - 1.65.2
 
   - Title margin adjustments

{newsworthycharts-1.65.2 → newsworthycharts-1.65.4}/README.rst

@@ -232,6 +232,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.65.4
+
+  - Revert some of the title margin changes
+
+- 1.65.3
+
+  - Dynamic title font size adjustments
+  - Further title margin adjustments
+
 - 1.65.2
 
   - Title margin adjustments

{newsworthycharts-1.65.2 → newsworthycharts-1.65.4}/newsworthycharts/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.65.2"
+__version__ = "1.65.4"
 
 from .chart import Chart
 from .choroplethmap import ChoroplethMap

{newsworthycharts-1.65.2 → newsworthycharts-1.65.4}/newsworthycharts/chart.py

@@ -91,12 +91,6 @@ class Chart(object):
         self._language = standardize_tag(language)
         self._locale = Locale.parse(self._language.replace("-", "_"))
 
-        # Dynamic typography
-        self._title_font = FontProperties()
-        self._title_font.set_family(self._nwc_style["title_font"])
-        self._title_font.set_size(self._style["figure.titlesize"])
-        self._title_font.set_weight(self._style["figure.titleweight"])
-
         self._fig = Figure(layout="tight")
         FigureCanvas(self._fig)
         self.ax = self._fig.add_subplot(111)
@@ -112,6 +106,15 @@ class Chart(object):
         if height:
             self._h = int(height)
 
+        # Dynamic typography
+        self._title_font = FontProperties()
+        # scale up slightly < 600px, scale down slightly > 600px
+        import math
+        adjusted_fontsize = math.log(self._h, 600)
+        self._title_font.set_family(self._nwc_style["title_font"])
+        self._title_font.set_size(int(adjusted_fontsize * self._style["figure.titlesize"]))
+        self._title_font.set_weight(self._style["figure.titleweight"])
+
         # Chart elements. Made available for fitting.
         self._title_elem = None
         self._subtitle_elem = None
@@ -844,8 +847,7 @@ class Chart(object):
         if self._title_elem:
             rel_height += self._text_rel_height(self._title_elem)
             # Adds a fixed margin below
-            rel_height += 0.01
-            # rel_height += 30 / self._h
+            rel_height += 0.008
         return rel_height
 
     @property
@@ -854,7 +856,8 @@ class Chart(object):
         if self._subtitle_elem:
             rel_height += self._text_rel_height(self._subtitle_elem)
             # Adds a fixed margin below
-            rel_height += 15 / self._h
+            rel_height += 0.012
+            # rel_height += 15 / self._h
         return rel_height
 
     @property

{newsworthycharts-1.65.2 → newsworthycharts-1.65.4/newsworthycharts.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.65.2
+Version: 1.65.4
 Summary: Matplotlib wrapper to create charts and publish them on Amazon S3
 Home-page: https://github.com/jplusplus/newsworthycharts
-Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.65.2.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.65.4.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -259,6 +259,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.65.4
+
+  - Revert some of the title margin changes
+
+- 1.65.3
+
+  - Dynamic title font size adjustments
+  - Further title margin adjustments
+
 - 1.65.2
 
   - Title margin adjustments