livetext 0.9.11 → 0.9.17

data/lib/userapi.rb

@@ -1,6 +1,8 @@
 # User API
 
-require 'formatline'
+require_relative 'formatline'
+
+# UserAPI deals mostly with user-level methods.
 
 module Livetext::UserAPI
 
@@ -93,10 +95,6 @@ module Livetext::UserAPI
     else
       lines
     end
-# rescue => err
-#   str = err.inspect + "\n"
-#   str << err.backtrace.map {|x| "  " + x }.join("\n")
-#   _error!(str)
   end
 
   def _body_text(raw=false)

data/livetext.gemspec

@@ -1,8 +1,7 @@
 require 'date'
 require 'find'
 
-$: << "."
-require "lib/livetext"
+require_relative "lib/livetext"
 
 Gem::Specification.new do |s|
   system("rm -f *.gem")

data/plugin/bookish.rb

@@ -1,4 +1,4 @@
-def hardbreaks
+def hardbreaks(args = nil, body = nil)
   @hard = false
   @hard = true unless @_args.first == "off"
 end
@@ -7,15 +7,17 @@ def hardbreaks?
   @hard
 end
 
-def credit
+def credit(args = nil, body = nil)
   # really just a place marker in source
 end
 
+# These are duplicated. Remove safely
+
 def h1; _out "<h1>#{@_data}</h1>"; end
 def h2; _out "<h2>#{@_data}</h2>"; end
 def h3; _out "<h3>#{@_data}</h3>"; end
 
-def alpha_columns
+def alpha_columns(args = nil, body = nil)
   n = @_args.first.to_i   # FIXME: what if missing?
   words = []
   _body do |line| 
@@ -30,9 +32,9 @@ def alpha_columns
   _out "</table>"
 end
 
-def comment
-  _body { }  # ignore body
-end
+# def comment
+#   _body { }  # ignore body
+# end
 
 def _errout(*args)
   ::STDERR.puts *args
@@ -48,12 +50,14 @@ def _slug(str)
   s2
 end
 
-def image
+
+# FIXME duplicated?
+def image(args = nil, body = nil)
   name = @_args[0]
   _out "<img src='#{name}'></img>"
 end
 
-def figure
+def figure(args = nil, body = nil)
   name = @_args[0]
   num = @_args[1]
   title = @_args[2..-1].join(" ")
@@ -62,7 +66,7 @@ def figure
   _out "<center><b>Figure #{num}</b> #{title}</center>"
 end
 
-def chapter
+def chapter(args = nil, body = nil)
 # _errout("chapter")
   @chapter = @_args.first.to_i
   @sec = @sec2 = 0
@@ -78,7 +82,7 @@ def chapter
   HTML
 end
 
-def chapterN
+def chapterN(args = nil, body = nil)
   @chapter += 1
   @sec = @sec2 = 0
   title = @_data    # .split(" ",2)[1]
@@ -94,7 +98,7 @@ def chapterN
   HTML
 end
 
-def sec
+def sec(args = nil, body = nil)
   @sec += 1
   @sec2 = 0
   @section = "#@chapter.#@sec"
@@ -108,7 +112,7 @@ rescue => err
   exit
 end
 
-def subsec
+def subsec(args = nil, body = nil)
   @sec2 += 1
   @subsec = "#@chapter.#@sec.#@sec2"
   title = @_data.dup
@@ -118,7 +122,7 @@ def subsec
   _out "<h3>#@subsec #{title}</h3>\n"
 end
 
-def definition_table
+def definition_table(args = nil, body = nil)
   title = @_data
   wide = "95"
   delim = " :: "
@@ -140,7 +144,7 @@ def definition_table
   _optional_blank_line
 end
 
-def table2
+def table2(args = nil, body = nil)
   title = @_data
   wide = "90"
   extra = _args[2]
@@ -164,7 +168,7 @@ def table2
   _optional_blank_line
 end
 
-def simple_table
+def simple_table(args = nil, body = nil)
   title = @_data
   delim = " :: "
   _out "<table cellpadding=2>"
@@ -193,7 +197,7 @@ def simple_table
   _out "</table>"
 end
 
-def table
+def table(args = nil, body = nil)
   @table_num ||= 0
   @table_num += 1
   title = @_data
@@ -227,7 +231,7 @@ def table
   _out "<b>Table #@chapter.#@table_num &nbsp;&nbsp; #{title}</b></center><br>"
 end
 
-def toc!
+def toc!(args = nil, body = nil)
   _debug "Closing TOC"
   @toc.close
 rescue => err
@@ -236,7 +240,7 @@ rescue => err
   _errout "Exception: #{err.inspect}"
 end
 
-def toc2
+def toc2(args = nil, body = nil)
   file = @_args[0]
   @toc.close
   ::File.write(file, <<-EOS)
@@ -249,24 +253,24 @@ EOS
   system("cat toc.tmp >>#{file}")
 end
 
-def missing
+def missing(args = nil, body = nil)
   @toc << "#{_nbsp(8)}<font color=red>TBD: #@_data</font><br>"
   stuff = @_data.empty? ? "" : ": #@_data"
   _out "<br><font color=red><i>[Material missing#{stuff}]</i></font><br>\n "
 end
 
-def TBC
+def TBC(args = nil, body = nil)
   @toc << "#{_nbsp(8)}<font color=red>To be continued...</font><br>"
   _out "<br><font color=red><i>To be continued...</i></font><br>"
 end
 
-def note
+def note(args = nil, body = nil)
   _out "<br><font color=red><i>Note: "
   _out @_data 
   _out "</i></font><br>\n "
 end
 
-def quote
+def quote(args = nil, body = nil)
   _out "<blockquote>"
   _body {|line| _out line }
   _out "</blockquote>"

data/plugin/calibre.rb

@@ -1,6 +1,6 @@
 require 'fileutils'
 
-def epub!
+def epub!(args = nil, body = nil)
   out = _format(@_args[0])
   src = @_args[1]
   @cover = @_args[2]

data/plugin/livemagick.rb

@@ -1,14 +1,14 @@
 require 'rmagick'
 include ::Magick
 
-def image
+def image(args = nil, body = nil)
   xx, yy, bg = _args
   xx, yy = xx.to_i, yy.to_i
   @image = Image.new(xx,yy) { self.background_color = bg }
   _optional_blank_line
 end
 
-def canvas
+def canvas(args = nil, body = nil)
   color, width, opacity = _args
   opacity, width = opacity.to_i, width.to_i
   @canvas = Draw.new
@@ -18,7 +18,7 @@ def canvas
   _optional_blank_line
 end
 
-def rectangle
+def rectangle(args = nil, body = nil)
   xy, wxh, stroke_color, stroke_width = _args
   x, y = xy.split(",").map(&:to_i)
   width, height = wxh.split("x").map(&:to_i)
@@ -29,14 +29,14 @@ def rectangle
   @canvas.rectangle(x, y, x+width, y+height)
 end
 
-def pen
+def pen(args = nil, body = nil)
   @fill, @stroke = _args
   @stroke = "black" if @stroke.nil? || @stroke.empty?
   _debug "pen: fill=#@fill stroke=#@stroke"
   _optional_blank_line
 end
 
-def font
+def font(args = nil, body = nil)
   size, font = _args
   font = "Helvetica" if font.nil? || font.empty? 
   size = "32" if size.nil? || size.empty? 
@@ -59,14 +59,14 @@ def _text(xy, wxh, str, weight, gravity)
   end
 end
 
-def text
+def text(args = nil, body = nil)
   xy, wxh, str = _data.split
   weight, gravity = BoldWeight, CenterGravity
   _text(xy, wxh, str, weight, gravity)
   _optional_blank_line
 end
 
-def text!
+def text!(args = nil, body = nil)
   xy, wxh = _data.split
   str = _body_text  # .join
   weight, gravity = BoldWeight, CenterGravity
@@ -74,17 +74,17 @@ def text!
   _optional_blank_line
 end
 
-def draw
+def draw(args = nil, body = nil)
   @canvas.draw(@image)
   _optional_blank_line
 end
 
-def save
+def save(args = nil, body = nil)
   @image.write(_args.first)
   _optional_blank_line
 end
 
-def save!
+def save!(args = nil, body = nil)
   save
   system("open #{_args.first}")
   _optional_blank_line

data/plugin/markdown.rb

@@ -1,35 +1,37 @@
 # This file is intended to be used via a Livetext .mixin  
 # or the equivalent.
 
+SimpleFormats = {}
 SimpleFormats[:b] = %w[* *]
 SimpleFormats[:i] = %w[_ _]
 SimpleFormats[:t] = %w[` `]
 SimpleFormats[:s] = %w[<strike> </strike>]
 
-def h1; _out "# #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end       # atx style for now
-def h2; _out "## #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end
-def h3; _out "### #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end
-def h4; _out "#### #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end
-def h5; _out "##### #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end
-def h6; _out "###### #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end
 
-def title
+def h1(args = nil, body = nil); _out "# #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end       # atx style for now
+def h2(args = nil, body = nil); _out "## #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end
+def h3(args = nil, body = nil); _out "### #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end
+def h4(args = nil, body = nil); _out "#### #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end
+def h5(args = nil, body = nil); _out "##### #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end
+def h6(args = nil, body = nil); _out "###### #{FormatLine.var_func_parse(@_data)}"; _optional_blank_line end
+
+def title(args = nil, body = nil)
   h1
 end
 
-def section
+def section(args = nil, body = nil)
   h3
 end
 
-def bq   # block quote
+def bq(args = nil, body = nil)   # block quote
   _body {|line| _out "> #{line}" }
 end
 
-def list
+def list(args = nil, body = nil)
   _body {|line| _out " * #{line}" }
 end
 
-def olist   # Doesn't handle paragraphs yet
+def olist(args = nil, body = nil)   # Doesn't handle paragraphs yet
   n = 0
   _body do |line|
     n += 1

data/plugin/pyggish.rb

@@ -1,58 +1,4 @@
-require 'pygments'
-
-module PygmentFix   # Remove CSS for Jutoh
-  Styles = {
-    :c  => "#408080-i",  # Comment
-    :k  => "#008000-b",  # Keyword
-    :o  => "#666666",    # Operator
-    :cm => "#408080-i",  # Comment.Multiline
-    :cp => "#BC7A00",    # Comment.Preproc
-    :c1 => "#408080-i",  # Comment.Single
-    :cs => "#408080-i",  # Comment.Special
-    :kc => "#008000-b",  # Keyword.Constant
-    :kd => "#008000-b",  # Keyword.Declaration
-    :kn => "#008000-b",  # Keyword.Namespace
-    :kp => "#008000",    # Keyword.Pseudo
-    :kr => "#008000-b",  # Keyword.Reserved
-    :kt => "#B00040",    # Keyword.Type
-    :m  => "#666666",    # Literal.Number
-    :s  => "#BA2121",    # Literal.String
-    :na => "#7D9029",    # Name.Attribute
-    :nb => "#008000",    # Name.Builtin
-    :nc => "#0000FF-b",  # Name.Class
-    :no => "#880000",    # Name.Constant
-    :nd => "#AA22FF",    # Name.Decorator
-    :ni => "#999999-b",  # Name.Entity
-    :ne => "#D2413A-b",  # Name.Exception
-    :nf => "#0000FF",    # Name.Function
-    :nl => "#A0A000",    # Name.Label
-    :nn => "#0000FF-b",  # Name.Namespace
-    :nt => "#008000-b",  # Name.Tag
-    :nv => "#19177C",    # Name.Variable
-    :ow => "#AA22FF-b",  # Operator.Word
-    :w  => "#bbbbbb",    # Text.Whitespace
-    :mb => "#666666",    # Literal.Number.Bin
-    :mf => "#666666",    # Literal.Number.Float
-    :mh => "#666666",    # Literal.Number.Hex
-    :mi => "#666666",    # Literal.Number.Integer
-    :mo => "#666666",    # Literal.Number.Oct
-    :sb => "#BA2121",    # Literal.String.Backtick
-    :sc => "#BA2121",    # Literal.String.Char
-    :sd => "#BA2121-i",  # Literal.String.Doc
-    :s2 => "#BA2121",    # Literal.String.Double 
-    :se => "#BB6622-b",  #  Literal.String.Escape 
-    :sh => "#BA2121",    # Literal.String.Heredoc
-    :si => "#BB6688-b",  # Literal.String.Interpol
-    :sx => "#008000",    # Literal.String.Other
-    :sr => "#BB6688",    # Literal.String.Regex
-    :s1 => "#BA2121",    # Literal.String.Single
-    :ss => "#19177C",    # Literal.String.Symbol
-    :bp => "#008000",    # Name.Builtin.Pseudo
-    :vc => "#19177C",    # Name.Variable.Class
-    :vg => "#19177C",    # Name.Variable.Global
-    :vi => "#19177C",    # Name.Variable.Instance
-    :il => "#666666"     # Literal.Number.Integer.Long
-  }
+require 'rouge'
 
   def self.pyg_change(code, klass, style)
     color = style[0..6]
