livetext 0.9.27 → 0.9.30

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.27
+  version: 0.9.30
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2022-07-25 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -29,7 +29,8 @@ files:
 - lib/cmdargs.rb
 - lib/livetext.rb
 - lib/livetext/errors.rb
-- lib/livetext/funcall.rb
+- lib/livetext/expansion.rb
+- lib/livetext/formatter.rb
 - lib/livetext/functions.rb
 - lib/livetext/global_helpers.rb
 - lib/livetext/handler.rb
@@ -37,7 +38,6 @@ files:
 - lib/livetext/handler/mixin.rb
 - lib/livetext/helpers.rb
 - lib/livetext/html.rb
-- lib/livetext/lineparser.rb
 - lib/livetext/more.rb
 - lib/livetext/parser.rb
 - lib/livetext/parser/general.rb
@@ -53,23 +53,24 @@ files:
 - lib/livetext/version.rb
 - livetext.gemspec
 - plugin/bookish.rb
+- plugin/bootstrap_menu.rb
 - plugin/calibre.rb
 - plugin/livemagick.rb
 - plugin/markdown.rb
+- plugin/misc/navbar.rb
 - plugin/pyggish.rb
 - plugin/tutorial.rb
 - test/all.rb
 - test/snapshots.rb
-- test/snapshots/basic_formatting/actual-error.txt
-- test/snapshots/basic_formatting/actual-output.txt
-- test/snapshots/basic_formatting/err-sdiff.txt
 - test/snapshots/basic_formatting/expected-error.txt
 - test/snapshots/basic_formatting/expected-output.txt
-- test/snapshots/basic_formatting/out-sdiff.txt
 - test/snapshots/basic_formatting/source.lt3
 - test/snapshots/block_comment/expected-error.txt
 - test/snapshots/block_comment/expected-output.txt
 - test/snapshots/block_comment/source.lt3
+- test/snapshots/bootstrap_menu/expected-error.txt
+- test/snapshots/bootstrap_menu/expected-output.txt
+- test/snapshots/bootstrap_menu/source.lt3
 - test/snapshots/comments_ignored_1/expected-error.txt
 - test/snapshots/comments_ignored_1/expected-output.txt
 - test/snapshots/comments_ignored_1/source.lt3
@@ -116,9 +117,6 @@ files:
 - test/snapshots/example_alpha2/expected-error.txt
 - test/snapshots/example_alpha2/expected-output.txt
 - test/snapshots/example_alpha2/source.lt3
-- test/snapshots/functions/actual-error.txt
-- test/snapshots/functions/actual-output.txt
-- test/snapshots/functions/err-sdiff.txt
 - test/snapshots/functions/expected-error.txt
 - test/snapshots/functions/expected-output.txt
 - test/snapshots/functions/source.lt3
@@ -136,30 +134,18 @@ files:
 - test/snapshots/import_bookish/expected-error.txt
 - test/snapshots/import_bookish/expected-output.txt
 - test/snapshots/import_bookish/source.lt3
-- test/snapshots/import_bookish/toc.tmp
 - test/snapshots/mixin_bookish/expected-error.txt
 - test/snapshots/mixin_bookish/expected-output.txt
 - test/snapshots/mixin_bookish/source.lt3
-- test/snapshots/mixin_bookish/toc.tmp
-- test/snapshots/more_complex_vars/actual-error.txt
-- test/snapshots/more_complex_vars/actual-output.txt
-- test/snapshots/more_complex_vars/err-sdiff.txt
 - test/snapshots/more_complex_vars/expected-error.txt
 - test/snapshots/more_complex_vars/expected-output.txt
-- test/snapshots/more_complex_vars/out-sdiff.txt
 - test/snapshots/more_complex_vars/source.lt3
-- test/snapshots/more_functions/actual-error.txt
-- test/snapshots/more_functions/actual-output.txt
-- test/snapshots/more_functions/err-sdiff.txt
 - test/snapshots/more_functions/expected-error.txt
 - test/snapshots/more_functions/expected-output.txt
 - test/snapshots/more_functions/source.lt3
 - test/snapshots/predef_vars/expected-error.txt
 - test/snapshots/predef_vars/match-output.txt
 - test/snapshots/predef_vars/source.lt3
