ctioga2 0.5 → 0.6

data/lib/ctioga2/log.rb

@@ -16,7 +16,7 @@ require 'logger'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 327 $', '$Date: 2012-11-28 14:47:52 +0100 (Wed, 28 Nov 2012) $')
+  Version::register_svn_info('$Revision: 497 $', '$Date: 2013-09-04 22:07:55 +0200 (Wed, 04 Sep 2013) $')
 
   # This module should be included (or extended) by every class that
   # need logging/debugging facilities.
@@ -70,6 +70,25 @@ module CTioga2
       @@logger.level = Logger::WARN # Warnings and more only by default
     end
 
+
+    # Logs to the target file, and fall back onto stderr should
+    # opening fail.
+    def self.log_to(target_file, message = nil)
+      if target_file.is_a? String
+        begin
+          target_file = File.open(target_file, "w")
+          if message
+            target_file.puts message
+          end
+        rescue
+          target_file = STDERR
+        end
+      end
+      old = @@logger
+      @@logger = Logger.new(target_file)
+      @@logger.level = old.level
+    end
+
     # Simple accessor for the @@log class variable.
     def self.logger
       return @@logger

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

@@ -20,7 +20,7 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 401 $', '$Date: 2013-08-19 17:29:59 +0200 (Mon, 19 Aug 2013) $')
+  Version::register_svn_info('$Revision: 484 $', '$Date: 2013-09-02 22:44:42 +0200 (Mon, 02 Sep 2013) $')
 
 
   module MetaBuilder
@@ -149,8 +149,9 @@ module CTioga2
           # We make a copy for our own purposes.
           subtype = type[:subtype] || {:type => :string}
           @subtype = Type.get_type(subtype)
-          @separator = /\s*,\s*/
-          @separator_out = ','
+          @separator = type[:separator] || /\s*,\s*/
+          @alternative_separator = type[:alternative_separator] || nil
+          @separator_out = type[:separator_out] || ','
         end
 
         def type_name
@@ -158,7 +159,11 @@ module CTioga2
         end
 
         def string_to_type_internal(str)
-          ary = str.split(@separator)
+          if @alternative_separator && str =~ @alternative_separator
+            ary = str.split(@alternative_separator)
+          else
+            ary = str.split(@separator)
+          end
           return ary.map do |a|
             @subtype.string_to_type(a)
           end
@@ -167,6 +172,7 @@ module CTioga2
         def type_to_string_internal(val)
           return val.map do |a|
             @subtype.type_to_string(a)
+            # Won't alway work !
           end.join(@separator_out)
         end
       end

data/lib/ctioga2/plotmaker.rb

@@ -155,7 +155,7 @@ require 'ctioga2/postprocess'
 # displays of rate constants vs potentials)
 module CTioga2
 
-  Version::register_svn_info('$Revision: 431 $', '$Date: 2013-08-23 17:58:47 +0200 (Fri, 23 Aug 2013) $')
+  Version::register_svn_info('$Revision: 478 $', '$Date: 2013-09-01 11:24:02 +0200 (Sun, 01 Sep 2013) $')
 
   # This class is the core of ctioga. It parses the command-line arguments,
   # reads all necessary files and plots graphs. Most of its functionality
@@ -201,6 +201,9 @@ module CTioga2
     # Additional preamble for LaTeX output
     attr_accessor :latex_preamble
 
+    # Global font information
+    attr_accessor :latex_font
+
     # What happens to generated PDF files (a PostProcess object)
     attr_accessor :postprocess
 
@@ -241,6 +244,10 @@ module CTioga2
       # Original preamble
       @latex_preamble = ""
 
+      @latex_font = Graphics::Styles::FullLatexFont.new
+
+      @latex_font.size = 15
+
       @postprocess = PostProcess.new
 
       # Make sure it is registered
@@ -333,6 +340,7 @@ module CTioga2
       
       info { "Producing figure '#{figname}'" }
 
+
       t = create_figure_maker
       # If figname is clearly a path, we split it into directory/name
       # and set the output directory to directory.
@@ -349,10 +357,19 @@ module CTioga2
         t.save_dir = @output_directory
       end
 
-      t.def_figure(figname) do
+      effective_fig_name = figname.gsub(/[.\s]/) do |x|
+        "__#{x.ord}__"
+      end
+
+      if effective_fig_name != figname
+        debug { "Mangled name to '#{effective_fig_name}'"}
+      end
+
+      t.def_figure(effective_fig_name) do
+        @latex_font.set_global_font(t)
         @root_object.draw_root_object(t)
       end
