livetext 0.9.13 → 0.9.19

data/lib/parser/string.rb

@@ -5,14 +5,13 @@ class StringParser
   def initialize(line)
     raise NilValue if line.nil?
     raise ExpectedString unless String === line
-#   raise NullString if line.empty?
     @line = line
     @len = @line.length
     @eos = @len == 0 ? true : false
     @i = 0
   end
 
-  def next
+  def grab
     return nil if @eos
     char = @line[@i]
     @i += 1
@@ -20,6 +19,19 @@ class StringParser
     char
   end
 
+  def ungrab
+    @i -= 1    # FIXME what about eos...?
+  end
+
+  def next!
+    @line[@i + 1]
+  end
+
+  def prev
+    return nil if @i <= 0
+    @line[@i-1]
+  end
+
   def last?
     @i > @len - 1
   end
@@ -35,11 +47,14 @@ class StringParser
   end
 
   def skip_spaces
+    char = nil
     loop do
-      break if peek != " "
+      char = peek
       break if eos?
-      self.next
+      break if char != " "
+      grab
     end
+    char
   end
 
 end

data/lib/processor.rb

@@ -40,16 +40,12 @@ class Livetext
 
     def _error!(err, raise_error=false, trace=false)   # FIXME much bullshit happens here
       where = @sources.last || @save_location
-      # puts @parent.body
-      # puts "[lib/processor] Error: #{err}"
-      # puts err.backtrace.join("\n") if err.respond_to?(:backtrace)
-      STDERR.puts "Error: #{err}"  #  (at #{where[1]} line #{where[2]})"
+      STDERR.puts "Error: #{err} (at #{where[1]} line #{where[2]})"
       STDERR.puts err.backtrace if err.respond_to?(:backtrace) # && trace
-      # raise "lib/processor error!" # FIXME
       raise GenericError.new("Error: #{err}") if raise_error
     end
 
-    def _disallowed?(name)
+    def disallowed?(name)
       Disallowed.include?(name.to_sym)
     end
 
@@ -75,11 +71,5 @@ class Livetext
       @sources.pop
       nil
     end
-
-    def grab_file(fname)
-      File.read(fname)
-    end
-
   end
-
 end

data/lib/standard.rb

@@ -5,8 +5,8 @@ require_relative 'html'
 require_relative 'helpers'
 
 make_exception(:ExpectedOnOff,    "Error: expected 'on' or 'off'")
-make_exception(:DisallowedName,   "Error: name %1 is invalid")
-make_exception(:FileNotFound,     "Error: file %1 not found")
+make_exception(:DisallowedName,   "Error: name '%1' is invalid")
+make_exception(:FileNotFound,     "Error: file '%1' not found")
 
 
 # Module Standard comprises most of the standard or "common" methods.
@@ -24,13 +24,14 @@ module Livetext::Standard
 
   attr_reader :_data
 
-  def data=(val)    # FIXME this is weird, let's not do it
+  def data=(val)    # FIXME this is weird, let's remove it soonish
     @_data = val.chomp
     @_args = val.split rescue []
     @_mixins = []
   end
 
-  def bits  # dumb name - bold, italic, teletype, striketrough
+  # dumb name - bold, italic, teletype, striketrough
+  def bits(args = nil, body = nil)
     b0, b1, i0, i1, t0, t1, s0, s1 = *@_args
     SimpleFormats[:b] = [b0, b1]
     SimpleFormats[:i] = [i0, i1]
@@ -38,23 +39,23 @@ module Livetext::Standard
     SimpleFormats[:s] = [s0, s1]
   end
 
-  def backtrace
+  def backtrace(args = nil, body = nil)
     @backtrace = onoff(@_args.first)
     _optional_blank_line
   end
 
-  def comment
+  def comment(args = nil, body = nil)
     _body
     _optional_blank_line
   end
 
-  def shell
+  def shell(args = nil, body = nil)
     cmd = @_data.chomp
     system(cmd)
     _optional_blank_line
   end
 
-  def func
+  def func(args = nil, body = nil)
     funcname = @_args[0]
     check_disallowed(funcname)
     func_def = <<~EOS
