r6519 - in trunk/gnue-reports/src/adapters/filters/Char: base esc-p pcl5 text

[btami]

Author: btami
Date: 2004-10-20 05:50:23 -0500 (Wed, 20 Oct 2004)
New Revision: 6519

Modified:
   trunk/gnue-reports/src/adapters/filters/Char/base/Writer.py
   trunk/gnue-reports/src/adapters/filters/Char/esc-p/Writer.py
   trunk/gnue-reports/src/adapters/filters/Char/pcl5/Writer.py
   trunk/gnue-reports/src/adapters/filters/Char/text/Writer.py
Log:
more work on char filter

Modified: trunk/gnue-reports/src/adapters/filters/Char/base/Writer.py
===================================================================
--- trunk/gnue-reports/src/adapters/filters/Char/base/Writer.py 2004-10-20 
07:44:00 UTC (rev 6518)
+++ trunk/gnue-reports/src/adapters/filters/Char/base/Writer.py 2004-10-20 
10:50:23 UTC (rev 6519)
@@ -95,10 +95,11 @@
 
   def newPage(self):
     self.pageNumber += 1
-    self.output.write('\n  ' + 8*('%s' % 'o---------'))
     self.currLine = 0
     self.pageHeaderDone = False
     self.pageFooterDone = False
+    
+    self.newPageCmd()
 
 
   def newLine(self, n=1):
@@ -113,6 +114,5 @@
       self.PageHeader.process(self)
 
     for i in range(n):
-      self.output.write('\n')
+      self.output.write(self.newLineCmd())
       self.currLine += 1
-      self.output.write(str(self.currLine).rjust(2))

Modified: trunk/gnue-reports/src/adapters/filters/Char/esc-p/Writer.py
===================================================================
--- trunk/gnue-reports/src/adapters/filters/Char/esc-p/Writer.py        
2004-10-20 07:44:00 UTC (rev 6518)
+++ trunk/gnue-reports/src/adapters/filters/Char/esc-p/Writer.py        
2004-10-20 10:50:23 UTC (rev 6519)
@@ -39,7 +39,8 @@
     self.__underline = 0
 
   def reset(self):
-    return "\x1B@"
+    # reset, 10 CPI, draft(not NLQ)
+    return "address@hidden"
 
   def beginCondensed(self):
     self.__condensed = 1
@@ -77,3 +78,9 @@
     return "\x1B!" + chr(self.__condensed * 4 | self.__bold * 8 | \
                          self.__italic * 64 | self.__underline * 128)
 
+  def newLineCmd(self):
+    return "\r\n"
+
+  def newPageCmd(self):
+    return "\x0C"
+

Modified: trunk/gnue-reports/src/adapters/filters/Char/pcl5/Writer.py
===================================================================
--- trunk/gnue-reports/src/adapters/filters/Char/pcl5/Writer.py 2004-10-20 
07:44:00 UTC (rev 6518)
+++ trunk/gnue-reports/src/adapters/filters/Char/pcl5/Writer.py 2004-10-20 
10:50:23 UTC (rev 6519)
@@ -36,30 +36,38 @@
     pass
 
   def reset(self):
-    return ""
+    # reset, fixed font, 
+    return "\x1BE\x1B(s0P"
 
   def beginCondensed(self):
-    return ""
+    # 16.67 CPI
+    return "\x1B(s16.67H"
 
   def endCondensed(self):
-    return ""
+    # 10 CPI
+    return "\x1B(s10H"
 
   def beginBold(self):
-    return ""
+    return "\x1B(s3B"
 
   def endBold(self):
-    return ""
+    return "\x1B(s0B"
 
   def beginItalic(self):
-    return ""
+    return "\x1B(s1S"
 
   def endItalic(self):
-    return ""
+    return "\x1B(s0S"
 
   def beginUnderline(self):
-    return ""
+    return "\x1B&d1D"
 
   def endUnderline(self):
-    return ""
+    return "\x1B&d@"
 
+  def newLineCmd(self):
+    return "\r\n"
 
+  def newPageCmd(self):
+    return "\x1B&l0H"
+

Modified: trunk/gnue-reports/src/adapters/filters/Char/text/Writer.py
===================================================================
--- trunk/gnue-reports/src/adapters/filters/Char/text/Writer.py 2004-10-20 
07:44:00 UTC (rev 6518)
+++ trunk/gnue-reports/src/adapters/filters/Char/text/Writer.py 2004-10-20 
10:50:23 UTC (rev 6519)
@@ -62,4 +62,10 @@
   def endUnderline(self):
     return ""
 
+  def newLineCmd(self):
+    return "\n " + str(self.currLine).rjust(2)
+#    return "\n"
 
+  def newPageCmd(self):
+    return "'\n  ' + 8*('%s' % 'o---------')"
+#    return ""