gnue/reports setup.py src/adapters/filters/Stan...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/04/28 14:23:55

Modified files:
        reports        : setup.py 
        reports/src/adapters/filters/Standard/postscript: Writer.py 
Added files:
        reports/src/adapters/filters/Standard/Base: PageSizes.py 
Removed files:
        reports/src/adapters/filters/Standard/postscript/psutils: 
                                                                  
PSOutputStream.py 
        
reports/src/adapters/filters/Standard/postscript/psutils/GenericDefinitions: 
                                                                                
     PageSizes.py 

Log message:
        fixed setup.py; more cleanup

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/setup.py.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/Standard/Base/PageSizes.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/Standard/postscript/Writer.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/reports/setup.py
diff -c gnue/reports/setup.py:1.29 gnue/reports/setup.py:1.30
*** gnue/reports/setup.py:1.29  Wed Apr  2 03:42:44 2003
--- gnue/reports/setup.py       Mon Apr 28 14:23:55 2003
***************
*** 267,273 ****
                     "gnue.reports.adapters.filters.Standard.universal",
                     "gnue.reports.adapters.filters.Standard.Base",
                     "gnue.reports.adapters.filters.Standard.Base.Objects",
!                    "gnue.reports.adapters.filters.Standard.Base.psutils",
                     "gnue.reports.adapters.filters.Standard.Base.styles",
                     
"gnue.reports.adapters.filters.Standard.Base.styles.Objects",
                     "gnue.reports.adapters.filters.Standard.Base.Helpers",
--- 267,279 ----
                     "gnue.reports.adapters.filters.Standard.universal",
                     "gnue.reports.adapters.filters.Standard.Base",
                     "gnue.reports.adapters.filters.Standard.Base.Objects",
!                    "gnue.reports.adapters.filters.Standard.postscript",
!                    
"gnue.reports.adapters.filters.Standard.postscript.psutils",
!                    "gnue.reports.adapters.filters.Standard.pcl5",
!                    "gnue.reports.adapters.filters.Standard.html",
!                    "gnue.reports.adapters.filters.Standard.xhtml",
!                    "gnue.reports.adapters.filters.Standard.rtf",
!                    "gnue.reports.adapters.filters.Standard.lineprinter",
                     "gnue.reports.adapters.filters.Standard.Base.styles",
                     
"gnue.reports.adapters.filters.Standard.Base.styles.Objects",
                     "gnue.reports.adapters.filters.Standard.Base.Helpers",
Index: gnue/reports/src/adapters/filters/Standard/postscript/Writer.py
diff -c gnue/reports/src/adapters/filters/Standard/postscript/Writer.py:1.2 
gnue/reports/src/adapters/filters/Standard/postscript/Writer.py:1.3
*** gnue/reports/src/adapters/filters/Standard/postscript/Writer.py:1.2 Sat Apr 
26 00:57:50 2003
--- gnue/reports/src/adapters/filters/Standard/postscript/Writer.py     Mon Apr 
28 14:23:55 2003
***************
*** 47,63 ****
      from psutils.GenericDefinitions.Postscript2Driver import Postscript2Driver
      self.ppd = Postscript2Driver()
  
!     # TODO: send options to PPD
  
!     # Create an output stream
!     # TODO: Support level 1,2, or 3 output streams
!     self.psstream = PS2OutputStream(self.output, self.ppd)
  
!     # Initialize the PS stream
!     self.psstream.initialize()
  
    def finalize(self):
!     # Write any footers to file
!     self.psstream.finalize()
  
  
--- 47,147 ----
      from psutils.GenericDefinitions.Postscript2Driver import Postscript2Driver
      self.ppd = Postscript2Driver()
  
!     self.handle = handle
!     self.ppd = ppd
! 
!     self.__pages = 0
!     self.__inPage = 0
!     self.__currentStyle = None
!     self.__usedfonts = {}
  
!     # TODO: send options to PPD
  
!     self._writeHeader()
  
    def finalize(self):
!     # Close the current page, if applicable
!     if self.__inPage:
!       self.closePage()
! 
!     # Write out the postscript trailer
!     self.handle.write('%%Trailer\n')
!     self.handle.write('%%%%Pages: %s\n' % pages)
!     self.handle.write('%%EOF\n')
! 
!   def newPage(self):
!     # Close the current page, if applicable
!     if self.__inPage:
!       self.closePage()
! 
!     # Keep track of our page status
!     self.__inPage = 1
! 
!     # Set number of pages
!     self.__pages += 1
! 
!     self.handle.write('%%%%Page: %s %s\n' % (self.__pages, self.__pages))
!     self.handle.write('%%BeginPageSetup\n')
!     self.handle.write('/psave save def\n')
!     # Set default coordinates, etc
!     self.handle.write('%%EndPageSetup\n')
! 
!   def _closePage(self):
!     # Keep track of our page status
!     self.__inPage = 0
!     self.handle.write("psave restore\n")
!     self.handle.write("showpage\n")
! 
!   def _writeHeader(self):
!     self.handle.write(PS_HEADER)
! 
! PS_HEADER = """\
! %%!PS-Adobe-3.0
! %%%%Creator: GNUe Reports %(version)s
! %%%%Title: %(reporttitle)s
! %%%%CreationDate: %(date)s
! %%%%BoundingBox: %(bb1)s %(bb2)s %(bb3)s %(bb4)s
! %%%%LanguageLevel: 2
! %%%%Orientation: %(orientation)s
! %%%%Pages: (atend)
! %%%%DocumentNeededFonts: (atend)
! %%%%DocumentSuppliedFonts: (atend)
! %%%%DocumentData: Clean7Bit
! %%%%EndComments
! %%%%BeginProlog
! %% This copyright applies to everything between here and the %%%%EndProlog:
! %% Copyright (C) 2003 Free Software Foundation.  All rights reserved.
! %% This code section is subject to the GPL version 2.0.
! %%%%BeginResource: procset GNUeReports_Standard_ProcSet %(procsetversion)s 0
! /GNUeReports_Standard_ProcSet 40 dict dup begin
! %%%%EndProlog
! """
! 
! 
! #########################################################
! #
! # Define our standard PS procset (procedure toolkit).
! # We do it in a dictionary instead of inside the PS_HEADER
! # so that we can have more room to write, comment, etc.
! # This way, we can write a compacted version to the output
! # stream, but code in a more readable format.  The code
! # adds the necessary 'Proc { <code> } def' wrapper.
! #
! _PROCSET = {
! #
! # SetFont
! # Syntax:  <fontname> Ft
! #
! 'Ft' : ( 'SetFont', """
! findfont
! """),
  
+ #
+ # NewPage
+ # Syntax:  Np
+ #
+ 'Np' : ( 'NewPage', """
+ newpage
+ """),
  
+ }