@@ -63,25 +64,24 @@ module Livetext::Standard
       end
     EOS
     _optional_blank_line
-
     Livetext::Functions.class_eval func_def
   end
 
-  def h1; _out wrapped(@_data, :h1); end
-  def h2; _out wrapped(@_data, :h2); end
-  def h3; _out wrapped(@_data, :h3); end
-  def h4; _out wrapped(@_data, :h4); end
-  def h5; _out wrapped(@_data, :h5); end
-  def h6; _out wrapped(@_data, :h6); end
+  def h1(args = nil, body = nil); _out wrapped(@_data, :h1); end
+  def h2(args = nil, body = nil); _out wrapped(@_data, :h2); end
+  def h3(args = nil, body = nil); _out wrapped(@_data, :h3); end
+  def h4(args = nil, body = nil); _out wrapped(@_data, :h4); end
+  def h5(args = nil, body = nil); _out wrapped(@_data, :h5); end
+  def h6(args = nil, body = nil); _out wrapped(@_data, :h6); end
 
-  def list
+  def list(args = nil, body = nil)
     wrap :ul do
       _body {|line| _out wrapped(line, :li) }
     end
     _optional_blank_line
   end
 
-  def list!
+  def list!(args = nil, body = nil)
     wrap(:ul) do
       lines = _body.each   # enumerator
       loop do
@@ -94,49 +94,49 @@ module Livetext::Standard
     _optional_blank_line
   end
 
-  def shell!
+  def shell!(args = nil, body = nil)
     cmd = @_data.chomp
     system(cmd)
     _optional_blank_line
   end
 
-  def errout
+  def errout(args = nil, body = nil)
     STDERR.puts @_data.chomp
     _optional_blank_line
   end
 
-  def ttyout
+  def ttyout(args = nil, body = nil)
     TTY.puts @_data.chomp
     _optional_blank_line
   end
 
-  def say
+  def say(args = nil, body = nil)
     str = _format(@_data.chomp)
     TTY.puts str
     _optional_blank_line
   end
 
-  def banner
+  def banner(args = nil, body = nil)
     str = _format(@_data.chomp)
-    num = str.length - 1
+    num = str.length
     decor = "-"*num + "\n"
     puts decor + str + "\n" + decor
   end
 
-  def quit
+  def quit(args = nil, body = nil)
     puts @body
     @body = ""
     @output.close
   end
 
-  def cleanup
+  def cleanup(args = nil, body = nil)
     @_args.each do |item|
       cmd = ::File.directory?(item) ? "rm -f #{item}/*" : "rm #{item}"
       system(cmd)
     end
   end
 
-  def _def
+  def dot_def(args = nil, body = nil)
     name = @_args[0]
     str = "def #{name}\n"
     check_disallowed(name)
@@ -144,17 +144,17 @@ module Livetext::Standard
     str << _body(true).join("\n")
     str << "\nend\n"
     eval str
-# rescue => err
-#   _error!(err)
   end
 
-  def set
+  def set(args = nil, body = nil)
     line = _data.chomp
     pairs = Livetext::ParseSet.new(line).parse
     set_variables(pairs)
   end
 
-  def variables!  # cwd, not FileDir - weird, fix later
+  # FIXME really these should be one method...
+
+  def variables!(args = nil, body = nil)  # cwd, not FileDir - weird, fix later
     prefix = _args[0]
     file = _args[1]
     prefix = nil if prefix == "-"  # FIXME dumb hack
@@ -164,11 +164,11 @@ module Livetext::Standard
     else
       lines = _body
     end
-    pairs = Livetext::ParseMisc.parse_vars(prefix, lines)
+    pairs = Livetext::ParseGeneral.parse_vars(prefix, lines)
     set_variables(pairs)
   end
 
-  def variables
+  def variables(args = nil, body = nil)
     prefix = _args[0]
     file = _args[1]
     prefix = nil if prefix == "-"  # FIXME dumb hack
@@ -178,11 +178,11 @@ module Livetext::Standard
     else
       lines = _body
     end
-    pairs = Livetext::ParseMisc.parse_vars(prefix, lines)
+    pairs = Livetext::ParseGeneral.parse_vars(prefix, lines)
     set_variables(pairs)
   end
 
-  def heredoc
+  def heredoc(args = nil, body = nil)
     var = @_args[0]
     text = _body.join("\n")
     rhs = ""
@@ -192,59 +192,26 @@ module Livetext::Standard
     end
     indent = @parent.indentation.last
     indented = " " * indent
-    @parent._setvar(var, rhs.chomp)
+    @parent.setvar(var, rhs.chomp)
     _optional_blank_line
   end
 
-  def _seek(file)
-    value = nil
-    return file if File.exist?(file)
-
-    count = 1
-    loop do
-      front = "../" * count
-      count += 1
-      here = Pathname.new(front).expand_path.dirname.to_s
-      break if here == "/"
-      path = front + file
-      value = path if File.exist?(path)
-      break if value
-    end
-    STDERR.puts "Cannot find #{file.inspect} from #{Dir.pwd}" unless value
-	  return value
-  rescue
-    STDERR.puts "Can't find #{file.inspect} from #{Dir.pwd}"
-	  return nil
-  end
-
-  def seek    # like include, but search upward as needed
+  def seek(args = nil, body = nil)    # like include, but search upward as needed
     file = @_args.first
-		file = _seek(file)
+		file = search_upward(file)
     check_file_exists(file)
     @parent.process_file(file)
     _optional_blank_line
   end
 
-  def in_out  # FIXME dumb name!
-    file, dest = *@_args
-    check_file_exists(file)
-    @parent.process_file(file, dest)
-    _optional_blank_line
-  end
-
-  def _include   # dot command
+  def dot_include(args = nil, body = nil)   # dot command
     file = _format(@_args.first)  # allows for variables
     check_file_exists(file)
     @parent.process_file(file)
     _optional_blank_line
   end
 
-  def _include_file(file)
-    @_args = [file]
-    _include
-  end
-
-  def inherit
+  def inherit(args = nil, body = nil)
     file = @_args.first
     upper = "../#{file}"
     got_upper, got_file = File.exist?(upper), File.exist?(file)
@@ -256,95 +223,94 @@ module Livetext::Standard
     _optional_blank_line
   end
 
-  def mixin
+  def mixin(args = nil, body = nil)
     name = @_args.first   # Expect a module name
     return if @_mixins.include?(name)
     @_mixins << name
-    parse = Livetext::ParseMixin.new(name)  # FIXME??
-    file = parse.find_mixin(name)
-    parse.use_mixin(name, file)
+    mod = Livetext::ParseMixin.get_module(name)  # FIXME??
+    self.extend(mod)
+    init = "init_#{name}"
+    self.send(init) if self.respond_to? init
     _optional_blank_line
   end
 
-  def import
+  def icanhaz(args = nil, body = nil)
     name = @_args.first   # Expect a module name
     return if @_mixins.include?(name)
     @_mixins << name
-    parse = Livetext::ParseImport.new(name)
+    mod = Livetext::Handler::ICanHaz.get_module(name)  # FIXME??
+    self.extend(mod)
+    init = "init_#{name}"
+    self.send(init) if self.respond_to? init
+    _optional_blank_line
+  end
+
+  def import(args = nil, body = nil)
+    name = @_args.first   # Expect a module name
+    return if @_mixins.include?(name)
+    @_mixins << name
+    mod = Livetext::ParseImport.get_module(name)
     parse.use_import(name)
     _optional_blank_line
   end
 
-  def copy
+  def copy(args = nil, body = nil)
     file = @_args.first
     check_file_exists(file)
     _out grab_file(file)
     _optional_blank_line
   end
 
-  def r
+  def r(args = nil, body = nil)
     _out @_data.chomp  # No processing at all
   end
 
-  def raw
+  def raw(args = nil, body = nil)
     # No processing at all (terminate with __EOF__)
     _raw_body {|line| _out line }  # no formatting
   end
 
-  def debug
+  def debug(args = nil, body = nil)
     self._debug = onoff(@_args.first)
   end
 
-  def passthru
+  def passthru(args = nil, body = nil)
     # FIXME - add check for args size? (helpers)
     @_nopass = ! onoff(_args.first)
   end
 
-  def nopass
+  def nopass(args = nil, body = nil)
     @_nopass = true
   end
 
-  def para
+  def para(args = nil, body = nil)
     # FIXME - add check for args size? (helpers)
     @_nopara = ! onoff(_args.first)
   end
 
-  def onoff(arg)   # helper
-    arg ||= "on"
-    raise ExpectedOnOff unless String === arg
-    case arg.downcase
-      when "on"
-        return true
-      when "off"
-        return false
-    else
-      raise ExpectedOnOff
-    end
-  end
-
-  def nopara
+  def nopara(args = nil, body = nil)
     @_nopara = true
   end
 
-  def heading
+  def heading(args = nil, body = nil)
     _print "<center><font size=+1><b>"
     _print @_data.chomp
     _print "</b></font></center>"
   end
 
-  def newpage
+  def newpage(args = nil, body = nil)
     _out '<p style="page-break-after:always;"></p>'
     _out "<p/>"
   end
 
-  def mono
+  def mono(args = nil, body = nil)
     wrap ":pre" do
       _body(true) {|line| _out line }
     end
     _optional_blank_line
   end
 
-  def dlist
+  def dlist(args = nil, body = nil)
     delim = _args.first
     wrap(:dl) do
       _body do |line|
@@ -356,13 +322,13 @@ module Livetext::Standard
     end
   end
 
-  def link
+  def link(args = nil, body = nil)
     url = _args.first
     text = _args[2..-1].join(" ")
     _out "<a style='text-decoration: none' href='#{url}'>#{text}</a>"
   end
 
-  def xtable   # Borrowed from bookish - FIXME
+  def xtable(args = nil, body = nil)   # Borrowed from bookish - FIXME
     title = @_data.chomp
     delim = " :: "
     _out "<br><center><table width=90% cellpadding=5>"
@@ -389,12 +355,12 @@ module Livetext::Standard
     _out "</table></center>"
   end
 
-  def image
+  def image(args = nil, body = nil)
     name = @_args[0]
     _out "<img src='#{name}'></img>"
   end
 
-  def br
+  def br(args = nil, body = nil)
     num = _args.first || "1"
     out = ""
     num.to_i.times { out << "<br>" }

data/lib/userapi.rb

@@ -3,6 +3,7 @@
 require_relative 'formatline'
 
 # UserAPI deals mostly with user-level methods.
+
 module Livetext::UserAPI
 
   def setvar(var, val)
@@ -94,10 +95,6 @@ module Livetext::UserAPI
     else
       lines
     end
-# rescue => err
-#   str = err.inspect + "\n"
-#   str << err.backtrace.map {|x| "  " + x }.join("\n")
-#   _error!(str)
   end
 
   def _body_text(raw=false)

data/livetext.gemspec

@@ -15,7 +15,8 @@ Gem::Specification.new do |s|
   s.executables << "livetext"
   
   # Files...
-  main = Find.find("bin").to_a + Find.find("lib").to_a + Find.find("plugin").to_a 
+  main = Find.find("bin").to_a + Find.find("lib").to_a + 
+         Find.find("plugin").to_a + Find.find("imports").to_a 
   misc = %w[./README.lt3 ./README.md livetext.gemspec]
   test = Find.find("test").to_a
 

data/plugin/bookish.rb

@@ -1,4 +1,4 @@
-def hardbreaks
+def hardbreaks(args = nil, body = nil)
   @hard = false
   @hard = true unless @_args.first == "off"
 end
@@ -7,15 +7,17 @@ def hardbreaks?
   @hard
 end
 
-def credit
+def credit(args = nil, body = nil)
   # really just a place marker in source
 end
 
+# These are duplicated. Remove safely
+
 def h1; _out "<h1>#{@_data}</h1>"; end
 def h2; _out "<h2>#{@_data}</h2>"; end
 def h3; _out "<h3>#{@_data}</h3>"; end
 
-def alpha_columns
+def alpha_columns(args = nil, body = nil)
   n = @_args.first.to_i   # FIXME: what if missing?
   words = []
   _body do |line| 
@@ -30,9 +32,9 @@ def alpha_columns
   _out "</table>"
 end
 
-def comment
-  _body { }  # ignore body
-end
+# def comment
+#   _body { }  # ignore body
+# end
 
 def _errout(*args)
   ::STDERR.puts *args
@@ -48,12 +50,14 @@ def _slug(str)
   s2
 end
 
-def image
+
+# FIXME duplicated?
+def image(args = nil, body = nil)
   name = @_args[0]
   _out "<img src='#{name}'></img>"
 end
 
-def figure
+def figure(args = nil, body = nil)
   name = @_args[0]
   num = @_args[1]
   title = @_args[2..-1].join(" ")
@@ -62,7 +66,7 @@ def figure
   _out "<center><b>Figure #{num}</b> #{title}</center>"
 end
 
-def chapter
+def chapter(args = nil, body = nil)
 # _errout("chapter")
   @chapter = @_args.first.to_i
   @sec = @sec2 = 0
@@ -78,7 +82,7 @@ def chapter
   HTML
 end
 
-def chapterN
+def chapterN(args = nil, body = nil)
   @chapter += 1
   @sec = @sec2 = 0
   title = @_data    # .split(" ",2)[1]
@@ -94,7 +98,7 @@ def chapterN
   HTML
 end
 
-def sec
+def sec(args = nil, body = nil)
   @sec += 1
   @sec2 = 0
   @section = "#@chapter.#@sec"
@@ -108,7 +112,7 @@ rescue => err
   exit
 end
 
-def subsec
+def subsec(args = nil, body = nil)
   @sec2 += 1
   @subsec = "#@chapter.#@sec.#@sec2"
   title = @_data.dup
@@ -118,7 +122,7 @@ def subsec
   _out "<h3>#@subsec #{title}</h3>\n"
 end
 
-def definition_table
+def definition_table(args = nil, body = nil)
   title = @_data
   wide = "95"
   delim = " :: "
@@ -140,7 +144,7 @@ def definition_table
   _optional_blank_line
 end
 
-def table2
+def table2(args = nil, body = nil)
   title = @_data
   wide = "90"
   extra = _args[2]
@@ -164,7 +168,7 @@ def table2
   _optional_blank_line
 end
 
-def simple_table
+def simple_table(args = nil, body = nil)
   title = @_data
   delim = " :: "
   _out "<table cellpadding=2>"
@@ -193,7 +197,7 @@ def simple_table
   _out "</table>"
 end
 
-def table
+def table(args = nil, body = nil)
   @table_num ||= 0
   @table_num += 1
   title = @_data
@@ -227,7 +231,7 @@ def table
   _out "<b>Table #@chapter.#@table_num &nbsp;&nbsp; #{title}</b></center><br>"
 end
 
-def toc!
+def toc!(args = nil, body = nil)
   _debug "Closing TOC"
   @toc.close
 rescue => err
@@ -236,7 +240,7 @@ rescue => err
   _errout "Exception: #{err.inspect}"
 end
 
-def toc2
+def toc2(args = nil, body = nil)
   file = @_args[0]
   @toc.close
   ::File.write(file, <<-EOS)
@@ -249,24 +253,24 @@ EOS
   system("cat toc.tmp >>#{file}")
 end
 
-def missing
+def missing(args = nil, body = nil)
   @toc << "#{_nbsp(8)}<font color=red>TBD: #@_data</font><br>"
   stuff = @_data.empty? ? "" : ": #@_data"
   _out "<br><font color=red><i>[Material missing#{stuff}]</i></font><br>\n "
 end
 
-def TBC
+def TBC(args = nil, body = nil)
   @toc << "#{_nbsp(8)}<font color=red>To be continued...</font><br>"
   _out "<br><font color=red><i>To be continued...</i></font><br>"
 end
 
-def note
+def note(args = nil, body = nil)
   _out "<br><font color=red><i>Note: "
   _out @_data 
   _out "</i></font><br>\n "
 end
 
-def quote
+def quote(args = nil, body = nil)
   _out "<blockquote>"
   _body {|line| _out line }
   _out "</blockquote>"