livetext 0.9.17 → 0.9.22

data/imports/pyggish.rb

@@ -0,0 +1,172 @@
+require 'rouge'
+
+# FIXME This file has suboptimal juju. See plugin/pyggish.rb also
+
+module Pyggish
+  def self.pyg_change(code, klass, style)
+    color = style[0..6]
+    modifier = style[8]
+    mod_open = modifier ? "<#{modifier}>" : ""
+    mod_close = modifier ? "</#{modifier}>" : ""
+    rx = /<span class="#{klass}">(?<cname>[^<]+?)<\/span>/
+    loop do
+      md = rx.match(code)
+      break if md.nil?
+      str = md[:cname]
+      result = code.sub!(rx, "<font color=#{color}>#{mod_open}#{str}#{mod_close}</font>")
+      break if result.nil?
+    end
+  end
+
+  def self._codebar_color(lexer)
+    color = case lexer
+      when :elixir
+        "#fc88fc"
+      when :ruby
+        "#fc8888"
+      else
+        raise "Unknown lexer"
+    end
+  end
+
+  def self.pyg_finalize(code, lexer=:elixir)
+    Styles.each_pair {|klass, style| pyg_change(code, klass, style) }
+    code.sub!(/<pre>/, "<pre>\n")
+    code.gsub!(/<span class="[np]">/, "")
+    code.gsub!(/<\/span>/, "")
+    color = _codebar_color(lexer)
+    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
+    lines = code.split("\n")
+    n1 = lines.index {|x| x =~ /<pre>/ }
+    n2 = lines.index {|x| x =~ /<\/pre>/ }
+    # FIXME ?
+    n1 ||= 0
+    n2 ||= -1
+    lines[n1].sub!(/ 1$/, "  1 ")
+    (n1+1).upto(n2) {|n| lines[n].replace(" " + lines[n] + " ") }
+    code = lines.join("\n")
+    code
+  end
+
+  def _process_code(text)
+    lines = text.split("\n")
+    lines = lines.select {|x| x !~ /##~ omit/ }
+    @refs = {}
+    lines.each.with_index do |line, i|
+      if line =~ /##~ ref/
+        frag, name = line.split(/ *##~ ref/)
+        @refs[name.strip] = i
+        line.replace(frag)
+      end
+    end
+    lines.map! {|line| "  " + line }
+    text2 = lines.join("\n")
+    text.replace(text2)
+  end
+
+  def _colorize(code, lexer=:elixir)
+    text = ::Pygments.highlight(code, lexer: lexer, options: {linenos: "table"})
+    _debug "--- in _colorize: text = #{text.inspect}"
+    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}"
+    text2 = PygmentFix.pyg_finalize(text, lexer)
+    result = "<!-- colorized code -->\n" + text2
+    result
+  end
+
+  def fragment
+    lang = @_args.empty? ? :elixir : @_args.first.to_sym   # ruby or elixir
+    @_args = []
+    send(lang)
+    _out "\n"
+  end
+
+  def code       # FIXME ?
+    text = ""   
+    _body {|line| _out "    " + line }
+  end
+
+  def mono
+    _out "<pre>"
+    _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
+end

data/imports/tutorial.rb

@@ -0,0 +1,95 @@
+require 'helpers'
+
+# Created as an "ad hoc" lib for generating the README
+
+module Tutorial
+  include Helpers
+
+  def title(args = nil, body = nil)
+    h1
+    _optional_blank_line
+  end
+
+  def section(args = nil, body = nil)
+    h3
+    _optional_blank_line
+  end
+
+  def code(args = nil, body = nil)
+    first = true  # dumb hack! fixes blank space
+    _body do |line| 
+      tag, first = "<pre>", false if first
+      _out "#{tag}   #{escape_html(line)}"   # indentation
+    end
+    _out "</pre>"
+    _optional_blank_line
+  end
+
+  def rx(str)
+    ::Regexp.compile(::Regexp.escape(str))
+  end
+
+  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}")
+    # To pacify markdown for README (FIXME later)
+    t1 = t1.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join
+    t2 = t2.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join
+
+    _out <<-HTML
+      <table width=80% cellpadding=4>
+      <tr>
+        <td width=50%><b>Input</b></td>
+        <td width=50%><b>Output</b></td>
+      </tr>
+      <tr>
+        <td width=50% bgcolor=#fee0fe valign=top>
+          <pre>#{t1}</pre>
+        </td>
+        <td width=50% bgcolor=#eeeeee valign=top>
+          <pre>#{t2}</pre>
+        </td>
+      </tr>
+      </table>
+    HTML
+    _optional_blank_line
+  end
+
+  def put_table(src, exp)
+    t1 = ::File.readlines(src) rescue (abort "t1 = #{src}")
+    t2 = ::File.readlines(exp) rescue (abort "t2 = #{out}")
+    t1 = t1.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join
+    t2 = t2.map {|x| " " + x.sub(/ +$/,"").gsub(/_/, "\\_") }.join
+
+    _out <<-HTML
+      <font size=+1>
+      <table width=80% cellpadding=4>
+      <tr>
+        <td width=50%><b>Input</b></td>
+        <td width=50%><b>Output</b></td>
+      </tr>
+      <tr>
+        <td width=50% bgcolor=#fee0fe valign=top>
+          <pre>#{t1}</pre>
+        </td>
+        <td width=50% bgcolor=#eeeeee valign=top>
+          <pre>#{t2}</pre>
+        </td>
+      </tr>
+      </table>
+      </font>
+    HTML
+  end
+
+  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/snapshots/#{name}/source.lt3", "test/snapshots/#{name}/expected-output.txt"
+    @_args = [src, exp]   # Better way to do this??
+    put_table(src, exp)
+    _out "<br>"
+    _optional_blank_line
+  end
+end
+

