livetext 0.5.2 → 0.5.3

data/lib/markdown.rb

@@ -0,0 +1,30 @@
+# This file is intended to be used via a Livetext .mixin  
+# or the equivalent.
+
+def h1; _puts "# #{@_data}"; end       # atx style for now
+def h2; _puts "## #{@_data}"; end
+def h3; _puts "### #{@_data}"; end
+def h4; _puts "#### #{@_data}"; end
+def h5; _puts "##### #{@_data}"; end
+def h6; _puts "###### #{@_data}"; end
+
+def bq   # block quote
+  _body {|line| _puts "> #{line}" }
+end
+
+# Asterisks, underscores, and double underscores -- difficult, handle later
+
+def list
+  _body {|line| _puts " * #{line}" }
+end
+
+alias nlist olist
+
+def olist   # Doesn't handle paragraphs yet
+  n = 0
+  _body do |line|
+    n += 1
+    _puts "#{n}. #{line}"
+  end
+end
+

data/lib/pyggish.rb

@@ -0,0 +1,194 @@
+require 'pygments'
+
+# noinspection ALL
+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
+  }
+
+  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=6%></td><td width=5% bgcolor=#{color}")
+    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
+end
+
+# Was in 'bookish':
+
+include PygmentFix
+
+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 }
+  text.replace(lines.join("\n"))
+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
+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
+end
+
+def ruby
+  file = @_args.first 
+  if file.nil?
+    code = "# Ruby code\n"
+    _body {|line| code << line }
+  else
+    code = "# Ruby code\n\n" + ::File.read(file)
+  end
+
+  _process_code(code)
+  html = _colorize(code, :ruby)
+  @output.puts "\n#{html}\n "
+end
+
+def elixir
+  file = @_args.first 
+  if file.nil?
+    code = ""
+    _body {|line| code << line }
+  else
+    code = ::File.read(file)
+  end
+
+  _process_code(code)
+  html = _colorize(code, :elixir)
+  @output.puts "\n#{html}\n "
+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 {|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)
+  @output.puts text + "\n<br>"
+end
+
+def code       # FIXME ?
+  text = ""   
+  _body {|line| @output.puts "    " + line }
+end
+
+def mono
+  _puts "<pre>"
+  _body {|line| _puts "    " + line }
+  _puts "</pre>"
+end
+
+

data/lib/tutorial.rb

@@ -0,0 +1,89 @@
+require 'cgi'
+
+def title
+  puts "<center><h2>#{_data}</h2></center>"
+end
+
+def section
+  puts "<br>" * 2 + "<b><font size=+1>#{_data}</font></b>" + "<br>"
+end
+
+def code
+  _puts "<pre>"
+  _body {|line| _puts "   #{::CGI.escape_html(line)}" }   # indentation
+  _puts "</pre>"
+end
+
+def rx(str)
+  ::Regexp.compile(::Regexp.escape(str))
+end
+
+def list
+  puts "<ul>"
+  _body {|line| puts "<li>#{_formatting(line)}</li>" }
+  _puts "</ul>"
+end
+
+def nlist
+  puts "<ol>"
+  _body {|line| puts "<li>#{_formatting(line)}</li>" }
+  _puts "</ol>"
+end
+
+def dlist
+  delim = "~~"
+  _puts "<table>"
+  _body do |line|
+# @tty.puts "Line = #{line}"
+    line = OLD_formatting(line)
+# @tty.puts "Line = #{line}\n "
+    term, defn = line.split(delim)
+    _puts "<tr>"
+    _puts "<td width=3%><td width=10%>#{term}</td><td>#{defn}</td>"
+    _puts "</tr>"
+  end
+  _puts "</table>"
+end
+
+def p
+# puts "<p>"
+  _passthru(_data)
+end
+
+def inout
+  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
+# t1 = ::CGI.escape_html(t1)
+# t2 = ::CGI.escape_html(t2)
+
+  puts <<-HTML
+    <center>
+    <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=#fec0fe valign=top>
+        <pre>#{t1}</pre>
+      </td>
+      <td width=50% bgcolor=lightgray valign=top>
+        <pre>#{t2}</pre>
+      </td>
+    </tr>
+    </table>
+    </center>
+  HTML
+end
+
+def testcase
+  name = _args.first
+  _puts "\n<b>Test: <tt>#{name.gsub(/_/, "\\_")}</tt></b><br>"
+  src, exp = "test/testfiles/#{name}/source.ltx", "test/testfiles/#{name}/expected-output.txt"
+  @_args = [src, exp]   # Better way to do this??
+  inout                 # Weird - only place I've done this yet.
+end

data/livetext.gemspec

@@ -1,12 +1,107 @@
 Gem::Specification.new do |s|
   s.name        = 'livetext'
-  s.version     = '0.5.2'
-  s.date        = '2017-02-03'
+  s.version     = '0.5.3'
+  s.date        = '2017-02-05'
   s.summary     = "A smart processor for text"
-  s.description = "A smart processor for text"
+  s.description = "A smart text processor extensible in Ruby"
   s.authors     = ["Hal Fulton"]
   s.email       = 'rubyhacker@gmail.com'
