ctioga2 0.13.1 → 0.14

data/lib/ctioga2/metabuilder/types/lists.rb

@@ -210,7 +210,7 @@ module CTioga2
             nb.times do |i|
               array << Utils::mix_objects(e,s, i * fact)
             end
-          elsif str =~ /(.*)!(\d+)(?:!(.*))?\s*$/
+          elsif str =~ /(.*)!!(\d+)(?:!!(.*))?\s*$/
             # We have a mixing
             nb = $2.to_i
             fact = nb*0.01

data/lib/ctioga2/metabuilder/types/styles.rb

@@ -75,7 +75,7 @@ module CTioga2
           if (elems.size % 2) == 0
             elems << "White"    # Implicit mix with white
           end
-          
+
           temp = parse_one_color(elems.shift).dup
           
           while elems.size > 0
@@ -121,7 +121,7 @@ module CTioga2
 
       # A marker Type for Tioga. Input as
       # 
-      #  a,b(,c)?
+      #  a,(,b(,c)?)?
       #  
       class MarkerType < Type
         
@@ -133,8 +133,10 @@ module CTioga2
             return [specs[0].to_i, specs[1].to_i]
           elsif specs.size == 3
             return [specs[0].to_i, specs[1].to_i, specs[2].to_f]
+          elsif specs.size == 1 # Defaults to symbols !
+            return [14, specs[0].to_i]
           else
-            raise IncorrectInput, "You need two or three values to make a marker"
+            raise IncorrectInput, "You need between one and three values to make a marker"
           end
         end
       end

data/lib/ctioga2/plotmaker.rb

@@ -99,6 +99,9 @@
 # \todo make --xrange automatically select the range for the --math
 # backend unless another range was explicitly specified.
 
+# Maybe, maybe, maybe... We need tioga ?
+require 'Tioga/FigureMaker'
+
 require 'ctioga2/utils'
 require 'ctioga2/log'
 
@@ -109,8 +112,9 @@ require 'shellwords'
 # Path name mangling
 require 'pathname'
 
-# Maybe, maybe, maybe... We need tioga ?
-require 'Tioga/FigureMaker'
+# And yaml...
+require 'yaml'
+
 
 # Interaction with Ruby code
 require 'ctioga2/ruby'
@@ -279,6 +283,9 @@ module CTioga2
     end
 
     # ctioga's entry point.
+    #
+    # Returns true if there was no errors and false if there was one
+    # or more.
     def run(command_line)
 
       # The main catch-all around the plot:
@@ -311,6 +318,7 @@ module CTioga2
           STDIN.gets
         end
       end
+      return errs == 0
     end
 
     # Flushes the current root object and starts a new one:
@@ -490,8 +498,9 @@ module CTioga2
       # of ctioga2 used to produce the PDF, and the command-line if
       # applicable.
       t.tex_preamble += 
-        "\n\\pdfinfo {\n#{title}/Creator(#{Utils::pdftex_quote_string("ctioga2 #{Version::version}")})\n}\n"
+        "\n\\pdfinfo {\n#{title}/Creator(#{Utils::pdftex_quote_string("ctioga2 #{Version::version}")})\n}\n" 
 
+#" #emacs ruby-mode is a dummy
       return t
     end
 
@@ -530,6 +539,8 @@ EOH
     PlotLastOptions = 
       Graphics::Styles::CurveStyleFactory::PlotCommandOptions.dup
 
+    PlotLastOptions.merge!(Graphics::Elements::TiogaElement::StyleBaseOptions)
+
     PlotLastOptions['which'] = CmdArg.new('stored-dataset')
     
     PlotLastCommand = 
@@ -642,8 +653,7 @@ EOH
 
     ResolutionCommand = 
       Cmd.new("resolution", false,"--resolution", 
-              [ CmdArg.new('float') ],
-              ) do |plotmaker, size, options|
+              [ CmdArg.new('float') ]) do |plotmaker, size, options|
       plotmaker.pdf_resolution = size
     end
 
@@ -784,6 +794,19 @@ EOH
                         <<EOH, OutputSetupGroup)
 When this feature is on, all produced PDF files are converted to SVG
 using the neat pdf2svg program.
+EOH
+
+    CleanupPDFCommand = 
+      Cmd.new("cleanup-pdf",nil,"--cleanup-pdf", 
+              [CmdArg.new('boolean') ]) do |plotmaker,val|
+      plotmaker.postprocess.cleanup_pdf = val
+    end
+    
+    CleanupPDFCommand.describe('Cleanup produced PDF using gs', 
+                               <<EOH, OutputSetupGroup)
+If this is on, then @ctioga2@ uses ghostscript to cleanup the PDF file 
+produced. It is on by default is @ctioga2@ is able to find the @gs@ 
+executable.
 EOH
 
     EPSCommand = 

data/lib/ctioga2/postprocess.rb

@@ -43,6 +43,13 @@ module CTioga2
     # Are we converting to EPS using pdftops ? 
     attr_accessor :eps
 
