From 9527cae7148a3c3c77b5a6b39727f1559d2f18c0 Mon Sep 17 00:00:00 2001 From: malc Date: Thu, 7 Jun 2018 09:04:38 +0300 Subject: [PATCH] Cosmetics --- main.ml | 54 ++++++++++++++++++++++++------------------------------ 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/main.ml b/main.ml index 2921c27..73bf8e8 100644 --- a/main.ml +++ b/main.ml @@ -236,21 +236,18 @@ let layoutN ((columns, coverA, coverB), b) x y sw sh = let pagevh = min (h - pagey) (sh - pagedispy) in if pagevw > 0 && pagevh > 0 then - let e = - { pageno = n - ; pagedimno = pdimno - ; pagew = w - ; pageh = h - ; pagex = pagex - ; pagey = pagey - ; pagevw = pagevw - ; pagevh = pagevh - ; pagedispx = pagedispx - ; pagedispy = pagedispy - ; pagecol = 0 - } - in - e :: accu + { pageno = n + ; pagedimno = pdimno + ; pagew = w + ; pageh = h + ; pagex = pagex + ; pagey = pagey + ; pagevw = pagevw + ; pagevh = pagevh + ; pagedispx = pagedispx + ; pagedispy = pagedispy + ; pagecol = 0 + } :: accu else accu else accu in @@ -305,21 +302,18 @@ let layoutS (columns, b) x y sw sh = let pagevh = min (pageh - pagey) (sh - pagedispy) in if pagevw > 0 && pagevh > 0 then - let e = - { pageno = n/columns - ; pagedimno = pdimno - ; pagew = pagew - ; pageh = pageh - ; pagex = pagex - ; pagey = pagey - ; pagevw = pagevw - ; pagevh = pagevh - ; pagedispx = pagedispx - ; pagedispy = pagedispy - ; pagecol = n mod columns - } - in - e :: accu + { pageno = n/columns + ; pagedimno = pdimno + ; pagew = pagew + ; pageh = pageh + ; pagex = pagex + ; pagey = pagey + ; pagevw = pagevw + ; pagevh = pagevh + ; pagedispx = pagedispx + ; pagedispy = pagedispy + ; pagecol = n mod columns + } :: accu else accu else accu in -- 2.11.4.GIT