livetext 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7abb70149d3ce8d437180e80e90ff923284202f
-  data.tar.gz: e006a124c7ee1524774b996d6632203bc4d1f8be
+  metadata.gz: 1a449b36a919484567bb601649627b5b58f9bdf1
+  data.tar.gz: e3549c9abb38e73e7d0536380539d20413740130
 SHA512:
-  metadata.gz: 162c8d389a83695a457046a6f57b1e4991f643c15c272a65d6689e5ba171933bcf83cb8fae9407b7cca2abeffe71f6f23085e397024ad1e0c0e2f0e64b7c488b
-  data.tar.gz: 9d1435ef7cb23a5bcd0293de2649d8d2cc3b4e5e9ff21213f7682621284a011b1a5357110b50c7ebfb0d604588fff6c425eb49600ae992b791358c9390703235
+  metadata.gz: 4545e6cc0c86b4014b53c44ffd9df28107bdf72c0c69adaf678f49f1897205b2f2ca66e8ce982a7923205385ae20d3da4cde440cd44131c53467522cd18d2993
+  data.tar.gz: b41ffe558578f7bc21c2b6d68417f28265f013617d74a03adf21c7cc1d28452feba09ed7a63d871eff0f28af7b560b429b9cbb4ac02d2397cbf0b6aaacfc5388

data/lib/formatline.rb

@@ -1,4 +1,3 @@
-
 class FormatLine
   EOL    = :eol
   Alpha  = /[a-z]/
@@ -82,6 +81,12 @@ class FormatLine
     @substr = ""
   end
 
+  def strike
+    d0, d1 = SimpleFormats[:s]
+    @buffer << "#{d0}#@substr#{d1}"
+    @substr = ""
+  end
+
   def parse(line)
     @enum = line.chomp.each_char
     @buffer = ""
@@ -94,6 +99,21 @@ class FormatLine
       char = peek
   #   puts "char = #{char.inspect}"
       case char
+        when "\\"
+          char = skip
+          case char
+            when "$", "*", "_", "`", "~"
+              emit(char)
+              skip
+            when " "
+              emit("\\ ")
+              skip
+            when EOL
+              emit("\\")
+              break
+            when Other
+              emit("\\")   # logic??
+          end
         when EOL
           break
         when "$"        # var or func or $
@@ -106,6 +126,9 @@ class FormatLine
               vsub
             when "$" 
               case skip
+                when EOL
+                  emit("$$")
+                  break
                 when Alpha
                   loop { @fname << grab; break unless Alpha2 === peek }
                   case peek
@@ -186,6 +209,25 @@ class FormatLine
               loop { @substr << grab; break if [" ", EOL].include?(peek) }
               ttype
           end
+        when "~"
+          case skip
+            when EOL
+              emit "~"
+            when " "
+              emit "~"
+            when "["
+              skip
+              loop { break if ["]", EOL].include?(peek); @substr << grab }
+              skip
+              strike
+            when "~"   # doubled...
+              skip
+              loop { break if [".", ",", ")", EOL].include?(peek); @substr << grab }   # ";" ?? FIXME
+              strike
+            when Other
+              loop { @substr << grab; break if [" ", EOL].include?(peek) }
+              strike
+          end
         when Other
           keep
       end

data/lib/functions.rb

@@ -4,6 +4,6 @@ class Livetext::Functions    # Functions will go here... user-def AND pre-def??
   end
 
   def time
-    Time.now.strftime("%F")
+    Time.now.strftime("%T")
   end
 end

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.7.8"
+  VERSION = "0.7.9"
 end
 
 require 'fileutils'
@@ -17,11 +17,7 @@ Plugins = File.expand_path(File.join(File.dirname(__FILE__), "../dsl"))
 
 TTY = ::File.open("/dev/tty", "w")
 
-# require_relative "#{Plugins}/pyggish"
-
-
 class Livetext
-
   Vars = {}
 
   class Processor
@@ -52,7 +48,7 @@ class Livetext
     def _error!(err, abort=true, trace=false)
       where = @sources.last || @save_location
       STDERR.puts "Error: #{err} (at #{where[1]} line #{where[2]})"
-      STDERR.puts err.backtrace if trace && err.respond_to?(:backtrace)
+      STDERR.puts err.backtrace if @backtrace && err.respond_to?(:backtrace)
       exit if abort
     end
 
@@ -91,8 +87,6 @@ class Livetext
 
   Space = " "
 
-  attr_reader :main
-
   def initialize(output = ::STDOUT)
     @source = nil
     @_mixins = []

data/lib/standard.rb

