tioga 1.15 → 1.16

data/Tioga_README

@@ -22,8 +22,10 @@ This is the README for the Tioga kernel, version 1.14, June 10, 2011.
 
 << What's new >>
 
-    Tioga 1.15 brings in some new iterators in Dvector and some minor
-bug fixes (in particular for gem builds).
+    Tioga 1.16 brings in a bug fix by Josiah Schwab in handling some
+HLS triplets. It also provides facilities to extract the pdflatex
+errors.
+
 
 << Quick Installation of Tioga >>
 
@@ -167,6 +169,9 @@ Bill Paxton
 
 Here are the old release messages:
 
+    Tioga 1.15 brings in some new iterators in Dvector and some minor
+bug fixes (in particular for gem builds).
+
     Tioga 1.14 fixes all known problems of Tioga with Ruby 1.9.1 and
 higher (to the point that it runs with ctioga2, and the samples run
 too !).

data/bin/tioga

@@ -1,4 +1,4 @@
-#! /usr/bin/ruby1.8
+#! /usr/bin/ruby1.9.1
 require 'Tioga/tioga_ui.rb'
 
 

data/ext/Tioga/FigureMaker/__shared_axes.c

@@ -107,9 +107,14 @@ static void figure_join(OBJ_PTR fmkr, FM *p,
    figure_lineto(fmkr, p, x1, y1, ierr);
 }
 
-static void axis_stroke(OBJ_PTR fmkr, FM *p, int *ierr)
+static void axis_stroke(OBJ_PTR fmkr, FM *p, int *ierr, int cap)
 {
+   int old_cap = p->line_cap;
+   if(old_cap != cap)           /* Save cap */
+      c_line_cap_set(fmkr, p, cap, ierr);
    c_stroke(fmkr,p, ierr);
+   if(old_cap != cap)           /* Restore cap */
+      c_line_cap_set(fmkr, p, old_cap, ierr);
 }
 
 static void figure_join_and_stroke(OBJ_PTR fmkr, FM *p, 
@@ -759,7 +764,8 @@ static void draw_major_ticks(OBJ_PTR fmkr, FM *p, PlotAxis *s, int *ierr)
       did_line = true;
       if (*ierr != 0) return;
    }
-   if (did_line) axis_stroke(fmkr,p, ierr);
+   if (did_line)
+      axis_stroke(fmkr,p, ierr, LINE_CAP_BUTT);
 }
 
 static double log_subintervals[8] = {
@@ -864,7 +870,7 @@ static void draw_minor_ticks(OBJ_PTR fmkr, FM *p, PlotAxis *s, int *ierr)
    /* And we free the array returned by get_minor_ticks_location */
    free(locs);
    if (did_line) 
-      axis_stroke(fmkr,p, ierr);
+      axis_stroke(fmkr,p, ierr, LINE_CAP_BUTT);
 }
 
 static void show_numeric_label(OBJ_PTR fmkr, FM *p, PlotAxis *s, 

data/ext/Tioga/FigureMaker/__shared_pdfcolor.c

@@ -402,7 +402,7 @@ convert_rgb_to_hls(double r, double g, double b, double *p_h, double *p_l,
    }
    *p_h = h;
    *p_l = l;
-   *p_s = s;
+   *p_s = MIN( 1., MAX( s, 0. ));
 }
 
 

data/ext/Tioga/FigureMaker/shared/axes.c

@@ -107,9 +107,14 @@ static void figure_join(OBJ_PTR fmkr, FM *p,
    figure_lineto(fmkr, p, x1, y1, ierr);
 }
 
-static void axis_stroke(OBJ_PTR fmkr, FM *p, int *ierr)
+static void axis_stroke(OBJ_PTR fmkr, FM *p, int *ierr, int cap)
 {
+   int old_cap = p->line_cap;
+   if(old_cap != cap)           /* Save cap */
+      c_line_cap_set(fmkr, p, cap, ierr);
    c_stroke(fmkr,p, ierr);
+   if(old_cap != cap)           /* Restore cap */
+      c_line_cap_set(fmkr, p, old_cap, ierr);
 }
 
 static void figure_join_and_stroke(OBJ_PTR fmkr, FM *p, 
@@ -759,7 +764,8 @@ static void draw_major_ticks(OBJ_PTR fmkr, FM *p, PlotAxis *s, int *ierr)
       did_line = true;
       if (*ierr != 0) return;
    }
-   if (did_line) axis_stroke(fmkr,p, ierr);
+   if (did_line)
+      axis_stroke(fmkr,p, ierr, LINE_CAP_BUTT);
 }
 
 static double log_subintervals[8] = {
@@ -864,7 +870,7 @@ static void draw_minor_ticks(OBJ_PTR fmkr, FM *p, PlotAxis *s, int *ierr)
    /* And we free the array returned by get_minor_ticks_location */
    free(locs);
    if (did_line) 
-      axis_stroke(fmkr,p, ierr);
+      axis_stroke(fmkr,p, ierr, LINE_CAP_BUTT);
 }
 
 static void show_numeric_label(OBJ_PTR fmkr, FM *p, PlotAxis *s, 

data/ext/Tioga/FigureMaker/shared/pdfcolor.c

@@ -402,7 +402,7 @@ convert_rgb_to_hls(double r, double g, double b, double *p_h, double *p_l,
    }
    *p_h = h;
    *p_l = l;
-   *p_s = s;
+   *p_s = MIN( 1., MAX( s, 0. ));
 }
 
 

