tioga 1.4 → 1.5

data/split/Tioga/lib/MarkerConstants.rb

@@ -11,7 +11,7 @@ module Tioga
 #
 # Here are the abc's of the PDF fonts, clockwise from the top: Times_Roman, Times_Italic, Times_Bold, Times_BoldItalic, Helvetica, Helvetica_Oblique, Helvetica_Bold, Helvetica_BoldOblique, Courier, Courier_Oblique, Courier_Bold, Courier_BoldOblique, Symbol, and ZapfDingbats.
 #
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/pdf_fonts.jpg
+# link:images/pdf_fonts.png
 #
 # ---
 #
@@ -24,12 +24,12 @@ module Tioga
 # as 'Arrow', and a stroked form, such as 'ArrowOpen'.   The color of filled markers is determined by the current 
 # setting of fill_color, and, similarly, stroke_color determines the color of stroked markers.
 #
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Marker_Names.jpg
+# link:images/Marker_Names.png
 #
 # Here is the full set of options from the ZapfDingbats font.  If you would like to use the jet plane as a marker,
 # just write [ ZapfDingbats, 40 ] where you would have used one of the predefined marker names.
 #
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/dingbats.jpg
+# link:images/dingbats.png
 #
 
 module MarkerConstants

data/split/Tioga/lib/Markers.rb

@@ -68,15 +68,15 @@ Dictionary Entries
 
 Examples
 
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Marker_Horizontal_Scaling.jpg
+link:images/Marker_Horizontal_Scaling.png
 
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Marker_Vertical_Scaling.jpg
+link:images/Marker_Vertical_Scaling.png
 
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Marker_Italic_Angle.jpg
+link:images/Marker_Italic_Angle.png
 
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Marker_Ascent_Angle.jpg
+link:images/Marker_Ascent_Angle.png
 
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Rendering_Modes.jpg
+link:images/Rendering_Modes.png
 
     def marker_shadow_effect
         t.landscape
@@ -103,7 +103,7 @@ http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Rendering_Modes.jpg
             'point' => [x+0.022, y-0.03])
     end
     
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Marker_Shadow_Effect.jpg
+link:images/Marker_Shadow_Effect.png
 
 =end
     def show_marker(dict)

data/split/Tioga/lib/Page_Frame_Bounds.rb

@@ -305,7 +305,7 @@ Example
         end
     end
     
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Columns.jpg
+link:images/Columns.png
 =end
     def column_margins(dict)
     end

data/split/Tioga/lib/Rectangles.rb

@@ -68,7 +68,7 @@ class Rectangles < Doc < FigureMaker
 # The illustration shows a rounded rectangle stroked and used as a clipping path
 # for showing the image.
 #
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/append_rounded_rect.jpg
+# link:images/append_rounded_rect.png
 #
    def append_rounded_rect_to_path(x, y, width, height, dx, dy)
    end

data/split/Tioga/lib/Shading.rb

@@ -40,7 +40,7 @@ Example
             'colormap' => t.mellow_colormap)
     end
 
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Axial_Shading.jpg
+link:images/Axial_Shading.png
 
 =end
     def axial_shading(dict)
@@ -90,7 +90,7 @@ Example
             'extend_start' => true)
     end
     
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Radial_Shading.jpg
+link:images/Radial_Shading.png
 =end
     def radial_shading(dict)
     end

data/split/Tioga/lib/Special_Paths.rb

@@ -46,7 +46,7 @@ Example
         end
     end
 
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Contours.jpg
+link:images/Contours.png
 
 =end
     def make_contour(dict)
@@ -99,7 +99,7 @@ Example
         end
     end
 
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Steps.jpg
+link:images/Steps.png
 =end
     def make_steps(dict)
     end
@@ -158,7 +158,7 @@ Example
         end
     end
 
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Sampled_Splines.jpg
+link:images/Sampled_Splines.png
 
 =end
     def make_spline_interpolated_points(dict)
@@ -199,7 +199,7 @@ Example
         end
     end
 
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Splines.jpg
+link:images/Splines.png
 =end
     def make_interpolant(dict)
     end
@@ -298,7 +298,7 @@ Example: 't' in this is the default FigureMaker.
         end
     end
 
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Arrows.jpg
+link:images/Arrows.png
 =end
     def show_arrow(dict)
     end

