livetext 0.9.46 → 0.9.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05c23cb9790ecbd684af4888ff8237bcf0aa792462bb1da1d183d18b786ab462
-  data.tar.gz: c0adc17493388b920557b09029213ab558fa43df3c6a7c23dce75d54c38fc298
+  metadata.gz: 91574e23cbcbe19d5c06d7c1fbbe8fbbe33ca29b06511da502b532bbb28519c6
+  data.tar.gz: 553612fc90e8a6f3676158c3e98997415d0b568fb811fc9d273f8a2ae47478b0
 SHA512:
-  metadata.gz: a8717d55d1775c6947b79f008d6a01a64b5e3c084e936b79f7faa243b7776233734fb3e56518ac249faf95bf5b86cbfcde006b50e449762b6bb96788b8c84ec0
-  data.tar.gz: d552b53c1b82e5b650d65a9e49e45bdf80447ecc0a4af0a290e9d6415979ef71dd3c4da35ca6b1cacff42c062c4e7896613ce05175b0040147e00a349c8ecb3d
+  metadata.gz: 909f58be5cd6ee9d11262bb7213d2fab733d379ac678953c0e0225486cdc7a24152b8f5e5b208f2522bf4ea629abd9597c14b3cce1988b19c89b3b92d96f729b
+  data.tar.gz: e6e9aaec3cba4d466601d9b4d2f2d96bbb3c3697640684d96c23d70b41843d6a5674a4f41e659355df45a72c59842f7e91df44c76455a430425836db17f1e8e7

data/lib/livetext/{more.rb → core.rb}

@@ -2,59 +2,8 @@
 # Class Livetext reopened (top level).
 
 class Livetext
-
   include Helpers
 
-  class Variables
-    attr_reader :vars
-
-    def initialize(hash = {})
-      @vars = {}
-      hash.each_pair do |k, v| 
-        sym = k.to_sym
-        str = k.to_s
-        @vars[sym] = v 
-        @vars[str] = v 
-      end
-    end
-
-    def inspect
-      syms = @vars.keys.select {|x| x.is_a? Symbol }
-      out = "\nVariables:"
-      syms.each do |sym|
-        out << "    #{sym}: #{@vars[sym].inspect}\n"
-      end
-      out
-    end
-  
-    def [](var)
-      @vars[var.to_sym]
-    end
-
-    def []=(var, value)
-      @vars[var.to_sym] = value
-    end
-
-    def get(var)
-      @vars[var.to_sym] || "[#{var} is undefined]"
-    end
-
-    def set(var, value)
-      @vars[var.to_sym] = value.to_s
-    end
-
-    def setvars(pairs)
-      pairs = pairs.to_a if pairs.is_a?(Hash)
-      pairs.each do |var, value|
-        api.setvar(var, value)
-      end
-    end
-
-    def to_a
-      @vars.to_a
-    end
-  end
-
   Vars = Variables.new
 
   TTY = ::File.open("/dev/tty", "w")
@@ -98,7 +47,7 @@ class Livetext
     @save_location = where  # delegate
   end
 
-  def initialize(output = ::STDOUT)
+  def initialize(output = ::STDOUT)  # Livetext
     @source = nil
     @_mixins = []
     @_imports = []
@@ -123,8 +72,6 @@ class Livetext
     end
     call.each {|cmd| obj.main.send(cmd[1..-1]) }  # ignores leading dot, no param
     obj.api.setvars(vars)
-# puts "------ init: obj = "
-# p obj
     obj
   end
 

data/lib/livetext/errors.rb

@@ -10,16 +10,19 @@
   end
 
   def checkpoint(msg = nil)
+    return unless ENV['LIVETEXT_DEBUG'] == "true"
     file, line, meth = whence(1)
     display(file, line, meth, msg)
   end
 
   def checkpoint?(msg = nil)        # with sleep 3
+    return unless ENV['LIVETEXT_DEBUG'] == "true"
     file, line, meth = whence(1)
     display(file, line, meth, msg)
   end
 
   def checkpoint!(msg = nil)        # with pause
+    return unless ENV['LIVETEXT_DEBUG'] == "true"
     file, line, meth = whence(1)
     display(file, line, meth, msg)
     print "::: Pause..."
@@ -71,6 +74,3 @@ make_exception(:ExpectedDotEnd,    "Error: expected .end but found end of file")
 make_exception(:ExpectedAlphaNum,  "Error: expected an alphanumeric but foun '%1'")   # parser/set.rb
 make_exception(:ExpectedCommaEOS,  "Error: expected comma or end of string")          # parser/set.rb
 