data/lib/Tioga/FigMkr.rb

@@ -38,7 +38,7 @@ class FigureMaker
 
     # This URL will contain tioga-(...) when it is exported from the
     # SVN repository. This is where we'll look for version information.
-    SVN_URL = '$HeadURL$'
+    SVN_URL = '$HeadURL: svn+ssh://rubyforge.org/var/svn/tioga/tags/tioga/Tioga%201.16/lib/Tioga/FigMkr.rb $'
 
     TIOGA_VERSION = if SVN_URL =~ /tags\/tioga\/Tioga%20([^\/]+)/
                        $1
@@ -62,8 +62,14 @@ class FigureMaker
     end
     
     def FigureMaker.pdflatex
-      @@which_pdflatex = 'pdflatex' if @@which_pdflatex == nil
-      @@which_pdflatex
+      if ! @@which_pdflatex
+        @@which_pdflatex = if ENV.key? 'TIOGA_PDFLATEX'
+                             ENV['TIOGA_PDFLATEX']
+                           else
+                             "pdflatex"
+                           end
+      end
+      return @@which_pdflatex
     end
     
     def FigureMaker.pdflatex=(s)
@@ -164,6 +170,8 @@ class FigureMaker
     # as it causes a systematic second run of pdflatex.
     attr_accessor :measure_legends
 
+    # Stores the errors recorded in the last run of pdflatex.
+    attr_accessor :pdflatex_errors
 
     # old preview attributes -- to be removed later
     
@@ -2304,43 +2312,79 @@ class FigureMaker
       quiet = @quiet_mode
       run_directory = @run_dir
       
-      if (@save_dir == nil)
-        logname = "pdflatex.log"
-      else
-        logname = "#{@save_dir}/pdflatex.log"
-      end
-      
-      if (@save_dir == nil)
-        syscmd = "#{pdflatex} -interaction nonstopmode #{name}.tex"
-      else
-        syscmd = "cd #{@save_dir}; #{pdflatex} -interaction nonstopmode #{name}.tex"
-      end
-      # Now fun begins:
-      # We use IO::popen for three reasons:
-      # * first, we want to be able to read back information from
-      #   pdflatex (see \tiogameasure)
-      # * second, this way of doing should be portable to win, while
-      #   the > trick might not be that much...
-      # * third, closing the standard input of pdflatex will remove
-      #   painful bugs, when pdflatex gets interrupted but waits
-      #   for an input for which it didn't prompt.
-
-      @measures = {}
-      IO::popen(syscmd, "r+") do |f|
-        f.close_write           # We don't need that.
-        log = File.open(logname, "w")
-        for line in f
-          log.print line
-          if line =~ /^(.*)\[(\d)\]=(.+pt)/
-            n = $1
-            num = $2.to_i
-            dim = Utils::tex_dimension_to_bp($3)
-            @measures[n] ||= []
-            @measures[n][num] = dim
+      logname = "pdflatex.log"
+
+      new_dir = @save_dir || "."
+      syscmd = "#{pdflatex} -interaction nonstopmode #{name}.tex"
+
+      popen_error = nil
+      @pdflatex_errors = []
+      Dir.chdir(new_dir) do 
+        # Now fun begins:
+        # We use IO::popen for three reasons:
+        # * first, we want to be able to read back information from
+        #   pdflatex (see \tiogameasure)
+        # * second, this way of doing should be portable to win, while
+        #   the > trick might not be that much...
+        # * third, closing the standard input of pdflatex will remove
+        #   painful bugs, when pdflatex gets interrupted but waits
+        #   for an input for which it didn't prompt.
+        
+        @measures = {}
+        begin
+          IO::popen(syscmd, "r+") do |f|
+            f.close_write           # We don't need that.
+            log = File.open(logname, "w")
+            error_pending = false
+            for line in f
+              log.print line
+              if line =~ /^(.*)\[(\d)\]=(.+pt)/
+                n = $1
+                num = $2.to_i
+                dim = Utils::tex_dimension_to_bp($3)
+                @measures[n] ||= []
+                @measures[n][num] = dim
+              elsif line =~ /^!/
+                error_pending = true
+              elsif line =~ /^\s*$/ # errors seem to stop at blank lines
+                error_pending = false
+              end
+              if error_pending
+                @pdflatex_errors << line
+              end
+            end
           end
+        rescue SystemCallError => e
+          popen_error = e
         end
       end
+        
+      if ($?.exitstatus == 127) or popen_error
+        $stderr.puts <<"EOE"
+ERROR: Tioga doesn't seem to find pdflatex (as '#{pdflatex}').
+
+This probably means that you don't have any working version of
+pdflatex, in which case you can get it there:
+
+http://www.tug.org/texlive/
+
+or try installing texlive with your favorite package manager.
+
+Alternatively, if you're positive that you have a working version of
+pdflatex installed, either make sur it is in your path or define the 
+TIOGA_PDFLATEX environment variable to its full path, by adding for 
+instance:
 