+    # Are we cleaning up the PDF produced using gs (in particular, to
+    # include missing markers and such, that are known to cause
+    # problems from time to time).
+    #
+    # @todo Path to gs...
+    attr_accessor :cleanup_pdf
+
 
     # @todo Maybe all the PNG stuff should be it is own class ?
 
@@ -72,6 +79,9 @@ module CTioga2
       @png_pdftoppm = false
 
       @processed_files = []
+
+      gs = Utils::which('gs')
+      @cleanup_pdf = (gs ? true : false)
     end
 
 
@@ -106,6 +116,24 @@ module CTioga2
     # only happen last happen.
     def process_file(file, last = false)
       @processed_files << file
+
+
+      if @cleanup_pdf
+        nw_src = file.sub(/(\.pdf)?$/,'.raw.pdf')
+        begin
+          File::rename(file, nw_src)
+          info { "Running gs to clean up the target PDF file: '#{file}'" }
+          if ! system('gs', "-sOutputFile=#{file}", "-q", "-sDEVICE=pdfwrite",
+                      "-dCompatibilityLevel=1.4", "-dNOPAUSE", "-dAutoRotatePages=/None", "-dBATCH", nw_src)
+            error { "Failed to run gs to cleanup '#{nw_src}', you can disable that using --no-cleanup-pdf" }
+          else
+            File::unlink(nw_src)
+          end
+        rescue SystemCallError => e
+          error { "Could not rename '#{file}' to '#{nw_src}': #{e.message}, try using --no-cleanup-pdf, or resolve the problem otherwise" }
+        end
+      end
+      
       # Converts to SVG if applicable
       if @svg
         target = file.sub(/(\.pdf)?$/,'.svg')

data/lib/ctioga2/ruby.rb

@@ -44,6 +44,13 @@ module CTioga2
     def self.compute_formula(col, vals, mods = [])
       return Dobjects::Dvector.compute_formula(col, vals, [@module] + mods)
     end
+
+    # Returns a Dobjects::MathEvaluator object to evaluate
+    def self.make_evaluator(formula, vars, mods = [])
+      return Dobjects::MathEvaluator.new(formula, vars.join(","),
+                                         [@module] + mods)
+    end
+
   end
 end
 

data/lib/ctioga2/utils.rb

@@ -64,6 +64,14 @@ module CTioga2
       return (flt.is_a?(Numeric) and flt.to_f.finite?)
     end
 
+    def self.nan_number?(flt)
+      return (flt.respond_to?(:nan?) and flt.nan?)
+    end
+
+    def self.infinite_number?(flt)
+      return (flt.respond_to?(:infinite?) and flt.infinite?)
+    end
+
     # Converts a number to a float while trying to stay as lenient as
     # possible
     def self.txt_to_float(txt)
@@ -199,6 +207,34 @@ module CTioga2
       return sets_by_prefix
     end
 
+    @@color_name_by_value = nil
+
+    def self.color_name_by_value_hsh
+      if ! @@color_name_by_value
+        @@color_name_by_value = {}
+        colors = Tioga::ColorConstants::constants
+        for c in colors
+          color = Tioga::ColorConstants::const_get(c)
+          @@color_name_by_value[Utils::color_to_html(color)] = c.to_s
+        end
+      end
+      return @@color_name_by_value
+    end
+
+    # Returns the Tioga name for the given color. Can be nil if the
+    # color does not match a Tioga named color.
+    def self.color_name_by_value(color)
+      return color_name_by_value_hsh()[Utils::color_to_html(color)]
+    end
+
+    # Transforms a Tioga color into a HTML color string "xxxxxx"
+    # (without the leeading #)
+    def self.color_to_html(color)
+      return color.map do |i|
+        "%02x" % (i*255.to_i)
+      end.join('')
+    end
+
     # An instrumentized version of Dir::chdir 
     def self.chdir(dir, &blk)
       @current_dirs ||= []
@@ -653,6 +689,15 @@ module CTioga2
 
 end
 
+
+# Patching YAML generation for recent Ruby
+
+class Dobjects::Dvector
+  def encode_with(coder)
+    coder.seq = self.to_a
+  end
+end
+
 ######################################################################
 # Now come a few functions that add to ruby's standard classes or
 # modules

data/lib/ctioga2/version.rb

@@ -2,7 +2,7 @@
 module CTioga2
 
   module Version
-GIT_VERSION = '0.13.1'
-GIT_DATE = 'Wed 29 Jul 20:32:19 CEST 2015'
+GIT_VERSION = '0.14'
+GIT_DATE = 'Thu 18 Feb 21:03:36 CET 2016'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ctioga2
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: '0.14'
 platform: ruby
 authors:
 - Vincent Fourmond <vincent.fourmond@9online.fr>
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tioga
@@ -56,6 +56,7 @@ files:
 - lib/ctioga2/commands/general-functions.rb
 - lib/ctioga2/commands/general-types.rb
 - lib/ctioga2/commands/groups.rb
+- lib/ctioga2/commands/instruction.rb
 - lib/ctioga2/commands/interpreter.rb
 - lib/ctioga2/commands/parsers/command-line.rb
 - lib/ctioga2/commands/parsers/file.rb
@@ -181,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: ctioga2 - the polymorphic plotting program