livetext 0.8.69 → 0.8.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67aa778cdb43a048dfc55badad8e133e78640e2845d5a7dc7775d415183af243
-  data.tar.gz: 5b83d81871210913ab1deff7c8499921daf8c2b6e1eac7b100945de1513a3ff9
+  metadata.gz: e413bcfe4586395dc9143b00a87955be2ae80f1da20d54a2fdc5809db8b99324
+  data.tar.gz: 81a2d9729aafe869516edccdb145545135b27d881f7d06442b2136db7e6cb1e1
 SHA512:
-  metadata.gz: b1b98fcccd4c90ae946a778ee3cfac8dbd404e9d4f7fd1f2576e7ab0746c95508c3de708dded5185e7729bade552c68812336775c2349e87f3f80f3ccde87a0d
-  data.tar.gz: 5e68c876cf1b24940c343d0f78296245f667840bc9868a45a48823acb3e052c745dfc91f2224f86bf05a17b0de09910016b7d6ea76a2110979fac57161bd31a9
+  metadata.gz: 3972eb3083aa1a1638c26af552947a61346a437668cdf55f2e5b6c9f00f99ff691306bc097c545af1325853b5e49f39d216243be4f55d9d6517c8535c2c1cc36
+  data.tar.gz: 61b5c70f1695849bb5db9e77edbb7502b506980c9948d845f66776ea9513ba10d72cbb77e87a6649294447a29ba62fdb67827cefab4af19318f8be6d37ea64fa

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.69"
+  VERSION = "0.8.70"
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
@@ -23,6 +23,7 @@ class Livetext
   Vars = {}
 
   attr_reader :main, :context
+  attr_accessor :no_puts
 
   class << self
     attr_accessor :parameters  # from outside world (process_text)
@@ -50,18 +51,12 @@ class Livetext
       @parent = parent
       @_nopass = false
       @_nopara = false
+      parent.no_puts = output.nil?
+      @body = ""  # not always used
       @output = ::Livetext.output = (output || File.open("/dev/null", "w"))
       @sources = []
     end
 
-    def _out(str)
-      if @no_puts
-        @body << str
-      else
-        _puts str
-      end
-    end
-
     def output=(io)
       @output = io
     end

data/lib/standard.rb

@@ -3,7 +3,7 @@ module Livetext::Standard
   SimpleFormats =     # Move this?
    { b: %w[<b> </b>],
      i: %w[<i> </i>],
-     t: ["<font size=+1><tt>", "</tt></font"],
+     t: ["<font size=+1><tt>", "</tt></font>"],
      s: %w[<strike> </strike>] }
 
   attr_reader :_data

data/lib/userapi.rb

@@ -107,10 +107,18 @@ module Livetext::UserAPI
     $which = 1
     return if @_nopass
 #   p [@_nopara, line]
-    _puts "<p>" if line == "\n" and ! @_nopara
-#   _puts "<p>" if line == "" and ! @_nopara
+    _out "<p>" if line == "\n" and ! @_nopara
+#   _out "<p>" if line == "" and ! @_nopara
     _formatting(line, context)
-    _puts line
+    _out line
+  end
+
+  def _out(str)
+    if @no_puts
+      @body << str
+    else
+      _puts str
+    end
   end
 
   def _puts(*args)

data/test/data/basic_formatting/expected-output.txt

@@ -1,6 +1,6 @@
-Here are examples of <b>boldface</b> and <i>italics</i> and <tt>code</tt>
+Here are examples of <b>boldface</b> and <i>italics</i> and <font size=+1><tt>code</tt></font>
 as well as <b>more complex</b> examples of <i>italicized text</i>
-and <tt>code font</tt>.
+and <font size=+1><tt>code font</tt></font>.
 <p>
 
 Here are some random punctuation marks:

data/test/data/lines.txt

@@ -1,22 +1,22 @@
 tick: Single token, beginning of line
 `def is like a reserved word
-<tt>def</tt> is like a reserved word
+<font size=+1><tt>def</tt></font> is like a reserved word
 
 tick: Single token, middle of line
 They say `def is like a reserved word
-They say <tt>def</tt> is like a reserved word
+They say <font size=+1><tt>def</tt></font> is like a reserved word
 
 tick: Single token, end of line
 like a reserved word, is `def
-like a reserved word, is <tt>def</tt>
+like a reserved word, is <font size=+1><tt>def</tt></font>
 
 tick: Bracketed, normal
 This is `[code font] here
-This is <tt>code font</tt> here
+This is <font size=+1><tt>code font</tt></font> here
 
 tick: Bracketed, hits EOL
 This is `[code font here
-This is <tt>code font here</tt>
+This is <font size=+1><tt>code font here</tt></font>
 
 tick: followed by space
 This is not ` code
@@ -28,19 +28,19 @@ This also isn't code: `
 
 tick: Doubled, ignores comma
 This is ``code, of course
-This is <tt>code</tt>, of course
+This is <font size=+1><tt>code</tt></font>, of course
 
 tick: Doubled, ignores period
 This is ``code. Hooray, I guess.
-This is <tt>code</tt>. Hooray, I guess.
+This is <font size=+1><tt>code</tt></font>. Hooray, I guess.
 
 tick: Doubled, ignores right paren
 (By the way, this is ``code)
-(By the way, this is <tt>code</tt>)
+(By the way, this is <font size=+1><tt>code</tt></font>)
 
 tick: Doubled, ignores EOL
 Up to EOL, this is ``code
-Up to EOL, this is <tt>code</tt>
+Up to EOL, this is <font size=+1><tt>code</tt></font>
 
 uscore: Single token, beginning of line
 _This is italics
@@ -88,7 +88,7 @@ Be there in a <i>second</i>
 
 Tick has precedence over underscore
 This is a `piece_of_code here
-This is a <tt>piece_of_code</tt> here
+This is a <font size=+1><tt>piece_of_code</tt></font> here
 
 under: Starts after double quote?
 He said, "_Please go away."
@@ -204,7 +204,7 @@ There is <i>some text</i> here
 
 Try $$t
 There is $$t[some text] here
-There is <tt>some text</tt> here
+There is <font size=+1><tt>some text</tt></font> here
 
 Try $$s
 There is $$s[some text] here
@@ -216,7 +216,7 @@ 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
+There is <b><font size=+1><tt>some text</tt></font></b> here
 
 Try $$bs
 There is $$bs[some text] here
@@ -224,7 +224,7 @@ 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
+There is <i><font size=+1><tt>some text</tt></font></i> here
 
 Try $$is
 There is $$is[some text] here
@@ -232,11 +232,11 @@ 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
+There is <font size=+1><tt><strike>some text</strike></tt></font> here
 
 Try $$bit
 There is $$bit[some text] here
-There is <b><i><tt>some text</tt></i></b> here
+There is <b><i><font size=+1><tt>some text</tt></font></i></b> here
 
 Try $$bis
 There is $$bis[some text] here
@@ -244,19 +244,19 @@ 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
+There is <b><font size=+1><tt><strike>some text</strike></tt></font></b> here
 
 Try $$its
 There is $$its[some text] here
-There is <i><tt><strike>some text</strike></tt></i> here
+There is <i><font size=+1><tt><strike>some text</strike></tt></font></i> here
 
 Try $$bits 
 There is $$bits[some text] here
-There is <b><i><tt><strike>some text</strike></tt></i></b> here
+There is <b><i><font size=+1><tt><strike>some text</strike></tt></font></i></b> here
 
 Escaped brackets inside bracketed function parameter
 Here is an $$t[\[:array, :expression\]] with escapes.
-Here is an <tt>[:array, :expression]</tt> with escapes.
+Here is an <font size=+1><tt>[:array, :expression]</tt></font> with escapes.
 
 Escape brackets inside *
 There are brackets *[\[\]] here
@@ -268,7 +268,7 @@ There are brackets <i>[]</i> here
 
 Escape brackets inside `
 There are brackets `[\[\]] here
-There are brackets <tt>[]</tt> here
+There are brackets <font size=+1><tt>[]</tt></font> here
 
 Escape brackets inside ~
 There are brackets ~[\[\]] here

data/test/data/table_with_heredocs/expected-output.txt

@@ -10,4 +10,4 @@ Testing heredocs (used in a table)
   <td valign=top>And so<br>is this.<br></td>
   <td valign=top>This is <br>row 2<br>col 2<br></td>
 </tr>
-</table>
+</table></center>

metadata

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