Changeset 269

Timestamp:

09/29/05 12:05:32 (19 years ago)

Author:

jerome

Message:

Fixed some PJL escaping issues

Location:

pkpgcounter/trunk

Files:

• NEWS (modified) (1 diff)
• pkpgpdls/pcl345.py (modified) (1 diff)
• pkpgpdls/pclxl.py (modified) (1 diff)
• pkpgpdls/version.py (modified) (1 diff)

pkpgcounter/trunk/NEWS

@@ -22 +22 @@
 pkpgcounter News :
    
+  * 1.70 :
+  
+    - Fixed some PJL escaping issue in the PCLXL and PCL3/4/5 parsers.
+    
   * 1.69 :
   

pkpgcounter/trunk/pkpgpdls/pcl345.py

@@ -150 +150 @@
                     if minfile[pos : pos+8] == r"%-12345X" :
                         endpos = pos + 9
-                        while (minfile[endpos] not in endmark) and (minfile[endpos] < asciilimit) :
+                        quotes = 0
+                        while (minfile[endpos] not in endmark) and \
+                              ((minfile[endpos] < asciilimit) or (quotes % 2)) :
+                            if minfile[endpos] == '"' :
+                                quotes += 1
                             endpos += 1
                         self.setPageDict(pages, pagecount, "escaped", minfile[pos : endpos])

pkpgcounter/trunk/pkpgpdls/pclxl.py

@@ -259 +259 @@
             endmark = chr(0x0c) + chr(0x00) + chr(0x1b)
             asciilimit = chr(0x80)
-            while (self.minfile[endpos] not in endmark) and (self.minfile[endpos] < asciilimit) :
+            quotes = 0
+            while (self.minfile[endpos] not in endmark) and \
+                   ((self.minfile[endpos] < asciilimit) or (quotes % 2)) :
+                if self.minfile[endpos] == '"' :
+                    quotes += 1
                 endpos += 1
                 

pkpgcounter/trunk/pkpgpdls/version.py

@@ -20 +20 @@
 #
 
-__version__ = "1.69"
+__version__ = "1.70"
 
 __doc__ = """pkpgcounter : a generic Page Description Languages parser."""