livetext 0.9.32 → 0.9.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6069fc394894011ca9f5ed2db3022b62a3a8c541c51566126551297e60eec74
-  data.tar.gz: b95803194c64a840262b4912e9116905c27a1879e4f6ec4309ae48404b31fa7e
+  metadata.gz: fb4392b3c99d41bf20385de2f5cbb25846fb9193ab303072075d0baf904912d2
+  data.tar.gz: b7fb45dd41a63f9c2cf39afa6e8973f53a8828c1063a341ad8ecd78eb4468f96
 SHA512:
-  metadata.gz: '046369b5d8a1c659fc210eea5134e79d9c8c0cfff0a2a833fff84b89001b115f4bd326fcf10cddcabc284e3abf964ad59e43330f7b4783dc4fba7d4255e66db9'
-  data.tar.gz: 20fb083bbd8d727c5e5774c784afa49f9a0edd58e339bdd4b7966916ffa94cbe335c6f702c841b67b75c053c88592b7b864eb9abef60aa96a9a949f5171769e0
+  metadata.gz: 06e2d46af57bb812baecb5afcc30147abc862df4c4a0619f0151b3b2e6db3c78d7ef7f05eb8cab1e388a7efd73d7ca67ac2143fb5fb901f0b5abcf233b9dcb86
+  data.tar.gz: 0575eaf1bcf527c19ba6ea7ecf7d28b36c6f4dab8b4b81a57185bb9454452af4127bf60dea9a8d15039f29a7919ad7930a99e8aacf6f74ad4f55554bb9ade072

data/bin/livetext

@@ -66,7 +66,7 @@ end
 
 def install_plugin
   lib = ARGV.shift
-  system("cp #{lib} #{Livetext::Path}/../plugin/")
+  system("cp #{lib} #{Livetext::Path}/../../plugin/")
 end
 
 def parse_command_line

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/formatter.rb

@@ -41,7 +41,6 @@ module Formatter
     end
 
     def grab_terminator
-      status("** grabterm 0")
       @state = :LOOPING
       # goes onto buffer by default
       # Don't? what if searching for space_marker?
@@ -73,7 +72,6 @@ module Formatter
     end
 
     def wrap(text)
-      status("** wrap 0")
       if text.empty?
         result = @marker
         result = "" if @marker[1] == "["
@@ -83,60 +81,45 @@ module Formatter
     end
     
     def initial
-      status("** init 0")
       n = @marker.length
       case
       when escape?
-        status("** esc i0")
         grab               # backslash
-        status("** esc i1")
         @buffer << grab    # char
-        status("** esc i2")
       when space_marker?
-        status("** init 1")
         @buffer << grab   # append the space
         grab(n)           # eat the marker
         @state = :CDATA
       when marker?
-        status("** init 2")
         grab(n)  # Eat the marker
         @state = :CDATA
       when eol?
-        status("** init 3")
         @state = :FINAL
       else
-        status("** init 4")
         @state = :BUFFER
       end
     end
 
     def buffer
-      status("** buffer 0")
       @buffer << grab
       @state = :LOOPING
     end
 
     def cdata
-      status("** cdata 0")
       case
       when eol?
-        status("** cdata 1")
         if @cdata.empty?
-          status("** cdata 2")
           @buffer << @marker unless @marker[1] == "["
         else
-          status("** cdata 3")
           @buffer << wrap(@cdata)
         end
         @state = :FINAL
       when terminated?
-        status("** cdata 4")
         @buffer << wrap(@cdata)
         grab_terminator    # "*a *b"  case???
         @cdata = ""
         @state = :LOOPING
       else
-        status("** cdata 5")
         @cdata << grab
         @state = :CDATA
       end
@@ -146,11 +129,8 @@ module Formatter
       n = @marker.length
       case
       when escape?
-        status("** esc l0")
         grab               # backslash
-        status("** esc l1")
         @buffer << grab    # char
-        status("** esc l2")
       when space_marker?
         @buffer << grab   # append the space
         grab(n)           # eat the marker

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

