Bump version and add j/k scroll to toc, help, meta win

wustho · Feb 11, 2022 · 65a2ea9 · 65a2ea9
1 parent 856cd56
commit 65a2ea9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/epr.py b/epr.py
@@ -41,7 +41,7 @@
 """
 
 
-__version__ = "2.4.12"
+__version__ = "2.4.13"
 __license__ = "MIT"
 __author__ = "Benawi Adha"
 __email__ = "benawiadha@gmail.com"
@@ -438,11 +438,11 @@ def toc(stdscr, src, index):
         if key_toc in range(48, 58): # i.e., k is a numeral
             countstring = countstring + chr(key_toc)
         else:
-            if key_toc in SCROLL_UP or key_toc in PAGE_UP:
+            if key_toc in SCROLL_UP|SCROLL_UP_K or key_toc in PAGE_UP:
                 index -= count
                 if index < 0:
                     index = 0
-            elif key_toc in SCROLL_DOWN or key_toc in PAGE_DOWN:
+            elif key_toc in SCROLL_DOWN|SCROLL_DOWN_J or key_toc in PAGE_DOWN:
                 index += count
                 if index + 1 >= totlines:
                     index = totlines - 1
@@ -522,9 +522,9 @@ def meta(stdscr, ebook):
     padhi = rows - 5 - Y - 4 + 1
 
     while key_meta not in META|QUIT:
-        if key_meta in SCROLL_UP and y > 0:
+        if key_meta in SCROLL_UP|SCROLL_UP_K and y > 0:
             y -= 1
-        elif key_meta in SCROLL_DOWN and y < totlines - hi + 6:
+        elif key_meta in SCROLL_DOWN|SCROLL_DOWN_J and y < totlines - hi + 6:
             y += 1
         elif key_meta in PAGE_UP:
             y = pgup(y, padhi)
@@ -576,9 +576,9 @@ def help(stdscr):
     padhi = rows - 5 - Y - 4 + 1
 
     while key_help not in HELP|QUIT:
-        if key_help in SCROLL_UP and y > 0:
+        if key_help in SCROLL_UP|SCROLL_UP_K and y > 0:
             y -= 1
-        elif key_help in SCROLL_DOWN and y < totlines - hi + 6:
+        elif key_help in SCROLL_DOWN|SCROLL_DOWN_J and y < totlines - hi + 6:
             y += 1
         elif key_help in PAGE_UP:
             y = pgup(y, padhi)

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "epr-reader"
-version = "2.4.12"
+version = "2.4.13"
 description = "CLI Ebook Reader"
 authors = ["Benawi Adha <benawiadha@gmail.com>"]
 license = "MIT"

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name="epr-reader",
-    version="2.4.12",
+    version="2.4.13",
     description="Terminal/CLI Epub Reader",
     long_description=long_description,
     long_description_content_type="text/markdown",