-
-
-

data/lib/livetext/expansion.rb

@@ -8,7 +8,9 @@ class Livetext::Expansion
   Lbrack = "\\["
   Colon  = ":"
 
-  def initialize(instance)
+  Formatter = ::Livetext::Formatter
+
+  def initialize(instance)   # Livetext::Expansion
     @live = instance
   end
 

data/lib/livetext/formatter.rb

@@ -1,14 +1,6 @@
-module Formatter
+module Livetext::Formatter
 
-## Hmmm...
-# 
-#  Double:  b, i, t, s
-#  Single:  bits
-#  Brackt:  bits
-# 
-
-
-  def self.format(str)
+  def self.format(str)    # FIXME - unneeded?
     str = str.chomp
     s2 = Double.process(str.chomp)
     s3 = Bracketed.process(s2)
@@ -16,188 +8,195 @@ module Formatter
     s4
   end
   
-  class Delimited
-    def initialize(str, marker, tag)
-      @str, @marker, @tag = str.dup, marker, tag
-      @buffer = ""
-      @cdata  = ""
-      @state  = :INITIAL
-    end
+  ## Hmmm...
+  # 
+  #  Double:  b, i, t, s
+  #  Single:  bits
+  #  Brackt:  bits
+  # 
 
-    def status(where)
-      if $debug
-        STDERR.printf "%-11s %-7s #{@marker.inspect} \n #{' '*11} state = %-8s  str = %-20s  buffer = %-20s  cdata = %-20s\n", 
-          where, self.class, @state, @str.inspect, @buffer.inspect, @cdata.inspect
-      end
-    end
+end
 
-    def front
-      @str[0]
-    end
+class Livetext::Formatter::Delimited
+  def initialize(str, marker, tag)    # Delimited
+    @str, @marker, @tag = str.dup, marker, tag
+    @buffer = ""
+    @cdata  = ""
+    @state  = :INITIAL
+  end
 
-    def grab(n=1)
-      char = @str.slice!(0..(n-1))   # grab n chars
-      char
+  def status(where)
+    if $debug
+      STDERR.printf "%-11s %-7s #{@marker.inspect} \n #{' '*11} state = %-8s  str = %-20s  buffer = %-20s  cdata = %-20s\n", 
+        where, self.class, @state, @str.inspect, @buffer.inspect, @cdata.inspect
     end
+  end
 
-    def grab_terminator
-      @state = :LOOPING
-      # goes onto buffer by default
-      # Don't? what if searching for space_marker?
-      # @buffer << grab  
-    end
+  def front
+    @str[0]
+  end
 
-    def eol?
-      @str.empty?
-    end
+  def grab(n=1)
+    char = @str.slice!(0..(n-1))   # grab n chars
+    char
+  end
 
-    def space?
-      front == " "
-    end
+  def grab_terminator
+    @state = :LOOPING
+    # goes onto buffer by default
+    # Don't? what if searching for space_marker?
+    # @buffer << grab  
+  end
 
-    def escape?
-      front == "\\"
-    end
+  def eol?
+    @str.empty?
+  end
 
-    def terminated?
-      space?   # Will be overridden except in Single
-    end
+  def space?
+    front == " "
+  end
 
-    def marker?
-      @str.start_with?(@marker)
-    end
+  def escape?
+    front == "\\"
+  end
 
-    def space_marker?
-      @str.start_with?(" " + @marker)
-    end
+  def terminated?
+    space?   # Will be overridden except in Single
+  end
 
-    def wrap(text)
-      if text.empty?
-        result = @marker
-        result = "" if @marker[1] == "["
-        return result
-      end
-      "<#{@tag}>#{text}</#{@tag}>"
+  def marker?
+    @str.start_with?(@marker)
+  end
+
+  def space_marker?
+    @str.start_with?(" " + @marker)
+  end
+
+  def wrap(text)
+    if text.empty?
+      result = @marker
+      result = "" if @marker[1] == "["
+      return result
     end
-    
-    def initial
-      n = @marker.length
-      case
-      when escape?
-        grab               # backslash
-        @buffer << grab    # char
-      when space_marker?
-        @buffer << grab   # append the space
-        grab(n)           # eat the marker
-        @state = :CDATA
-      when marker?
-        grab(n)  # Eat the marker
-        @state = :CDATA
-      when eol?
-        @state = :FINAL
-      else
-        @state = :BUFFER
-      end
+    "<#{@tag}>#{text}</#{@tag}>"
+  end
+  
+  def initial
+    n = @marker.length
+    case
+    when escape?
+      grab               # backslash
+      @buffer << grab    # char
+    when space_marker?
+      @buffer << grab   # append the space
+      grab(n)           # eat the marker
+      @state = :CDATA
+    when marker?
+      grab(n)  # Eat the marker
+      @state = :CDATA
+    when eol?
+      @state = :FINAL
+    else
+      @state = :BUFFER
     end