@@ -7,6 +7,7 @@ class Livetext
 
   class Variables
     attr_reader :vars
+
     def initialize(hash = {})
       @vars = {}
       hash.each_pair {|k, v| @vars[k.to_sym] = v }
@@ -34,6 +35,10 @@ class Livetext
         api.setvar(var, value)
       end
     end
+
+    def to_a
+      @vars.to_a
+    end
   end
 
   Vars = Variables.new
@@ -95,7 +100,10 @@ class Livetext
     obj = self.new
     mix  = Array(mix)
     call = Array(call)
-    mix.each {|lib| obj.mixin(lib) }
+# STDERR.puts "#{__method__}: obj meth = #{obj.methods.sort.inspect}"
+    mix.each do |lib| 
+      obj.invoke_dotcmd(:mixin, lib.dup)
+    end
     call.each {|cmd| obj.main.send(cmd[1..-1]) }  # ignores leading dot, no param
     # vars.each_pair {|var, val| obj.setvar(var, val.to_s) }
     obj.api.setvars(vars)
@@ -130,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
@@ -173,7 +173,6 @@ module Livetext::Standard
       lines = api.body
     end
     pairs = Livetext::ParseGeneral.parse_vars(lines, prefix: nil)
-STDERR.puts "! pairs = #{pairs.inspect}"
     api.setvars(pairs)
     api.optional_blank_line
   end
@@ -189,7 +188,6 @@ STDERR.puts "! pairs = #{pairs.inspect}"
       lines = api.body
     end
     pairs = Livetext::ParseGeneral.parse_vars(lines, prefix: nil)
-STDERR.puts "pairs = #{pairs.inspect}"
     api.setvars(pairs)
     api.optional_blank_line
   end
@@ -217,7 +215,7 @@ STDERR.puts "pairs = #{pairs.inspect}"
   end
 
   def dot_include   # dot command
-    file = api.args.first # api.format(api.args.first)  # allows for variables
+    file = api.expand_variables(api.args.first)  # allows for variables
     check_file_exists(file)
     @parent.process_file(file)
     api.optional_blank_line
@@ -283,7 +281,7 @@ STDERR.puts "pairs = #{pairs.inspect}"
   end
 
   def debug
-    self._debug = onoff(api.args.first)
+    self.debug = onoff(api.args.first)
     api.optional_blank_line
   end
 
@@ -323,7 +321,7 @@ STDERR.puts "pairs = #{pairs.inspect}"
   end
 
   def mono
-    wrap ":pre" do
+    html.wrap ":pre" do
       api.body(true) {|line| api.out line }
     end
     api.optional_blank_line
@@ -331,7 +329,7 @@ STDERR.puts "pairs = #{pairs.inspect}"
 
   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)
@@ -371,7 +369,7 @@ STDERR.puts "pairs = #{pairs.inspect}"
 
     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
@@ -380,8 +378,10 @@ STDERR.puts "pairs = #{pairs.inspect}"
   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")
 
@@ -31,12 +33,28 @@ class Livetext::UserAPI
     @live
   end
 
+  def include_file(file)
+    api.data = file
+    api.args = [file]
+STDERR.puts "incfile: #{api.methods.sort.inspect}\n "
+    api.dot_include
+  end
+
+  def expand_variables(str)
+    @expander.expand_variables(str)
+  end
+
+  def expand_functions(str)
+    @expander.expand_functions(str)
+  end
+
   def setvar(var, val)   # FIXME
     @live.vars.set(var, val)
   end
 
   def setvars(pairs)
-    pairs = pairs.to_a if pairs.is_a?(Hash)
+    # STDERR.puts "#{__method__}: pairs = #{pairs.inspect} (#{pairs.class})"
+    pairs = pairs.to_a   # could be Hash or Variables
     pairs.each do |var, value|
       @live.vars.set(var, value)
     end

data/lib/livetext/version.rb

@@ -2,5 +2,5 @@
 # Defining VERSION
 
 class Livetext
-  VERSION = "0.9.32"
+  VERSION = "0.9.35"
 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

metadata

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