livetext 0.9.38 → 0.9.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd459c3fa75665b383b8056baa8af5ee9bae77a3abcaeba153b11c422b2f0418
-  data.tar.gz: 6f3674f4f5f5408e1b7fbffe45631ebbc0c43abbc624f1ba6ade1232e33d10f3
+  metadata.gz: c1acd3333afca72468cfc97d2dcdf7d7018700e08d7c0defe4b68d7da53d0824
+  data.tar.gz: 32495892978828e9e75d619b9df32891829fd6d6fca9eea46efc5d372fc172c5
 SHA512:
-  metadata.gz: 49baee92ae2d7a5ef1337ef98258e416014c954a07d5574f697def625c41e06f7cdaa297ca6cc9a88f3cb3dc4f7c58b589aab889f9bb30d67ba4bf583a52c4f7
-  data.tar.gz: 6bff41c9c3128a5de6a58f1e81985e35ec3563acbdc133f24427e21c86aca2b475ac0dc1da7967b6e10f92203beab44750ae2ae47bb36a164dfddc62b506c5b9
+  metadata.gz: f8c3e9ad8689636fbe83f63117e75461a2a12ca8b716f96f26ca89752f8404093bfd77d1a25ec62dd200263a79f7584960c66a2a2df699b314d909cba82995a7
+  data.tar.gz: bee8d442bd0755f18c64851241907569d9150af1a051f04729d82bd84ca814049e14a71c1e9257caea9f26ad3af547ebaaf0a55012f837c37ea4cb2699b22283

data/lib/livetext/functions.rb

@@ -11,6 +11,14 @@ class Livetext::Functions
     attr_accessor :param   # kill this?
   end
 
+  def code_lines(param = nil)
+    $code_lines.to_i  # FIXME pleeease
+  end
+
+  def ns(param = nil)
+    "\b"
+  end
+
 # FIXME Function parameters need to be fixed...
 
   def isqrt(param = nil)      # "integer square root" - Just for testing

data/lib/livetext/helpers.rb

@@ -255,8 +255,3 @@ module Livetext::Helpers
 
 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/standard.rb

@@ -74,16 +74,16 @@ module Livetext::Standard
     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 h1(args = nil, body = nil); api.out html.tag(:h1, cdata: api.data); return true; end
+  def h2(args = nil, body = nil); api.out html.tag(:h2, cdata: api.data); return true; end
+  def h3(args = nil, body = nil); api.out html.tag(:h3, cdata: api.data); return true; end
+  def h4(args = nil, body = nil); api.out html.tag(:h4, cdata: api.data); return true; end
+  def h5(args = nil, body = nil); api.out html.tag(:h5, cdata: api.data); return true; end
+  def h6(args = nil, body = nil); api.out html.tag(:h6, cdata: api.data); return true; end
 
   def list(args = nil, body = nil)
     html.wrap :ul do
-      api.body {|line| api.out html.tag(:li, line) }
+      api.body {|line| api.out html.tag(:li, cdata: line) }
     end
     api.optional_blank_line
   end
@@ -94,7 +94,7 @@ module Livetext::Standard
       loop do
         line = lines.next
         line = api.format(line)
-        str = line[0] == " " ? line : html.tag(:li, line)
+        str = line[0] == " " ? line : html.tag(:li, cdata: line)
         api.out str
       end
     end
@@ -200,7 +200,21 @@ module Livetext::Standard
     rhs = ""
     text.each_line do |line|
       str = api.format(line.chomp)
-      rhs << str + "<br>"
+      rhs << str + "<br>\n"
+    end
+    indent = @parent.indentation.last
+    indented = " " * indent
+    api.setvar(var, rhs.chomp)
+    api.optional_blank_line
+  end
+
+  def heredoc!(args = nil, body = nil)     # no <br>
+    var = api.args[0]
+    text = api.body.join("\n")
+    rhs = ""
+    text.each_line do |line|
+      str = api.format(line.chomp)
+      rhs << str + "\n"
     end
     indent = @parent.indentation.last
     indented = " " * indent
@@ -216,6 +230,20 @@ module Livetext::Standard
     api.optional_blank_line
   end
 
+  def cinclude(args = nil, body = nil)   # dot command
+    file = api.expand_variables(api.args.first)    # allows for variables
+    if api.args.size > 1  # there is an HTML file
+      processed = api.expand_variables(api.args[1]) 
+      if File.exist?(processed) && File.mtime(processed) > File.mtime(file)
+        api.args = [processed]
+        copy
+      end
+    end
+    check_file_exists(file)
+    @parent.process_file(file)
+    api.optional_blank_line
+  end
+
   def dot_include(args = nil, body = nil)   # dot command
     file = api.expand_variables(api.args.first)  # allows for variables
     check_file_exists(file)
