livetext 0.9.37 → 0.9.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 784ac1767694b1d098d3e289082070ef3e3df0aab15766cf42105e854da31730
-  data.tar.gz: b6f62f1164873ec613b16067c53abc0e1b8906cacaeaae033bd5e862ca6b4bd5
+  metadata.gz: dd459c3fa75665b383b8056baa8af5ee9bae77a3abcaeba153b11c422b2f0418
+  data.tar.gz: 6f3674f4f5f5408e1b7fbffe45631ebbc0c43abbc624f1ba6ade1232e33d10f3
 SHA512:
-  metadata.gz: 795730de451f27c2ffccf326fcc976e170ae884fef45d3bc732bb59826cc40bbff0e877d3ee3ed051fa3f20e0836ccede6668c42ba7a21ec1bf51910ebfc7a99
-  data.tar.gz: 1db7dfbb839a6787872df65d591b49fb36db69f9d3ddc86805d981f19266c98abcac4a8bbe8efebdf1137ec674201a3b3f4e0f09d849116acb56f390eefd8cbd
+  metadata.gz: 49baee92ae2d7a5ef1337ef98258e416014c954a07d5574f697def625c41e06f7cdaa297ca6cc9a88f3cb3dc4f7c58b589aab889f9bb30d67ba4bf583a52c4f7
+  data.tar.gz: 6bff41c9c3128a5de6a58f1e81985e35ec3563acbdc133f24427e21c86aca2b475ac0dc1da7967b6e10f92203beab44750ae2ae47bb36a164dfddc62b506c5b9

data/lib/livetext/standard.rb

@@ -94,7 +94,7 @@ module Livetext::Standard
       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
@@ -120,7 +120,7 @@ module Livetext::Standard
   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
 
@@ -128,7 +128,8 @@ module Livetext::Standard
     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(args = nil, body = nil)
@@ -334,8 +335,8 @@ module Livetext::Standard
       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

data/lib/livetext/version.rb

@@ -2,5 +2,5 @@
 # Defining VERSION
 
 class Livetext
-  VERSION = "0.9.37"
+  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"
@@ -296,7 +325,7 @@ rescue => err
   exit
 end
 
-def init_bookish
+def init_booktool
   @_file_num = 0
   @toc_file = "toc.tmp"
   @toc = ::File.new(@toc_file, "w")
@@ -347,10 +376,8 @@ def _prep_next_output(args)
   *title = args    # _next_output(tag, num)
   title = title.join(" ")
   slug = _slug(title)
-  api.tty "title = #{title.inspect}"
   @_file_num += 1
   fname = "#{'%03d' % @_file_num}-#{slug}.html"
-  api.tty "slug, fnum, fname= #{[slug, @_file_num, fname].inspect}"
   fname
 end
 

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.37
+  version: 0.9.38
 platform: ruby
 authors:
 - Hal Fulton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-09 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