livetext 0.9.32 → 0.9.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6069fc394894011ca9f5ed2db3022b62a3a8c541c51566126551297e60eec74
-  data.tar.gz: b95803194c64a840262b4912e9116905c27a1879e4f6ec4309ae48404b31fa7e
+  metadata.gz: 4c6ed527394d333fd5c667d5737093c26595794269dcf444d72bc28cdcbf8c61
+  data.tar.gz: 7eb6d6907ebfd5bfd2ee7f8253a0c3a051d06cd83ffaac5baca388406168db6c
 SHA512:
-  metadata.gz: '046369b5d8a1c659fc210eea5134e79d9c8c0cfff0a2a833fff84b89001b115f4bd326fcf10cddcabc284e3abf964ad59e43330f7b4783dc4fba7d4255e66db9'
-  data.tar.gz: 20fb083bbd8d727c5e5774c784afa49f9a0edd58e339bdd4b7966916ffa94cbe335c6f702c841b67b75c053c88592b7b864eb9abef60aa96a9a949f5171769e0
+  metadata.gz: 57b37bb2795cacaa81f86f4d251d438b92dd8d0fd7f71839eb68edda95a4bf5d60a56af46d93d9ba93de118b7b878eea53f5daecab6459dd73a0167a5aba33d4
+  data.tar.gz: 7c7fb6ac4101629dd86b0901a961fc8d4c4901b661ff0eb8553081f7617601c7d807df03212ac57ab14b8c740a3a60efcfd3c2d951bea6b509f57a89170fa2b9

data/bin/livetext

@@ -66,7 +66,7 @@ end
 
 def install_plugin
   lib = ARGV.shift
-  system("cp #{lib} #{Livetext::Path}/../plugin/")
+  system("cp #{lib} #{Livetext::Path}/../../plugin/")
 end
 
 def parse_command_line

data/lib/livetext/formatter.rb

@@ -41,7 +41,6 @@ module Formatter
     end
 
     def grab_terminator
-      status("** grabterm 0")
       @state = :LOOPING
       # goes onto buffer by default
       # Don't? what if searching for space_marker?
@@ -73,7 +72,6 @@ module Formatter
     end
 
     def wrap(text)
-      status("** wrap 0")
       if text.empty?
         result = @marker
         result = "" if @marker[1] == "["
@@ -83,60 +81,45 @@ module Formatter
     end
     
     def initial
-      status("** init 0")
       n = @marker.length
       case
       when escape?
-        status("** esc i0")
         grab               # backslash
-        status("** esc i1")
         @buffer << grab    # char
-        status("** esc i2")
       when space_marker?
-        status("** init 1")
         @buffer << grab   # append the space
         grab(n)           # eat the marker
         @state = :CDATA
       when marker?
-        status("** init 2")
         grab(n)  # Eat the marker
         @state = :CDATA
       when eol?
-        status("** init 3")
         @state = :FINAL
       else
-        status("** init 4")
         @state = :BUFFER
       end
     end
 
     def buffer
-      status("** buffer 0")
       @buffer << grab
       @state = :LOOPING
     end
 
     def cdata
-      status("** cdata 0")
       case
       when eol?
-        status("** cdata 1")
         if @cdata.empty?
-          status("** cdata 2")
           @buffer << @marker unless @marker[1] == "["
         else
-          status("** cdata 3")
           @buffer << wrap(@cdata)
         end
         @state = :FINAL
       when terminated?
-        status("** cdata 4")
         @buffer << wrap(@cdata)
         grab_terminator    # "*a *b"  case???
         @cdata = ""
         @state = :LOOPING
       else
-        status("** cdata 5")
         @cdata << grab
         @state = :CDATA
       end
@@ -146,11 +129,8 @@ module Formatter
       n = @marker.length
       case
       when escape?
-        status("** esc l0")
         grab               # backslash
-        status("** esc l1")
         @buffer << grab    # char
-        status("** esc l2")
       when space_marker?
         @buffer << grab   # append the space
         grab(n)           # eat the marker

data/lib/livetext/more.rb

@@ -7,6 +7,7 @@ class Livetext
 
   class Variables
     attr_reader :vars
+
     def initialize(hash = {})
       @vars = {}
       hash.each_pair {|k, v| @vars[k.to_sym] = v }
@@ -34,6 +35,10 @@ class Livetext
         api.setvar(var, value)
       end
     end
+
+    def to_a
+      @vars.to_a
+    end
   end
 
   Vars = Variables.new
@@ -95,7 +100,10 @@ class Livetext
     obj = self.new
     mix  = Array(mix)
     call = Array(call)
-    mix.each {|lib| obj.mixin(lib) }
+# STDERR.puts "#{__method__}: obj meth = #{obj.methods.sort.inspect}"
+    mix.each do |lib| 
+      obj.invoke_dotcmd(:mixin, lib.dup)
+    end
     call.each {|cmd| obj.main.send(cmd[1..-1]) }  # ignores leading dot, no param
     # vars.each_pair {|var, val| obj.setvar(var, val.to_s) }
     obj.api.setvars(vars)

data/lib/livetext/standard.rb

@@ -173,7 +173,6 @@ module Livetext::Standard
       lines = api.body
     end
     pairs = Livetext::ParseGeneral.parse_vars(lines, prefix: nil)
-STDERR.puts "! pairs = #{pairs.inspect}"
     api.setvars(pairs)
     api.optional_blank_line
   end
@@ -189,7 +188,6 @@ STDERR.puts "! pairs = #{pairs.inspect}"
       lines = api.body
     end
     pairs = Livetext::ParseGeneral.parse_vars(lines, prefix: nil)
-STDERR.puts "pairs = #{pairs.inspect}"
     api.setvars(pairs)
     api.optional_blank_line
   end
@@ -217,7 +215,7 @@ STDERR.puts "pairs = #{pairs.inspect}"
   end
 
   def dot_include   # dot command
-    file = api.args.first # api.format(api.args.first)  # allows for variables
+    file = api.expand_variables(api.args.first)  # allows for variables
     check_file_exists(file)
     @parent.process_file(file)
     api.optional_blank_line

data/lib/livetext/userapi.rb

@@ -31,12 +31,26 @@ class Livetext::UserAPI
     @live
   end
 
+  def include_file(file)
+    api.data = file
+    api.dot_include
+  end
+
+  def expand_variables(str)
+    @expander.expand_variables(str)
+  end
+
+  def expand_functions(str)
+    @expander.expand_functions(str)
+  end
+
   def setvar(var, val)   # FIXME
     @live.vars.set(var, val)
   end
 
   def setvars(pairs)
-    pairs = pairs.to_a if pairs.is_a?(Hash)
+    # STDERR.puts "#{__method__}: pairs = #{pairs.inspect} (#{pairs.class})"
+    pairs = pairs.to_a   # could be Hash or Variables
     pairs.each do |var, value|
       @live.vars.set(var, value)
     end

data/lib/livetext/version.rb

@@ -2,5 +2,5 @@
 # Defining VERSION
 
 class Livetext
-  VERSION = "0.9.32"
+  VERSION = "0.9.33"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.32
+  version: 0.9.33
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com