tioga 1.13 → 1.14

data/Tioga_README

@@ -1,7 +1,7 @@
-This is the README for the Tioga kernel, version 1.10, March 7, 2009.
+This is the README for the Tioga kernel, version 1.14, June 10, 2011.
 
     Copyright (C) 2005, 2006, 2007, 2008, 2009  Bill Paxton
-    Copyright (C) 2007, 2008, 2009, 2010 Vincent Fourmond, Taro Sato, 
+    Copyright (C) 2007, 2008, 2009, 2010, 2011 Vincent Fourmond, Taro Sato, 
     	      	  Benjamin ter Kuile
     
     This file is part of Tioga.
@@ -22,13 +22,13 @@ This is the README for the Tioga kernel, version 1.10, March 7, 2009.
 
 << What's new >>
 
-   Tioga 1.13 brings in a fix for a well-hidden memory leak that was
-unlikely to hit you unless you were allocating a huge number of
-vectors.
+    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 !).
 
-   More interestingly, a few instance functions that did not depend on
-FigureMaker's internal state (color conversion functions and
-contouring algorithms) were made available as module functions too.
+    It also brings in the possibility to customize the number of major
+ticks after which log plots don't show minor ticks, via the
+log_minor_ticks_limit accessor.
 
 << Quick Installation of Tioga >>
 
@@ -122,18 +122,18 @@ The next step is to do the tutorial found in the documentation.
     Once you have Tioga installed, the on-line tutorial will help you
 get started using it.
     
-http://theory.kitp.ucsb.edu/~paxton/tioga_doc/classes/Tioga/Tutorial.html
+http://tioga.rubyforge.org/doc/classes/Tioga/Tutorial.html
 
 
 << Documentation >>
 
     Visit this website to access the documentation:
     
-        http://theory.kitp.ucsb.edu/~paxton/tioga_doc/index.html
+        http://tioga.rubyforge.org/doc/
 
 If for some reason that link isn't working, go to my website,
 
-        http://theory.kitp.ucsb.edu/~paxton
+        http://www.kitp.ucsb.edu/~paxton
 
 and check there for a new link to the Tioga stuff.
 
@@ -157,7 +157,7 @@ fix it.  Or even better, let me know the fix along with the bug!
 
 ----------------------------------
 
-For more, visit my website:  http://theory.kitp.ucsb.edu/~paxton
+For more, visit my website:  http://www.kitp.ucsb.edu/~paxton
 
 Best wishes,
 Bill Paxton
@@ -172,6 +172,15 @@ Bill Paxton
 
 Here are the old release messages:
 
+   Tioga 1.13 brings in a fix for a well-hidden memory leak that was
+unlikely to hit you unless you were allocating a huge number of
+vectors.
+
+   More interestingly, a few instance functions that did not depend on
+FigureMaker's internal state (color conversion functions and
+contouring algorithms) were made available as module functions too.
+
+
     Tioga 1.12 has seen quite a lot of action. The first and major
 change is the switch from a custom rewrite of mkmf.rb for
 building/installing to the standard setup.rb tool, which finally has
@@ -318,7 +327,7 @@ time?  Turns out there was one user who couldn't live without it --
 me!  So it's back, but I'm still not making any promises about keeping
 it alive if Apple does something stupid in coming releases.  If you're
 interested in playing with it in spite of that warning, it's available
-from my website (http://theory.kitp.ucsb.edu/~paxton/Tioga-1.5.dmg).
+from my website (http://www.kitp.ucsb.edu/~paxton/Tioga-1.5.dmg).
 
 	Cheers, Bill
 

data/ext/Dobjects/Dvector/dvector.c

@@ -5967,7 +5967,7 @@ static VALUE dvector_fft_mul(VALUE self, VALUE m)
  * This copies <i>xhe</i> to <i>log_xhe0</i>, subtracts <i>xhe1</i> and <i>xhe2</i> from <i>log_xhe0</i> in place,
  * and then takes the +log+, also in place.  It's not pretty, but it is efficient -- use if needed.
  *
- * Please report problems with the Dvector extension here[http://theory.kitp.ucsb.edu/~paxton/].
+ * Please report problems with the Dvector extension to the <tt>tioga-users</tt> at <tt>rubyforge.org</tt> mailing list.
  * [Note: for N-dimensional arrays or arrays of complex numbers or integers as well as doubles,
  * along with a variety of matrix operations,
  * check out the NArray[http://www.ir.isas.ac.jp/~masa/ruby/index-e.html] extension.]

data/ext/Tioga/FigureMaker/__shared_axes.c

@@ -785,7 +785,7 @@ static double * get_minor_ticks_location(OBJ_PTR fmkr, FM *p,
    if (s->number_of_minor_intervals <= 0) {
       if (s->log_vals) {
          double interval = s->majors[1] - s->majors[0];
-         s->number_of_minor_intervals = (abs(interval) != 1.0 || s->nmajors > 10)? 1 : 9; 
+         s->number_of_minor_intervals = (abs(interval) != 1.0 || s->nmajors > p->log_minor_ticks_limit) ? 1 : 9; 
       }  else {
          s->number_of_minor_intervals = Pick_Number_of_Minor_Intervals(s->interval, &ierr);
          if (ierr != 0) return NULL;

data/ext/Tioga/FigureMaker/figures.c

@@ -233,6 +233,7 @@ FM *Get_FM(OBJ_PTR fmkr, int *ierr) {
 
 /* Major ticks picking algorithm */
    BOOL_ATTR(vincent_or_bill)
+   INT_ATTR(log_minor_ticks_limit)
 
     
 /* Legend */
@@ -642,6 +643,7 @@ void Init_FigureMaker(void) {
 
 /* Major ticks algorithm */
    attr_accessors(vincent_or_bill)
+   attr_accessors(log_minor_ticks_limit)
     
 /* Legend */
    attr_accessors(legend_text_width)

data/ext/Tioga/FigureMaker/figures.h

@@ -292,8 +292,9 @@ typedef struct {
     int right_edge_type;
     bool right_edge_visible;
 
-    /* General axis stuff*/
-    bool vincent_or_bill;
+    /* General axis */
+    bool vincent_or_bill; /* whether to use Bill's or Vincent's algorithms for minor ticks */
+    int log_minor_ticks_limit; /* the number after which we disable the display of minor ticks on log scale */
 
     /* Legend */
     // units are text heights for x and y for locations and sizes

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

@@ -785,7 +785,7 @@ static double * get_minor_ticks_location(OBJ_PTR fmkr, FM *p,
    if (s->number_of_minor_intervals <= 0) {
       if (s->log_vals) {
          double interval = s->majors[1] - s->majors[0];
-         s->number_of_minor_intervals = (abs(interval) != 1.0 || s->nmajors > 10)? 1 : 9; 
+         s->number_of_minor_intervals = (abs(interval) != 1.0 || s->nmajors > p->log_minor_ticks_limit) ? 1 : 9; 
       }  else {
          s->number_of_minor_intervals = Pick_Number_of_Minor_Intervals(s->interval, &ierr);
          if (ierr != 0) return NULL;

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.14/lib/Tioga/FigMkr.rb $'
 
     TIOGA_VERSION = if SVN_URL =~ /tags\/tioga\/Tioga%20([^\/]+)/
                        $1
@@ -283,7 +283,7 @@ class FigureMaker
         @enter_context_function = nil
         @exit_context_function = nil
 
-        @enter_page_function = lambda { default_enter_page_function }
+        @enter_page_function = lambda  { |t| t.default_enter_page_function }
         @exit_page_function = nil
                 
         @tex_preview_paper_width = '297mm'
@@ -311,6 +311,7 @@ class FigureMaker
 
         # By default, we use Bill's algorithm for major ticks positions
         self.vincent_or_bill = false
+        self.log_minor_ticks_limit = 10
     end
     
 
@@ -1219,7 +1220,7 @@ class FigureMaker
                 k += '=' if respond_to? "#{k}="
                 send(k, val)
               end
-              bottom[m].each {|x| stroke_line(x, y0, x, y1)}
+              bottom["#{m}_ticks"].each {|x| stroke_line(x, y0, x, y1)}
             end
           end
         end
@@ -1240,7 +1241,7 @@ class FigureMaker
                 k += '=' if respond_to? "#{k}="
                 send(k, val)
               end
-              left[m].each {|y| stroke_line(x0, y, x1, y)}
+              left["#{m}_ticks"].each {|y| stroke_line(x0, y, x1, y)}
             end
           end
         end
@@ -2471,26 +2472,8 @@ class FigureMaker
             puts msg
             puts ""
         end
-        puts "    " + "#{er.message}" + "  [version: " + FigureMaker.version + "]"
-        line_count = 0
-        show_count = 0
-        past_callers_routines = false
-        in_callers_routines = false
-        er.backtrace.each do |line|
-            if (line.include?('Tioga/FigMkr.rb')) || (line.include?('Tioga/tioga_ui.rb'))
-              if in_callers_routines
-                past_callers_routines = true 
-                in_callers_routines = false
-              end
-            else
-              in_callers_routines = true
-            end 
-            if (show_count < @num_error_lines) and in_callers_routines
-                puts "    " + line
-                show_count = show_count + 1
-            end
-            line_count = line_count + 1
-        end
+        puts "    #{er.message}  [version: #{ FigureMaker.version}]"
+        puts "\t#{er.backtrace.join("\n\t")}"
     end
     
 

data/lib/Tioga/tioga_ui_cmds.rb

@@ -201,7 +201,7 @@ class TiogaUI
     puts "\nThis program is a command line interface for the open-source tioga kernel."
     puts "The tioga kernel is for creating figures and plots using Ruby, PDF, and TeX."
     puts "Following is a brief description of the tioga command line options."
-    puts "For more information, visit http://theory.kitp.ucsb.edu/~paxton/tioga.html."
+    puts "For more information, visit http://www.kitp.ucsb.edu/~paxton/tioga.html."
     puts "\nBefore any command line information is processed, tioga runs ~/.tiogainit if it exists."
     puts "    The primary use of this file is to set your default pdf viewer command (see below)."
     puts "\nIf there are no command line arguments, or the argument is -h, this help info is output."
@@ -699,7 +699,7 @@ class TiogaUI
         'message' => "Tioga-Point-and-Click is a Ruby/Tk Application.\n" +
             "It uses the Tioga kernel to create PDFs and then calls your favorite viewer to show them.\n\n" +
             "Version 0.1  -- January, 2007\n\n" +
-            "Visit http://theory.kitp.ucsb.edu/~paxton/tioga.html")
+            "Visit http://www.kitp.ucsb.edu/~paxton/tioga.html")
   end
 
 

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: tioga
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
-  - 13
-  version: "1.13"
+  - 14
+  version: "1.14"
 platform: ruby
 authors: 
 - Bill Paxton
@@ -19,8 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 +01:00
-default_executable: 
+date: 2011-06-10 00:00:00 Z
 dependencies: []
 
 description: 
@@ -130,7 +129,6 @@ files:
 - lib/Tioga/irb_tioga.rb
 - lib/Tioga/FigMkr.rb
 - lib/Tioga/tioga_ui_cmds.rb
-- lib/Tioga/TexPreamble.rb
 - lib/Tioga/Markers.rb
 - lib/Tioga/MarkerConstants.rb
 - lib/Tioga/Rectangles.rb
@@ -138,7 +136,6 @@ files:
 - lib/Tioga/Using_Paths.rb
 - lib/Tioga/Special_Paths.rb
 - lib/Tioga/TeX_Text.rb
-- tests/Icon_Test.pdf
 - tests/dtable_test.data
 - tests/dvector_read_test.data
 - tests/tc_Dvector.rb
@@ -148,7 +145,6 @@ files:
 - tests/tc_Dtable.rb
 - tests/tc_Flate.rb
 - tests/tc_FMkr.rb
-- tests/vg.log
 - tests/tc_Function.rb
 - Tioga_README
 - lgpl.txt
@@ -158,7 +154,6 @@ files:
 - ext/Dobjects/Dvector/extconf.rb
 - ext/Dobjects/Dtable/extconf.rb
 - ext/Dobjects/Function/extconf.rb
-has_rdoc: true
 homepage: http://tioga.rubyforge.org
 licenses: 
 - LGPL 2.1
@@ -188,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tioga
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Tioga - a powerful scientific plotting library

data/lib/Tioga/TexPreamble.rb

@@ -1,372 +0,0 @@
-# This file is automatically generated from Tioga/tioga.sty.in 
-# using the Tioga/mk_tioga_sty.rb script.
-# 
-# Please do not modify this file directly as all changes would
-# be lost !! 
-
-module Tioga
-  class FigureMaker
-    TEX_PREAMBLE = <<'End_of_preamble'
-\makeatletter
-% Here are some command to ease the use of pictures produced by Tioga
-% within a LaTeX document.
-
-
-% \tiogafigurefullpage[minwhitespace]{figurename}
-%
-% \tiogafigurefullpage shows a version of the picture scaled to fit the 
-% paper size minus the minwhitespace.  The minwhitespace is the sum of 
-% the margins on both sides, top and bottom or left and right. 
-% The minwhitespace defaults to 2 inches.
-%
-\newcommand{\tiogafigurefullpage}[2][2in]{
-  \tiogafigurescaledtofit{#2}{\paperwidth - (#1)}{\paperheight - (#1)}}
-
-
-% \tiogafigurescaledtofit{figurename}{maxwidth}{maxheight}
-%
-% \tiogafigurescaledtofit shows a version of the picture scaled to fit the
-% given width and height while preserving the aspect ratio.
-% The 1st arg is the base name for the pdf and txt files.
-% The 2nd arg determines the maximum figure width.
-% The 3rd arg determines the maximum figure height.
-\newcommand{\tiogafigurescaledtofit}[3]{
-  \setkeys{Gin}{keepaspectratio=true}
-  \resizebox{#2}{#3}{\tiogafigureshow{#1}}}
-
-
-% \tiogafigurescaled{figurename}{scalefactor}
-%
-% \tiogafigurescaled shows a scaled version of the picture
-% The 1st arg is the base name for the pdf and txt files.
-% The 2nd arg determines the scale.
-\newcommand{\tiogafigurescaled}[2]{
-  \scalebox{#2}{\tiogafigureshow{#1}}}
-
-
-% \tiogafigurescaledxy{figurename}{xscalefactor}{yscalefactor}
-%
-% \tiogafigurescaledxy shows a scaled version of the picture where you
-% can use different scaling factors in the horizontal and vertical directions.
-% The 1st arg is the base name for the pdf and txt files.
-% The 2nd arg determines the horizontal scale.
-% The 3rd arg determines the vertical scale.
-\newcommand{\tiogafigurescaledxy}[3]{
-  \scalebox{#2}[#3]{\tiogafigureshow{#1}}}
-
-
-% \tiogafiguresized{figurename}{figurewidth}{figureheight}
-%
-% \tiogafiguresized shows a scaled version of the picture, where you
-% can specify the actual size you want.  If either length is
-% given as !, the one scale factor is used in both directions.
-% The 1st arg is the base name for the pdf and txt files.
-% The 2nd arg determines the figure width.
-% The 3rd arg determines the figure height.
-\newcommand{\tiogafiguresized}[3]{
-  \resizebox{#2}{#3}{\tiogafigureshow{#1}}}
-
-
-% \tiogaprefix can be used to set a path for the figure pdf and txt files.
-%
-\newcommand{\tiogaprefix}{}
-% The prefix is initialized to an empty string.  
-% To change it, use \renewcommand as in the following example:
-% \renewcommand{\tiogaprefix}{plot_out/}
-
-
-% \tiogafigurecentered{figurename}{targetwidth}{targetheight}
-%
-% \tiogafigurecentered displays an unscaled figure centered within
-% a box of targetwidth *targetheight.
-\newcommand{\tiogafigurecentered}[3]{
-\vbox to #3{%
-\vspace*{\fill}%
-\hbox to #2{\hfill%
-\tiogafigureshow{#1}%
-\hspace*{\fill}}%
-\vspace*{\fill}%
-}}
-
-% \tiogafigurecentereddebug{figurename}{targetwidth}{targetheight}
-%
-% \tiogafigurecentereddebug has the same effect as \tiogafigurecentered
-% except that the figure is included in a \fbox, which makes it easier
-% to track problems.
-\newcommand{\tiogafigurecentereddebug}[3]{
-\vbox to #3{%
-\vspace*{\fill}%
-\hbox to #2{\hfill%
-\fbox{\tiogafigureshow{#1}}
-\hspace*{\fill}}%
-\vspace*{\fill}%
-}}
-
-
-% \tiogafigureshow{figurename}
-%
-% \tiogafigureshow shows the figure and the accompanying text.
-% Inside a box, it first creates a picture that includes the pdf
-% file with the graphics for the figure, then it includes the text.
-% The \tiogaprefix is added at the start of the file names for both.
-\newcommand{\tiogafigureshow}[1]{%
-  \mbox{\begin{picture}(0,0)(0,0)%
-      \put(0,0){\includegraphics{\tiogaprefix#1_figure.pdf}}%
-    \end{picture}%
-    \input{\tiogaprefix#1_figure.txt}}}
-
-% Commands for text properties:
-% Font size (two parameters)
-% {sz}{line_sp}, 1st is size of font in points,
-% 2nd is line spacing (not used by Tioga)
-\newcommand\tiog@fontsize{{10.0}{10pt}}
-\newcommand\settiogafontsize[2][10pt]{\renewcommand\tiog@fontsize{{#2}{#1}}}
-
-% Font family
-% \rmdefault, \sfdefault, \ttdefault  -- roman, sans serif, typewriter
-\newcommand\tiog@fontfamily{\rmdefault}
-\newcommand\settiogafontfamily[1]{\renewcommand\tiog@fontfamily{#1}}
-
-% Font series
-% \mddefault, \bfdefault -- medium, bold 
-\newcommand\tiog@fontseries{\mddefault}
-\newcommand\settiogafontseries[1]{\renewcommand\tiog@fontseries{#1}}
-
-% Font shape
-% \updefault, \itdefault, \sldefault, \scdefault -- upright, italic, slant, small caps
-\newcommand\tiog@fontshape{\updefault}
-\newcommand\settiogafontshape[1]{\renewcommand\tiog@fontshape{#1}}
-
-% \SetTiogaFontInfo is called from within the figure.txt file with the TeX
-% for the text of the figure. Do not modify this function directly, it
-% is way better to use the previous settiogafont* commands.
-\newcommand\SetTiogaFontInfo{%
-\expandafter\fontsize\tiog@fontsize%
-\fontfamily{\tiog@fontfamily}% 
-\fontseries{\tiog@fontseries}%
-\fontshape{\tiog@fontshape}%
-}
-
-% This command is used inside the _figure.txt files. You can use it directly
-% as well, if you really want to make sure you get the same fonts. But I
-% personnaly doubt it would really come in useful ;-)...
-\newcommand\tiogasetfont{\reset@font\SetTiogaFontInfo%
-\selectfont}%
-
-
-% This commands typesets its second argument while sending to the
-% standard output successively the width, height and depth of the
-% box produced.
-%
-% These informations are collected when Tioga runs pdflatex.
-\newlength{\tiogatempdim}
-\newcommand{\tiogameasure}[2]{%
-\settowidth{\tiogatempdim}{#2}\typeout{#1[0]=\the\tiogatempdim}%
-\settoheight{\tiogatempdim}{#2}\typeout{#1[1]=\the\tiogatempdim}%
-\settodepth{\tiogatempdim}{#2}\typeout{#1[2]=\the\tiogatempdim}%
-{#2}}
-
-\makeatother
-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{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{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{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{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{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{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{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{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{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{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{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{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{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{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{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{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{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}
-
-End_of_preamble
-  end
-end