-  s.files       = Dir["**"]
+  s.files       = %w[
+                     ./bin
+                     ./bin/livetext
+                     ./lib
+                     ./lib/bookish.rb
+                     ./lib/calibre.rb
+                     ./lib/liveblog.rb
+                     ./lib/livemagick.rb
+                     ./lib/livetext.rb
+                     ./lib/markdown.rb
+                     ./lib/pyggish.rb
+                     ./lib/tutorial.rb
+                     ./livetext-0.5.2.gem
+                     ./livetext.gemspec
+                     ./notes.txt
+                     ./README.html
+                     ./README.ltx
+                     ./README.md
+                     ./test
+                     ./test/cleanup
+                     ./test/newtest
+                     ./test/rawtext.inc
+                     ./test/simple_mixin.rb
+                     ./test/simplefile.inc
+                     ./test/test.rb
+                     ./test/testfiles
+                     ./test/testfiles/basic_formatting
+                     ./test/testfiles/basic_formatting/expected-error.txt
+                     ./test/testfiles/basic_formatting/expected-output.txt
+                     ./test/testfiles/basic_formatting/source.ltx
+                     ./test/testfiles/block_comment
+                     ./test/testfiles/block_comment/expected-error.txt
+                     ./test/testfiles/block_comment/expected-output.txt
+                     ./test/testfiles/block_comment/source.ltx
+                     ./test/testfiles/comments_ignored_1
+                     ./test/testfiles/comments_ignored_1/expected-error.txt
+                     ./test/testfiles/comments_ignored_1/expected-output.txt
+                     ./test/testfiles/comments_ignored_1/source.ltx
+                     ./test/testfiles/copy_is_raw
+                     ./test/testfiles/copy_is_raw/expected-error.txt
+                     ./test/testfiles/copy_is_raw/expected-output.txt
+                     ./test/testfiles/copy_is_raw/source.ltx
+                     ./test/testfiles/def_method
+                     ./test/testfiles/def_method/expected-error.txt
+                     ./test/testfiles/def_method/expected-output.txt
+                     ./test/testfiles/def_method/source.ltx
+                     ./test/testfiles/example_alpha
+                     ./test/testfiles/example_alpha/expected-error.txt
+                     ./test/testfiles/example_alpha/expected-output.txt
+                     ./test/testfiles/example_alpha/source.ltx
+                     ./test/testfiles/example_alpha2
+                     ./test/testfiles/example_alpha2/expected-error.txt
+                     ./test/testfiles/example_alpha2/expected-output.txt
+                     ./test/testfiles/example_alpha2/source.ltx
+                     ./test/testfiles/fixit
+                     ./test/testfiles/functions
+                     ./test/testfiles/functions/expected-error.txt
+                     ./test/testfiles/functions/expected-output.txt
+                     ./test/testfiles/functions/source.ltx
+                     ./test/testfiles/hello_world
+                     ./test/testfiles/hello_world/expected-error.txt
+                     ./test/testfiles/hello_world/expected-output.txt
+                     ./test/testfiles/hello_world/source.ltx
+                     ./test/testfiles/more_complex_vars
+                     ./test/testfiles/more_complex_vars/expected-error.txt
+                     ./test/testfiles/more_complex_vars/expected-output.txt
+                     ./test/testfiles/more_complex_vars/source.ltx
+                     ./test/testfiles/raw_text_block
+                     ./test/testfiles/raw_text_block/expected-error.txt
+                     ./test/testfiles/raw_text_block/expected-output.txt
+                     ./test/testfiles/raw_text_block/source.ltx
+                     ./test/testfiles/sigil_can_change
+                     ./test/testfiles/sigil_can_change/expected-error.txt
+                     ./test/testfiles/sigil_can_change/expected-output.txt
+                     ./test/testfiles/sigil_can_change/source.ltx
+                     ./test/testfiles/simple_copy
+                     ./test/testfiles/simple_copy/expected-error.txt
+                     ./test/testfiles/simple_copy/expected-output.txt
+                     ./test/testfiles/simple_copy/source.ltx
+                     ./test/testfiles/simple_include
+                     ./test/testfiles/simple_include/expected-error.txt
+                     ./test/testfiles/simple_include/expected-output.txt
+                     ./test/testfiles/simple_include/source.ltx
+                     ./test/testfiles/simple_mixin
+                     ./test/testfiles/simple_mixin/expected-error.txt
+                     ./test/testfiles/simple_mixin/expected-output.txt
+                     ./test/testfiles/simple_mixin/source.ltx
+                     ./test/testfiles/simple_vars
+                     ./test/testfiles/simple_vars/expected-error.txt
+                     ./test/testfiles/simple_vars/expected-output.txt
+                     ./test/testfiles/simple_vars/source.ltx
+                     ./test/testfiles/single_raw_line
+                     ./test/testfiles/single_raw_line/expected-error.txt
+                     ./test/testfiles/single_raw_line/expected-output.txt
+                     ./test/testfiles/single_raw_line/source.ltx
+                    ]
   s.homepage    = 'https://github.com/Hal9000/livetext'
   s.license       = "Ruby's"
 end

data/test/cleanup

@@ -0,0 +1 @@
+find testfiles -name actual-*.txt | xargs rm

data/test/newtest

@@ -0,0 +1,10 @@
+mkdir testfiles/$1
+
+# actual-error.txt        actual-output.txt       expected-error.txt      expected-output.txt     source.ltx
+
+cd testfiles/$1
+
+touch expected-output.txt expected-error.txt
+
+vi -O source.ltx exp expected-output.txt expected-error.txt
+

data/test/rawtext.inc

@@ -0,0 +1,4 @@
+This is not a comment:
+.comment woohoo!
+This is not a method:
+.no_such_method