prawn_hebrew 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 186bb2aea7a5ccd10a5346b4847823432d635de32257683a16b5cba3eeec9f7d
-  data.tar.gz: 6e8961d9ecfc709a3dedbe73680c85d7745e9efbc90ab502c34d880e9cd9720c
+  metadata.gz: c85ea02d489bf50f5f0c8facaab7928485a9042f324a54bfb06cd974708e5324
+  data.tar.gz: 21a63093c22ffe1baf7c9b646a000138ef05694448315f077642a0e7f72acf43
 SHA512:
-  metadata.gz: 999a1b333faf3e1e2ac6034de9bdf9abdf6320f06b086dfcf5086b50084416ea14aa3c202e031837abe18c8a6c715855eb126e34acf0f677efa49ca779a99004
-  data.tar.gz: 533e97ded68db1248e666351677077b49243b059877763d65d00e27761845de55e60a089737b10726cb943348f61a84e6c01dcf3f83f7b7898b3e672b883838c
+  metadata.gz: c4ab1e0ce09de9756667400c9b77b43d2f859734056adce3252ffd327af19c1fc97d79ec8c4832c794ef1020a971980e32b9dbd4adf3d4b1960772e06e2edcc7
+  data.tar.gz: dc6e7cd6daae94a23eb250652dd9d1ec754439e921cd3d0707d2b3060cf6515d1e8859e5e32502e46ba0fdbfc8a55fdf62665a0b9089e4c92871a542ea75c66c

data/lib/prawn_hebrew.rb

@@ -8,12 +8,15 @@ module PrawnHebrew
     
     # Set to true for debugging which text rendering path is used
     DEBUG_MODE = false
-    INVISIBLE_CHARS = /[\u200B\u200C\u200D\u200E\u200F\uFEFF\u00AD\u202A\u202B\u202C\u202D\u202E]/.freeze
+    INVISIBLE_CHARS = /[\u2011\u2010\u2012\u2013\u2014\u2018\u2019\u201C\u201D\u2026\u200B\u200C\u200D\u200E\u200F\uFEFF\u00AD\u202A\u202B\u202C\u202D\u202E]/.freeze
     NBSP_CHARS = /[\u00A0\u202F]/.freeze
 
+
+
+
     def sanitize_text(text)
       return text if text.nil?
-      text.to_s.gsub(INVISIBLE_CHARS, '').gsub(NBSP_CHARS, ' ')
+      text.to_s.gsub(INVISIBLE_CHARS, ' ').gsub(NBSP_CHARS, ' ')
     end
 
     def hebrew_formatted_text(text, size: 12, style: :normal, hebrew_font: DEFAULT_HEBREW_FONT, english_font: DEFAULT_ENGLISH_FONT)
@@ -78,6 +81,8 @@ module PrawnHebrew
       rotation = box_opts.delete(:rotate) || 0
       char_spacing = box_opts.delete(:character_spacing) || 0
       leading = box_opts.delete(:leading) || 0
+      min_font_size = box_opts.delete(:min_font_size)
+      overflow = box_opts[:overflow]
       
       # Check if text contains Hebrew characters
       contains_hebrew = text.to_s =~ /\p{Hebrew}/
@@ -87,21 +92,38 @@ module PrawnHebrew
         direction = contains_hebrew ? :rtl : :ltr
       end
       
-      # For completely English text (no Hebrew characters and LTR direction), 
-      # use standard Prawn text_box for better performance and compatibility
-      if !contains_hebrew && direction == :ltr
-        render_english_only_text(text, final_size, style, final_english_font, 
-                                 rotation, char_spacing, leading, box_opts)
+      # Handle shrink_to_fit behavior
+      if overflow == :shrink_to_fit
+        box_opts.delete(:overflow)
+        
+        if !contains_hebrew && direction == :ltr
+          # English-only: use Prawn's built-in shrink_to_fit
+          box_opts[:overflow] = :shrink_to_fit
+          box_opts[:min_font_size] = min_font_size if min_font_size
+          render_english_only_text(text, final_size, style, final_english_font, 
+                                   rotation, char_spacing, leading, box_opts)
+        else
+          # Hebrew/mixed: implement shrinking manually
+          shrink_hebrew_text_to_fit(text, final_size, style, final_hebrew_font, 
+                                    final_english_font, char_spacing, leading, 
+                                    min_font_size, rotation, box_opts)
+        end
       else