+  end
 
-    def buffer
-      @buffer << grab
-      @state = :LOOPING
-    end
+  def buffer
+    @buffer << grab
+    @state = :LOOPING
+  end
 
-    def cdata
-      case
-      when eol?
-        if @cdata.empty?
-          @buffer << @marker unless @marker[1] == "["
-        else
-          @buffer << wrap(@cdata)
-        end
-        @state = :FINAL
-      when terminated?
-        @buffer << wrap(@cdata)
-        grab_terminator    # "*a *b"  case???
-        @cdata = ""
-        @state = :LOOPING
+  def cdata
+    case
+    when eol?
+      if @cdata.empty?
+        @buffer << @marker unless @marker[1] == "["
       else
-        @cdata << grab
-        @state = :CDATA
-      end
-    end
-
-    def looping
-      n = @marker.length
-      case
-      when escape?
-        grab               # backslash
-        @buffer << grab    # char
-      when space_marker?
-        @buffer << grab   # append the space
-        grab(n)           # eat the marker
-        @state = :CDATA
-      when eol?
-        @state = :FINAL
-      else   # includes marker not preceded by space!
-        @buffer << grab
+        @buffer << wrap(@cdata)
       end
+      @state = :FINAL
+    when terminated?
+      @buffer << wrap(@cdata)
+      grab_terminator    # "*a *b"  case???
+      @cdata = ""
+      @state = :LOOPING
+    else
+      @cdata << grab
+      @state = :CDATA
     end
+  end
 
-    def handle
-      loop do
-        break if @state == :FINAL
-        meth = @state.downcase
-        send(meth)
-      end
-      return @buffer
+  def looping
+    n = @marker.length
+    case
+    when escape?
+      grab               # backslash
+      @buffer << grab    # char
+    when space_marker?
+      @buffer << grab   # append the space
+      grab(n)           # eat the marker
+      @state = :CDATA
+    when eol?
+      @state = :FINAL
+    else   # includes marker not preceded by space!
+      @buffer << grab
     end
+  end
 
-    def self.process(str)
-      bold = self.new(str, "*", "b")
-      sb   = bold.handle
-# return sb
-      ital = self.new(sb, "_", "i")
-      si   = ital.handle
-      code = self.new(si, "`", "tt")
-      sc   = code.handle
-      stri = self.new(sc, "~", "strike")
-      si   = stri.handle
-      si
+  def handle
+    loop do
+      break if @state == :FINAL
+      meth = @state.downcase
+      send(meth)
     end
+    return @buffer
   end
 
-  class Single < Delimited
-    # Yeah, this one is that simple
+  def self.process(str)
+    bold = self.new(str, "*", "b")
+    sb   = bold.handle
+# return sb
+    ital = self.new(sb, "_", "i")
+    si   = ital.handle
+    code = self.new(si, "`", "tt")
+    sc   = code.handle
+    stri = self.new(sc, "~", "strike")
+    si   = stri.handle
+    si
   end
+end
 
-  class Double < Delimited
-    def initialize(str, sigil, tag)
-      super
-      # Convention: marker is "**", sigil is "*"
-      @marker = sigil + sigil
-    end
+class Livetext::Formatter::Single < Livetext::Formatter::Delimited
+  # Yeah, this one is that simple
+end
 
-    def terminated?
-      terms = [" ", ".", ","]
-      terms.include?(front)
-    end
+class Livetext::Formatter::Double < Livetext::Formatter::Delimited
+  def initialize(str, sigil, tag)    # Double
+    super
+    # Convention: marker is "**", sigil is "*"
+    @marker = sigil + sigil
   end
 
-  class Bracketed < Delimited
-    def initialize(str, sigil, tag)
-      super
-      # Convention: marker is "*[", sigil is "*"
-      @marker = sigil + "["
-    end
+  def terminated?
+    terms = [" ", ".", ","]
+    terms.include?(front)
+  end
+end
 
-    def terminated?
-      front == "]" || eol?
-    end
+class Livetext::Formatter::Bracketed < Livetext::Formatter::Delimited
+  def initialize(str, sigil, tag)   # Bracketed
+    super
+    # Convention: marker is "*[", sigil is "*"
+    @marker = sigil + "["
+  end
 
