checkin from browser
authorClaus Gittinger <cg@exept.de>
Tue, 04 Jun 1996 17:19:21 +0200
changeset 386 cebdfb2e9cf0
parent 385 67ac6014097c
child 387 bcd98f85086f
checkin from browser
PSPrStr.st
PostscriptPrinterStream.st
PrinterStream.st
--- a/PSPrStr.st	Tue Jun 04 17:15:02 1996 +0200
+++ b/PSPrStr.st	Tue Jun 04 17:19:21 1996 +0200
@@ -294,13 +294,13 @@
     ].
 
     TopInset isNil ifTrue:[
-        TopInset := 0.652778.  "/ inches
+        TopInset := 0.6.      "/ inches
     ].
     BottomInset isNil ifTrue:[
-        BottomInset := 1.18056 "/ inches
+        BottomInset := 1.2    "/ inches
     ].
     LeftInset isNil ifTrue:[
-        LeftInset := 0.625.     "/ inches
+        LeftInset := 0.6.     "/ inches
     ].
 
     "/     +-----------------------------------------------+  PageHeight
@@ -328,8 +328,13 @@
     TopY := PageHeight - (UnitConverter convert:TopInset from:#inch to:#twip) rounded.
     LinesPerPage := TopY - (UnitConverter convert:BottomInset from:#inch to:#twip) rounded // 200.
 
+    "
+     TopInset := LeftInset := BottomInset := nil.
+     self initPage
+    "
+
     "Modified: 30.5.1996 / 17:24:55 / ca"
-    "Modified: 3.6.1996 / 10:45:34 / cg"
+    "Modified: 4.6.1996 / 17:18:25 / cg"
 !
 
 initPageProlog
@@ -958,6 +963,6 @@
 !PostscriptPrinterStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/Attic/PSPrStr.st,v 1.36 1996-06-03 15:17:41 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/Attic/PSPrStr.st,v 1.37 1996-06-04 15:19:09 cg Exp $'
 ! !
 PostscriptPrinterStream initialize!
--- a/PostscriptPrinterStream.st	Tue Jun 04 17:15:02 1996 +0200
+++ b/PostscriptPrinterStream.st	Tue Jun 04 17:19:21 1996 +0200
@@ -294,13 +294,13 @@
     ].
 
     TopInset isNil ifTrue:[
-        TopInset := 0.652778.  "/ inches
+        TopInset := 0.6.      "/ inches
     ].
     BottomInset isNil ifTrue:[
-        BottomInset := 1.18056 "/ inches
+        BottomInset := 1.2    "/ inches
     ].
     LeftInset isNil ifTrue:[
-        LeftInset := 0.625.     "/ inches
+        LeftInset := 0.6.     "/ inches
     ].
 
     "/     +-----------------------------------------------+  PageHeight
@@ -328,8 +328,13 @@
     TopY := PageHeight - (UnitConverter convert:TopInset from:#inch to:#twip) rounded.
     LinesPerPage := TopY - (UnitConverter convert:BottomInset from:#inch to:#twip) rounded // 200.
 
+    "
+     TopInset := LeftInset := BottomInset := nil.
+     self initPage
+    "
+
     "Modified: 30.5.1996 / 17:24:55 / ca"
-    "Modified: 3.6.1996 / 10:45:34 / cg"
+    "Modified: 4.6.1996 / 17:18:25 / cg"
 !
 
 initPageProlog
@@ -958,6 +963,6 @@
 !PostscriptPrinterStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/PostscriptPrinterStream.st,v 1.36 1996-06-03 15:17:41 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/PostscriptPrinterStream.st,v 1.37 1996-06-04 15:19:09 cg Exp $'
 ! !
 PostscriptPrinterStream initialize!
--- a/PrinterStream.st	Tue Jun 04 17:15:02 1996 +0200
+++ b/PrinterStream.st	Tue Jun 04 17:19:21 1996 +0200
@@ -115,43 +115,48 @@
     ].
 
     PrintCommand isNil ifTrue:[
-	OperatingSystem isBSDlike ifTrue:[
-	    PrintCommand := 'lpr'
-	] ifFalse:[
-	    PrintCommand := 'lp'
-	]
+        OperatingSystem isBSDlike ifTrue:[
+            PrintCommand := 'lpr'
+        ] ifFalse:[
+            PrintCommand := 'lp'
+        ]
     ].
     LeftMargin isNil ifTrue:[
-	LeftMargin := 0
+        LeftMargin := 0
     ].
 
     DefaultPageFormats isNil ifTrue:[
     "/ UnitConverter must support all of them.
-	self defaultPageFormats:#(
-				    'letter'
-				    'a4'
-				    'a5'
-				    'a6'
-			       ).
+        self defaultPageFormats:#(
+                                    'letter'
+                                    'legal'
+                                    'ledger'
+                                    'a3'
+                                    'a4'
+                                    'a5'
+                                    'a6'
+                                    'b5'
+                               ).
     ].
 
     Landscape isNil ifTrue:[
-	Landscape := false
+        Landscape := false
     ].
 
     PageFormat isNil ifTrue:[
-	Language == #us ifTrue:[
-	    PageFormat := #letter
-	] ifFalse:[
-	    PageFormat := #a4
-	]
+        Language == #us ifTrue:[
+            PageFormat := #letter
+        ] ifFalse:[
+            PageFormat := #a4
+        ]
     ]
 
     "
+     DefaultPageFormats := nil.
      PrinterStream initialize
     "
 
-    "Modified: 1.6.1996 / 00:20:15 / cg"
+    "Modified: 4.6.1996 / 17:16:32 / cg"
 !
 
 reInitPage
@@ -749,6 +754,6 @@
 !PrinterStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/PrinterStream.st,v 1.34 1996-06-03 17:06:17 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/PrinterStream.st,v 1.35 1996-06-04 15:19:21 cg Exp $'
 ! !
 PrinterStream initialize!