diff options
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/plugins/rfpdf/lib/rfpdf/fpdf.rb | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/vendor/plugins/rfpdf/lib/rfpdf/fpdf.rb b/vendor/plugins/rfpdf/lib/rfpdf/fpdf.rb index ad52e9e62..c41174f6a 100644 --- a/vendor/plugins/rfpdf/lib/rfpdf/fpdf.rb +++ b/vendor/plugins/rfpdf/lib/rfpdf/fpdf.rb @@ -378,13 +378,21 @@ class FPDF end @ColorFlag=(@FillColor!=@TextColor) end + + def GetCharWidth(widths, index) + if index.is_a?(String) + widths[index.ord] + else + widths[index] + end + end def GetStringWidth(s) # Get width of a string in the current font cw=@CurrentFont['cw'] w=0 s.each_byte do |c| - w=w+cw[c] + w=w+GetCharWidth(cw, c) end w*@FontSize/1000.0 end @@ -707,7 +715,7 @@ class FPDF ls=l ns=ns+1 end - l=l+cw[c[0]] + l=l+GetCharWidth(cw, c[0]) if l>wmax # Automatic line break if sep==-1 @@ -786,7 +794,7 @@ class FPDF sep=i ls=l end - l=l+cw[c]; + l=l+GetCharWidth(cw, c); if l>wmax # Automatic line break if sep==-1 @@ -1079,7 +1087,7 @@ class FPDF cw=font['cw'] s='[' 32.upto(255) do |i| - s << cw[i].to_s+' ' + s << GetCharWidth(cw, i).to_s + ' ' end out(s+']') out('endobj') |