-    def grab_terminator
-      @state = :LOOPING
-      grab
-    end
+  def terminated?
+    front == "]" || eol?
   end
 
+  def grab_terminator
+    @state = :LOOPING
+    grab
+  end
 end
 

data/lib/livetext/functions.rb

@@ -19,7 +19,7 @@ class Livetext::Functions
     "\b"
   end
 
-# FIXME Function parameters need to be fixed...
+  # FIXME Function parameters need to be fixed...
 
   def isqrt(param = nil)      # "integer square root" - Just for testing
     arg = num = param         #  Takes any number

data/lib/livetext/global_helpers.rb

@@ -1,5 +1,5 @@
 
-module GlobalHelpers
+module Livetext::GlobalHelpers
 
   def check_disallowed(name)
     raise DisallowedName(name) if disallowed?(name)

data/lib/livetext/handler/import.rb

@@ -5,11 +5,11 @@ require_relative '../helpers'
 
 class Livetext::Handler::Import
   include Livetext::Helpers
-  include GlobalHelpers
+  include Livetext::GlobalHelpers
 
   attr_reader :file
 
-  def initialize(name)
+  def initialize(name)     # Livetext::Handler::Import
     @name = name
     @file = find_file(name)
   end

data/lib/livetext/handler/mixin.rb

@@ -5,11 +5,11 @@ require_relative '../helpers'
 
 class Livetext::Handler::Mixin
   include Livetext::Helpers
-  include GlobalHelpers
+  include Livetext::GlobalHelpers
 
   attr_reader :file
 
-  def initialize(name, parent)
+  def initialize(name, parent)     # Livetext::Handler::Mixin
     @name = name
     @file = find_file(name, ".rb", "plugin")
     parent.graceful_error FileNotFound(name) if @file.nil?

data/lib/livetext/helpers.rb

@@ -2,9 +2,7 @@
 require_relative 'global_helpers'
 require_relative 'expansion'
 
-
 module Livetext::Helpers
-
   Space = " "
   Sigil = "." # Can't change yet
 
@@ -75,6 +73,7 @@ module Livetext::Helpers
 ## FIXME process_file[!] should call process[_text] ?
 
   def process_file(fname, btrace=false)
+checkpoint "fname = #{fname.inspect}"
     unless File.exist?(fname)
       api.dump
       raise FileNotFound(fname) 
@@ -127,6 +126,7 @@ module Livetext::Helpers
     api.data = data0.dup   # should permit _ in function names at least
     args0 = data0.split
     api.args = args0.dup
+checkpoint "name = #{name} args = #{args0.inspect}"
     retval = @main.send(name)  # , *args)      # was 125
     retval
   rescue => err
@@ -258,14 +258,6 @@ module Livetext::Helpers
     api.setvar(:File, file)
   end
 
-#   def dump(file = nil)   # not a dot command!
-#     file ||= ::STDOUT
-#     TTY.puts "--- Writing body (#{@body.size} bytes)" if @body
-#     file.puts @body
-#   rescue => err
-#     TTY.puts "#dump had an error: #{err.inspect}"
-#   end
-
   def graceful_error(err, msg = nil)
     api.dump
     STDERR.puts msg if msg

data/lib/livetext/html.rb

@@ -1,39 +1,6 @@
+class Livetext::HTML
 
-# module HTMLHelper
-# 
-#   def wrapped(str, *tags)   # helper
-#     open, close = open_close_tags(*tags)
-#     open + str + close
-#   end
-# 
-#   def wrapped!(str, tag, **extras)    # helper
-#     open, close = open_close_tags(tag)
-#     extras.each_pair do |name, value|
-#       open.sub!(">", " #{name}='#{value}'>")
-#     end
-#     open + str + close
-#   end
-# 
-#   def wrap(*tags)     # helper
-#     open, close = open_close_tags(*tags)
-#     api.out open
-#     yield
-#     api.out close
-#   end
-# 
-#   def open_close_tags(*tags)
-#     open, close = "", ""
-#     tags.each do |tag|
-#       open << "<#{tag}>"
-#       close.prepend("</#{tag}>")
-#     end
-#     [open, close]
-#   end
-# end
-
-class HTML
-
-  def initialize(api)
+  def initialize(api)   # HTML
     raise "API is nil!" unless api
     @api = api
     @indent = 0

data/lib/livetext/parser/general.rb

@@ -6,7 +6,7 @@ make_exception(:ExpectedString,   "Error: expected a string")
 
 class Livetext::ParseGeneral < StringParser
 
-  def initialize(str)
+  def initialize(str)    # Livetext::ParseGeneral
     super
   end
 

