livetext 0.9.36 → 0.9.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dceb322a5f44e776bab9ed9113c7c7a4adf29eff271be81a613c72a081a2d51
-  data.tar.gz: 70576d3a39fccbe7f3285ddca930f79400b8d770ef600d043e2b3690f173ba23
+  metadata.gz: dd459c3fa75665b383b8056baa8af5ee9bae77a3abcaeba153b11c422b2f0418
+  data.tar.gz: 6f3674f4f5f5408e1b7fbffe45631ebbc0c43abbc624f1ba6ade1232e33d10f3
 SHA512:
-  metadata.gz: 8d91e26a1721ce60ca41ff49a323df2e4ef0a365b0b4eec9b224cbef8381e48b6ab4f3c0bb63e74ada905efb101c69a33e021f521420abe56927b16a46e02091
-  data.tar.gz: fa718856dcbb75bb4f60f49f31638041158b815335ba9df3680c2ca0b117a2584d66921e06dae30b266f3104a465f826904a797e3e1a546960d75d6dc79d9d4b
+  metadata.gz: 49baee92ae2d7a5ef1337ef98258e416014c954a07d5574f697def625c41e06f7cdaa297ca6cc9a88f3cb3dc4f7c58b589aab889f9bb30d67ba4bf583a52c4f7
+  data.tar.gz: 6bff41c9c3128a5de6a58f1e81985e35ec3563acbdc133f24427e21c86aca2b475ac0dc1da7967b6e10f92203beab44750ae2ae47bb36a164dfddc62b506c5b9

data/lib/livetext/helpers.rb

@@ -127,7 +127,7 @@ module Livetext::Helpers
     retval = @main.send(name)  # , *args)      # was 125
     retval
   rescue => err
-    graceful_error(err)
+    graceful_error(err)   # , "#{__method__}: name = #{name}")
   end
 
   def handle_dotcmd(line, indent = 0)

data/lib/livetext/more.rb

@@ -91,8 +91,9 @@ class Livetext
     TTY.puts "#dump had an error: #{err.inspect}"
   end
 
-  def graceful_error(err)
+  def graceful_error(err, msg = nil)
     dump
+    STDERR.puts msg if msg
     raise err
   end
 

data/lib/livetext/standard.rb

@@ -44,23 +44,23 @@ module Livetext::Standard
 #    end
 #  end
 
-  def backtrace
+  def backtrace(args = nil, body = nil)
     @backtrace = onoff(api.args.first)
     api.optional_blank_line
   end
 
-  def comment
+  def comment(args = nil, body = nil)
     api.body
     api.optional_blank_line
   end
 
-  def shell
+  def shell(args = nil, body = nil)
     cmd = api.data
     system(cmd)
     api.optional_blank_line
   end
 
-  def func
+  def func(args = nil, body = nil)
     funcname = api.args[0]
     # check_disallowed(funcname)  # should any be invalid?
     funcname = funcname.gsub(/\./, "__")
@@ -74,68 +74,69 @@ module Livetext::Standard
     return true
   end
 
-  def h1; api.out wrapped(api.data, :h1); return true; end
-  def h2; api.out wrapped(api.data, :h2); return true; end
-  def h3; api.out wrapped(api.data, :h3); return true; end
-  def h4; api.out wrapped(api.data, :h4); return true; end
-  def h5; api.out wrapped(api.data, :h5); return true; end
-  def h6; api.out wrapped(api.data, :h6); return true; end
+  def h1(args = nil, body = nil); api.out html.tag(:h1, api.data); return true; end
+  def h2(args = nil, body = nil); api.out html.tag(:h2, api.data); return true; end
+  def h3(args = nil, body = nil); api.out html.tag(:h3, api.data); return true; end
+  def h4(args = nil, body = nil); api.out html.tag(:h4, api.data); return true; end
+  def h5(args = nil, body = nil); api.out html.tag(:h5, api.data); return true; end
+  def h6(args = nil, body = nil); api.out html.tag(:h6, api.data); return true; end
 
-  def list
+  def list(args = nil, body = nil)
     html.wrap :ul do
-      api.body {|line| api.out wrapped(line, :li) }
+      api.body {|line| api.out html.tag(:li, line) }
     end
     api.optional_blank_line
   end
 
-  def list!
+  def list!(args = nil, body = nil)
     html.wrap(:ul) do
       lines = api.body.each   # enumerator
       loop do
         line = lines.next
         line = api.format(line)
