From 67c33fb13d02c3712f5e36192a71e52d9b5a79a4 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Fri, 26 Jul 2013 19:00:46 -0600 Subject: [PATCH] adjust startup to avoid config file if collection links are disabled The intent of this change is to avoid trying to read a configuration file from a stand-alone executable. --- .../racket-doc/scribblings/raco/exe-api.scrbl | 22 +- .../scribblings/reference/collects.scrbl | 10 +- .../scribblings/reference/startup.scrbl | 2 +- racket/src/racket/src/cstartup.inc | 842 +++++++++--------- racket/src/racket/src/startup.inc | 12 +- racket/src/racket/src/startup.rktl | 45 +- 6 files changed, 486 insertions(+), 447 deletions(-) diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/raco/exe-api.scrbl b/pkgs/racket-pkgs/racket-doc/scribblings/raco/exe-api.scrbl index 319730214d..a5a2ce7853 100644 --- a/pkgs/racket-pkgs/racket-doc/scribblings/raco/exe-api.scrbl +++ b/pkgs/racket-pkgs/racket-doc/scribblings/raco/exe-api.scrbl @@ -217,6 +217,18 @@ currently supported keys are as follows: the @filepath{Resources} directory of the generated executable.} + @item{@racket['config-dir] : A string/path to a directory that + contains configuration information, such as + @filepath{config.rtkd} (see @secref["config-file"]). If no + value is supplied, the path is left as-is and converted to + absolute form as needed. If @racket[#f] is supplied, the path + is left as-is (in potentially relative form). Note that if + @racket[collects-path] is provided as an empty list, then + the configuration-directory path is not used by Racket's + start up process (in contrast to a normal Racket start-up, + where the configuration directory is consulted for information + about collection link files).} + @item{@racket['framework-root] (Mac OS X) : A string to prefix the executable's path to the Racket and GRacket frameworks (including a separating slash); note that when the prefix @@ -267,9 +279,11 @@ currently supported keys are as follows: @racket[#t] means that, to the degree that the generated executable must refer to another, it can use a relative path (so the executables can be moved together, but not - separately); a @racket[#f] value (the default) means that - absolute paths should be used (so the generated executable can - be moved).} + separately), and it implies @racket[#f] for + @racket['config-dir], @racket['framework-dir], and + @racket['dll-dir], unless those are explicitly provided; a + @racket[#f] value (the default) means that absolute paths + should be used (so the generated executable can be moved).} @item{@racket['wm-class] (Unix) : A string; used as the default @tt{WM_CLASS} program class for the program's windows.} @@ -293,7 +307,7 @@ before the main @filepath{collects} directory; then the search list is combined with @envvar{PLTCOLLECTS}, if it is defined). If the list is empty, then @racket[(find-system-path 'collects-dir)] will return the directory of the executable, but @racket[current-library-collection-paths] -is initialized to an empty list and +is initialized to an empty list, and @racket[use-collection-link-paths] is set to false to disable the use of @tech[#:doc reference-doc]{collection links files}. diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/reference/collects.scrbl b/pkgs/racket-pkgs/racket-doc/scribblings/reference/collects.scrbl index 8b68a824b3..65d226bff1 100644 --- a/pkgs/racket-pkgs/racket-doc/scribblings/reference/collects.scrbl +++ b/pkgs/racket-pkgs/racket-doc/scribblings/reference/collects.scrbl @@ -186,7 +186,15 @@ user-specific collection directory when this parameter's value is @defboolparam[use-collection-link-paths on?]{ Parameter that determines whether @tech{collection links files} are -used to locate collections.} +used to locate collections. + +If this parameter's value is @racket[#f] on start-up, then +@tech{collection links files} are effectively disabled permanently for +the Racket process. In particular, if an empty string is provided as +the @Flag{X} or @DFlag{collects} argument to @exec{racket}, then not +only is @racket[current-library-collection-paths] initialized to the +empty list, but @racket[use-collection-link-paths] is initialized to +@racket[#f].} @; ---------------------------------------------------------------------- diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/reference/startup.scrbl b/pkgs/racket-pkgs/racket-doc/scribblings/reference/startup.scrbl index f0594c25d8..6ff843ab36 100644 --- a/pkgs/racket-pkgs/racket-doc/scribblings/reference/startup.scrbl +++ b/pkgs/racket-pkgs/racket-doc/scribblings/reference/startup.scrbl @@ -265,7 +265,7 @@ flags: empty string, then @racket[(find-system-path 'collects-dir)] returns @filepath{.}, but @racket[current-library-collection-paths] is initialized to - the empty list and @racket[use-collection-link-paths] is + the empty list, and @racket[use-collection-link-paths] is initialized to @racket[#f].} @item{@FlagFirst{S} @nonterm{dir} or @DFlagFirst{search} diff --git a/racket/src/racket/src/cstartup.inc b/racket/src/racket/src/cstartup.inc index 1f0ced084e..b73665a59c 100644 --- a/racket/src/racket/src/cstartup.inc +++ b/racket/src/racket/src/cstartup.inc @@ -16,12 +16,12 @@ 73,108,101,116,114,101,99,45,118,97,108,117,101,115,66,108,97,109,98,100,97, 1,20,112,97,114,97,109,101,116,101,114,105,122,97,116,105,111,110,45,107,101, 121,61,118,73,100,101,102,105,110,101,45,118,97,108,117,101,115,97,36,11,8, -240,212,90,0,0,95,159,2,17,36,36,159,2,16,36,36,159,2,16,36,36, +240,216,90,0,0,95,159,2,17,36,36,159,2,16,36,36,159,2,16,36,36, 16,20,2,8,2,2,2,4,2,2,2,5,2,2,2,6,2,2,2,7,2, 2,2,10,2,2,2,3,2,2,2,9,2,2,2,11,2,2,2,12,2,2, -97,37,11,8,240,212,90,0,0,93,159,2,16,36,37,16,2,2,13,161,2, -2,37,2,13,2,2,2,13,96,38,11,8,240,212,90,0,0,16,0,96,11, -11,8,240,212,90,0,0,16,0,18,98,64,104,101,114,101,13,16,6,36,2, +97,37,11,8,240,216,90,0,0,93,159,2,16,36,37,16,2,2,13,161,2, +2,37,2,13,2,2,2,13,96,38,11,8,240,216,90,0,0,16,0,96,11, +11,8,240,216,90,0,0,16,0,18,98,64,104,101,114,101,13,16,6,36,2, 14,2,2,11,11,11,8,32,8,31,8,30,8,29,27,248,22,161,4,195,249, 22,154,4,80,158,39,36,251,22,89,2,18,248,22,101,199,12,249,22,79,2, 19,248,22,103,201,27,248,22,161,4,195,249,22,154,4,80,158,39,36,251,22, @@ -30,14 +30,14 @@ 22,81,194,248,22,136,18,193,249,22,154,4,80,158,39,36,251,22,89,2,18, 248,22,136,18,199,249,22,79,2,4,248,22,137,18,201,11,18,100,10,13,16, 6,36,2,14,2,2,11,11,11,8,32,8,31,8,30,8,29,16,4,11,11, -2,20,3,1,8,101,110,118,49,55,54,50,57,16,4,11,11,2,21,3,1, -8,101,110,118,49,55,54,51,48,27,248,22,81,248,22,161,4,196,28,248,22, +2,20,3,1,8,101,110,118,49,55,54,51,49,16,4,11,11,2,21,3,1, +8,101,110,118,49,55,54,51,50,27,248,22,81,248,22,161,4,196,28,248,22, 87,193,20,14,159,37,36,37,28,248,22,87,248,22,81,194,248,22,136,18,193, 249,22,154,4,80,158,39,36,250,22,89,2,22,248,22,89,249,22,89,248,22, 89,2,23,248,22,136,18,201,251,22,89,2,18,2,23,2,23,249,22,79,2, 11,248,22,137,18,204,18,100,11,13,16,6,36,2,14,2,2,11,11,11,8, 32,8,31,8,30,8,29,16,4,11,11,2,20,3,1,8,101,110,118,49,55, -54,51,50,16,4,11,11,2,21,3,1,8,101,110,118,49,55,54,51,51,248, +54,51,52,16,4,11,11,2,21,3,1,8,101,110,118,49,55,54,51,53,248, 22,161,4,193,27,248,22,161,4,194,249,22,79,248,22,89,248,22,80,196,248, 22,137,18,195,27,248,22,81,248,22,161,4,23,197,1,249,22,154,4,80,158, 39,36,28,248,22,64,248,22,155,4,248,22,80,23,198,2,27,249,22,2,32, @@ -68,8 +68,8 @@ 163,9,248,22,155,4,248,22,80,200,64,101,108,115,101,10,248,22,136,18,197, 250,22,90,2,22,9,248,22,137,18,200,249,22,79,2,8,248,22,81,202,99, 13,16,6,36,2,14,2,2,11,11,11,8,32,8,31,8,30,8,29,16,4, -11,11,2,20,3,1,8,101,110,118,49,55,54,53,53,16,4,11,11,2,21, -3,1,8,101,110,118,49,55,54,53,54,18,158,94,10,64,118,111,105,100,8, +11,11,2,20,3,1,8,101,110,118,49,55,54,53,55,16,4,11,11,2,21, +3,1,8,101,110,118,49,55,54,53,56,18,158,94,10,64,118,111,105,100,8, 48,27,248,22,81,248,22,161,4,196,249,22,154,4,80,158,39,36,28,248,22, 64,248,22,155,4,248,22,80,197,250,22,89,2,28,248,22,89,248,22,136,18, 199,248,22,101,198,27,248,22,155,4,248,22,136,18,197,250,22,89,2,28,248, @@ -112,14 +112,14 @@ 246,4,12,5,23,5,75,5,98,5,106,5,130,5,151,5,108,6,138,6,19, 10,42,10,59,10,7,12,110,12,124,12,28,13,216,14,225,14,234,14,248,14, 2,15,43,16,146,16,3,17,76,17,149,17,253,17,26,18,97,18,234,18,49, -19,3,20,154,20,240,20,36,21,49,21,60,21,157,22,5,23,67,23,254,24, -22,25,81,26,88,26,140,26,153,26,143,27,157,27,11,28,169,28,176,28,50, -30,127,30,144,30,246,30,168,31,228,31,235,31,115,32,169,32,188,32,138,33, -154,33,152,34,217,35,0,36,9,36,86,37,25,38,45,38,61,38,84,38,100, -38,151,38,172,38,192,38,212,38,13,39,248,41,17,43,176,43,192,43,88,46, -217,48,232,48,122,50,60,51,62,51,88,51,103,51,27,53,221,53,236,53,245, -53,252,53,9,55,22,56,169,58,42,59,173,59,202,61,152,62,184,62,58,63, -0,0,90,70,0,0,67,35,37,117,116,105,108,115,72,112,97,116,104,45,115, +19,3,20,154,20,249,20,45,21,58,21,69,21,166,22,14,23,76,23,7,25, +31,25,102,26,109,26,161,26,174,26,164,27,178,27,32,28,190,28,197,28,71, +30,148,30,165,30,11,31,189,31,249,31,0,32,136,32,190,32,209,32,159,33, +175,33,173,34,238,35,21,36,30,36,107,37,46,38,66,38,82,38,105,38,121, +38,172,38,193,38,213,38,233,38,34,39,13,42,46,43,205,43,221,43,117,46, +246,48,5,49,151,50,89,51,91,51,117,51,132,51,56,53,250,53,9,54,18, +54,25,54,38,55,51,56,198,58,71,59,202,59,231,61,181,62,213,62,87,63, +0,0,119,70,0,0,67,35,37,117,116,105,108,115,72,112,97,116,104,45,115, 116,114,105,110,103,63,64,98,115,98,115,76,110,111,114,109,97,108,45,99,97, 115,101,45,112,97,116,104,71,114,101,114,111,111,116,45,112,97,116,104,1,20, 102,105,110,100,45,101,120,101,99,117,116,97,98,108,101,45,112,97,116,104,1, @@ -370,77 +370,78 @@ 23,193,2,192,86,94,23,193,1,27,249,22,180,15,27,248,22,131,16,2,61, 250,80,159,45,40,39,23,196,1,11,11,248,22,131,16,2,60,90,159,39,11, 89,161,39,36,11,248,22,175,15,23,197,1,86,95,23,195,1,23,194,1,249, -22,180,15,23,200,1,23,195,1,20,13,159,80,159,36,43,37,26,29,80,159, -8,29,44,37,249,22,33,11,80,159,8,31,43,37,22,188,14,10,22,189,14, -10,22,190,14,10,22,129,15,10,22,128,15,11,22,130,15,10,22,191,14,10, -22,131,15,10,22,132,15,10,22,133,15,10,22,134,15,10,22,135,15,11,22, -136,15,10,22,186,14,11,247,22,143,6,27,249,22,172,15,23,197,1,6,11, -11,99,111,110,102,105,103,46,114,107,116,100,27,28,248,22,166,15,23,195,2, -249,22,135,6,23,196,1,80,159,40,8,43,39,11,28,192,192,21,17,1,0, -250,22,157,2,23,196,1,2,62,247,22,166,8,250,22,157,2,195,2,62,247, -22,166,8,28,248,22,148,7,23,195,2,27,248,22,162,15,23,196,1,28,248, -22,179,15,23,194,2,192,249,22,180,15,23,195,1,27,27,248,22,131,16,2, -63,28,248,22,179,15,23,194,2,192,28,248,22,178,15,23,194,2,249,22,180, -15,23,195,1,249,22,180,15,250,80,159,48,40,39,248,22,131,16,2,61,11, -10,248,22,131,16,2,60,250,80,159,44,40,39,248,22,131,16,2,61,23,196, -1,10,28,23,193,2,192,86,94,23,193,1,248,22,131,16,2,60,28,248,22, -137,8,23,195,2,27,248,22,163,15,23,196,1,28,248,22,179,15,23,194,2, -192,249,22,180,15,23,195,1,27,27,248,22,131,16,2,63,28,248,22,179,15, -23,194,2,192,28,248,22,178,15,23,194,2,249,22,180,15,23,195,1,249,22, -180,15,250,80,159,48,40,39,248,22,131,16,2,61,11,10,248,22,131,16,2, -60,250,80,159,44,40,39,248,22,131,16,2,61,23,196,1,10,28,23,193,2, -192,86,94,23,193,1,248,22,131,16,2,60,28,248,22,154,15,23,195,2,28, -248,22,179,15,23,195,2,193,249,22,180,15,23,196,1,27,27,248,22,131,16, -2,63,28,248,22,179,15,23,194,2,192,28,248,22,178,15,23,194,2,249,22, -180,15,23,195,1,249,22,180,15,250,80,159,47,40,39,248,22,131,16,2,61, -11,10,248,22,131,16,2,60,250,80,159,43,40,39,248,22,131,16,2,61,23, -196,1,10,28,23,193,2,192,86,94,23,193,1,248,22,131,16,2,60,193,28, -248,22,179,15,23,195,2,193,249,22,180,15,23,196,1,27,27,248,22,131,16, -2,63,28,248,22,179,15,23,194,2,192,28,248,22,178,15,23,194,2,249,22, -180,15,23,195,1,249,22,180,15,250,80,159,47,40,39,248,22,131,16,2,61, -11,10,248,22,131,16,2,60,250,80,159,43,40,39,248,22,131,16,2,61,23, -196,1,10,28,23,193,2,192,86,94,23,193,1,248,22,131,16,2,60,28,248, -22,179,15,23,195,2,193,28,248,22,178,15,23,195,2,249,22,180,15,23,196, -1,249,22,180,15,250,80,159,43,40,39,248,22,131,16,2,61,11,10,248,22, -131,16,2,60,250,80,159,39,40,39,248,22,131,16,2,61,196,10,28,248,22, -87,23,196,2,9,28,248,22,80,23,196,2,249,22,79,248,80,159,39,54,39, -248,22,136,18,23,199,2,27,248,22,137,18,23,199,1,28,248,22,87,23,194, -2,9,28,248,22,80,23,194,2,249,22,79,248,80,159,42,54,39,248,22,136, -18,23,197,2,27,248,22,137,18,23,197,1,28,248,22,87,23,194,2,9,28, -248,22,80,23,194,2,249,22,79,248,80,159,45,54,39,248,22,136,18,23,197, -2,249,80,159,46,8,44,39,23,204,1,248,22,137,18,23,198,1,249,22,93, -23,202,2,249,80,159,46,8,44,39,23,204,1,248,22,137,18,23,198,1,249, -22,93,23,199,2,27,248,22,137,18,23,197,1,28,248,22,87,23,194,2,9, -28,248,22,80,23,194,2,249,22,79,248,80,159,45,54,39,248,22,136,18,23, -197,2,249,80,159,46,8,44,39,23,204,1,248,22,137,18,23,198,1,249,22, -93,23,202,2,249,80,159,46,8,44,39,23,204,1,248,22,137,18,23,198,1, -249,22,93,23,196,2,27,248,22,137,18,23,199,1,28,248,22,87,23,194,2, -9,28,248,22,80,23,194,2,249,22,79,248,80,159,42,54,39,248,22,136,18, -23,197,2,27,248,22,137,18,23,197,1,28,248,22,87,23,194,2,9,28,248, -22,80,23,194,2,249,22,79,248,80,159,45,54,39,248,22,136,18,23,197,2, -249,80,159,46,8,44,39,23,204,1,248,22,137,18,23,198,1,249,22,93,23, -202,2,249,80,159,46,8,44,39,23,204,1,248,22,137,18,23,198,1,249,22, -93,23,199,2,27,248,22,137,18,23,197,1,28,248,22,87,23,194,2,9,28, -248,22,80,23,194,2,249,22,79,248,80,159,45,54,39,248,22,136,18,23,197, -2,249,80,159,46,8,44,39,23,204,1,248,22,137,18,23,198,1,249,22,93, -23,202,2,249,80,159,46,8,44,39,23,204,1,248,22,137,18,23,198,1,27, -250,22,157,2,23,198,1,23,199,1,11,28,192,249,80,159,39,8,44,39,198, -194,196,27,27,248,22,131,16,2,59,28,248,22,179,15,23,194,2,192,27,28, -248,22,177,15,23,195,2,20,13,159,80,159,39,43,37,250,80,159,42,44,37, -249,22,33,11,80,159,44,43,37,22,132,16,248,22,131,16,2,60,27,248,22, -131,16,2,61,250,80,159,43,40,39,23,196,1,23,198,2,11,11,28,23,193, -2,192,86,94,23,193,1,27,249,22,180,15,27,248,22,131,16,2,61,250,80, -159,46,40,39,23,196,1,11,11,248,22,131,16,2,60,90,159,39,11,89,161, -39,36,11,248,22,175,15,23,197,1,86,95,23,195,1,23,194,1,249,22,180, -15,23,200,1,23,195,1,27,248,80,159,39,52,39,23,195,1,27,248,80,159, -40,54,39,27,250,22,157,2,23,199,2,70,108,105,110,107,115,45,102,105,108, -101,11,28,23,193,2,192,86,94,23,193,1,249,22,172,15,27,250,22,157,2, -23,202,2,69,115,104,97,114,101,45,100,105,114,11,28,23,193,2,192,86,94, -23,193,1,249,22,172,15,62,117,112,6,5,5,115,104,97,114,101,2,64,249, -22,79,248,22,186,8,250,80,159,45,57,39,23,200,2,78,108,105,110,107,115, -45,115,101,97,114,99,104,45,102,105,108,101,115,248,22,89,23,200,1,250,22, -172,15,248,22,131,16,2,65,250,22,157,2,23,202,1,2,62,247,22,166,8, -2,64,248,22,162,13,23,194,1,249,22,16,80,159,38,8,30,38,28,248,22, +22,180,15,23,200,1,23,195,1,27,20,13,159,80,159,37,43,37,26,29,80, +159,8,30,44,37,249,22,33,11,80,159,8,32,43,37,22,188,14,10,22,189, +14,10,22,190,14,10,22,129,15,10,22,128,15,11,22,130,15,10,22,191,14, +10,22,131,15,10,22,132,15,10,22,133,15,10,22,134,15,10,22,135,15,11, +22,136,15,10,22,186,14,11,247,22,143,6,28,248,22,148,2,193,192,11,27, +249,22,172,15,23,197,1,6,11,11,99,111,110,102,105,103,46,114,107,116,100, +27,28,248,22,166,15,23,195,2,249,22,135,6,23,196,1,80,159,40,8,43, +39,11,28,192,192,21,17,1,0,250,22,157,2,23,196,1,2,62,247,22,166, +8,250,22,157,2,195,2,62,247,22,166,8,28,248,22,148,7,23,195,2,27, +248,22,162,15,23,196,1,28,248,22,179,15,23,194,2,192,249,22,180,15,23, +195,1,27,27,248,22,131,16,2,63,28,248,22,179,15,23,194,2,192,28,248, +22,178,15,23,194,2,249,22,180,15,23,195,1,249,22,180,15,250,80,159,48, +40,39,248,22,131,16,2,61,11,10,248,22,131,16,2,60,250,80,159,44,40, +39,248,22,131,16,2,61,23,196,1,10,28,23,193,2,192,86,94,23,193,1, +248,22,131,16,2,60,28,248,22,137,8,23,195,2,27,248,22,163,15,23,196, +1,28,248,22,179,15,23,194,2,192,249,22,180,15,23,195,1,27,27,248,22, +131,16,2,63,28,248,22,179,15,23,194,2,192,28,248,22,178,15,23,194,2, +249,22,180,15,23,195,1,249,22,180,15,250,80,159,48,40,39,248,22,131,16, +2,61,11,10,248,22,131,16,2,60,250,80,159,44,40,39,248,22,131,16,2, +61,23,196,1,10,28,23,193,2,192,86,94,23,193,1,248,22,131,16,2,60, +28,248,22,154,15,23,195,2,28,248,22,179,15,23,195,2,193,249,22,180,15, +23,196,1,27,27,248,22,131,16,2,63,28,248,22,179,15,23,194,2,192,28, +248,22,178,15,23,194,2,249,22,180,15,23,195,1,249,22,180,15,250,80,159, +47,40,39,248,22,131,16,2,61,11,10,248,22,131,16,2,60,250,80,159,43, +40,39,248,22,131,16,2,61,23,196,1,10,28,23,193,2,192,86,94,23,193, +1,248,22,131,16,2,60,193,28,248,22,179,15,23,195,2,193,249,22,180,15, +23,196,1,27,27,248,22,131,16,2,63,28,248,22,179,15,23,194,2,192,28, +248,22,178,15,23,194,2,249,22,180,15,23,195,1,249,22,180,15,250,80,159, +47,40,39,248,22,131,16,2,61,11,10,248,22,131,16,2,60,250,80,159,43, +40,39,248,22,131,16,2,61,23,196,1,10,28,23,193,2,192,86,94,23,193, +1,248,22,131,16,2,60,28,248,22,179,15,23,195,2,193,28,248,22,178,15, +23,195,2,249,22,180,15,23,196,1,249,22,180,15,250,80,159,43,40,39,248, +22,131,16,2,61,11,10,248,22,131,16,2,60,250,80,159,39,40,39,248,22, +131,16,2,61,196,10,28,248,22,87,23,196,2,9,28,248,22,80,23,196,2, +249,22,79,248,80,159,39,54,39,248,22,136,18,23,199,2,27,248,22,137,18, +23,199,1,28,248,22,87,23,194,2,9,28,248,22,80,23,194,2,249,22,79, +248,80,159,42,54,39,248,22,136,18,23,197,2,27,248,22,137,18,23,197,1, +28,248,22,87,23,194,2,9,28,248,22,80,23,194,2,249,22,79,248,80,159, +45,54,39,248,22,136,18,23,197,2,249,80,159,46,8,44,39,23,204,1,248, +22,137,18,23,198,1,249,22,93,23,202,2,249,80,159,46,8,44,39,23,204, +1,248,22,137,18,23,198,1,249,22,93,23,199,2,27,248,22,137,18,23,197, +1,28,248,22,87,23,194,2,9,28,248,22,80,23,194,2,249,22,79,248,80, +159,45,54,39,248,22,136,18,23,197,2,249,80,159,46,8,44,39,23,204,1, +248,22,137,18,23,198,1,249,22,93,23,202,2,249,80,159,46,8,44,39,23, +204,1,248,22,137,18,23,198,1,249,22,93,23,196,2,27,248,22,137,18,23, +199,1,28,248,22,87,23,194,2,9,28,248,22,80,23,194,2,249,22,79,248, +80,159,42,54,39,248,22,136,18,23,197,2,27,248,22,137,18,23,197,1,28, +248,22,87,23,194,2,9,28,248,22,80,23,194,2,249,22,79,248,80,159,45, +54,39,248,22,136,18,23,197,2,249,80,159,46,8,44,39,23,204,1,248,22, +137,18,23,198,1,249,22,93,23,202,2,249,80,159,46,8,44,39,23,204,1, +248,22,137,18,23,198,1,249,22,93,23,199,2,27,248,22,137,18,23,197,1, +28,248,22,87,23,194,2,9,28,248,22,80,23,194,2,249,22,79,248,80,159, +45,54,39,248,22,136,18,23,197,2,249,80,159,46,8,44,39,23,204,1,248, +22,137,18,23,198,1,249,22,93,23,202,2,249,80,159,46,8,44,39,23,204, +1,248,22,137,18,23,198,1,27,250,22,157,2,23,198,1,23,199,1,11,28, +192,249,80,159,39,8,44,39,198,194,196,28,247,22,138,16,27,27,248,22,131, +16,2,59,28,248,22,179,15,23,194,2,192,27,28,248,22,177,15,23,195,2, +20,13,159,80,159,39,43,37,250,80,159,42,44,37,249,22,33,11,80,159,44, +43,37,22,132,16,248,22,131,16,2,60,27,248,22,131,16,2,61,250,80,159, +43,40,39,23,196,1,23,198,2,11,11,28,23,193,2,192,86,94,23,193,1, +27,249,22,180,15,27,248,22,131,16,2,61,250,80,159,46,40,39,23,196,1, +11,11,248,22,131,16,2,60,90,159,39,11,89,161,39,36,11,248,22,175,15, +23,197,1,86,95,23,195,1,23,194,1,249,22,180,15,23,200,1,23,195,1, +27,248,80,159,39,52,39,23,195,1,27,248,80,159,40,54,39,27,250,22,157, +2,23,199,2,70,108,105,110,107,115,45,102,105,108,101,11,28,23,193,2,192, +86,94,23,193,1,249,22,172,15,27,250,22,157,2,23,202,2,69,115,104,97, +114,101,45,100,105,114,11,28,23,193,2,192,86,94,23,193,1,249,22,172,15, +62,117,112,6,5,5,115,104,97,114,101,2,64,249,22,79,248,22,186,8,250, +80,159,45,57,39,23,200,2,78,108,105,110,107,115,45,115,101,97,114,99,104, +45,102,105,108,101,115,248,22,89,23,200,1,250,22,172,15,248,22,131,16,2, +65,250,22,157,2,23,202,1,2,62,247,22,166,8,2,64,249,22,79,21,16, +0,11,248,22,162,13,23,194,1,249,22,16,80,159,38,8,30,38,28,248,22, 182,12,23,197,2,86,94,23,196,1,32,0,88,163,8,36,36,41,11,9,222, 11,20,20,94,88,163,8,36,36,43,11,9,223,3,33,120,23,196,1,32,122, 88,163,36,37,56,11,2,54,222,33,123,90,159,39,11,89,161,39,36,11,248, @@ -633,351 +634,352 @@ 16,23,16,254,2,146,2,201,202,203,204,205,248,22,81,23,15,23,15,90,159, 38,11,89,161,38,36,11,249,80,159,40,8,35,39,23,199,1,23,200,1,27, 248,22,67,28,248,22,154,15,195,248,22,158,15,195,194,27,247,22,138,16,27, -250,22,93,28,23,197,2,28,247,22,137,16,248,22,93,27,249,80,159,48,8, -34,39,10,36,249,22,93,250,22,157,2,23,198,2,23,205,2,9,250,22,157, -2,23,198,1,11,9,9,9,28,23,197,1,28,249,22,129,4,36,248,22,182, -8,80,159,47,8,24,38,86,94,23,198,1,9,27,249,80,159,47,8,34,39, -11,36,250,22,93,250,22,157,2,23,199,2,23,205,2,9,250,22,157,2,23, -199,1,11,9,28,249,22,129,4,37,248,22,182,8,80,159,51,8,24,38,9, -27,249,80,159,51,8,34,39,11,37,250,22,93,250,22,157,2,23,199,2,23, -209,2,9,250,22,157,2,23,199,1,11,9,28,249,22,129,4,38,248,22,182, -8,80,159,55,8,24,38,9,27,249,80,159,55,8,34,39,11,38,250,22,93, -250,22,157,2,23,199,2,23,213,2,9,250,22,157,2,23,199,1,11,9,249, -80,159,58,8,46,39,23,212,1,39,9,247,22,134,16,254,2,146,2,199,202, -203,205,23,16,199,11,86,95,28,28,248,22,155,15,23,194,2,10,28,248,22, -154,15,23,194,2,10,28,248,22,148,7,23,194,2,28,248,22,177,15,23,194, -2,10,248,22,178,15,23,194,2,11,12,252,22,172,11,23,200,2,2,46,36, -23,198,2,23,199,2,28,28,248,22,148,7,23,195,2,10,248,22,137,8,23, -195,2,86,94,23,194,1,12,252,22,172,11,23,200,2,2,73,37,23,198,2, -23,199,1,90,159,39,11,89,161,39,36,11,248,22,175,15,23,197,2,86,94, -23,195,1,86,94,28,23,193,2,86,95,23,198,1,23,196,1,12,250,22,175, -11,23,201,1,2,74,23,199,1,249,22,7,23,195,1,23,196,1,32,158,2, -88,163,36,42,8,24,11,2,54,222,33,159,2,28,248,22,130,4,23,199,2, -86,95,23,198,1,23,194,1,19,248,22,142,8,23,195,2,19,248,22,142,8, -23,196,2,249,22,164,15,251,22,149,8,250,22,148,8,23,204,2,36,23,203, -4,2,55,249,23,205,1,23,203,1,23,201,4,28,248,22,148,7,23,206,2, -249,22,163,8,23,207,1,8,63,23,205,1,28,248,22,155,15,23,201,2,248, -22,156,15,23,201,1,86,94,23,200,1,247,22,157,15,2,2,27,248,22,179, -3,23,200,1,28,249,22,163,9,8,46,249,22,143,8,23,198,2,23,197,2, -27,248,22,178,3,23,195,2,249,22,164,15,251,22,149,8,250,22,148,8,23, -204,2,36,23,203,1,23,202,1,249,23,205,1,23,203,1,23,201,1,28,248, -22,148,7,23,206,2,249,22,163,8,23,207,1,8,63,23,205,1,28,248,22, -155,15,23,201,2,248,22,156,15,23,201,1,86,94,23,200,1,247,22,157,15, -28,248,22,130,4,23,194,2,86,95,23,195,1,23,193,1,19,248,22,142,8, -23,196,2,19,248,22,142,8,23,197,2,249,22,164,15,251,22,149,8,250,22, -148,8,23,205,2,36,23,203,4,2,55,249,23,206,1,23,204,1,23,201,4, -28,248,22,148,7,23,207,2,249,22,163,8,23,208,1,8,63,23,206,1,28, -248,22,155,15,23,202,2,248,22,156,15,23,202,1,86,94,23,201,1,247,22, -157,15,2,2,27,248,22,179,3,23,195,1,28,249,22,163,9,8,46,249,22, -143,8,23,199,2,23,197,2,27,248,22,178,3,23,195,2,249,22,164,15,251, -22,149,8,250,22,148,8,23,205,2,36,23,203,1,23,203,1,249,23,206,1, -23,204,1,23,201,1,28,248,22,148,7,23,207,2,249,22,163,8,23,208,1, -8,63,23,206,1,28,248,22,155,15,23,202,2,248,22,156,15,23,202,1,86, -94,23,201,1,247,22,157,15,28,248,22,130,4,23,194,2,86,95,23,196,1, -23,193,1,19,248,22,142,8,23,197,2,19,248,22,142,8,23,198,2,249,22, +250,22,93,28,23,197,2,28,247,22,137,16,28,80,159,44,8,25,38,248,22, +93,27,249,80,159,48,8,34,39,10,36,249,22,93,250,22,157,2,23,198,2, +23,205,2,9,250,22,157,2,23,198,1,11,9,9,9,9,28,23,197,1,28, +249,22,129,4,36,248,22,182,8,80,159,47,8,24,38,86,94,23,198,1,9, +27,249,80,159,47,8,34,39,11,36,250,22,93,250,22,157,2,23,199,2,23, +205,2,9,250,22,157,2,23,199,1,11,9,28,249,22,129,4,37,248,22,182, +8,80,159,51,8,24,38,9,27,249,80,159,51,8,34,39,11,37,250,22,93, +250,22,157,2,23,199,2,23,209,2,9,250,22,157,2,23,199,1,11,9,28, +249,22,129,4,38,248,22,182,8,80,159,55,8,24,38,9,27,249,80,159,55, +8,34,39,11,38,250,22,93,250,22,157,2,23,199,2,23,213,2,9,250,22, +157,2,23,199,1,11,9,249,80,159,58,8,46,39,23,212,1,39,9,247,22, +134,16,254,2,146,2,199,202,203,205,23,16,199,11,86,95,28,28,248,22,155, +15,23,194,2,10,28,248,22,154,15,23,194,2,10,28,248,22,148,7,23,194, +2,28,248,22,177,15,23,194,2,10,248,22,178,15,23,194,2,11,12,252,22, +172,11,23,200,2,2,46,36,23,198,2,23,199,2,28,28,248,22,148,7,23, +195,2,10,248,22,137,8,23,195,2,86,94,23,194,1,12,252,22,172,11,23, +200,2,2,73,37,23,198,2,23,199,1,90,159,39,11,89,161,39,36,11,248, +22,175,15,23,197,2,86,94,23,195,1,86,94,28,23,193,2,86,95,23,198, +1,23,196,1,12,250,22,175,11,23,201,1,2,74,23,199,1,249,22,7,23, +195,1,23,196,1,32,158,2,88,163,36,42,8,24,11,2,54,222,33,159,2, +28,248,22,130,4,23,199,2,86,95,23,198,1,23,194,1,19,248,22,142,8, +23,195,2,19,248,22,142,8,23,196,2,249,22,164,15,251,22,149,8,250,22, +148,8,23,204,2,36,23,203,4,2,55,249,23,205,1,23,203,1,23,201,4, +28,248,22,148,7,23,206,2,249,22,163,8,23,207,1,8,63,23,205,1,28, +248,22,155,15,23,201,2,248,22,156,15,23,201,1,86,94,23,200,1,247,22, +157,15,2,2,27,248,22,179,3,23,200,1,28,249,22,163,9,8,46,249,22, +143,8,23,198,2,23,197,2,27,248,22,178,3,23,195,2,249,22,164,15,251, +22,149,8,250,22,148,8,23,204,2,36,23,203,1,23,202,1,249,23,205,1, +23,203,1,23,201,1,28,248,22,148,7,23,206,2,249,22,163,8,23,207,1, +8,63,23,205,1,28,248,22,155,15,23,201,2,248,22,156,15,23,201,1,86, +94,23,200,1,247,22,157,15,28,248,22,130,4,23,194,2,86,95,23,195,1, +23,193,1,19,248,22,142,8,23,196,2,19,248,22,142,8,23,197,2,249,22, +164,15,251,22,149,8,250,22,148,8,23,205,2,36,23,203,4,2,55,249,23, +206,1,23,204,1,23,201,4,28,248,22,148,7,23,207,2,249,22,163,8,23, +208,1,8,63,23,206,1,28,248,22,155,15,23,202,2,248,22,156,15,23,202, +1,86,94,23,201,1,247,22,157,15,2,2,27,248,22,179,3,23,195,1,28, +249,22,163,9,8,46,249,22,143,8,23,199,2,23,197,2,27,248,22,178,3, +23,195,2,249,22,164,15,251,22,149,8,250,22,148,8,23,205,2,36,23,203, +1,23,203,1,249,23,206,1,23,204,1,23,201,1,28,248,22,148,7,23,207, +2,249,22,163,8,23,208,1,8,63,23,206,1,28,248,22,155,15,23,202,2, +248,22,156,15,23,202,1,86,94,23,201,1,247,22,157,15,28,248,22,130,4, +23,194,2,86,95,23,196,1,23,193,1,19,248,22,142,8,23,197,2,19,248, +22,142,8,23,198,2,249,22,164,15,251,22,149,8,250,22,148,8,23,206,2, +36,23,203,4,2,55,249,23,207,1,23,205,1,23,201,4,28,248,22,148,7, +23,208,2,249,22,163,8,23,209,1,8,63,23,207,1,28,248,22,155,15,23, +203,2,248,22,156,15,23,203,1,86,94,23,202,1,247,22,157,15,2,2,27, +248,22,179,3,23,195,1,28,249,22,163,9,8,46,249,22,143,8,23,200,2, +23,197,2,27,248,22,178,3,23,195,2,249,22,164,15,251,22,149,8,250,22, +148,8,23,206,2,36,23,203,1,23,204,1,249,23,207,1,23,205,1,23,201, +1,28,248,22,148,7,23,208,2,249,22,163,8,23,209,1,8,63,23,207,1, +28,248,22,155,15,23,203,2,248,22,156,15,23,203,1,86,94,23,202,1,247, +22,157,15,253,2,158,2,201,202,203,204,205,198,90,159,38,11,89,161,38,36, +11,86,95,28,28,248,22,155,15,23,199,2,10,28,248,22,154,15,23,199,2, +10,28,248,22,148,7,23,199,2,28,248,22,177,15,23,199,2,10,248,22,178, +15,23,199,2,11,12,252,22,172,11,23,200,2,2,46,36,23,203,2,23,204, +2,28,28,248,22,148,7,23,200,2,10,248,22,137,8,23,200,2,12,252,22, +172,11,23,200,2,2,73,37,23,203,2,23,204,2,90,159,39,11,89,161,39, +36,11,248,22,175,15,23,202,2,86,94,23,195,1,86,94,28,192,12,250,22, +175,11,23,201,1,2,74,23,204,2,249,22,7,194,195,27,248,22,160,15,23, +196,1,27,19,248,22,142,8,23,196,2,28,248,22,130,4,23,194,4,86,94, +23,199,1,19,248,22,142,8,23,197,2,19,248,22,142,8,23,198,2,249,22, 164,15,251,22,149,8,250,22,148,8,23,206,2,36,23,203,4,2,55,249,23, -207,1,23,205,1,23,201,4,28,248,22,148,7,23,208,2,249,22,163,8,23, -209,1,8,63,23,207,1,28,248,22,155,15,23,203,2,248,22,156,15,23,203, -1,86,94,23,202,1,247,22,157,15,2,2,27,248,22,179,3,23,195,1,28, +210,1,23,205,1,23,201,4,28,248,22,148,7,23,211,2,249,22,163,8,23, +212,1,8,63,23,210,1,28,248,22,155,15,23,206,2,248,22,156,15,23,206, +1,86,94,23,205,1,247,22,157,15,2,2,27,248,22,179,3,23,195,4,28, 249,22,163,9,8,46,249,22,143,8,23,200,2,23,197,2,27,248,22,178,3, 23,195,2,249,22,164,15,251,22,149,8,250,22,148,8,23,206,2,36,23,203, -1,23,204,1,249,23,207,1,23,205,1,23,201,1,28,248,22,148,7,23,208, -2,249,22,163,8,23,209,1,8,63,23,207,1,28,248,22,155,15,23,203,2, -248,22,156,15,23,203,1,86,94,23,202,1,247,22,157,15,253,2,158,2,201, -202,203,204,205,198,90,159,38,11,89,161,38,36,11,86,95,28,28,248,22,155, -15,23,199,2,10,28,248,22,154,15,23,199,2,10,28,248,22,148,7,23,199, -2,28,248,22,177,15,23,199,2,10,248,22,178,15,23,199,2,11,12,252,22, -172,11,23,200,2,2,46,36,23,203,2,23,204,2,28,28,248,22,148,7,23, -200,2,10,248,22,137,8,23,200,2,12,252,22,172,11,23,200,2,2,73,37, -23,203,2,23,204,2,90,159,39,11,89,161,39,36,11,248,22,175,15,23,202, -2,86,94,23,195,1,86,94,28,192,12,250,22,175,11,23,201,1,2,74,23, -204,2,249,22,7,194,195,27,248,22,160,15,23,196,1,27,19,248,22,142,8, -23,196,2,28,248,22,130,4,23,194,4,86,94,23,199,1,19,248,22,142,8, -23,197,2,19,248,22,142,8,23,198,2,249,22,164,15,251,22,149,8,250,22, -148,8,23,206,2,36,23,203,4,2,55,249,23,210,1,23,205,1,23,201,4, -28,248,22,148,7,23,211,2,249,22,163,8,23,212,1,8,63,23,210,1,28, -248,22,155,15,23,206,2,248,22,156,15,23,206,1,86,94,23,205,1,247,22, -157,15,2,2,27,248,22,179,3,23,195,4,28,249,22,163,9,8,46,249,22, -143,8,23,200,2,23,197,2,27,248,22,178,3,23,195,2,249,22,164,15,251, -22,149,8,250,22,148,8,23,206,2,36,23,203,1,23,207,1,249,23,210,1, -23,205,1,23,201,1,28,248,22,148,7,23,211,2,249,22,163,8,23,212,1, -8,63,23,210,1,28,248,22,155,15,23,206,2,248,22,156,15,23,206,1,86, -94,23,205,1,247,22,157,15,28,248,22,130,4,23,194,2,86,95,23,200,1, -23,193,1,19,248,22,142,8,23,198,2,19,248,22,142,8,23,199,2,249,22, -164,15,251,22,149,8,250,22,148,8,23,207,2,36,23,203,4,2,55,249,23, -211,1,23,206,1,23,201,4,28,248,22,148,7,23,212,2,249,22,163,8,23, -213,1,8,63,23,211,1,28,248,22,155,15,23,207,2,248,22,156,15,23,207, -1,86,94,23,206,1,247,22,157,15,2,2,27,248,22,179,3,23,195,1,28, -249,22,163,9,8,46,249,22,143,8,23,201,2,23,197,2,27,248,22,178,3, -23,195,2,249,22,164,15,251,22,149,8,250,22,148,8,23,207,2,36,23,203, -1,23,208,1,249,23,211,1,23,206,1,23,201,1,28,248,22,148,7,23,212, -2,249,22,163,8,23,213,1,8,63,23,211,1,28,248,22,155,15,23,207,2, -248,22,156,15,23,207,1,86,94,23,206,1,247,22,157,15,253,2,158,2,23, -203,1,23,207,1,23,208,1,23,209,1,23,210,1,23,199,1,2,28,248,22, -154,15,23,196,2,249,22,172,15,23,197,1,23,195,1,192,32,161,2,88,163, -36,40,57,11,2,54,222,33,162,2,28,248,22,130,4,23,197,2,86,94,23, -196,1,19,248,22,142,8,23,195,2,35,248,22,142,8,23,196,2,249,22,164, -15,251,22,149,8,250,22,148,8,23,204,1,36,23,203,4,2,55,2,55,28, -248,22,148,7,23,204,2,249,22,163,8,23,205,1,8,63,23,203,1,28,248, -22,155,15,23,199,2,248,22,156,15,23,199,1,86,94,23,198,1,247,22,157, -15,2,27,248,22,179,3,23,198,1,28,249,22,163,9,8,46,249,22,143,8, -23,198,2,23,197,2,35,248,22,178,3,23,195,2,249,22,164,15,251,22,149, -8,250,22,148,8,23,204,1,36,23,203,1,2,55,2,55,28,248,22,148,7, -23,204,2,249,22,163,8,23,205,1,8,63,23,203,1,28,248,22,155,15,23, -199,2,248,22,156,15,23,199,1,86,94,23,198,1,247,22,157,15,28,248,22, -130,4,23,194,2,86,94,23,193,1,19,248,22,142,8,23,196,2,35,248,22, -142,8,23,197,2,249,22,164,15,251,22,149,8,250,22,148,8,23,205,1,36, -23,203,4,2,55,2,55,28,248,22,148,7,23,205,2,249,22,163,8,23,206, -1,8,63,23,204,1,28,248,22,155,15,23,200,2,248,22,156,15,23,200,1, -86,94,23,199,1,247,22,157,15,2,27,248,22,179,3,23,195,1,28,249,22, -163,9,8,46,249,22,143,8,23,199,2,23,197,2,35,248,22,178,3,23,195, -2,249,22,164,15,251,22,149,8,250,22,148,8,23,205,1,36,23,203,1,2, -55,2,55,28,248,22,148,7,23,205,2,249,22,163,8,23,206,1,8,63,23, -204,1,28,248,22,155,15,23,200,2,248,22,156,15,23,200,1,86,94,23,199, -1,247,22,157,15,251,2,161,2,198,199,200,196,90,159,38,11,89,161,38,36, -11,86,95,28,28,248,22,155,15,23,196,2,10,28,248,22,154,15,23,196,2, -10,28,248,22,148,7,23,196,2,28,248,22,177,15,23,196,2,10,248,22,178, -15,23,196,2,11,12,252,22,172,11,2,40,2,46,36,23,200,2,23,201,2, -28,28,248,22,148,7,23,197,2,10,248,22,137,8,23,197,2,12,252,22,172, -11,2,40,2,73,37,23,200,2,23,201,2,90,159,39,11,89,161,39,36,11, -248,22,175,15,23,199,2,86,94,23,195,1,86,94,28,192,12,250,22,175,11, -2,40,2,74,23,201,2,249,22,7,194,195,27,248,22,160,15,23,196,1,27, -251,2,161,2,23,198,2,23,201,1,23,202,1,248,22,142,8,23,199,1,28, -248,22,154,15,23,196,2,249,22,172,15,23,197,1,23,195,1,192,2,55,252, -80,158,41,8,37,2,40,2,55,32,0,88,163,8,36,38,43,11,9,222,33, -164,2,198,199,32,166,2,88,163,36,40,57,11,2,54,222,33,167,2,28,248, -22,130,4,23,197,2,86,94,23,196,1,19,248,22,142,8,23,195,2,19,248, -22,142,8,23,196,2,249,22,164,15,251,22,149,8,250,22,148,8,23,204,2, -36,23,203,4,2,55,249,22,148,8,23,203,1,23,201,4,28,248,22,148,7, -23,204,2,249,22,163,8,23,205,1,8,63,23,203,1,28,248,22,155,15,23, -199,2,248,22,156,15,23,199,1,86,94,23,198,1,247,22,157,15,2,2,27, -248,22,179,3,23,198,1,28,249,22,163,9,8,46,249,22,143,8,23,198,2, +1,23,207,1,249,23,210,1,23,205,1,23,201,1,28,248,22,148,7,23,211, +2,249,22,163,8,23,212,1,8,63,23,210,1,28,248,22,155,15,23,206,2, +248,22,156,15,23,206,1,86,94,23,205,1,247,22,157,15,28,248,22,130,4, +23,194,2,86,95,23,200,1,23,193,1,19,248,22,142,8,23,198,2,19,248, +22,142,8,23,199,2,249,22,164,15,251,22,149,8,250,22,148,8,23,207,2, +36,23,203,4,2,55,249,23,211,1,23,206,1,23,201,4,28,248,22,148,7, +23,212,2,249,22,163,8,23,213,1,8,63,23,211,1,28,248,22,155,15,23, +207,2,248,22,156,15,23,207,1,86,94,23,206,1,247,22,157,15,2,2,27, +248,22,179,3,23,195,1,28,249,22,163,9,8,46,249,22,143,8,23,201,2, 23,197,2,27,248,22,178,3,23,195,2,249,22,164,15,251,22,149,8,250,22, -148,8,23,204,2,36,23,203,1,2,75,249,22,148,8,23,203,1,23,201,1, -28,248,22,148,7,23,204,2,249,22,163,8,23,205,1,8,63,23,203,1,28, -248,22,155,15,23,199,2,248,22,156,15,23,199,1,86,94,23,198,1,247,22, -157,15,28,248,22,130,4,23,194,2,86,94,23,193,1,19,248,22,142,8,23, -196,2,19,248,22,142,8,23,197,2,249,22,164,15,251,22,149,8,250,22,148, -8,23,205,2,36,23,203,4,2,55,249,22,148,8,23,204,1,23,201,4,28, -248,22,148,7,23,205,2,249,22,163,8,23,206,1,8,63,23,204,1,28,248, -22,155,15,23,200,2,248,22,156,15,23,200,1,86,94,23,199,1,247,22,157, -15,2,2,27,248,22,179,3,23,195,1,28,249,22,163,9,8,46,249,22,143, -8,23,199,2,23,197,2,27,248,22,178,3,23,195,2,249,22,164,15,251,22, -149,8,250,22,148,8,23,205,2,36,23,203,1,2,75,249,22,148,8,23,204, -1,23,201,1,28,248,22,148,7,23,205,2,249,22,163,8,23,206,1,8,63, -23,204,1,28,248,22,155,15,23,200,2,248,22,156,15,23,200,1,86,94,23, -199,1,247,22,157,15,251,2,166,2,198,199,200,196,90,159,38,11,89,161,38, -36,11,86,95,28,28,248,22,155,15,23,196,2,10,28,248,22,154,15,23,196, -2,10,28,248,22,148,7,23,196,2,28,248,22,177,15,23,196,2,10,248,22, -178,15,23,196,2,11,12,252,22,172,11,2,40,2,46,36,23,200,2,23,201, -2,28,28,248,22,148,7,23,197,2,10,248,22,137,8,23,197,2,12,252,22, -172,11,2,40,2,73,37,23,200,2,23,201,2,90,159,39,11,89,161,39,36, -11,248,22,175,15,23,199,2,86,94,23,195,1,86,94,28,192,12,250,22,175, -11,2,40,2,74,23,201,2,249,22,7,194,195,27,248,22,160,15,23,196,1, -27,251,2,166,2,23,198,2,23,201,1,23,202,1,248,22,142,8,23,199,1, -28,248,22,154,15,23,196,2,249,22,172,15,23,197,1,23,195,1,192,252,80, -158,41,8,37,2,40,2,75,22,148,8,198,199,249,247,22,172,5,23,195,1, -11,249,247,22,172,5,194,11,28,248,22,87,23,195,2,9,27,27,248,22,80, +148,8,23,207,2,36,23,203,1,23,208,1,249,23,211,1,23,206,1,23,201, +1,28,248,22,148,7,23,212,2,249,22,163,8,23,213,1,8,63,23,211,1, +28,248,22,155,15,23,207,2,248,22,156,15,23,207,1,86,94,23,206,1,247, +22,157,15,253,2,158,2,23,203,1,23,207,1,23,208,1,23,209,1,23,210, +1,23,199,1,2,28,248,22,154,15,23,196,2,249,22,172,15,23,197,1,23, +195,1,192,32,161,2,88,163,36,40,57,11,2,54,222,33,162,2,28,248,22, +130,4,23,197,2,86,94,23,196,1,19,248,22,142,8,23,195,2,35,248,22, +142,8,23,196,2,249,22,164,15,251,22,149,8,250,22,148,8,23,204,1,36, +23,203,4,2,55,2,55,28,248,22,148,7,23,204,2,249,22,163,8,23,205, +1,8,63,23,203,1,28,248,22,155,15,23,199,2,248,22,156,15,23,199,1, +86,94,23,198,1,247,22,157,15,2,27,248,22,179,3,23,198,1,28,249,22, +163,9,8,46,249,22,143,8,23,198,2,23,197,2,35,248,22,178,3,23,195, +2,249,22,164,15,251,22,149,8,250,22,148,8,23,204,1,36,23,203,1,2, +55,2,55,28,248,22,148,7,23,204,2,249,22,163,8,23,205,1,8,63,23, +203,1,28,248,22,155,15,23,199,2,248,22,156,15,23,199,1,86,94,23,198, +1,247,22,157,15,28,248,22,130,4,23,194,2,86,94,23,193,1,19,248,22, +142,8,23,196,2,35,248,22,142,8,23,197,2,249,22,164,15,251,22,149,8, +250,22,148,8,23,205,1,36,23,203,4,2,55,2,55,28,248,22,148,7,23, +205,2,249,22,163,8,23,206,1,8,63,23,204,1,28,248,22,155,15,23,200, +2,248,22,156,15,23,200,1,86,94,23,199,1,247,22,157,15,2,27,248,22, +179,3,23,195,1,28,249,22,163,9,8,46,249,22,143,8,23,199,2,23,197, +2,35,248,22,178,3,23,195,2,249,22,164,15,251,22,149,8,250,22,148,8, +23,205,1,36,23,203,1,2,55,2,55,28,248,22,148,7,23,205,2,249,22, +163,8,23,206,1,8,63,23,204,1,28,248,22,155,15,23,200,2,248,22,156, +15,23,200,1,86,94,23,199,1,247,22,157,15,251,2,161,2,198,199,200,196, +90,159,38,11,89,161,38,36,11,86,95,28,28,248,22,155,15,23,196,2,10, +28,248,22,154,15,23,196,2,10,28,248,22,148,7,23,196,2,28,248,22,177, +15,23,196,2,10,248,22,178,15,23,196,2,11,12,252,22,172,11,2,40,2, +46,36,23,200,2,23,201,2,28,28,248,22,148,7,23,197,2,10,248,22,137, +8,23,197,2,12,252,22,172,11,2,40,2,73,37,23,200,2,23,201,2,90, +159,39,11,89,161,39,36,11,248,22,175,15,23,199,2,86,94,23,195,1,86, +94,28,192,12,250,22,175,11,2,40,2,74,23,201,2,249,22,7,194,195,27, +248,22,160,15,23,196,1,27,251,2,161,2,23,198,2,23,201,1,23,202,1, +248,22,142,8,23,199,1,28,248,22,154,15,23,196,2,249,22,172,15,23,197, +1,23,195,1,192,2,55,252,80,158,41,8,37,2,40,2,55,32,0,88,163, +8,36,38,43,11,9,222,33,164,2,198,199,32,166,2,88,163,36,40,57,11, +2,54,222,33,167,2,28,248,22,130,4,23,197,2,86,94,23,196,1,19,248, +22,142,8,23,195,2,19,248,22,142,8,23,196,2,249,22,164,15,251,22,149, +8,250,22,148,8,23,204,2,36,23,203,4,2,55,249,22,148,8,23,203,1, +23,201,4,28,248,22,148,7,23,204,2,249,22,163,8,23,205,1,8,63,23, +203,1,28,248,22,155,15,23,199,2,248,22,156,15,23,199,1,86,94,23,198, +1,247,22,157,15,2,2,27,248,22,179,3,23,198,1,28,249,22,163,9,8, +46,249,22,143,8,23,198,2,23,197,2,27,248,22,178,3,23,195,2,249,22, +164,15,251,22,149,8,250,22,148,8,23,204,2,36,23,203,1,2,75,249,22, +148,8,23,203,1,23,201,1,28,248,22,148,7,23,204,2,249,22,163,8,23, +205,1,8,63,23,203,1,28,248,22,155,15,23,199,2,248,22,156,15,23,199, +1,86,94,23,198,1,247,22,157,15,28,248,22,130,4,23,194,2,86,94,23, +193,1,19,248,22,142,8,23,196,2,19,248,22,142,8,23,197,2,249,22,164, +15,251,22,149,8,250,22,148,8,23,205,2,36,23,203,4,2,55,249,22,148, +8,23,204,1,23,201,4,28,248,22,148,7,23,205,2,249,22,163,8,23,206, +1,8,63,23,204,1,28,248,22,155,15,23,200,2,248,22,156,15,23,200,1, +86,94,23,199,1,247,22,157,15,2,2,27,248,22,179,3,23,195,1,28,249, +22,163,9,8,46,249,22,143,8,23,199,2,23,197,2,27,248,22,178,3,23, +195,2,249,22,164,15,251,22,149,8,250,22,148,8,23,205,2,36,23,203,1, +2,75,249,22,148,8,23,204,1,23,201,1,28,248,22,148,7,23,205,2,249, +22,163,8,23,206,1,8,63,23,204,1,28,248,22,155,15,23,200,2,248,22, +156,15,23,200,1,86,94,23,199,1,247,22,157,15,251,2,166,2,198,199,200, +196,90,159,38,11,89,161,38,36,11,86,95,28,28,248,22,155,15,23,196,2, +10,28,248,22,154,15,23,196,2,10,28,248,22,148,7,23,196,2,28,248,22, +177,15,23,196,2,10,248,22,178,15,23,196,2,11,12,252,22,172,11,2,40, +2,46,36,23,200,2,23,201,2,28,28,248,22,148,7,23,197,2,10,248,22, +137,8,23,197,2,12,252,22,172,11,2,40,2,73,37,23,200,2,23,201,2, +90,159,39,11,89,161,39,36,11,248,22,175,15,23,199,2,86,94,23,195,1, +86,94,28,192,12,250,22,175,11,2,40,2,74,23,201,2,249,22,7,194,195, +27,248,22,160,15,23,196,1,27,251,2,166,2,23,198,2,23,201,1,23,202, +1,248,22,142,8,23,199,1,28,248,22,154,15,23,196,2,249,22,172,15,23, +197,1,23,195,1,192,252,80,158,41,8,37,2,40,2,75,22,148,8,198,199, +249,247,22,172,5,23,195,1,11,249,247,22,172,5,194,11,28,248,22,87,23, +195,2,9,27,27,248,22,80,23,197,2,28,248,22,179,15,23,194,2,192,28, +248,22,178,15,23,194,2,249,22,180,15,23,195,1,249,22,180,15,250,80,159, +45,40,39,248,22,131,16,2,61,11,10,248,22,131,16,2,60,250,80,159,41, +40,39,248,22,131,16,2,61,23,196,1,10,28,23,193,2,249,22,79,248,22, +182,15,249,22,180,15,23,198,1,247,22,132,16,27,248,22,81,23,199,1,28, +248,22,87,23,194,2,9,27,248,80,159,42,56,39,248,22,80,23,196,2,28, +23,193,2,249,22,79,248,22,182,15,249,22,180,15,23,198,1,247,22,132,16, +248,80,159,44,8,47,39,248,22,81,23,198,1,86,94,23,193,1,248,80,159, +42,8,47,39,248,22,81,23,196,1,86,94,23,193,1,27,248,22,81,23,197, +1,28,248,22,87,23,194,2,9,27,248,80,159,40,56,39,248,22,80,23,196, +2,28,23,193,2,249,22,79,248,22,182,15,249,22,180,15,23,198,1,247,22, +132,16,248,80,159,42,8,47,39,248,22,81,23,198,1,86,94,23,193,1,248, +80,159,40,8,47,39,248,22,81,23,196,1,28,248,22,87,23,195,2,9,27, +27,248,22,80,23,197,2,28,248,22,179,15,23,194,2,192,28,248,22,178,15, +23,194,2,249,22,180,15,23,195,1,249,22,180,15,250,80,159,45,40,39,248, +22,131,16,2,61,11,10,248,22,131,16,2,60,250,80,159,41,40,39,248,22, +131,16,2,61,23,196,1,10,28,23,193,2,249,22,79,248,22,182,15,249,22, +180,15,23,198,1,247,22,132,16,27,248,22,81,23,199,1,28,248,22,87,23, +194,2,9,27,248,80,159,42,56,39,248,22,80,23,196,2,28,23,193,2,249, +22,79,248,22,182,15,249,22,180,15,23,198,1,247,22,132,16,248,80,159,44, +8,48,39,248,22,81,23,198,1,86,94,23,193,1,248,80,159,42,8,48,39, +248,22,81,23,196,1,86,94,23,193,1,27,248,22,81,23,197,1,28,248,22, +87,23,194,2,9,27,248,80,159,40,56,39,248,22,80,23,196,2,28,23,193, +2,249,22,79,248,22,182,15,249,22,180,15,23,198,1,247,22,132,16,248,80, +159,42,8,48,39,248,22,81,23,198,1,86,94,23,193,1,248,80,159,40,8, +48,39,248,22,81,23,196,1,28,248,22,87,23,195,2,9,27,27,248,22,80, 23,197,2,28,248,22,179,15,23,194,2,192,28,248,22,178,15,23,194,2,249, 22,180,15,23,195,1,249,22,180,15,250,80,159,45,40,39,248,22,131,16,2, 61,11,10,248,22,131,16,2,60,250,80,159,41,40,39,248,22,131,16,2,61, 23,196,1,10,28,23,193,2,249,22,79,248,22,182,15,249,22,180,15,23,198, 1,247,22,132,16,27,248,22,81,23,199,1,28,248,22,87,23,194,2,9,27, -248,80,159,42,56,39,248,22,80,23,196,2,28,23,193,2,249,22,79,248,22, -182,15,249,22,180,15,23,198,1,247,22,132,16,248,80,159,44,8,47,39,248, -22,81,23,198,1,86,94,23,193,1,248,80,159,42,8,47,39,248,22,81,23, -196,1,86,94,23,193,1,27,248,22,81,23,197,1,28,248,22,87,23,194,2, -9,27,248,80,159,40,56,39,248,22,80,23,196,2,28,23,193,2,249,22,79, -248,22,182,15,249,22,180,15,23,198,1,247,22,132,16,248,80,159,42,8,47, -39,248,22,81,23,198,1,86,94,23,193,1,248,80,159,40,8,47,39,248,22, -81,23,196,1,28,248,22,87,23,195,2,9,27,27,248,22,80,23,197,2,28, -248,22,179,15,23,194,2,192,28,248,22,178,15,23,194,2,249,22,180,15,23, -195,1,249,22,180,15,250,80,159,45,40,39,248,22,131,16,2,61,11,10,248, -22,131,16,2,60,250,80,159,41,40,39,248,22,131,16,2,61,23,196,1,10, -28,23,193,2,249,22,79,248,22,182,15,249,22,180,15,23,198,1,247,22,132, -16,27,248,22,81,23,199,1,28,248,22,87,23,194,2,9,27,248,80,159,42, -56,39,248,22,80,23,196,2,28,23,193,2,249,22,79,248,22,182,15,249,22, -180,15,23,198,1,247,22,132,16,248,80,159,44,8,48,39,248,22,81,23,198, -1,86,94,23,193,1,248,80,159,42,8,48,39,248,22,81,23,196,1,86,94, -23,193,1,27,248,22,81,23,197,1,28,248,22,87,23,194,2,9,27,248,80, -159,40,56,39,248,22,80,23,196,2,28,23,193,2,249,22,79,248,22,182,15, -249,22,180,15,23,198,1,247,22,132,16,248,80,159,42,8,48,39,248,22,81, -23,198,1,86,94,23,193,1,248,80,159,40,8,48,39,248,22,81,23,196,1, -28,248,22,87,23,195,2,9,27,27,248,22,80,23,197,2,28,248,22,179,15, -23,194,2,192,28,248,22,178,15,23,194,2,249,22,180,15,23,195,1,249,22, -180,15,250,80,159,45,40,39,248,22,131,16,2,61,11,10,248,22,131,16,2, -60,250,80,159,41,40,39,248,22,131,16,2,61,23,196,1,10,28,23,193,2, -249,22,79,248,22,182,15,249,22,180,15,23,198,1,247,22,132,16,27,248,22, -81,23,199,1,28,248,22,87,23,194,2,9,27,27,248,22,80,23,196,2,28, -248,22,179,15,23,194,2,192,28,248,22,178,15,23,194,2,249,22,180,15,23, -195,1,249,22,180,15,250,80,159,49,40,39,248,22,131,16,2,61,11,10,248, -22,131,16,2,60,250,80,159,45,40,39,248,22,131,16,2,61,23,196,1,10, -28,23,193,2,249,22,79,248,22,182,15,249,22,180,15,23,198,1,247,22,132, -16,27,248,22,81,23,198,1,28,248,22,87,23,194,2,9,27,248,80,159,46, -56,39,248,22,80,23,196,2,28,23,193,2,249,22,79,248,22,182,15,249,22, -180,15,23,198,1,247,22,132,16,248,80,159,48,8,49,39,248,22,81,23,198, -1,86,94,23,193,1,248,80,159,46,8,49,39,248,22,81,23,196,1,86,94, -23,193,1,27,248,22,81,23,196,1,28,248,22,87,23,194,2,9,27,248,80, -159,44,56,39,248,22,80,23,196,2,28,23,193,2,249,22,79,248,22,182,15, -249,22,180,15,23,198,1,247,22,132,16,248,80,159,46,8,49,39,248,22,81, -23,198,1,86,94,23,193,1,248,80,159,44,8,49,39,248,22,81,23,196,1, -86,94,23,193,1,27,248,22,81,23,197,1,28,248,22,87,23,194,2,9,27, 27,248,22,80,23,196,2,28,248,22,179,15,23,194,2,192,28,248,22,178,15, -23,194,2,249,22,180,15,23,195,1,249,22,180,15,250,80,159,47,40,39,248, -22,131,16,2,61,11,10,248,22,131,16,2,60,250,80,159,43,40,39,248,22, +23,194,2,249,22,180,15,23,195,1,249,22,180,15,250,80,159,49,40,39,248, +22,131,16,2,61,11,10,248,22,131,16,2,60,250,80,159,45,40,39,248,22, 131,16,2,61,23,196,1,10,28,23,193,2,249,22,79,248,22,182,15,249,22, 180,15,23,198,1,247,22,132,16,27,248,22,81,23,198,1,28,248,22,87,23, -194,2,9,27,248,80,159,44,56,39,248,22,80,23,196,2,28,23,193,2,249, -22,79,248,22,182,15,249,22,180,15,23,198,1,247,22,132,16,248,80,159,46, -8,49,39,248,22,81,23,198,1,86,94,23,193,1,248,80,159,44,8,49,39, +194,2,9,27,248,80,159,46,56,39,248,22,80,23,196,2,28,23,193,2,249, +22,79,248,22,182,15,249,22,180,15,23,198,1,247,22,132,16,248,80,159,48, +8,49,39,248,22,81,23,198,1,86,94,23,193,1,248,80,159,46,8,49,39, 248,22,81,23,196,1,86,94,23,193,1,27,248,22,81,23,196,1,28,248,22, -87,23,194,2,9,27,248,80,159,42,56,39,248,22,80,23,196,2,28,23,193, +87,23,194,2,9,27,248,80,159,44,56,39,248,22,80,23,196,2,28,23,193, 2,249,22,79,248,22,182,15,249,22,180,15,23,198,1,247,22,132,16,248,80, -159,44,8,49,39,248,22,81,23,198,1,86,94,23,193,1,248,80,159,42,8, -49,39,248,22,81,23,196,1,27,247,22,137,16,27,248,80,159,39,52,39,247, -80,159,39,51,39,249,80,159,40,41,38,28,23,196,2,27,249,22,170,8,247, -22,169,8,2,76,28,192,249,22,160,8,194,7,63,2,71,2,71,250,80,159, -43,57,39,23,198,2,2,77,27,28,23,200,1,250,22,172,15,248,22,131,16, -2,65,250,22,157,2,23,205,1,2,62,247,22,166,8,2,78,86,94,23,199, -1,11,27,248,80,159,46,8,47,39,250,22,93,9,248,22,89,248,22,131,16, -2,63,9,28,193,249,22,79,195,194,192,27,247,22,137,16,27,248,80,159,39, -52,39,247,80,159,39,51,39,249,80,159,40,41,38,28,23,196,2,27,249,22, -170,8,247,22,169,8,2,76,28,192,249,22,160,8,194,7,63,2,71,2,71, -250,80,159,43,57,39,23,198,2,2,77,27,28,23,200,1,250,22,172,15,248, -22,131,16,2,65,250,22,157,2,23,205,1,2,62,247,22,166,8,2,78,86, -94,23,199,1,11,27,248,80,159,46,8,48,39,250,22,93,23,207,1,248,22, -89,248,22,131,16,2,63,9,28,193,249,22,79,195,194,192,27,247,22,137,16, -27,248,80,159,39,52,39,27,248,22,131,16,2,59,28,248,22,179,15,23,194, -2,192,27,28,248,22,177,15,23,195,2,20,13,159,80,159,41,43,37,250,80, -159,44,44,37,249,22,33,11,80,159,46,43,37,22,132,16,248,22,131,16,2, -60,27,248,22,131,16,2,61,250,80,159,45,40,39,23,196,1,23,198,2,11, -11,28,23,193,2,192,86,94,23,193,1,27,249,22,180,15,27,248,22,131,16, -2,61,250,80,159,48,40,39,23,196,1,11,11,248,22,131,16,2,60,90,159, -39,11,89,161,39,36,11,248,22,175,15,23,197,1,86,95,23,195,1,23,194, -1,249,22,180,15,23,200,1,23,195,1,249,80,159,40,41,38,28,23,196,2, -27,249,22,170,8,247,22,169,8,2,76,28,192,249,22,160,8,194,7,63,2, -71,2,71,250,80,159,43,57,39,23,198,2,2,77,27,28,23,200,1,250,22, -172,15,248,22,131,16,2,65,250,22,157,2,23,205,1,2,62,247,22,166,8, -2,78,86,94,23,199,1,11,27,27,250,22,93,23,207,1,248,22,89,248,22, -131,16,2,63,23,208,1,28,248,22,87,23,194,2,9,27,27,248,22,80,23, -196,2,28,248,22,179,15,23,194,2,192,28,248,22,178,15,23,194,2,249,22, -180,15,23,195,1,249,22,180,15,250,80,159,55,40,39,248,22,131,16,2,61, -11,10,248,22,131,16,2,60,250,80,159,51,40,39,248,22,131,16,2,61,23, -196,1,10,28,23,193,2,249,22,79,248,22,182,15,249,22,180,15,23,198,1, -247,22,132,16,27,248,22,81,23,198,1,28,248,22,87,23,194,2,9,27,248, -80,159,52,56,39,248,22,80,23,196,2,28,23,193,2,249,22,79,248,22,182, -15,249,22,180,15,23,198,1,247,22,132,16,248,80,159,54,8,49,39,248,22, -81,23,198,1,86,94,23,193,1,248,80,159,52,8,49,39,248,22,81,23,196, -1,86,94,23,193,1,27,248,22,81,23,196,1,28,248,22,87,23,194,2,9, -27,248,80,159,50,56,39,248,22,80,23,196,2,28,23,193,2,249,22,79,248, -22,182,15,249,22,180,15,23,198,1,247,22,132,16,248,80,159,52,8,49,39, -248,22,81,23,198,1,86,94,23,193,1,248,80,159,50,8,49,39,248,22,81, -23,196,1,28,193,249,22,79,195,194,192,27,20,13,159,80,159,37,43,37,26, -9,80,159,46,44,37,249,22,33,11,80,159,48,43,37,22,128,15,10,22,135, -15,10,22,136,15,10,22,137,15,10,248,22,143,6,23,196,2,28,248,22,143, -7,23,194,2,12,86,94,248,22,171,9,23,194,1,27,20,13,159,80,159,38, -43,37,26,9,80,159,47,44,37,249,22,33,11,80,159,49,43,37,22,128,15, -10,22,135,15,10,22,136,15,10,22,137,15,10,248,22,143,6,23,197,2,28, -248,22,143,7,23,194,2,12,86,94,248,22,171,9,23,194,1,27,20,13,159, -80,159,39,43,37,26,9,80,159,48,44,37,249,22,33,11,80,159,50,43,37, -22,128,15,10,22,135,15,10,22,136,15,10,22,137,15,10,248,22,143,6,23, -198,2,28,248,22,143,7,23,194,2,12,86,94,248,22,171,9,23,194,1,248, -80,159,40,8,50,39,197,86,94,249,22,134,7,247,22,168,5,23,196,2,248, -22,158,6,249,22,133,4,36,249,22,181,3,23,198,1,23,199,1,27,28,23, -197,2,86,95,23,196,1,23,195,1,23,197,1,86,94,23,197,1,27,248,22, -131,16,2,61,27,250,80,159,42,40,39,23,197,1,11,11,27,248,22,136,4, -23,199,1,27,28,23,194,2,23,194,1,86,94,23,194,1,36,27,248,22,136, -4,23,202,1,27,28,23,194,2,23,194,1,86,94,23,194,1,36,249,22,135, -6,23,199,1,20,20,95,88,163,8,36,36,48,11,9,224,4,2,33,179,2, -23,195,1,23,197,1,27,248,22,184,5,23,195,1,248,80,159,39,8,50,39, -193,159,36,20,114,159,36,16,1,11,16,0,20,26,145,9,2,1,2,1,29, -11,11,11,11,9,9,11,11,11,10,43,80,158,36,36,20,114,159,44,16,43, -2,2,2,3,2,4,2,5,2,6,2,7,2,8,30,2,11,1,20,112,97, -114,97,109,101,116,101,114,105,122,97,116,105,111,110,45,107,101,121,11,6,30, -2,11,1,23,101,120,116,101,110,100,45,112,97,114,97,109,101,116,101,114,105, -122,97,116,105,111,110,11,3,2,12,2,13,2,14,2,15,2,16,2,17,2, -18,2,19,2,20,2,21,2,22,2,23,2,24,2,25,30,2,26,76,102,105, -110,100,45,108,105,110,107,115,45,112,97,116,104,33,11,4,2,27,2,28,2, -29,2,30,2,31,2,32,2,33,2,34,30,2,26,1,21,101,120,99,101,112, -116,105,111,110,45,104,97,110,100,108,101,114,45,107,101,121,11,2,2,35,2, -36,2,37,2,38,2,39,2,40,2,41,2,42,2,43,2,44,16,0,37,39, -36,16,0,36,16,25,2,13,2,14,2,12,2,24,2,25,2,3,2,38,2, -21,2,22,2,23,2,34,2,18,2,19,2,20,2,36,2,31,2,27,2,32, -2,35,2,37,2,39,2,33,2,29,2,28,2,30,8,25,11,11,11,16,14, -2,8,2,17,2,15,2,44,2,16,2,6,2,43,2,42,2,4,2,41,2, -7,2,40,2,2,2,5,16,14,11,11,11,11,11,11,11,11,11,11,11,11, -11,11,16,14,2,8,2,17,2,15,2,44,2,16,2,6,2,43,2,42,2, -4,2,41,2,7,2,40,2,2,2,5,50,50,37,12,11,11,16,0,16,0, -16,0,36,36,11,12,11,11,16,0,16,0,16,0,36,36,16,47,20,15,16, -2,32,0,88,163,36,37,45,11,2,2,222,33,79,80,159,36,36,37,20,15, -16,2,249,22,150,7,7,92,7,92,80,159,36,37,37,20,15,16,2,88,163, -36,37,54,38,2,4,223,0,33,84,80,159,36,38,37,20,15,16,2,88,163, -36,38,58,38,2,5,223,0,33,86,80,159,36,39,37,20,15,16,2,20,25, -96,2,6,88,163,8,36,39,8,25,8,32,9,223,0,33,93,88,163,36,38, -47,52,9,223,0,33,94,88,163,36,37,46,52,9,223,0,33,95,80,159,36, -40,37,20,15,16,2,27,248,22,141,16,248,22,162,8,27,28,249,22,163,9, -247,22,175,8,2,47,6,1,1,59,6,1,1,58,250,22,132,8,6,14,14, -40,91,94,126,97,93,42,41,126,97,40,46,42,41,23,196,2,23,196,1,88, -163,8,36,38,48,11,2,7,223,0,33,99,80,159,36,41,37,20,15,16,2, -88,163,36,37,8,38,8,128,6,2,8,223,0,33,100,80,159,36,42,37,20, -15,16,2,32,0,88,163,8,36,38,47,11,2,12,222,33,101,80,159,36,45, -37,20,15,16,2,32,0,88,163,8,36,39,48,11,2,13,222,33,103,80,159, -36,46,37,20,15,16,2,32,0,88,163,8,36,38,46,11,2,14,222,33,104, -80,159,36,47,37,20,15,16,2,88,163,45,39,49,8,128,128,2,15,223,0, -33,106,80,159,36,48,37,20,15,16,2,88,163,45,40,50,8,128,128,2,17, -223,0,33,108,80,159,36,50,37,20,15,16,2,88,163,36,36,51,8,144,6, -2,18,223,0,33,109,80,159,36,51,37,20,15,16,2,88,163,8,32,36,8, -37,8,128,6,9,223,0,33,110,80,159,36,8,43,39,20,15,16,2,88,163, -8,36,37,47,16,4,36,36,8,128,32,36,2,19,223,0,33,111,80,159,36, -52,37,20,15,16,2,20,27,158,32,0,88,163,36,37,45,11,2,20,222,33, -112,32,0,88,163,36,37,45,11,2,20,222,33,113,80,159,36,53,37,20,15, -16,2,88,163,36,37,56,52,2,21,223,0,33,114,80,159,36,54,37,20,15, -16,2,88,163,36,37,55,52,2,22,223,0,33,115,80,159,36,55,37,20,15, -16,2,88,163,36,37,51,52,2,23,223,0,33,116,80,159,36,56,37,20,15, -16,2,88,163,8,36,38,55,16,4,36,40,8,128,64,36,2,54,223,0,33, -117,80,159,36,8,44,39,20,15,16,2,88,163,8,36,39,49,16,4,36,36, -8,128,64,36,2,24,223,0,33,118,80,159,36,57,37,20,15,16,2,248,80, -159,37,59,37,88,163,8,36,36,53,8,240,144,1,37,0,9,223,1,33,119, -80,159,36,58,37,20,15,16,2,248,22,80,80,159,37,58,38,80,159,36,8, -24,37,20,15,16,2,248,22,81,80,159,37,58,38,80,159,36,8,25,37,20, -15,16,2,247,22,137,2,80,158,36,8,26,20,15,16,2,11,80,158,36,8, -27,20,15,16,2,249,22,179,8,248,22,182,8,80,159,39,8,24,38,247,22, -137,2,80,159,36,8,28,37,20,15,16,2,249,22,179,8,248,22,182,8,80, -159,39,8,24,38,11,80,159,36,8,29,37,20,15,16,2,248,22,18,65,115, -116,97,109,112,80,159,36,8,30,37,20,15,16,2,88,163,36,37,46,16,2, -36,8,240,0,64,0,0,9,223,0,33,121,80,159,36,8,45,39,20,15,16, -2,88,163,36,38,48,16,4,36,8,240,0,64,0,0,8,129,128,36,2,34, -223,0,33,129,2,80,159,36,8,31,37,20,15,16,2,32,0,88,163,8,36, -37,45,11,2,35,222,33,130,2,80,159,36,8,33,37,20,15,16,2,88,163, -36,38,45,16,4,8,128,6,8,240,0,191,0,0,37,36,2,36,223,0,33, -142,2,80,159,36,8,34,37,20,15,16,2,88,163,36,38,56,16,4,36,36, -44,36,2,37,223,0,33,144,2,80,159,36,8,35,37,20,15,16,2,88,163, -8,36,38,8,25,16,4,36,8,128,4,8,240,4,64,0,0,36,2,54,223, -0,33,145,2,80,159,36,8,46,39,20,15,16,2,88,163,36,40,8,33,16, -4,36,8,128,4,8,240,12,64,0,0,36,2,16,223,0,33,156,2,80,159, -36,49,37,20,15,16,2,32,0,88,163,36,39,50,11,2,38,222,33,157,2, -80,159,36,8,36,37,20,15,16,2,32,0,88,163,36,41,8,27,11,2,39, -222,33,160,2,80,159,36,8,37,37,20,15,16,2,20,27,158,32,0,88,163, -36,38,52,11,2,40,222,33,163,2,88,163,36,38,49,16,4,36,36,8,32, -36,2,40,223,0,33,165,2,80,159,36,8,38,37,20,15,16,2,20,27,158, -32,0,88,163,36,38,52,11,2,41,222,33,168,2,88,163,36,38,49,16,4, -36,36,8,32,36,2,41,223,0,33,169,2,80,159,36,8,39,37,20,15,16, -2,20,27,158,32,0,88,163,36,37,44,11,2,42,222,33,170,2,32,0,88, -163,36,37,44,11,2,42,222,33,171,2,80,159,36,8,40,37,20,15,16,2, -88,163,8,36,37,53,16,4,52,52,8,240,0,128,0,0,36,2,54,223,0, -33,172,2,80,159,36,8,47,39,20,15,16,2,88,163,8,36,37,53,16,4, -52,52,36,37,2,54,223,0,33,173,2,80,159,36,8,48,39,20,15,16,2, -88,163,8,36,37,57,16,4,52,52,36,38,2,54,223,0,33,174,2,80,159, -36,8,49,39,20,15,16,2,20,25,96,2,43,88,163,36,36,57,16,4,8, -240,32,128,0,0,8,33,8,240,0,128,0,0,36,9,223,0,33,175,2,88, -163,36,37,58,16,4,8,240,32,128,0,0,8,33,36,37,9,223,0,33,176, -2,88,163,36,38,8,28,16,4,8,176,6,8,49,36,38,9,223,0,33,177, -2,80,159,36,8,41,37,20,15,16,2,88,163,8,36,37,57,16,4,8,128, -6,36,36,40,2,54,223,0,33,178,2,80,159,36,8,50,39,20,15,16,2, -88,163,8,36,39,54,16,4,52,36,36,40,2,44,223,0,33,180,2,80,159, -36,8,42,37,95,29,94,2,9,68,35,37,107,101,114,110,101,108,11,29,94, -2,9,69,35,37,109,105,110,45,115,116,120,11,2,26,9,9,9,36,0}; - EVAL_ONE_SIZED_STR((char *)expr, 18415); +159,46,8,49,39,248,22,81,23,198,1,86,94,23,193,1,248,80,159,44,8, +49,39,248,22,81,23,196,1,86,94,23,193,1,27,248,22,81,23,197,1,28, +248,22,87,23,194,2,9,27,27,248,22,80,23,196,2,28,248,22,179,15,23, +194,2,192,28,248,22,178,15,23,194,2,249,22,180,15,23,195,1,249,22,180, +15,250,80,159,47,40,39,248,22,131,16,2,61,11,10,248,22,131,16,2,60, +250,80,159,43,40,39,248,22,131,16,2,61,23,196,1,10,28,23,193,2,249, +22,79,248,22,182,15,249,22,180,15,23,198,1,247,22,132,16,27,248,22,81, +23,198,1,28,248,22,87,23,194,2,9,27,248,80,159,44,56,39,248,22,80, +23,196,2,28,23,193,2,249,22,79,248,22,182,15,249,22,180,15,23,198,1, +247,22,132,16,248,80,159,46,8,49,39,248,22,81,23,198,1,86,94,23,193, +1,248,80,159,44,8,49,39,248,22,81,23,196,1,86,94,23,193,1,27,248, +22,81,23,196,1,28,248,22,87,23,194,2,9,27,248,80,159,42,56,39,248, +22,80,23,196,2,28,23,193,2,249,22,79,248,22,182,15,249,22,180,15,23, +198,1,247,22,132,16,248,80,159,44,8,49,39,248,22,81,23,198,1,86,94, +23,193,1,248,80,159,42,8,49,39,248,22,81,23,196,1,27,247,22,137,16, +27,248,80,159,39,52,39,247,80,159,39,51,39,249,80,159,40,41,38,28,23, +196,2,27,249,22,170,8,247,22,169,8,2,76,28,192,249,22,160,8,194,7, +63,2,71,2,71,250,80,159,43,57,39,23,198,2,2,77,27,28,23,200,1, +250,22,172,15,248,22,131,16,2,65,250,22,157,2,23,205,1,2,62,247,22, +166,8,2,78,86,94,23,199,1,11,27,248,80,159,46,8,47,39,250,22,93, +9,248,22,89,248,22,131,16,2,63,9,28,193,249,22,79,195,194,192,27,247, +22,137,16,27,248,80,159,39,52,39,247,80,159,39,51,39,249,80,159,40,41, +38,28,23,196,2,27,249,22,170,8,247,22,169,8,2,76,28,192,249,22,160, +8,194,7,63,2,71,2,71,250,80,159,43,57,39,23,198,2,2,77,27,28, +23,200,1,250,22,172,15,248,22,131,16,2,65,250,22,157,2,23,205,1,2, +62,247,22,166,8,2,78,86,94,23,199,1,11,27,248,80,159,46,8,48,39, +250,22,93,23,207,1,248,22,89,248,22,131,16,2,63,9,28,193,249,22,79, +195,194,192,27,247,22,137,16,27,248,80,159,39,52,39,27,248,22,131,16,2, +59,28,248,22,179,15,23,194,2,192,27,28,248,22,177,15,23,195,2,20,13, +159,80,159,41,43,37,250,80,159,44,44,37,249,22,33,11,80,159,46,43,37, +22,132,16,248,22,131,16,2,60,27,248,22,131,16,2,61,250,80,159,45,40, +39,23,196,1,23,198,2,11,11,28,23,193,2,192,86,94,23,193,1,27,249, +22,180,15,27,248,22,131,16,2,61,250,80,159,48,40,39,23,196,1,11,11, +248,22,131,16,2,60,90,159,39,11,89,161,39,36,11,248,22,175,15,23,197, +1,86,95,23,195,1,23,194,1,249,22,180,15,23,200,1,23,195,1,249,80, +159,40,41,38,28,23,196,2,27,249,22,170,8,247,22,169,8,2,76,28,192, +249,22,160,8,194,7,63,2,71,2,71,250,80,159,43,57,39,23,198,2,2, +77,27,28,23,200,1,250,22,172,15,248,22,131,16,2,65,250,22,157,2,23, +205,1,2,62,247,22,166,8,2,78,86,94,23,199,1,11,27,27,250,22,93, +23,207,1,248,22,89,248,22,131,16,2,63,23,208,1,28,248,22,87,23,194, +2,9,27,27,248,22,80,23,196,2,28,248,22,179,15,23,194,2,192,28,248, +22,178,15,23,194,2,249,22,180,15,23,195,1,249,22,180,15,250,80,159,55, +40,39,248,22,131,16,2,61,11,10,248,22,131,16,2,60,250,80,159,51,40, +39,248,22,131,16,2,61,23,196,1,10,28,23,193,2,249,22,79,248,22,182, +15,249,22,180,15,23,198,1,247,22,132,16,27,248,22,81,23,198,1,28,248, +22,87,23,194,2,9,27,248,80,159,52,56,39,248,22,80,23,196,2,28,23, +193,2,249,22,79,248,22,182,15,249,22,180,15,23,198,1,247,22,132,16,248, +80,159,54,8,49,39,248,22,81,23,198,1,86,94,23,193,1,248,80,159,52, +8,49,39,248,22,81,23,196,1,86,94,23,193,1,27,248,22,81,23,196,1, +28,248,22,87,23,194,2,9,27,248,80,159,50,56,39,248,22,80,23,196,2, +28,23,193,2,249,22,79,248,22,182,15,249,22,180,15,23,198,1,247,22,132, +16,248,80,159,52,8,49,39,248,22,81,23,198,1,86,94,23,193,1,248,80, +159,50,8,49,39,248,22,81,23,196,1,28,193,249,22,79,195,194,192,27,20, +13,159,80,159,37,43,37,26,9,80,159,46,44,37,249,22,33,11,80,159,48, +43,37,22,128,15,10,22,135,15,10,22,136,15,10,22,137,15,10,248,22,143, +6,23,196,2,28,248,22,143,7,23,194,2,12,86,94,248,22,171,9,23,194, +1,27,20,13,159,80,159,38,43,37,26,9,80,159,47,44,37,249,22,33,11, +80,159,49,43,37,22,128,15,10,22,135,15,10,22,136,15,10,22,137,15,10, +248,22,143,6,23,197,2,28,248,22,143,7,23,194,2,12,86,94,248,22,171, +9,23,194,1,27,20,13,159,80,159,39,43,37,26,9,80,159,48,44,37,249, +22,33,11,80,159,50,43,37,22,128,15,10,22,135,15,10,22,136,15,10,22, +137,15,10,248,22,143,6,23,198,2,28,248,22,143,7,23,194,2,12,86,94, +248,22,171,9,23,194,1,248,80,159,40,8,50,39,197,86,94,249,22,134,7, +247,22,168,5,23,196,2,248,22,158,6,249,22,133,4,36,249,22,181,3,23, +198,1,23,199,1,27,28,23,197,2,86,95,23,196,1,23,195,1,23,197,1, +86,94,23,197,1,27,248,22,131,16,2,61,27,250,80,159,42,40,39,23,197, +1,11,11,27,248,22,136,4,23,199,1,27,28,23,194,2,23,194,1,86,94, +23,194,1,36,27,248,22,136,4,23,202,1,27,28,23,194,2,23,194,1,86, +94,23,194,1,36,249,22,135,6,23,199,1,20,20,95,88,163,8,36,36,48, +11,9,224,4,2,33,179,2,23,195,1,23,197,1,27,248,22,184,5,23,195, +1,248,80,159,39,8,50,39,193,159,36,20,114,159,36,16,1,11,16,0,20, +26,145,9,2,1,2,1,29,11,11,11,11,9,9,11,11,11,10,43,80,158, +36,36,20,114,159,44,16,43,2,2,2,3,2,4,2,5,2,6,2,7,2, +8,30,2,11,1,20,112,97,114,97,109,101,116,101,114,105,122,97,116,105,111, +110,45,107,101,121,11,6,30,2,11,1,23,101,120,116,101,110,100,45,112,97, +114,97,109,101,116,101,114,105,122,97,116,105,111,110,11,3,2,12,2,13,2, +14,2,15,2,16,2,17,2,18,2,19,2,20,2,21,2,22,2,23,2,24, +2,25,30,2,26,76,102,105,110,100,45,108,105,110,107,115,45,112,97,116,104, +33,11,4,2,27,2,28,2,29,2,30,2,31,2,32,2,33,2,34,30,2, +26,1,21,101,120,99,101,112,116,105,111,110,45,104,97,110,100,108,101,114,45, +107,101,121,11,2,2,35,2,36,2,37,2,38,2,39,2,40,2,41,2,42, +2,43,2,44,16,0,37,39,36,16,0,36,16,25,2,13,2,14,2,12,2, +24,2,25,2,3,2,38,2,21,2,22,2,23,2,34,2,18,2,19,2,20, +2,36,2,31,2,27,2,32,2,35,2,37,2,39,2,33,2,29,2,28,2, +30,8,25,11,11,11,16,14,2,8,2,17,2,15,2,44,2,16,2,6,2, +43,2,42,2,4,2,41,2,7,2,40,2,2,2,5,16,14,11,11,11,11, +11,11,11,11,11,11,11,11,11,11,16,14,2,8,2,17,2,15,2,44,2, +16,2,6,2,43,2,42,2,4,2,41,2,7,2,40,2,2,2,5,50,50, +37,12,11,11,16,0,16,0,16,0,36,36,11,12,11,11,16,0,16,0,16, +0,36,36,16,47,20,15,16,2,32,0,88,163,36,37,45,11,2,2,222,33, +79,80,159,36,36,37,20,15,16,2,249,22,150,7,7,92,7,92,80,159,36, +37,37,20,15,16,2,88,163,36,37,54,38,2,4,223,0,33,84,80,159,36, +38,37,20,15,16,2,88,163,36,38,58,38,2,5,223,0,33,86,80,159,36, +39,37,20,15,16,2,20,25,96,2,6,88,163,8,36,39,8,25,8,32,9, +223,0,33,93,88,163,36,38,47,52,9,223,0,33,94,88,163,36,37,46,52, +9,223,0,33,95,80,159,36,40,37,20,15,16,2,27,248,22,141,16,248,22, +162,8,27,28,249,22,163,9,247,22,175,8,2,47,6,1,1,59,6,1,1, +58,250,22,132,8,6,14,14,40,91,94,126,97,93,42,41,126,97,40,46,42, +41,23,196,2,23,196,1,88,163,8,36,38,48,11,2,7,223,0,33,99,80, +159,36,41,37,20,15,16,2,88,163,36,37,8,38,8,128,6,2,8,223,0, +33,100,80,159,36,42,37,20,15,16,2,32,0,88,163,8,36,38,47,11,2, +12,222,33,101,80,159,36,45,37,20,15,16,2,32,0,88,163,8,36,39,48, +11,2,13,222,33,103,80,159,36,46,37,20,15,16,2,32,0,88,163,8,36, +38,46,11,2,14,222,33,104,80,159,36,47,37,20,15,16,2,88,163,45,39, +49,8,128,128,2,15,223,0,33,106,80,159,36,48,37,20,15,16,2,88,163, +45,40,50,8,128,128,2,17,223,0,33,108,80,159,36,50,37,20,15,16,2, +88,163,36,36,51,8,144,6,2,18,223,0,33,109,80,159,36,51,37,20,15, +16,2,88,163,8,36,36,8,38,8,128,6,9,223,0,33,110,80,159,36,8, +43,39,20,15,16,2,88,163,8,36,37,47,16,4,36,36,8,128,32,36,2, +19,223,0,33,111,80,159,36,52,37,20,15,16,2,20,27,158,32,0,88,163, +36,37,45,11,2,20,222,33,112,32,0,88,163,36,37,45,11,2,20,222,33, +113,80,159,36,53,37,20,15,16,2,88,163,36,37,56,52,2,21,223,0,33, +114,80,159,36,54,37,20,15,16,2,88,163,36,37,55,52,2,22,223,0,33, +115,80,159,36,55,37,20,15,16,2,88,163,36,37,51,52,2,23,223,0,33, +116,80,159,36,56,37,20,15,16,2,88,163,8,36,38,55,16,4,36,40,8, +128,64,36,2,54,223,0,33,117,80,159,36,8,44,39,20,15,16,2,88,163, +8,36,39,49,16,4,36,36,8,128,64,36,2,24,223,0,33,118,80,159,36, +57,37,20,15,16,2,248,80,159,37,59,37,88,163,8,36,36,53,8,240,144, +1,37,0,9,223,1,33,119,80,159,36,58,37,20,15,16,2,248,22,80,80, +159,37,58,38,80,159,36,8,24,37,20,15,16,2,248,22,81,80,159,37,58, +38,80,159,36,8,25,37,20,15,16,2,247,22,137,2,80,158,36,8,26,20, +15,16,2,11,80,158,36,8,27,20,15,16,2,249,22,179,8,248,22,182,8, +80,159,39,8,24,38,247,22,137,2,80,159,36,8,28,37,20,15,16,2,249, +22,179,8,248,22,182,8,80,159,39,8,24,38,11,80,159,36,8,29,37,20, +15,16,2,248,22,18,65,115,116,97,109,112,80,159,36,8,30,37,20,15,16, +2,88,163,36,37,46,16,2,36,8,240,0,64,0,0,9,223,0,33,121,80, +159,36,8,45,39,20,15,16,2,88,163,36,38,48,16,4,36,8,240,0,64, +0,0,8,129,128,36,2,34,223,0,33,129,2,80,159,36,8,31,37,20,15, +16,2,32,0,88,163,8,36,37,45,11,2,35,222,33,130,2,80,159,36,8, +33,37,20,15,16,2,88,163,36,38,45,16,4,8,128,6,8,240,0,191,0, +0,37,36,2,36,223,0,33,142,2,80,159,36,8,34,37,20,15,16,2,88, +163,36,38,56,16,4,36,36,44,36,2,37,223,0,33,144,2,80,159,36,8, +35,37,20,15,16,2,88,163,8,36,38,8,25,16,4,36,8,128,4,8,240, +4,64,0,0,36,2,54,223,0,33,145,2,80,159,36,8,46,39,20,15,16, +2,88,163,36,40,8,33,16,4,36,8,128,12,8,240,12,64,0,0,36,2, +16,223,0,33,156,2,80,159,36,49,37,20,15,16,2,32,0,88,163,36,39, +50,11,2,38,222,33,157,2,80,159,36,8,36,37,20,15,16,2,32,0,88, +163,36,41,8,27,11,2,39,222,33,160,2,80,159,36,8,37,37,20,15,16, +2,20,27,158,32,0,88,163,36,38,52,11,2,40,222,33,163,2,88,163,36, +38,49,16,4,36,36,8,32,36,2,40,223,0,33,165,2,80,159,36,8,38, +37,20,15,16,2,20,27,158,32,0,88,163,36,38,52,11,2,41,222,33,168, +2,88,163,36,38,49,16,4,36,36,8,32,36,2,41,223,0,33,169,2,80, +159,36,8,39,37,20,15,16,2,20,27,158,32,0,88,163,36,37,44,11,2, +42,222,33,170,2,32,0,88,163,36,37,44,11,2,42,222,33,171,2,80,159, +36,8,40,37,20,15,16,2,88,163,8,36,37,53,16,4,52,52,8,240,0, +128,0,0,36,2,54,223,0,33,172,2,80,159,36,8,47,39,20,15,16,2, +88,163,8,36,37,53,16,4,52,52,36,37,2,54,223,0,33,173,2,80,159, +36,8,48,39,20,15,16,2,88,163,8,36,37,57,16,4,52,52,36,38,2, +54,223,0,33,174,2,80,159,36,8,49,39,20,15,16,2,20,25,96,2,43, +88,163,36,36,57,16,4,8,240,32,128,0,0,8,33,8,240,0,128,0,0, +36,9,223,0,33,175,2,88,163,36,37,58,16,4,8,240,32,128,0,0,8, +33,36,37,9,223,0,33,176,2,88,163,36,38,8,28,16,4,8,176,6,8, +49,36,38,9,223,0,33,177,2,80,159,36,8,41,37,20,15,16,2,88,163, +8,36,37,57,16,4,8,128,6,36,36,40,2,54,223,0,33,178,2,80,159, +36,8,50,39,20,15,16,2,88,163,8,36,39,54,16,4,52,36,36,40,2, +44,223,0,33,180,2,80,159,36,8,42,37,95,29,94,2,9,68,35,37,107, +101,114,110,101,108,11,29,94,2,9,69,35,37,109,105,110,45,115,116,120,11, +2,26,9,9,9,36,0}; + EVAL_ONE_SIZED_STR((char *)expr, 18444); } { SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,8,53,46,57,48,46,48,46,51,84,0,0,0,0,0,0,0,0,0, @@ -1500,7 +1502,7 @@ 111,114,107,11,29,94,2,2,68,35,37,112,97,114,97,109,122,11,29,94,2, 2,74,35,37,112,108,97,99,101,45,115,116,114,117,99,116,11,29,94,2,2, 66,35,37,98,111,111,116,11,29,94,2,2,68,35,37,101,120,112,111,98,115, -11,29,94,2,2,68,35,37,107,101,114,110,101,108,11,97,36,11,8,240,95, +11,29,94,2,2,68,35,37,107,101,114,110,101,108,11,97,36,11,8,240,103, 93,0,0,100,159,2,3,36,36,159,2,4,36,36,159,2,5,36,36,159,2, 6,36,36,159,2,7,36,36,159,2,8,36,36,159,2,9,36,36,159,2,9, 36,36,16,0,159,36,20,114,159,36,16,1,11,16,0,20,26,145,9,2,1, diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc index a590b311ae..d235d26e8b 100644 --- a/racket/src/racket/src/startup.inc +++ b/racket/src/racket/src/startup.inc @@ -382,7 +382,9 @@ "(or(and(file-exists? p)" "(with-input-from-file p" "(lambda()" -"(call-with-default-reading-parameterization read))))" +"(let((v(call-with-default-reading-parameterization read)))" +"(and(hash? v)" +" v)))))" " #hash()))))" "(define-values(get-installation-name)" "(lambda(config-table)" @@ -428,6 +430,7 @@ " orig-l))))" "(define-values(all-links-paths)(find-links-path!" "(lambda()" +"(if(use-collection-link-paths)" "(let*((d(find-config-dir))" "(ht(get-config-table d))" "(lf(coerce-to-path" @@ -442,7 +445,8 @@ "(list lf)))" "(build-path(find-system-path 'addon-dir)" "(get-installation-name ht)" -" \"links.rktd\"))))))" +" \"links.rktd\")))" +"(cons #() #f)))))" "(define-values(links-paths)(car all-links-paths))" "(define-values(user-links-path)(cdr all-links-paths))" "(define-values(user-links-cache)(make-hasheq))" @@ -646,7 +650,9 @@ " collection)))" "(links?(use-collection-link-paths)))" "(append" -"(if(and links?(use-user-specific-search-paths))" +"(if(and links? " +"(use-user-specific-search-paths)" +" user-links-path)" "(append" "(let((ht(get-linked-collections #t 0)))" "(append(hash-ref ht sym null)" diff --git a/racket/src/racket/src/startup.rktl b/racket/src/racket/src/startup.rktl index 036b302e9f..823815ca5e 100644 --- a/racket/src/racket/src/startup.rktl +++ b/racket/src/racket/src/startup.rktl @@ -450,7 +450,9 @@ (or (and (file-exists? p) (with-input-from-file p (lambda () - (call-with-default-reading-parameterization read)))) + (let ([v (call-with-default-reading-parameterization read)]) + (and (hash? v) + v))))) #hash())))) (define-values (get-installation-name) @@ -508,22 +510,27 @@ ;; search for the config file can trip over filesystem ;; restrictions imposed by security guards. (lambda () - (let* ([d (find-config-dir)] - [ht (get-config-table d)] - [lf (coerce-to-path - (or (hash-ref ht 'links-file #f) - (build-path (or (hash-ref ht 'share-dir #f) - (build-path 'up "share")) - "links.rktd")))]) - (cons (list->vector - (add-config-search - ht - 'links-search-files - (list lf))) - (build-path (find-system-path 'addon-dir) - (get-installation-name ht) - "links.rktd")))))) - + ;; If `use-collection-link-paths' is disabled on + ;; startup, then don't try to read the configuration + ;; file, either. + (if (use-collection-link-paths) + (let* ([d (find-config-dir)] + [ht (get-config-table d)] + [lf (coerce-to-path + (or (hash-ref ht 'links-file #f) + (build-path (or (hash-ref ht 'share-dir #f) + (build-path 'up "share")) + "links.rktd")))]) + (cons (list->vector + (add-config-search + ht + 'links-search-files + (list lf))) + (build-path (find-system-path 'addon-dir) + (get-installation-name ht) + "links.rktd"))) + (cons #() #f))))) + (define-values (links-paths) (car all-links-paths)) (define-values (user-links-path) (cdr all-links-paths)) @@ -751,7 +758,9 @@ [links? (use-collection-link-paths)]) (append ;; list of paths and (box path)s: - (if (and links? (use-user-specific-search-paths)) + (if (and links? + (use-user-specific-search-paths) + user-links-path) (append (let ([ht (get-linked-collections #t 0)]) (append (hash-ref ht sym null)