livetext 0.9.51 → 0.9.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1d0ef585b57b9cf3ffc439ab8dc44d67ba5b287219920121694d06a78558872
-  data.tar.gz: a73d887e9f053977c1c96b0b7ac8b1eb4bd8976180e5fee18ecb5ef5b5ca1e65
+  metadata.gz: 4847cd14621a75b3cfa04c887b486a2bfc40ba1d631fb2cbb59730a70a77ea5d
+  data.tar.gz: d1ca67209314868f986283e1999c3f6225c1335f5391813c59941af6623a258f
 SHA512:
-  metadata.gz: 4ceda09db8d0819b550c485af5fb3d5f6da2be17ce879a07c1199c31554f76550bebaf8bcc77e834ff20466eb859d3712996fd23d0c6812aba799809f6a66ada
-  data.tar.gz: 97c76c0a601541d78afa39da976fb966ee3a7917c065eb5589c70b755e8120f89916edbc7eacc72f02c4f76edcbadd839ed545e482b097e970e87602b59b4ecf
+  metadata.gz: c71410f3eff32c91da1ba414966f01f00acc82ae92184a633137f9d1ba79bee5c9a282dbd7ba4db2cb5511d83859a458c88e006ada07e29dace6edfc76784c96
+  data.tar.gz: c8018eaead5bcf4dbffe756c0d6aad2dd1a3cfe2f319b9aefa0ae636ce7828e7528f992156c873a8285ae01a2724654ddbcf9ad8c4bfa84d72159d3774806eb4

data/lib/livetext/expansion.rb

@@ -55,10 +55,26 @@ class Livetext::Expansion
   def funcall(name, param)
     err = "[Error evaluating $$#{name}(#{param})]"
     name = name.gsub(/\./, "__")
-    return if self.send?(name, param)
+    
+    # First check Livetext::Functions (for predefined and inline functions)
     fobj = ::Livetext::Functions.new
-    result = fobj.send(name, param) rescue err
-    result.to_s
+    result = fobj.send(name, param) rescue nil
+    return result.to_s if result
+    
+    # Then check the processor instance (for mixin functions)
+    if @live.main.respond_to?(name)
+      # Check if the method expects parameters
+      method = @live.main.method(name)
+      if method.parameters.empty?
+        result = @live.main.send(name) rescue err
+      else
+        result = @live.main.send(name, param) rescue err
+      end
+      return result.to_s
+    end
+    
+    # If not found anywhere
+    err
   end
 
   def expand_function_calls(str)

data/lib/livetext/formatter.rb

@@ -1,24 +1,148 @@
 module Livetext::Formatter
 
-  def self.format(str)    # FIXME - unneeded?
+  def self.format(str)
     str = str.chomp