@@ -20,6 +20,12 @@ module Livetext::Standard
     SimpleFormats[:s] = [s0, s1]
   end
 
+  def backtrace
+    arg = @_args.first
+    @backtrace = true
+    @backtrace = false if arg == "off"
+  end
+
   def comment
     _body
   end

data/lib/userapi.rb

@@ -8,7 +8,6 @@ module Livetext::UserAPI
 
   def _check_existence(file, msg)
     _error! msg unless File.exist?(file)
-    # puts "ERROR"  unless File.exist?(file)
   end
 
   def _source
@@ -84,78 +83,6 @@ module Livetext::UserAPI
     _body(sigil).join("\n")
   end
 
-  def _full_format(line)
-    Parser.parse(line)
-=begin
-    d0, d1 = Livetext::Standard::SimpleFormats[sym]
-    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 << d0
-            c = getch.call
-            if c == "("
-              loop { getch.call; break if c == ")"; buffer << c }
-              buffer << d1
-            else
-              loop { buffer << c; getch.call; break if c == " " || c == nil || c == "\n" }
-              buffer << d1
-              buffer << " " if c == " "
-            end
-          else
-            buffer << delim
-          end
-      else
-        buffer << c
-      end
-      getch.call
-    end
-    buffer
-=end
-  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|
@@ -165,47 +92,14 @@ module Livetext::UserAPI
   end
 
   def _formatting(line)
-#   l2 = _basic_format(line, "_", "i")
- #  l2 = _new_format(line, "_", :i)
-#   l2 = _basic_format(l2, "*", "b")
- #  l2 = _new_format(l2, "*", :b)
-#   l2 = _basic_format(l2, "`", "tt")
- #  l2 = _new_format(l2, "`", :t)
-# Do strikethrough?
-    l2 = _full_format(line)
-    l2 = _handle_escapes(l2, "_*`")
+    l2 = Parser.parse(line)
     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
 

data/test/testfiles/lines.txt

@@ -94,3 +94,91 @@ under: Starts after double quote?
 He said, "_Please go away."
 He said, "<i>Please</i> go away."
 
+Dollar sign followed by blank
+This: $ is a dollar sign
+This: $ is a dollar sign
+
+Dollar sign followed by non-alpha
+I'd pay $3 for that
+I'd pay $3 for that
+
+Dollar sign followed by EOL
+This is a dollar sign: $
+This is a dollar sign: $
+
+Double dollar sign followed by blank
+This: $$ is not a function call
+This: $$ is not a function call
+
+Double dollar sign followed by non-alpha
+If I say $$-, that's not a function call
+If I say $$-, that's not a function call
+
+Double dollar sign followed by EOL
+This is two dollar signs: $$
+This is two dollar signs: $$
+
+Escaped *
+Asterisk followed by abc: \*abc
+Asterisk followed by abc: *abc
+
+Escaped _
+Underscore followed by abc: \_abc
+Underscore followed by abc: _abc
+
+Escaped `
+Tick followed by abc: \`abc
+Tick followed by abc: `abc
+
+Escaped $
+This:  \$var is not a variable
+This:  $var is not a variable
+
+Escaped $$
+This: \$\$func is not a function
+This: $$func is not a function
+
+strike: Single token, beginning of line
+~this - no, I mean that
+<strike>this</strike> - no, I mean that
+
+strike: Single token, middle of line
+They say ~redacted is fun
+They say <strike>redacted</strike> is fun
+
+strike: Single token, end of line
+Ignore this: ~foobar
+Ignore this: <strike>foobar</strike>
+
+strike: Bracketed, normal
+This is ~[crossed out] text
+This is <strike>crossed out</strike> text
+
+strike: Bracketed, hits EOL
+This is ~[more stuff crossed out
+This is <strike>more stuff crossed out</strike>
+
+strike: followed by space
+This is not ~ overstrike
+This is not ~ overstrike
+
+strike: followed by EOL
+This also isn't overstrike: `
+This also isn't overstrike: `
+
+strike: Doubled, ignores comma
+This is ~~overstrike, of course
+This is <strike>overstrike</strike>, of course
+
+strike: Doubled, ignores period
+This is ~~overstrike. Hooray, I guess.
+This is <strike>overstrike</strike>. Hooray, I guess.
+
+strike: Doubled, ignores right paren
+(By the way, this is ~~overstrike)
+(By the way, this is <strike>overstrike</strike>)
+
+strike: Doubled, ignores EOL
+Up to EOL, this is ~~redacted
+Up to EOL, this is <strike>redacted</strike>
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-01 00:00:00.000000000 Z
+date: 2017-04-02 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com