+export TIOGA_PDFLATEX=/path/to/pdflatex
+
+in your ~/.bashrc.
+EOE
+
+        if popen_error
+          $stderr.puts "Error: #{popen_error.inspect}"
+        end
+      end
+        
       # Now passing the saved measures to the C code.
       for key, val in @measures
         # p @fm_data
@@ -2349,7 +2393,7 @@ class FigureMaker
         
       result = $?
         if !result
-            puts "ERROR: #{pdflatex} failed."
+            $stderr.puts "ERROR: #{pdflatex} failed with error code #{$?.exitstatus}"
             file = File.open(logname)
             if file == nil
                 puts "cannot open #{logname}"

data/lib/Tioga/TexPreamble.rb

@@ -170,202 +170,202 @@ module Tioga
 End_of_preamble
     COLOR_PREAMBLE = <<'End_of_preamble'
 % Color constants, generated from ColorConstants.rb
-\definecolor{PaleTurquoise}{rgb}{0.688,0.932,0.932}
-\definecolor{GreenYellow}{rgb}{0.680,1.000,0.185}
-\definecolor{SpringGreen}{rgb}{0.000,1.000,0.498}
-\definecolor{LightTurquoise}{rgb}{0.200,1.000,0.800}
-\definecolor{DarkGrey}{rgb}{0.664,0.664,0.664}
-\definecolor{DarkSlateGray}{rgb}{0.185,0.310,0.310}
-\definecolor{RedBrown}{rgb}{0.800,0.400,0.200}
-\definecolor{LightBrightGreen}{rgb}{0.000,0.800,0.200}
-\definecolor{BlueViolet}{rgb}{0.540,0.170,0.888}
-\definecolor{MediumOrchid}{rgb}{0.730,0.332,0.828}
-\definecolor{Navy}{rgb}{0.000,0.000,0.500}
-\definecolor{Gainsboro}{rgb}{0.864,0.864,0.864}
-\definecolor{Sienna}{rgb}{0.628,0.320,0.176}
-\definecolor{LightRose}{rgb}{1.000,0.600,0.800}
-\definecolor{Cornsilk}{rgb}{1.000,0.972,0.864}
-\definecolor{Peru}{rgb}{0.804,0.520,0.248}
-\definecolor{Indigo}{rgb}{0.294,0.000,0.510}
+\definecolor{AliceBlue}{rgb}{0.940,0.972,1.000}
+\definecolor{AntiqueWhite}{rgb}{0.980,0.920,0.844}
+\definecolor{Aqua}{rgb}{0.000,1.000,1.000}
 \definecolor{Aquamarine}{rgb}{0.498,1.000,0.830}
-\definecolor{Tomato}{rgb}{1.000,0.390,0.280}
-\definecolor{LimeGreen}{rgb}{0.196,0.804,0.196}
-\definecolor{DarkOrange}{rgb}{1.000,0.550,0.000}
-\definecolor{RoyalPurple}{rgb}{0.400,0.000,0.600}
-\definecolor{LightGold}{rgb}{0.800,0.800,0.400}
-\definecolor{Burgundy}{rgb}{0.600,0.000,0.200}
-\definecolor{MediumTurquoise}{rgb}{0.284,0.820,0.800}
-\definecolor{DeepPink}{rgb}{1.000,0.080,0.576}
-\definecolor{GrassGreen}{rgb}{0.200,0.600,0.000}
-\definecolor{SlateGrey}{rgb}{0.440,0.500,0.565}
-\definecolor{LightSkyBlue}{rgb}{0.530,0.808,0.980}
-\definecolor{DarkCyan}{rgb}{0.000,0.545,0.545}
-\definecolor{OrangeRed}{rgb}{1.000,0.270,0.000}
-\definecolor{Purple}{rgb}{0.500,0.000,0.500}
-\definecolor{LavenderBlush}{rgb}{1.000,0.940,0.960}
+\definecolor{Avocado}{rgb}{0.600,0.600,0.000}
+\definecolor{Azure}{rgb}{0.940,1.000,1.000}
+\definecolor{Beige}{rgb}{0.960,0.960,0.864}
+\definecolor{Bisque}{rgb}{1.000,0.894,0.770}
 \definecolor{Black}{rgb}{0.000,0.000,0.000}
-\definecolor{White}{rgb}{1.000,1.000,1.000}
-\definecolor{MediumAquamarine}{rgb}{0.400,0.804,0.668}
-\definecolor{DarkRoyalBlue}{rgb}{0.000,0.200,0.800}
-\definecolor{SalmonRed}{rgb}{1.000,0.400,0.400}
-\definecolor{LightMustard}{rgb}{1.000,0.800,0.400}
-\definecolor{Chiffon}{rgb}{0.980,0.980,0.824}
-\definecolor{MistyRose}{rgb}{1.000,0.894,0.884}
-\definecolor{FireBrick}{rgb}{0.698,0.132,0.132}
-\definecolor{SteelBlue}{rgb}{0.275,0.510,0.705}
-\definecolor{LightYellow}{rgb}{1.000,1.000,0.880}
-\definecolor{DarkKhaki}{rgb}{0.740,0.716,0.420}
-\definecolor{PaleVioletRed}{rgb}{0.860,0.440,0.576}
-\definecolor{Grey}{rgb}{0.500,0.500,0.500}
-\definecolor{LightCoral}{rgb}{0.940,0.500,0.500}
+\definecolor{BlanchedAlmond}{rgb}{1.000,0.920,0.804}
+\definecolor{Blue}{rgb}{0.000,0.000,1.000}
+\definecolor{BlueGreen}{rgb}{0.000,0.600,0.400}
+\definecolor{BlueViolet}{rgb}{0.540,0.170,0.888}
 \definecolor{BrickRed}{rgb}{0.645,0.000,0.129}
-\definecolor{MediumPurple}{rgb}{0.576,0.440,0.860}
-\definecolor{DarkSlateGrey}{rgb}{0.185,0.310,0.310}
-\definecolor{RedOrange}{rgb}{0.800,0.200,0.000}
-\definecolor{Silver}{rgb}{0.752,0.752,0.752}
-\definecolor{LightSalmon}{rgb}{1.000,0.628,0.480}
-\definecolor{Crimson}{rgb}{0.800,0.000,0.200}
-\definecolor{OldLace}{rgb}{0.992,0.960,0.900}
-\definecolor{GhostWhite}{rgb}{0.972,0.972,1.000}
-\definecolor{Avocado}{rgb}{0.600,0.600,0.000}
-\definecolor{Turquoise}{rgb}{0.250,0.880,0.815}
-\definecolor{Linen}{rgb}{0.980,0.940,0.900}
-\definecolor{DarkOrchid}{rgb}{0.600,0.196,0.800}
-\definecolor{Pink}{rgb}{1.000,0.752,0.796}
-\definecolor{Ivory}{rgb}{1.000,1.000,0.940}
+\definecolor{BrightBlue}{rgb}{0.000,0.400,1.000}
+\definecolor{BrightPink}{rgb}{1.000,0.400,0.800}
+\definecolor{Brown}{rgb}{0.648,0.165,0.165}
+\definecolor{Burgundy}{rgb}{0.600,0.000,0.200}
 \definecolor{BurlyWood}{rgb}{0.870,0.720,0.530}
-\definecolor{MediumVioletRed}{rgb}{0.780,0.084,0.520}
-\definecolor{DeepSkyBlue}{rgb}{0.000,0.750,1.000}
-\definecolor{SaddleBrown}{rgb}{0.545,0.270,0.075}
-\definecolor{LightGrassGreen}{rgb}{0.400,1.000,0.400}
-\definecolor{LightSlateGray}{rgb}{0.468,0.532,0.600}
-\definecolor{DarkGoldenrod}{rgb}{0.720,0.525,0.044}
-\definecolor{Orchid}{rgb}{0.855,0.440,0.840}
-\definecolor{Gray}{rgb}{0.500,0.500,0.500}
-\definecolor{Smoke}{rgb}{0.950,0.950,0.950}
-\definecolor{WhiteSmoke}{rgb}{0.970,0.970,0.970}
-\definecolor{MediumBlue}{rgb}{0.000,0.000,0.804}
-\definecolor{DarkSalmon}{rgb}{0.912,0.590,0.480}
-\definecolor{PurpleBlue}{rgb}{0.400,0.200,0.800}
-\definecolor{LawnGreen}{rgb}{0.488,0.990,0.000}
-\definecolor{BlanchedAlmond}{rgb}{1.000,0.920,0.804}
+\definecolor{CadetBlue}{rgb}{0.372,0.620,0.628}
+\definecolor{Cement}{rgb}{0.800,0.800,0.600}
+\definecolor{Chartreuse}{rgb}{0.498,1.000,0.000}
+\definecolor{Chiffon}{rgb}{0.980,0.980,0.824}
 \definecolor{Chocolate}{rgb}{0.824,0.410,0.116}
-\definecolor{Moccasin}{rgb}{1.000,0.894,0.710}
-\definecolor{FloralWhite}{rgb}{1.000,0.980,0.940}
-\definecolor{SandyBrown}{rgb}{0.956,0.644,0.376}
-\definecolor{LightOliveGreen}{rgb}{0.600,0.800,0.600}
-\definecolor{DarkLavender}{rgb}{0.400,0.200,0.600}
-\definecolor{PapayaWhip}{rgb}{1.000,0.936,0.835}
-\definecolor{Honeydew}{rgb}{0.940,1.000,0.940}
-\definecolor{AliceBlue}{rgb}{0.940,0.972,1.000}
-\definecolor{Tan}{rgb}{0.824,0.705,0.550}
-\definecolor{LightYellowGreen}{rgb}{0.800,0.800,0.200}
-\definecolor{MediumSeaGreen}{rgb}{0.235,0.700,0.444}
-\definecolor{DarkSmoke}{rgb}{0.920,0.920,0.920}
-\definecolor{Rose}{rgb}{1.000,0.400,0.600}
-\definecolor{LightCrimson}{rgb}{0.864,0.080,0.235}
-\definecolor{BrightBlue}{rgb}{0.000,0.400,1.000}
-\definecolor{Olive}{rgb}{0.500,0.500,0.000}
-\definecolor{Gold}{rgb}{1.000,0.844,0.000}
-\definecolor{SkyBlue}{rgb}{0.530,0.808,0.920}
-\definecolor{LightSandyBrown}{rgb}{1.000,0.800,0.600}
+\definecolor{Coral}{rgb}{1.000,0.498,0.312}
+\definecolor{CornflowerBlue}{rgb}{0.392,0.585,0.930}
+\definecolor{Cornsilk}{rgb}{1.000,0.972,0.864}
+\definecolor{Crimson}{rgb}{0.800,0.000,0.200}
 \definecolor{Cyan}{rgb}{0.000,1.000,1.000}
