livetext 0.8.76 → 0.8.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc5fb0814d68c5672211c15ec2e37cfdf1eb0e82509249fa627f4fcc809653a6
-  data.tar.gz: dd997198c3af0c32b1125fb403ee67d225083c302c3d0bca32c74c89554cf511
+  metadata.gz: 904d935b6923cb3dd8a70dc6042b03a95dcd18851d7e3dfb4d9cae61cc0653b9
+  data.tar.gz: afdfa6c79db3beeb644bd12de6ab2ee061c48b786f87fdc4b6fb10dbeb706f45
 SHA512:
-  metadata.gz: 4d52c231252860de533870f9a31ef9b0c68cfa6579f64d19ed1177e63e9a008e5f35a8aea893ed34a546a419e8f92f644bdf7aa85638786cd55e65007e6202af
-  data.tar.gz: 7822f9b1f34fdfc7791831c425bf079e25f12e35972855c77b267306957cef48c3394bd04a59385c79d8edb517e3d98be47957ab6eba5d42fb5c4442688089f9
+  metadata.gz: 7f18d43dd7672ad30d7c4029e39ddda2eb27316d31f0312cc68f2e751ad34f818949150cb6306dd513194e73d2d54e88b457ce34b37003162f12df3aae476264
+  data.tar.gz: c533499a1aeb11bcdaf5937dd9ce25fed799c0e8c02034cff9c6fe845ae57159b8d2a8f5211eeece89eb09e34d1777b69bb36a65d54b40b142dfb877f22b53a0

data/bin/livetext

@@ -82,3 +82,5 @@ loop do
       x.process_file(arg, @backtrace)
   end
 end
+
+puts x.body

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.76"
+  VERSION = "0.8.77"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -99,6 +99,7 @@ class Livetext
     val = @main.finalize if @main.respond_to? :finalize
     val
   rescue => err
+    puts @body
     puts "process_text: err = #{err}"
     puts err.backtrace.join("\n")
   end
@@ -169,6 +170,7 @@ class Livetext
     end
     result
   rescue => err
+    puts @body
     @main._error!(err)
   end
 

data/lib/processor.rb

@@ -32,6 +32,7 @@ class Livetext
 
     def _error!(err, abort=true, trace=false)
       where = @sources.last || @save_location
+      puts @parent.body
       STDERR.puts "Error: #{err} (at #{where[1]} line #{where[2]})"
       STDERR.puts err.backtrace if trace && err.respond_to?(:backtrace)
       exit if abort

data/lib/standard.rb

@@ -146,6 +146,7 @@ module Livetext::Standard
     str += "end\n"
     eval str
   rescue => err
+    puts @body
     _error!(err)
   end
 

data/lib/userapi.rb

@@ -77,7 +77,8 @@ module Livetext::UserAPI
       lines
     end
   rescue => err
-    # FIXME
+    puts @body
+    # FIXME ?
     _error!("Expecting .end, found end of file")
   end
 
@@ -110,12 +111,17 @@ module Livetext::UserAPI
     _out line
   end
 
-  def _out(str)
-    if @no_puts
-      @parent.body << str
-    else
-      _puts str
-    end
+  def _out(str = "")
+#   if @no_puts
+      @parent.body << str 
+      @parent.body << "\n" unless str.end_with?("\n")
+#   else
+#     _puts str
+#   end
+  end
+
+  def _out!(str = "")
+    @parent.body << str  # no newline
   end
 
   def _puts(*args)

data/plugin/bookish.rb

@@ -11,28 +11,28 @@ def credit
   # really just a place marker in source
 end
 
-def h1; _puts "<h1>#{@_data}</h1>"; end
-def h3; _puts "<h3>#{@_data}</h3>"; end
+def h1; _out "<h1>#{@_data}</h1>"; end
+def h3; _out "<h3>#{@_data}</h3>"; end
 
 def list
-  _puts "<ul>"
-  _body {|line| _puts "<li>#{line}</li>" }
-  _puts "</ul>"
+  _out "<ul>"
+  _body {|line| _out "<li>#{line}</li>" }
+  _out "</ul>"
 end
 
 def list!
-  _puts "<ul>"
-  lines = _body.each   # {|line| _puts "<li>#{line}</li>" }
+  _out "<ul>"
+  lines = _body.each   # {|line| _out "<li>#{line}</li>" }
   loop do 
     line = lines.next
     line = _formatting(line)
     if line[0] == " "
-      _puts line
+      _out line
     else
-      _puts "<li>#{line}</li>"
+      _out "<li>#{line}</li>"
     end
   end
-  _puts "</ul>"
+  _out "</ul>"
 end
 
 def alpha_columns
@@ -42,12 +42,12 @@ def alpha_columns
     words << line.chomp
   end
   words.sort!
-  _puts "<table cellpadding=10>"
+  _out "<table cellpadding=10>"
   words.each_slice(n) do |w|
     items = w.map {|x| "<tt>#{x}</tt>" }
-    _puts "<tr><td width=5% valign=top></td><td>" + items.join("</td><td>") + "</td></tr>"
+    _out "<tr><td width=5% valign=top></td><td>" + items.join("</td><td>") + "</td></tr>"
   end
-  _puts "</table>"
+  _out "</table>"
 end
 
 def comment
@@ -70,7 +70,7 @@ end
 
 def image
   name = @_args[0]
-  _puts "<img src='#{name}'></img>"
+  _out "<img src='#{name}'></img>"
 end
 
 def figure
@@ -78,8 +78,8 @@ def figure
   num = @_args[1]
   title = @_args[2..-1].join(" ")
   title = _formatting(title)
-  _puts "<img src='#{name}'></img>"
-  _puts "<center><b>Figure #{num}</b> #{title}</center>"
+  _out "<img src='#{name}'></img>"
+  _out "<center><b>Figure #{num}</b> #{title}</center>"
 end
 
 def chapter
@@ -89,8 +89,8 @@ def chapter
   title = @_data.split(" ",2)[1]
   @toc << "<br><b>#@chapter</b> #{title}<br>"
   _next_output(_slug(title))
-  _puts "<title>#{@chapter}. #{title}</title>"
-  _puts <<-HTML
+  _out "<title>#{@chapter}. #{title}</title>"
+  _out <<-HTML
     <h2>Chapter #{@chapter}</h1>
     <h1>#{title}</h1>
 
@@ -104,8 +104,8 @@ def chapterN
   _errout("Chapter #@chapter: #{title}")
   @toc << "<br><b>#@chapter</b> #{title}<br>"
   _next_output(_slug(title))
-  _puts "<title>#{@chapter}. #{title}</title>"
-  _puts <<-HTML
+  _out "<title>#{@chapter}. #{title}</title>"
+  _out <<-HTML
     <h2>Chapter #{@chapter}</h1>
     <h1>#{title}</h1>
 
@@ -119,7 +119,7 @@ def sec
 # _errout("section #@section")
   @toc << "#{_nbsp(3)}<b>#@section</b> #@_data<br>"
 # _next_output(_slug(@_data))
-  _puts "<h3>#@section #{@_data}</h3>\n"
+  _out "<h3>#@section #{@_data}</h3>\n"
 end
 
 def subsec
@@ -128,7 +128,7 @@ def subsec
   @toc << "#{_nbsp(6)}<b>#@subsec</b> #@_data<br>"
 # _errout("section #@subsec")
 # _next_output(_slug(@_data))
-  _puts "<h3>#@subsec #{@_data}</h3>\n"
+  _out "<h3>#@subsec #{@_data}</h3>\n"
 end
 
 def table2
@@ -136,21 +136,21 @@ def table2
   wide = "90"
   extra = _args[2]
   delim = " :: "
-  _puts "<br><center><table border=1 width=#{wide}% cellpadding=5>"
+  _out "<br><center><table border=1 width=#{wide}% cellpadding=5>"
   lines = _body(true)
   lines.map! {|line| _formatting(line) }
 
   lines.each do |line|
     cells = line.split(delim)
     percent = (100/cells.size.to_f).round
-    _puts "<tr>"
+    _out "<tr>"
     cells.each do |cell| 
-      _puts "  <td width=#{percent}% valign=top " + 
+      _out "  <td width=#{percent}% valign=top " + 
             "#{extra}>#{cell}</td>"
     end
-    _puts "</tr>"
+    _out "</tr>"
   end
-  _puts "</table></center><br><br>"
+  _out "</table></center><br><br>"
 
   _optional_blank_line
 end
@@ -158,7 +158,7 @@ end
 def simple_table
   title = @_data
   delim = " :: "
-  _puts "<table cellpadding=2>"
+  _out "<table cellpadding=2>"
   lines = _body(true)
   maxw = nil
   lines.each do |line|
@@ -174,14 +174,14 @@ def simple_table
 
   lines.each do |line|
     cells = line.split(delim)
-    _puts "<tr>"
+    _out "<tr>"
     cells.each.with_index do |cell, i| 
-      _puts "  <td width=#{maxw}% valign=top>" + 
+      _out "  <td width=#{maxw}% valign=top>" + 
             "#{cell}</td>"
     end
-    _puts "</tr>"
+    _out "</tr>"
   end
-  _puts "</table>"
+  _out "</table>"
 end
 
 def table
@@ -189,7 +189,7 @@ def table
   @table_num += 1
   title = @_data
   delim = " :: "
-  _puts "<br><center><table border=1 width=90% cellpadding=5>"
+  _out "<br><center><table border=1 width=90% cellpadding=5>"
   lines = _body(true)
   maxw = nil
   lines.each do |line|
@@ -205,23 +205,24 @@ def table
 
   lines.each do |line|
     cells = line.split(delim)
-    _puts "<tr>"
+    _out "<tr>"
     cells.each.with_index do |cell, i| 
-      _puts "  <td width=#{maxw}% valign=top>" + 
+      _out "  <td width=#{maxw}% valign=top>" + 
             "#{cell}</td>"
     end
-    _puts "</tr>"
+    _out "</tr>"
   end
-  _puts "</table>"
+  _out "</table>"
   @toc << "#{_nbsp(8)}<b>Table #@chapter.#@table_num</b> #{title}<br>"
 # _next_output(_slug("table_#{title}"))
-  _puts "<b>Table #@chapter.#@table_num &nbsp;&nbsp; #{title}</b></center><br>"
+  _out "<b>Table #@chapter.#@table_num &nbsp;&nbsp; #{title}</b></center><br>"
 end
 
 def toc!
   _debug "Closing TOC"
   @toc.close
 rescue => err
+   puts @body
   _errout "Exception: #{err.inspect}"
 end
 
@@ -242,7 +243,7 @@ def missing
   @toc << "#{_nbsp(8)}<font color=red>TBD: #@_data</font><br>"
   _print "<br><font color=red><i>[Material missing"
   _print ": #@_data" unless @_data.empty?
-  _puts "]</i></font><br>\n "
+  _out "]</i></font><br>\n "
 end
 
 def TBC
@@ -251,15 +252,15 @@ def TBC
 end
 
 def note
-  _puts "<br><font color=red><i>Note: "
-  _puts @_data 
-  _puts "</i></font><br>\n "
+  _out "<br><font color=red><i>Note: "
+  _out @_data 
+  _out "</i></font><br>\n "
 end
 
 def quote
-  _puts "<blockquote>"
-  _puts _body
-  _puts "</blockquote>"
+  _out "<blockquote>"
+  _out _body
+  _out "</blockquote>"
 end
 
 def init_bookish

data/plugin/markdown.rb

@@ -6,12 +6,12 @@ SimpleFormats[:i] = %w[_ _]
 SimpleFormats[:t] = %w[` `]
 SimpleFormats[:s] = %w[<strike> </strike>]
 
-def h1; _puts "# #{@_data}"; _optional_blank_line end       # atx style for now
-def h2; _puts "## #{@_data}"; _optional_blank_line end
-def h3; _puts "### #{@_data}"; _optional_blank_line end
-def h4; _puts "#### #{@_data}"; _optional_blank_line end
-def h5; _puts "##### #{@_data}"; _optional_blank_line end
-def h6; _puts "###### #{@_data}"; _optional_blank_line end
+def h1; _out "# #{@_data}"; _optional_blank_line end       # atx style for now
+def h2; _out "## #{@_data}"; _optional_blank_line end
+def h3; _out "### #{@_data}"; _optional_blank_line end
+def h4; _out "#### #{@_data}"; _optional_blank_line end
+def h5; _out "##### #{@_data}"; _optional_blank_line end
+def h6; _out "###### #{@_data}"; _optional_blank_line end
 
 def title
   h1
