Update wordspacing calculation to use the line height

Author: NicholasMamo

examples/.ipynb_checkpoints/3. Time Series-checkpoint.ipynb

@@ -56,7 +56,7 @@ def __init__(self, drawable):
 		self.drawable = drawable
 		self.lines = [ ]
 
-	def draw(self, annotation, x, y, wordspacing=0.005, lineheight=1.25,
+	def draw(self, annotation, x, y, wordspacing=None, lineheight=1.25,
 			 align='left', va='top', pad=0, *args, **kwargs):
 		"""
 		Draw the text annotation visualization.
@@ -91,7 +91,8 @@ def draw(self, annotation, x, y, wordspacing=0.005, lineheight=1.25,
 		:param y: The starting y-position of the annotation.
 		:type y: float
 		:param wordspacing: The space between words.
-		:type wordspacing: float
+							If `None` is given, the space is calculated based on the height of the line.
+		:type wordspacing: float or None
 		:param lineheight: The space between lines.
 		:type lineheight: float
 		:param align: The text's alignment.
@@ -267,7 +268,8 @@ def _draw_tokens(self, tokens, x, y, wordspacing, lineheight, align, va,
 		:param y: The starting y-position of the annotation.
 		:type y: float
 		:param wordspacing: The space between words.
-		:type wordspacing: float
+							If `None` is given, the space is calculated based on the height of the line.
+		:type wordspacing: float or None
 		:param lineheight: The space between lines.
 		:type lineheight: float
 		:param align: The text's alignment.
@@ -300,6 +302,9 @@ def _draw_tokens(self, tokens, x, y, wordspacing, lineheight, align, va,
 
 		linespacing = util.get_linespacing(figure, axis, wordspacing, transform=transform, *args, **kwargs) * lineheight
 
+		if wordspacing is None:
+			wordspacing = linespacing / 15.
+
 		"""
 		Go through each token and draw it on the axis.
 		"""

examples/3. Time Series.ipynb

@@ -111,6 +111,7 @@ def get_linespacing(figure, axis, wordspacing=0, transform=None, *args, **kwargs
 	The bbox's padding is calculated in pixels.
 	Therefore it is transformed from the provided axis coordinates to pixels.
 	"""
+	wordspacing = wordspacing or 0
 	wordspacing_px = (axis.transData.transform((wordspacing, 0))[0] -
 					  axis.transData.transform((0, 0))[0])
 	token = axis.text(0, 0, 'None', bbox=dict(pad=wordspacing_px / 2., **bbox_kwargs),