From 51b940dad98e17cffac16cf1b4fcd7e81d650eca Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 25 Sep 2016 13:49:32 +0530
Subject: [PATCH] Use 0 instead of auto for automatic pagination value of cols
 per screen

---
 src/pyj/read_book/paged_mode.pyj | 13 ++++++-------
 src/pyj/read_book/settings.pyj   |  2 +-
 src/pyj/session.pyj              |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/pyj/read_book/paged_mode.pyj b/src/pyj/read_book/paged_mode.pyj
index b66abcb795..34fb7f154b 100644
--- a/src/pyj/read_book/paged_mode.pyj
+++ b/src/pyj/read_book/paged_mode.pyj
@@ -106,15 +106,14 @@ def layout(is_single_page):
     nonlocal _in_paged_mode, col_width, col_and_gap, screen_height, gap, screen_width, is_full_screen_layout, cols_per_screen
     body_style = window.getComputedStyle(document.body)
     first_layout = not _in_paged_mode
-    cps = opts.columns_per_screen
+    cps = opts.columns_per_screen or {}
     cps = cps.landscape if window.innerWidth > window.innerHeight else cps.portrait
-    if cps is 'auto':
+    try:
+        cps = int(cps)
+    except:
+        cps = 0
+    if not cps:
         cps = int(Math.floor(window.innerWidth / 500.0))
-    else:
-        try:
-            cps = int(cps)
-        except:
-            cps = 1
     cps = max(1, min(cps or 1, 20))
     if first_layout:
         handle_rtl_body(body_style)
diff --git a/src/pyj/read_book/settings.pyj b/src/pyj/read_book/settings.pyj
index 5b30de8cc3..18a5723630 100644
--- a/src/pyj/read_book/settings.pyj
+++ b/src/pyj/read_book/settings.pyj
@@ -6,7 +6,7 @@ opts = {}
 
 def apply_settings(settings):
     settings = settings or {}
-    opts.columns_per_screen = settings.columns_per_screen or {'portrait':'auto', 'landscape':'auto'}
+    opts.columns_per_screen = settings.columns_per_screen or {'portrait':0, 'landscape':0}
     opts.margin_left = max(0, settings.margin_left or 0)
     opts.margin_right = max(0, settings.margin_right or 0)
     opts.color_scheme = settings.color_scheme
diff --git a/src/pyj/session.pyj b/src/pyj/session.pyj
index 6c12a80cac..3211efe586 100644
--- a/src/pyj/session.pyj
+++ b/src/pyj/session.pyj
@@ -25,7 +25,7 @@ defaults = {
     'read_mode': 'paged',
     'max_text_height': 0,
     'max_text_width': 0,
-    'columns_per_screen': {'portrait':'auto', 'landscape':'auto'},
+    'columns_per_screen': {'portrait':0, 'landscape':0},
     'current_color_scheme': 'white',
     'user_color_schemes': {},
 }