data/lib/livetext/parser/set.rb

@@ -10,7 +10,7 @@ class Livetext::ParseSet < StringParser
     self.new(str).parse
   end
 
-  def initialize(line)
+  def initialize(line)   # Livetext::ParseSet
     super
   end
 

data/lib/livetext/parser/string.rb

@@ -2,7 +2,7 @@ class StringParser
 
   attr_reader :line, :eos, :i, :len
 
-  def initialize(line)
+  def initialize(line)   # StringParser
     raise NilValue if line.nil?
     raise ExpectedString unless String === line
     @line = line

data/lib/livetext/paths.rb

@@ -1,4 +1,4 @@
-# Reopening for paths... do differently?
+# Reopening for paths... do differently?  FIXME
 
 class Livetext
   def self.get_path(dir = "")

data/lib/livetext/processor.rb

@@ -23,7 +23,7 @@ class Processor
 
   attr_reader :parent, :sources
 
-  def initialize(parent, output = nil)
+  def initialize(parent, output = nil)   # Processor
     @parent = parent || self
     # STDERR.puts "PARENT.api = #{parent.api.inspect}"
     @parent.api ||= Livetext::UserAPI.new(@parent)
@@ -35,7 +35,7 @@ class Processor
     @indentation = @parent.indentation
     @_mixins = []
     @_imports = []
-    @html = HTML.new(@parent.api)
+    @html = Livetext::HTML.new(@parent.api)
   end
 
   def api
@@ -85,6 +85,4 @@ class Processor
     @sources.pop
     nil
   end
-
-
 end

data/lib/livetext/skeleton.rb

@@ -3,10 +3,19 @@ require_relative 'parser/string'    # FIXME eh, should fix this
 # Class Livetext skeleton (top level).
 
 class Livetext
+  class Variables
+  end
+
   module Handler
   end
 
-  module ParsingConstants
+  module Formatter
+  end
+
+  class HTML
+  end
+
+  class ParsingConstants
   end
 
   class LineParser < StringParser

data/lib/livetext/standard.rb

@@ -1,4 +1,3 @@
-
 require 'pathname'   # For _seek - remove later??
 
 require_relative 'parser'   # nested requires
@@ -9,12 +8,9 @@ make_exception(:ExpectedOnOff,    "Error: expected 'on' or 'off'")
 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.
 
 module Livetext::Standard
-
-# include HTMLHelper
   include Livetext::Helpers
 
   TTY = ::File.open("/dev/tty", "w")
@@ -74,6 +70,8 @@ module Livetext::Standard
     return true
   end
 
+  # FIXME - move these to a single universal place in code
+
   def h1(args = nil, body = nil); api.out html.tag(:h1, cdata: api.data); return true; end
   def h2(args = nil, body = nil); api.out html.tag(:h2, cdata: api.data); return true; end
   def h3(args = nil, body = nil); api.out html.tag(:h3, cdata: api.data); return true; end
@@ -258,7 +256,7 @@ module Livetext::Standard
   def dot_include(args = nil, body = nil)   # dot command
     file = api.expand_variables(api.args.first)  # allows for variables
     check_file_exists(file)
-# checkpoint "====== self.methods = #{self.methods.sort.inspect}"
+checkpoint 
     @parent.process_file(file)
     api.optional_blank_line
   end

data/lib/livetext/userapi.rb

@@ -4,8 +4,7 @@ require_relative 'html'
 # Encapsulate the UserAPI as a class
 
 class Livetext::UserAPI
-
-  include ::Livetext::Standard
+  include ::Livetext::Standard    # FIXME - feels wonky?
 
   KBD = File.new("/dev/tty", "r")
   TTY = File.new("/dev/tty", "w")
@@ -14,10 +13,10 @@ class Livetext::UserAPI
 
   attr_accessor :data, :args
 
-  def initialize(live)
+  def initialize(live)  # Livetext::UserAPI
     @live = live
     @vars = live.vars
-    @html = HTML.new(self)
+    @html = Livetext::HTML.new(self)
     @expander = Livetext::Expansion.new(live)
   end
 
@@ -45,7 +44,7 @@ class Livetext::UserAPI
 # checkpoint "DATA = #{file.inspect}"
     api.data = file
     api.args = [file]
-    api.dot_include
+    dot_include
   end
 
   def expand_variables(str)
@@ -215,6 +214,5 @@ class Livetext::UserAPI
   def debug(*args)
     TTY.puts *args if @live.debug
   end
-
 end
 

data/lib/livetext/variables.rb