-    s2 = Double.process(str.chomp)
-    s3 = Bracketed.process(s2)
-    s4 = Single.process(s3)
-    s4
+    # First, mark escaped characters so they won't be processed as formatting
+    str = mark_escaped_characters(str)
+    
+    # Process all marker types in sequence (like the original formatter)
+    str = handle_double_markers(str)
+    str = handle_bracketed_markers(str)
+    str = handle_single_markers(str)
+    str = handle_underscore_markers(str)
+    str = handle_backtick_markers(str)
+    str = handle_tilde_markers(str)
+    
+    str = unmark_escaped_characters(str)
+    str
+  end
+
+  private
+
+  def self.mark_escaped_characters(str)
+    # Replace escaped characters with a null byte marker (safe for internal use)
+    str.gsub(/\\([*_`~])/, "\u0000\\1")
+  end
+
+  def self.unmark_escaped_characters(str)
+    # Restore escaped characters
+    str.gsub(/\u0000([*_`~])/, '\1')
+  end
+
+  def self.handle_double_markers(str)
+    # **word -> <b>word</b> (terminated by space, comma, period)
+    # But ignore standalone ** or ** surrounded by spaces
+    str.gsub(/(?<=\s|^)\*\*([^\s,.]*)/) do |match|
+      if $1.empty?
+        "**"  # standalone ** should be literal
+      else
+        "<b>#{$1}</b>"
+      end
+    end
+  end
+
+  def self.handle_bracketed_markers(str)
+    # Handle all bracketed markers: *[content], _[content], `[content]
+    # *[content] -> <b>content</b>
+    # _[content] -> <i>content</i>
+    # `[content] -> <tt>content</tt>
+    # And handle unclosed brackets with end-of-line termination
+    # Empty brackets disappear
+    # But ignore if the marker was originally escaped
+    # And ignore embedded markers (like abc*[)
+    
+    # First handle complete brackets for all marker types
+    str = str.gsub(/(?<!\u0000)([*_`])\[([^\]]*)\]/) do |match|
+      marker, content = $1, $2
+      if content.empty?
+        ""  # empty brackets disappear
+      else
+        case marker
+        when "*" then "<b>#{content}</b>"
+        when "_" then "<i>#{content}</i>"
+        when "`" then "<tt>#{content}</tt>"
+        else match  # fallback
+        end
+      end
+    end
+    
+    # Then handle unclosed brackets (end of line replaces closing bracket)
+    # But only if it's at start of line or preceded by whitespace
+    str = str.gsub(/(?<!\u0000)(?<=\s|^)([*_`])\[([^\]]*)$/) do |match|
+      marker, content = $1, $2
+      if content.empty?
+        ""  # standalone marker[ disappears
+      else
+        case marker
+        when "*" then "<b>#{content}</b>"
+        when "_" then "<i>#{content}</i>"
+        when "`" then "<tt>#{content}</tt>"
+        else match  # fallback
+        end
+      end
+    end
+    
+    str
+  end
+
+  def self.handle_single_markers(str)
+    # *word -> <b>word</b> (only at start of word or after space)
+    # But ignore standalone * or * surrounded by spaces
+    # Also ignore * that are part of ** patterns (already processed)
+    # And ignore * that are part of *[ patterns (already processed)
+    str.gsub(/(?<=\s|^)\*(?!\[)([^\s]*)/) do |match|
+      if $1.empty?
+        "*"  # standalone * should be literal
+      elsif $1.start_with?('*')
+        # This is part of a ** pattern, leave it as literal
+        match
+      else
+        "<b>#{$1}</b>"
+      end
+    end
+  end
+
+  def self.handle_underscore_markers(str)
+    # _word -> <i>word</i> (only at start of word or after space)
+    # But ignore standalone _ or _ surrounded by spaces
+    str.gsub(/(?<=\s|^)_([^\s]*)/) do |match|
+      if $1.empty?
+        "_"  # standalone _ should be literal
+      else
+        "<i>#{$1}</i>"
+      end
+    end
+  end
+
+  def self.handle_backtick_markers(str)
+    # `word -> <tt>word</tt> (only at start of word or after space)
+    # But ignore standalone ` or ` surrounded by spaces
+    str.gsub(/(?<=\s|^)`([^\s]*)/) do |match|
+      if $1.empty?
+        "`"  # standalone ` should be literal
+      else
+        "<tt>#{$1}</tt>"
+      end
+    end
+  end
+
+  def self.handle_tilde_markers(str)
+    # ~word -> <strike>word</strike> (only at start of word or after space)
+    # But ignore standalone ~ or ~ surrounded by spaces
+    str.gsub(/(?<=\s|^)~([^\s]*)/) do |match|
+      if $1.empty?
+        "~"  # standalone ~ should be literal
+      else
+        "<strike>#{$1}</strike>"
+      end
+    end
   end
-  
-  ## Hmmm...
-  # 
-  #  Double:  b, i, t, s
-  #  Single:  bits
-  #  Brackt:  bits
-  # 
 
 end
 
+# Legacy classes - kept for compatibility but not used
 class Livetext::Formatter::Delimited
-  def initialize(str, marker, tag)    # Delimited
+  def initialize(str, marker, tag)
     @str, @marker, @tag = str.dup, marker, tag
     @buffer = ""
     @cdata  = ""
@@ -37,15 +161,12 @@ class Livetext::Formatter::Delimited
   end
 
   def grab(n=1)
-    char = @str.slice!(0..(n-1))   # grab n chars
+    char = @str.slice!(0..(n-1))
     char
   end
 
   def grab_terminator
     @state = :LOOPING
-    # goes onto buffer by default
-    # Don't? what if searching for space_marker?
-    # @buffer << grab  
   end
 
   def eol?
@@ -61,7 +182,7 @@ class Livetext::Formatter::Delimited
   end
 
   def terminated?
-    space?   # Will be overridden except in Single
+    space?
   end
 
   def marker?
@@ -85,14 +206,14 @@ class Livetext::Formatter::Delimited
     n = @marker.length
     case
     when escape?
-      grab               # backslash
-      @buffer << grab    # char
+      grab
+      @buffer << grab
     when space_marker?
-      @buffer << grab   # append the space
-      grab(n)           # eat the marker
+      @buffer << grab
+      grab(n)
       @state = :CDATA
     when marker?
-      grab(n)  # Eat the marker
+      grab(n)
       @state = :CDATA
     when eol?
       @state = :FINAL
@@ -117,7 +238,7 @@ class Livetext::Formatter::Delimited
       @state = :FINAL
     when terminated?
       @buffer << wrap(@cdata)
-      grab_terminator    # "*a *b"  case???
+      grab_terminator
       @cdata = ""
       @state = :LOOPING
     else
@@ -130,15 +251,15 @@ class Livetext::Formatter::Delimited
     n = @marker.length
     case
     when escape?
-      grab               # backslash
-      @buffer << grab    # char
+      grab
+      @buffer << grab
     when space_marker?
-      @buffer << grab   # append the space
-      grab(n)           # eat the marker
+      @buffer << grab
+      grab(n)
       @state = :CDATA
     when eol?
       @state = :FINAL
-    else   # includes marker not preceded by space!
+    else
       @buffer << grab
     end
   end
@@ -155,7 +276,6 @@ class Livetext::Formatter::Delimited
   def self.process(str)
     bold = self.new(str, "*", "b")
     sb   = bold.handle
-# return sb
     ital = self.new(sb, "_", "i")
     si   = ital.handle
     code = self.new(si, "`", "tt")
@@ -167,13 +287,11 @@ class Livetext::Formatter::Delimited
 end
 
 class Livetext::Formatter::Single < Livetext::Formatter::Delimited
-  # Yeah, this one is that simple
 end
 
 class Livetext::Formatter::Double < Livetext::Formatter::Delimited
-  def initialize(str, sigil, tag)    # Double
+  def initialize(str, sigil, tag)
     super
-    # Convention: marker is "**", sigil is "*"
     @marker = sigil + sigil
   end
 
@@ -184,9 +302,8 @@ class Livetext::Formatter::Double < Livetext::Formatter::Delimited
 end
 
 class Livetext::Formatter::Bracketed < Livetext::Formatter::Delimited
-  def initialize(str, sigil, tag)   # Bracketed
+  def initialize(str, sigil, tag)
     super
-    # Convention: marker is "*[", sigil is "*"
     @marker = sigil + "["
   end
 

data/lib/livetext/version.rb

@@ -2,5 +2,5 @@
 # Defining VERSION
 
 class Livetext
-  VERSION = "0.9.51"
+  VERSION = "0.9.52"
 end

data/test/extra/testgen.rb

@@ -41,13 +41,11 @@ end
 output.puts <<~RUBY
   require 'minitest/autorun'
 
-  MiniTest = Minitest unless defined?(MiniTest)
-
   require 'livetext'
 
   # Just another testing class. Chill.
 
-  class TestingLivetext#{classname} < MiniTest::Test
+  class TestingLivetext#{classname} < Minitest::Test
 
     def setup
       @live = Livetext.new

data/test/snapshots/mixin_functions/expected-output.txt

@@ -0,0 +1,18 @@
+Testing functions defined in external .rb files
+<p>
+
+Now calling a function defined in the .rb file:
+External function called with: test_parameter
+<p>
+
+And another one with brackets:
+Another function called with: with brackets
+<p>
+
+And a function with no parameters:
+Simple function with no parameters
+<p>
+
+That's all.
+<p>
+

data/test/snapshots/mixin_functions/mixin_functions.rb

@@ -0,0 +1,11 @@
+def external_func(param)
+  "External function called with: #{param}"
+end
+
+def another_func(param)
+  "Another function called with: #{param}"
+end
+
+def simple_func
+  "Simple function with no parameters"
+end

data/test/snapshots/mixin_functions/source.lt3

@@ -0,0 +1,15 @@
+Testing functions defined in external .rb files
+
+.mixin mixin_functions
+
+Now calling a function defined in the .rb file:
+$$external_func:test_parameter
+
+And another one with brackets:
+$$another_func[with brackets]
+
+And a function with no parameters:
+$$simple_func
+
+That's all.
+

data/test/snapshots.rb

@@ -9,8 +9,6 @@
 
 require 'minitest/autorun'
 
-MiniTest = Minitest unless defined?(MiniTest)
-
 require_relative '../lib/livetext'
 
 =begin
@@ -45,7 +43,7 @@ It works this way:
 
 # Just a testing class. Chill.
 
-class TestingLivetext < MiniTest::Test
+class TestingLivetext < Minitest::Test
 
   class Snapshot
     SOURCE = "source.lt3"
@@ -67,9 +65,10 @@ class TestingLivetext < MiniTest::Test
     end
 
     Args = ARGV - ["cmdline"]
+    cmdline = ARGV.first == "cmdline"
     dir = self.get_dir
     # Data = "#{dir}/test/snapshots"
-    Data = "../../test/snapshots"
+    Data = cmdline ? "../../test/snapshots" : "test/snapshots"
     Dir.chdir(Data)
     TestDirs = Dir.entries(".").reject {|fname| ! File.directory?(fname) } - %w[. ..]
 

data/test/test_escape.lt3

@@ -0,0 +1 @@
+\*escaped

data/test/unit/bracketed.rb

@@ -1,12 +1,12 @@
 require 'minitest/autorun'
 
-MiniTest = Minitest unless defined?(MiniTest)
+
 
 require 'livetext'
 
 # Just another testing class. Chill.
 
-class TestingLivetextBracketed < MiniTest::Test
+class TestingLivetextBracketed < Minitest::Test
 
   def setup
     @live = Livetext.new

data/test/unit/double.rb

@@ -1,12 +1,10 @@
 require 'minitest/autorun'
 
-MiniTest = Minitest unless defined?(MiniTest)
-
 require 'livetext'
 
 # Just another testing class. Chill.
 
-class TestingLivetextDouble < MiniTest::Test
+class TestingLivetextDouble < Minitest::Test
 
   def setup
     @live = Livetext.new

data/test/unit/functions.rb

@@ -1,12 +1,12 @@
 require 'minitest/autorun'
 
-MiniTest = Minitest unless defined?(MiniTest)
+
 
 require 'livetext'
 
 # Just another testing class. Chill.
 
-class TestingLivetextFunctions < MiniTest::Test
+class TestingLivetextFunctions < Minitest::Test
 
   def setup
     @live = Livetext.new

data/test/unit/html.rb

@@ -1,10 +1,10 @@
 require 'minitest/autorun'
 
-MiniTest = Minitest unless defined?(MiniTest)
+
 
 require 'livetext'
 
-class TestingLivetext < MiniTest::Test
+class TestingLivetext < Minitest::Test
   include Livetext::Standard
 
   # Some of these methods being tested "really" belong elsewhere?

data/test/unit/parser/general.rb

@@ -1,13 +1,13 @@
 
 require 'minitest/autorun'
 
-MiniTest = Minitest unless defined?(MiniTest)
+
 
 require_relative '../parser'      # nested
 
 ParseGeneral = ::Livetext::ParseGeneral
 
-class TestParseGeneral < MiniTest::Test
+class TestParseGeneral < Minitest::Test
 
   def setup
   end

data/test/unit/parser/mixin.rb

@@ -1,11 +1,11 @@
 
 require 'minitest/autorun'
 
-MiniTest = Minitest unless defined?(MiniTest)
+
 
 require_relative '../parser'      # nested
 
-class TestParseSet < MiniTest::Test
+class TestParseSet < Minitest::Test
 
   def setup
   end

data/test/unit/parser/set.rb

@@ -1,13 +1,13 @@
 
 require 'minitest/autorun'
 
-MiniTest = Minitest unless defined?(MiniTest)
+
 
 require_relative '../parser'      # nested
 
 ParseSet = ::Livetext::ParseSet
 
-class TestParseSet < MiniTest::Test
+class TestParseSet < Minitest::Test
 
   def setup
   end

data/test/unit/parser/string.rb

@@ -1,10 +1,10 @@
 require 'minitest/autorun'
 
-MiniTest = Minitest unless defined?(MiniTest)
+
 
 require_relative '../parser'      # nested
 
-class TestStringParser < MiniTest::Test
+class TestStringParser < Minitest::Test
 
   def setup
     # Lengths: zero, one, arbitrary

data/test/unit/single.rb

@@ -1,12 +1,10 @@
 require 'minitest/autorun'
 
-MiniTest = Minitest unless defined?(MiniTest)
-
 require 'livetext'
 
 # Just another testing class. Chill.
 
-class TestingLivetextSingle < MiniTest::Test
+class TestingLivetextSingle < Minitest::Test
   def setup
     @live = Livetext.new
   end

data/test/unit/standard.rb

@@ -1,10 +1,8 @@
 require 'minitest/autorun'
 
-MiniTest = Minitest
-
 require_relative '../../lib/livetext'
 
-class TestingLivetext < MiniTest::Test
+class TestingLivetext < Minitest::Test
   include Livetext::Standard
 
   # Only method here "really" belongs elsewhere?  FIXME

data/test/unit/stringparser.rb

@@ -1,10 +1,10 @@
 require 'minitest/autorun'
 
-MiniTest = Minitest unless defined?(MiniTest)
+
 
 require_relative '../../lib/stringparser'
 
-class TestStringParser < MiniTest::Test
+class TestStringParser < Minitest::Test
 
   def setup
     # Lengths: zero, one, arbitrary

data/test/unit/variables.rb

@@ -1,12 +1,12 @@
 require 'minitest/autorun'
 
-MiniTest = Minitest unless defined?(MiniTest)
+
 
 require 'livetext'
 
 # Just another testing class. Chill.
 
-class TestingLivetextVariables < MiniTest::Test
+class TestingLivetextVariables < Minitest::Test
 
   def setup
     @live = Livetext.new

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: livetext
 version: !ruby/object:Gem::Version
-  version: 0.9.51
+  version: 0.9.52
 platform: ruby
 authors:
 - Hal Fulton
 bindir: bin
 cert_chain: []
-date: 2025-07-22 00:00:00.000000000 Z
+date: 2025-08-06 00:00:00.000000000 Z
 dependencies: []
 description: A smart text processor extensible in Ruby
 email: rubyhacker@gmail.com
@@ -139,6 +139,10 @@ files:
 - test/snapshots/mixin_booktool/expected-output.txt
 - test/snapshots/mixin_booktool/source.lt3
 - test/snapshots/mixin_booktool/toc.tmp
+- test/snapshots/mixin_functions/expected-error.txt
+- test/snapshots/mixin_functions/expected-output.txt
+- test/snapshots/mixin_functions/mixin_functions.rb
+- test/snapshots/mixin_functions/source.lt3
 - test/snapshots/more_complex_vars/expected-error.txt
 - test/snapshots/more_complex_vars/expected-output.txt
 - test/snapshots/more_complex_vars/source.lt3
@@ -185,6 +189,7 @@ files:
 - test/snapshots/var_into_func/expected-error.txt
 - test/snapshots/var_into_func/expected-output.txt
 - test/snapshots/var_into_func/source.lt3
+- test/test_escape.lt3
 - test/unit/all.rb
 - test/unit/bracketed.rb
 - test/unit/double.rb