@@ -335,10 +363,11 @@ module Livetext::Standard
       api.body do |line|
         line = api.format(line)
         term, defn = line.split(delim)
-        api.out html.tag(:dt, term)
-        api.out html.tag(:dd, defn)
+        api.out html.tag(:dt, cdata: term)
+        api.out "  " + html.tag(:dd, cdata: defn)
       end
     end
+    api.out ""
     api.optional_blank_line
   end
 
@@ -352,13 +381,13 @@ module Livetext::Standard
   def xtable(args = nil, body = nil)   # Borrowed from bookish - FIXME
     title = api.data
     delim = " :: "
-    api.out "<br><center><table width=90% cellpadding=5>"
+    api.out "<br>\n\n<center><table width=90% cellpadding=5>"
     lines = api.body(true)
     maxw = nil
     processed = []
     lines.each do |line|
       line = api.format(line)
-      line.gsub!(/\n+/, "<br>")
+      line.gsub!(/\n+/, "<br>\n")
       processed << line
       cells = line.split(delim)
       wide = cells.map {|cell| cell.length }

data/lib/livetext/userapi.rb

@@ -173,6 +173,7 @@ STDERR.puts "incfile: #{api.methods.sort.inspect}\n "
   def out(str = "", file = nil)
     return if str.nil?
     return file.puts str unless file.nil?
+    str.gsub!("\b ", "")   # ignore spaces
     @live.body << str
     @live.body << "\n" unless str.end_with?("\n")
   end

data/lib/livetext/version.rb

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

data/plugin/booktool.rb

@@ -1,10 +1,31 @@
 require 'fileutils'
 
+def mobi(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}.mobi "
+  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]
+end
+
 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$/
@@ -107,7 +128,7 @@ def xchapterN(args = nil, body = nil)
   @chapter = api.args.first.to_i
   @sec = @sec2 = 0
   title = api.data.split(" ",2)[1]
-  @toc << "<br><b>#@chapter</b> #{title}<br>"
+  @toc << "<br>\n\n<b>#@chapter</b> #{title}<br>\n\n"
   api.data = _slug(title)
   next_output
   api.out "<title>#{@chapter}. #{title}</title>"
@@ -123,7 +144,7 @@ def chapter(args = nil, body = nil)
   @sec = @sec2 = 0
   title = api.data    # .split(" ",2)[1]
   _errout("Chapter #@chapter: #{title}")
-  @toc << "<br><b>#@chapter</b> #{title}<br>"
+  @toc << "<br>\n\n<b>#@chapter</b> #{title}<br>\n\n"
   api.data = _slug(title)
   next_output
   api.out "<title>#{@chapter}. #{title}</title>"
@@ -139,10 +160,10 @@ def sec(args = nil, body = nil)
   @sec2 = 0
   @section = "#@chapter.#@sec"
   title = api.data.dup
-  @toc << "#{_nbsp(3)}<b>#@section</b> #{title}<br>"
+  @toc << "#{_nbsp(3)}<b>#@section</b> #{title}<br>\n"
   api.data = _slug(api.data)
   next_output
-  api.out "<h3>#@section #{title}</h3>\n"
+  api.out "<h3>#@section #{title}</h3>\n\n"
   api.optional_blank_line
 rescue => err
   api.tty  "#{err}\n#{err.backtrace.join("\n")}"
@@ -154,10 +175,10 @@ def subsec(args = nil, body = nil)
   @sec2 += 1
   @subsec = "#@chapter.#@sec.#@sec2"
   title = api.data.dup
-  @toc << "#{_nbsp(6)}<b>#@subsec</b> #{title}<br>"
+  @toc << "#{_nbsp(6)}<b>#@subsec</b> #{title}<br>\n"
   api.data = _slug(api.data)
   next_output
-  api.out "<h3>#@subsec #{title}</h3>\n"
+  api.out "<h3>#@subsec #{title}</h3>\n\n"
   api.optional_blank_line
 end
 
@@ -165,7 +186,7 @@ def definition_table(args = nil, body = nil)
   title = api.data
   wide = "95"
   delim = " :: "
-  api.out "<br><center><table width=#{wide}% cellpadding=5>"
+  api.out "<br>\n\n<center><table width=#{wide}% cellpadding=5>"
   lines = api.body(true)
   lines.map! {|line| api.format(line) }
 
@@ -178,7 +199,7 @@ def definition_table(args = nil, body = nil)
     end
     api.out "</tr>"
   end
-  api.out "</table></center><br><br>"
+  api.out "</table></center>\n\n<br><br>\n\n"
 
   api.optional_blank_line
 end
@@ -188,7 +209,7 @@ def table2(args = nil, body = nil)
   wide = "90"
   extra = api.args[2]
   delim = " :: "
-  api.out "<br><center><table width=#{wide}% cellpadding=5>"
+  api.out "<br>\n\n<center><table width=#{wide}% cellpadding=5>"
   lines = api.body(true)
   lines.map! {|line| api.format(line) }
 
@@ -202,7 +223,7 @@ def table2(args = nil, body = nil)
     end
     api.out "</tr>"
   end
-  api.out "</table></center><br><br>"
+  api.out "</table></center>\n\n<br><br>\n\n"
   api.optional_blank_line
 end
 
@@ -241,11 +262,12 @@ def table(args = nil, body = nil)
   @table_num += 1
   title = api.data
   delim = " :: "
-  api.out "<br><center><table width=90% cellpadding=5>"
+  api.out "<br>\n\n<center><table width=90% cellpadding=5>"
+
   lines = api.body(true)
+  # Find max width for each column
   maxw = nil
   lines.each do |line|
-    api.format(line)
     cells = line.split(delim)
     wide = cells.map {|x| x.length }
     maxw = [0] * cells.size
@@ -253,21 +275,22 @@ def table(args = nil, body = nil)
   end
 
   sum = maxw.inject(0, :+)
-  maxw.map! {|x| (x/sum*100).floor }
+  maxw.map! {|x| (x/sum*100.0).floor }
 
   lines.each do |line|
+    line = api.format(line)
     cells = line.split(delim)
     api.out "<tr>"
     cells.each.with_index do |cell, i| 
-      api.out "  <td width=#{maxw}% valign=top>" + 
-            "#{cell}</td>"
+      api.out "  <td width=#{maxw[i]}% valign=top>#{cell}</td>"
+#     api.out "  <td valign=top>#{cell}</td>"
     end
     api.out "</tr>"
   end
   api.out "</table>"
-  @toc << "#{_nbsp(8)}<b>Table #@chapter.#@table_num</b> #{title}<br>"
+  @toc << "#{_nbsp(8)}<b>Table #@chapter.#@table_num</b> #{title}<br>\n"
 # _next_output(_slug("table_#{title}"))
-  api.out "<b>Table #@chapter.#@table_num &nbsp;&nbsp; #{title}</b></center><br>"
+  api.out "\n<br><b>Table #@chapter.#@table_num &nbsp;&nbsp; #{title}</b></center><br>\n\n"
   api.optional_blank_line
 end
 
@@ -296,20 +319,20 @@ EOS
 end
 
 def missing(args = nil, body = nil)
-  @toc << "#{_nbsp(8)}<font color=red>TBD: #{api.data}</font><br>"
+  @toc << "#{_nbsp(8)}<font color=red>TBD: #{api.data}</font><br>\n"
   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>"
+  @toc << "#{_nbsp(8)}<font color=red>To be continued...</font><br>\n"
   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 "\n<br>\n<font color=red><i>Note: "
   api.out api.data 
   api.out "</i></font><br>\n "
   api.optional_blank_line

data/plugin/codetool.rb

@@ -83,12 +83,14 @@ def self.pyg_finalize(code, lexer=:elixir)
   end
 
   def fragment(args = nil, body = nil)
+    $code_lines ||= 0  # FIXME later
     lang = api.args.empty? ? :elixir : api.args.first.to_sym   # ruby or elixir
     api.args = []
     lines = api.body(true)  # .to_a  # raw
+    $code_lines += lines.size
     result = send("format_#{lang}", lines)
     api.out result
-    api.out "\n"
+    api.out "<br>\n"
     api.optional_blank_line
   rescue => err
     STDERR.puts "fragment Error: #{__method__} err = #{err}\n#{err.backtrace.join("\n")}"

data/test/snapshots/{mixin_bookish → mixin_booktool}/source.lt3

@@ -1,4 +1,4 @@
-.mixin bookish
+.mixin booktool
 
 .simple_table
 this :: that

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.38
+  version: 0.9.39
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-11 00:00:00.000000000 Z
+date: 2024-01-06 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -141,10 +141,10 @@ files:
 - test/snapshots/import_bookish/expected-output.txt
 - test/snapshots/import_bookish/source.lt3
 - test/snapshots/import_bookish/toc.tmp
-- test/snapshots/mixin_bookish/expected-error.txt
-- test/snapshots/mixin_bookish/expected-output.txt
-- test/snapshots/mixin_bookish/source.lt3
-- test/snapshots/mixin_bookish/toc.tmp
+- test/snapshots/mixin_booktool/expected-error.txt
+- test/snapshots/mixin_booktool/expected-output.txt
+- test/snapshots/mixin_booktool/source.lt3
+- test/snapshots/mixin_booktool/toc.tmp
 - test/snapshots/more_complex_vars/expected-error.txt
 - test/snapshots/more_complex_vars/expected-output.txt
 - test/snapshots/more_complex_vars/source.lt3
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: A smart processor for text