@@ -0,0 +1,50 @@
+  class Livetext::Variables      # FIXME - split out into file as Livetext::Variables
+    attr_reader :vars
+
+    def initialize(hash = {})   # Livetext::Variables
+      @vars = {}
+      hash.each_pair do |k, v| 
+        sym = k.to_sym
+        str = k.to_s
+        @vars[sym] = v 
+        @vars[str] = v 
+      end
+    end
+
+    def inspect
+      syms = @vars.keys.select {|x| x.is_a? Symbol }
+      out = "\nVariables:"
+      syms.each do |sym|
+        out << "    #{sym}: #{@vars[sym].inspect}\n"
+      end
+      out
+    end
+  
+    def [](var)
+      @vars[var.to_sym]
+    end
+
+    def []=(var, value)
+      @vars[var.to_sym] = value
+    end
+
+    def get(var)
+      @vars[var.to_sym] || "[#{var} is undefined]"
+    end
+
+    def set(var, value)
+      @vars[var.to_sym] = value.to_s
+    end
+
+    def setvars(pairs)
+      pairs = pairs.to_a if pairs.is_a?(Hash)
+      pairs.each do |var, value|
+        api.setvar(var, value)
+      end
+    end
+
+    def to_a
+      @vars.to_a
+    end
+  end
+

data/lib/livetext/version.rb

@@ -2,5 +2,5 @@
 # Defining VERSION
 
 class Livetext
-  VERSION = "0.9.46"
+  VERSION = "0.9.48"
 end

data/lib/livetext.rb

@@ -1,19 +1,21 @@
 
-require_relative 'livetext/skeleton'
-require_relative 'livetext/version'
-require_relative 'livetext/paths'
+if !defined?(Livetext)
+  require_relative 'livetext/skeleton'
+  require_relative 'livetext/version'
+  require_relative 'livetext/helpers'
+  require_relative 'livetext/variables'
+  require_relative 'livetext/core'
+  require_relative 'livetext/formatter'
+  require_relative 'livetext/paths'
 
-require_relative 'livetext/reopen'
-
-require_relative 'livetext/errors'
-require_relative 'livetext/standard'
-require_relative 'livetext/functions'
-require_relative 'livetext/userapi'
-require_relative 'livetext/formatter'
-require_relative 'livetext/processor'
-require_relative 'livetext/helpers'
-require_relative 'livetext/more'
-
-require_relative 'livetext/handler'
+  require_relative 'livetext/reopen'
 
+  require_relative 'livetext/errors'
+  require_relative 'livetext/standard'
+  require_relative 'livetext/functions'
+  require_relative 'livetext/userapi'
+  # require_relative 'livetext/formatter'
+  require_relative 'livetext/processor'
 
+  require_relative 'livetext/handler'
+end

data/test/all.rb

@@ -5,5 +5,8 @@
 #   add_filter "/test/"
 # end
 
+# FIXME - this file is broken - path issues
+
 require_relative 'unit/all'
+
 require_relative 'snapshots'             # snapshots

data/test/extra/README.txt

@@ -11,6 +11,7 @@ The tests here include:
    double.txt        Double sigil (see Formatting below)
    bracketed.txt     Bracketed sigil (see Formatting below)
 
+NOTE: These are moved under test/unit/ now.
 
 Variables:
 ----------

data/test/snapshots/table_with_heredocs/expected-output.txt

@@ -5,11 +5,19 @@ Testing heredocs (used in a table)
 
 <center><table width=90% cellpadding=5>
 <tr>
-  <td valign=top>This is <br>only <br>a test.<br></td>
-  <td valign=top>This is <br>just <br>some <br>random text.<br></td>
+  <td valign=top>This is <br><br>
+only <br><br>
+a test.<br></td>
+  <td valign=top>This is <br><br>
+just <br><br>
+some <br><br>
+random text.<br></td>
 </tr>
 <tr>
-  <td valign=top>And so<br>is this.<br></td>
-  <td valign=top>This is <br>row 2<br>col 2<br></td>
+  <td valign=top>And so<br><br>
+is this.<br></td>
+  <td valign=top>This is <br><br>
+row 2<br><br>
+col 2<br></td>
 </tr>
 </table></center>

data/test/snapshots/table_with_heredocs/old-exp-out.txt

@@ -0,0 +1,15 @@
+Testing heredocs (used in a table)
+<p>
+
+<br>
+
+<center><table width=90% cellpadding=5>
+<tr>
+  <td valign=top>This is <br>only <br>a test.<br></td>
+  <td valign=top>This is <br>just <br>some <br>random text.<br></td>
+</tr>
+<tr>
+  <td valign=top>And so<br>is this.<br></td>
+  <td valign=top>This is <br>row 2<br>col 2<br></td>
+</tr>
+</table></center>

