livetext 0.7.9 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a449b36a919484567bb601649627b5b58f9bdf1
-  data.tar.gz: e3549c9abb38e73e7d0536380539d20413740130
+  metadata.gz: 93e53f99adb2db092428d0e3b5c66ecbfc173814
+  data.tar.gz: baffe8b343d7290ca8d8ffc3f419ea7745fc128c
 SHA512:
-  metadata.gz: 4545e6cc0c86b4014b53c44ffd9df28107bdf72c0c69adaf678f49f1897205b2f2ca66e8ce982a7923205385ae20d3da4cde440cd44131c53467522cd18d2993
-  data.tar.gz: b41ffe558578f7bc21c2b6d68417f28265f013617d74a03adf21c7cc1d28452feba09ed7a63d871eff0f28af7b560b429b9cbb4ac02d2397cbf0b6aaacfc5388
+  metadata.gz: 433d52e19811f6f6056759e5ec25df1944c34f382badf64d2e6f75e21f61e24381673a3f8e9119da776bc6257f0a37d8125160d157775453e003a50e131d23b9
+  data.tar.gz: a3254d97a375f0db7a74b9c8047a22b15a1157d0766a4ca1f8043bf70bfcbe42bf95483caa5accac2b924d52d1b014b26a14b439f460c23bd6e0f6baf0b1b56a

data/bin/livetext

@@ -12,14 +12,16 @@ end
 
 case ARGV.first 
   when  "-v", "--version"
-    puts "livetext version #{Livetext::VERSION}\n "
+    puts "#{Livetext::VERSION}\n "
     exit
   when nil
-    puts "Usage: "
-    puts "  livetext -v"
-    puts "  livetext --version"
-    puts "  livetext filename"
-    puts
+    puts <<-EOF
+    Usage: 
+      livetext -v
+      livetext --version
+      livetext filename
+    
+    EOF
     exit
   else
     src = ARGV.first

data/dsl/calibre.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 
 def epub!
-  out = _substitution(@_args[0])
+  out = _formatting(@_args[0])
   src = @_args[1]
   @cover = @_args[2]
   if ::File.directory?(src)

data/dsl/liveblog.rb

@@ -21,9 +21,8 @@ end
 
 def _passthru(line)
   @dest << "<p>" if line == "\n" and ! @_nopara
-  OLD_formatting(line)
-  _var_substitution(line)
-  @dest << line
+  l2 = _formatting(line)
+  @dest << l2
 end
 
 def title 

data/lib/formatline.rb

@@ -44,17 +44,14 @@ class FormatLine
     @buffer << str
   end
 
-  def varsub(name)
-    Livetext::Vars[name]
-  end
-
   def funcall(name, param)
     fobj = ::Livetext::Functions.new
-    fobj.send(name, param)
+    fobj.param = param
+    fobj.send(name)
   end
 
   def vsub
-    @buffer << varsub(@vname)
+    @buffer << Livetext::Vars[@vname]
     @vname = ""
   end
 
@@ -122,7 +119,7 @@ class FormatLine
               emit("$")
               break
             when Alpha
-              loop { @vname << grab; break unless Alpha2 === peek } 
+              loop { ch = peek; break if ch == EOL; @vname << grab; break unless Alpha2 === peek } 
               vsub
             when "$" 
               case skip
@@ -130,13 +127,15 @@ class FormatLine
                   emit("$$")
                   break
                 when Alpha
-                  loop { @fname << grab; break unless Alpha2 === peek }
+                  loop { ch = peek; break if ch == EOL; @fname << grab; break unless Alpha2 === peek }
                   case peek
                     when " "   # no param - just call
+                      @param = nil
                       fcall    # no param? Hmm
                     when "["   # long param - may have spaces - can hit eol
                       skip
                       loop { break if ["]", EOL].include?(peek); @param << grab }
+                      skip
                       fcall
                     when ":"   # param (single token or to-eol)
                       case skip

data/lib/functions.rb

@@ -1,4 +1,16 @@
+require 'standard'  # FIXME
+
 class Livetext::Functions    # Functions will go here... user-def AND pre-def??
+  Formats = ::Livetext::Standard::SimpleFormats
+
+  def initialize
+    @param = nil
+  end
+
+  def param=(str)
+    @param = str
+  end
+
   def date
     Time.now.strftime("%F")
   end
@@ -6,4 +18,31 @@ class Livetext::Functions    # Functions will go here... user-def AND pre-def??
   def time
     Time.now.strftime("%T")
   end