data/split/Tioga/lib/Strokes.rb

@@ -64,7 +64,7 @@ class Strokes < Doc < FigureMaker
 # For +LINE_CAP_SQUARE+, the stroke continues beyond the endpoint of the path for a distance equal to half the
 # line width and is then squared off.  See also line_join.
 #
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Caps_and_Joins.jpg
+# link:images/Caps_and_Joins.png
    def line_cap
    end
    
@@ -108,7 +108,7 @@ class Strokes < Doc < FigureMaker
 # When a path consisting of several subpaths is stroked, each subpath is treated independently -- 
 # that is, the dash pattern is restarted and the dash phase is reapplied
 # to it at the beginning of each subpath.
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Line_Types.jpg
+# link:images/Line_Types.png
    def line_type
    end
 

data/split/Tioga/lib/TeX_Text.rb

@@ -121,7 +121,7 @@ Examples
             'scale'=>1.3)
     end
     
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Math_Typesetting.jpg
+link:images/Math_Typesetting.png
 
     def strings
         t.stroke_rect(0,0,1,1)
@@ -145,7 +145,7 @@ http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Math_Typesetting.jpg
         end
     end
 
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Strings.jpg
+link:images/Strings.png
 
     def minipages
         centerx = t.bounds_xmin + 0.5 * t.bounds_width
@@ -171,7 +171,7 @@ http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Strings.jpg
             'y' => t.bounds_ymin + 0.30 * t.bounds_height, 'angle' => 20)
     end
     
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Minipages.jpg
+link:images/Minipages.png
 
     def framebox
         centerx = t.bounds_xmin + 0.5 * t.bounds_width
@@ -198,7 +198,7 @@ http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Minipages.jpg
             'at' => [centerx, y])
     end
          
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Framebox.jpg
+link:images/Framebox.png
 
 =end
     def show_text(dict)
@@ -233,7 +233,7 @@ http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Framebox.jpg
 # constants: +LEFT_JUSTIFIED+, +CENTERED+, and +RIGHT_JUSTIFIED+.
 # See also #alignment.
 # 
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Text_J_and_A.jpg
+# link:images/Text_J_and_A.png
    def justification
    end
 

data/split/Tioga/lib/TexPreamble.rb

@@ -156,121 +156,190 @@ module Tioga
 End_of_preamble
     COLOR_PREAMBLE = <<'End_of_preamble'
 % Color constants, generated from ColorConstants.rb