-      t.make_preview_pdf(t.figure_index(figname))
+      t.make_preview_pdf(t.figure_index(effective_fig_name))
 
       # We look for latex errors
       if t.respond_to? :pdflatex_errors
@@ -365,6 +382,13 @@ module CTioga2
         end
       end
 
+      # We first rename the PDF file if it was mangled.
+      if effective_fig_name != figname
+        Dir.chdir(t.save_dir || ".") do
+          File::rename("#{effective_fig_name}.pdf", "#{figname}.pdf")
+        end
+      end
+
       file = t.save_dir ? File::join(t.save_dir, figname + ".pdf") : 
         figname + ".pdf"
 
@@ -440,6 +464,7 @@ module CTioga2
       # applicable.
       t.tex_preamble += 
         "\n\\pdfinfo {\n#{title}/Creator(#{Utils::pdftex_quote_string("ctioga2 #{Version::version}")})\n}\n"
+
       return t
     end
 
@@ -542,6 +567,18 @@ the command {command: preamble} with the argument:
 
 @ \\usepackage[utf8]{inputenc}\\usepackage[T1]{fontenc}
 
+EOD
+
+    LatexFontCommand = 
+      Cmd.new("set-global-font",nil,"--set-global-font", 
+              [], Graphics::Styles::FullLatexFont.options_hash) do |plotmaker, opts|
+      plotmaker.latex_font.set_from_hash(opts)
+    end
+
+    LatexFontCommand.describe('Set global font details',
+                              <<EOD, LaTeXGroup)
+Set global font. Sets the size of everything, including that of text
+that has already been used.
 EOD
 
 

data/lib/ctioga2/utils.rb

@@ -30,11 +30,12 @@ module CTioga2
       end
     end
 
+
     # All files should use this function with the appropriate
     # arguments and have the Date and Revision svn:keyword:. Use this
     # way:
     #
-    #  Version::register_svn_info('$Revision: 424 $', '$Date: 2013-08-23 10:16:34 +0200 (Fri, 23 Aug 2013) $')
+    #  Version::register_svn_info('$Revision: 496 $', '$Date: 2013-09-04 21:31:56 +0200 (Wed, 04 Sep 2013) $')
     #
     # To set the correct properties, the following command-line can be
     # used:
@@ -74,7 +75,7 @@ module CTioga2
     }
 
     # The position of the URL, used for getting the version
-    SVN_URL = '$HeadURL: svn+ssh://rubyforge.org/var/svn/ctioga2/releases/ctioga2-0.5/lib/ctioga2/utils.rb $'
+    SVN_URL = '$HeadURL: svn+ssh://rubyforge.org/var/svn/ctioga2/releases/ctioga2-0.6/lib/ctioga2/utils.rb $'
     
     # The version of ctioga2
     CTIOGA_VERSION = if SVN_URL =~ /releases\/ctioga2-([^\/]+)/
@@ -83,7 +84,7 @@ module CTioga2
                        "SVN version"
                      end
 
-    register_svn_info('$Revision: 424 $', '$Date: 2013-08-23 10:16:34 +0200 (Fri, 23 Aug 2013) $')
+    register_svn_info('$Revision: 496 $', '$Date: 2013-09-04 21:31:56 +0200 (Wed, 04 Sep 2013) $')
 
   end
 
@@ -104,6 +105,16 @@ module CTioga2
       end
     end
 
+    # Converts a number to a float while trying to stay as lenient as
+    # possible
+    def self.txt_to_float(txt)
+      v = txt.to_f
+      if v == 0.0
+        return Float(txt)
+      end
+      return v
+    end
+
     # Takes two arrays of the same size (vectors) and mix them
     # a * r + b * (1 - r)
     def self.mix_objects(a,b,r)
@@ -130,6 +141,20 @@ module CTioga2
       end
     end
 
