livetext 0.8.89 → 0.8.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c66f92e4f5c190749d6e7c40a0d0229fee297d043e501e8977eaf60004d52275
-  data.tar.gz: be71a91b69bbdceb2792d68757abf4ba606bf1f5a68ed2cde3226373215a50ea
+  metadata.gz: 98d789586df6c883fa5084f610c44d94a492d883b296c0b06236fc462a7b8f5c
+  data.tar.gz: 1da6160f229fd2a8b99c37b06e1a87efcb476d342deac9bc18ff64a4b2074acb
 SHA512:
-  metadata.gz: 27320e87ca5f53288b2da97f616d63ba91392a182b702a07993f65f622bf9933f14b246d4c8225ab3f90306cdf8a2a3fad828da365c6395de69e8ea405459d02
-  data.tar.gz: 715129eabb7900a6342c4072ef280015df063579f0f16239dd816db83b4fb98596025917ac9ab1f3bf1e8116f3e7434e7a5357c294e7478531066ce92a2c74f8
+  metadata.gz: ac8c17b7b87bf29c252df478bbbf2c3bd2916ca697a89b32691381d98ed9759361235926483e2ed120695d1bb3bd86328806bd338cd3ed5118d07c7dba68501b
+  data.tar.gz: f2b8ddcd1112c99a724e0ef15a39ad03c144d8e1f31bf069b6eecd2073c983491f7cb35dcc6cbb50ffdbdf7ce0f3e87dc0ed2cc94b6c1450ac9c0d06206662ed

data/lib/formatline.rb

@@ -50,7 +50,7 @@ class FormatLine
     loop do 
       case curr
         when Escape; grab; add curr; grab; add curr
-puts "Found #{curr.inspect}"
+# puts "Found #{curr.inspect}"
         when "$"
           dollar
         when "*", "_", "`", "~"

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.89"
+  VERSION = "0.8.91"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -135,10 +135,6 @@ puts @body
 
   def process_file(fname, btrace=false)
     _setfile(fname)
-#   up = Dir.pwd
-#   Dir.chdir(File.dirname(fname))
-#   base = File.basename(fname)
-#   raise "No such file '#{fname}' to process" unless File.exist?(base)
     text = File.readlines(fname)
     enum = text.each
     @backtrace = btrace
@@ -149,7 +145,6 @@ puts @body
       process_line(line)
     end
     val = @main.finalize if @main.respond_to? :finalize
-#   Dir.chdir(up)
 return @body
     val
   rescue

data/lib/standard.rb

@@ -173,6 +173,7 @@ EOS
 
   def variables
     _body.each do |line|
+      next if line.strip.empty?
       var, val = line.split(" ", 2)
       val = FormatLine.var_func_parse(val)
       @parent._setvar(var, val)
@@ -223,13 +224,17 @@ EOS
     _optional_blank_line
   end
 
+  def in_out  # FIXME dumb name!
+    file, dest = *@_args
+    _check_existence(file, "No such include file '#{file}'")
+    @parent.process_file(file, dest)
+    _optional_blank_line
+  end
+
   def _include
     file = @_args.first
-STDERR.puts "In #{Dir.pwd}\n     - about to process #{file}\n"
-
     _check_existence(file, "No such include file '#{file}'")
     @parent.process_file(file)
-STDERR.puts "    ...finished"
     _optional_blank_line
   end
 

data/lib/userapi.rb

@@ -62,6 +62,7 @@ module Livetext::UserAPI
     @save_location = @sources.last
     loop do
       @line = nextline
+      break if @line.nil?
       break if @line.chomp.strip == tag
       lines << @line
     end
@@ -134,11 +135,14 @@ module Livetext::UserAPI
     _out line
   end
 
-  def _out(str = "")
+  def _out(str = "", file = nil)
     return if str.nil?
-# STDERR.puts "STR = #{str.inspect}"
-    @parent.body << str 
-    @parent.body << "\n" unless str.end_with?("\n")
+    if file.nil?   # FIXME  do this elsewhere?
+      @parent.body << str 
+      @parent.body << "\n" unless str.end_with?("\n")
+    else
+      file.puts str
+    end
   end
 
   def _out!(str = "")

metadata

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