Merge branch 'master' of github.com:hwhw/kindlepdfviewer

pdf.c

@@ -105,16 +105,6 @@ static int walkTableOfContent(lua_State *L, fz_outline* ol, int *count, int dept
 		lua_settable(L, -3);
 		lua_pushstring(L, "title");
 
-		/* workaround for misplaced carriage ret in toc entry */
-		int i = 0;
-		while (ol->title[i]) {
-			if (ol->title[i] == 0x0d) {
-				ol->title[i] = ' ';
-			}
-			/*printf("%x|", ol->title[i]);*/
-			i++;
-		}
-
 		lua_pushstring(L, ol->title);
 		lua_settable(L, -3);
 

pdfreader.lua

@@ -336,7 +336,7 @@ function PDFReader:showTOC()
 	-- build menu items
 	for _k,_v in ipairs(toc) do
 		table.insert(menu_items,
-		("        "):rep(_v.depth-1).._v.title)
+		("        "):rep(_v.depth-1) .. _v.title:gsub("\13", ""))
 	end
 	toc_menu = SelectMenu:new{
 		menu_title = "Table of Contents",