livetext 0.8.87 → 0.8.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ee705b74c12263a3020cd814da619d81c371a9d59f743c2111045d96f9fd7b6
-  data.tar.gz: 9e600b7b9129c209cd076cf5c4d2f9c02cc20168ad3b748fa56615d56784bc49
+  metadata.gz: d581f4bdb4eb60d5a74be2f601cdd140428cfa781c1ad41047ad7e8372e9a526
+  data.tar.gz: 875be8550e6b0bb65aafe39d56457ccd19825fdf71b9ace4c0079e505b7896b8
 SHA512:
-  metadata.gz: edf421e51e7c6f7909bbe4886e464b87cf291fd48a1fdbdef07e59b3209c116cec251cafb990497e9c8d9bc75887ca1f46df87a40ff21b1c736fef12023899b7
-  data.tar.gz: 1a0710996604c583fcce4ef87d65d58a61b98c4dabb8e4df4c2f91995a162e2d6e8c8bf3d93613771789dd98492a5881baa3cc3d8c3b2120011ccb172e06cfaf
+  metadata.gz: 3c7f9858cdb40eb009d4c3f1951ea92b88ad91b9251c8cbac4cfa445d36b81d883dbb18ee94bc3c8a27842febb3ff82cd0439500db470c5f4441342d65f25fae
+  data.tar.gz: 0d89365d60e1c3375af7d1f34a819691fc5799e9490f3853587d5bad61be0c4cf2684f19bbafe8fd8abf284ae36ca47b71ad796313eabf1f49b59ede02a85972

data/bin/livetext

@@ -8,12 +8,6 @@ def handle_lt3(src)
   abort "Unknown file extension" unless src =~ /.lt3$/
 end
 
-# Main
-
-x = Livetext.new
-
-@backtrace = false
-
 def usage
   puts <<-EOF
   Usage: 
@@ -52,6 +46,12 @@ def usage
   exit
 end
 
+# Main
+
+x = Livetext.new
+
+@backtrace = false
+
 usage if ARGV.empty?
 
 loop do
@@ -79,7 +79,7 @@ loop do
       lib = ARGV.shift
       system("cp #{lib} #{Livetext::Path}/../plugin/")
     when Object
-      x.process_file(arg)  # , @backtrace)
+      x.process_file(arg, true)  # , @backtrace)
   end
 end
 

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.87"
+  VERSION = "0.8.88"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -127,20 +127,21 @@ class Livetext
     puts "process_text: err = #{err}"
 #   puts err.backtrace.join("\n")
 puts @body
+@body = ""
     return @body
   end
 
 ## FIXME process_file[!] should call process[_text]
 
-  def process_file(fname)
+  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(base)
+#   base = File.basename(fname)
+#   raise "No such file '#{fname}' to process" unless File.exist?(base)
+    text = File.readlines(fname)
     enum = text.each
-    @backtrace = false
+    @backtrace = btrace
     @main.source(enum, fname, 0)
     loop do 
       line = @main.nextline
@@ -153,6 +154,7 @@ return @body
     val
   rescue
     puts @body
+    @body = ""
   end
 
   def process_file!(fname, backtrace=false)
@@ -206,6 +208,7 @@ return @body
   rescue => err
     @main._error!(err)
 puts @body
+@body = ""
     return @body
   end
 

data/lib/processor.rb

@@ -36,7 +36,7 @@ class Livetext
 #     puts "-- body = "
       puts @parent.body
       STDERR.puts "Error: #{err} (at #{where[1]} line #{where[2]})"
-      STDERR.puts err.backtrace if err.respond_to?(:backtrace) && trace
+      STDERR.puts err.backtrace if err.respond_to?(:backtrace) # && trace
       exit if abort
     end
 

data/lib/standard.rb

@@ -73,53 +73,58 @@ EOS
   end
 
   def quit
+    puts @body
+    @body = ""
     @output.close
-    exit
+#   exit!
   end
 