-- test/snapshots/raw_lines/actual-error.txt
-- test/snapshots/raw_lines/actual-output.txt
-- test/snapshots/raw_lines/err-sdiff.txt
 - test/snapshots/raw_lines/expected-error.txt
 - test/snapshots/raw_lines/expected-output.txt
 - test/snapshots/raw_lines/source.lt3
@@ -183,12 +169,8 @@ files:
 - test/snapshots/simple_mixin/expected-output.txt
 - test/snapshots/simple_mixin/simple_mixin.rb
 - test/snapshots/simple_mixin/source.lt3
-- test/snapshots/simple_vars/actual-error.txt
-- test/snapshots/simple_vars/actual-output.txt
-- test/snapshots/simple_vars/err-sdiff.txt
 - test/snapshots/simple_vars/expected-error.txt
 - test/snapshots/simple_vars/expected-output.txt
-- test/snapshots/simple_vars/out-sdiff.txt
 - test/snapshots/simple_vars/source.lt3
 - test/snapshots/single_raw_line/expected-error.txt
 - test/snapshots/single_raw_line/expected-output.txt
@@ -197,12 +179,8 @@ files:
 - test/snapshots/table_with_heredocs/expected-error.txt
 - test/snapshots/table_with_heredocs/expected-output.txt
 - test/snapshots/table_with_heredocs/source.lt3
-- test/snapshots/var_into_func/actual-error.txt
-- test/snapshots/var_into_func/actual-output.txt
-- test/snapshots/var_into_func/err-sdiff.txt
 - test/snapshots/var_into_func/expected-error.txt
 - test/snapshots/var_into_func/expected-output.txt
-- test/snapshots/var_into_func/out-sdiff.txt
 - test/snapshots/var_into_func/source.lt3
 - test/unit/all.rb
 - test/unit/html.rb
@@ -216,7 +194,6 @@ files:
 - test/unit/parser/string.rb
 - test/unit/standard.rb
 - test/unit/stringparser.rb
-- test/unit/tokenizer.rb
 homepage: https://github.com/Hal9000/livetext
 licenses:
 - Ruby

data/lib/livetext/funcall.rb

@@ -1,87 +0,0 @@
-
-require_relative '../livetext'
-
-# Parse function calls
-
-module Livetext::LineParser::FunCall
-
-  include Livetext::ParsingConstants
-
-  def param_loop(char)
-    param = ""
-    loop do
-      case peek
-        when Escape
-          param << escaped
-        when char, LF, nil
-          break
-      else
-        param << grab
-      end
-    end
-    param = nil if param.empty?
-    param
-  end
-
-  def grab_colon_param
-    grab  # grab :
-    param = param_loop(Space)
-  end
-
-  def grab_bracket_param
-    grab # [
-    param = param_loop("]")
-    grab  # "]"
-    param
-  end
-
-  def funcall(name, param)
-    err = "[Error evaluating $$#{name}(#{param})]"
-    name = name.gsub(/\./, "__")
-    result = 
-      if self.send?(name, param)
-        # do nothing
-      else
-        fobj = ::Livetext::Functions.new
-        fobj.send(name, param) rescue err
-      end
-    result.to_s
-  end
-
-  def grab_func_with_param
-    add_token(:str, @token)
-    func = grab_alpha
-    add_token(:func, func)
-    param = grab_func_param(grab)    # may be null/missing
-    param
-  end
-
-  def double_dollar
-    case peek
-      when Space;   add_token :string, "$$ "; grab
-      when LF, nil; add "$$ "; add_token :str
-      when Alpha;   param = grab_func_with_param
-      else          grab; add_token :str, "$$" + peek
-    end
-  end
-
-#   def grab_func_param
-#     case peek
-#       when "["
-#         param = grab_bracket_param
-#         add_token(:brackets, param)
-#       when ":"
-#         param = grab_colon_param
-#         add_token(:colon, param)
-#     else  # do nothing
-#     end
-#   end
-
-  def escaped
-    grab        # Eat the backslash
-    ch = grab   # Take next char
-    ch
-  end
-
-end
-