+
+  def simple_format(*args)
+    @param ||= "NO PARAMETER"
+    pairs = Formats.values_at(*args)
+    str = @param.dup
+    pairs.reverse.each do |pair|
+      str = "#{pair.first}#{str}#{pair.last}"
+    end
+    str
+  end
+
+  def b;    simple_format(:b); end
+  def i;    simple_format(:i); end
+  def t;    simple_format(:t); end
+  def s;    simple_format(:s); end
+  def bi;   simple_format(:b, :i); end
+  def bt;   simple_format(:b, :t); end
+  def bs;   simple_format(:b, :s); end
+  def it;   simple_format(:i, :t); end
+  def is;   simple_format(:i, :s); end
+  def ts;   simple_format(:t, :s); end
+  def bit;  simple_format(:b, :i, :t); end
+  def bis;  simple_format(:b, :i, :s); end
+  def bts;  simple_format(:b, :t, :s); end
+  def its;  simple_format(:i, :t, :s); end
+  def bits; simple_format(:b, :i, :t, :s); end
+
 end

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.7.9"
+  VERSION = "0.8.0"
 end
 
 require 'fileutils'

data/lib/standard.rb

@@ -57,13 +57,13 @@ module Livetext::Standard
   end
 
   def say
-    str = _substitution(@_data)
+    str = _formatting(@_data)
     TTY.puts str
     _optional_blank_line
   end
 
   def banner
-    str = _substitution(@_data)
+    str = _formatting(@_data)
     n = str.length - 1
     _errout "-"*n
     _errout str
@@ -153,6 +153,7 @@ module Livetext::Standard
 
   def set
     assigns = @_data.chomp.split(/, */)
+    # Do a better way?
     assigns.each do |a| 
       var, val = a.split("=")
       val = val[1..-2] if val[0] == ?" and val[-1] == ?"

data/test/testfiles/functions/source.ltx

@@ -2,7 +2,7 @@ Testing out
 some functions 
 here...
 
-.func myfunc(x)
+.func myfunc
 "Eureka!"
 .end
 

data/test/testfiles/lines.txt

@@ -182,3 +182,75 @@ strike: Doubled, ignores EOL
 Up to EOL, this is ~~redacted
 Up to EOL, this is <strike>redacted</strike>
 
+Trying $$b function, no param
+This is $$b being called
+This is <b>NO PARAMETER</b> being called
+
+Trying $$b function, brackets
+This is $$b[bold text] being called
+This is <b>bold text</b> being called
+
+Trying $$b function, unterminated brackets
+This is $$b[bold text being called
+This is <b>bold text being called</b>
+
+Trying $$b function, colon param
+This is $$b:token being called
+This is <b>token</b> being called
+
+Try $$i
+There is $$i[some text] here
+There is <i>some text</i> here
+
+Try $$t
+There is $$t[some text] here
+There is <tt>some text</tt> here
+
+Try $$s
+There is $$s[some text] here
+There is <strike>some text</strike> here
+
+Try $$bi
+There is $$bi[some text] here
+There is <b><i>some text</i></b> here
+
+Try $$bt
+There is $$bt[some text] here
+There is <b><tt>some text</tt></b> here
+
+Try $$bs
+There is $$bs[some text] here
+There is <b><strike>some text</strike></b> here
+
+Try $$it
+There is $$it[some text] here
+There is <i><tt>some text</tt></i> here
+
+Try $$is
+There is $$is[some text] here
+There is <i><strike>some text</strike></i> here
+
+Try $$ts
+There is $$ts[some text] here
+There is <tt><strike>some text</strike></tt> here
+
+Try $$bit
+There is $$bit[some text] here
+There is <b><i><tt>some text</tt></i></b> here
+
+Try $$bis
+There is $$bis[some text] here
+There is <b><i><strike>some text</strike></i></b> here
+
+Try $$bts
+There is $$bts[some text] here
+There is <b><tt><strike>some text</strike></tt></b> here
+
+Try $$its
+There is $$its[some text] here
+There is <i><tt><strike>some text</strike></tt></i> here
+
+Try $$bits 
+There is $$bits[some text] here
+There is <b><i><tt><strike>some text</strike></tt></i></b> here
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.8.0
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-02 00:00:00.000000000 Z
+date: 2017-04-03 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -146,8 +146,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: A smart processor for text
 test_files: []
+has_rdoc: