livetext 0.9.33 → 0.9.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c6ed527394d333fd5c667d5737093c26595794269dcf444d72bc28cdcbf8c61
-  data.tar.gz: 7eb6d6907ebfd5bfd2ee7f8253a0c3a051d06cd83ffaac5baca388406168db6c
+  metadata.gz: 2dceb322a5f44e776bab9ed9113c7c7a4adf29eff271be81a613c72a081a2d51
+  data.tar.gz: 70576d3a39fccbe7f3285ddca930f79400b8d770ef600d043e2b3690f173ba23
 SHA512:
-  metadata.gz: 57b37bb2795cacaa81f86f4d251d438b92dd8d0fd7f71839eb68edda95a4bf5d60a56af46d93d9ba93de118b7b878eea53f5daecab6459dd73a0167a5aba33d4
-  data.tar.gz: 7c7fb6ac4101629dd86b0901a961fc8d4c4901b661ff0eb8553081f7617601c7d807df03212ac57ab14b8c740a3a60efcfd3c2d951bea6b509f57a89170fa2b9
+  metadata.gz: 8d91e26a1721ce60ca41ff49a323df2e4ef0a365b0b4eec9b224cbef8381e48b6ab4f3c0bb63e74ada905efb101c69a33e021f521420abe56927b16a46e02091
+  data.tar.gz: fa718856dcbb75bb4f60f49f31638041158b815335ba9df3680c2ca0b117a2584d66921e06dae30b266f3104a465f826904a797e3e1a546960d75d6dc79d9d4b

data/bin/livetext

@@ -93,8 +93,8 @@ def parse_command_line
     end
   end
   @live.dump if success
-# rescue => err
-#   STDERR.puts "Unexpected error! #{err.inspect}"
+rescue => err
+  STDERR.puts "Unexpected error! #{err.inspect}\n#{err.backtrace.join("\n")}"
 end
 
 # Main

data/imports/bookish.rb

@@ -98,14 +98,18 @@ module Bookish
   end
 
   def sec(args = nil, body = nil)
+api.tty "## sec: cp 1"
     @sec += 1
     @sec2 = 0
     @section = "#@chapter.#@sec"
+api.tty "## sec: cp 2"
     title = api.data.dup
     @toc << "#{_nbsp(3)}<b>#@section</b> #{title}<br>"
-    api.data = _slug(api.data)
+    api.data = _slug(title)
+api.tty "## sec: cp 3"
     next_output
     api.out "<h3>#@section #{title}</h3>\n"
+api.tty "## sec: cp 4"
   rescue => err
     ::STDERR.puts "#{err}\n#{err.backtrace}"
     exit

data/lib/livetext/helpers.rb

@@ -2,6 +2,7 @@
 require_relative 'global_helpers'
 require_relative 'expansion'
 
+
 module Livetext::Helpers
 
   Space = " "
@@ -98,13 +99,16 @@ module Livetext::Helpers
     when Comment
       success = handle_scomment(line)
     when DotCmd
-      success = handle_dotcmd(line)
+      success = handle_dotcmd(line)       # was 102
     when DollarDot
       success = handle_dollar_dot(line)
     else
       api.passthru(line)  # must succeed?
     end
     success
+  rescue => err
+    STDERR.puts "ERROR: #{err}\n#{err.backtrace.join("\n")}"
+    exit
   end
 
   def handle_dollar_dot(line)
@@ -120,7 +124,7 @@ module Livetext::Helpers
     api.data = data0.dup   # should permit _ in function names at least
     args0 = data0.split
     api.args = args0.dup
-    retval = @main.send(name)  # , *args)
+    retval = @main.send(name)  # , *args)      # was 125
     retval
   rescue => err
     graceful_error(err)
@@ -135,7 +139,7 @@ module Livetext::Helpers
       when name == :end   # special case
         graceful_error EndWithoutOpening()
       when @main.respond_to?(name)
-        success = invoke_dotcmd(name, data)
+        success = invoke_dotcmd(name, data)    # was 141
     else
       graceful_error UnknownMethod(name)
     end
@@ -250,3 +254,9 @@ module Livetext::Helpers
   end
 
 end
