--- a/WinPrinterContext.st	Thu Jan 05 21:05:26 2017 +0000
+++ b/WinPrinterContext.st	Sat Jan 07 17:09:43 2017 +0000
@@ -2273,11 +2273,11 @@
 		goto ret;
 	    }
 
-	    cp = _stringVal(aString);
+	    cp = __stringVal(aString);
 	    l = i2 - i1 + 1;
 
 	    if ((cls == @global(String)) || (cls == @global(Symbol))) {
-		n = _stringSize(aString);
+		n = __stringSize(aString);
 		if (i2 < n) {
 		    cp += i1;
 		    DPRINTF(("string1: %s pos=%d/%d l=%d hDC=%x\n", cp, pX, pY,l,hDC));
@@ -2376,11 +2376,11 @@
 		goto ret;
 	    }
 
-	    cp = _stringVal(aString);
+	    cp = __stringVal(aString);
 	    l = i2 - i1 + 1;
 
 	    if ((cls == @global(String)) || (cls == @global(Symbol))) {
-		n = _stringSize(aString);
+		n = __stringSize(aString);
 		if (i2 < n) {
 		    cp += i1;
 		    DPRINTF(("string1: %s pos=%d/%d l=%d hDC=%x\n", cp, pX, pY,l,hDC));
@@ -4799,11 +4799,11 @@
 		RETURN ( __MKSMALLINT( 0 ) );
 	    }
 
-	    cp = (char *) _stringVal(aString);
+	    cp = (char *) __stringVal(aString);
 	    l = i2 - i1 + 1;
 
 	    if ((cls == @global(String)) || (cls == @global(Symbol))) {
-		n = _stringSize(aString);
+		n = __stringSize(aString);
     commonWidthChars:
 		if (i2 < n) {
 		    cp += i1;
@@ -5627,29 +5627,29 @@
     |docInfoStruct nameAddress fileNameAddress|
 
     self gcId isNil ifTrue:[
-        self buildPrinter
+	self buildPrinter
     ].
     abort := false.
     title := aString ? 'Smalltalk/X'.
     nameAddress := title asExternalBytes unprotectFromGC.
     aFileName isNil ifFalse:[
-        fileNameAddress := aFileName pathName asExternalBytes unprotectFromGC
+	fileNameAddress := aFileName pathName asExternalBytes unprotectFromGC
     ].
     docInfoStruct := Win32OperatingSystem::DocInfoStructure new.
     docInfoStruct
-        cbSize:docInfoStruct sizeInBytes;
-        lpszDocName:nameAddress address.
+	cbSize:docInfoStruct sizeInBytes;
+	lpszDocName:nameAddress address.
     fileNameAddress isNil ifFalse:[
-        docInfoStruct lpszOutput:fileNameAddress address
+	docInfoStruct lpszOutput:fileNameAddress address
     ].
     jobid := OperatingSystem startDoc:self gcId docInfo:docInfoStruct.
     jobid > 0 ifFalse:[
-        jobid = -1 ifTrue:[
-            abort := true.
-            ^ nil
-        ].
+	jobid = -1 ifTrue:[
+	    abort := true.
+	    ^ nil
+	].
 "/        ^ self error
-        OpenError raiseErrorString:'Cannot create printer job'.
+	OpenError raiseErrorString:'Cannot create printer job'.
     ].
     self startPage
 
@@ -5848,8 +5848,8 @@
 
 scale:scale translation:aPoint
     self
-        translation:aPoint;
-        scale:scale.
+	translation:aPoint;
+	scale:scale.
 !
 
 transformation
@@ -6089,7 +6089,7 @@
     printPageNumbers := true.
 
     Language == #de ifTrue:[ pageNumberFormat := 'Seite %1' ]
-                   ifFalse:[ pageNumberFormat := 'page %1'  ].
+		   ifFalse:[ pageNumberFormat := 'page %1'  ].
 ! !
 
 !WinPrinterContext::WinPrinterGraphicContext methodsFor:'printing process'!
@@ -6121,21 +6121,21 @@
     |s|
 
     needsEndOfPage ifFalse:[
-        ^ self
+	^ self
     ].
     needsEndOfPage := false.
 
     printPageNumbers == true ifTrue:[
-        self displayTitleDo:[
-            self displayString:title
+	self displayTitleDo:[
+	    self displayString:title
                  x:(self extent x - (self font widthOf:title)) // 2
                  y:(self extent y + (self font ascent)).
 
-            s := pageNumberFormat bindWith:pageCounter.
-            self displayString:s
+	    s := pageNumberFormat bindWith:pageCounter.
+	    self displayString:s
 			     x:(self extent x - (self font widthOf:s))
 			     y:(self extent y + (self font ascent)).
-        ]
+	]
     ].
     super endPage.
 !
@@ -6172,4 +6172,3 @@
 version_CVS
     ^ '$Header$'
 ! !
-