@@ -82,13 +28,17 @@ module PygmentFix   # Remove CSS for Jutoh
 
   def self.pyg_finalize(code, lexer=:elixir)
     Styles.each_pair {|klass, style| pyg_change(code, klass, style) }
+File.open("debug-pf1", "w") {|f| f.puts code }
     code.sub!(/<pre>/, "<pre>\n")
     code.gsub!(/<span class="[np]">/, "")
     code.gsub!(/<\/span>/, "")
     color = _codebar_color(lexer)
-    code.sub!(/<td class="linenos"/, "<td width=6%></td><td width=5% bgcolor=#{color}")
+    code.sub!(/<td class="linenos"/, "<td width=2%></td><td width=5% bgcolor=#{color}")
+    code.gsub!(/<td/, "<td valign=top ")
     code.gsub!(/ class="[^"]*?"/, "")    # Get rid of remaining Pygments CSS
+File.open("debug-pf2", "w") {|f| f.puts code }
     lines = code.split("\n")
+#   lines.each {|line| line << "\n" }
     n1 = lines.index {|x| x =~ /<pre>/ }
     n2 = lines.index {|x| x =~ /<\/pre>/ }
     # FIXME ?
@@ -97,15 +47,13 @@ module PygmentFix   # Remove CSS for Jutoh
     lines[n1].sub!(/ 1$/, "  1 ")
     (n1+1).upto(n2) {|n| lines[n].replace(" " + lines[n] + " ") }
     code = lines.join("\n")
+File.open("debug-pf3", "w") {|f| f.puts code }
     code
   end
-end
-
-# Was in 'bookish':
 
-# include PygmentFix
 
 def _process_code(text)