data/lib/cmdargs.rb

@@ -4,44 +4,53 @@ require_relative 'livetext'
   Weird concepts to understand here...
 
     1. A Livetext dot-command (flush left) usually looks like:
-       .foobar
+         .foobar
+
     2. A dot-command (left-indented) usually looks like:
-           $.foobar
+         $.foobar
+
     3. More generally, it may have any number of parameters (0, 1, ...)
-       .redirect somefile.txt append
+         .redirect somefile.txt append
+
     4. Variables and functions *can* appear (rare in practice??)
-       .redirect somefile$my_suffix $$my_mode
+         .redirect somefile$my_suffix $$my_mode
+
     5. A trailing # comment may appear 
        a. Stripped... saved in #raw ? #data ? #comment ? elsewhere?
        b. NOT the "dot" as a comment!
+
     6. .foobar  # This here is a comment
+
     7. #data accessor returns all data on the .foo line...
        a. ...After the initial space
-       b. ...Including spaces
+       b. ...Including later spaces
        c. Including comment??
        d. .foo This is  o n l y   a test.
           # #data returns: "This is  o n l y   a test."
        e. What about formatting???
        f. What about: comments? variables? functions? 
 
-    7. Some commands have NO body while others have an OPTIONAL or REQUIRED body
+    8. Some commands have NO body while others have an OPTIONAL or REQUIRED body
        a. Assume .cmd1 definition forbids a body (then a body is an error)
           .cmd1   # may NOT have a body
        b. Assume .cmd2 definition PERMITS a body
           .cmd2   # may or MAY NOT have body/.end  
-       c. Assume .cmd3 definition PERMITS a body
+       c. Assume .cmd3 definition REQUIRES a body
           .cmd3   # REQUIRES a body/.end  
           . stuff...
           .end
-    8. Inside a body:
-    8a. Leading dot has no special meaning (though the associated method may parse it!)
-    8b. BUG? Currently leading dot is a comment INSIDE a body?
-    8a. No leading char is special (though the associated method may parse it!)
-    8a. No trailing #-comments (though the associated method may parse it!)
-    8c. ?? We should or shouldn't look for variables/functions? or make it an option?
-    8d. .end may naturally not be used (but see .raw where it may)
-    9. the args accessor is a simple array of strings
 
+    9. Inside a body:
+       a. Leading dot has no special meaning (though the associated method may parse it!)
+       b. BUG? Currently leading dot is a comment INSIDE a body?
+       c. No leading char is special (though the associated method may parse it!)
+       d. No trailing #-comments (though the associated method may parse it!)
+       e. ?? We should or shouldn't look for variables/functions? or make it an option?
+       f. .end may naturally not be used (but see .raw where it may)
+
+   10. The args accessor is a simple array of strings
+       a. there is also raw_args (without variables/functions, etc.)
+       b. Much of this HAS NOT been thought through yet!      
 
 =end
 
@@ -56,19 +65,18 @@ class Livetext::CmdData
     # body:  true => this command has a body + .end
     # how raw is raw?
     #   remove comment - always/sometimes/never?
-    #   var_func_parse - always/sometimes/never?
-    #   var_func_parse inside body??
+    #   interpolate - always/sometimes/never?
+    #   interpolate inside body??
     @data = data.dup     # comment? vars? funcs?
     @raw  = data.dup     # comment? vars? funcs?
     @args  = data.split  # simple array
     @nargs = nargs       # not really "needed"
     check_num_args(nargs)
