livetext 0.8.78 → 0.8.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 14f8d44bfa9cd1fbcd49da2f848df5ed1e8dd6086555a8b163d43e0137303284
-  data.tar.gz: f695e704124133507245e5ec0c7e596aa1b4c97117e14c2ac79b6497a83224c8
+SHA1:
+  metadata.gz: b10afcc4cb31c7ee535b019ad71dceb81642288b
+  data.tar.gz: 31071b49e22b3a45638588cfc626364e47a1c205
 SHA512:
-  metadata.gz: 39c10beb0b76dbcfa9221bba0b0dccde17294b943d4a50639b7b1e66766040ce32a780d1849df3512efdfeb016abbccdd78298bde802001d8f131bee06f0ee39
-  data.tar.gz: 794dbdb41daed694e3d1f3fce433c7cfaa2a5846ffb7b03610b35ce9ab8b52d48b4d1ebf66a7a1bb15da41dd59baa380fcfc82f97d0d719512034372799f99a0
+  metadata.gz: 6174fa5fd3f5c0b4169adf59f89fe8aa438d324819ddb382210cf6e1ef3a4f26a2120f69d9c3fd8d85dcd709a081cdfb6ba35a68ae1be2c94958c95751718678
+  data.tar.gz: 2ff43baa577625b28d82b7ba2dcfaee894216124de6ed60c4252369dd28f158dc94141954d7b92243acd57469eee9f6e6af319bf691900bc3c82a705c916496c

data/lib/formatline.rb

@@ -28,7 +28,7 @@ class FormatLine
 
   attr_reader :out
 
-  def initialize(line, context)
+  def initialize(line, context=nil)
     context ||= binding
     @context = context
     @line = line
@@ -38,8 +38,9 @@ class FormatLine
   end
 
   def self.parse!(line, context = nil)
+    return nil if line.nil?
     x = self.new(line.chomp, context)
-    x.tokenize(line)
+t = x.tokenize(line)
     x.evaluate    # (context)
   end
 
@@ -49,7 +50,7 @@ class FormatLine
       case curr
         when Escape; go; add curr; grab
         when "$"
-          _dollar
+          dollar
         when "*", "_", "`", "~"
           marker curr
           add curr
@@ -78,6 +79,8 @@ class FormatLine
       break if token.nil? 
       sym, val = *token
       case sym
+        when :ddot
+          return [@out, val]
         when :str
           @out << val unless val == "\n"   # BUG
         when :var
@@ -97,7 +100,7 @@ class FormatLine
       end
       token = gen.next
     end
-    @out
+    [@out, nil]
   end
 
   def curr
@@ -181,14 +184,14 @@ class FormatLine
     str
   end
 
-  def _dollar
+  def dollar
     grab
     case curr
       when LF;  add "$";  add_token :str
       when " "; add "$ "; add_token :str
       when nil; add "$";  add_token :str
-      when "$"; _double_dollar
-      when "."; _dollar_dot
+      when "$"; double_dollar
+      when "."; dollar_dot
       when /[A-Za-z]/
        add_token :str
         var = curr + grab_alpha
@@ -199,7 +202,7 @@ class FormatLine
     end
   end
 
-  def _double_dollar
+  def double_dollar
     case next!
       when Space; add_token :string, "$$ "; grab; return
       when LF, nil; add "$$"; add_token :str

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.78"
+  VERSION = "0.8.79"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -32,6 +32,7 @@ class Livetext
   end
 
   Space = " "
+  Sigil = "." # Can't change yet
 
   def initialize(output = ::STDOUT)
     @source = nil
@@ -45,17 +46,17 @@ class Livetext
   def process_line(line, context=nil)
     context ||= binding
     @context = context
-    sigil = "." # Can't change yet
     nomarkup = true
     # FIXME inefficient
-    scomment  = rx(sigil, Livetext::Space)  # apply these in order
-    sname     = rx(sigil)
+    scomment  = rx(Sigil, Livetext::Space)  # apply these in order
+    sname     = rx(Sigil)
     if line =~ scomment
       handle_scomment(line)
     elsif line =~ sname 
-      handle_sname(line)
+      handle_dotcmd(line)
     else
       @main._passthru(line, context)
+      # Can output extra line(s) in $. scenario
     end
   end
 
@@ -142,7 +143,7 @@ class Livetext
     Regexp.compile("^" + Regexp.escape(str) + "#{space}")
   end
 
-  def handle_scomment(line, sigil=".")
+  def handle_scomment(line)
   end
 
   def _check_name(name)
@@ -153,15 +154,15 @@ class Livetext
     name
   end
 
