krill 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 263d05f0b3e34007af5a65efed3386497244294e
-  data.tar.gz: 5607a0d4c668dd9cda6d736e78c50986eb108c23
+  metadata.gz: bd3f51a4af9789839d2855c32fa16ec028774135
+  data.tar.gz: ae4d0f52fd062ba40368f6be9ed68daa34278d09
 SHA512:
-  metadata.gz: 5dff75341afc874c3694154ccee79ff844c1dd27af1143486850bb256d1095a097d67092ad2252d21892c6e9787e7cfd5e54d0519d7a1841130979f7409bc571
-  data.tar.gz: 72c902daa932736530e97c5ff755a4345dc93807241da37cc6c41492544cc55c4f927820f8d1a9293a3bf6060344dd28c9deec94464b8b93bbabd3835e89993a
+  metadata.gz: 19d495ab9f258a1f1b830a8634af24f6edcb0c77dbdd032bcc6551d2943ef1689e5ca51f0407e5972de2f751c96f6dd438fa41de7d9d2bc0d0667dc7d9c6b7cf
+  data.tar.gz: 83294c710da5637b8ed8dd28520383d11d6249dc0134b4fcad325e56214a2b73aabba62da833a69fbfa3958ce9b00eb163af4dab2c9ebd3bedf0fbcde9e0387f

data/lib/krill/afm.rb

@@ -1,6 +1,6 @@
 module Krill
   AFM = Struct.new(:filename) do
-    attr_reader :name, :family, :ascender, :descender, :line_gap,:character_widths, :kernings
+    attr_reader :name, :family, :ascender, :descender, :line_gap, :character_widths, :kernings
 
     def self.open(filename)
       new filename

data/lib/krill/formatter.rb

@@ -22,18 +22,16 @@ module Krill
     # NOTE: +string+ must be UTF8-encoded.
     def compute_width_of(string, kerning: true)
       if kerning
-        kern(string).inject(0) do |s, r|
+        kern(string).inject(0.0) do |width, r|
           if r.is_a?(Numeric)
-            s - r
+            width - r
           else
-            r.inject(s) { |s2, u| s2 + font.character_widths.fetch(u, 0) }
+            r.inject(width) { |width2, char| width2 + width_of_char(char) }
           end
-        end * size
+        end
       else
-        string.chars.inject(0) do |sum, char|
-          sum + font.character_widths.fetch(char, 0.0)
-        end * size
-      end
+        string.chars.inject(0.0) { |width, char| width + width_of_char(char) }
+      end * size
     end
 
 
@@ -74,6 +72,7 @@ module Krill
 
   private
 
+
     def normalized_height
       @normalized_height ||= font.ascender - font.descender + font.line_gap
     end
@@ -94,7 +93,7 @@ module Krill
       string.each_char do |char|
         if a.empty?
           a << [char]
-        elsif (kern = font.kernings["#{a.last.last}#{char}"])
+        elsif (kern = kerning_for_chars(a.last.last, char))
           a << -kern << [char]
         else
           a.last << char
@@ -104,5 +103,18 @@ module Krill
       a
     end
 
+
+  protected
+
+
+    def width_of_char(char)
+      font.character_widths.fetch(char, 0.0)
+    end
+
+    def kerning_for_chars(char0, char1)
+      font.kernings["#{char0}#{char1}"]
+    end
+
+
   end
 end

data/lib/krill/line.rb

@@ -0,0 +1,14 @@
+module Krill
+  class Line
+    attr_reader :text, :width
+
+    def initialize(text, width)
+      @text = text
+      @width = width
+    end
+
+    alias :to_s :text
+    alias :to_str :text
+
+  end
+end

data/lib/krill/line_wrap.rb

@@ -35,7 +35,6 @@ module Krill
       while fragment = @arranger.next_string
         @fragment_output = ""
 
-        fragment.lstrip! if first_fragment_on_this_line?(fragment)
         next if empty_line?(fragment)
 
         break unless apply_font_settings_and_add_fragment_to_line(fragment)
@@ -219,7 +218,7 @@ module Krill
     end
 
     def update_output_based_on_last_fragment(fragment, normalized_soft_hyphen = nil)
-      remaining_text = fragment.slice(@fragment_output.length..fragment.length)
+      remaining_text = fragment.slice(@fragment_output.length..fragment.length).lstrip
       fail CannotFit if line_finished? && line_empty? && @fragment_output.empty? && !fragment.strip.empty?
       @arranger.update_last_string(@fragment_output, remaining_text, normalized_soft_hyphen)
     end

data/lib/krill/text_box.rb

@@ -1,8 +1,10 @@
 require "krill/line_wrap"
+require "krill/line"
 require "krill/arranger"
 
 module Krill
   class TextBox
+    attr_reader :printed_lines
 
     def initialize(formatted_text, options={})
       @original_array       = formatted_text
@@ -189,9 +191,8 @@ module Krill
         accumulated_width += fragment_this_line.width
       end
 
-      @printed_lines << printed_fragments.map do |s|
-        s.force_encoding(::Encoding::UTF_8)
-      end.join
+      text = printed_fragments.map { |s| s.force_encoding(::Encoding::UTF_8) }.join
+      @printed_lines << Krill::Line.new(text, accumulated_width)
     end
 
     def word_spacing_for_this_line

data/lib/krill/version.rb

@@ -1,3 +1,3 @@
 module Krill
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/krill/wrapped_text.rb

@@ -10,7 +10,11 @@ module Krill
     end
 
     def lines
-      @text_box.instance_variable_get :@printed_lines
+      @text_box.printed_lines.map(&:to_s)
+    end
+
+    def width
+      @text_box.printed_lines.map(&:width).max
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: krill
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,6 +102,7 @@ files:
 - lib/krill/arranger.rb
 - lib/krill/formatter.rb
 - lib/krill/fragment.rb
+- lib/krill/line.rb
 - lib/krill/line_wrap.rb
 - lib/krill/text_box.rb
 - lib/krill/ttf.rb