xrpn 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bc359eaf9eff213e3dc7ff0050fdaec73ccbf89990312534e425e6c2f11fb7d
-  data.tar.gz: f7dfcb8196f206f0636c9bfbde3b77d0939190a86ff9c8b253af9140beaf48fc
+  metadata.gz: 16c34e199fb1fbc49a70873a0f8c5ac5138428455ea901fbd75078521763386b
+  data.tar.gz: 86408ca6f73171ea22f769b565687bb69f01ddea7764b70057a25e5110766901
 SHA512:
-  metadata.gz: 7d9d3802c169f108379c88652c44be78b26930f94c6d3d5447f945983307bfd639daa2944c4df4b4b2a008c197d10d7f1df9b3cdfb7cedcbea251db725253e07
-  data.tar.gz: a5539c1057a057e1023f5ab742bfc71055027b1acf3d61818f2c3c75bbaf3fd47f8b7b851b1061f1a6455a0d22b38288e2785d6500d7cdb4569421e2154163a1
+  metadata.gz: 1b65935bac23d27df1ecde41dc16f4e488cd5a141a7e56de6f18c47df42a21b8239f516871534667227da269767369627a1c3030ac2321eb6c1adf475d31ff58
+  data.tar.gz: ad965154e4811e44e57fa88e4185caa7aba1c79e24cd56c54eca1596c753d7c9141efde3e7164f559dd7054b89fb459621c9f648cbae0db08f5d58b7ead08958

data/bin/xrpn

@@ -37,9 +37,7 @@ if $lfile                                               # Read file to load but
 end
 read_state($sfile) if $sfile                            # Read state file in ~.xrpn/ if -s switch is used
 $debug = true      if $lfile or $sfile                  # Do not run loaded program or program in state file
-load(Dir.home+'/.xrpn/xlib/theme_dark')  if File.exist?(Dir.home+'/.xrpn/lib/theme_dark') # Read theme file
-load(Dir.home+'/.xrpn/conf')             if File.exist?(Dir.home+'/.xrpn/conf')           # Read config file
-load(Dir.home+'/.xrpn/xlib/theme_light') if $theme == "light" and File.exist?(Dir.home+'/.xrpn/xlib/theme_light') # Read theme file
+load(Dir.home+'/.xrpn/conf')  if File.exist?(Dir.home+'/.xrpn/conf')  # Read config file
 load(Dir.home+'/.xrpn/theme') if File.exist?(Dir.home+'/.xrpn/theme') # Override theme if user theme file exists
 
 

data/lib/xrpn.rb

@@ -1,3 +1,2 @@
-puts "Loading..."
-Dir[__dir__ + "/../xlib/*"].each { |file| load file }
 Dir[__dir__ + "/../xcmd/*"].each { |file| load file }
+Dir[__dir__ + "/../xlib/*"].each { |file| load file }

data/xlib/theme

@@ -0,0 +1,23 @@
+def theme(t ="dark")
+  if t == "light"
+    $colors = {
+      "X" => 232,
+      "Y" => 241,
+      "Z" => 244,
+      "T" => 247,
+      "L" => 130,
+      "A" =>  39
+    }
+  else
+    $colors = {
+      "X" => 255,
+      "Y" => 246,
+      "Z" => 243,
+      "T" => 240,
+      "L" => 130,
+      "A" =>  39
+    }
+  end
+end
+
+# vim:ft=ruby:

data/xrpn.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'xrpn'
-  s.version     = '1.1.7'
+  s.version     = '1.1.8'
   s.licenses    = ['Unlicense']
   s.summary     = "XRPN - The eXtended RPN (Reverse Polish Notation) programming language"
   s.description = "A full programming language and environment extending the features of the venerable HP calculator programmable calculators. With XRPN you can accomplish a wide range of modern programming tasks as well as running existing HP-41 FOCAL programs directly. XRPN gives modern life to tens of thousands of old HP calculator programs and opens the possibilities to many, many more."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xrpn
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Geir Isene
@@ -320,8 +320,7 @@ files:
 - xlib/save_xm
 - xlib/setpt
 - xlib/string
-- xlib/theme_dark
-- xlib/theme_light
+- xlib/theme
 - xlib/xrpn_class
 - xrpn.gemspec
 homepage: https://github.com/isene/XRPN

data/xlib/theme_dark

@@ -1,10 +0,0 @@
-$colors = {
-  "X" => 255,
-  "Y" => 246,
-  "Z" => 243,
-  "T" => 240,
-  "L" => 130,
-  "A" =>  39
-}
- 
-# vim:ft=ruby:

data/xlib/theme_light

@@ -1,10 +0,0 @@
-$colors = {
-  "X" => 232,
-  "Y" => 241,
-  "Z" => 244,
-  "T" => 247,
-  "L" => 130,
-  "A" =>  39
-}
- 
-# vim:ft=ruby: