livetext 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ae7c917ce5e93c8b0d53795b72471d5b7ca18ea
-  data.tar.gz: aca0850f743ae6d906c8581a466510dd022e53cf
+  metadata.gz: b7059d92044e10b0b6434ca10c8fca98495abd9c
+  data.tar.gz: 7811dac366af024bd3257d31278902d023a5d4ec
 SHA512:
-  metadata.gz: 4036aeecc7357e64ad8cb9328ee5fdb808e218d2f1b4d96b1164152ef02ae1602725570e8a521237b9d3ade1fd3e716f76b5440baa8a83f8e52e9e046806d739
-  data.tar.gz: 7e2ed315502c6868aed402b91364285a99a89d5db83e38d69dda55ba98dfce10fb388ca34ee6de7e50f4830778605d7621acc600de351a84cb5b7fb0d8491d79
+  metadata.gz: 09c0a9e24e023e36a26c3b176a5ddb7d1e4f474ffe372da8595d947b88f2e7bce49269190dc2e76f4d293354b8582974da41b64dd801dd10c5b0fb84a59d99db
+  data.tar.gz: eba59a3e5dde7c6c609bbc0e5c6d093d7dc2dacee41301451e06eb5ceb770754025180694fe1cafde14e141301e8d9fc2f273e1e46f76ebe87f74422e67f8d18

data/bin/livetext

@@ -4,18 +4,26 @@ require_relative '../lib/livetext'
 
 def handle_ltx(src)
   abort "Unknown file extension" unless src =~ /.ltx$/
-
   x = Livetext.new
   x.process_file(src)
 end
 
 # Main
 
-if ARGV.first == "--clean-all"
-  clean_all
-  exit
+case ARGV.first 
+  when  "-v", "--version"
+    puts "livetext version #{Livetext::VERSION}\n "
+    exit
+  when nil
+    puts "Usage: "
+    puts "  livetext -v"
+    puts "  livetext --version"
+    puts "  livetext filename"
+    puts
+    exit
+  else
+    src = ARGV.first
 end
 
-src = ARGV.first
 handle_ltx(src)
 

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end
 
 require 'fileutils'

data/lib/standard.rb