-\definecolor{DarkPeriwinkle}{rgb}{0.400,0.400,1.000}
-\definecolor{Plum}{rgb}{0.868,0.628,0.868}
-\definecolor{Khaki}{rgb}{0.940,0.900,0.550}
-\definecolor{Azure}{rgb}{0.940,1.000,1.000}
-\definecolor{Violet}{rgb}{0.932,0.510,0.932}
-\definecolor{Magenta}{rgb}{1.000,0.000,1.000}
-\definecolor{DimGray}{rgb}{0.410,0.410,0.410}
-\definecolor{LightChartreuse}{rgb}{0.800,1.000,0.400}
-\definecolor{LightGray}{rgb}{0.828,0.828,0.828}
-\definecolor{CadetBlue}{rgb}{0.372,0.620,0.628}
-\definecolor{YellowGreen}{rgb}{0.800,0.800,0.000}
+\definecolor{DarkBlue}{rgb}{0.000,0.000,0.545}
+\definecolor{DarkChocolate}{rgb}{0.400,0.200,0.000}
+\definecolor{DarkCyan}{rgb}{0.000,0.545,0.545}
+\definecolor{DarkGoldenrod}{rgb}{0.720,0.525,0.044}
 \definecolor{DarkGray}{rgb}{0.664,0.664,0.664}
-\definecolor{LightSlateGrey}{rgb}{0.468,0.532,0.600}
-\definecolor{PaleGoldenrod}{rgb}{0.932,0.910,0.668}
-\definecolor{GrayBlue}{rgb}{0.000,0.400,0.600}
-\definecolor{Snow}{rgb}{1.000,0.980,0.980}
-\definecolor{DarkSeaGreen}{rgb}{0.560,0.736,0.560}
-\definecolor{Blue}{rgb}{0.000,0.000,1.000}
-\definecolor{LemonChiffon}{rgb}{1.000,0.980,0.804}
-\definecolor{MediumGreen}{rgb}{0.000,0.600,0.000}
-\definecolor{PurpleGray}{rgb}{0.600,0.600,0.800}
-\definecolor{Yellow}{rgb}{1.000,1.000,0.000}
-\definecolor{Coral}{rgb}{1.000,0.498,0.312}
-\definecolor{LightOrchid}{rgb}{0.600,0.400,0.800}
-\definecolor{ForestGreen}{rgb}{0.132,0.545,0.132}
-\definecolor{MustardSeed}{rgb}{0.800,0.600,0.000}
-\definecolor{SeaGreen}{rgb}{0.180,0.545,0.340}
+\definecolor{DarkGreen}{rgb}{0.000,0.392,0.000}
+\definecolor{DarkGrey}{rgb}{0.664,0.664,0.664}
+\definecolor{DarkKhaki}{rgb}{0.740,0.716,0.420}
+\definecolor{DarkLavender}{rgb}{0.400,0.200,0.600}
 \definecolor{DarkMagenta}{rgb}{0.545,0.000,0.545}
-\definecolor{AntiqueWhite}{rgb}{0.980,0.920,0.844}
-\definecolor{HotPink}{rgb}{1.000,0.410,0.705}
-\definecolor{Lilac}{rgb}{0.800,0.600,1.000}
-\definecolor{PeachPuff}{rgb}{1.000,0.855,0.725}
-\definecolor{Teal}{rgb}{0.000,0.500,0.500}
+\definecolor{DarkOliveGreen}{rgb}{0.332,0.420,0.185}
+\definecolor{DarkOrange}{rgb}{1.000,0.550,0.000}
+\definecolor{DarkOrchid}{rgb}{0.600,0.196,0.800}
+\definecolor{DarkPeriwinkle}{rgb}{0.400,0.400,1.000}
+\definecolor{DarkPurpleBlue}{rgb}{0.400,0.000,0.800}
+\definecolor{DarkRed}{rgb}{0.545,0.000,0.000}
+\definecolor{DarkRoyalBlue}{rgb}{0.000,0.200,0.800}
+\definecolor{DarkSalmon}{rgb}{0.912,0.590,0.480}
+\definecolor{DarkSeaGreen}{rgb}{0.560,0.736,0.560}
+\definecolor{DarkSlateBlue}{rgb}{0.284,0.240,0.545}
+\definecolor{DarkSlateGray}{rgb}{0.185,0.310,0.310}
+\definecolor{DarkSlateGrey}{rgb}{0.185,0.310,0.310}
+\definecolor{DarkSmoke}{rgb}{0.920,0.920,0.920}
 \definecolor{DarkTurquoise}{rgb}{0.000,0.808,0.820}
