[whimsy] branch master updated: string_to_utf8 only used by Receiver

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 594e024  string_to_utf8 only used by Receiver
594e024 is described below

commit 594e024917795797871a5ec5bdf5240c37c15194
Author: Sebb <s...@apache.org>
AuthorDate: Mon Oct 18 23:36:44 2021 +0100

    string_to_utf8 only used by Receiver
    
    Also simplify strip() calls
---
 www/secretary/iclaparser.rb | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/www/secretary/iclaparser.rb b/www/secretary/iclaparser.rb
index ab61db8..f88bcfa 100644
--- a/www/secretary/iclaparser.rb
+++ b/www/secretary/iclaparser.rb
@@ -55,7 +55,7 @@ module ICLAParser
     end
 
     def end_text_object
-      @lines << @textobj.join('')
+      @lines << @textobj.join
     end
 
     def set_text_font_and_size(*args)
@@ -64,7 +64,7 @@ module ICLAParser
 
     def show_text(string)
       font = @fontdict[@tfs.first]
-      utf8 = ICLAParser.string_to_utf8(string, font)
+      utf8 = string_to_utf8(string, font)
       @textobj << utf8
     end
 
@@ -75,11 +75,11 @@ module ICLAParser
       chars = []
       args.flatten.each do |arg|
         if arg.is_a?(String)
-          char = ICLAParser.string_to_utf8(arg, font)
+          char = string_to_utf8(arg, font)
           chars << char
         end
       end
-      val = chars.join("").strip
+      val = chars.join.strip
       len = val.length
       # some PDFs have the individual text in this format so skip long lines 
which are unlikely to be user data
       # Could perhaps have full list of expected text lines instead.
@@ -96,20 +96,20 @@ module ICLAParser
       @lines
     end
 
-  end
-
-  def self.string_to_utf8(string, font)
-    chars = []
-    glyphs = font.unpack(string)
-    glyphs.each do |glyph_code|
-      char = font.to_utf8(glyph_code)
-      # One pdf (yev) has spurious \t\r<sp>?<nbsp> translated from 36 => [9, 
13, 32, 194, 160]
-      if glyph_code == 36 and char =~ /^\t\r /
-        char = ' '
+    def string_to_utf8(string, font)
+      chars = []
+      glyphs = font.unpack(string)
+      glyphs.each do |glyph_code|
+        char = font.to_utf8(glyph_code)
+        # One pdf (yev) has spurious \t\r<sp>?<nbsp> translated from 36 => [9, 
13, 32, 194, 160]
+        if glyph_code == 36 and char =~ /^\t\r /
+          char = ' '
+        end
+        chars << char
       end
-      chars << char
+      chars.join
     end
-    chars.join('')
+
   end
 
   # Standard form field names for other code to use