-    
-    # @varfunc = _var_func_parse(data.dup)
+    # @varfunc = Livetext.interpolate(data.dup)
   end
 
   def check_num_args(num)
-    num_range = /(\d{0,2})(\.\.)(\d{0,2})/
+    num_range = /(\d{0,2})(\.\.)(\d{0,2})/   # Not "really" right...
     min, max = 0, 9999
     md = num_range.match(@nargs).to_a
     bad_args = nil

data/lib/formatline.rb

@@ -7,6 +7,8 @@ class FormatLine < StringParser
   SimpleFormats[:i] = %w[<i> </i>]
   SimpleFormats[:t] = ["<font size=+1><tt>", "</tt></font>"]
   SimpleFormats[:s] = %w[<strike> </strike>]
+
+  BITS = SimpleFormats.keys
  
   Null   = ""
   Space  = " "
@@ -45,14 +47,14 @@ class FormatLine < StringParser
 #   add grab
     loop do 
       case peek
-        when Escape; grab; add peek; grab; add peek
+        when Escape; grab; add peek; grab; #  add peek  # <-- last is an error??
         when "$"
           dollar
         when "*", "_", "`", "~"
           marker peek
           add peek
         when LF
-          break if @i >= line.size - 1
+          break if eos?  # @i >= line.size - 1
         when nil
           break
         else
@@ -107,22 +109,10 @@ class FormatLine < StringParser
       break if token.nil? 
       sym, val = *token
       case sym
-        when :str
-          @out << val unless val == "\n"   # BUG
-        when :var
-          @out << varsub(val)
-        when :func 
-          param = nil
-          arg = gen.peek
-          if [:colon, :brackets].include? arg[0] 
-            arg = gen.next  # for real
-            param = arg[1]
-            param = FormatLine.var_func_parse(param)
-          end
-          @out << funcall(val, param)
-        when :b, :i, :t, :s
-          val = FormatLine.var_func_parse(val)
-          @out << embed(sym, val)
+        when :str;   eval_str(val)
+        when :var;   eval_var(val)
+        when :func;  eval_func(val, gen)
+        when *BITS;  eval_bits(sym, val)
       else
         add_token :str
       end
@@ -131,46 +121,16 @@ class FormatLine < StringParser
     @out
   end
 
-  def grab_colon_param
-    grab  # grab :
-    param = ""
-    loop do 
-      case next!
-        when Escape
-          grab
-          param << next!
-          grab
-        when Space, LF, nil; break
-      else
-        param << next!
-        grab
-      end
-    end
-
-    param = nil if param.empty?
-    param
-  end
-
   def grab_func_param
-    grab # [
-    param = ""
-    loop do 
-      case next!
-        when Escape
-          grab
-          param << next!
-          grab
-        when "]", LF, nil; break
-      else
-        param << next!
-        grab
-      end
+    case lookahead
+      when "["
+        param = grab_bracket_param
+        add_token(:brackets, param)
+      when ":"
+        param = grab_colon_param
+        add_token(:colon, param)
+    else  # do nothing
     end
-
-    add peek
-    grab
-    param = nil if param.empty?
-    param
   end
 
   def add(str)
@@ -189,7 +149,7 @@ class FormatLine < StringParser
     loop do
       break if eos?
       str << peek
-      break if terminate?(NoAlpha, next!)
+      break if terminate?(NoAlpha, lookahead)
       grab
     end
     str
@@ -199,9 +159,9 @@ class FormatLine < StringParser
     str = Null.dup
     grab
     loop do
-      break if eos?   # peek.nil?
+      break if peek.nil?   # eos?
       str << peek
-      break if terminate?(NoAlphaDot, next!)
+      break if terminate?(NoAlphaDot, lookahead)
       grab
     end
     str
@@ -216,7 +176,7 @@ class FormatLine < StringParser
       when "$"; double_dollar
 #     when "."; dollar_dot
       when /[A-Za-z]/
-       add_token :str
+        add_token :str
         var = peek + grab_alpha_dot
         add_token(:var, var)
     else 
@@ -226,17 +186,14 @@ class FormatLine < StringParser
   end
 
   def double_dollar
-    case next!
+    case lookahead
       when Space; add_token :string, "$$ "; grab; return
       when LF, nil; add "$$"; add_token :str
       when Alpha
         add_token(:str, @token)
         func = grab_alpha
         add_token(:func, func)
-        case next!
-          when ":"; param = grab_colon_param; add_token(:colon, param)
-          when "["; param = grab_func_param; add_token(:brackets, param)
-        end
+        param = grab_func_param    # may be null/missing
       else
         grab; add_token :str, "$$" + peek; return
     end
