livetext 0.8.62 → 0.8.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abf7c5c4536e07d15550a42bed3ea8058cc1f62581940b2031536a02c57deeeb
-  data.tar.gz: 3295dc6e4e8aba61683123be3fc1f19dd536d247b95dca10d24097f585bde415
+  metadata.gz: 1ecefd7b98d49f5249cdc6c824c06723cd2aadcabc1fcdf9fa0e26b6278605af
+  data.tar.gz: af7eabe2aa02501c29af2c756c443316eb751627c388ad4f19a1d8f9507e30c2
 SHA512:
-  metadata.gz: 4070908d526c8fab9902657715a064f4b4afc8e6a5f74b0442dae654db809f34f470a88333b7262f8e8184c9598675a99b41a9fa954e362db187726bbe436270
-  data.tar.gz: 20fc4b7d364412496f716531e937e9409a79d26a86a355207bb3caff0b1c5514ae22365e0ebb4f59e1d32aaab25907f14ea7b55aa52e61283f9fbf5941c452d2
+  metadata.gz: 16b6d95f524c33fb45c3247421e31377888b346dde63702663aff3b5f1bcbae62e9214bf4e7f0281bf82073b82bff2ad8343185920da17651a659cf091cd9b74
+  data.tar.gz: e2d59f0f673fb6280fac1d6d41e0888192ee74a480c0b5e860d19ea5366582b18f5ddd834e6aef4e9a6f3a98a0e682a01c38dce567d084ba5e82619805b4b510

data/lib/livetext.rb

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

data/plugin/liveblog.rb

@@ -5,9 +5,10 @@ require 'date'
 require 'runeblog'  # Now depends explicitly
 
 def quote
-  _puts "<blockquote>"
-  _puts _body
-  _puts "</blockquote>"
+  _passthru "<blockquote>"
+  _passthru _body
+  _passthru "</blockquote>"
+  _optional_blank_line
 end
 
 class ::Livetext::Functions   # do this differently??
@@ -31,6 +32,26 @@ class ::Livetext::Functions   # do this differently??
 
 end
 
+### inset
+
+def inset
+  lines = _body
+  box = []
+  lines.each do |line| 
+    if line[0] == "|"
+      line[0] = ' '
+      box << line
+    end
+    _passthru(line)
+  end
+  lr = _args.first
+  _passthru "<div style='float:#{lr}; width: 25%; padding:8px; padding-right:12px; font-family:verdana'>"
+  _passthru '<b><i>'
+  _passthru box.join("<br>")
+  _passthru_noline '</i></b></div>'
+  _optional_blank_line
+end
+
 ### copy_asset
 
 def copy_asset(asset)
@@ -67,10 +88,18 @@ def _passthru(line, context = nil)
   @body << "<p>" if line.empty? && ! @_nopara
 end
 
+def _passthru_noline(line, context = nil)
+  return if line.nil?
+  line = _formatting(line, context)
+  @body << line
+  @body << "<p>" if line.empty? && ! @_nopara
+end
+
 def title 
   title = @_data.chomp
   @meta.title = title
   @body << "<h1>#{title}</h1>"
+  _optional_blank_line
 end
 
 def pubdate 
@@ -81,6 +110,7 @@ def pubdate
   y, m, d = y.to_i, m.to_i, d.to_i
   @meta.date = ::Date.new(y, m, d)
   @meta.pubdate = "%04d-%02d-%02d" % [y, m, d]
+  _optional_blank_line
 end
 
 def image   # primitive so far
@@ -88,22 +118,26 @@ def image   # primitive so far
   fname = _args.first
   path = "../assets/#{fname}"
   @body << "<img src=#{path}></img>"
+  _optional_blank_line
 end
 
 def tags
   _debug "args = #{_args}"
   @meta.tags = _args.dup || []
+  _optional_blank_line
 end
 
 def views
   _debug "data = #{_args}"
   @meta.views = _args.dup # + ["main"]
+  _optional_blank_line
 end
 
 def pin  
   _debug "data = #{_args}"
   # verify only already-specified views?
   @meta.pinned = _args.dup
+  _optional_blank_line
 end
 
 # def liveblog_version
@@ -113,6 +147,7 @@ def list
   @body << "<ul>"
   _body {|line| @body << "<li>#{line}</li>" }
   @body << "</ul>"
+  _optional_blank_line
 end
 
 def list!
@@ -128,6 +163,7 @@ def list!
     end
   end
   @body << "</ul>"
+  _optional_blank_line
 end
 
 def asset
@@ -136,34 +172,36 @@ def asset
   # For now: copies, doesn't keep record
   # Later: Add to file and uniq; use in publishing
   list.each {|asset| copy_asset(asset) }
+  _optional_blank_line
 end
 
 def assets
   @meta.assets ||= []
   @meta.assets += _body
-end
-
-  def write_post(meta)
-    save = Dir.pwd
-    @postdir.gsub!(/\/\//, "/")  # FIXME unneeded?
-    Dir.mkdir(@postdir) unless Dir.exist?(@postdir) # FIXME remember assets!
-    Dir.chdir(@postdir)
-    meta.views = meta.views.join(" ")
-    meta.tags  = meta.tags.join(" ") rescue ""
-    File.write("body.txt", @body)  # Actually HTML...
-    File.write("teaser.txt", meta.teaser)
-    
-    fields = [:num, :title, :date, :pubdate, :views, :tags]
-    
-    fname2 = "metadata.txt"
-    f2 = File.open(fname2, "w") do |f2| 
-      fields.each {|fld| f2.puts "#{fld}: #{meta.send(fld)}" }
-    end
-    Dir.chdir(save)
-  rescue => err
-    puts "err = #{err}"
-    puts err.backtrace.join("\n")
+  _optional_blank_line
+end
+
+def write_post(meta)
+  save = Dir.pwd
+  @postdir.gsub!(/\/\//, "/")  # FIXME unneeded?
+  Dir.mkdir(@postdir) unless Dir.exist?(@postdir) # FIXME remember assets!
+  Dir.chdir(@postdir)
+  meta.views = meta.views.join(" ")
+  meta.tags  = meta.tags.join(" ") rescue ""
+  File.write("body.txt", @body)  # Actually HTML...
+  File.write("teaser.txt", meta.teaser)
+  
+  fields = [:num, :title, :date, :pubdate, :views, :tags]
+  
+  fname2 = "metadata.txt"
+  f2 = File.open(fname2, "w") do |f2| 
+    fields.each {|fld| f2.puts "#{fld}: #{meta.send(fld)}" }
   end
+  Dir.chdir(save)
+rescue => err
+  puts "err = #{err}"
+  puts err.backtrace.join("\n")
+end
 
 def teaser
   @meta.teaser = _body_text

metadata

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