obf 0.9.8.31 → 0.9.8.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 239d820afb7dc6da2f8acf5987caa95c6678811093a3810bf92da9a6091010a8
-  data.tar.gz: 32500a980838e9e326cce0e25afbd69e6b02991a5c682cb46c4259663dc673d8
+  metadata.gz: 16b1632c3cbc9a1ae6257270d4efb70929ded87aa79c1b73a5ed7c553e452df6
+  data.tar.gz: 37d0c8a2c6eed4b4ce9ba26bf97f76d12040b33def794d1524cc2ea4028ab0ad
 SHA512:
-  metadata.gz: c469f2e6d1d24f7ff2c2a1313e627b2f8565f75cb3e992c151a9704574a2fd3e6bdf5ca4ce5e4505071a4d23b041102919a57d25b85eea36163ffefb0ddad1fe
-  data.tar.gz: 47a2ce4bfd802e4e6aa208dcf82379bf1e0fab72e3de404aa38079e6ec69e1618a920c76133adafaf85e324dadd633d8144e29ca6bd744336a1805e4533af945
+  metadata.gz: 236aefcd275d5d2323895a6c463b7d08028f4b6b746e41df12efd723ca3829324edfd5030c07ac2a4e9b7f54999660f2a9efc5d40b97790ee24c90b395fdb3bd
+  data.tar.gz: 2f5fe9234e980e76d4bfd23affa13a0966ab1bd6c8f394a7cb2fc7f614c0f8baac92662a0ecd3b48632e282ea0747a1c751c31441fa086bb349da05553197848

data/lib/obf/pdf.rb

@@ -44,20 +44,28 @@ 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.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_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('Arial' => {
+        normal: {font: 'Arial', file: File.expand_path('../../Arial.ttf', __FILE__)}
+      })
+      pdf.font_families.update('TimesNewRoman' => {
+        normal: {font: 'TimesNewRoman', file: File.expand_path('../../TimesNewRoman.ttf', __FILE__)}
+      })
+      default_font = 'TimesNewRoman'
+      if opts['font'] && !opts['font'].match(/TimesNewRoman/) && File.exists?(opts['font'])
+        pdf.font_families.update('DocDefault' => {
+          normal: {font: 'DocDefault', file: font}
+        })
+        default_font = 'DocDefault'
       else
-#        pdf.font('Times-Roman')
       end
+      pdf.fallback_fonts = ['TimesNewRoman', 'THFahKwangBold', 'MiedingerBook', 'Helvetica']
+      pdf.font(default_font)
     
       multi_render_paths = []
       if obj['boards']
@@ -94,7 +102,7 @@ module OBF::PDF
               'pages' => obj['pages'],
               'backlinks' => obj['backlinks'][board['id']] || [], 
               'headerless' => !!opts['headerless'], 
-              'font' => font,
+              'font' => default_font,
               'links' => false,
               'text_on_top' => !!opts['text_on_top'], 
               'transparent_background' => !!opts['transparent_background'],
@@ -150,7 +158,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('Helvetica')
+          pdf.font('Arial')
           pdf.line_width = 2
           pdf.font_size 16
           pdf.fill_color "eeeeee"
@@ -242,7 +250,7 @@ module OBF::PDF
       end
     
       # board
-#      pdf.font(options['font']) if options['font'] && File.exists?(options['font'])
+      pdf.font(options['font'])
       pdf.font_size 12
       padding = 10
       grid_height = doc_height - header_height - text_height - (padding * 2)
@@ -344,11 +352,7 @@ module OBF::PDF
                 if text.match(Regexp.new("[" + NEPALI_ALPHABET + "]"))
                   font = File.expand_path('../../MiedingerBook.ttf', __FILE__)
                 end
-                if font && File.exists?(font)
-#                  pdf.font(font) 
-                else
-#                  pdf.font('Times-Roman')
-                end
+                pdf.font(font)
                 direction = text.match(rtl_regex) ? :rtl : :ltr
                 if options['text_case'] == 'upper'
                   text = text.upcase
@@ -413,7 +417,7 @@ module OBF::PDF
       # footer
       pdf.fill_color "bbbbbb"
       obj['name'] = nil if obj['name'] == 'Unnamed Board'
-#      pdf.font('Helvetica')
+      pdf.font('Arial')
       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.31
+  version: 0.9.8.32
 platform: ruby
 authors:
 - Brian Whitmer