@@ -0,0 +1,231 @@
+module Livetext::Standard
+
+  def data=(val)
+    @_data = val
+    @_args = val.split
+    @_mixins = []
+  end
+
+  def comment
+    junk = _body  # do nothing with contents
+  end
+
+  def shell
+    cmd = @_data
+    _errout("Running: #{cmd}")
+    system(cmd)
+  end
+
+  def func
+    funcname = @_args[0]
+    _error! "Illegal name '#{funcname}'" if _disallowed?(funcname)
+    func_def = <<-EOS
+      def #{funcname}
+        #{_body!}
+      end
+    EOS
+    Livetext::Functions.class_eval func_def
+  end
+
+  def shell!
+    cmd = @_data
+    system(cmd)
+  end
+
+  def errout
+    TTY.puts @_data
+  end
+
+  def say
+    str = _substitution(@_data)
+    TTY.puts str
+    _optional_blank_line
+  end
+
+  def banner
+    str = _substitution(@_data)
+    n = str.length - 1
+    _errout "-"*n
+    _errout str
+    _errout "-"*n
+  end
+
+  def quit
+    @output.close
+    exit
+  end
+
+  def outdir
+    @_outdir = @_args.first
+    _optional_blank_line
+  end
+
+  def outdir!  # FIXME ?
+    @_outdir = @_args.first
+    raise "No output directory specified" if @_outdir.nil?
+    raise "No output directory specified" if @_outdir.empty?
+    system("rm -f #@_outdir/*.html")
+    _optional_blank_line
+  end
+
+  def _output(name)
+    @output.close unless @output == STDOUT
+    @output = File.open(@_outdir + "/" + name, "w")
+    @output.puts "<meta charset='UTF-8'>\n\n"
+  end
+
+  def _append(name)
+    @output.close unless @output == STDOUT
+    @output = File.open(@_outdir + "/" + name, "a")
+    @output.puts "<meta charset='UTF-8'>\n\n"
+  end
+
+  def output
+    name = @_args.first
+    _debug "Redirecting output to: #{name}"
+    _output(name)
+  end
+
+  def append
+    file = @_args[0]
+    _append(file)
+  end
+
+  def next_output
+    tag, num = @_args
+    _next_output(tag, num)
+    _optional_blank_line
+  end
+
+  def cleanup
+    @_args.each do |item| 
+      if ::File.directory?(item)
+        system("rm -f #{item}/*")
+      else
+        ::FileUtils.rm(item)
+      end
+    end
+  end
+
+  def _next_output(tag = "sec", num = nil)
+    @_file_num = num ? num : @_file_num + 1
+    @_file_num = @_file_num.to_i
+    name = "#{'%03d' % @_file_num}-#{tag}.html"
+    _output(name)
+  end
+
+  def _def
+    name = @_args[0]
+    str = "def #{name}\n"
+    raise "Illegal name '#{name}'" if _disallowed?(name)
+    str += _body!
+    str += "end\n"
+    eval str
+  rescue => err
+    _error!(err)
+  end
+
+  def nopass
+    @_nopass = true
+  end
+
+  def set
+    assigns = @_data.chomp.split(/, */)
+    assigns.each do |a| 
+      var, val = a.split("=")
+      val = val[1..-2] if val[0] == ?" and val[-1] == ?"
+      val = val[1..-2] if val[0] == ?' and val[-1] == ?'
+      @vars[var] = val
+    end
+    _optional_blank_line
+  end
+
+  def _include
+    file = @_args.first
+    _check_existence(file, "No such include file '#{file}'")
+    @parent.process_file(file)
+    _optional_blank_line
+  end
+
+  def include!    # FIXME huh?
+    file = @_args.first
+    return unless File.exist?(file)
+
+    lines = @parent.process_file(file)
+    File.delete(file)
+    _optional_blank_line
+  end
+
+  def mixin
+    name = @_args.first   # Expect a module name
+    file = "#{Plugins}/" + name.downcase + ".rb"
+    return if @_mixins.include?(name)
+    file = "./#{name}.rb" unless File.exist?(file)
+    _check_existence(file, "No such mixin '#{name}'")
+
+    @_mixins << name
+    meths = grab_file(file)
+    modname = name.gsub("/","_").capitalize
+    string = "module ::#{modname}\n#{meths}\nend"
+    eval(string)
+    newmod = Object.const_get("::" + modname)
+    self.extend(newmod)
+    init = "init_#{name}"
+    self.send(init) if self.respond_to? init
+    _optional_blank_line
+  end
+
+  def copy
+    file = @_args.first
+    _check_existence(file, "No such file '#{file}' to copy")
+    @output.puts grab_file(file)
+    _optional_blank_line
+  end
+
+  def r
+    _puts @_data  # No processing at all
+  end
+
+  def raw
+    # No processing at all (terminate with __EOF__)
+    _puts _raw_body  
+  end
+
+  def debug
+    arg = @_args.first
+    self._debug = true
+    self._debug = false if arg == "off"
+  end
+
+  def nopara
+    @_nopara = true
+  end
+
+  def heading
+    _print "<center><font size=+1><b>"
+    _print @_data
+    _print "</b></font></center>"
+  end
+
+  def newpage
+    _puts '<p style="page-break-after:always;"></p>'
+    _puts "<p/>"
+  end
+
+  def invoke(str)
+  end
+
+  def dlist
+    delim = "~~"
+    _puts "<table>"
+    _body do |line|
+      line = _formatting(line)
+      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
+
+end

data/lib/userapi.rb

