Font:getWrap's second return value is now a table containing the text split into lines. Resolves issue #1002.

src/modules/graphics/opengl/wrap_Font.cpp

@@ -19,8 +19,12 @@
  **/
 
 // LOVE
+#include "common/config.h"
 #include "wrap_Font.h"
 
+// C++
+#include <algorithm>
+
 namespace love
 {
 namespace graphics
@@ -54,23 +58,24 @@ int w_Font_getWrap(lua_State *L)
 	Font *t = luax_checkfont(L, 1);
 	const char *str = luaL_checkstring(L, 2);
 	float wrap = (float) luaL_checknumber(L, 3);
-	int max_width = 0, numlines = 0;
+	int max_width = 0;
 	std::vector<std::string> lines;
 	std::vector<int> widths;
 
-	luax_catchexcept(L, [&]() {
+	luax_catchexcept(L, [&]() { t->getWrap(str, wrap, lines, &widths); });
-		t->getWrap(str, wrap, lines, &widths);
-		numlines = (int) lines.size();
-	});
 
 	for (int width : widths)
-	{
+		max_width = std::max(max_width, width);
-		if (width > max_width)
-			max_width = width;
-	}
 
 	lua_pushinteger(L, max_width);
-	lua_pushinteger(L, numlines);
+	lua_createtable(L, (int) lines.size(), 0);
+
+	for (int i = 0; i < (int) lines.size(); i++)
+	{
+		lua_pushstring(L, lines[i].c_str());
+		lua_rawseti(L, -2, i + 1);
+	}
+
 	return 2;
 }
 
@@ -148,8 +153,7 @@ int w_Font_hasGlyphs(lua_State *L)
 	Font *t = luax_checkfont(L, 1);
 	bool hasglyph = false;
 
-	int count = lua_gettop(L) - 1;
+	int count = std::max(lua_gettop(L) - 1, 1);
-	count = count < 1 ? 1 : count;
 
 	luax_catchexcept(L, [&]() {
 		 for (int i = 2; i < count + 2; i++)