[squeak-dev] The Trunk: MorphicExtras-ar.44.mcz

commits at source.squeak.org commits at source.squeak.org
Mon Aug 31 00:19:29 UTC 2009


Andreas Raab uploaded a new version of MorphicExtras to project The Trunk:
http://source.squeak.org/trunk/MorphicExtras-ar.44.mcz

==================== Summary ====================

Name: MorphicExtras-ar.44
Author: ar
Time: 30 August 2009, 5:18:50 am
UUID: 77556604-c907-714e-8d84-aacd322ed0ec
Ancestors: MorphicExtras-eem.43

FreeTypePlus integration. Fold extensions and overrides in CanvasCharacterScanner.

=============== Diff against MorphicExtras-eem.43 ===============

Item was changed:
  ----- Method: CanvasCharacterScanner>>tab (in category 'stop conditions') -----
  tab
  
+ 	destX _ (alignment == Justified and: [self leadingTab not])
- 	destX := (alignment == Justified and: [self leadingTab not])
  		ifTrue:		"imbedded tabs in justified text are weird"
  			[destX + (textStyle tabWidth - (line justifiedTabDeltaFor: spaceCount)) max: destX]
  		ifFalse: 
  			[textStyle nextTabXFrom: destX
  				leftMargin: leftMargin
  				rightMargin: rightMargin].
+ 	lastIndex _ lastIndex + 1.
+ 	pendingKernX := 0.
- 
- 	lastIndex := lastIndex + 1.
  	^ false!

Item was changed:
  ----- Method: CanvasCharacterScanner>>cr (in category 'stop conditions') -----
  cr
  	"When a carriage return is encountered, simply increment the pointer 
  	into the paragraph."
  
+ 	lastIndex_ lastIndex + 1.
+ 	pendingKernX := 0.
- 	lastIndex:= lastIndex + 1.
  	^false!

Item was changed:
  ----- Method: CanvasCharacterScanner>>paddedSpace (in category 'stop conditions') -----
  paddedSpace
  	"Each space is a stop condition when the alignment is right justified. 
  	Padding must be added to the base width of the space according to 
  	which space in the line this space is and according to the amount of 
  	space that remained at the end of the line when it was composed."
  
+ 	destX _ destX + spaceWidth + (line justifiedPadFor: spaceCount font: font).
+ 	lastIndex _ lastIndex + 1.
+ 	pendingKernX := 0.
- 	destX := destX + spaceWidth + (line justifiedPadFor: spaceCount).
- 
- 	lastIndex := lastIndex + 1.
  	^ false!




More information about the Squeak-dev mailing list