livetext 0.9.22 → 0.9.23

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.22
+  version: 0.9.23
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -24,13 +24,14 @@ files:
 - imports/calibre.rb
 - imports/livemagick.rb
 - imports/markdown.rb
-- imports/markdown_importable.rb
 - imports/pyggish.rb
 - imports/tutorial.rb
 - lib/cmdargs.rb
 - lib/errors.rb
 - lib/formatline.rb
+- lib/funcall.rb
 - lib/functions.rb
+- lib/global_helpers.rb
 - lib/handler.rb
 - lib/handler/import.rb
 - lib/helpers.rb
@@ -42,6 +43,7 @@ files:
 - lib/parser/mixin.rb
 - lib/parser/set.rb
 - lib/parser/string.rb
+- lib/parsing.rb
 - lib/processor.rb
 - lib/standard.rb
 - lib/userapi.rb
@@ -70,12 +72,12 @@ files:
 - test/snapshots/def_method/expected-error.txt
 - test/snapshots/def_method/expected-output.txt
 - test/snapshots/def_method/source.lt3
+- test/snapshots/error_inc_line_num/OUT
 - test/snapshots/error_inc_line_num/actual-error.txt
 - test/snapshots/error_inc_line_num/actual-output.txt
 - test/snapshots/error_inc_line_num/expected-output.txt
 - test/snapshots/error_inc_line_num/file2.lt3
 - test/snapshots/error_inc_line_num/match-error.txt
-- test/snapshots/error_inc_line_num/out-sdiff.txt
 - test/snapshots/error_inc_line_num/source.lt3
 - test/snapshots/error_invalid_name/actual-error.txt
 - test/snapshots/error_invalid_name/actual-output.txt
@@ -102,11 +104,13 @@ files:
 - test/snapshots/error_no_such_copy/actual-output.txt
 - test/snapshots/error_no_such_copy/expected-output.txt
 - test/snapshots/error_no_such_copy/match-error.txt
+- test/snapshots/error_no_such_copy/out-sdiff.txt
 - test/snapshots/error_no_such_copy/source.lt3
 - test/snapshots/error_no_such_inc/actual-error.txt
 - test/snapshots/error_no_such_inc/actual-output.txt
 - test/snapshots/error_no_such_inc/expected-output.txt
 - test/snapshots/error_no_such_inc/match-error.txt
+- test/snapshots/error_no_such_inc/out-sdiff.txt
 - test/snapshots/error_no_such_inc/source.lt3
 - test/snapshots/error_no_such_mixin/actual-error.txt
 - test/snapshots/error_no_such_mixin/actual-output.txt
@@ -126,17 +130,22 @@ files:
 - test/snapshots/hello_world/expected-error.txt
 - test/snapshots/hello_world/expected-output.txt
 - test/snapshots/hello_world/source.lt3
-- test/snapshots/import/actual-error.txt
-- test/snapshots/import/actual-output.txt
 - test/snapshots/import/expected-output.txt
 - test/snapshots/import/match-error.txt
-- test/snapshots/import/out-sdiff.txt
 - test/snapshots/import/simple_import.rb
 - test/snapshots/import/source.lt3
 - test/snapshots/import2/expected-error.txt
 - test/snapshots/import2/expected-output.txt
 - test/snapshots/import2/simple_import.rb
 - test/snapshots/import2/source.lt3
+- 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/expected-error.txt
 - test/snapshots/more_complex_vars/expected-output.txt
 - test/snapshots/more_complex_vars/source.lt3
@@ -179,10 +188,6 @@ 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/wtf_bookish/expected-error.txt
-- test/snapshots/wtf_bookish/expected-output.txt
-- test/snapshots/wtf_bookish/source.lt3
-- test/snapshots/wtf_bookish/toc.tmp
 - test/testlines.rb
 - test/unit/all.rb
 - test/unit/formatline.rb
