From 78d4f915a8d668fe90c94ff846376b6bd6b5b94a Mon Sep 17 00:00:00 2001
From: chrox <chrox.huang@gmail.com>
Date: Thu, 24 Oct 2013 21:29:12 +0800
Subject: [PATCH] set auto detect word gap in reflowing by default

---
 defaults.lua                        | 6 +++---
 frontend/document/koptinterface.lua | 1 -
 frontend/ui/data/koptoptions.lua    | 2 +-
 koreader-base                       | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/defaults.lua b/defaults.lua
index ddb4a1c67..9fdce7758 100644
--- a/defaults.lua
+++ b/defaults.lua
@@ -48,13 +48,13 @@ DKOPTREADER_CONFIG_PAGE_MARGIN = 0.10	-- range from 0.0 to 1.0
 DKOPTREADER_CONFIG_LINE_SPACING = 1.2	-- range from 0.5 to 2.0
 DKOPTREADER_CONFIG_RENDER_QUALITY = 1.0	-- range from 0.5 to 2.0
 DKOPTREADER_CONFIG_AUTO_STRAIGHTEN = 0	-- range from 0 to 10
-DKOPTREADER_CONFIG_JUSTIFICATION = -1	-- -1 = auto, 0 = left, 1 = center, 2 = right, 3 = full
+DKOPTREADER_CONFIG_JUSTIFICATION = 3	-- -1 = auto, 0 = left, 1 = center, 2 = right, 3 = full
 DKOPTREADER_CONFIG_MAX_COLUMNS = 2		-- range from 1 to 4
 DKOPTREADER_CONFIG_CONTRAST = 1.0		-- range from 0.2 to 2.0
 
 -- word spacing for reflow
-DKOPTREADER_CONFIG_WORD_SAPCINGS = {0.05, 0.15, 0.375}  -- range from 0.05 to 0.5
-DKOPTREADER_CONFIG_DEFAULT_WORD_SAPCING = 0.15			-- range from 0.05 to 0.5
+DKOPTREADER_CONFIG_WORD_SAPCINGS = {0.05, -1, 0.375}    -- range from 0.05 to 0.5
+DKOPTREADER_CONFIG_DEFAULT_WORD_SAPCING = -1			-- range from 0.05 to 0.5
 -- document languages for OCR
 DKOPTREADER_CONFIG_DOC_LANGS_TEXT = {"English", "Chinese"}
 DKOPTREADER_CONFIG_DOC_LANGS_CODE = {"eng", "chi_sim"}	-- language code, make sure you have corresponding training data
diff --git a/frontend/document/koptinterface.lua b/frontend/document/koptinterface.lua
index 51e3ebfb0..bdc5f773d 100644
--- a/frontend/document/koptinterface.lua
+++ b/frontend/document/koptinterface.lua
@@ -58,7 +58,6 @@ function KoptInterface:createContext(doc, pageno, bbox)
 		lang == "jpn" or lang == "kor" then
 		kc:setCJKChar()
 	end
-	DEBUG("configurable", doc.configurable)
 	kc:setLanguage(lang)
 	kc:setTrim(doc.configurable.trim_page)
 	kc:setWrap(doc.configurable.text_wrap)
diff --git a/frontend/ui/data/koptoptions.lua b/frontend/ui/data/koptoptions.lua
index 898994e3b..c1aa6d1d0 100644
--- a/frontend/ui/data/koptoptions.lua
+++ b/frontend/ui/data/koptoptions.lua
@@ -182,7 +182,7 @@ local KoptOptions = {
 			{
 				name = "word_spacing",
 				name_text = S.WORD_GAP,
-				toggle = {S.SMALL, S.MEDIUM, S.LARGE},
+				toggle = {S.SMALL, S.AUTO, S.LARGE},
 				values = DKOPTREADER_CONFIG_WORD_SAPCINGS,
 				default_value = DKOPTREADER_CONFIG_DEFAULT_WORD_SAPCING,
 			},
diff --git a/koreader-base b/koreader-base
index 61f28fbbd..669fb3dad 160000
--- a/koreader-base
+++ b/koreader-base
@@ -1 +1 @@
-Subproject commit 61f28fbbddc11c2ed0a600529d68ac91f33e00d6
+Subproject commit 669fb3dad4738f8003ddb4d9bb8da16e95f7ef25