@@ -0,0 +1,181 @@
+# User API
+
+module Livetext::UserAPI
+
+  def _check_existence(file, msg)
+    _error! msg unless File.exist?(file)
+    # puts "ERROR"  unless File.exist?(file)
+  end
+
+  def _source
+    @input
+  end
+
+  def _args
+    if block_given?
+      @_args.each {|arg| yield arg }
+    else
+      @_args
+    end
+  end
+
+  def _optional_blank_line
+    @line = nextline if peek_nextline =~ /^ *$/
+  end
+
+  def _comment?(str, sigil=".")
+    c1 = sigil + Livetext::Space
+    c2 = sigil + sigil + Livetext::Space
+    str.index(c1) == 0 || str.index(c2) == 0
+  end
+
+  def _trailing?(char)
+    return true if ["\n", " ", nil].include?(char)
+    return false
+  end
+
+  def _end?(str, sigil=".")
+    cmd = sigil + "end"
+    return false if str.index(cmd) != 0 
+    return false unless _trailing?(str[5])
+    return true
+  end
+
+  def _raw_body(tag = "__EOF__", sigil = ".")
+    lines = []
+    @save_location = @sources.last
+    loop do
+      @line = nextline
+      break if @line.chomp.strip == tag
+      lines << @line
+    end
+    _optional_blank_line
+    if block_given?
+      lines.each {|line| yield @line }
+    else
+      lines
+    end
+  end
+
+  def _body(sigil=".")
+    lines = []
+    @save_location = @sources.last
+    loop do
+      @line = nextline
+      break if _end?(@line, sigil)
+      next if _comment?(@line, sigil)   # FIXME?
+      lines << @line
+    end
+    _optional_blank_line
+    if block_given?
+      lines.each {|line| yield line }
+    else
+      lines
+    end
+  rescue => err
+    _error!("Expecting .end, found end of file")
+  end
+
+  def _body!(sigil=".")
+    _body(sigil).join("\n")
+  end
+
+  def _basic_format(line, delim, tag)
+    s = line.each_char
+    c = s.next
+    last = nil
+    getch = -> { last = c; c = s.next }
+    buffer = ""
+    loop do
+      case c
+        when " "
+          buffer << " "
+          last = " "
+        when delim
+          if last == " " || last == nil
+            buffer << "<#{tag}>"
+            c = getch.call
+            if c == "("
+              loop { getch.call; break if c == ")"; buffer << c }
+              buffer << "</#{tag}>"
+            else
+              loop { buffer << c; getch.call; break if c == " " || c == nil || c == "\n" }
+              buffer << "</#{tag}>"
+              buffer << " " if c == " "
+            end
+          else
+            buffer << delim
+          end
+      else
+        buffer << c
+      end
+      getch.call
+    end
+    buffer
+  end
+
+  def _handle_escapes(str, set)
+    str = str.dup
+    set.each_char do |ch|
+      str.gsub!("\\#{ch}", ch)
+    end
+    str
+  end
+
+  def _formatting(line)
+    l2 = _basic_format(line, "_", "i")
+    l2 = _basic_format(l2, "*", "b")
+    l2 = _basic_format(l2, "`", "tt")
+    l2 = _handle_escapes(l2, "_*`")
+    line.replace(l2)
+  end
+
+  def _func_sub
+  end
+
+  def _substitution(line)
+    # FIXME handle vars/functions separately later??
+    # FIXME permit parameters to functions
+    fobj = ::Livetext::Functions.new
+    @funcs = ::Livetext::Functions.instance_methods
+    @funcs.each do |func|
+      name = ::Regexp.escape("$$#{func}")
+      rx = /#{name}\b/
+      line.gsub!(rx) do |str| 
+        val = fobj.send(func)
+        str.sub(rx, val)
+      end
+    end
+    @vars.each_pair do |var, val|
+      name = ::Regexp.escape("$#{var}")
+      rx = /#{name}\b/
+      line.gsub!(rx, val)
+    end
+    line
+  end
+
+  def _passthru(line)
+    return if @_nopass
+    _puts "<p>" if line == "\n" and ! @_nopara
+    _formatting(line)
+    _substitution(line)
+    _puts line
+  end
+
+  def _puts(*args)
+    @output.puts *args
+  end
+
+  def _print(*args)
+    @output.print *args
+  end
+
+  def _debug=(val)
+    @_debug = val
+  end
+
+  def _debug(*args)
+    TTY.puts *args if @_debug
+  end
+
+end