data/test/snapshots.rb

@@ -132,7 +132,7 @@ class TestingLivetext < MiniTest::Test
       @included - @excluded
     end
 
-    def initialize(base, assertion = nil)
+    def initialize(base, assertion = nil)    # Testing::Livetext
       @assertion = assertion
       @base = base
       @errors = false

data/test/unit/all.rb

@@ -2,3 +2,10 @@
 require_relative 'standard'
 require_relative 'parser'      # nested
 require_relative 'html'
+
+require_relative 'single'
+require_relative 'double'
+require_relative 'bracketed'
+require_relative 'variables'
+require_relative 'functions'
+

data/test/unit/html.rb

@@ -12,7 +12,7 @@ class TestingLivetext < MiniTest::Test
 
   def test_wrapped
     live = Livetext.new
-    html = HTML.new(live.api)
+    html = Livetext::HTML.new(live.api)
     str = "nothing much"
     assert_equal html.tag(:b, cdata: str), "<b>#{str}</b>"
     assert_equal html.tag(:b, :i, cdata: str), "<b><i>#{str}</i></b>"
@@ -23,7 +23,7 @@ class TestingLivetext < MiniTest::Test
 
   def test_wrapped_extra
     live = Livetext.new
-    html = HTML.new(live.api)
+    html = Livetext::HTML.new(live.api)
     str = "nothing much"
     assert_equal html.tag(:td, cdata: str, valign: :top), 
                      "<td valign='top'>#{str}</td>"

data/test/{extra → unit}/single.rb

@@ -7,7 +7,6 @@ require 'livetext'
 # Just another testing class. Chill.
 
 class TestingLivetextSingle < MiniTest::Test
-
   def setup
     @live = Livetext.new
   end
@@ -131,11 +130,9 @@ class TestingLivetextSingle < MiniTest::Test
   def test_single_013_escaped_marker_is_ignored   
     # Escaped marker is ignored
     # No special initialization
-    src = "\\\\*escaped"
+    src = '\\' + "*escaped"   # Note single quote
     exp = "*escaped"
     actual = @live.api.format(src)
     check_match(exp, actual)
   end
- 
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.46
+  version: 0.9.48
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-24 00:00:00.000000000 Z
+date: 2024-05-25 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -26,8 +26,8 @@ files:
 - imports/markdown.rb
 - imports/pyggish.rb
 - imports/tutorial.rb
-- lib/cmdargs.rb
 - lib/livetext.rb
+- lib/livetext/core.rb
 - lib/livetext/errors.rb
 - lib/livetext/expansion.rb
 - lib/livetext/formatter.rb
@@ -38,7 +38,6 @@ files:
 - lib/livetext/handler/mixin.rb
 - lib/livetext/helpers.rb
 - lib/livetext/html.rb
-- lib/livetext/more.rb
 - lib/livetext/parser.rb
 - lib/livetext/parser/general.rb
 - lib/livetext/parser/set.rb
@@ -50,6 +49,7 @@ files:
 - lib/livetext/skeleton.rb
 - lib/livetext/standard.rb
 - lib/livetext/userapi.rb
+- lib/livetext/variables.rb
 - lib/livetext/version.rb
 - livetext.gemspec
 - plugin/booktool.rb
@@ -61,16 +61,11 @@ files:
 - plugin/tutorial.rb
 - test/all.rb
 - test/extra/README.txt
-- test/extra/bracketed.rb
 - test/extra/bracketed.txt
-- test/extra/double.rb
 - test/extra/double.txt
-- test/extra/functions.rb
 - test/extra/functions.txt
-- test/extra/single.rb
 - test/extra/single.txt
 - test/extra/testgen.rb
-- test/extra/variables.rb
 - test/extra/variables.txt
 - test/snapshots.rb
 - test/snapshots/basic_formatting/expected-error.txt
@@ -186,11 +181,15 @@ files:
 - test/snapshots/subset.txt
 - test/snapshots/table_with_heredocs/expected-error.txt
 - test/snapshots/table_with_heredocs/expected-output.txt
+- test/snapshots/table_with_heredocs/old-exp-out.txt
 - test/snapshots/table_with_heredocs/source.lt3
 - test/snapshots/var_into_func/expected-error.txt
 - test/snapshots/var_into_func/expected-output.txt
 - test/snapshots/var_into_func/source.lt3
 - test/unit/all.rb
