From 1e72b97a51411f66a2102453e90e52f9197d56df Mon Sep 17 00:00:00 2001
From: Rod Begbie <rod@offlinelabs.com>
Date: Mon, 28 May 2012 16:38:17 -0700
Subject: [PATCH] Fix for initial font-size guess being too big.

Fix the case where the maxFontSize is just slightly too big
for the space available, and BigText's initial guess is larger
than maxFontSize.

(also, some light cleanup to make jshint happy)
---
 bigtext.js | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/bigtext.js b/bigtext.js
index 0fa796f..2f15ffb 100644
--- a/bigtext.js
+++ b/bigtext.js
@@ -65,9 +65,9 @@
                 BigText.clearCss(id);
 
                 for(var j=0, k=linesFontSizes.length; j<k; j++) {
-                    css.push('#' + id + ' .' + BigText.LINE_CLASS_PREFIX + j + ' {' + 
-                        (minFontSizes[j] ? ' white-space: normal;' : '') + 
-                        (linesFontSizes[j] ? ' font-size: ' + linesFontSizes[j] + 'px;' : '') + 
+                    css.push('#' + id + ' .' + BigText.LINE_CLASS_PREFIX + j + ' {' +
+                        (minFontSizes[j] ? ' white-space: normal;' : '') +
+                        (linesFontSizes[j] ? ' font-size: ' + linesFontSizes[j] + 'px;' : '') +
                         (lineWordSpacings[j] ? ' word-spacing: ' + lineWordSpacings[j] + 'px;' : '') +
                         '}');
                 }
@@ -77,14 +77,14 @@
             jQueryMethod: function(options)
             {
                 BigText.init();
-        
+
                 options = $.extend({
                             minfontsize: BigText.DEFAULT_MIN_FONT_SIZE_PX,
                             maxfontsize: BigText.DEFAULT_MAX_FONT_SIZE_PX,
                             childSelector: '',
                             resize: true
                         }, options || {});
-            
+
                 return this.each(function()
                 {
                     var $t = $(this).addClass('bigtext'),
@@ -93,28 +93,28 @@
                                     BigText.DEFAULT_CHILD_SELECTOR,
                         maxWidth = $t.width(),
                         id = $t.attr('id');
-        
+
                     if(!id) {
                         id = 'bigtext-id' + (counter++);
                         $t.attr('id', id);
                     }
-        
+
                     if(options.resize) {
                         BigText.bindResize('resize.bigtext-event-' + id, function()
                         {
                             BigText.jQueryMethod.call($('#' + id), options);
                         });
                     }
-        
+
                     BigText.clearCss(id);
-        
+
                     $t.find(childSelector).addClass(function(lineNumber, className)
                     {
                         // remove existing line classes.
                         return [className.replace(new RegExp('\\b' + BigText.LINE_CLASS_PREFIX + '\\d+\\b'), ''),
                                 BigText.LINE_CLASS_PREFIX + lineNumber].join(' ');
                     });
-        
+
                     var sizes = calculateSizes($t, childSelector, maxWidth, options.maxfontsize, options.minfontsize);
                     $headCache.append(BigText.generateCss(id, sizes.fontSizes, sizes.wordSpacings, sizes.minFontSizes));
                 });
@@ -134,7 +134,7 @@
             if(width == maxWidth) {
                 return {
                     match: 'exact',
-                    size: parseFloat((parseFloat(size) - .1).toFixed(3))
+                    size: parseFloat((parseFloat(size) - 0.1).toFixed(3))
                 };
             }
 
@@ -173,7 +173,7 @@
             'clear': 'left'
         }).each(function(lineNumber) {
             var $line = $(this),
-                intervals = [4,1,.4,.1],
+                intervals = [4, 1, 0.4, 0.1],
                 lineMax;
 
             if($line.hasClass(BigText.EXEMPT_CLASS)) {
@@ -190,6 +190,10 @@
                 ratio = (lineWidth / currentFontSize).toFixed(6),
                 newFontSize = parseFloat(((maxWidth - autoGuessSubtraction) / ratio).toFixed(3));
 
+            while (newFontSize + intervals[0] > maxFontSize) {
+                newFontSize = newFontSize - 1;
+            }
+
             outer: for(var m=0, n=intervals.length; m<n; m++) {
                 inner: for(var j=1, k=4; j<=k; j++) {
                     if(newFontSize + j*intervals[m] > maxFontSize) {