Merge 6628efed8a into a3811b8330

libraries/bitmap_fonts/bitmap_fonts.cpp

@@ -39,6 +39,12 @@ namespace bitmap {
       text_width += letter_spacing * scale;
       codepage = unicode_sorta::PAGE_195; // Reset back to default
     }
+
+    // Do not include the spacing on the final character
+    if (text_width>0) {
+      text_width -= letter_spacing * scale;
+    }
+
     return text_width;
   }
 
@@ -230,4 +236,4 @@ namespace bitmap {
       i = next_break += 1;
     }
   }
-}
+}