livetext 0.8.95 → 0.8.96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d50c436a237a5e3f02b6619316c5ff37efa5d0c58e4d64eb5445c05f3a54dfa
-  data.tar.gz: c849446d4dd970e89c3cace0a8f1af13e3eadc2918df35f6614dc99192cbbd80
+  metadata.gz: 61efdb7cdd7d3a5c6597796d18922ba7f405c7b421a35d7b8708031a3a1d56c3
+  data.tar.gz: f6452c5a4bc7c1c28154774e9847a6502072be8e63ecb33ba6e85799452c10a0
 SHA512:
-  metadata.gz: b778d4a49af38754d8a35df8e8cf42da35933888d26a6e13dd65cf944991f0521fc7138f49d174e7c3e640a93b84c451b3877d5424793e0cf4cd2af580964e66
-  data.tar.gz: 620dac5c5eca194d84cf758ceddf738ad5bc41c8574ac110d6599bb5e5542857781e7dd66a4710e3a416490cb7934063b3f826860aa26172bc8f633ad7f562d1
+  metadata.gz: cc2c1c48f54e7411a9f6571256fa8ba1612d7e056010440a86be6d4038b1593c3771032f9305024d9fa0adfdc6543893a0f4183b435c22aab66cd40684b679e8
+  data.tar.gz: d45545ba38eec5669650e7171c285acc1627599fadce73cb80b5c3c7b38e9ef01be1d12ca4bbfd54e89d8e9c6b8e45b7779b7685cdb46812b64a5f6dae6471f4

data/lib/formatline.rb

@@ -325,6 +325,9 @@ class FormatLine
     end
     grab if param && curr == "]" # skip right bracket
     add str
+  rescue => err
+    STDERR.puts "ERR = #{err}\n#{err.backtrace}"
+    STDERR.puts "=== str = #{str.inspect}"
   end
 
 ############

data/lib/functions.rb

@@ -29,7 +29,7 @@ class Livetext::Functions    # Functions will go here... user-def AND pre-def??
 
   def link(param=nil)
     text, url = param.split("|", 2)  # reverse these?
-    "<a href='#{url}'>#{text}</a>"
+    "<a style='text-decoration: none' href='#{url}'>#{text}</a>"
   end
 
   def br(n="1")

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.95"
+  VERSION = "0.8.96"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -97,6 +97,11 @@ class Livetext
     end
   end
 
+  def xform_file(file)
+    self.process_file(file)
+    self.body
+  end
+
   def transform(text)
     _setfile!("(string)")
     @output = ::Livetext.output

data/lib/standard.rb

@@ -198,10 +198,12 @@ EOS
   end
 
   def variables
+    prefix = _args[0]
     _body.each do |line|
       next if line.strip.empty?
       var, val = line.split(" ", 2)
       val = FormatLine.var_func_parse(val)
+      var = prefix + "." + var if prefix
       @parent._setvar(var, val)
     end
   end
@@ -443,7 +445,7 @@ EOS
   def link
     url = _args.first
     text = _args[2..-1].join(" ")
-    _out "<a href='#{url}'>#{text}</a>"
+    _out "<a style='text-decoration: none' href='#{url}'>#{text}</a>"
   end
 
   def xtable   # Borrowed from bookish - FIXME

data/lib/userapi.rb

@@ -45,16 +45,10 @@ module Livetext::UserAPI
   end
 
   def _end?(str)
-    indent = ""
-#   n = @parent.indentation.last - 1
-#   n = 0 if n < 0  # Gahhh FIXM
-#   indent = " " * n
-#   indent << "$" unless indent.empty?
-    return false if str.nil?
-    cmd = indent + Livetext::Sigil + "end"
-    return false if str.index(cmd) != 0 
-    return false unless _trailing?(str[5])
-    return true
+    str = str.dup
+    str.gsub!(/^ */, "")
+    return true if str == ".end" || str == "$.end"
+    return false
   end
 
   def _raw_body(tag = "__EOF__")
@@ -83,19 +77,17 @@ module Livetext::UserAPI
       @line = nextline
       break if @line.nil?
       @line.chomp!
+# STDERR.puts "LINE = #{@line.inspect}"
       if _end?(@line)
         end_found = true
         break 
       end
       next if _comment?(@line)
-flag = (@line.include?("og:title"))
       # FIXME Will cause problem with $. ?
-# STDERR.puts "lt3: _body @line = #{@line.inspect}" if flag
       @line = _format(@line) unless raw
-# STDERR.puts "           @line = #{@line.inspect}" if flag
       lines << @line 
     end
-    raise unless end_found
+    raise "this stupid error again" unless end_found
     _optional_blank_line
     if block_given?
       lines.each {|line| yield line }   # FIXME what about $. ?
@@ -106,7 +98,9 @@ flag = (@line.include?("og:title"))
     str = "Fake error? 'Expecting .end, found end of file'\n" 
     str << err.inspect + "\n"
     str << err.backtrace.map {|x| "  " + x }.join("\n")
-    _error!(str)
+STDERR.puts str
+exit
+#   _error!(str)
   end
 
   def _body_text(raw=false)

data/plugin/bookish.rb

@@ -118,8 +118,11 @@ def sec
   @section = "#@chapter.#@sec"
 # _errout("section #@section")
   @toc << "#{_nbsp(3)}<b>#@section</b> #@_data<br>"
-# _next_output(_slug(@_data))
+  _next_output(_slug(@_data))
   _out "<h3>#@section #{@_data}</h3>\n"
+rescue => err
+  STDERR.puts "#{err}\n#{err.backtrace}"
+  exit
 end
 
 def subsec
@@ -127,7 +130,7 @@ def subsec
   @subsec = "#@chapter.#@sec.#@sec2"
   @toc << "#{_nbsp(6)}<b>#@subsec</b> #@_data<br>"
 # _errout("section #@subsec")
-# _next_output(_slug(@_data))
+  _next_output(_slug(@_data))
   _out "<h3>#@subsec #{@_data}</h3>\n"
 end
 
@@ -222,8 +225,8 @@ def toc!
   _debug "Closing TOC"
   @toc.close
 rescue => err
-   puts @body
-   @body = ""
+   puts @parent.body
+   @parent.body = ""
   _errout "Exception: #{err.inspect}"
 end
 
@@ -242,9 +245,8 @@ end
 
 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?
-  _out "]</i></font><br>\n "
+  stuff = @_data.empty? ? "" : ": #@_data"
+  _print "<br><font color=red><i>[Material missing#{stuff}]</i></font><br>\n "
 end
 
 def TBC
@@ -262,6 +264,9 @@ def quote
   _out "<blockquote>"
   _body {|line| _out line }
   _out "</blockquote>"
+rescue => err
+  STDERR.puts "#{err}\n#{err.backtrace}"
+  exit
 end
 
 def init_bookish

metadata

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