-\definecolor{BrightPink}{rgb}{1.000,0.400,0.800}
-\definecolor{LightCyan}{rgb}{0.880,1.000,1.000}
-\definecolor{MediumSlateBlue}{rgb}{0.484,0.408,0.932}
-\definecolor{RosyBrown}{rgb}{0.736,0.560,0.560}
+\definecolor{DarkViolet}{rgb}{0.580,0.000,0.828}
+\definecolor{DeepPink}{rgb}{1.000,0.080,0.576}
+\definecolor{DeepSkyBlue}{rgb}{0.000,0.750,1.000}
+\definecolor{DimGray}{rgb}{0.410,0.410,0.410}
+\definecolor{DimGrey}{rgb}{0.410,0.410,0.410}
+\definecolor{DodgerBlue}{rgb}{0.116,0.565,1.000}
+\definecolor{FireBrick}{rgb}{0.698,0.132,0.132}
+\definecolor{FloralWhite}{rgb}{1.000,0.980,0.940}
+\definecolor{ForestGreen}{rgb}{0.132,0.545,0.132}
+\definecolor{Fuchsia}{rgb}{1.000,0.000,1.000}
+\definecolor{Gainsboro}{rgb}{0.864,0.864,0.864}
+\definecolor{GhostWhite}{rgb}{0.972,0.972,1.000}
+\definecolor{Gold}{rgb}{1.000,0.844,0.000}
 \definecolor{GoldenBrown}{rgb}{0.600,0.400,0.000}
-\definecolor{DarkBlue}{rgb}{0.000,0.000,0.545}
-\definecolor{LightSeaGreen}{rgb}{0.125,0.698,0.668}
-\definecolor{OliveDrab}{rgb}{0.420,0.556,0.136}
-\definecolor{SlateBlue}{rgb}{0.415,0.352,0.804}
-\definecolor{DarkPurpleBlue}{rgb}{0.400,0.000,0.800}
-\definecolor{Beige}{rgb}{0.960,0.960,0.864}
+\definecolor{Goldenrod}{rgb}{0.855,0.648,0.125}
+\definecolor{GrassGreen}{rgb}{0.200,0.600,0.000}
+\definecolor{Gray}{rgb}{0.500,0.500,0.500}
+\definecolor{GrayBlue}{rgb}{0.000,0.400,0.600}
+\definecolor{Green}{rgb}{0.000,0.500,0.000}
+\definecolor{GreenYellow}{rgb}{0.680,1.000,0.185}
+\definecolor{Grey}{rgb}{0.500,0.500,0.500}
+\definecolor{Honeydew}{rgb}{0.940,1.000,0.940}
+\definecolor{HotPink}{rgb}{1.000,0.410,0.705}
+\definecolor{IndianRed}{rgb}{0.804,0.360,0.360}
+\definecolor{Indigo}{rgb}{0.294,0.000,0.510}
+\definecolor{Ivory}{rgb}{1.000,1.000,0.940}
+\definecolor{Khaki}{rgb}{0.940,0.900,0.550}
 \definecolor{Lavender}{rgb}{0.900,0.900,0.980}
-\definecolor{Maroon}{rgb}{0.500,0.000,0.000}
-\definecolor{PowderBlue}{rgb}{0.690,0.880,0.900}
-\definecolor{WarmGray}{rgb}{0.678,0.660,0.562}
-\definecolor{DimGrey}{rgb}{0.410,0.410,0.410}
-\definecolor{Cement}{rgb}{0.800,0.800,0.600}
+\definecolor{LavenderBlue}{rgb}{0.400,0.200,1.000}
+\definecolor{LavenderBlush}{rgb}{1.000,0.940,0.960}
+\definecolor{LawnGreen}{rgb}{0.488,0.990,0.000}
+\definecolor{LemonChiffon}{rgb}{1.000,0.980,0.804}
+\definecolor{LightBlue}{rgb}{0.680,0.848,0.900}
+\definecolor{LightBrightGreen}{rgb}{0.000,0.800,0.200}
+\definecolor{LightCoral}{rgb}{0.940,0.500,0.500}
+\definecolor{LightCrimson}{rgb}{0.864,0.080,0.235}
+\definecolor{LightCyan}{rgb}{0.880,1.000,1.000}
+\definecolor{LightDullGreen}{rgb}{0.400,1.000,0.600}
+\definecolor{LightGold}{rgb}{0.800,0.800,0.400}
+\definecolor{LightGrassGreen}{rgb}{0.400,1.000,0.400}
+\definecolor{LightGray}{rgb}{0.828,0.828,0.828}
 \definecolor{LightGreen}{rgb}{0.565,0.932,0.565}
-\definecolor{MidnightBlue}{rgb}{0.098,0.098,0.440}
-\definecolor{Saffron}{rgb}{1.000,0.800,0.000}
-\definecolor{Green}{rgb}{0.000,0.500,0.000}
-\definecolor{DarkGreen}{rgb}{0.000,0.392,0.000}
+\definecolor{LightGrey}{rgb}{0.828,0.828,0.828}
+\definecolor{LightMustard}{rgb}{1.000,0.800,0.400}
+\definecolor{LightOliveGreen}{rgb}{0.600,0.800,0.600}
+\definecolor{LightOrchid}{rgb}{0.600,0.400,0.800}
+\definecolor{LightPlum}{rgb}{0.800,0.600,0.800}
+\definecolor{LightRose}{rgb}{1.000,0.600,0.800}
+\definecolor{LightSalmon}{rgb}{1.000,0.628,0.480}
+\definecolor{LightSandyBrown}{rgb}{1.000,0.800,0.600}
+\definecolor{LightSeaGreen}{rgb}{0.125,0.698,0.668}
+\definecolor{LightSienna}{rgb}{0.800,0.400,0.000}
+\definecolor{LightSkyBlue}{rgb}{0.530,0.808,0.980}
+\definecolor{LightSlateGray}{rgb}{0.468,0.532,0.600}
+\definecolor{LightSlateGrey}{rgb}{0.468,0.532,0.600}
 \definecolor{LightSteelBlue}{rgb}{0.690,0.770,0.870}
