rubyfca 0.2.6 → 0.2.7

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/bin/rubyfca

@@ -28,10 +28,10 @@ EOS
   opt :circle,  "Use circle shaped concept nodes", :default=> false
   opt :full, "Do not contract concept labels", :default=> false
   opt :legend, "Print the legend of concept nodes (available only when using circle node shape)", :default => false
-  opt :coloring, "Color concept nodes", :default => false
+  opt :coloring, "Color concept nodes [0 = none (default), 1 = lightblue/pink, 2 = monochrome]", :default => 0
   opt :straight, "Straighten edges (available when output format is either png, jpg, or eps)", :default => false
 end
-
+Trollop::die :coloring, "must be 0, 1, or 2" if (opts[:coloring] > 2 || opts[:coloring] < 0)
 ############### main program ############### 
 
 if ARGV.size != 2

data/lib/rubyfca.rb

@@ -371,10 +371,25 @@ class FormalContext
 
       attr_str = attrfull.join('<br />')
       attr_str = attr_str == "" ? "     " : attr_str
-      attr_color = (!opts[:coloring] || /\A\s+\z/ =~ attr_str) ? "white" : "lightblue"
+      
+      if opts[:coloring] == 0 or /\A\s+\z/ =~ attr_str
+        attr_color = "white"
+      elsif opts[:coloring] == 1
+        attr_color = "lightblue"
+      elsif opts[:coloring] == 2
+        attr_color = "gray87"
+      end
+      
       obj_str = objfull.join('<br />')
       obj_str = obj_str == "" ? "     " : obj_str
-      obj_color = (!opts[:coloring] || /\A\s+\z/ =~ obj_str) ? "white" : "pink"
+
+      if opts[:coloring] == 0 or /\A\s+\z/ =~ obj_str
+        obj_color = "white"
+      elsif opts[:coloring] == 1
+        obj_color = "pink"
+      elsif opts[:coloring] == 2
+        obj_color = "gray92"
+      end
 
       label = "<<table border=\"0\" cellborder=\"1\" cellspacing=\"0\">" + 
       "<tr><td balign=\"left\" align=\"left\" bgcolor=\"#{attr_color}\">#{attr_str}</td></tr>" +

data/rubyfca.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyfca}
-  s.version = "0.2.6"
+  s.version = "0.2.7"
   s.required_ruby_version = ">=1.8.6"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yoichiro Hasebe", "Kow Kuroda"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubyfca
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - Yoichiro Hasebe