livetext 0.9.26 → 0.9.31

data/lib/livetext/parser/set.rb

@@ -53,8 +53,9 @@ class Livetext::ParseSet < StringParser
     var = get_var
     skip_equal
     value = get_value
-    value = Livetext.interpolate(value)
+    # value = Livetext.interpolate(value)
     pair = [var, value]
+    Livetext::Vars[var.to_sym] = value
     pair
   end
 
@@ -115,10 +116,11 @@ class Livetext::ParseSet < StringParser
   end
 
   def unquoted_value
-    char = nil
     value = ""
+    char = nil
     loop do
       char = peek
+      break if char.nil?
       break if eos?
       break if char == " " || char == ","
       value << char
@@ -133,7 +135,12 @@ class Livetext::ParseSet < StringParser
 
   def get_value
     char = peek
-    value = quote?(char) ? quoted_value : unquoted_value
+    flag = quote?(char)
+    if flag
+      value = quoted_value 
+    else
+      value = unquoted_value
+    end
     value
   end
 end

data/lib/livetext/parser/string.rb

@@ -11,10 +11,12 @@ class StringParser
     @i = 0
   end
 
-  def grab
+  def grab(n = 1)
+    raise "n <= 0 for #grab" if n <= 0
     return nil if @eos
-    char = @line[@i]
-    @i += 1
+    i2 = @i + n - 1
+    char = @line[@i..i2]
+    @i += n
     check_eos
     char
   end
@@ -25,9 +27,14 @@ class StringParser
   end
 
   def lookahead
+    # Get rid of this?
     @line[@i + 1]
   end
 
+  def remainder
+    @line[@i..-1]
+  end
+
   def prev
     return nil if @i <= 0
     @line[@i-1]
@@ -37,9 +44,11 @@ class StringParser
     @eos
   end
 
-  def peek
+  def peek(n = 1)
+    raise "n <= 0 for #grab" if n <= 0
     return nil if @eos
-    @line[@i]
+    i2 = @i + n - 1
+    @line[@i..i2]
   end
 
   def skip_spaces

data/lib/livetext/processor.rb

@@ -35,12 +35,17 @@ class Processor
     @indentation = @parent.indentation
     @_mixins = []
     @_imports = []
+    @html = HTML.new(@parent.api)
   end
 
   def api
     @parent.api   # FIXME Is this weird??
   end
 
+  def html
+    @html
+  end
+
   def output=(io)
     @output = io
   end

data/lib/livetext/skeleton.rb

@@ -14,9 +14,5 @@ class Livetext
     end
   end
 
-  class FormatLine < StringParser
-    module FunCall
-    end
-  end
 end
 

data/lib/livetext/standard.rb

@@ -17,6 +17,8 @@ module Livetext::Standard
   include HTMLHelper
   include Livetext::Helpers
 