-\definecolor{PaleGreen}{rgb}{0.596,0.985,0.596}
-\definecolor{SoftYellow}{rgb}{1.000,1.000,0.400}
-\definecolor{LightBlue}{rgb}{0.680,0.848,0.900}
-\definecolor{DarkSlateBlue}{rgb}{0.284,0.240,0.545}
-\definecolor{BlueGreen}{rgb}{0.000,0.600,0.400}
+\definecolor{LightTurquoise}{rgb}{0.200,1.000,0.800}
+\definecolor{LightYellow}{rgb}{1.000,1.000,0.880}
+\definecolor{LightYellowGreen}{rgb}{0.800,0.800,0.200}
+\definecolor{Lilac}{rgb}{0.800,0.600,1.000}
+\definecolor{Lime}{rgb}{0.000,1.000,0.000}
+\definecolor{LimeGreen}{rgb}{0.196,0.804,0.196}
+\definecolor{Linen}{rgb}{0.980,0.940,0.900}
+\definecolor{Magenta}{rgb}{1.000,0.000,1.000}
+\definecolor{Maroon}{rgb}{0.500,0.000,0.000}
+\definecolor{Mauve}{rgb}{0.800,0.200,0.400}
+\definecolor{MediumAquamarine}{rgb}{0.400,0.804,0.668}
+\definecolor{MediumBlue}{rgb}{0.000,0.000,0.804}
+\definecolor{MediumGreen}{rgb}{0.000,0.600,0.000}
 \definecolor{MediumOrange}{rgb}{1.000,0.400,0.000}
-\definecolor{Red}{rgb}{1.000,0.000,0.000}
-\definecolor{Fuchsia}{rgb}{1.000,0.000,1.000}
-\definecolor{CornflowerBlue}{rgb}{0.392,0.585,0.930}
-\definecolor{LightPlum}{rgb}{0.800,0.600,0.800}
+\definecolor{MediumOrchid}{rgb}{0.730,0.332,0.828}
+\definecolor{MediumPurple}{rgb}{0.576,0.440,0.860}
+\definecolor{MediumSeaGreen}{rgb}{0.235,0.700,0.444}
+\definecolor{MediumSlateBlue}{rgb}{0.484,0.408,0.932}
+\definecolor{MediumSpringGreen}{rgb}{0.000,0.980,0.604}
+\definecolor{MediumTurquoise}{rgb}{0.284,0.820,0.800}
+\definecolor{MediumVioletRed}{rgb}{0.780,0.084,0.520}
+\definecolor{YellowGreen}{rgb}{0.800,0.800,0.000}
+\definecolor{MidnightBlue}{rgb}{0.098,0.098,0.440}
+\definecolor{MintCream}{rgb}{0.960,1.000,0.980}
+\definecolor{MistyRose}{rgb}{1.000,0.894,0.884}
+\definecolor{Moccasin}{rgb}{1.000,0.894,0.710}
+\definecolor{MustardSeed}{rgb}{0.800,0.600,0.000}
 \definecolor{NavajoWhite}{rgb}{1.000,0.870,0.680}
-\definecolor{Seashell}{rgb}{1.000,0.960,0.932}
-\definecolor{Aqua}{rgb}{0.000,1.000,1.000}
-\definecolor{IndianRed}{rgb}{0.804,0.360,0.360}
-\definecolor{DarkOliveGreen}{rgb}{0.332,0.420,0.185}
-\definecolor{Lime}{rgb}{0.000,1.000,0.000}
+\definecolor{Navy}{rgb}{0.000,0.000,0.500}
+\definecolor{OldLace}{rgb}{0.992,0.960,0.900}
+\definecolor{Olive}{rgb}{0.500,0.500,0.000}
+\definecolor{OliveDrab}{rgb}{0.420,0.556,0.136}
+\definecolor{Orange}{rgb}{1.000,0.648,0.000}
+\definecolor{OrangeRed}{rgb}{1.000,0.270,0.000}
+\definecolor{Orchid}{rgb}{0.855,0.440,0.840}
+\definecolor{PaleGoldenrod}{rgb}{0.932,0.910,0.668}
+\definecolor{PaleGreen}{rgb}{0.596,0.985,0.596}
+\definecolor{PaleTurquoise}{rgb}{0.688,0.932,0.932}
+\definecolor{PaleVioletRed}{rgb}{0.860,0.440,0.576}
+\definecolor{PapayaWhip}{rgb}{1.000,0.936,0.835}
+\definecolor{PeachPuff}{rgb}{1.000,0.855,0.725}
 \definecolor{Periwinkle}{rgb}{0.600,0.000,1.000}
