livetext 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7059d92044e10b0b6434ca10c8fca98495abd9c
-  data.tar.gz: 7811dac366af024bd3257d31278902d023a5d4ec
+  metadata.gz: 1bf150349564c9f613698a94db648859a5b03d3b
+  data.tar.gz: cea49f36d5db27d1fdff4d0c5484686044126104
 SHA512:
-  metadata.gz: 09c0a9e24e023e36a26c3b176a5ddb7d1e4f474ffe372da8595d947b88f2e7bce49269190dc2e76f4d293354b8582974da41b64dd801dd10c5b0fb84a59d99db
-  data.tar.gz: eba59a3e5dde7c6c609bbc0e5c6d093d7dc2dacee41301451e06eb5ceb770754025180694fe1cafde14e141301e8d9fc2f273e1e46f76ebe87f74422e67f8d18
+  metadata.gz: c8ec7ac2f7028ef1fef91e3e1937e62e7f91fbd467a0a3e0c7c58d51796b05ada956fb89a04ecc8b2487d53591fa5ab211d18bfd095ddc4c5404ce92d178afad
+  data.tar.gz: 106ef65fea37b5d262d574f3adf7435ff95397508be3241d7e3711a050f2019f3303bce8bdf9f1b308518568d9c49dc3b5f9cf21066021050513ceb04798b7b9

data/dsl/markdown.rb

@@ -1,6 +1,11 @@
 # This file is intended to be used via a Livetext .mixin  
 # or the equivalent.
 
+SimpleFormats[:b] = %w[* *]
+SimpleFormats[:i] = %w[_ _]
+SimpleFormats[:t] = %w[` `]
+SimpleFormats[:s] = %w[<strike> </strike>]
+
 def h1; _puts "# #{@_data}"; end       # atx style for now
 def h2; _puts "## #{@_data}"; end
 def h3; _puts "### #{@_data}"; end

data/lib/livetext.rb

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

data/lib/standard.rb

@@ -1,13 +1,27 @@
 module Livetext::Standard
 
+  SimpleFormats =     # Move this?
+   { b: %w[<b> </b>],
+     i: %w[<i> </i>],
+     t: %w[<tt> </tt>],
+     s: %w[<strike> </strike>] }
+
   def data=(val)
     @_data = val
     @_args = val.split
     @_mixins = []
   end
 
+  def bits  # dumb name - bold, italic, teletype, striketrough
+    b0, b1, i0, i1, t0, t1, s0, s1 = *@_args
+    SimpleFormats[:b] = [b0, b1]
+    SimpleFormats[:i] = [i0, i1]
+    SimpleFormats[:t] = [t0, t1]
+    SimpleFormats[:s] = [s0, s1]
+  end
+
   def comment
-    junk = _body  # do nothing with contents
+    _body
   end
 
   def shell
@@ -69,12 +83,14 @@ module Livetext::Standard
   end
 
   def _output(name)
+    @_outdir ||= "."  # FIXME
     @output.close unless @output == STDOUT
     @output = File.open(@_outdir + "/" + name, "w")
     @output.puts "<meta charset='UTF-8'>\n\n"
   end
 
   def _append(name)
+    @_outdir ||= "."  # FIXME
     @output.close unless @output == STDOUT
     @output = File.open(@_outdir + "/" + name, "a")
     @output.puts "<meta charset='UTF-8'>\n\n"

data/lib/userapi.rb

@@ -80,6 +80,41 @@ module Livetext::UserAPI
     _body(sigil).join("\n")
   end
 
+  def _new_format(line, delim, sym)
+    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
+
   def _basic_format(line, delim, tag)
     s = line.each_char
     c = s.next
@@ -123,9 +158,13 @@ module Livetext::UserAPI
   end
 
   def _formatting(line)
-    l2 = _basic_format(line, "_", "i")
-    l2 = _basic_format(l2, "*", "b")
-    l2 = _basic_format(l2, "`", "tt")
+#   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 = _handle_escapes(l2, "_*`")
     line.replace(l2)
   end

data/test/test.rb

@@ -65,7 +65,6 @@ class TestingLiveText < MiniTest::Test
   def test_example_alpha2;      external_files end
 
   def test_functions;           external_files end
-
 end
 
 

metadata

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