Reverted to gs-9.10 due to severe bugs reported by Ulrike and Heiko.

git-svn-id: svn://tug.org/texlive/trunk@33453 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 13 insertions, 36 deletions

diff --git a/Master/tlpkg/tlgs/lib/PDFA_def.ps b/Master/tlpkg/tlgs/lib/PDFA_def.ps
index f0ff0d1b6f9..3923d5fb21a 100644
--- a/Master/tlpkg/tlgs/lib/PDFA_def.ps
+++ b/Master/tlpkg/tlgs/lib/PDFA_def.ps
@@ -1,31 +1,22 @@
 %!
 % This is a sample prefix file for creating a PDF/A document.
 % Feel free to modify entries marked with "Customize".
+
 % This assumes an ICC profile to reside in the file (ISO Coated sb.icc),
 % unless the user modifies the corresponding line below.
 
 % Define entries in the document Info dictionary :
-/ICCProfile (srgb.icc) % Customise
+
+/ICCProfile (ISO Coated sb.icc)   % Customize.
 def
 
-[ /Title (Title)       % Customise
+[ /Title (Title)                  % Customize.
   /DOCINFO pdfmark
 
 % Define an ICC profile :
 
 [/_objdef {icc_PDFA} /type /stream /OBJ pdfmark
-[{icc_PDFA}
-<<
-  /N currentpagedevice /ProcessColorModel known {
-    currentpagedevice /ProcessColorModel get dup /DeviceGray eq
-    {pop 1} {
-      /DeviceRGB eq
-      {3}{4} ifelse
-    } ifelse
-  } {
-    (ERROR, unable to determine ProcessColorModel) == flush
-  } ifelse
->> /PUT pdfmark
+[{icc_PDFA} <</N systemdict /ProcessColorModel get /DeviceGray eq {1} {4} ifelse >> /PUT pdfmark
 [{icc_PDFA} ICCProfile (r) file /PUT pdfmark
 
 % Define the output intent dictionary :
@@ -35,6 +26,6 @@ def
   /Type /OutputIntent             % Must be so (the standard requires).
   /S /GTS_PDFA1                   % Must be so (the standard requires).
   /DestOutputProfile {icc_PDFA}            % Must be so (see above).
-  /OutputConditionIdentifier (sRGB)      % Customize
+  /OutputConditionIdentifier (CGATS TR001)      % Customize
 >> /PUT pdfmark
 [{Catalog} <</OutputIntents [ {OutputIntent_PDFA} ]>> /PUT pdfmark
diff --git a/Master/tlpkg/tlgs/lib/opdfread.ps b/Master/tlpkg/tlgs/lib/opdfread.ps
index 6ef1564ea5a..ebb7caaaaca 100644
--- a/Master/tlpkg/tlgs/lib/opdfread.ps
+++ b/Master/tlpkg/tlgs/lib/opdfread.ps
@@ -742,7 +742,7 @@ currentdict end readonly def
         copypage
       } repeat
     } if
-    EPS2Write not {showpage} if
+    showpage
   } if
 } bind def
 
@@ -896,27 +896,13 @@ currentdict end readonly def
       0 0                                               % dummy page size values if not known
     }ifelse
                                                         % bw bh px0 py0 bw bh bool bw bh Width Height
-    round cvi 2 index round cvi eq                      % bw bh px0 py0 bw bh bool bw bh Width bool
+    round cvi 2 index round cvi                         % bw bh px0 py0 bw bh bool bw bh Width bool
     exch round cvi 3 index round cvi eq and             % bw bh px0 py0 bw bh bool bw bh bool
     {                                                   % Page Size unchanged, do not emit setpagedevice
       pop pop                                           % bw bh px0 py0 bw bh bool
     } {
-      /MediaRequested where {
-                                                        % bw bh px0 py0 bw bh
-        /MediaRequested get aload pop                   % bw bh px0 py0 bw bh Width Height
-        round cvi 2 index round cvi eq                  % bw bh px0 py0 bw bh bool bw bh Width bool
-        exch round cvi 3 index round cvi eq and         % bw bh px0 py0 bw bh bool bw bh bool
-        {pop pop false}                                         % We already requested this media size, so don't re-request
-        {true} ifelse                                   % Media request different to last request
-      } {
-        true                                            % No stored media request, so apply setpagedevice
-      } ifelse
-      {
-        2 array astore                                    % bw bh px0 py0 bw bh bool []
-        dup /MediaRequested exch def
-        << exch /PageSize exch >> setpagedevice           % bw bh px0 py0 bw bh bool
-        /pagesave save def
-      } if
+      2 array astore                                    % bw bh px0 py0 bw bh bool []
+      << exch /PageSize exch >> setpagedevice           % bw bh px0 py0 bw bh bool
     } ifelse
     userdict /PDFR_InitialGS gstate put
     setglobal                                           % bw bh px0 py0 bw bh
@@ -985,7 +971,7 @@ currentdict end readonly def
   1 index exch /Context exch put                        % id obj
   dup /ImmediateExec true put
   dup /IsPage true put
-  SetPageSize {dup /Context get //SetupPageView exec} if
+  dup /Context get //SetupPageView exec
 } bind def
 
 /FontFileDaemon % <id> <obj> <font_descriptor> FontFileDaemon <id> <obj>
diff --git a/Master/tlpkg/tlgs/lib/ps2epsi.ps b/Master/tlpkg/tlgs/lib/ps2epsi.ps
index 35c203a85c6..cc308ae484d 100644
--- a/Master/tlpkg/tlgs/lib/ps2epsi.ps
+++ b/Master/tlpkg/tlgs/lib/ps2epsi.ps
@@ -190,8 +190,8 @@ ps2edict begin
          epsifile (\n) writestring
      epsifile flushfile
 
-        epsifile BBoxString writestring epsifile (\n) writestring
-        epsifile HiresBBoxString writestring epsifile (\n) writestring
+        epsifile BBoxString writestring epsifile (\r) writestring
+        epsifile HiresBBoxString writestring epsifile (\r) writestring
 
     % Define character and bit widths for the output line buffer:
      /cwidth rm lm sub 1 add def