+    # Quotes a string so it can be included directly within a
+    # \pdfinfo statement (for instance).
+    def self.tex_quote_string(str)
+      return str.gsub(/([%#])|([{}~_^])|\\/) do 
+        if $1
+          "\\#{$1}"
+        elsif $2
+          "\\string#{$2}"
+        else                      # Quoting \
+          "\\string\\\\"
+        end
+      end
+    end
+
     # Binomial coefficients (for the smooth filter)
     def self.cnk(n,k)
       res = 1.0
@@ -185,9 +210,23 @@ module CTioga2
       end
       raise "Should not reach this !"
     end
-    
 
+
+    # Returns the smallest power of 10 within the given buffer
+    # (excluding 0 or anything really close). That is, if you multiply
+    # by 10 to the power what is returned, the smallest will be in the
+    # range 1-10.
+    def self.common_pow10(vect, method = :floor, tolerance = 1e-8)
+      a = vect.abs
+      a.sort!
+      while (a.size > 1) && (a.first < tolerance * a.last)
+        a.shift
+      end
+
+      return Math.log10(a.first).send(method)
+    end
   end
+    
 
   # This class implements a Hash whose values can also be retrieved by
   # pattern matching.
@@ -246,6 +285,20 @@ module CTioga2
 
 end
 
+######################################################################
+# Now come a few functions that add to ruby's standard classes or
+# modules
+
+module Math
+
+  # The absolute value, but in a more easy to use way
+  def abs(x)
+    return x.abs
+  end
+end
+
+
+
 # Here, we define an additional function in the Hash class: without
 class Hash
 
@@ -266,6 +319,45 @@ class Hash
 
 end
 
+
+class String
+  # Splits a string into substrings at the given regexp, but only if
+  # the splitting occurs at top-level with respect to parentheses.
+  def split_at_toplevel(regexp)
+    # Groups
+    grps = {} 
+    
+    sz = 0
+    s = self.dup
+    while true
+      s.gsub!(/\([^()]+\)/) do |x|
+        idx = grps.size
+        rep = "__#{idx}__"
+        grps[rep] = x
+        rep
+      end
+      if sz == grps.size
+        break
+      else
+        sz = grps.size
+      end
+    end
+    
+    splitted = s.split(regexp)
+    
+    while grps.size > 0
+      for s in splitted
+        s.gsub!(/__\d+__/) do |x|
+          rep = grps[x]
+          grps.delete(x)
+          rep
+        end
+      end
+    end
+    return splitted
+  end
+end
+
 begin
   # This is a dirty hack in order to ensure that the SVN revision
   # information is kept up-to-date even when using git-svn. This
@@ -273,3 +365,4 @@ begin
   require 'ctioga2/git-fools-svn'
 rescue LoadError => e
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ctioga2
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tioga
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.17'
 description: ! 'ctioga2 is a command-driven plotting program that produces
 
   high quality PDF files. It can be used both from the command-line
@@ -43,109 +43,111 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/ctioga2/data/indexed-dtable.rb
-- lib/ctioga2/data/datacolumn.rb
-- lib/ctioga2/data/point.rb
-- lib/ctioga2/data/stack.rb
-- lib/ctioga2/data/filters.rb
-- lib/ctioga2/data/dataset.rb
-- lib/ctioga2/data/backends/factory.rb
-- lib/ctioga2/data/backends/parameter.rb
-- lib/ctioga2/data/backends/description.rb
-- lib/ctioga2/data/backends/backends.rb
-- lib/ctioga2/data/backends/backend.rb
-- lib/ctioga2/data/backends/backends/math.rb
-- lib/ctioga2/data/backends/backends/text.rb
-- lib/ctioga2/data/backends/backends/gnuplot.rb
-- lib/ctioga2/data/backends/backends/direct.rb
-- lib/ctioga2/log.rb
-- lib/ctioga2/plotmaker.rb
+- lib/ctioga2/commands/variables.rb
+- lib/ctioga2/commands/groups.rb
+- lib/ctioga2/commands/strings.rb
+- lib/ctioga2/commands/interpreter.rb
 - lib/ctioga2/commands/type.rb
-- lib/ctioga2/commands/general-commands.rb
-- lib/ctioga2/commands/commands.rb
+- lib/ctioga2/commands/parsers/file.rb
+- lib/ctioga2/commands/parsers/old-file.rb
+- lib/ctioga2/commands/parsers/command-line.rb
+- lib/ctioga2/commands/doc/wordwrap.rb
 - lib/ctioga2/commands/doc/introspection.rb
 - lib/ctioga2/commands/doc/documentation-commands.rb
-- lib/ctioga2/commands/doc/help.rb
+- lib/ctioga2/commands/doc/man.rb
 - lib/ctioga2/commands/doc/markup.rb
 - lib/ctioga2/commands/doc/doc.rb
-- lib/ctioga2/commands/doc/wordwrap.rb
-- lib/ctioga2/commands/doc/man.rb
+- lib/ctioga2/commands/doc/help.rb
 - lib/ctioga2/commands/doc/html.rb
-- lib/ctioga2/commands/strings.rb
-- lib/ctioga2/commands/variables.rb
-- lib/ctioga2/commands/parsers/file.rb
-- lib/ctioga2/commands/parsers/command-line.rb
-- lib/ctioga2/commands/parsers/old-file.rb
-- lib/ctioga2/commands/context.rb
-- lib/ctioga2/commands/groups.rb
-- lib/ctioga2/commands/interpreter.rb
 - lib/ctioga2/commands/arguments.rb
+- lib/ctioga2/commands/context.rb
 - lib/ctioga2/commands/general-types.rb
-- lib/ctioga2/graphics/legends.rb
-- lib/ctioga2/graphics/styles/curve.rb
+- lib/ctioga2/commands/general-commands.rb
+- lib/ctioga2/commands/commands.rb
+- lib/ctioga2/postprocess.rb
+- lib/ctioga2/utils.rb
+- lib/ctioga2/graphics/types/dimensions.rb
+- lib/ctioga2/graphics/types/boundaries.rb
+- lib/ctioga2/graphics/types/location.rb
+- lib/ctioga2/graphics/types/grid.rb
+- lib/ctioga2/graphics/types/boxes.rb
+- lib/ctioga2/graphics/types/bijection.rb
+- lib/ctioga2/graphics/types/fill.rb
+- lib/ctioga2/graphics/types/point.rb
+- lib/ctioga2/graphics/coordinates.rb
+- lib/ctioga2/graphics/elements/redirecting-container.rb
+- lib/ctioga2/graphics/elements/parametric2d.rb
+- lib/ctioga2/graphics/elements/gradient-region.rb
+- lib/ctioga2/graphics/elements/region.rb
+- lib/ctioga2/graphics/elements/contour.rb
+- lib/ctioga2/graphics/elements/xyz-map.rb
+- lib/ctioga2/graphics/elements/tangent.rb
+- lib/ctioga2/graphics/elements/primitive.rb
+- lib/ctioga2/graphics/elements/element.rb
+- lib/ctioga2/graphics/elements/xyz-contour.rb
+- lib/ctioga2/graphics/elements/curve2d.rb
+- lib/ctioga2/graphics/elements/subplot.rb
+- lib/ctioga2/graphics/elements/containers.rb
+- lib/ctioga2/graphics/styles/arrows.rb
+- lib/ctioga2/graphics/styles/colormap.rb
+- lib/ctioga2/graphics/styles/box.rb
+- lib/ctioga2/graphics/styles/carrays.rb
+- lib/ctioga2/graphics/styles/location.rb
+- lib/ctioga2/graphics/styles/contour.rb
 - lib/ctioga2/graphics/styles/errorbar.rb
-- lib/ctioga2/graphics/styles/gradients.rb
+- lib/ctioga2/graphics/styles/sets.rb
+- lib/ctioga2/graphics/styles/texts.rb
+- lib/ctioga2/graphics/styles/plot.rb
 - lib/ctioga2/graphics/styles/factory.rb
 - lib/ctioga2/graphics/styles/sheet.rb
-- lib/ctioga2/graphics/styles/carrays.rb
-- lib/ctioga2/graphics/styles/location.rb
-- lib/ctioga2/graphics/styles/map-axes.rb
-- lib/ctioga2/graphics/styles/arrows.rb
-- lib/ctioga2/graphics/styles/drawable.rb
 - lib/ctioga2/graphics/styles/axes.rb
-- lib/ctioga2/graphics/styles/background.rb
 - lib/ctioga2/graphics/styles/base.rb
-- lib/ctioga2/graphics/styles/sets.rb
-- lib/ctioga2/graphics/styles/plot.rb
-- lib/ctioga2/graphics/styles/contour.rb
-- lib/ctioga2/graphics/styles/colormap.rb
-- lib/ctioga2/graphics/styles/texts.rb
+- lib/ctioga2/graphics/styles/gradients.rb
+- lib/ctioga2/graphics/styles/ticks.rb
 - lib/ctioga2/graphics/styles/legend.rb
-- lib/ctioga2/graphics/styles/box.rb
+- lib/ctioga2/graphics/styles/drawable.rb
+- lib/ctioga2/graphics/styles/background.rb
+- lib/ctioga2/graphics/styles/map-axes.rb
+- lib/ctioga2/graphics/styles/curve.rb
 - lib/ctioga2/graphics/styles.rb
-- lib/ctioga2/graphics/coordinates.rb
-- lib/ctioga2/graphics/legends/area.rb
-- lib/ctioga2/graphics/legends/items.rb
+- lib/ctioga2/graphics/elements.rb
+- lib/ctioga2/graphics/legends/provider.rb
 - lib/ctioga2/graphics/legends/storage.rb
+- lib/ctioga2/graphics/legends/items.rb
+- lib/ctioga2/graphics/legends/area.rb
 - lib/ctioga2/graphics/legends/multicols.rb
-- lib/ctioga2/graphics/legends/provider.rb
+- lib/ctioga2/graphics/legends.rb
+- lib/ctioga2/graphics/root.rb
 - lib/ctioga2/graphics/types.rb
-- lib/ctioga2/graphics/elements/subplot.rb
-- lib/ctioga2/graphics/elements/parametric2d.rb
-- lib/ctioga2/graphics/elements/redirecting-container.rb
-- lib/ctioga2/graphics/elements/primitive.rb
-- lib/ctioga2/graphics/elements/region.rb
-- lib/ctioga2/graphics/elements/curve2d.rb
-- lib/ctioga2/graphics/elements/containers.rb
-- lib/ctioga2/graphics/elements/tangent.rb
-- lib/ctioga2/graphics/elements/xyz-contour.rb
-- lib/ctioga2/graphics/elements/xyz-map.rb
-- lib/ctioga2/graphics/elements/contour.rb
-- lib/ctioga2/graphics/elements/gradient-region.rb
-- lib/ctioga2/graphics/elements/element.rb
-- lib/ctioga2/graphics/subplot-commands.rb
 - lib/ctioga2/graphics/generator.rb
-- lib/ctioga2/graphics/elements.rb
-- lib/ctioga2/graphics/types/bijection.rb
-- lib/ctioga2/graphics/types/location.rb
-- lib/ctioga2/graphics/types/dimensions.rb
-- lib/ctioga2/graphics/types/point.rb
-- lib/ctioga2/graphics/types/boundaries.rb
-- lib/ctioga2/graphics/types/boxes.rb
-- lib/ctioga2/graphics/types/grid.rb
-- lib/ctioga2/graphics/root.rb
-- lib/ctioga2/utils.rb
-- lib/ctioga2/postprocess.rb
-- lib/ctioga2/metabuilder/type.rb
-- lib/ctioga2/metabuilder/types.rb
-- lib/ctioga2/metabuilder/types/lists.rb
+- lib/ctioga2/graphics/subplot-commands.rb
+- lib/ctioga2/data/indexed-dtable.rb
+- lib/ctioga2/data/datacolumn.rb
+- lib/ctioga2/data/filters.rb
+- lib/ctioga2/data/stack.rb
+- lib/ctioga2/data/backends/backends.rb
+- lib/ctioga2/data/backends/backends/gnuplot.rb
+- lib/ctioga2/data/backends/backends/math.rb
+- lib/ctioga2/data/backends/backends/text.rb
+- lib/ctioga2/data/backends/backends/direct.rb
+- lib/ctioga2/data/backends/factory.rb
+- lib/ctioga2/data/backends/description.rb
+- lib/ctioga2/data/backends/parameter.rb
+- lib/ctioga2/data/backends/backend.rb
+- lib/ctioga2/data/dataset.rb
+- lib/ctioga2/data/point.rb
+- lib/ctioga2/log.rb
 - lib/ctioga2/metabuilder/types/dates.rb
-- lib/ctioga2/metabuilder/types/numbers.rb
-- lib/ctioga2/metabuilder/types/styles.rb
 - lib/ctioga2/metabuilder/types/strings.rb
 - lib/ctioga2/metabuilder/types/coordinates.rb
 - lib/ctioga2/metabuilder/types/data.rb
+- lib/ctioga2/metabuilder/types/styles.rb
+- lib/ctioga2/metabuilder/types/lists.rb
+- lib/ctioga2/metabuilder/types/numbers.rb
 - lib/ctioga2/metabuilder/types/generic.rb
+- lib/ctioga2/metabuilder/type.rb
+- lib/ctioga2/metabuilder/types.rb
+- lib/ctioga2/plotmaker.rb
 - COPYING
 - Changelog
 - setup.rb