obf 0.9.8.30 → 0.9.8.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cb56d99fe87de9bba6903881552faf415b2d448f4b2db53a9dbef31920822b7
-  data.tar.gz: ce3feae227bfbcbed640c6e6fe58dddcfbd5656763ce7ca10c24a0f0bd76e155
+  metadata.gz: 239d820afb7dc6da2f8acf5987caa95c6678811093a3810bf92da9a6091010a8
+  data.tar.gz: 32500a980838e9e326cce0e25afbd69e6b02991a5c682cb46c4259663dc673d8
 SHA512:
-  metadata.gz: ee15c8c553577d46247d9105ffd24fa982704f615eba9efa32c32d7c019fe4f72e384e72e05b8d1b835985d9dd9f665d525cdc38cc85da514241d7b154e3760e
-  data.tar.gz: f6f8f9f2ab1ef2b9e2eebe33d53b4641dadc9f4bc522114afd9f6f6dfa857093239035ed706c6dee3cd972a3d8f9d470128ed61a7ee73cd6af52f48d0fc6e654
+  metadata.gz: c469f2e6d1d24f7ff2c2a1313e627b2f8565f75cb3e992c151a9704574a2fd3e6bdf5ca4ce5e4505071a4d23b041102919a57d25b85eea36163ffefb0ddad1fe
+  data.tar.gz: 47a2ce4bfd802e4e6aa208dcf82379bf1e0fab72e3de404aa38079e6ec69e1618a920c76133adafaf85e324dadd633d8144e29ca6bd744336a1805e4533af945

data/lib/obf/pdf.rb

@@ -44,25 +44,19 @@ module OBF::PDF
       }
       pdf = Prawn::Document.new(doc_opts)
       # remember: https://www.alphabet-type.com/tools/charset-checker/
-      pdf.font_families.update('THFahKwangBold' => {
-        normal: {font: 'THFahKwangBold', file: File.expand_path('../../THFahKwangBold.ttf', __FILE__)}
-      })
-      pdf.font_families.update('MiedingerBook' => {
-        normal: {font: 'MiedingerBook', file: File.expand_path('../../MiedingerBook.ttf', __FILE__)}
-      })
-      pdf.font_families.update('TimesNewRoman' => {
-        normal: {font: 'TimesNewRoman', file: File.expand_path('../../TimesNewRoman.ttf', __FILE__)}
-      })
-      pdf.font_families.update('Arial' => {
-        normal: {font: 'Arial', file: File.expand_path('../../Arial.ttf', __FILE__)}
-      })
-      pdf.fallback_fonts = ['Times-Roman', 'THFahKwangBold', 'MiedingerBook', 'Arial']
+      # pdf.font_families.update('THFahKwangBold' => {
+      #   normal: {font: 'THFahKwangBold', file: File.expand_path('../../THFahKwangBold.ttf', __FILE__)}
+      # })
+      # pdf.font_families.update('MiedingerBook' => {
+      #   normal: {font: 'MiedingerBook', file: File.expand_path('../../MiedingerBook.ttf', __FILE__)}
+      # })
+      # pdf.fallback_fonts = ['Times-Roman', 'THFahKwangBold', 'MiedingerBook', 'Helvetica']
 
       font = opts['font'] if opts['font'] && File.exists?(opts['font'])
       if font && File.exists?(font)
-        pdf.font(font) 
+#        pdf.font(font) 
       else
-        File.expand_path('../../Arial.ttf', __FILE__)
+#        pdf.font('Times-Roman')
       end
     
       multi_render_paths = []
@@ -141,7 +135,6 @@ module OBF::PDF
   # b.generate_download('1_2', 'pdf', {'include' => 'all', 'headerless' => true, 'symbol_background' => 'transparent'})
   def self.build_page(pdf, obj, options)
     OBF::Utils.as_progress_percent(0, 1.0) do
-      pdf.font(options['font']) if options['font'] && File.exists?(options['font'])
       doc_width = 11*72 - 72
       doc_height = 8.5*72 - 72
       default_radius = 3
@@ -157,7 +150,7 @@ module OBF::PDF
       if !options['headerless']
         header_height = 80
         pdf.bounding_box([0, doc_height], :width => doc_width, :height => header_height) do
-          pdf.font(File.expand_path('../../Arial.ttf', __FILE__)) rescue nil
+#          pdf.font('Helvetica')
           pdf.line_width = 2
           pdf.font_size 16
           pdf.fill_color "eeeeee"
@@ -249,6 +242,7 @@ module OBF::PDF
       end
     
       # board
+#      pdf.font(options['font']) if options['font'] && File.exists?(options['font'])
       pdf.font_size 12
       padding = 10
       grid_height = doc_height - header_height - text_height - (padding * 2)
@@ -351,9 +345,9 @@ module OBF::PDF
                   font = File.expand_path('../../MiedingerBook.ttf', __FILE__)
                 end
                 if font && File.exists?(font)
-                  pdf.font(font) 
+#                  pdf.font(font) 
                 else
-                  pdf.font(File.expand_path('../../TimesNewRoman.ttf', __FILE__))
+#                  pdf.font('Times-Roman')
                 end
                 direction = text.match(rtl_regex) ? :rtl : :ltr
                 if options['text_case'] == 'upper'
@@ -409,7 +403,6 @@ module OBF::PDF
                   pdf.text_box text, :at => [0, vertical], :width => button_width, :height => text_height, :align => :center, :valign => :center, :overflow => :shrink_to_fit, :direction => direction
                 end
               end
-              pdf.font(options['font']) if options['font'] && File.exists?(options['font'])
             end
             index = col + (row * obj['grid']['columns'])
             OBF::Utils.update_current_progress(index.to_f / (obj['grid']['rows'] * obj['grid']['columns']).to_f)
@@ -420,7 +413,7 @@ module OBF::PDF
       # footer
       pdf.fill_color "bbbbbb"
       obj['name'] = nil if obj['name'] == 'Unnamed Board'
-      pdf.font(File.expand_path('../../Arial.ttf', __FILE__))
+#      pdf.font('Helvetica')
       if OBF::PDF.footer_text || obj['name']
         text = [obj['name'], OBF::PDF.footer_text].compact.join(', ')
         offset = options['pages'] ? 400 : 300

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.9.8.30
+  version: 0.9.8.31
 platform: ruby
 authors:
 - Brian Whitmer