-        # For Hebrew text or RTL direction, use formatted text approach
-        if rotation != 0
-          rotate(rotation, origin: box_opts[:at] || [0, 0]) do
+        # Normal rendering without shrinking
+        if !contains_hebrew && direction == :ltr
+          render_english_only_text(text, final_size, style, final_english_font, 
+                                   rotation, char_spacing, leading, box_opts)
+        else
+          # For Hebrew text or RTL direction, use formatted text approach
+          if rotation != 0
+            rotate(rotation, origin: box_opts[:at] || [0, 0]) do
+              render_hebrew_text_content(text, contains_hebrew, direction, final_size, style, 
+                                 final_hebrew_font, final_english_font, char_spacing, leading, box_opts)
+            end
+          else
             render_hebrew_text_content(text, contains_hebrew, direction, final_size, style, 
                                final_hebrew_font, final_english_font, char_spacing, leading, box_opts)
           end
-        else
-          render_hebrew_text_content(text, contains_hebrew, direction, final_size, style, 
-                             final_hebrew_font, final_english_font, char_spacing, leading, box_opts)
         end
       end
     end
@@ -132,6 +154,73 @@ module PrawnHebrew
         formatted_text_box(fragments, box_opts)
       end
     end
+    
+    # Shrink Hebrew text to fit in the box by reducing font size
+    def shrink_hebrew_text_to_fit(text, initial_size, style, hebrew_font, english_font, 
+                                   char_spacing, leading, min_font_size, rotation, box_opts)
+      min_size = min_font_size || 5
+      current_size = initial_size
+      
+      # Try rendering with progressively smaller font sizes until it fits
+      while current_size >= min_size
+        # Create a copy of box_opts to test rendering
+        test_opts = box_opts.dup
+        
+        # Try rendering at current size
+        fragments = hebrew_formatted_text(text, size: current_size, style: style,
+                                          hebrew_font: hebrew_font,
+                                          english_font: english_font)
+        
+        test_opts[:leading] = leading if leading > 0
+        
+        # Test if it fits by attempting to render
+        success = character_spacing(char_spacing) do
+          if rotation != 0
+            rotate(rotation, origin: test_opts[:at] || [0, 0]) do
+              result = formatted_text_box(fragments, test_opts.merge(dry_run: true))
+              result.empty? || result == ""
+            end
+          else
+            result = formatted_text_box(fragments, test_opts.merge(dry_run: true))
+            result.empty? || result == ""
+          end
+        end
+        
+        # If it fits, render it for real and return
+        if success
+          character_spacing(char_spacing) do
+            if rotation != 0
+              rotate(rotation, origin: box_opts[:at] || [0, 0]) do
+                formatted_text_box(fragments, box_opts.merge(leading: leading > 0 ? leading : nil).compact)
+              end
+            else
+              formatted_text_box(fragments, box_opts.merge(leading: leading > 0 ? leading : nil).compact)
+            end
+          end
+          return
+        end
+        
+        # Reduce font size and try again
+        current_size -= 0.5
+      end
+      
+      # If we've reached min size, render at min size anyway
+      fragments = hebrew_formatted_text(text, size: min_size, style: style,
+                                        hebrew_font: hebrew_font,
+                                        english_font: english_font)
+      
+      box_opts[:leading] = leading if leading > 0
+      
+      character_spacing(char_spacing) do
+        if rotation != 0
+          rotate(rotation, origin: box_opts[:at] || [0, 0]) do
+            formatted_text_box(fragments, box_opts)
+          end
+        else
+          formatted_text_box(fragments, box_opts)
+        end
+      end
+    end
   end
 end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module PrawnHebrew
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawn_hebrew
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Ben Lite