-        str = line[0] == " " ? line : wrapped(line, :li)
+        str = line[0] == " " ? line : html.tag(:li, line)
         api.out str
       end
     end
     api.optional_blank_line
   end
 
-  def shell!
+  def shell!(args = nil, body = nil)
     cmd = api.data
     system(cmd)
     api.optional_blank_line
   end
 
-  def errout
+  def errout(args = nil, body = nil)
     ::STDERR.puts api.data
     api.optional_blank_line
   end
 
-  def ttyout
+  def ttyout(args = nil, body = nil)
     TTY.puts api.data
     api.optional_blank_line
   end
 
-  def say(arg=nil)
-    data = arg || api.args.join(" ")
+  def say(args = nil, body = nil)
+    data = args || api.args.join(" ")
     str = api.format(data)
-    TTY.puts "(say) #{str}"
+    TTY.puts str
     api.optional_blank_line
   end
 
-  def banner
+  def banner(args = nil, body = nil)
     str = api.format(api.data)
     num = str.length
     decor = "-"*num + "\n"
-    puts decor + str + "\n" + decor
+    api.tty decor + str + "\n" + decor
+    api.optional_blank_line
   end
 
-  def quit
+  def quit(args = nil, body = nil)
     @output.close
   end
 
-  def cleanup
+  def cleanup(args = nil, body = nil)
     api.args.each do |item|
       cmd = ::File.directory?(item) ? "rm -f #{item}/*" : "rm #{item}"
       system(cmd)
@@ -143,7 +144,7 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def dot_def
+  def dot_def(args = nil, body = nil)
     name = api.args[0]
     check_disallowed(name)
     # Difficult to avoid eval here
@@ -154,7 +155,7 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def set
+  def set(args = nil, body = nil)
     line = api.args.join(" ")  # data.chomp
     pairs = Livetext::ParseSet.new(line).parse
     api.setvars(pairs)
@@ -163,7 +164,7 @@ module Livetext::Standard
 
   # FIXME really these should be one method...
 
-  def variables!  # cwd, not FileDir - weird, fix later
+  def variables!(args = nil, body = nil)  # cwd, not FileDir - weird, fix later
     prefix = api.args[0]
     file = api.args[1]
     prefix = nil if prefix == "-"  # FIXME dumb hack
@@ -178,7 +179,7 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def variables
+  def variables(args = nil, body = nil)
     prefix = api.args[0]
     file = api.args[1]
     prefix = nil if prefix == "-"  # FIXME dumb hack
@@ -193,7 +194,7 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def heredoc
+  def heredoc(args = nil, body = nil)
     var = api.args[0]
     text = api.body.join("\n")
     rhs = ""
@@ -207,7 +208,7 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def seek    # like include, but search upward as needed
+  def seek(args = nil, body = nil)    # like include, but search upward as needed
     file = api.args.first
 		file = search_upward(file)
     check_file_exists(file)
@@ -215,14 +216,14 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def dot_include   # dot command
+  def dot_include(args = nil, body = nil)   # dot command
     file = api.expand_variables(api.args.first)  # allows for variables
     check_file_exists(file)
     @parent.process_file(file)
     api.optional_blank_line
   end
 
-  def inherit
+  def inherit(args = nil, body = nil)
     file = api.args.first
     upper = "../#{file}"
     got_upper, got_file = File.exist?(upper), File.exist?(file)
@@ -234,7 +235,7 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def mixin
+  def mixin(args = nil, body = nil)
     name = api.args.first   # Expect a module name
     @mixins ||= []
     return if @mixins.include?(name)
@@ -246,7 +247,7 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def import
+  def import(args = nil, body = nil)
     name = api.args.first   # Expect a module name
     @imports ||= []
     return if @imports.include?(name)
@@ -258,7 +259,7 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def copy
+  def copy(args = nil, body = nil)
     file = api.args.first
     ok = check_file_exists(file)
 
@@ -268,87 +269,87 @@ module Livetext::Standard
     [ok, file]
   end
 
-  def r
+  def r(args = nil, body = nil)
     # FIXME api.data is broken
     # api.out api.data  # No processing at all
     api.out api.args.join(" ")
     api.optional_blank_line
   end
 
-  def raw
+  def raw(args = nil, body = nil)
     # No processing at all (terminate with __EOF__)
     api.raw_body {|line| api.out line }  # no formatting
     api.optional_blank_line
   end
 
-  def debug
+  def debug(args = nil, body = nil)
     @debug = onoff(api.args.first)
     api.optional_blank_line
   end
 
-  def passthru
+  def passthru(args = nil, body = nil)
     # FIXME - add check for args size? (helpers)
     @nopass = ! onoff(api.args.first)
     api.optional_blank_line
   end
 
-  def nopass
+  def nopass(args = nil, body = nil)
     @nopass = true
     api.optional_blank_line
   end
 
-  def para
+  def para(args = nil, body = nil)
     # FIXME - add check for args size? (helpers)
     @nopara = ! onoff(api.args.first)
     api.optional_blank_line
   end
 
-  def nopara
+  def nopara(args = nil, body = nil)
     @nopara = true
     api.optional_blank_line
   end
 
-  def heading
+  def heading(args = nil, body = nil)
     api.print "<center><font size=+1><b>"
     api.print api.data
     api.print "</b></font></center>"
     api.optional_blank_line
   end
 
-  def newpage
+  def newpage(args = nil, body = nil)
     api.out '<p style="page-break-after:always;"></p>'
     api.out "<p/>"
     api.optional_blank_line
   end
 
-  def mono
+  def mono(args = nil, body = nil)
     html.wrap ":pre" do
       api.body(true) {|line| api.out line }
     end
     api.optional_blank_line
   end
 
-  def dlist
+  def dlist(args = nil, body = nil)
     delim = api.args.first
     html.wrap(:dl) do
       api.body do |line|
         line = api.format(line)
         term, defn = line.split(delim)
-        api.out wrapped(term, :dt)
-        api.out wrapped(defn, :dd)
+        api.out html.tag(:dt, term)
+        api.out html.tag(:dd, defn)
       end
     end
     api.optional_blank_line
   end
 
-  def link
+  def link(args = nil, body = nil)
     url = api.args.first
     text = api.args[2..-1].join(" ")
     api.out "<a style='text-decoration: none' href='#{url}'>#{text}</a>"
     api.optional_blank_line
   end
 
-  def xtable   # Borrowed from bookish - FIXME
+  def xtable(args = nil, body = nil)   # Borrowed from bookish - FIXME
     title = api.data
     delim = " :: "
     api.out "<br><center><table width=90% cellpadding=5>"
@@ -378,7 +379,7 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def image
+  def image(args = nil, body = nil)
     name, wide, high = api.args
     geom = ""
     geom = "width=#{wide} height=#{high}" if wide || high
@@ -386,7 +387,7 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def br
+  def br(args = nil, body = nil)
     num = api.args.first || "1"
     str = ""
     num.to_i.times { str << "<br>" }
@@ -394,7 +395,7 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
-  def reflection   # strictly experimental!
+  def reflection(args = nil, body = nil)   # strictly experimental!
     list = self.methods
     obj  = Object.instance_methods
     diff = (list - obj).sort

data/lib/livetext/version.rb

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

data/plugin/{bookish.rb → booktool.rb}

@@ -1,3 +1,32 @@
+require 'fileutils'
+
+def epub(args = nil, body = nil)
+api.tty "======== Entering epub"
+  out = api.format(api.args[0])
+  src = api.args[1]
+api.tty "======== epub: src = #{src}"
+  @cover = api.args[2]
+  if ::File.directory?(src)
+    files = ::Dir["#{src}/*"].grep /\.html$/
+    files = files.sort  # why is this necessary now?
+    cmd = "cat #{files.join(' ')} >TEMP.html"
+    system(cmd)
+  else
+    raise "Not supported yet"
+  end
+
+  cmd = "ebook-convert "
+  cmd << "TEMP.html #{out}.epub "
+  cmd << "--cover #@cover " if @cover
+  system(cmd)
+
+  system("links -dump TEMP.html >/tmp/links.out")
+  str = `wc -w /tmp/links.out`
+  nw = str.split[0]
+  puts "Approx words: #{nw}"
+  # ::FileUtils.rm("TEMP.html")
+end
+
 def hardbreaks(args = nil, body = nil)
   @hard = false
   @hard = true unless api.args.first == "off"
@@ -15,9 +44,12 @@ end
 
 # These are duplicated. Remove safely
 
-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 h1(args = nil, body = nil); api.out html.tag(:h1, api.data); return true; end
+  def h2(args = nil, body = nil); api.out html.tag(:h2, api.data); return true; end
+  def h3(args = nil, body = nil); api.out html.tag(:h3, api.data); return true; end
+  def h4(args = nil, body = nil); api.out html.tag(:h4, api.data); return true; end
+  def h5(args = nil, body = nil); api.out html.tag(:h5, api.data); return true; end
+  def h6(args = nil, body = nil); api.out html.tag(:h6, api.data); return true; end
 
 def alpha_columns(args = nil, body = nil)
   n = api.args.first.to_i   # FIXME: what if it's missing?