+\definecolor{CornflowerBlue}{rgb}{0.392,0.585,0.930}
+\definecolor{NavajoWhite}{rgb}{1.000,0.870,0.680}
+\definecolor{Fuchsia}{rgb}{1.000,0.000,1.000}
+\definecolor{Seashell}{rgb}{1.000,0.960,0.932}
+\definecolor{LightPlum}{rgb}{0.800,0.600,0.800}
+\definecolor{Lime}{rgb}{0.000,1.000,0.000}
+\definecolor{DarkOliveGreen}{rgb}{0.332,0.420,0.185}
+\definecolor{Periwinkle}{rgb}{0.600,0.000,1.000}
+\definecolor{IndianRed}{rgb}{0.804,0.360,0.360}
+\definecolor{Aqua}{rgb}{0.000,1.000,1.000}
+\definecolor{Thistle}{rgb}{0.848,0.750,0.848}
+\definecolor{MediumSpringGreen}{rgb}{0.000,0.980,0.604}
+\definecolor{DarkViolet}{rgb}{0.580,0.000,0.828}
+\definecolor{RoyalBlue}{rgb}{0.255,0.410,0.884}
+\definecolor{LightDullGreen}{rgb}{0.400,1.000,0.600}
+\definecolor{Brown}{rgb}{0.648,0.165,0.165}
+\definecolor{DarkChocolate}{rgb}{0.400,0.200,0.000}
+\definecolor{Orange}{rgb}{1.000,0.648,0.000}
+\definecolor{Goldenrod}{rgb}{0.855,0.648,0.125}
+\definecolor{SlateGray}{rgb}{0.440,0.500,0.565}
+\definecolor{LightSienna}{rgb}{0.800,0.400,0.000}
+\definecolor{DarkRed}{rgb}{0.545,0.000,0.000}
+\definecolor{Pumpkin}{rgb}{1.000,0.600,0.200}
+\definecolor{LavenderBlue}{rgb}{0.400,0.200,1.000}
+\definecolor{Bisque}{rgb}{1.000,0.894,0.770}
+\definecolor{Wheat}{rgb}{0.960,0.870,0.700}
+\definecolor{Mauve}{rgb}{0.800,0.200,0.400}
+\definecolor{MintCream}{rgb}{0.960,1.000,0.980}
+\definecolor{DodgerBlue}{rgb}{0.116,0.565,1.000}
+\definecolor{Salmon}{rgb}{0.980,0.500,0.448}
+\definecolor{LightGrey}{rgb}{0.828,0.828,0.828}
+\definecolor{Chartreuse}{rgb}{0.498,1.000,0.000}
+\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{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{Navy}{rgb}{0.000,0.000,0.500}
+\definecolor{Peru}{rgb}{0.804,0.520,0.248}
+\definecolor{Indigo}{rgb}{0.294,0.000,0.510}
+\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{LavenderBlush}{rgb}{1.000,0.940,0.960}
+\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{Purple}{rgb}{0.500,0.000,0.500}
+\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{SalmonRed}{rgb}{1.000,0.400,0.400}
 \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{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{LightCoral}{rgb}{0.940,0.500,0.500}
 \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{Silver}{rgb}{0.752,0.752,0.752}
+\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{Avocado}{rgb}{0.600,0.600,0.000}
-\definecolor{Turquoise}{rgb}{0.250,0.880,0.815}
+\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{BurlyWood}{rgb}{0.870,0.720,0.530}
+\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{LightSlateGray}{rgb}{0.468,0.532,0.600}
 \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{WhiteSmoke}{rgb}{0.970,0.970,0.970}
+\definecolor{Chocolate}{rgb}{0.824,0.410,0.116}
+\definecolor{LightOliveGreen}{rgb}{0.600,0.800,0.600}
 \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{Chocolate}{rgb}{0.824,0.410,0.116}
-\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{AliceBlue}{rgb}{0.940,0.972,1.000}
+\definecolor{Honeydew}{rgb}{0.940,1.000,0.940}
 \definecolor{DarkLavender}{rgb}{0.400,0.200,0.600}
-\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{PapayaWhip}{rgb}{1.000,0.936,0.835}
+\definecolor{Tan}{rgb}{0.824,0.705,0.550}
 \definecolor{BrightBlue}{rgb}{0.000,0.400,1.000}
+\definecolor{LightCrimson}{rgb}{0.864,0.080,0.235}
+\definecolor{DarkSmoke}{rgb}{0.920,0.920,0.920}
 \definecolor{MediumSeaGreen}{rgb}{0.235,0.700,0.444}
-\definecolor{Olive}{rgb}{0.500,0.500,0.000}
+\definecolor{Rose}{rgb}{1.000,0.400,0.600}
+\definecolor{Cyan}{rgb}{0.000,1.000,1.000}
+\definecolor{LightSandyBrown}{rgb}{1.000,0.800,0.600}
 \definecolor{Gold}{rgb}{1.000,0.844,0.000}
+\definecolor{Olive}{rgb}{0.500,0.500,0.000}
 \definecolor{SkyBlue}{rgb}{0.530,0.808,0.920}
-\definecolor{LightSandyBrown}{rgb}{1.000,0.800,0.600}
-\definecolor{Cyan}{rgb}{0.000,1.000,1.000}
-\definecolor{Plum}{rgb}{0.868,0.628,0.868}
-\definecolor{Khaki}{rgb}{0.940,0.900,0.550}
+\definecolor{DarkPeriwinkle}{rgb}{0.400,0.400,1.000}
 \definecolor{Azure}{rgb}{0.940,1.000,1.000}
-\definecolor{Violet}{rgb}{0.932,0.510,0.932}
+\definecolor{Khaki}{rgb}{0.940,0.900,0.550}
 \definecolor{Magenta}{rgb}{1.000,0.000,1.000}
-\definecolor{DarkPeriwinkle}{rgb}{0.400,0.400,1.000}
-\definecolor{LightChartreuse}{rgb}{0.800,1.000,0.400}
-\definecolor{LightGray}{rgb}{0.828,0.828,0.828}
+\definecolor{Plum}{rgb}{0.868,0.628,0.868}
+\definecolor{Violet}{rgb}{0.932,0.510,0.932}
 \definecolor{CadetBlue}{rgb}{0.372,0.620,0.628}
-\definecolor{YellowGreen}{rgb}{0.800,0.800,0.000}
+\definecolor{LightGray}{rgb}{0.828,0.828,0.828}
 \definecolor{DimGray}{rgb}{0.410,0.410,0.410}
-\definecolor{GrayBlue}{rgb}{0.000,0.400,0.600}
-\definecolor{Snow}{rgb}{1.000,0.980,0.980}
-\definecolor{LightSlateGrey}{rgb}{0.468,0.532,0.600}
+\definecolor{YellowGreen}{rgb}{0.800,0.800,0.000}
+\definecolor{LightChartreuse}{rgb}{0.800,1.000,0.400}
 \definecolor{DarkGray}{rgb}{0.664,0.664,0.664}
+\definecolor{LightSlateGrey}{rgb}{0.468,0.532,0.600}
+\definecolor{GrayBlue}{rgb}{0.000,0.400,0.600}
 \definecolor{PaleGoldenrod}{rgb}{0.932,0.910,0.668}
-\definecolor{PurpleGray}{rgb}{0.600,0.600,0.800}
-\definecolor{LemonChiffon}{rgb}{1.000,0.980,0.804}
+\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{Yellow}{rgb}{1.000,1.000,0.000}
+\definecolor{LemonChiffon}{rgb}{1.000,0.980,0.804}
 \definecolor{MediumGreen}{rgb}{0.000,0.600,0.000}
-\definecolor{DarkSeaGreen}{rgb}{0.560,0.736,0.560}
-\definecolor{SeaGreen}{rgb}{0.180,0.545,0.340}
-\definecolor{LightOrchid}{rgb}{0.600,0.400,0.800}
+\definecolor{PurpleGray}{rgb}{0.600,0.600,0.800}
+\definecolor{Yellow}{rgb}{1.000,1.000,0.000}
+\definecolor{ForestGreen}{rgb}{0.132,0.545,0.132}
 \definecolor{Coral}{rgb}{1.000,0.498,0.312}
+\definecolor{LightOrchid}{rgb}{0.600,0.400,0.800}
 \definecolor{MustardSeed}{rgb}{0.800,0.600,0.000}
-\definecolor{ForestGreen}{rgb}{0.132,0.545,0.132}
+\definecolor{SeaGreen}{rgb}{0.180,0.545,0.340}
+\definecolor{DarkMagenta}{rgb}{0.545,0.000,0.545}
 \definecolor{AntiqueWhite}{rgb}{0.980,0.920,0.844}
-\definecolor{Teal}{rgb}{0.000,0.500,0.500}
+\definecolor{HotPink}{rgb}{1.000,0.410,0.705}
 \definecolor{Lilac}{rgb}{0.800,0.600,1.000}
-\definecolor{DarkMagenta}{rgb}{0.545,0.000,0.545}
 \definecolor{PeachPuff}{rgb}{1.000,0.855,0.725}
-\definecolor{HotPink}{rgb}{1.000,0.410,0.705}
-\definecolor{LightCyan}{rgb}{0.880,1.000,1.000}
+\definecolor{Teal}{rgb}{0.000,0.500,0.500}
+\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{DarkTurquoise}{rgb}{0.000,0.808,0.820}
 \definecolor{RosyBrown}{rgb}{0.736,0.560,0.560}
-\definecolor{SlateBlue}{rgb}{0.415,0.352,0.804}
-\definecolor{LightSeaGreen}{rgb}{0.125,0.698,0.668}
+\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{GoldenBrown}{rgb}{0.600,0.400,0.000}
+\definecolor{SlateBlue}{rgb}{0.415,0.352,0.804}
+\definecolor{Lavender}{rgb}{0.900,0.900,0.980}
+\definecolor{DarkPurpleBlue}{rgb}{0.400,0.000,0.800}
 \definecolor{Beige}{rgb}{0.960,0.960,0.864}
-\definecolor{WarmGray}{rgb}{0.678,0.660,0.562}
 \definecolor{Maroon}{rgb}{0.500,0.000,0.000}
-\definecolor{DarkPurpleBlue}{rgb}{0.400,0.000,0.800}
 \definecolor{PowderBlue}{rgb}{0.690,0.880,0.900}
-\definecolor{Lavender}{rgb}{0.900,0.900,0.980}
-\definecolor{LightGreen}{rgb}{0.565,0.932,0.565}
+\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{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}
@@ -278,80 +347,11 @@ End_of_preamble
 \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{BlueGreen}{rgb}{0.000,0.600,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{MediumOrange}{rgb}{1.000,0.400,0.000}
 \definecolor{Red}{rgb}{1.000,0.000,0.000}
-\definecolor{LightPlum}{rgb}{0.800,0.600,0.800}
-\definecolor{Fuchsia}{rgb}{1.000,0.000,1.000}
-\definecolor{CornflowerBlue}{rgb}{0.392,0.585,0.930}
-\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{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{RoyalBlue}{rgb}{0.255,0.410,0.884}
-\definecolor{DarkChocolate}{rgb}{0.400,0.200,0.000}
-\definecolor{LightSienna}{rgb}{0.800,0.400,0.000}
-\definecolor{Goldenrod}{rgb}{0.855,0.648,0.125}
-\definecolor{Orange}{rgb}{1.000,0.648,0.000}
-\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{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{DarkGrey}{rgb}{0.664,0.664,0.664}
-\definecolor{LightTurquoise}{rgb}{0.200,1.000,0.800}
-\definecolor{GreenYellow}{rgb}{0.680,1.000,0.185}
-\definecolor{PaleTurquoise}{rgb}{0.688,0.932,0.932}
-\definecolor{SpringGreen}{rgb}{0.000,1.000,0.498}
-\definecolor{DarkSlateGray}{rgb}{0.185,0.310,0.310}
-\definecolor{BlueViolet}{rgb}{0.540,0.170,0.888}
-\definecolor{LightBrightGreen}{rgb}{0.000,0.800,0.200}
-\definecolor{MediumOrchid}{rgb}{0.730,0.332,0.828}
-\definecolor{RedBrown}{rgb}{0.800,0.400,0.200}
-\definecolor{Cornsilk}{rgb}{1.000,0.972,0.864}
-\definecolor{LightRose}{rgb}{1.000,0.600,0.800}
-\definecolor{Gainsboro}{rgb}{0.864,0.864,0.864}
-\definecolor{Navy}{rgb}{0.000,0.000,0.500}
-\definecolor{Sienna}{rgb}{0.628,0.320,0.176}
-\definecolor{DarkOrange}{rgb}{1.000,0.550,0.000}
-\definecolor{Aquamarine}{rgb}{0.498,1.000,0.830}
-\definecolor{Indigo}{rgb}{0.294,0.000,0.510}
-\definecolor{LimeGreen}{rgb}{0.196,0.804,0.196}
-\definecolor{Peru}{rgb}{0.804,0.520,0.248}
-\definecolor{Tomato}{rgb}{1.000,0.390,0.280}
-\definecolor{DeepPink}{rgb}{1.000,0.080,0.576}
-\definecolor{Burgundy}{rgb}{0.600,0.000,0.200}
-\definecolor{LightGold}{rgb}{0.800,0.800,0.400}
-\definecolor{MediumTurquoise}{rgb}{0.284,0.820,0.800}
-\definecolor{RoyalPurple}{rgb}{0.400,0.000,0.600}
-\definecolor{GrassGreen}{rgb}{0.200,0.600,0.000}
-\definecolor{DarkCyan}{rgb}{0.000,0.545,0.545}
-\definecolor{LightSkyBlue}{rgb}{0.530,0.808,0.980}
-\definecolor{OrangeRed}{rgb}{1.000,0.270,0.000}
-\definecolor{SlateGrey}{rgb}{0.440,0.500,0.565}
-\definecolor{DarkRoyalBlue}{rgb}{0.000,0.200,0.800}
-\definecolor{Black}{rgb}{0.000,0.000,0.000}
-\definecolor{LavenderBlush}{rgb}{1.000,0.940,0.960}
-\definecolor{MediumAquamarine}{rgb}{0.400,0.804,0.668}
-\definecolor{Purple}{rgb}{0.500,0.000,0.500}
-\definecolor{White}{rgb}{1.000,1.000,1.000}
 
 End_of_preamble
   end