@@ -276,7 +233,7 @@ class FormatLine < StringParser
   def double_marker(char)
     sym = Syms[char]
     kind = sym
-    case next!   # first char after **
+    case lookahead   # first char after **
       when Space, LF, nil
         pre, post = SimpleFormats[sym]
         add_token kind
@@ -317,13 +274,12 @@ class FormatLine < StringParser
     add str
     str
   rescue => err
-    STDERR.puts "ERR = #{err}\n#{err.backtrace}"
-    STDERR.puts "=== str = #{str.inspect}"
+    ::STDERR.puts "ERR = #{err}\n#{err.backtrace}"
   end
 
   def escaped
-    grab
-    ch = grab
+    grab        # Eat the backslash
+    ch = grab   # Take next char
     ch
   end
 
@@ -350,20 +306,20 @@ class FormatLine < StringParser
     add str
     str
   rescue => err
-    STDERR.puts "ERR = #{err}\n#{err.backtrace}"
-    STDERR.puts "=== str = #{str.inspect}"
+    ::STDERR.puts "ERR = #{err}\n#{err.backtrace}"
   end
 
   def funcall(name, param)
     err = "[Error evaluating $$#{name}(#{param})]"
+    func_name = name  # "func_" + name.to_s
     result = 
-      if self.respond_to?("func_" + name.to_s)
-        self.send("func_" + name.to_s, param)
+      if self.send?(func_name, param)  # self.respond_to?(func_name)
+        # do nothing
       else
         fobj = ::Livetext::Functions.new
         fobj.send(name, param) rescue err
       end
-    result
+    result.to_s
   end
 
   def varsub(name)
@@ -374,4 +330,76 @@ class FormatLine < StringParser
   def embedded?
     ! (['"', "'", " ", nil].include? prev)
   end
+
+  private 
+
+  def grab_colon_param
+    grab  # grab :
+    param = ""
+    loop do 
+      case lookahead
+        when Escape
+          grab
+          param << lookahead
+          grab
+        when Space, LF, nil; break
+      else
+        param << lookahead
+        grab
+      end
+    end
+
+    param = nil if param.empty?
+    param
+  end
+
+  def grab_bracket_param
+    grab # [
+    param = ""
+    loop do 
+      case lookahead
+        when Escape
+          grab
+          param << lookahead
+          grab
+        when "]", LF, nil
+          break
+      else
+        param << lookahead
+        grab
+      end
+    end
+    add peek
+    grab
+    param = nil if param.empty?
+    param
+  end
+
+  def eval_bits(sym, val)
+    val = Livetext.interpolate(val)
+    @out << embed(sym, val)
+  end
+
+  def eval_func(val, gen)
+    param = nil
+    arg = gen.peek rescue :bogus
+    unless arg == :bogus
+      if [:colon, :brackets].include? arg[0] 
+        arg = gen.next  # for real
+        param = arg[1]
+        # FIXME - unsure - interpolate again??
+        # param = Livetext.interpolate(param)
+      end
+    end
+    @out << funcall(val, param)
+  end
+
+  def eval_var(val)
+    @out << varsub(val)
+  end
+
+  def eval_str(val)
+    @out << val unless val == "\n"   # BUG
+  end
+
 end

data/lib/functions.rb

@@ -13,6 +13,21 @@ class Livetext::Functions
     attr_accessor :param   # kill this?
   end
 
+# FIXME Function parameters need to be fixed...
+
+  def isqrt(param = nil)      # "integer square root" - Just for testing
+    arg = num = param         #  Takes any number
+    if num.nil? || num.empty?
+      arg = "NO PARAM"        # Just for error text
+    end
+    # Integer()/Float() can raise error
+    num = num.include?(".") ? Float(num) : Integer(num)   
+    # Returns truncated integer
+    Math.sqrt(num).to_i       # user need not do to_s
+  rescue => err               # Malformed number? negative?
+    "[Error evaluating $$isqrt(#{arg})]"
+  end
+
   def date(param=nil)
     Time.now.strftime("%F")
   end
@@ -40,7 +55,7 @@ class Livetext::Functions
     "<br>"*n
   end
 
-  def yt(param)
+  def yt(param)   # FIXME uh, this is crap
     param = self.class.param
     "https://www.youtube.com/watch?v=#{param}"
   end

data/lib/handler/{icanhaz.rb → import.rb}

@@ -1,5 +1,5 @@
 
-class Livetext::Handler::ICanHaz
+class Livetext::Handler::Import
   include Helpers
 
   attr_reader :file

data/lib/handler.rb

@@ -1 +1 @@
-require_relative 'handler/icanhaz'
+require_relative 'handler/import'