-  def _get_name(line, sigil=".")
+  def _get_name(line)
     name, data = line.split(" ", 2)
     name = name[1..-1]  # chop off sigil
     @main.data = data
     name = _check_name(name)
   end
 
-  def handle_sname(line, sigil=".")
-    name = _get_name(line, sigil)
+  def handle_dotcmd(line)
+    name = _get_name(line)
     result = nil
     if @main.respond_to?(name)
       result = @main.send(name)

data/lib/processor.rb

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

data/lib/standard.rb

@@ -59,13 +59,13 @@ module Livetext::Standard
   end
 
   def say
-    str = _formatting(@_data)
+    str = _format(@_data)
     TTY.puts str
     _optional_blank_line
   end
 
   def banner
-    str = _formatting(@_data)
+    str = _format(@_data)
     n = str.length - 1
     _errout "-"*n
     _errout str
@@ -157,7 +157,8 @@ module Livetext::Standard
       var, val = a.split("=")
       val = val[1..-2] if val[0] == ?" and val[-1] == ?"
       val = val[1..-2] if val[0] == ?' and val[-1] == ?'
-      Livetext::Vars[var] = val
+      Livetext::Vars[var.to_sym] = val
+      Livetext::Vars[var] = val         # FIXME
     end
     _optional_blank_line
   end
@@ -199,6 +200,7 @@ module Livetext::Standard
     meths = grab_file(file)
     modname = name.gsub("/","_").capitalize
     string = "module ::#{modname}\n#{meths}\nend"
+# puts string   # .inspect
     eval(string)
     newmod = Object.const_get("::" + modname)
     self.extend(newmod)
@@ -284,7 +286,7 @@ module Livetext::Standard
     delim = _args.first
     _out "<dl>"
     _body do |line|
-      line = _formatting(line)
+      line = _format(line)
       term, defn = line.split(delim)
       _out "<dt>#{term}</dt>"
       _out "<dd>#{defn}</dd>"
@@ -296,7 +298,7 @@ module Livetext::Standard
     delim = _args.first
     _out "<table>"
     _body do |line|
-      line = _formatting(line)
+      line = _format(line)
       term, defn = line.split(delim)
       _out "<tr>"
       _out "<td width=3%><td width=10%>#{term}</td><td>#{defn}</td>"
@@ -318,7 +320,7 @@ module Livetext::Standard
     lines = _body(true)
     maxw = nil
     lines.each do |line|
-      _formatting(line)  # May split into multiple lines!
+      line = _format(line)
       line.gsub!(/\n+/, "<br>")
       cells = line.split(delim)
       wide = cells.map {|x| x.length }

data/lib/userapi.rb

@@ -24,7 +24,8 @@ module Livetext::UserAPI
     @line = nextline if peek_nextline =~ /^ *$/
   end
 
-  def _comment?(str, sigil=".")
+  def _comment?(str)
+    sigil = Livetext::Sigil
     c1 = sigil + Livetext::Space
     c2 = sigil + sigil + Livetext::Space
     str.index(c1) == 0 || str.index(c2) == 0
@@ -35,21 +36,20 @@ module Livetext::UserAPI
     return false
   end
 
-  def _end?(str, sigil=".")
+  def _end?(str)
     return false if str.nil?
-    cmd = sigil + "end"
+    cmd = Livetext::Sigil + "end"
     return false if str.index(cmd) != 0 
     return false unless _trailing?(str[5])
     return true
   end
 
-  def _raw_body(tag = "__EOF__", sigil = ".")
+  def _raw_body(tag = "__EOF__")
     lines = []
     @save_location = @sources.last
     loop do
       @line = nextline
       break if @line.chomp.strip == tag
-# STDERR.puts "_raw_body adds: #{@line.inspect}"
       lines << @line
     end
     _optional_blank_line
@@ -58,39 +58,39 @@ module Livetext::UserAPI
     else
       lines
     end
-# STDERR.puts "_raw_body returns: #{lines.inspect}"
     lines
   end
 
-  def _body(raw=false, sigil=".")
+  def _body(raw=false)
     lines = []
     @save_location = @sources.last
     loop do
       @line = nextline
       raise if @line.nil?
-      break if _end?(@line, sigil)
-      next if _comment?(@line, sigil)   # FIXME?
-      @line = _formatting(@line) unless raw
-      lines << @line
+      break if _end?(@line)
+      next if _comment?(@line)
+      # FIXME Will cause problem with $. ?
+      @line = _format(@line) unless raw
+      lines << @line 
     end
     _optional_blank_line
     if block_given?
-      lines.each {|line| yield line }
+      lines.each {|line| yield line }   # FIXME what about $. ?
     else
       lines
     end
   rescue => err