@@ -71,7 +103,7 @@ def figure(args = nil, body = nil)
   api.optional_blank_line
 end
 
-def chapter(args = nil, body = nil)
+def xchapterN(args = nil, body = nil)
   @chapter = api.args.first.to_i
   @sec = @sec2 = 0
   title = api.data.split(" ",2)[1]
@@ -81,13 +113,12 @@ def chapter(args = nil, body = nil)
   api.out "<title>#{@chapter}. #{title}</title>"
   api.out <<-HTML
     <h2>Chapter #{@chapter}</h2>
-    <h1>#{title}</h1>
-
+    <h1>#{title}</h1>\n
   HTML
   api.optional_blank_line
 end
 
-def chapterN(args = nil, body = nil)
+def chapter(args = nil, body = nil)
   @chapter += 1
   @sec = @sec2 = 0
   title = api.data    # .split(" ",2)[1]
@@ -98,8 +129,7 @@ def chapterN(args = nil, body = nil)
   api.out "<title>#{@chapter}. #{title}</title>"
   api.out <<-HTML
     <h2>Chapter #{@chapter}</h2>
-    <h1>#{title}</h1>
-
+    <h1>#{title}</h1>\n
   HTML
   api.optional_blank_line
 end
@@ -115,8 +145,8 @@ def sec(args = nil, body = nil)
   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}"
+  api.tty  "#{err}\n#{err.backtrace.join("\n")}"
+  ::STDERR.puts "#{err}\n#{err.backtrace.join("\n")}"
   exit
 end
 
@@ -295,23 +325,23 @@ rescue => err
   exit
 end
 
-def init_bookish
+def init_booktool
+  @_file_num = 0
   @toc_file = "toc.tmp"
   @toc = ::File.new(@toc_file, "w")
   @chapter = -1
 end
 
-###################  custom.rb
-
+###########
 
-def outdir
+def outdir(args = nil, body = nil)
   @_outdir = api.args.first
 # @output = STDOUT
   @output = nil
   api.optional_blank_line
 end
 
-def outdir!  # FIXME ?
+def outdir!(args = nil, body = nil)  # FIXME ?
   @_outdir = api.args.first
   raise "No output directory specified" if @_outdir.nil?
   raise "No output directory specified" if @_outdir.empty?
@@ -327,12 +357,12 @@ def _append(name)
 end
 
 
-def append
+def append(args = nil, body = nil)
   file = api.args[0]
   _append(file)
 end
 
-def close_output
+def close_output(args = nil, body = nil)
   return if @output == STDOUT
   @_outdir ||= "."
   @output.puts "<meta charset='UTF-8'>\n\n"
@@ -343,16 +373,17 @@ def close_output
 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
+  *title = args    # _next_output(tag, num)
+  title = title.join(" ")
+  slug = _slug(title)
+  @_file_num += 1
+  fname = "#{'%03d' % @_file_num}-#{slug}.html"
+  fname
 end
 
-def next_output
-  name = _prep_next_output(api.args)
+def next_output(args = nil, body = nil)
+  args ||= api.args
+  fname = _prep_next_output(args)
   @_outdir ||= "."
   unless @output.nil?
     @output.puts "<meta charset='UTF-8'>\n\n"
@@ -360,12 +391,12 @@ def next_output
     @parent.body = ""
     @output.close unless @output == STDOUT
   end
-  fname = @_outdir + "/" + name
+  fname = @_outdir + "/" + fname
   @output = File.open(fname, "w")
   api.optional_blank_line
 end
 
-def output
+def output(args = nil, body = nil)
   name = api.args.first
   _debug "Redirecting output to: #{name}"
   # _output(name)
@@ -378,7 +409,7 @@ def output
   @output = File.open(fname, "w")  #; STDERR.puts "---- @out = #{@output.inspect}"
 end
 
-def columns
+def columns(args = nil, body = nil)
   api.out "<table border=1><tr><td valign=top><br>\n"
   api.body.to_a.each do |line|
     if line.start_with?("##col")
@@ -392,7 +423,7 @@ def columns
   api.out "<br>\n</td></tr></table>"
 end
 
-def quote
+def quote(args = nil, body = nil)
   api.out "<blockquote>"
   lines = api.body.to_a
 # STDERR.puts "-----------------------------------------------------"

data/plugin/{pyggish.rb → codetool.rb}

@@ -86,7 +86,7 @@ def self.pyg_finalize(code, lexer=:elixir)
     lang = api.args.empty? ? :elixir : api.args.first.to_sym   # ruby or elixir
     api.args = []
     lines = api.body(true)  # .to_a  # raw
-    result = send(lang, lines)
+    result = send("format_#{lang}", lines)
     api.out result
     api.out "\n"
     api.optional_blank_line
@@ -94,14 +94,6 @@ def self.pyg_finalize(code, lexer=:elixir)
     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 }
@@ -138,26 +130,7 @@ end
     File.write("#{dir}/elixir.css", css)
   end
 
-
-  def format_ruby(source, theme = "Github", back = "black")
-    # theme/back not used now
-    formatter = Rouge::Formatters::HTML.new
-    lexer = Rouge::Lexers::Ruby.new
-    body = formatter.format(lexer.lex(source))
-    text = "<div class=rb_highlight>#{body}</div>"
-    text
-  end
-
-  def format_elixir(source, theme = "Github", back = "black")
-    # theme/back not used now
-    formatter = Rouge::Formatters::HTML.new
-    lexer = Rouge::Lexers::Elixir.new
-    body = formatter.format(lexer.lex(source))
-    text = "<div class=ex_highlight>#{body}</div>"
-    text
-  end
-
-  def xruby
+  def ruby(args = nil, body = nil)
     file = api.args.first 
     code = nil
     if file.nil?
@@ -171,7 +144,7 @@ end
     api.out html
   end
 
-  def xelixir
+  def elixir(args = nil, body = nil)
     file = api.args.first 
     code = nil
     if file.nil?
@@ -184,7 +157,29 @@ end
     api.out html
   end
 
-def ruby(lines)
+  def format_ruby(lines, theme = "Github", back = "black")
+    # theme/back not used now
+    source = lines
+    source = source.join("\n") if source.is_a?(Array)
+    formatter = Rouge::Formatters::HTML.new
+    lexer = Rouge::Lexers::Ruby.new
+    body = formatter.format(lexer.lex(source))
+    text = "<div class=rb_highlight>#{body}</div>"
+    text
+  end
+
+  def format_elixir(lines, theme = "Github", back = "black")
+    # theme/back not used now
+    source = lines
+    source = source.join("\n") if source.is_a?(Array)
+    formatter = Rouge::Formatters::HTML.new
+    lexer = Rouge::Lexers::Elixir.new
+    body = formatter.format(lexer.lex(source))
+    text = "<div class=ex_highlight>#{body}</div>"
+    text
+  end
+
+def __ruby(lines)
   theme = :Github  # default
   source = lines.join("\n")
   formatter = Rouge::Formatters::HTML.new
@@ -214,7 +209,7 @@ rescue => err
 end
 
 
-def elixir(lines)
+def __elixir(lines)
   theme = :Github  # default
   source = lines.join("\n")
   formatter = Rouge::Formatters::HTML.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.36
+  version: 0.9.38
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-03-11 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -52,13 +52,12 @@ files:
 - lib/livetext/userapi.rb
 - lib/livetext/version.rb
 - livetext.gemspec
-- plugin/bookish.rb
+- plugin/booktool.rb
 - plugin/bootstrap_menu.rb
-- plugin/calibre.rb
+- plugin/codetool.rb
 - plugin/livemagick.rb
 - plugin/markdown.rb
 - plugin/misc/navbar.rb
-- plugin/pyggish.rb
 - plugin/tutorial.rb
 - test/all.rb
 - test/extra/README.txt

data/plugin/calibre.rb

@@ -1,26 +0,0 @@
-require 'fileutils'
-
-def epub!(args = nil, body = nil)
-  out = api.format(api.args[0])
-  src = api.args[1]
-  @cover = api.args[2]
-  if ::File.directory?(src)
-    files = ::Dir["#{src}/*"].grep /\.html$/
-    files = files.sort  # why is this necessary now?
-    cmd = "cat #{files.join(' ')} >TEMP.html"
-    system(cmd)
-  else
-    raise "Not supported yet"
-  end
-
-  cmd = "ebook-convert "
-  cmd << "TEMP.html #{out}.epub "
-  cmd << "--cover #@cover " if @cover
-  system(cmd)
-
-  system("links -dump TEMP.html >/tmp/links.out")
-  str = `wc -w /tmp/links.out`
-  nw = str.split[0]
-  puts "Approx words: #{nw}"
-  # ::FileUtils.rm("TEMP.html")
-end