Reduce score fit to width to use 99.5%

This should be enough to ensure that the score fits and is also scaled
as nearly as possib;e to the desired limit.

correct typo in recalculating the score height after scaling to fit
width.

Author: newlandsvalley

examples/scaling/src/Main.purs

@@ -25,7 +25,7 @@ main =
     Right abcTune -> do
       renderer <- initialiseCanvas config
       let
-        desiredWidth = 580
+        desiredWidth = 400
       renderFinalTuneAtWidth config desiredWidth renderer abcTune
     _ ->
       pure $ Just "ABC failed to parse"

src/VexFlow/Score.purs

@@ -148,15 +148,13 @@ scaleConfigToDesiredWidth :: AbcTune -> Config -> Int -> Config
 scaleConfigToDesiredWidth abcTune config desiredWidth =
   let 
     justifiedConfig = justifiedScoreConfig (createScore config abcTune) config
-    -- fit the score to within 98% of the desired width to avoid margin errors
-    scaleFactor = (0.98 * toNumber desiredWidth) / (toNumber justifiedConfig.width)
+    -- fit the score to within 99.5% of the desired width to avoid margin errors
+    scaleFactor = (0.995 * toNumber desiredWidth) / (toNumber justifiedConfig.width)
     newScale = justifiedConfig.scale * scaleFactor 
-    newWidth = desiredWidth
-       -- floor $ (toNumber justifiedConfig.width) * scaleFactor 
-    newHeight = floor $ (toNumber justifiedConfig.width) * scaleFactor 
+    newHeight = floor $ (toNumber justifiedConfig.height) * scaleFactor 
   in 
     justifiedConfig 
-      { width = newWidth
+      { width = desiredWidth
       , height = newHeight 
       , scale = newScale 
       }