data/livetext.gemspec

@@ -1,4 +1,5 @@
 require 'date'
+require 'find'
 
 $: << "."
 require "lib/livetext"
@@ -12,92 +13,14 @@ Gem::Specification.new do |s|
   s.description = "A smart text processor extensible in Ruby"
   s.authors     = ["Hal Fulton"]
   s.email       = 'rubyhacker@gmail.com'
-  s.files       = %w[
-                     ./bin
-                     ./bin/livetext
-                     ./lib
-                     ./lib/livetext.rb
-                     ./lib/functions.rb
-                     ./dsl
-                     ./dsl/bookish.rb
-                     ./dsl/calibre.rb
-                     ./dsl/liveblog.rb
-                     ./dsl/livemagick.rb
-                     ./dsl/markdown.rb
-                     ./dsl/pyggish.rb
-                     ./dsl/tutorial.rb
-                     ./livetext.gemspec
-                     ./notes.txt
-                     ./README.html
-                     ./README.ltx
-                     ./README.md
-                     ./test
-                     ./test/cleanup
-                     ./test/newtest
-                     ./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/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/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.executables << "livetext"
+  
+  # Files...
+  main = Find.find("bin").to_a + Find.find("lib").to_a + Find.find("dsl").to_a 
+  misc = %w[./README.html ./README.ltx ./README.md livetext.gemspec]
+  test = Find.find("test").to_a
+
+  s.files       =  main + misc + test
   s.homepage    = 'https://github.com/Hal9000/livetext'
   s.license       = "Ruby's license"
 end

data/test/affirm/lm-kbks.lt

@@ -0,0 +1,19 @@
+.mixin livemagick
+
+.nopass
+
+  .image 300 100 lightgray
+  .canvas green 1 0
+  .pen red red
+  .font 80 Arial
+  
+   .rectangle 100,50 300x300 green 9
+  
+  .text! 100,50 100x100 
+  K B K Z
+  .end
+  .draw
+  .save! myfile.jpg
+
+.def foobar
+

data/test/testfiles/copy_is_raw/rawtext.inc

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

data/test/testfiles/crap

@@ -0,0 +1,16 @@
+./fixit block_comment
+./fixit comments_ignored_1
+./fixit comments_ignored_2
+./fixit copy_is_raw
+./fixit def_method
+./fixit example_alpha
+./fixit example_alpha2
+./fixit hello_world
+./fixit more_complex_vars
+./fixit raw_text_block
+./fixit sigil_can_change
+./fixit simple_copy
+./fixit simple_include
+./fixit simple_mixin
+./fixit simple_vars
+./fixit single_raw_line

data/test/testfiles/error_inc_line_num/expected-error.txt

@@ -0,0 +1 @@
+Error: Name 'foobar' is unknown (at file2.ltx line 5)

data/test/testfiles/error_inc_line_num/expected-output.txt

@@ -0,0 +1,7 @@
+This is my 
+source file
+which includes file2 here:
+  This is file2
+  which has an error
+  about an unknown command
+  in line 5

data/test/testfiles/error_inc_line_num/file2.ltx

@@ -0,0 +1,7 @@
+  This is file2
+  which has an error
+  about an unknown command
+  in line 5
+.foobar
+
+  And this is file2 line 7.

data/test/testfiles/error_inc_line_num/source.ltx

@@ -0,0 +1,8 @@
+This is my 
+source file
+which includes file2 here:
+.include file2.ltx
+
+And here we are
+back in the
+original file.

data/test/testfiles/error_invalid_name/expected-error.txt

@@ -0,0 +1 @@
+Error: Illegal name 'to_s' (at source.ltx line 5)

data/test/testfiles/error_invalid_name/expected-output.txt

@@ -0,0 +1,5 @@
+This file has
+a defined method
+that is invalid:
+<p>
+

data/test/testfiles/error_invalid_name/source.ltx

@@ -0,0 +1,9 @@
+This file has
+a defined method
+that is invalid:
+
+.def to_s
+  # whatever...
+.end
+
+

data/test/testfiles/error_line_num/expected-error.txt

@@ -0,0 +1 @@
+Error: Name 'foobar' is unknown (at source.ltx line 4)

data/test/testfiles/error_line_num/expected-output.txt

@@ -0,0 +1,3 @@
+This file 
+will have an error
+on line 4

data/test/testfiles/error_line_num/source.ltx

@@ -0,0 +1,6 @@
+This file 
+will have an error
+on line 4
+.foobar
+if all goes
+well.

data/test/testfiles/error_mismatched_end/expected-error.txt

@@ -0,0 +1 @@
+Error: Mismatched 'end' (at source.ltx line 6)

data/test/testfiles/error_mismatched_end/expected-output.txt

@@ -0,0 +1,6 @@
+It is an error
+to specify .end
+without something
+beginning a block:
+<p>
+

data/test/testfiles/error_mismatched_end/source.ltx

@@ -0,0 +1,8 @@
+It is an error
+to specify .end
+without something
+beginning a block:
+
+.end
+foo bar
+baz

data/test/testfiles/error_missing_end/expected-error.txt

@@ -0,0 +1 @@
+Error: Expecting .end, found end of file (at source.ltx line 6)

data/test/testfiles/error_missing_end/expected-output.txt

@@ -0,0 +1,4 @@
+Blah
+blah
+<p>
+

data/test/testfiles/error_missing_end/source.ltx

@@ -0,0 +1,6 @@
+Blah
+blah
+
+.comment
+meh
+foo

data/test/testfiles/error_name_not_permitted/expected-error.txt

@@ -0,0 +1 @@
+Error: Name 'class' is not permitted (at source.ltx line 4)

data/test/testfiles/error_name_not_permitted/expected-output.txt

@@ -0,0 +1,4 @@
+Names such as 'class'
+are not permitted here...
+<p>
+

data/test/testfiles/error_name_not_permitted/source.ltx

@@ -0,0 +1,6 @@
+Names such as 'class'
+are not permitted here...
+
+.class
+meh
+foo

data/test/testfiles/error_no_such_copy/expected-error.txt

@@ -0,0 +1 @@
+Error: No such file 'nosuchfile.txt' to copy (at source.ltx line 5)

data/test/testfiles/error_no_such_copy/expected-output.txt

@@ -0,0 +1,5 @@
+Make sure a
+nonexistent file with .copy
+gives an error.
+<p>
+

data/test/testfiles/error_no_such_copy/source.ltx

@@ -0,0 +1,8 @@
+Make sure a
+nonexistent file with .copy
+gives an error.
+
+.copy nosuchfile.txt
+
+Nothing to
+see here.

data/test/testfiles/error_no_such_inc/expected-error.txt

@@ -0,0 +1 @@
+Error: No such include file 'nosuchinc.ltx' (at source.ltx line 5)

data/test/testfiles/error_no_such_inc/expected-output.txt

@@ -0,0 +1,5 @@
+Make sure 
+a nonexistent include
+will give an error.
+<p>
+

data/test/testfiles/error_no_such_inc/source.ltx

@@ -0,0 +1,8 @@
+Make sure 
+a nonexistent include
+will give an error.
+
+.include nosuchinc.ltx
+
+Nothing to
+see here.

data/test/testfiles/error_no_such_mixin/expected-error.txt

@@ -0,0 +1 @@
+Error: No such mixin 'nosuchthing' (at source.ltx line 6)

data/test/testfiles/error_no_such_mixin/expected-output.txt

@@ -0,0 +1,6 @@
+Test that 
+we give an error
+when a mixin does not
+exist:
+<p>
+

data/test/testfiles/error_no_such_mixin/source.ltx

@@ -0,0 +1,10 @@
+Test that 
+we give an error
+when a mixin does not
+exist:
+
+.mixin nosuchthing
+
+We shouldn't
+reach this point
+in the file.

data/test/testfiles/functions/expected-output.txt

@@ -0,0 +1,8 @@
+Testing out
+some functions 
+here...
+<p>
+
+I am calling Eureka! here...
+Let's see 
+what happens.

data/test/testfiles/functions/source.ltx

@@ -0,0 +1,11 @@
+Testing out
+some functions 
+here...
+
+.func myfunc
+"Eureka!"
+.end
+
+I am calling $$myfunc here...
+Let's see 
+what happens.

data/test/testfiles/raw_text_block/rawtext.inc

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

data/test/testfiles/simple_copy/simplefile.inc

@@ -0,0 +1,2 @@
+a simple 
+include file.

data/test/testfiles/simple_include/simplefile.inc

@@ -0,0 +1,2 @@
+a simple 
+include file.

data/test/testfiles/simple_mixin/simple_mixin.rb

@@ -0,0 +1,3 @@
+def hello_world
+  puts "Hello, world."
+end

data/test/try.lt

@@ -0,0 +1,20 @@
+.mixin livemagick
+
+.nopass
+
+.image 800 600 skyblue
+.canvas green 1 0
+.pen red red
+.font 80 AvantGarde
+
+.rectangle 100,100 300x300 green 9
+
+.text! 150,200 500x200 
+This is
+only
+a test.
+.end
+.draw
+.save! somefile.jpg
+
+

data/test/try2.lt

@@ -0,0 +1,20 @@
+.mixin livemagick
+
+.nopass
+
+.image 400 400 skyblue
+.canvas green 1 0
+.pen red red
+.font 80 Arial
+
+.rectangle 50,50 300x300 green 9
+
+.text! 0,150 400x200 
+This is
+only
+a test.
+.end
+.draw
+.save! myfile.jpg
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Hal Fulton
@@ -12,74 +12,117 @@ date: 2017-03-25 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
-executables: []
+executables:
+- livetext
 extensions: []
 extra_rdoc_files: []
 files:
 - "./README.html"
 - "./README.ltx"
 - "./README.md"
-- "./bin/livetext"
-- "./dsl/bookish.rb"
-- "./dsl/calibre.rb"
-- "./dsl/liveblog.rb"
-- "./dsl/livemagick.rb"
-- "./dsl/markdown.rb"
-- "./dsl/pyggish.rb"
-- "./dsl/tutorial.rb"
-- "./lib/functions.rb"
-- "./lib/livetext.rb"
-- "./livetext.gemspec"
-- "./notes.txt"
-- "./test/cleanup"
-- "./test/newtest"
-- "./test/test.rb"
-- "./test/testfiles/basic_formatting/expected-error.txt"
-- "./test/testfiles/basic_formatting/expected-output.txt"
-- "./test/testfiles/basic_formatting/source.ltx"
-- "./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/expected-error.txt"
-- "./test/testfiles/comments_ignored_1/expected-output.txt"
-- "./test/testfiles/comments_ignored_1/source.ltx"
-- "./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/expected-error.txt"
-- "./test/testfiles/def_method/expected-output.txt"
-- "./test/testfiles/def_method/source.ltx"
-- "./test/testfiles/example_alpha/expected-error.txt"
-- "./test/testfiles/example_alpha/expected-output.txt"
-- "./test/testfiles/example_alpha/source.ltx"
-- "./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/hello_world/expected-error.txt"
-- "./test/testfiles/hello_world/expected-output.txt"
-- "./test/testfiles/hello_world/source.ltx"
-- "./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/expected-error.txt"
-- "./test/testfiles/raw_text_block/expected-output.txt"
-- "./test/testfiles/raw_text_block/source.ltx"
-- "./test/testfiles/simple_copy/expected-error.txt"
-- "./test/testfiles/simple_copy/expected-output.txt"
-- "./test/testfiles/simple_copy/source.ltx"
-- "./test/testfiles/simple_include/expected-error.txt"
-- "./test/testfiles/simple_include/expected-output.txt"
-- "./test/testfiles/simple_include/source.ltx"
-- "./test/testfiles/simple_mixin/expected-error.txt"
-- "./test/testfiles/simple_mixin/expected-output.txt"
-- "./test/testfiles/simple_mixin/source.ltx"
-- "./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/expected-error.txt"
-- "./test/testfiles/single_raw_line/expected-output.txt"
-- "./test/testfiles/single_raw_line/source.ltx"
+- bin/livetext
+- dsl/bookish.rb
+- dsl/calibre.rb
+- dsl/liveblog.rb
+- dsl/livemagick.rb
+- dsl/markdown.rb
+- dsl/pyggish.rb
+- dsl/tutorial.rb
+- lib/functions.rb
+- lib/livetext.rb
+- lib/standard.rb
+- lib/userapi.rb
+- livetext.gemspec
+- test/affirm/kbks.jpg
+- test/affirm/lm-kbks.lt
+- test/cleanup
+- test/newtest
+- test/test.rb
+- test/testfiles/basic_formatting/expected-error.txt
+- test/testfiles/basic_formatting/expected-output.txt
+- test/testfiles/basic_formatting/source.ltx
+- 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/expected-error.txt
+- test/testfiles/comments_ignored_1/expected-output.txt
+- test/testfiles/comments_ignored_1/source.ltx
+- test/testfiles/copy_is_raw/expected-error.txt
+- test/testfiles/copy_is_raw/expected-output.txt
+- test/testfiles/copy_is_raw/rawtext.inc
+- test/testfiles/copy_is_raw/source.ltx
+- test/testfiles/crap
+- test/testfiles/def_method/expected-error.txt
+- test/testfiles/def_method/expected-output.txt
+- test/testfiles/def_method/source.ltx
+- test/testfiles/error_inc_line_num/expected-error.txt
+- test/testfiles/error_inc_line_num/expected-output.txt
+- test/testfiles/error_inc_line_num/file2.ltx
+- test/testfiles/error_inc_line_num/source.ltx
+- test/testfiles/error_invalid_name/expected-error.txt
+- test/testfiles/error_invalid_name/expected-output.txt
+- test/testfiles/error_invalid_name/source.ltx
+- test/testfiles/error_line_num/expected-error.txt
+- test/testfiles/error_line_num/expected-output.txt
+- test/testfiles/error_line_num/source.ltx
+- test/testfiles/error_mismatched_end/expected-error.txt
+- test/testfiles/error_mismatched_end/expected-output.txt
+- test/testfiles/error_mismatched_end/source.ltx
+- test/testfiles/error_missing_end/expected-error.txt
+- test/testfiles/error_missing_end/expected-output.txt
+- test/testfiles/error_missing_end/source.ltx
+- test/testfiles/error_name_not_permitted/expected-error.txt
+- test/testfiles/error_name_not_permitted/expected-output.txt
+- test/testfiles/error_name_not_permitted/source.ltx
+- test/testfiles/error_no_such_copy/expected-error.txt
+- test/testfiles/error_no_such_copy/expected-output.txt
+- test/testfiles/error_no_such_copy/source.ltx
+- test/testfiles/error_no_such_inc/expected-error.txt
+- test/testfiles/error_no_such_inc/expected-output.txt
+- test/testfiles/error_no_such_inc/source.ltx
+- test/testfiles/error_no_such_mixin/expected-error.txt
+- test/testfiles/error_no_such_mixin/expected-output.txt
+- test/testfiles/error_no_such_mixin/source.ltx
+- test/testfiles/example_alpha/expected-error.txt
+- test/testfiles/example_alpha/expected-output.txt
+- test/testfiles/example_alpha/source.ltx
+- 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/expected-error.txt
+- test/testfiles/functions/expected-output.txt
+- test/testfiles/functions/source.ltx
+- 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/expected-error.txt
+- test/testfiles/more_complex_vars/expected-output.txt
+- test/testfiles/more_complex_vars/source.ltx
+- test/testfiles/raw_text_block/expected-error.txt
+- test/testfiles/raw_text_block/expected-output.txt
+- test/testfiles/raw_text_block/rawtext.inc
+- test/testfiles/raw_text_block/source.ltx
+- test/testfiles/simple_copy/expected-error.txt
+- test/testfiles/simple_copy/expected-output.txt
+- test/testfiles/simple_copy/simplefile.inc
+- test/testfiles/simple_copy/source.ltx
+- test/testfiles/simple_include/expected-error.txt
+- test/testfiles/simple_include/expected-output.txt
+- test/testfiles/simple_include/simplefile.inc
+- test/testfiles/simple_include/source.ltx
+- test/testfiles/simple_mixin/expected-error.txt
+- test/testfiles/simple_mixin/expected-output.txt
+- test/testfiles/simple_mixin/simple_mixin.rb
+- test/testfiles/simple_mixin/source.ltx
+- 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/expected-error.txt
+- test/testfiles/single_raw_line/expected-output.txt
+- test/testfiles/single_raw_line/source.ltx
+- test/try.lt
+- test/try2.lt
 homepage: https://github.com/Hal9000/livetext
 licenses:
 - Ruby's license

data/notes.txt

@@ -1,146 +0,0 @@
-Mostly done
------------
-define variables
-define methods
-allow switching sigils, etc.
-.raw
-.mixin
-.include
-double sigil + blank = true comment 
-sigil + blank = passthru comment 
-double sigil + token = internal sigil
-.comment/.end
-.func
-
-
-To Be Done
-----------
-Bug: Optional blank line at EOF causes problem
-turn "blank=para" on/off?
-keyword args
-.defaults
-better variable support
-need a 'require' (with sigil?)
-.init ?
-.method or .private
-Prioritized formatting: markdown b/i/c, lt b/i/c, emdash, varsub, funcsub, etc.?
-em dash
-variable for source file
-variable for line number
-ignore trailing punctuation for * _ `
-args vs bare args (quotes)
-comment!  pass this thru as comment
-comment!/end
-.proc
-.break to eof ?
-warn when overriding?
-.meth?/.end  (.else?)
-$var.subvar
-$$func $$func(params)
-
-
-
-Undecided
----------
-encourage overriding passthru?
-disallow leading underscore
-HTML entities?
-explicit Unicode support?
-intermediate format prior to output?
-.say
-.debug
-.dump
-links? 
-images?
-safe level?
-exceptions?
-.if, .else ?
-.shell ?
-table styles?
-define "quotes" such as * _ ?
-Issues: 
-  - substitution and bold/italics on @data and @args?
-  - substitution before or after bold/italics?
-.run  Arbitrary Ruby code?
-BEGIN/END for require or mixin?
-other langs??
-configurable delimiters (tables, etc.)
-
-
-
-For bookish
------------
-.index 
-.indexable
-
-
-Assignment
-----------
-myvar=foo
-myvar.x = "This and that"
-$myvar
-$myvar.x
-$(myvar.x)
-
-Functions
----------
-$$func
-$$func.blah
-$$(func.blah)
-$$proc ?
-$$(func args)
-
-Predef functions?
------------------
-$$sourceline
-$index
-
-What is Livetext?
------------------
-It's a text transformer
-Agnostic about output format
-Like a macro processor but not
-Like markdown but not
-Like erb or HAML but not
-Later on - language agnostic?
-Like an old-fashioned text formatter, but extensible
-Plugin-oriented
-Aims to be easy/flexible but not too dangerous
-Predefine but don't clutter namespace
-Mention softcover
-
-Tutorial
---------
-What is it?
-Any text file is (probably) valid
-Simple built-in methods
-Pass-through mode
-Comments
-Methods with bodies
-Changing sigils
-Reusing text and code
-Predefined stuff: methods, functions, variables, libs?
-Defining your own code: inline, methods, func, proc, ...
-require, include
-variables
-functions
-
-Mixins etc
-----------
-PlainHTML
-PDFout
-Bookish
-InlineMarkdown
-Pygments
-
-
-Logic:
-------
-Handle . .. .name 
-In each body:
-  - allow . and ..
-  - handle ..name
-  - disallow .name ?
-  - handle italics
-  - handle substitution
-