gnue-reports/src/adapters/filters/SimpleTabulat...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-reports
Branch:         
Changes by:     James Thompson <address@hidden> 03/09/29 07:47:24

Modified files:
        src/adapters/filters/SimpleTabulation/tabulator/formatters: 
                                                                    pdf.py 

Log message:
        bypass ttf support on distros with older reports labs

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/adapters/filters/SimpleTabulation/tabulator/formatters/pdf.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: 
gnue-reports/src/adapters/filters/SimpleTabulation/tabulator/formatters/pdf.py
diff -c 
gnue-reports/src/adapters/filters/SimpleTabulation/tabulator/formatters/pdf.py:1.5
 
gnue-reports/src/adapters/filters/SimpleTabulation/tabulator/formatters/pdf.py:1.6
*** 
gnue-reports/src/adapters/filters/SimpleTabulation/tabulator/formatters/pdf.py:1.5
  Thu May 29 15:48:33 2003
--- 
gnue-reports/src/adapters/filters/SimpleTabulation/tabulator/formatters/pdf.py  
    Mon Sep 29 07:47:24 2003
***************
*** 46,55 ****
  from reportlab.lib.units import cm
  
  # Truetype font support
! from reportlab.pdfbase import pdfmetrics
! from reportlab.pdfbase.ttfonts import TTFont
! from reportlab.lib.fonts import addMapping
! 
  PAGE_WIDTH = defaultPageSize[0]
  PAGE_HEIGHT = defaultPageSize[1]
  
--- 46,59 ----
  from reportlab.lib.units import cm
  
  # Truetype font support
! try:
!   from reportlab.pdfbase import pdfmetrics
!   from reportlab.pdfbase.ttfonts import TTFont
!   from reportlab.lib.fonts import addMapping
!   ttf_supported = 1
! except ImportError:
!   ttf_supported = 0
!   
  PAGE_WIDTH = defaultPageSize[0]
  PAGE_HEIGHT = defaultPageSize[1]
  
***************
*** 94,99 ****
--- 98,106 ----
      self.loadFont(self.boldfont)
  
    def loadFont(self,name):
+     if not ttf_supported:
+       return
+     
      if font_to_filename.has_key(name):
        try:
          pdfmetrics.registerFont(TTFont(name, self.fontdir + \