Compression.hs: finished updating compression modes (96 mb dictionary…

… for -m2..-m4 and using exe after rep), removed various obsolete *r modes

git-svn-id: https://freearc.svn.sourceforge.net/svnroot/freearc@120 3a4f7f31-9599-433d-91b1-573e8b61252c

Compression.hs

@@ -401,43 +401,31 @@ builtinMethodSubsts = [
     , "0  = storing"
     , "1  = 1b  / $exe=exe+1b"
     , "1x = 1"
-    , "2  = 2b  / $exe=exe+2b  / $text=2t"
-    , "2x = 2xb / $exe=exe+2xb / $text=2xt"
-    , "#  = #b/#t        ;equivalent to the following:  exe+#b / $obj=#b / $text=#t"
-    , "#r = #br/#tr      ; exe+#b / $obj=#b / $text=#tr"
-    , "#x = #bx/#tx      ; exe+#xb/ $obj=#xb/ $text=#xt"
+    , "#  = #rep+exe+#xb / $obj=#rep+#xb / $text=#t"
+    , "#x = #xb/#xt"
     , ""
     , ";Text files compression with slow decompression"
     , "1t  = 1b"
     , "2t  = grzip:m4:8m:32:h15"
-    , "3trr= grzip:m1:8m:32:h15"
     , "3t  = dict:p: 64m:85% + lzp: 64m: 24:h20        :92% + grzip:m3:8m:l"
-    , "3tr = dict:p: 64m:80% + lzp: 64m: 55:d1m:s16:h18:87% + ppmd:7:48m"    -- âàðèàíò -m3t ñ èñïîëüçîâàíèåì ppmd âìåñòå grzip(bwt)
     , "4t  = dict:p: 64m:80% + lzp: 64m: 65:d1m:s16:h20:90% + ppmd:8:96m"
     , "5t  = dict:p: 64m:80% + lzp: 80m:105:d1m:s32:h22:92% + ppmd:12:192m"
     , "6t  = dict:p:128m:80% + lzp:160m:145:d1m:s32:h23:92% + ppmd:16:384m"
     , "7t  = dict:p:128m:80% + lzp:320m:185:d1m:s32:h24:92% + ppmd:20:768m"
     , "8t  = dict:p:128m:80% + lzp:640m:225:d1m:s32:h25:92% + ppmd:24:1536m"
     , "9t  = dict:p:128m:80% + lzp:800m:235:d1m:s32:h26:92% + ppmd:25:2047m"
-    , "4tr = 4t:12:r"     -- âàðèàíò m4t ñ ôëàãîì "-r1" äëÿ ppmd
-    , "5tr = 5t:16:r"     -- âàðèàíò m5t ñ ôëàãîì "-r1" äëÿ ppmd
-    , "6tr = 6t:20:r"     -- âàðèàíò m6t ñ ôëàãîì "-r1" äëÿ ppmd
-    , "#tr = #t"
     , ""
     , ";Binary files compression with slow and/or memory-expensive decompression"
     , "1b  = 1xb"
-    , "2b  = 2xb"
-    , "2br = delta + lzma:16m:fastest"
-    , "3b  = 3xb"
-    , "3br = rep:  32m + delta + lzma:  4m:fast:mc8"
-    , "4b  = 4xb"
-    , "4br = rep:  64m + delta + lzma:  8m:normal:mc16"
-    , "5b  = rep: 128m + 5xb"
-    , "6b  = rep: 256m + 6xb"
-    , "7b  = rep: 512m + 7xb"
-    , "8b  = rep:1024m + 8xb"
-    , "9b  = rep:2047m + 9xb"
-    , "#br = #b"
+    , "#b  = #rep+#bx"
+    , "2rep  = rep:  96m"
+    , "3rep  = rep:  96m"
+    , "4rep  = rep:  96m"
+    , "5rep  = rep: 128m"
+    , "6rep  = rep: 256m"
+    , "7rep  = rep: 512m"
+    , "8rep  = rep:1024m"
+    , "9rep  = rep:2047m"
     , ""
     , ";Text files compression with fast decompression"
     , "1xt = 1xb"
@@ -463,10 +451,8 @@ builtinMethodSubsts = [
     , ""
     , ";Synonyms"
     , "bcj = exe"
-    , "#rt = #tr"
-    , "#rb = #br"
-    , "#bx = #xb"
-    , "#tx = #xt"
+    , "#xb = #bx"
+    , "#xt = #tx"
     , "x#  = #x"    -- ïðèíèìàåì îïöèè òèïà "-mx7" äëÿ ìèìèêðèè ïîä 7-zip
     , ""
     , ";Compression modes involving external PPMONSTR.EXE"