+- test/unit/bracketed.rb
+- test/unit/double.rb
+- test/unit/functions.rb
 - test/unit/html.rb
 - test/unit/parser.rb
 - test/unit/parser/all.rb
@@ -198,8 +197,10 @@ files:
 - test/unit/parser/mixin.rb
 - test/unit/parser/set.rb
 - test/unit/parser/string.rb
+- test/unit/single.rb
 - test/unit/standard.rb
 - test/unit/stringparser.rb
+- test/unit/variables.rb
 homepage: https://github.com/Hal9000/livetext
 licenses:
 - Ruby

data/lib/cmdargs.rb

@@ -1,106 +0,0 @@
-
-require_relative 'livetext'
-
-=begin
-  Weird concepts to understand here...
-
-    1. A Livetext dot-command (flush left) usually looks like:
-         .foobar
-
-    2. A dot-command (left-indented) usually looks like:
-         $.foobar
-
-    3. More generally, it may have any number of parameters (0, 1, ...)
-         .redirect somefile.txt append
-
-    4. Variables and functions *can* appear (rare in practice??)
-         .redirect somefile$my_suffix $$my_mode
-
-    5. A trailing # comment may appear 
-       a. Stripped... saved in #raw ? #data ? #comment ? elsewhere?
-       b. NOT the "dot" as a comment!
-
-    6. .foobar  # This here is a comment
-
-    7. #data accessor returns all data on the .foo line...
-       a. ...After the initial space
-       b. ...Including later spaces
-       c. Including comment??
-       d. .foo This is  o n l y   a test.
-          # #data returns: "This is  o n l y   a test."
-       e. What about formatting???
-       f. What about: comments? variables? functions? 
-
-    8. Some commands have NO body while others have an OPTIONAL or REQUIRED body
-       a. Assume .cmd1 definition forbids a body (then a body is an error)
-          .cmd1   # may NOT have a body
-       b. Assume .cmd2 definition PERMITS a body
-          .cmd2   # may or MAY NOT have body/.end  
-       c. Assume .cmd3 definition REQUIRES a body
-          .cmd3   # REQUIRES a body/.end  
-          . stuff...
-          .end
-
-    9. Inside a body:
-       a. Leading dot has no special meaning (though the associated method may parse it!)
-       b. BUG? Currently leading dot is a comment INSIDE a body?
-       c. No leading char is special (though the associated method may parse it!)
-       d. No trailing #-comments (though the associated method may parse it!)
-       e. ?? We should or shouldn't look for variables/functions? or make it an option?
-       f. .end may naturally not be used (but see .raw where it may)
-
-   10. The args accessor is a simple array of strings
-       a. there is also raw_args (without variables/functions, etc.)
-       b. Much of this HAS NOT been thought through yet!      
-
-=end
-
-class Livetext::CmdData
-
-  attr_reader :data, :args, :nargs, :arity, :comment, :raw  # , ...?
-
-  def initialize(data, body: false, arity: :N)   # FIXME maybe just add **options ??
-    # arity:  (num)   fixed number 0 or more
-    #        :N       arbitrary number
-    #        n1..n2   range
-    # body:  true => this command has a body + .end
-    # how raw is raw?
-    #   remove comment - always/sometimes/never?
-    #   interpolate - always/sometimes/never?
-    #   interpolate inside body??
-    @data = data.dup     # comment? vars? funcs?
-    @raw  = data.dup     # comment? vars? funcs?
-    @args  = data.split  # simple array
-    @nargs = nargs       # not really "needed"
-    check_num_args(nargs)
-    # @varfunc = Livetext.interpolate(data.dup)
-  end
-
-  def check_num_args(num)
-    num_range = /(\d{0,2})(\.\.)(\d{0,2})/   # Not "really" right...
-    min, max = 0, 9999
-    mdata = num_range.match(@nargs).to_a
-    bad_args = nil
-    case 
-      when @nargs == ":N"          # arbitrary
-        # max already set
-      when mdata[2] == ".."           # range: 4..6 1.. ..4
-        vmin, vmax = mdata.values_at(1, 2)
-        min = Integer(vmin) unless vmin.empty?
-        max = Integer(vmax) unless vmax.empty?
-        min, max = Integer(min), Integer(max)
-      when %r[^\d+$] =~ num
-        min = max = Integer(num)  # can raise error
-      else
-        raise "Invalid value or range '#{num.inspect}'"
-    end
-
-    bad_args = @args.size.between?(min, max)
-    raise "Expected #{num} args but found #{@args.size}!" if bad_args
-  end
-
-  def strip_comments(str)
-    str.sub!(/ # .*/, "")
-  end
-
-end