livetext 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93e53f99adb2db092428d0e3b5c66ecbfc173814
-  data.tar.gz: baffe8b343d7290ca8d8ffc3f419ea7745fc128c
+  metadata.gz: 61fc8530a13b32edfcc6701ad7f3b7a439454008
+  data.tar.gz: 6fc9806e07131c1c7ea6e8988c0f14a6695b08b3
 SHA512:
-  metadata.gz: 433d52e19811f6f6056759e5ec25df1944c34f382badf64d2e6f75e21f61e24381673a3f8e9119da776bc6257f0a37d8125160d157775453e003a50e131d23b9
-  data.tar.gz: a3254d97a375f0db7a74b9c8047a22b15a1157d0766a4ca1f8043bf70bfcbe42bf95483caa5accac2b924d52d1b014b26a14b439f460c23bd6e0f6baf0b1b56a
+  metadata.gz: 242cd19f6051338d664968e086ac6d58d9df152e6938592bd7247e5752aa702818ccddf1c820824f6016061f15a3bd1d8a9d3e2e12215f6774f242839bd458df
+  data.tar.gz: a3b5278186da25bfd72beae900569b2df4d1d964ae122ee30f93b5c594554329cd634346350f5d9a22ee41850d5d72626032936423fa42d278d5ff348e952302

data/lib/formatline.rb

@@ -132,9 +132,16 @@ class FormatLine
                     when " "   # no param - just call
                       @param = nil
                       fcall    # no param? Hmm
-                    when "["   # long param - may have spaces - can hit eol
+                    when "["   # long param
                       skip
-                      loop { break if ["]", EOL].include?(peek); @param << grab }
+                      loop do 
+                        if peek == "\\"
+                          skip
+                          @param << grab
+                        end
+                        break if ["]", EOL].include?(peek)
+                        @param << grab
+                      end
                       skip
                       fcall
                     when ":"   # param (single token or to-eol)
@@ -163,7 +170,15 @@ class FormatLine
               emit "*"
             when "["
               skip
-              loop { break if ["]", EOL].include?(peek); @substr << grab }
+              loop do
+                if peek == "\\"
+                  skip
+                  @substr << grab
+                  next
+                end
+                break if ["]", EOL].include?(peek)
+                @substr << grab
+              end
               skip
               bold
             when Other
@@ -178,12 +193,28 @@ class FormatLine
               emit "_"
             when "["
               skip
-              loop { break if ["]", EOL].include?(peek); @substr << grab }
+              loop do
+                if peek == "\\"
+                  skip
+                  @substr << grab
+                  next
+                end
+                break if ["]", EOL].include?(peek)
+                @substr << grab
+              end
               skip
               italics
             when "_"   # doubled...
               skip
-              loop { break if [".", ",", ")", EOL].include?(peek); @substr << grab }   # ";" ?? FIXME
+              loop do
+                if peek == "\\"
+                  skip
+                  @substr << grab
+                  next
+                end
+                break if [".", ",", ")", EOL].include?(peek)
+                @substr << grab
+              end
               italics
             when Other
               loop { @substr << grab; break if [" ", EOL].include?(peek) }
@@ -197,7 +228,15 @@ class FormatLine
               emit "`"
             when "["
               skip
-              loop { break if ["]", EOL].include?(peek); @substr << grab }
+              loop do
+                if peek == "\\"
+                  skip
+                  @substr << grab
+                  next
+                end
+                break if ["]", EOL].include?(peek)
+                @substr << grab
+              end
               skip
               ttype
             when "`"   # doubled...
@@ -216,7 +255,15 @@ class FormatLine
               emit "~"
             when "["
               skip
-              loop { break if ["]", EOL].include?(peek); @substr << grab }
+              loop do
+                if peek == "\\"
+                  skip
+                  @substr << grab
+                  next
+                end
+                break if ["]", EOL].include?(peek)
+                @substr << grab
+              end
               skip
               strike
             when "~"   # doubled...

data/lib/livetext.rb

@@ -1,5 +1,5 @@
 class Livetext
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end
 
 require 'fileutils'

data/test/testfiles/lines.txt

@@ -254,3 +254,23 @@ Try $$bits
 There is $$bits[some text] here
 There is <b><i><tt><strike>some text</strike></tt></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.
+
+Escape brackets inside *
+There are brackets *[\[\]] here
+There are brackets <b>[]</b> here
+
+Escape brackets inside _
+There are brackets _[\[\]] here
+There are brackets <i>[]</i> here
+
+Escape brackets inside `
+There are brackets `[\[\]] here
+There are brackets <tt>[]</tt> here
+
+Escape brackets inside ~
+There are brackets ~[\[\]] here
+There are brackets <strike>[]</strike> here
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Hal Fulton
@@ -146,9 +146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A smart processor for text
 test_files: []
-has_rdoc: