From 8b5475dcb33b8edd90946350f1795fac6f818ddf Mon Sep 17 00:00:00 2001
From: malc <av1474@comtv.ru>
Date: Sun, 4 Mar 2012 03:42:21 +0400
Subject: [PATCH] Refactor

---
 main.ml | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/main.ml b/main.ml
index 82fdec5..2e314ec 100644
--- a/main.ml
+++ b/main.ml
@@ -1101,22 +1101,17 @@ let layout1 y sh =
           ~pdims:rest
           ~accu
   in
-  if nogeomcmds state.geomcmds
-  then (
-    let accu =
-      f
-        ~pageno:0
-        ~pdimno:~-1
-        ~prev:(0,0,0,0)
-        ~py:0
-        ~dy:0
-        ~pdims:state.pdims
-        ~accu:[]
-    in
-    List.rev accu
-  )
-  else
-    []
+  let accu =
+    f
+      ~pageno:0
+      ~pdimno:~-1
+      ~prev:(0,0,0,0)
+      ~py:0
+      ~dy:0
+      ~pdims:state.pdims
+      ~accu:[]
+  in
+  List.rev accu
 ;;
 
 let layoutN ((columns, coverA, coverB), b) y sh =
@@ -1171,15 +1166,16 @@ let layoutN ((columns, coverA, coverB), b) y sh =
         in
         fold accu (n+1)
   in
-  if nogeomcmds state.geomcmds
-  then List.rev (fold [] 0)
-  else []
+  List.rev (fold [] 0)
 ;;
 
 let layout y sh =
-  match conf.columns with
-  | None -> layout1 y sh
-  | Some c -> layoutN c y sh
+  if nogeomcmds state.geomcmds
+  then
+    match conf.columns with
+    | None -> layout1 y sh
+    | Some c -> layoutN c y sh
+  else []
 ;;
 
 let clamp incr =
-- 
2.11.4.GIT