@@ -22,18 +22,18 @@ def section
 end
 
 def bq   # block quote
-  _body {|line| _puts "> #{line}" }
+  _body {|line| _out "> #{line}" }
 end
 
 def list
-  _body {|line| _puts " * #{line}" }
+  _body {|line| _out " * #{line}" }
 end
 
 def olist   # Doesn't handle paragraphs yet
   n = 0
   _body do |line|
     n += 1
-    _puts "#{n}. #{_formatting(line)}"
+    _out "#{n}. #{_formatting(line)}"
   end
 end
 

data/plugin/pyggish.rb

@@ -185,9 +185,9 @@ def code       # FIXME ?
 end
 
 def mono
-  _puts "<pre>"
-  _body(true) {|line| _puts "    " + line }
-  _puts "</pre>"
+  _out "<pre>"
+  _body(true) {|line| _out "    " + line }
+  _out "</pre>"
 end
 
 

data/plugin/tutorial.rb

@@ -9,7 +9,7 @@ def section
 end
 
 def code
-# _puts "<pre>"
+# _out "<pre>"
   first = true  # dumb hack! fixes blank space
   _body do |line| 
     if first
@@ -17,9 +17,9 @@ def code
       first = false
     else
     end
-    _puts "#{tag}   #{::CGI.escape_html(line)}"   # indentation
+    _out "#{tag}   #{::CGI.escape_html(line)}"   # indentation
   end
-  _puts "</pre>"
+  _out "</pre>"
 end
 
 def rx(str)
@@ -80,9 +80,9 @@ end
 
 def testcase
   name = _args.first
-  _puts "\n<font size=+1><b>Test: </font><font size=+2><tt>#{name}</tt></font></b></h3><br>"
+  _out "\n<font size=+1><b>Test: </font><font size=+2><tt>#{name}</tt></font></b></h3><br>"
   src, exp = "test/data/#{name}/source.lt3", "test/data/#{name}/expected-output.txt"
   @_args = [src, exp]   # Better way to do this??
   put_table(src, exp)
-  _puts "<br>"
+  _out "<br>"
 end

data/test/data/error_invalid_name/expected-output.txt

@@ -1,3 +1,4 @@
+
 This file has
 a defined method
 that is invalid:

data/test/data/error_missing_end/expected-output.txt

@@ -1,3 +1,4 @@
+
 Blah
 blah
 <p>

data/test/data/example_alpha/expected-output.txt

@@ -1,6 +1,3 @@
-Here is an alphabetized list:
-<p>
-
     aardvark
     anamorphic
     anarchist
@@ -18,6 +15,9 @@ Here is an alphabetized list:
     quark
     zootrope
     zymurgy
+Here is an alphabetized list:
+<p>
+
 <p>
 
 That's all.

data/test/data/example_alpha2/expected-output.txt

@@ -1,12 +1,12 @@
-Here is an alphabetized list:
-<p>
-
 aardvark       anamorphic     anarchist      
 bellicose      cytology       ectomorph      
 fishmonger     fusillade      glyph          
 gryphon        halcyon        manicotti      
 mataeotechny   pareidolia     quark          
 zootrope       zymurgy        
+Here is an alphabetized list:
+<p>
+
 <p>
 
 And that is all.

data/test/data/raw_text_block/source.lt3

@@ -1,3 +1,4 @@
+.backtrace
 This text block will be passed thru
 with no interpretation or processing:
 .raw

data/test/data/simple_mixin/expected-output.txt

@@ -1,5 +1,2 @@
 Here I am
 testing a simple mixin
-Now call it:
-Hello, world.
-That's all.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.8.76
+  version: 0.8.77
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-19 00:00:00.000000000 Z
+date: 2019-04-21 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com