+File.open("debug-pc1", "w") {|f| f.puts text }
   lines = text.split("\n")
   lines = lines.select {|x| x !~ /##~ omit/ }
   @refs = {}
@@ -117,28 +65,32 @@ def _process_code(text)
     end
   end
   lines.map! {|line| "  " + line }
-  text.replace(lines.join("\n"))
+  text2 = lines.join("\n")
+File.open("debug-pc2", "w") {|f| f.puts text2 }
+  text.replace(text2)
 end
 
 def _colorize(code, lexer=:elixir)
   text = ::Pygments.highlight(code, lexer: lexer, options: {linenos: "table"})
   _debug "--- in _colorize: text = #{text.inspect}"
-  PygmentFix.pyg_finalize(text, lexer)
-  text
+  text2 = PygmentFix.pyg_finalize(text, lexer)
+  result = "<!-- colorized code -->\n" + text2
+  result
 end
 
 def _colorize!(code, lexer=:elixir)
   text = ::Pygments.highlight(code, lexer: lexer, options: {})
   _debug "--- in _colorize!: text = #{text.inspect}"
-  PygmentFix.pyg_finalize(text, lexer)
-  text
+  text2 = PygmentFix.pyg_finalize(text, lexer)
+  result = "<!-- colorized code -->\n" + text2
+  result
 end
 
-def ruby
+def OLD_ruby
   file = @_args.first 
   if file.nil?
     code = "# Ruby code\n"
-    _body {|line| code << line }
+    _body {|line| code << line + "\n" }
   else
     code = "# Ruby code\n\n" + ::File.read(file)
   end
@@ -148,11 +100,11 @@ def ruby
   _out "\n#{html}\n "
 end
 
-def elixir
+def OLD_elixir
   file = @_args.first 
   if file.nil?
     code = ""
-    _body {|line| code << line }
+    _body {|line| code << line + "\n" }
   else
     code = ::File.read(file)
   end
@@ -163,20 +115,10 @@ def elixir
 end
 
 def fragment
-# debug
-  lexer = @_args.empty? ? :elixir : @_args.first.to_sym   # ruby or elixir
-  _debug "-- fragment: lexer = #{lexer.inspect}"
-  code = ""
-  code << "# Ruby code\n\n" if lexer == :ruby
-  _body(true) {|line| code << "  " + line }
-  _debug "code = \n#{code}\n-----"
-  params = "(code, lexer: #{lexer.inspect}, options: {})"
-  _debug "-- pygments params = #{params}"
-  text = _colorize!(code, lexer)
-  text ||= "ERROR IN HIGHLIGHTER"
-  _debug "text = \n#{text.inspect}\n-----"
-# PygmentFix.pyg_finalize(text, lexer)
-  _out text + "\n<br>"
+  lang = @_args.empty? ? :elixir : @_args.first.to_sym   # ruby or elixir
+  @_args = []
+  send(lang)
+  _out "\n"
 end
 
 def code       # FIXME ?
@@ -186,8 +128,76 @@ end
 
 def mono
   _out "<pre>"
-  _body(true) {|line| _out "    " + line }
+  _body {|line| _out "    " + line }
   _out "</pre>"
 end
 
+def create_code_styles
+  dir = @_outdir || "."
+  theme, back = "Github", "white"
+  css = Rouge::Themes.const_get(theme).render(scope: '.rb_highlight')
+  added = <<~CSS
+    .rb_highlight { 
+    font-family: 'Monaco', 'Andale Mono', 'Lucida Grande', 'Courier', 'Lucida Console', 'Courier New', monospace;
+    white-space: pre; 
+    background-color: #{back} 
+    }
+  CSS
+
+  css.gsub!(/{\n/, "{\n  font-family: courier;")
+  css = added + "\n" + css
+  # STDERR.puts "Writing #{theme} theme to ruby.css"
+  File.write("#{dir}/ruby.css", css)
+
+  css = Rouge::Themes.const_get(theme).render(scope: '.ex_highlight')
+  added = added.sub(/rb/, "ex")
+  css.gsub!(/{\n/, "{\n  font-family: courier;")
+  css = added + "\n" + css 
+  # STDERR.puts "Writing #{theme} theme to elixir.css"
+  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 ruby
+  file = @_args.first 
+  if file.nil?
+    code = "  # Ruby code\n\n"
+    _body {|line| code << "  " + line + "\n" }
+  else
+    code = "# Ruby code\n\n" + ::File.read(file)
+  end
+
+  html = format_ruby(code)
+  _out html
+end
+
+def elixir
+  file = @_args.first 
+  if file.nil?
+    code = ""
+    _body {|line| code << "  " + line + "\n" }
+  else
+    code = ::File.read(file)
+  end
+
+  html = format_elixir(code)
+  _out html
+end

data/plugin/tutorial.rb

@@ -1,27 +1,30 @@
 require 'cgi'
 
-def title
+def title(args = nil, body = nil)
   h1
+  _optional_blank_line
 end
 
-def section
+def section(args = nil, body = nil)
   h3
+  _optional_blank_line
 end
 
-def code
+def code(args = nil, body = nil)
   first = true  # dumb hack! fixes blank space
   _body do |line| 
     tag, first = "<pre>", false if first
     _out "#{tag}   #{::CGI.escape_html(line)}"   # indentation
   end
   _out "</pre>"
+  _optional_blank_line
 end
 
 def rx(str)
   ::Regexp.compile(::Regexp.escape(str))
 end
 
-def inout
+def inout(args = nil, body = nil)
   src, out = _args
   t1 = ::File.readlines(src) rescue (abort "t1 = #{src}")
   t2 = ::File.readlines(out) rescue (abort "t2 = #{out}")
@@ -45,6 +48,7 @@ def inout
     </tr>
     </table>
   HTML
+  _optional_blank_line
 end
 
 def put_table(src, exp)
@@ -73,11 +77,12 @@ def put_table(src, exp)
   HTML
 end
 
-def testcase
+def testcase(args = nil, body = nil)
   name = _args.first
   _out "\n<font size=+1><b>Test: </font><font size=+2><tt>#{name}</tt></font></b></h3><br>"
   src, exp = "test/data/#{name}/source.lt3", "test/data/#{name}/expected-output.txt"
   @_args = [src, exp]   # Better way to do this??
   put_table(src, exp)
   _out "<br>"
+  _optional_blank_line
 end

data/test/all.rb

@@ -0,0 +1,3 @@
+
+require_relative 'unit/all'
+require_relative 'snapshots'             # snapshots

data/test/snapshots/OMIT.txt

@@ -0,0 +1,11 @@
+# Comments are ignored.
+# Other lines:  name_of_snapshot and any comments here are ignored (no # needed)
+# fake_test_name       Use # to un-omit   ;)
+  error_no_such_inc      Output BEFORE error doesn't get passed through
+  error_no_such_copy     ^ Same behavior as  error_no_such_inc
+  error_no_such_mixin    ^ Same behavior as error_missing_end
+  error_invalid_name     ^ Same behavior as error_no_such_inc
+  error_missing_end      Output is duplicated somehow. Look for: puts @body or puts @main.body
+  error_inc_line_num     Forgot what's wrong here
+  simple_import          Not coded yet
+  icanhaz                Dummy command similar to import/mixin