livetext 0.9.01 → 0.9.02

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b5dbf29a35e17c163982a4c2d5355949a72be58c662e75cf1f1d59bef1894dd
-  data.tar.gz: 882f20c410919dc4aa5f5d4e4277cdff88dca8efce5b1d0d96d1228767dd80c3
+  metadata.gz: d9e45d3b0ea8fb06374c84d7e830ca7537fc553decbdbe034171dd7f9395671a
+  data.tar.gz: 1943173d9090705f70b447e4a283d73cb9bbd86c7458a6e744431c79e3ccea21
 SHA512:
-  metadata.gz: 58671323ec46267e898c2999e86fc3f5e1379eae4adca5df0adf7be90d0d8b35a9aefaa9f4bf778f67963624fa764ba8087349500e5c4c280c90297c9fc07789
-  data.tar.gz: 3ddfa97b6ef5a86c311baf9df53851bf39f01780fbec54a34de64bd9b4970aa8e055b77147891927e1ed378b87a050a414d11a51d942010ba0d774a99714e3bb
+  metadata.gz: 78452f768fe1a334af4f7b2f5ac437bcda06d27a7e4ae3bf360ad92db61632a0bdb67c1a8e5fcf7ba8f18e4c3941181c084fb2a88b0ece4eae7b3eb31e4bddb6
+  data.tar.gz: 4fca6756c94dcceb8a7f5224d71aca40e3a47cea1bfc1d660e62409ed532b1bed1123528615e32ca01715f0a6a8d2e7efb07b9a22ed2c7f2c0362829c7b2639f

data/lib/formatline.rb

@@ -195,6 +195,7 @@ class FormatLine
   end
 
   def add_token(kind, token = @token)
+    return if token.nil?
     @tokenlist << [kind, token] unless token.empty?
     @token = Null.dup
   end
@@ -352,6 +353,8 @@ class FormatLine
     grab   # ZZZ
     loop do
       case
+        when curr.nil?
+          return str
         when curr == Escape
           str << escaped
           next

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.9.01"
+  VERSION = "0.9.02"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 

data/lib/standard.rb

@@ -205,6 +205,7 @@ EOS
     else
       lines = _body
     end
+    lines.map! {|x| x.sub(/# .*/, "").strip }  # strip comments
     lines.each do |line|
       next if line.strip.empty?
       var, val = line.split(" ", 2)

data/lib/userapi.rb

@@ -68,15 +68,14 @@ module Livetext::UserAPI
   end
 
   def _body(raw=false)
-    lines = []      #   @save_location = @sources.last
+    lines = []
     end_found = false
     loop do
       @line = nextline
       break if @line.nil?
       @line.chomp!
-      end_found = _end?(@line)
-      break if end_found 
-      next if _comment?(@line)  # FIXME Will cause problem with $. ?
+      break if _end?(@line)
+      next if _comment?(@line)
       @line = _format(@line) unless raw
       lines << @line 
     end
@@ -91,13 +90,11 @@ module Livetext::UserAPI
     str = "Fake error? 'Expecting .end, found end of file'\n" 
     str << err.inspect + "\n"
     str << err.backtrace.map {|x| "  " + x }.join("\n")
-STDERR.puts str
-exit
-#   _error!(str)
+    _error!(str)
   end
 
   def _body_text(raw=false)
-    _body(Livetext::Sigil).join("\n")
+    _body.join("\n")
   end
 
   def _raw_body!

data/plugin/calibre.rb

@@ -6,6 +6,7 @@ def epub!
   @cover = @_args[2]
   if ::File.directory?(src)
     files = ::Dir["#{src}/*"].grep /\.html$/
+    files = files.sort  # why is this necessary now?
     cmd = "cat #{files.join(' ')} >TEMP.html"
     system(cmd)
   else
@@ -17,7 +18,8 @@ def epub!
   cmd << "--cover #@cover " if @cover
   system(cmd)
 
-  str = `links -dump TEMP.html | wc -w`
+  system("links -dump TEMP.html >/tmp/links.out")
+  str = `wc -w /tmp/links.out`
   nw = str.split[0]
   puts "Approx words: #{nw}"
   ::FileUtils.rm("TEMP.html")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.01
+  version: 0.9.02
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-31 00:00:00.000000000 Z
+date: 2020-01-07 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com