-    # FIXME ?
+p err.inspect
+puts err.backtrace
     _error!("Expecting .end, found end of file")
-#   puts @body
   end
 
-  def _body_text(raw=false, sigil=".")
-    _body(sigil).join("")
+  def _body_text(raw=false)
+    _body(Livetext::Sigil).join("")
   end
 
-  def _raw_body!(sigil=".")
-    _raw_body(sigil).join("\n")
+  def _raw_body!
+    _raw_body(Livetext::Sigil).join("\n")
   end
 
   def _handle_escapes(str, set)
@@ -101,26 +101,39 @@ module Livetext::UserAPI
     str
   end
 
-  def _formatting(line, context = nil)
+  def _format(line, context = nil)
+    return ["", nil] if line == "\n"
+    l2 = FormatLine.parse!(line, context)
+    line1, line2 = *l2
+    line.replace(line1) unless line.nil?
+    line
+  end
+
+  def _format!(line, context = nil)
+    return ["", nil] if line == "\n"
     l2 = FormatLine.parse!(line, context)
-    line.replace(l2)
+    # maybe move fix back toward parse! ?
+    line1, line2 = *l2
+    line2 = line2.dup
+    line.replace(line1) unless line.nil?
+    line2 = @parent.handle_dotcmd(line2) unless line2.nil?
+    [line, line2]
   end
 
   def _passthru(line, context = nil)
     return if @_nopass
     _out "<p>" if line == "\n" and ! @_nopara
-    line = _formatting(line, context)
+    line, line2 = *_format!(line, context)
+p line
+p line2
     _out line
+    _out line2
   end
 
   def _out(str = "")
-#   if @no_puts
-# STDERR.puts "_out: #{str.inspect}"
-      @parent.body << str 
-      @parent.body << "\n" unless str.end_with?("\n")
-#   else
-#     _puts str
-#   end
+    return if str.nil?
+    @parent.body << str 
+    @parent.body << "\n" unless str.end_with?("\n")
   end
 
   def _out!(str = "")

data/plugin/bookish.rb

@@ -25,7 +25,7 @@ def list!
   lines = _body.each   # {|line| _out "<li>#{line}</li>" }
   loop do 
     line = lines.next
-    line = _formatting(line)
+    line = _format(line)
     if line[0] == " "
       _out line
     else
@@ -77,7 +77,7 @@ def figure
   name = @_args[0]
   num = @_args[1]
   title = @_args[2..-1].join(" ")
-  title = _formatting(title)
+  title = _format(title)
   _out "<img src='#{name}'></img>"
   _out "<center><b>Figure #{num}</b> #{title}</center>"
 end
@@ -138,7 +138,7 @@ def table2
   delim = " :: "
   _out "<br><center><table border=1 width=#{wide}% cellpadding=5>"
   lines = _body(true)
-  lines.map! {|line| _formatting(line) }
+  lines.map! {|line| _format(line) }
 
   lines.each do |line|
     cells = line.split(delim)
@@ -162,7 +162,7 @@ def simple_table
   lines = _body(true)
   maxw = nil
   lines.each do |line|
-    _formatting(line)
+    _format(line)
     cells = line.split(delim)
     wide = cells.map {|x| x.length }
     maxw = [0] * cells.size
@@ -193,7 +193,7 @@ def table
   lines = _body(true)
   maxw = nil
   lines.each do |line|
-    _formatting(line)
+    _format(line)
     cells = line.split(delim)
     wide = cells.map {|x| x.length }
     maxw = [0] * cells.size

data/plugin/calibre.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 
 def epub!
-  out = _formatting(@_args[0])
+  out = _format(@_args[0])
   src = @_args[1]
   @cover = @_args[2]
   if ::File.directory?(src)

data/plugin/markdown.rb

@@ -33,7 +33,7 @@ def olist   # Doesn't handle paragraphs yet
   n = 0
   _body do |line|
     n += 1
-    _out "#{n}. #{_formatting(line)}"
+    _out "#{n}. #{_format(line)}"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.8.78
+  version: 0.8.79
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 2019-04-28 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -20,8 +20,6 @@ files:
 - "./README.lt3"
 - "./README.md"
 - bin/livetext
-- lib/SAVE.formatline
-- lib/SAVE2.formatline.rb
 - lib/formatline.rb
 - lib/functions.rb
 - lib/livetext.rb
@@ -38,7 +36,6 @@ files:
 - test/affirm/kbks.jpg
 - test/affirm/lm-kbks.lt
 - test/cleanup
-- test/data/SAVE.lines
 - test/data/basic_formatting/expected-error.txt
 - test/data/basic_formatting/expected-output.txt
 - test/data/basic_formatting/source.lt3
@@ -153,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A smart processor for text