-  def outdir
-    @_outdir = @_args.first
-    _optional_blank_line
-  end
-
-  def outdir!  # FIXME ?
-    @_outdir = @_args.first
-    raise "No output directory specified" if @_outdir.nil?
-    raise "No output directory specified" if @_outdir.empty?
-    system("rm -f #@_outdir/*.html")
-    _optional_blank_line
-  end
-
-  def _output(name)
-    @_outdir ||= "."  # FIXME
-    @output.close unless @output == STDOUT
-    @output = File.open(@_outdir + "/" + name, "w")
-    @output.puts "<meta charset='UTF-8'>\n\n"
-  end
-
-  def _append(name)
-    @_outdir ||= "."  # FIXME
-    @output.close unless @output == STDOUT
-    @output = File.open(@_outdir + "/" + name, "a")
-    @output.puts "<meta charset='UTF-8'>\n\n"
-  end
-
-  def output
-    name = @_args.first
-    _debug "Redirecting output to: #{name}"
-    _output(name)
-  end
-
-  def append
-    file = @_args[0]
-    _append(file)
-  end
-
-  def next_output
-    tag, num = @_args
-    _next_output(tag, num)
-    _optional_blank_line
-  end
+#   def outdir
+#     @_outdir = @_args.first
+#     _optional_blank_line
+#   end
+# 
+#   def outdir!  # FIXME ?
+#     @_outdir = @_args.first
+#     raise "No output directory specified" if @_outdir.nil?
+#     raise "No output directory specified" if @_outdir.empty?
+#     system("rm -f #@_outdir/*.html")
+#     _optional_blank_line
+#   end
+# 
+#   def _output(name)
+#     @_outdir ||= "."  # FIXME
+#     @output.puts @body
+#     @body = ""
+#     @output.close unless @output == STDOUT
+#     @output = File.open(@_outdir + "/" + name, "w")
+#     @output.puts "<meta charset='UTF-8'>\n\n"
+#   end
+# 
+#   def _append(name)
+#     @_outdir ||= "."  # FIXME
+#     @output.close unless @output == STDOUT
+#     @output = File.open(@_outdir + "/" + name, "a")
+#     @output.puts "<meta charset='UTF-8'>\n\n"
+#   end
+# 
+#   def output
+#     name = @_args.first
+#     _debug "Redirecting output to: #{name}"
+#     _output(name)
+#   end
+# 
+#   def append
+#     file = @_args[0]
+#     _append(file)
+#   end
+# 
+#   def next_output
+#     tag, num = @_args
+#     _next_output(tag, num)
+#     _optional_blank_line
+#   end
+# 
 
   def cleanup
     @_args.each do |item| 
@@ -131,12 +136,12 @@ EOS
     end
   end
 
-  def _next_output(tag = "sec", num = nil)
-    @_file_num = num ? num : @_file_num + 1
-    @_file_num = @_file_num.to_i
-    name = "#{'%03d' % @_file_num}-#{tag}.html"
-    _output(name)
-  end
+#   def _next_output(tag = "sec", num = nil)
+#     @_file_num = num ? num : @_file_num + 1
+#     @_file_num = @_file_num.to_i
+#     name = "#{'%03d' % @_file_num}-#{tag}.html"
+#     _output(name)
+#   end
 
   def _def
     name = @_args[0]
@@ -212,9 +217,11 @@ EOS
 
   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
 
@@ -250,7 +257,9 @@ EOS
         Dir.chdir("..") { mixin }
         return
       else
-        raise "No such mixin '#{name}"
+        STDERR.puts "No such mixin '#{name}"
+        puts @body
+        exit!
       end
     end
 

data/lib/userapi.rb

@@ -136,6 +136,7 @@ module Livetext::UserAPI
 
   def _out(str = "")
     return if str.nil?
+STDERR.puts "STR = #{str.inspect}"
     @parent.body << str 
     @parent.body << "\n" unless str.end_with?("\n")
   end

data/plugin/bookish.rb

@@ -223,6 +223,7 @@ def toc!
   @toc.close
 rescue => err
    puts @body
+   @body = ""
   _errout "Exception: #{err.inspect}"
 end
 
@@ -259,7 +260,7 @@ end
 
 def quote
   _out "<blockquote>"
-  _out _body
+  _body {|line| _out line }
   _out "</blockquote>"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.8.87
+  version: 0.8.88
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-11 00:00:00.000000000 Z
+date: 2019-09-14 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -149,8 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: A smart processor for text