livetext 0.8.71 → 0.8.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b9236cbbe00cda8fcaf0c3dd550204d03a241986f6e82cc3e4a848705ed5807
-  data.tar.gz: 46aa92b4fb6a3d1fe79f0fdd1fc3709ede6af67b636153fd2abdd10dc539be80
+  metadata.gz: 1bedb942f052436ccaec81e8f14ac61e4dacce9d7911b4bb3ee3c63a76a5e680
+  data.tar.gz: 39f7227e5e9f06a3be455b0f4cc0f64573b751fa0893912a9cf81edbca2d6a9d
 SHA512:
-  metadata.gz: 1c754d3461c7699c45dcbe84ce45fec8e0f9a77b4c56891b5dae5339bc9c18cbfab4bdca975845092a19549b5f3035eae3f19c3c5d7c5dda5a15e1e8db32d12c
-  data.tar.gz: 8054676d55ae1d01d332d7d319ce280f066706f78714866f74a4f12a4f48bde69784b030cd2dd3058c4aed8ec7b18bcd230b8094f6e4ef0cc662dbdc4f16a1d4
+  metadata.gz: 7ea613b9204fdc8f8190540a51e023bd26ec26e3bee675c6ab48a597a408a3e0b7769e2b703a10095cb2bf9909e7cf30fcb261b3d8368641f1128562ad1089b2
+  data.tar.gz: 8cdf9980c22d8bfead5853fe7b3e8f849826f2c1b6c798ff93d652489f61bb4ef03d65ddab179b8941542d5fe3a857667f62c2477a0529671219dbf8945806ae

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.71"
+  VERSION = "0.8.72"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -24,6 +24,7 @@ class Livetext
 
   attr_reader :main, :context
   attr_accessor :no_puts
+  attr_accessor :body
 
   class << self
     attr_accessor :parameters  # from outside world (process_text)
@@ -51,8 +52,7 @@ class Livetext
       @parent = parent
       @_nopass = false
       @_nopara = false
-      parent.no_puts = output.nil?
-      @body = ""  # not always used
+      # Meh?
       @output = ::Livetext.output = (output || File.open("/dev/null", "w"))
       @sources = []
     end
@@ -64,8 +64,7 @@ class Livetext
     def _error!(err, abort=true, trace=false)
       where = @sources.last || @save_location
       STDERR.puts "Error: #{err} (at #{where[1]} line #{where[2]})"
-#     STDERR.puts err.backtrace if @backtrace && err.respond_to?(:backtrace)
-      STDERR.puts err.backtrace if err.respond_to?(:backtrace)
+      STDERR.puts err.backtrace if trace && err.respond_to?(:backtrace)
       exit if abort
     end
 
@@ -108,6 +107,8 @@ class Livetext
     @source = nil
     @_mixins = []
     @_outdir = "."
+    @no_puts = output.nil?
+    @body = ""
     @main = Processor.new(self, output)
   end
 
@@ -128,23 +129,23 @@ class Livetext
     end
   end
 
-  def transform_line(line, context=nil)
-    context ||= binding
-    @context = context
-    sigil = "." # Can't change yet
-    nomarkup = true
-    # FIXME inefficient
-    scomment  = rx(sigil, Livetext::Space)  # apply these in order
-    sname     = rx(sigil)
-    if line =~ scomment
-      handle_scomment(line)
-    elsif line =~ sname 
-      handle_sname(line)
-    else
-      @body << line
-    end
-    result
-  end
+#   def transform_line(line, context=nil)
+#     context ||= binding
+#     @context = context
+#     sigil = "." # Can't change yet
+#     nomarkup = true
+#     # FIXME inefficient
+#     scomment  = rx(sigil, Livetext::Space)  # apply these in order
+#     sname     = rx(sigil)
+#     if line =~ scomment
+#       handle_scomment(line)
+#     elsif line =~ sname 
+#       handle_sname(line)
+#     else
+#       @body << line
+#     end
+#     result
+#   end
 
   def process(text)
     enum = text.each_line
@@ -157,7 +158,6 @@ class Livetext
   end
 
   def transform(text)
-    @body = ""
     @output = ::Livetext.output
     enum = text.each_line
     @main.source(enum, "STDIN", 0)

data/lib/userapi.rb

@@ -114,7 +114,7 @@ module Livetext::UserAPI
 
   def _out(str)
     if @no_puts
-      @body << str
+      @parent.body << str
     else
       _puts str
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.8.71
+  version: 0.8.72
 platform: ruby
 authors:
 - Hal Fulton