@@ -190,7 +195,6 @@ files:
 - test/unit/parser.rb
 - test/unit/parser/all.rb
 - test/unit/parser/general.rb
-- test/unit/parser/importable.rb
 - test/unit/parser/mixin.rb
 - test/unit/parser/set.rb
 - test/unit/parser/string.rb

data/imports/markdown_importable.rb

@@ -1,45 +0,0 @@
-# This file is intended to be used via a Livetext .mixin
-# or the equivalent.
-
-require_relative '../lib/livetext/importable'
-
-class MarkdownImportable < LiveText::Importable
-
-  SimpleFormats[:b] = %w[* *]
-  SimpleFormats[:i] = %w[_ _]
-  SimpleFormats[:t] = %w[` `]
-  SimpleFormats[:s] = %w[<strike> </strike>]
-
-  def h1; _out "# #{Livetext.interpolate(@_data)}"; _optional_blank_line end       # atx style for now
-  def h2; _out "## #{Livetext.interpolate(@_data)}"; _optional_blank_line end
-  def h3; _out "### #{Livetext.interpolate(@_data)}"; _optional_blank_line end
-  def h4; _out "#### #{Livetext.interpolate(@_data)}"; _optional_blank_line end
-  def h5; _out "##### #{Livetext.interpolate(@_data)}"; _optional_blank_line end
-  def h6; _out "###### #{Livetext.interpolate(@_data)}"; _optional_blank_line end
-
-  def title
-    h1
-  end
-
-  def section
-    h3
-  end
-
-  def bq   # block quote
-    _body {|line| _out "> #{line}" }
-  end
-
-  def list
-    _body {|line| _out " * #{line}" }
-  end
-
-  def olist   # Doesn't handle paragraphs yet
-    n = 0
-    _body do |line|
-      n += 1
-      _out "#{n}. #{_format(line)}"
-    end
-  end
-
-  alias nlist olist
-end

data/test/snapshots/error_inc_line_num/out-sdiff.txt

@@ -1,14 +0,0 @@
-ACTUAL                                                      | EXPECTED                                                    
-This is my                                                    This is my 
-source file                                                   source file
-which includes file2 here:                                    which includes file2 here:
-  This is file2                                                 This is file2
-  which has an error                                            which has an error
-  about an unknown command                                      about an unknown command
-  in line 5                                                     in line 5
-                                                            > <p>
-                                                            >
-                                                            >   And this is file2 line 7.
-                                                            > And here we are
-                                                            > back in the
-                                                            > original file.

data/test/snapshots/import/actual-error.txt

@@ -1,13 +0,0 @@
-/Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:34:in `find_file': No such mixin 'nonexistent' (RuntimeError)
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/handler/import.rb:9:in `initialize'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/handler/import.rb:13:in `new'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/handler/import.rb:13:in `get_module'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/standard.rb:243:in `import'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:95:in `handle_dotcmd'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:73:in `process_line'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:61:in `block in process_file'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `loop'
-	from /Users/Hal/Dropbox/topx/git/livetext/lib/helpers.rb:58:in `process_file'
-	from ../../../bin/livetext:86:in `block in <main>'
-	from ../../../bin/livetext:57:in `loop'
-	from ../../../bin/livetext:57:in `<main>'

data/test/snapshots/import/out-sdiff.txt

@@ -1,6 +0,0 @@
-ACTUAL                                                      | EXPECTED                                                    
-                                                            > Test fake command .icanhaz:
-                                                            > we give an error
-                                                            > when a .rb does not
-                                                            > exist:
-                                                            > <p>

data/test/unit/parser/importable.rb

@@ -1,19 +0,0 @@
-
-require 'minitest/autorun'
-
-require_relative '../../../lib/parser/set'
-
-# ParseSet = Livetext::ParseSet
-
-class TestParseSet < MiniTest::Test
-
-  def setup
-  end
-
-  def teardown
-  end
-
-  # FIXME no tests yet
-  # Bad syntax? File not found? not found searching upward?
-
-end