+
+=begin
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.35/lib/livetext/helpers.rb:125:in `invoke_dotcmd'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.35/lib/livetext/helpers.rb:141:in `handle_dotcmd'
+/Users/Hal/.rvm/gems/ruby-2.7.0/gems/livetext-0.9.35/lib/livetext/helpers.rb:102:in `process_line'
+=end

data/lib/livetext/html.rb

@@ -1,43 +1,48 @@
 
-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
+# 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)
+    raise "API is nil!" unless api
     @api = api
     @indent = 0
   end
 
+  def api
+    @api
+  end
+
   def indented
     " "*@indent
   end
@@ -69,10 +74,6 @@ class HTML
     wrap(:li, **details, &block)
   end
 
-  def api
-    @api
-  end
-
   def open_close_tags(*tags)
     open, close = "", ""
     tags.each do |tag|
@@ -87,6 +88,7 @@ class HTML
     extras.each_pair do |name, value|
       open.sub!(">", " #{name}='#{value}'>")
     end
+# STDERR.puts "#wrap - @api = #{@api.inspect}\n-----------"
     api.out indented + open 
     indent(:in)
     yield

data/lib/livetext/more.rb

@@ -138,6 +138,10 @@ class Livetext
     @api
   end
 
+  def api=(obj)
+    @api = obj
+  end
+
   def initial_vars
     # Other predefined variables (see also setfile)
     @api.setvar(:User, `whoami`.chomp)

data/lib/livetext/processor.rb

@@ -27,6 +27,8 @@ class Processor
 
   def initialize(parent, output = nil)
     @parent = parent
+    # STDERR.puts "PARENT.api = #{parent.api.inspect}"
+    @parent.api ||= Livetext::UserAPI.new(@parent)
     @nopass = false
     @nopara = false
     # Meh?

data/lib/livetext/standard.rb

@@ -14,7 +14,7 @@ make_exception(:FileNotFound,     "Error: file '%1' not found")
 
 module Livetext::Standard
 
-  include HTMLHelper
+# include HTMLHelper
   include Livetext::Helpers
 
   TTY = ::File.open("/dev/tty", "w")
@@ -82,14 +82,14 @@ module Livetext::Standard
   def h6; api.out wrapped(api.data, :h6); return true; end
 
   def list
-    wrap :ul do
+    html.wrap :ul do
       api.body {|line| api.out wrapped(line, :li) }
     end
     api.optional_blank_line
   end
 
   def list!
-    wrap(:ul) do
+    html.wrap(:ul) do
       lines = api.body.each   # enumerator
       loop do
         line = lines.next
@@ -117,9 +117,10 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def say
-    str = api.format(api.data)
-    TTY.puts str
+  def say(arg=nil)
+    data = arg || api.args.join(" ")
+    str = api.format(data)
+    TTY.puts "(say) #{str}"
     api.optional_blank_line
   end
 
@@ -281,7 +282,7 @@ module Livetext::Standard
   end
 
   def debug
-    self._debug = onoff(api.args.first)
+    @debug = onoff(api.args.first)
     api.optional_blank_line
   end
 
@@ -321,7 +322,7 @@ module Livetext::Standard
   end
 
   def mono
-    wrap ":pre" do
+    html.wrap ":pre" do
       api.body(true) {|line| api.out line }
     end
     api.optional_blank_line
@@ -329,7 +330,7 @@ module Livetext::Standard
 
   def dlist
     delim = api.args.first
-    wrap(:dl) do
+    html.wrap(:dl) do
       api.body do |line|
         line = api.format(line)
         term, defn = line.split(delim)
@@ -369,7 +370,7 @@ module Livetext::Standard
 
     processed.each do |line|
       cells = line.split(delim)
-      wrap :tr do
+      html.wrap :tr do
         cells.each {|cell| api.out "  <td valign=top>#{cell}</td>" }
       end
     end
@@ -378,8 +379,10 @@ module Livetext::Standard
   end
 
   def image
-    name = api.args[0]
-    api.out "<img src='#{name}'></img>"
+    name, wide, high = api.args
+    geom = ""
+    geom = "width=#{wide} height=#{high}" if wide || high
+    api.out "<img src='#{name} #{geom}'></img>"
     api.optional_blank_line
   end
 

data/lib/livetext/userapi.rb

@@ -5,6 +5,8 @@ require_relative 'html'
 
 class Livetext::UserAPI
 
+  include ::Livetext::Standard
+
   KBD = File.new("/dev/tty", "r")
   TTY = File.new("/dev/tty", "w")
 
@@ -33,6 +35,8 @@ class Livetext::UserAPI
 
   def include_file(file)
     api.data = file
+    api.args = [file]
+STDERR.puts "incfile: #{api.methods.sort.inspect}\n "
     api.dot_include
   end
 

data/lib/livetext/version.rb

@@ -2,5 +2,5 @@
 # Defining VERSION
 
 class Livetext
-  VERSION = "0.9.33"
+  VERSION = "0.9.36"
 end

data/plugin/bookish.rb

@@ -1,6 +1,7 @@
 def hardbreaks(args = nil, body = nil)
   @hard = false
   @hard = true unless api.args.first == "off"
+  api.optional_blank_line
 end
 
 def hardbreaks?
@@ -9,13 +10,14 @@ end
 
 def credit(args = nil, body = nil)
   # really just a place marker in source
+  api.optional_blank_line
 end
 
 # These are duplicated. Remove safely
 
-def h1; api.out "<h1>#{api.data}</h1>"; end
-def h2; api.out "<h2>#{api.data}</h2>"; end
-def h3; api.out "<h3>#{api.data}</h3>"; end
+def h1; api.out "<h1>#{api.data}</h1>"; api.optional_blank_line; end
+def h2; api.out "<h2>#{api.data}</h2>";  api.optional_blank_line; end
+def h3; api.out "<h3>#{api.data}</h3>";  api.optional_blank_line; end
 
 def alpha_columns(args = nil, body = nil)
   n = api.args.first.to_i   # FIXME: what if it's missing?
@@ -30,6 +32,7 @@ def alpha_columns(args = nil, body = nil)
     api.out "<tr><td width=5% valign=top></td><td>" + items.join("</td><td>") + "</td></tr>"
   end
   api.out "</table>"
+  api.optional_blank_line
 end
 
 # def comment
@@ -55,6 +58,7 @@ end
 def image(args = nil, body = nil)
   name = api.args[0]
   api.out "<img src='#{name}'></img>"
+  api.optional_blank_line
 end
 
 def figure(args = nil, body = nil)
@@ -64,6 +68,7 @@ def figure(args = nil, body = nil)
   title = api.format(title)
   api.out "<img src='#{name}'></img>"
   api.out "<center><b>Figure #{num}</b> #{title}</center>"
+  api.optional_blank_line
 end
 
 def chapter(args = nil, body = nil)
@@ -79,6 +84,7 @@ def chapter(args = nil, body = nil)
     <h1>#{title}</h1>
 
   HTML
+  api.optional_blank_line
 end
 
 def chapterN(args = nil, body = nil)
@@ -95,6 +101,7 @@ def chapterN(args = nil, body = nil)
     <h1>#{title}</h1>
 
   HTML
+  api.optional_blank_line
 end
 
 def sec(args = nil, body = nil)
@@ -106,7 +113,9 @@ def sec(args = nil, body = nil)
   api.data = _slug(api.data)
   next_output
   api.out "<h3>#@section #{title}</h3>\n"
+  api.optional_blank_line
 rescue => err
+  api.tty  "#{err}\n#{err.backtrace}"
   ::STDERR.puts "#{err}\n#{err.backtrace}"
   exit
 end
@@ -119,6 +128,7 @@ def subsec(args = nil, body = nil)
   api.data = _slug(api.data)
   next_output
   api.out "<h3>#@subsec #{title}</h3>\n"
+  api.optional_blank_line
 end
 
 def definition_table(args = nil, body = nil)
@@ -234,6 +244,7 @@ end
 def toc!(args = nil, body = nil)
   _debug "Closing TOC"
   @toc.close
+  api.optional_blank_line
 rescue => err
    puts @parent.body
    @parent.body = ""
@@ -251,29 +262,34 @@ def toc2(args = nil, body = nil)
 
 EOS
   system("cat toc.tmp >>#{file}")
+  api.optional_blank_line
 end
 
 def missing(args = nil, body = nil)
   @toc << "#{_nbsp(8)}<font color=red>TBD: #{api.data}</font><br>"
   stuff = api.data.empty? ? "" : ": #{api.data}"
   api.out "<br><font color=red><i>[Material missing#{stuff}]</i></font><br>\n "
+  api.optional_blank_line
 end
 
 def TBC(args = nil, body = nil)
   @toc << "#{_nbsp(8)}<font color=red>To be continued...</font><br>"
   api.out "<br><font color=red><i>To be continued...</i></font><br>"
+  api.optional_blank_line
 end
 
 def note(args = nil, body = nil)
   api.out "<br><font color=red><i>Note: "
   api.out api.data 
   api.out "</i></font><br>\n "
+  api.optional_blank_line
 end
 
 def quote(args = nil, body = nil)
   api.out "<blockquote>"
   api.body {|line| api.out line }
   api.out "</blockquote>"
+  api.optional_blank_line
 rescue => err
   ::STDERR.puts "#{err}\n#{err.backtrace}"
   exit
@@ -285,3 +301,102 @@ def init_bookish
   @chapter = -1
 end
 
+###################  custom.rb
+
+
+def outdir
+  @_outdir = api.args.first
+# @output = STDOUT
+  @output = nil
+  api.optional_blank_line
+end
+
+def outdir!  # FIXME ?
+  @_outdir = api.args.first
+  raise "No output directory specified" if @_outdir.nil?
+  raise "No output directory specified" if @_outdir.empty?
+  system("rm -f #@_outdir/*.html")
+  api.optional_blank_line
+end
+
+def _append(name)
+  @_outdir ||= "."
+  @output.close unless @output == STDOUT
+  @output = File.open(@_outdir + "/" + name, "a")
+  @output.puts "<meta charset='UTF-8'>\n\n"
+end
+
+
+def append
+  file = api.args[0]
+  _append(file)
+end
+
+def close_output
+  return if @output == STDOUT
+  @_outdir ||= "."
+  @output.puts "<meta charset='UTF-8'>\n\n"
+  @output.puts @parent.body
+  @output.close
+  @parent.body = ""   # See bin/livetext
+  @output = STDOUT
+end
+
+def _prep_next_output(args)
+  tag, num = args    # _next_output(tag, num)
+  @_file_num = num ? num : @_file_num + 1
+  @_file_num = @_file_num.to_i
+  name = "#{'%03d' % @_file_num}-#{tag}.html"
+  api.tty "tag, num, name= #{[tag, num, name].inspect}"
+  name
+end
+
+def next_output
+  name = _prep_next_output(api.args)
+  @_outdir ||= "."
+  unless @output.nil?
+    @output.puts "<meta charset='UTF-8'>\n\n"
+    @output.puts @parent.body
+    @parent.body = ""
+    @output.close unless @output == STDOUT
+  end
+  fname = @_outdir + "/" + name
+  @output = File.open(fname, "w")
+  api.optional_blank_line
+end
+
+def output
+  name = api.args.first
+  _debug "Redirecting output to: #{name}"
+  # _output(name)
+  @_outdir ||= "."  # FIXME
+  @output.puts "<meta charset='UTF-8'>\n\n"
+  @output.puts @parent.body
+  @parent.body = ""
+  @output.close unless @output == STDOUT
+  fname = @_outdir + "/" + name    #; STDERR.puts "---  _output: fname = #{fname.inspect}"
+  @output = File.open(fname, "w")  #; STDERR.puts "---- @out = #{@output.inspect}"
+end
+
+def columns
+  api.out "<table border=1><tr><td valign=top><br>\n"
+  api.body.to_a.each do |line|
+    if line.start_with?("##col")
+      api.out "</td><td valign=top>"
+    elsif line.start_with?("##row")
+      api.out "</td></tr><tr><td valign=top>"
+    else
+      api.out line
+    end
+  end
+  api.out "<br>\n</td></tr></table>"
+end
+
+def quote
+  api.out "<blockquote>"
+  lines = api.body.to_a
+# STDERR.puts "-----------------------------------------------------"
+# STDERR.puts lines.inspect
+  lines.each {|line| api.out line }
+  api.out "</blockquote>"
+end

data/plugin/pyggish.rb

@@ -82,14 +82,26 @@ def self.pyg_finalize(code, lexer=:elixir)
     result
   end
 
-  def fragment
+  def fragment(args = nil, body = nil)
     lang = api.args.empty? ? :elixir : api.args.first.to_sym   # ruby or elixir
     api.args = []
-  # TTY.puts "\n#{self.inspect}"
-    send(lang)
+    lines = api.body(true)  # .to_a  # raw
+    result = send(lang, lines)
+    api.out result
     api.out "\n"
+    api.optional_blank_line
+  rescue => err
+    STDERR.puts "fragment Error: #{__method__} err = #{err}\n#{err.backtrace.join("\n")}"
   end
 
+def dammit(args = nil, body = nil)
+  lines = api.body(true)
+  api.out "BODY:"
+  lines.each {|x| api.out x }
+  api.out "END BODY"
+  api.optional_blank_line
+end
+
   def code       # FIXME ?
     text = ""   
     api.body {|line| api.out "    " + line }
@@ -145,8 +157,9 @@ def self.pyg_finalize(code, lexer=:elixir)
     text
   end
 
-  def ruby
+  def xruby
     file = api.args.first 
+    code = nil
     if file.nil?
       code = "  # Ruby code\n\n"
       api.body {|line| code << "  " + line + "\n" }
@@ -158,15 +171,76 @@ def self.pyg_finalize(code, lexer=:elixir)
     api.out html
   end
 
-  def elixir
+  def xelixir
     file = api.args.first 
+    code = nil
     if file.nil?
       code = ""
       api.body {|line| code << "  " + line + "\n" }
     else
       code = ::File.read(file)
     end
-
     html = format_elixir(code)
     api.out html
+  end
+
+def ruby(lines)
+  theme = :Github  # default
+  source = lines.join("\n")
+  formatter = Rouge::Formatters::HTML.new
+  lexer = Rouge::Lexers::Ruby.new
+  body = formatter.format(lexer.lex(source))
+
+# css = Rouge::Themes.const_get(theme.to_s).render(scope: '.highlight')
+# added = ".highlight { font-family: courier; white-space: pre }"
+
+  result = <<~HTML
+    <div class="highlight">
+#{body}
+    </div>
+    <br>
+  HTML
+  return result
+
+  iheight = lines.size * 25
+  api.out <<~HTML
+    <center>
+      <iframe width=90% height=#{iheight} src='#{File.basename(html_file)}'></iframe>
+    </center>
+    <br>
+  HTML
+rescue => err
+  STDERR.puts "Error: #{__method__} err = #{err}\n#{err.backtrace.join("\n")}"
 end
+
+
+def elixir(lines)
+  theme = :Github  # default
+  source = lines.join("\n")
+  formatter = Rouge::Formatters::HTML.new
+  lexer = Rouge::Lexers::Elixir.new
+  body = formatter.format(lexer.lex(source))
+
+# css = Rouge::Themes.const_get(theme.to_s).render(scope: '.highlight')
+# added = ".highlight { font-family: courier; white-space: pre }"
+
+  result = <<~HTML
+    <div class="highlight">
+#{body}
+    </div>
+    <br>
+  HTML
+  return result
+
+  iheight = lines.size * 25
+  api.out <<~HTML
+    <center>
+      <iframe width=90% height=#{iheight} src='#{File.basename(html_file)}'></iframe>
+    </center>
+    <br>
+  HTML
+rescue => err
+  STDERR.puts "Error: #{__method__} err = #{err}\n#{err.backtrace}"
+end
+
+

data/test/unit/html.rb

@@ -9,29 +9,27 @@ class TestingLivetext < MiniTest::Test
   # Same is probably true of the methods that are testing them.
 
   def test_wrapped
-    cdata = "nothing much"
-    assert_equal wrapped(cdata, :b),     "<b>#{cdata}</b>"
-    assert_equal wrapped(cdata, :b, :i), "<b><i>#{cdata}</i></b>"
-
-    assert_equal wrapped(cdata, :table, :tr, :td),
-                          "<table><tr><td>#{cdata}</td></tr></table>"
+    live = Livetext.new
+    html = 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>"
+
+    assert_equal html.tag(:table, :tr, :td, cdata: str),
+                          "<table><tr><td>#{str}</td></tr></table>"
   end
 
-  def test_wrapped_bang
-    cdata = "nothing much"
-    assert_equal wrapped!(cdata, :td, valign: :top), 
-                     "<td valign='top'>#{cdata}</td>"
-    assert_equal wrapped!(cdata, :img, src: "foo.jpg"),
-                    "<img src='foo.jpg'>#{cdata}</img>"
-    assert_equal wrapped!(cdata, :a, style: 'text-decoration: none', 
+  def test_wrapped_extra
+    live = Livetext.new
+    html = HTML.new(live.api)
+    str = "nothing much"
+    assert_equal html.tag(:td, cdata: str, valign: :top), 
+                     "<td valign='top'>#{str}</td>"
+    assert_equal html.tag(:img, cdata: str, src: "foo.jpg"),
+                    "<img src='foo.jpg'>#{str}</img>"
+    assert_equal html.tag(:a, cdata: str, style: 'text-decoration: none', 
                      href: 'foo.com'),
-                     "<a style='text-decoration: none' href='foo.com'>#{cdata}</a>"
-  end
-
-  def xtest_wrap
-    # bogus!
-    wrap(:ul) { 2.times {|i| _out i } }
-    dump  # puts @body
+                     "<a style='text-decoration: none' href='foo.com'>#{str}</a>"
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.33
+  version: 0.9.36
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com