-\definecolor{Thistle}{rgb}{0.848,0.750,0.848}
-\definecolor{Brown}{rgb}{0.648,0.165,0.165}
-\definecolor{LightDullGreen}{rgb}{0.400,1.000,0.600}
-\definecolor{DarkViolet}{rgb}{0.580,0.000,0.828}
-\definecolor{MediumSpringGreen}{rgb}{0.000,0.980,0.604}
+\definecolor{Peru}{rgb}{0.804,0.520,0.248}
+\definecolor{Pink}{rgb}{1.000,0.752,0.796}
+\definecolor{Plum}{rgb}{0.868,0.628,0.868}
+\definecolor{PowderBlue}{rgb}{0.690,0.880,0.900}
+\definecolor{Pumpkin}{rgb}{1.000,0.600,0.200}
+\definecolor{Purple}{rgb}{0.500,0.000,0.500}
+\definecolor{PurpleBlue}{rgb}{0.400,0.200,0.800}
+\definecolor{PurpleGray}{rgb}{0.600,0.600,0.800}
+\definecolor{Red}{rgb}{1.000,0.000,0.000}
+\definecolor{RedBrown}{rgb}{0.800,0.400,0.200}
+\definecolor{RedOrange}{rgb}{0.800,0.200,0.000}
+\definecolor{Rose}{rgb}{1.000,0.400,0.600}
+\definecolor{RosyBrown}{rgb}{0.736,0.560,0.560}
 \definecolor{RoyalBlue}{rgb}{0.255,0.410,0.884}
-\definecolor{LightSienna}{rgb}{0.800,0.400,0.000}
-\definecolor{Goldenrod}{rgb}{0.855,0.648,0.125}
-\definecolor{DarkChocolate}{rgb}{0.400,0.200,0.000}
-\definecolor{Orange}{rgb}{1.000,0.648,0.000}
+\definecolor{RoyalPurple}{rgb}{0.400,0.000,0.600}
+\definecolor{SaddleBrown}{rgb}{0.545,0.270,0.075}
+\definecolor{LightChartreuse}{rgb}{0.800,1.000,0.400}
+\definecolor{Saffron}{rgb}{1.000,0.800,0.000}
+\definecolor{Salmon}{rgb}{0.980,0.500,0.448}
+\definecolor{SalmonRed}{rgb}{1.000,0.400,0.400}
+\definecolor{SandyBrown}{rgb}{0.956,0.644,0.376}
+\definecolor{SeaGreen}{rgb}{0.180,0.545,0.340}
+\definecolor{Seashell}{rgb}{1.000,0.960,0.932}
+\definecolor{Sienna}{rgb}{0.628,0.320,0.176}
+\definecolor{Silver}{rgb}{0.752,0.752,0.752}
+\definecolor{SkyBlue}{rgb}{0.530,0.808,0.920}
+\definecolor{SlateBlue}{rgb}{0.415,0.352,0.804}
 \definecolor{SlateGray}{rgb}{0.440,0.500,0.565}
-\definecolor{Bisque}{rgb}{1.000,0.894,0.770}
-\definecolor{LavenderBlue}{rgb}{0.400,0.200,1.000}
-\definecolor{DarkRed}{rgb}{0.545,0.000,0.000}
-\definecolor{Mauve}{rgb}{0.800,0.200,0.400}
-\definecolor{Pumpkin}{rgb}{1.000,0.600,0.200}
+\definecolor{SlateGrey}{rgb}{0.440,0.500,0.565}
+\definecolor{Smoke}{rgb}{0.950,0.950,0.950}
+\definecolor{Snow}{rgb}{1.000,0.980,0.980}
+\definecolor{SoftYellow}{rgb}{1.000,1.000,0.400}
+\definecolor{SpringGreen}{rgb}{0.000,1.000,0.498}
+\definecolor{SteelBlue}{rgb}{0.275,0.510,0.705}
+\definecolor{Tan}{rgb}{0.824,0.705,0.550}
+\definecolor{Teal}{rgb}{0.000,0.500,0.500}
+\definecolor{Thistle}{rgb}{0.848,0.750,0.848}
+\definecolor{Tomato}{rgb}{1.000,0.390,0.280}
+\definecolor{Turquoise}{rgb}{0.250,0.880,0.815}
+\definecolor{Violet}{rgb}{0.932,0.510,0.932}
+\definecolor{WarmGray}{rgb}{0.678,0.660,0.562}
 \definecolor{Wheat}{rgb}{0.960,0.870,0.700}
-\definecolor{Chartreuse}{rgb}{0.498,1.000,0.000}
-\definecolor{LightGrey}{rgb}{0.828,0.828,0.828}
-\definecolor{DodgerBlue}{rgb}{0.116,0.565,1.000}
-\definecolor{MintCream}{rgb}{0.960,1.000,0.980}
-\definecolor{Salmon}{rgb}{0.980,0.500,0.448}
+\definecolor{White}{rgb}{1.000,1.000,1.000}
+\definecolor{WhiteSmoke}{rgb}{0.970,0.970,0.970}
+\definecolor{Yellow}{rgb}{1.000,1.000,0.000}
 
 End_of_preamble
   end