+  TTY = ::File.open("/dev/tty", "w")
+
   SimpleFormats =     # Move this?
    { b: %w[<b> </b>],
      i: %w[<i> </i>],
@@ -25,18 +27,19 @@ module Livetext::Standard
 
   attr_reader :data
 
-  def data=(val)    # FIXME this is weird, let's remove it soonish  and why are there two???
-# api.tty ">>>> in #{__FILE__}: api id = #{api.object_id}"
-    val = val.chomp
-    api.data = val
-    api.args = format(val).split rescue []
-    @mixins = []
-    @imports = []
-  end
+#   def data=(val)    # FIXME this is weird, let's remove it soonish  and why are there two???
+# # api.tty ">>>> in #{__FILE__}: api id = #{api.object_id}"
+#     val ||= ""
+#     val = val.chomp
+#     api.data = val
+#     api.args = format(val).split rescue []
+#     @mixins = []
+#     @imports = []
+#   end
 
   # dumb name - bold, italic, teletype, striketrough
 
-  def bits(args = nil, body = nil)   # FIXME umm what is this?
+  def bits   # FIXME umm what is this?
     b0, b1, i0, i1, t0, t1, s0, s1 = *api.args
     SimpleFormats[:b] = [b0, b1]
     SimpleFormats[:i] = [i0, i1]
@@ -45,28 +48,35 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def backtrace(args = nil, body = nil)
+#  def setvars(pairs)
+#    pairs.each do |var, value|
+#      api.setvar(var, value)
+#    end
+#  end
+
+  def backtrace
     @backtrace = onoff(api.args.first)
     api.optional_blank_line
   end
 
-  def comment(args = nil, body = nil)
+  def comment
     api.body
     api.optional_blank_line
   end
 
-  def shell(args = nil, body = nil)
+  def shell
     cmd = api.data
     system(cmd)
     api.optional_blank_line
   end
 
-  def func(args = nil, body = nil)
+  def func
     funcname = api.args[0]
-    check_disallowed(funcname)
+    # check_disallowed(funcname)  # should any be invalid?
+    funcname = funcname.gsub(/\./, "__")
     func_def = <<~EOS
       def #{funcname}(param)
-        #{api.body.to_a.join("\n")}
+        #{api.body(true).to_a.join("\n")}
       end
     EOS
     api.optional_blank_line
@@ -74,21 +84,21 @@ module Livetext::Standard
     return true
   end
 
-  def h1(args = nil, body = nil); api.out wrapped(api.data, :h1); return true; end
-  def h2(args = nil, body = nil); api.out wrapped(api.data, :h2); return true; end
-  def h3(args = nil, body = nil); api.out wrapped(api.data, :h3); return true; end
-  def h4(args = nil, body = nil); api.out wrapped(api.data, :h4); return true; end
-  def h5(args = nil, body = nil); api.out wrapped(api.data, :h5); return true; end
-  def h6(args = nil, body = nil); api.out wrapped(api.data, :h6); return true; end
+  def h1; api.out wrapped(api.data, :h1); return true; end
+  def h2; api.out wrapped(api.data, :h2); return true; end
+  def h3; api.out wrapped(api.data, :h3); return true; end
+  def h4; api.out wrapped(api.data, :h4); return true; end
+  def h5; api.out wrapped(api.data, :h5); return true; end
+  def h6; api.out wrapped(api.data, :h6); return true; end
 
-  def list(args = nil, body = nil)
+  def list
     wrap :ul do
       api.body {|line| api.out wrapped(line, :li) }
     end
     api.optional_blank_line
   end
 
-  def list!(args = nil, body = nil)
+  def list!
     wrap(:ul) do
       lines = api.body.each   # enumerator
       loop do
@@ -101,40 +111,40 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def shell!(args = nil, body = nil)
+  def shell!
     cmd = api.data
     system(cmd)
     api.optional_blank_line
   end
 
-  def errout(args = nil, body = nil)
+  def errout
     ::STDERR.puts api.data
     api.optional_blank_line
   end
 
-  def ttyout(args = nil, body = nil)
+  def ttyout
     TTY.puts api.data
     api.optional_blank_line
   end
 
-  def say(args = nil, body = nil)
+  def say
     str = api.format(api.data)
     TTY.puts str
     api.optional_blank_line
   end
 
-  def banner(args = nil, body = nil)
+  def banner
     str = api.format(api.data)
     num = str.length
     decor = "-"*num + "\n"
     puts decor + str + "\n" + decor
   end
 
-  def quit(args = nil, body = nil)
+  def quit
     @output.close
   end
 
-  def cleanup(args = nil, body = nil)
+  def cleanup
     api.args.each do |item|
       cmd = ::File.directory?(item) ? "rm -f #{item}/*" : "rm #{item}"
       system(cmd)
@@ -142,7 +152,7 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def dot_def(args = nil, body = nil)
+  def dot_def
 # api.tty "in #{__FILE__}: api id = #{api.inspect}"
     name = api.args[0]
 # api.tty :dd1
@@ -157,16 +167,16 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def set(args = nil, body = nil)
-    line = api.data.chomp
+  def set
+    line = api.args.join(" ")  # data.chomp
     pairs = Livetext::ParseSet.new(line).parse
-    set_variables(pairs)
+    api.setvars(pairs)
     api.optional_blank_line
   end
 
   # FIXME really these should be one method...
 
-  def variables!(args = nil, body = nil)  # cwd, not FileDir - weird, fix later
+  def variables!  # cwd, not FileDir - weird, fix later
     prefix = api.args[0]
     file = api.args[1]
     prefix = nil if prefix == "-"  # FIXME dumb hack
@@ -177,11 +187,12 @@ module Livetext::Standard
       lines = api.body
     end
     pairs = Livetext::ParseGeneral.parse_vars(lines, prefix: nil)
-    set_variables(pairs)
+STDERR.puts "! pairs = #{pairs.inspect}"
+    api.setvars(pairs)
     api.optional_blank_line
   end
 
-  def variables(args = nil, body = nil)
+  def variables
     prefix = api.args[0]
     file = api.args[1]
     prefix = nil if prefix == "-"  # FIXME dumb hack
@@ -192,11 +203,12 @@ module Livetext::Standard
       lines = api.body
     end
     pairs = Livetext::ParseGeneral.parse_vars(lines, prefix: nil)
-    set_variables(pairs)
+STDERR.puts "pairs = #{pairs.inspect}"
+    api.setvars(pairs)
     api.optional_blank_line
   end
 
-  def heredoc(args = nil, body = nil)
+  def heredoc
     var = api.args[0]
     text = api.body.join("\n")
     rhs = ""
@@ -207,11 +219,10 @@ module Livetext::Standard
     indent = @parent.indentation.last
     indented = " " * indent
     api.setvar(var, rhs.chomp)
-#   @parent.setvar(var, rhs.chomp)
     api.optional_blank_line
   end
 
-  def seek(args = nil, body = nil)    # like include, but search upward as needed
+  def seek    # like include, but search upward as needed
     file = api.args.first
 		file = search_upward(file)
     check_file_exists(file)
@@ -219,14 +230,14 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def dot_include(args = nil, body = nil)   # dot command
-    file = api.format(api.args.first)  # allows for variables
+  def dot_include   # dot command
+    file = api.args.first # api.format(api.args.first)  # allows for variables
     check_file_exists(file)
     @parent.process_file(file)
     api.optional_blank_line
   end
 
-  def inherit(args = nil, body = nil)
+  def inherit
     file = api.args.first
     upper = "../#{file}"
     got_upper, got_file = File.exist?(upper), File.exist?(file)
@@ -238,8 +249,9 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def mixin(args = nil, body = nil)
+  def mixin
     name = api.args.first   # Expect a module name
+    @mixins ||= []
     return if @mixins.include?(name)
     @mixins << name
     mod = Livetext::Handler::Mixin.get_module(name, @parent)
@@ -249,8 +261,9 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def import(args = nil, body = nil)
+  def import
     name = api.args.first   # Expect a module name
+    @imports ||= []
     return if @imports.include?(name)
     @imports << name
     mod = Livetext::Handler::Import.get_module(name, @parent)
@@ -260,7 +273,7 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def copy(args = nil, body = nil)
+  def copy
     file = api.args.first
     ok = check_file_exists(file)
 
@@ -270,65 +283,67 @@ module Livetext::Standard
     [ok, file]
   end
 
-  def r(args = nil, body = nil)
-    api.out api.data  # No processing at all
+  def r
+    # FIXME api.data is broken
+    # api.out api.data  # No processing at all
+    api.out api.args.join(" ")
     api.optional_blank_line
   end
 
-  def raw(args = nil, body = nil)
+  def raw
     # No processing at all (terminate with __EOF__)
     api.raw_body {|line| api.out line }  # no formatting
     api.optional_blank_line
   end
 
-  def debug(args = nil, body = nil)
+  def debug
     self._debug = onoff(api.args.first)
     api.optional_blank_line
   end
 
-  def passthru(args = nil, body = nil)
+  def passthru
     # FIXME - add check for args size? (helpers)
     @nopass = ! onoff(api.args.first)
     api.optional_blank_line
   end
 
-  def nopass(args = nil, body = nil)
+  def nopass
     @nopass = true
     api.optional_blank_line
   end
 
-  def para(args = nil, body = nil)
+  def para
     # FIXME - add check for args size? (helpers)
     @nopara = ! onoff(api.args.first)
     api.optional_blank_line
   end
 
-  def nopara(args = nil, body = nil)
+  def nopara
     @nopara = true
     api.optional_blank_line
   end
 
-  def heading(args = nil, body = nil)
+  def heading
     api.print "<center><font size=+1><b>"
     api.print api.data
     api.print "</b></font></center>"
     api.optional_blank_line
   end
 
-  def newpage(args = nil, body = nil)
+  def newpage
     api.out '<p style="page-break-after:always;"></p>'
     api.out "<p/>"
     api.optional_blank_line
   end
 
-  def mono(args = nil, body = nil)
+  def mono
     wrap ":pre" do
       api.body(true) {|line| api.out line }
     end
     api.optional_blank_line
   end
 
-  def dlist(args = nil, body = nil)
+  def dlist
     delim = api.args.first
     wrap(:dl) do
       api.body do |line|
@@ -341,14 +356,14 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def link(args = nil, body = nil)
+  def link
     url = api.args.first
     text = api.args[2..-1].join(" ")
     api.out "<a style='text-decoration: none' href='#{url}'>#{text}</a>"
     api.optional_blank_line
   end
 
-  def xtable(args = nil, body = nil)   # Borrowed from bookish - FIXME
+  def xtable   # Borrowed from bookish - FIXME
 # TTY.puts "=== #{__method__} #{__FILE__} #{__LINE__}"
     title = api.data
     delim = " :: "
@@ -379,13 +394,13 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def image(args = nil, body = nil)
+  def image
     name = api.args[0]
     api.out "<img src='#{name}'></img>"
     api.optional_blank_line
   end
 
-  def br(args = nil, body = nil)
+  def br
     num = api.args.first || "1"
     str = ""
     num.to_i.times { str << "<br>" }

data/lib/livetext/userapi.rb

@@ -1,6 +1,5 @@
-
-# require_relative 'formatline'   # FIXME  meh, because of #format
-require_relative 'lineparser'     # FIXME  meh, because of #format
+require_relative 'expansion'
+require_relative 'html'
 
 # Encapsulate the UserAPI as a class
 
@@ -16,18 +15,32 @@ class Livetext::UserAPI
   def initialize(live)
     @live = live
     @vars = live.vars
+    @html = HTML.new(self)
+    @expander = Livetext::Expansion.new(live)
   end
 
   def api
     @live.api
   end
 
+  def html
+    @html
+  end
+
   def dot
     @live
   end
 
-  def setvar(var, val)
-    Livetext::Vars[var] = val  # Now indifferent and "safe"
+  def setvar(var, val)   # FIXME
+    # Livetext::Vars[var] = val  # Now indifferent and "safe"
+    @live.vars.set(var, val)
+  end
+
+  def setvars(pairs)
+    pairs = pairs.to_a if pairs.is_a?(Hash)
+    pairs.each do |var, value|
+      @live.vars.set(var, value)
+    end
   end
 
   def check_existence(file, msg)
@@ -35,19 +48,22 @@ class Livetext::UserAPI
   end
 
   def data=(value)
-# TTY.puts "in #{__FILE__}: api = #{@live.api.inspect}"
-    @data = value
+    @data = value.dup
     @args = format(@data).chomp.split
   end
 
+  def data
+    @data
+  end
+
   def args
     return @args unless block_given?
     @args.each {|arg| yield arg }
   end
 
-  def vars
-    @vars
-  end
+ def vars
+   @vars
+ end
 
   def optional_blank_line
     peek = @live.peek_nextline  # ???
@@ -88,17 +104,29 @@ class Livetext::UserAPI
     lines = []
     end_found = false
     loop do
+# TTY.puts "BODY 0: @line = #{@line.inspect}"
       @line = @live.nextline
+# TTY.puts "BODY 1: @line = #{@line.inspect}"
       break if @line.nil?
+# TTY.puts "BODY 2: @line = #{@line.inspect}"
       @line.chomp!
+# TTY.puts "BODY 3: @line = #{@line.inspect}"
       break if end?(@line)
+# TTY.puts "BODY 4: @line = #{@line.inspect}"
       next if comment?(@line)
+# TTY.puts "BODY 5: @line = #{@line.inspect}"
       @line = format(@line) unless raw
-      lines << @line 
+# TTY.puts "BODY 6: @line = #{@line.inspect}"
+      lines << @line
+# TTY.puts "BODY 7: @line = #{@line.inspect}"
     end
+# TTY.puts "BODY 8: lines = #{lines.inspect}"
     raise "Expected .end, found end of file" unless end?(@line)  # use custom exception
+# TTY.puts "BODY 9: lines = #{lines.inspect}"
     optional_blank_line   # FIXME Delete this??
+# TTY.puts "BODY A: lines = #{lines.inspect}"
     return lines unless block_given?
+# TTY.puts "BODY B: lines = #{lines.inspect}"
     lines.each {|line| yield line }   # FIXME what about $. ?
   end
 
@@ -119,22 +147,27 @@ class Livetext::UserAPI
   end
 
   def format(line)
-    return "" if line == "\n" || line.nil?
-    line2 = Livetext::LineParser.parse!(line)
+    line2 = @expander.format(line)
     line2
   end
 
   def passthru(line)
     return if @live.nopass
-    out "<p>" if line == "\n" and ! @live.nopara
-    line = format(line)
-    out line
+    if line == "\n"
+      unless @live.nopara
+        out "<p>" 
+        out
+      end
+    else
+      text = @expander.format(line.chomp)
+      out text
+    end
   end
 
   def out(str = "", file = nil)
     return if str.nil?
     return file.puts str unless file.nil?
-    @live.body << str 
+    @live.body << str
     @live.body << "\n" unless str.end_with?("\n")
   end
 
@@ -151,11 +184,11 @@ class Livetext::UserAPI
   end
 
   def puts(*args)
-    @live.output.puts *args 
+    @live.output.puts *args
   end
 
   def print(*args)
-    @live.output.print *args 
+    @live.output.print *args
   end
 
   def debug=(val)

data/lib/livetext/version.rb

@@ -2,5 +2,5 @@
 # Defining VERSION
 
 class Livetext
-  VERSION = "0.9.26"
+  VERSION = "0.9.31"
 end

data/lib/livetext.rb

@@ -9,8 +9,7 @@ require_relative 'livetext/errors'
 require_relative 'livetext/standard'
 require_relative 'livetext/functions'
 require_relative 'livetext/userapi'
-# require_relative 'livetext/formatline'
-require_relative 'livetext/lineparser'
+require_relative 'livetext/formatter'
 require_relative 'livetext/processor'
 require_relative 'livetext/helpers'
 require_relative 'livetext/handler'

data/plugin/bookish.rb

@@ -173,7 +173,7 @@ def simple_table(args = nil, body = nil)
   lines = api.body(true)
   maxw = nil
   lines.each do |line|
-    api.format(line)
+    # api.format(line)
     cells = line.split(delim)
     wide = cells.map {|x| x.length }
     maxw = [0] * cells.size