Packages September 2013

packages@lists.squeakfoundation.org

1 participants
423 discussions

The Trunk: Graphics-nice.234.mcz
by commits＠source.squeak.org 28 Sep '13

28 Sep '13

Nicolas Cellier uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-nice.234.mcz ==================== Summary ==================== Name: Graphics-nice.234 Author: nice Time: 28 September 2013, 3:05:03.082 pm UUID: a6f7b246-719d-441c-b082-9f627559e4a5 Ancestors: Graphics-nice.233 The scan* methods should not devise if font isNil isFontSet or whatever. Tell don't ask... They can legitimately assume that the font was correctly set, and should mind their own business. =============== Diff against Graphics-nice.233 =============== Item was changed: ----- Method: CharacterScanner>>scanJapaneseCharactersFrom:to:in:rightX:stopConditions:kern: (in category 'scanner methods') ----- scanJapaneseCharactersFrom: startIndex to: stopIndex in: sourceString rightX: rightX stopConditions: stops kern: kernDelta + | ascii encoding nextDestX startEncoding | - | ascii encoding f nextDestX startEncoding | lastIndex := startIndex. lastIndex > stopIndex ifTrue: [lastIndex := stopIndex. ^ stops endOfRun]. startEncoding := (sourceString at: startIndex) leadingChar. - font ifNil: [font := (TextConstants at: #DefaultMultiStyle) fontArray at: 1]. - font isFontSet ifTrue: [ - f := font fontArray at: startEncoding + 1. - spaceWidth := f widthOf: Space. - ]. - [lastIndex <= stopIndex] whileTrue: [ encoding := (sourceString at: lastIndex) leadingChar. encoding ~= startEncoding ifTrue: [lastIndex := lastIndex - 1. ^ stops endOfRun]. ascii := (sourceString at: lastIndex) charCode. (encoding = 0 and: [ascii < 256 and:[(stops at: ascii + 1) notNil]]) ifTrue: [^ stops at: ascii + 1]. nextDestX := destX + (font widthOf: (sourceString at: lastIndex)). nextDestX > rightX ifTrue: [^ stops crossedX]. destX := nextDestX + kernDelta. "destX printString displayAt: 0@(lastIndex*20)." lastIndex := lastIndex + 1. ]. lastIndex := stopIndex. ^ stops endOfRun! Item was changed: ----- Method: CharacterScanner>>scanMultiCharactersFrom:to:in:rightX:stopConditions:kern: (in category 'scanning') ----- scanMultiCharactersFrom: startIndex to: stopIndex in: sourceString rightX: rightX stopConditions: stops kern: kernDelta + | ascii encoding nextDestX startEncoding | - | ascii encoding f nextDestX startEncoding | lastIndex := startIndex. lastIndex > stopIndex ifTrue: [lastIndex := stopIndex. ^ stops endOfRun]. startEncoding := (sourceString at: startIndex) leadingChar. - font ifNil: [font := (TextConstants at: #DefaultMultiStyle) fontArray at: 1]. - font isFontSet ifTrue: [ - f := font fontArray at: startEncoding + 1. - spaceWidth := f widthOf: Space. - ]. - [lastIndex <= stopIndex] whileTrue: [ encoding := (sourceString at: lastIndex) leadingChar. encoding ~= startEncoding ifTrue: [lastIndex := lastIndex - 1. ^ stops endOfRun]. ascii := (sourceString at: lastIndex) charCode. (encoding = 0 and: [ascii < 256 and:[(stops at: ascii + 1) notNil]]) ifTrue: [^ stops at: ascii + 1]. nextDestX := destX + (font widthOf: (sourceString at: lastIndex)). nextDestX > rightX ifTrue: [^ stops crossedX]. destX := nextDestX + kernDelta. "destX printString displayAt: 0@(lastIndex*20)." lastIndex := lastIndex + 1. ]. lastIndex := stopIndex. ^ stops endOfRun!

1 0

The Trunk: Multilingual-nice.180.mcz
by commits＠source.squeak.org 28 Sep '13

28 Sep '13

Nicolas Cellier uploaded a new version of Multilingual to project The Trunk: http://source.squeak.org/trunk/Multilingual-nice.180.mcz ==================== Summary ==================== Name: Multilingual-nice.180 Author: nice Time: 28 September 2013, 3:03:15.862 pm UUID: d6b37780-f157-4e5c-b555-e33e4d8d7e2c Ancestors: Multilingual-nice.179 More cleanups: 1) the scan* should not devise if font isNil isFontSet or whatever. Tell don't ask... They can legitimately assume that the font was correctly set, and should mind their own business. 2) remove accesses to inst. var. firstDestX. It can be replaced with leftMargin, they should in no case differ. There is one last inst. var. difference with CharacterScanner: lastWidth (just for Combining unicode) =============== Diff against Multilingual-nice.179 =============== Item was changed: ----- Method: MultiCharacterBlockScanner>>scanMultiCharactersCombiningFrom:to:in:rightX:stopConditions:kern: (in category 'scanning') ----- scanMultiCharactersCombiningFrom: startIndex to: stopIndex in: sourceString rightX: rightX stopConditions: stops kern: kernDelta + | encoding nextDestX startEncoding char charValue floatDestX widthAndKernedWidth nextChar | - | encoding f nextDestX startEncoding char charValue floatDestX widthAndKernedWidth nextChar | lastIndex := startIndex. lastIndex > stopIndex ifTrue: [lastIndex := stopIndex. ^ stops endOfRun]. startEncoding := (sourceString at: startIndex) leadingChar. - font ifNil: [font := (TextConstants at: #DefaultMultiStyle) fontArray at: 1]. - font isFontSet ifTrue: [ - f := [font fontArray at: startEncoding + 1] ifError: [font fontArray at: 1]. - spaceWidth := f widthOf: Space. - ]. floatDestX := destX. widthAndKernedWidth := Array new: 2. [lastIndex <= stopIndex] whileTrue: [ encoding := (sourceString at: lastIndex) leadingChar. encoding ~= startEncoding ifTrue: [lastIndex := lastIndex - 1. ^ stops endOfRun]. char := (sourceString at: lastIndex). charValue := char charCode. (encoding = 0 and: [charValue < 256 and: [(stops at: charValue + 1) ~~ nil]]) ifTrue: [ ^ stops at: charValue + 1 ]. nextChar := (lastIndex + 1 <= stopIndex) ifTrue:[sourceString at: lastIndex + 1] ifFalse:[nil]. font widthAndKernedWidthOfLeft: ((char isMemberOf: CombinedChar) ifTrue:[char base] ifFalse:[char]) right: nextChar into: widthAndKernedWidth. nextDestX := floatDestX + (widthAndKernedWidth at: 1). nextDestX > rightX ifTrue: [^ stops crossedX]. floatDestX := floatDestX + kernDelta + (widthAndKernedWidth at: 2). destX := floatDestX. lastIndex := lastIndex + 1. ]. lastIndex := stopIndex. ^ stops endOfRun! Item was changed: ----- Method: MultiCharacterScanner>>scanJapaneseCharactersFrom:to:in:rightX:stopConditions:kern: (in category 'scanner methods') ----- scanJapaneseCharactersFrom: startIndex to: stopIndex in: sourceString rightX: rightX stopConditions: stops kern: kernDelta + | ascii encoding nextDestX startEncoding | - | ascii encoding f nextDestX startEncoding | lastIndex := startIndex. lastIndex > stopIndex ifTrue: [lastIndex := stopIndex. ^ stops endOfRun]. startEncoding := (sourceString at: startIndex) leadingChar. - font ifNil: [font := (TextConstants at: #DefaultMultiStyle) fontArray at: 1]. - font isFontSet ifTrue: [ - f := [font fontArray at: startEncoding + 1] ifError: [font fontArray at: 1]. - spaceWidth := f widthOf: Space. - ] ifFalse: [ - (font isMemberOf: HostFont) ifTrue: [ - f := font. - spaceWidth := f widthOf: Space. - ]. - ]. [lastIndex <= stopIndex] whileTrue: [ encoding := (sourceString at: lastIndex) leadingChar. encoding ~= startEncoding ifTrue: [lastIndex := lastIndex - 1. ^ stops endOfRun]. ascii := (sourceString at: lastIndex) charCode. (encoding = 0 and: [ascii < 256 and:[(stops at: ascii + 1) notNil]]) ifTrue: [^ stops at: ascii + 1]. (self isBreakableAt: lastIndex in: sourceString in: (EncodedCharSet charsetAt: encoding)) ifTrue: [ self registerBreakableIndex. ]. nextDestX := destX + (font widthOf: (sourceString at: lastIndex)). + nextDestX > rightX ifTrue: [leftMargin ~= destX ifTrue: [^ stops crossedX]]. - nextDestX > rightX ifTrue: [firstDestX ~= destX ifTrue: [^ stops crossedX]]. destX := nextDestX + kernDelta. lastIndex := lastIndex + 1. ]. lastIndex := stopIndex. ^ stops endOfRun! Item was changed: ----- Method: MultiCharacterScanner>>scanMultiCharactersCombiningFrom:to:in:rightX:stopConditions:kern: (in category 'scanner methods') ----- scanMultiCharactersCombiningFrom: startIndex to: stopIndex in: sourceString rightX: rightX stopConditions: stops kern: kernDelta "appears to be unused" + | charCode encoding startEncoding combining combined combiningIndex c | - | charCode encoding f startEncoding combining combined combiningIndex c | lastIndex := startIndex. lastIndex > stopIndex ifTrue: [lastIndex := stopIndex. ^ stops endOfRun]. startEncoding := (sourceString at: startIndex) leadingChar. - font ifNil: [font := (TextConstants at: #DefaultMultiStyle) fontArray at: 1]. - font isFontSet ifTrue: [ - f := [font fontArray at: startEncoding + 1] ifError: [font fontArray at: 1]. - ]. - - spaceWidth := font widthOf: Space. combining := nil. [lastIndex <= stopIndex] whileTrue: [ charCode := (sourceString at: lastIndex) charCode. c := (sourceString at: lastIndex). combining ifNil: [ combining := CombinedChar new. combining add: c. combiningIndex := lastIndex. lastIndex := lastIndex + 1. ] ifNotNil: [ (combining add: c) ifFalse: [ self addCharToPresentation: (combined := combining combined). combining := CombinedChar new. combining add: c. charCode := combined charCode. encoding := combined leadingChar. encoding ~= startEncoding ifTrue: [lastIndex := lastIndex - 1. (encoding = 0 and: [charCode < 256 and:[(stops at: charCode + 1) notNil]]) ifTrue: [ ^ stops at: charCode + 1 ] ifFalse: [ ^ stops endOfRun ]. ]. (encoding = 0 and: [charCode < 256 and:[(stops at: charCode + 1) notNil]]) ifTrue: [ combining ifNotNil: [ self addCharToPresentation: (combining combined). ]. ^ stops at: charCode + 1 ]. destX > rightX ifTrue: [ + destX ~= leftMargin ifTrue: [ - destX ~= firstDestX ifTrue: [ lastIndex := combiningIndex. self removeLastCharFromPresentation. ^ stops crossedX]]. combiningIndex := lastIndex. lastIndex := lastIndex + 1. ] ifTrue: [ lastIndex := lastIndex + 1. ]. ]. ]. lastIndex := stopIndex. combining ifNotNil: [ combined := combining combined. self addCharToPresentation: combined. ]. ^ stops endOfRun! Item was changed: ----- Method: MultiCharacterScanner>>scanMultiCharactersFrom:to:in:rightX:stopConditions:kern: (in category 'scanning') ----- scanMultiCharactersFrom: startIndex to: stopIndex in: sourceString rightX: rightX stopConditions: stops kern: kernDelta + | ascii encoding nextDestX startEncoding floatDestX widthAndKernedWidth nextChar atEndOfRun | - | ascii encoding f nextDestX startEncoding floatDestX widthAndKernedWidth nextChar atEndOfRun | lastIndex := startIndex. lastIndex > stopIndex ifTrue: [lastIndex := stopIndex. ^ stops endOfRun]. startEncoding := (sourceString at: startIndex) leadingChar. - font ifNil: [font := (TextConstants at: #DefaultMultiStyle) fontArray at: 1]. - font isFontSet ifTrue: [ - f := [font fontArray at: startEncoding + 1] ifError: [font fontArray at: 1]. - spaceWidth := f widthOf: Space. - ]. floatDestX := destX. widthAndKernedWidth := Array new: 2. atEndOfRun := false. [lastIndex <= stopIndex] whileTrue: [ encoding := (sourceString at: lastIndex) leadingChar. encoding ~= startEncoding ifTrue: [lastIndex := lastIndex - 1. ^ stops endOfRun]. ascii := (sourceString at: lastIndex) charCode. (ascii < 256 and: [(stops at: ascii + 1) ~~ nil]) ifTrue: [^ stops at: ascii + 1]. nextChar := (lastIndex + 1 <= stopIndex) ifTrue:[sourceString at: lastIndex + 1] ifFalse:[ atEndOfRun := true. "if there is a next char in sourceString, then get the kern and store it in pendingKernX" lastIndex + 1 <= sourceString size ifTrue:[sourceString at: lastIndex + 1] ifFalse:[ nil]]. font widthAndKernedWidthOfLeft: (sourceString at: lastIndex) right: nextChar into: widthAndKernedWidth. nextDestX := floatDestX + (widthAndKernedWidth at: 1). + nextDestX > rightX ifTrue: [destX ~= leftMargin ifTrue: [^stops crossedX]]. - nextDestX > rightX ifTrue: [destX ~= firstDestX ifTrue: [^stops crossedX]]. floatDestX := floatDestX + kernDelta + (widthAndKernedWidth at: 2). atEndOfRun ifTrue:[ pendingKernX := (widthAndKernedWidth at: 2) - (widthAndKernedWidth at: 1). floatDestX := floatDestX - pendingKernX]. destX := floatDestX . lastIndex := lastIndex + 1. ]. lastIndex := stopIndex. ^ stops endOfRun! Item was changed: ----- Method: MultiCompositionScanner>>composeFrom:inRectangle:firstLine:leftSide:rightSide: (in category 'scanning') ----- composeFrom: startIndex inRectangle: lineRectangle firstLine: firstLine leftSide: leftSide rightSide: rightSide "Answer an instance of TextLineInterval that represents the next line in the paragraph." | runLength stopCondition | "Set up margins" leftMargin := lineRectangle left. leftSide ifTrue: [leftMargin := leftMargin + (firstLine ifTrue: [textStyle firstIndent] ifFalse: [textStyle restIndent])]. destX := spaceX := leftMargin. - firstDestX := destX. rightMargin := lineRectangle right. rightSide ifTrue: [rightMargin := rightMargin - textStyle rightIndent]. lastIndex := startIndex. "scanning sets last index" destY := lineRectangle top. lineHeight := baseline := 0. "Will be increased by setFont" self setStopConditions. "also sets font" runLength := text runLengthFor: startIndex. runStopIndex := (lastIndex := startIndex) + (runLength - 1). line := (TextLine start: lastIndex stop: 0 internalSpaces: 0 paddingWidth: 0) rectangle: lineRectangle. spaceCount := 0. breakAtSpace := false. self handleIndentation. leftMargin := destX. line leftMargin: leftMargin. [stopCondition := self scanCharactersFrom: lastIndex to: runStopIndex in: text string rightX: rightMargin stopConditions: stopConditions kern: kern. "See setStopConditions for stopping conditions for composing." self perform: stopCondition] whileFalse. ^ line lineHeight: lineHeight + textStyle leading baseline: baseline + textStyle leading! Item was changed: ----- Method: MultiDisplayScanner>>scanMultiCharactersCombiningFrom:to:in:rightX:stopConditions:kern: (in category 'multilingual scanning') ----- scanMultiCharactersCombiningFrom: startIndex to: stopIndex in: sourceString rightX: rightX stopConditions: stops kern: kernDelta + | encoding nextDestX startEncoding char charValue | - | encoding f nextDestX startEncoding char charValue | lastIndex := startIndex. lastIndex > stopIndex ifTrue: [lastIndex := stopIndex. ^ stops endOfRun]. startEncoding := (sourceString at: startIndex) leadingChar. - font ifNil: [font := (TextConstants at: #DefaultMultiStyle) fontArray at: 1]. - font isFontSet ifTrue: [ - f := [font fontArray at: startEncoding + 1] ifError: [font fontArray at: 1]. - spaceWidth := f widthOf: Space. - ]. - [lastIndex <= stopIndex] whileTrue: [ encoding := (sourceString at: lastIndex) leadingChar. encoding ~= startEncoding ifTrue: [lastIndex := lastIndex - 1. ^ stops endOfRun]. char := (sourceString at: lastIndex). charValue := char charCode. (encoding = 0 and: [charValue < 256 and:[(stops at: charValue + 1) notNil]]) ifTrue: [^stops at: charValue + 1]. nextDestX := destX + (font widthOf: char). nextDestX > rightX ifTrue: [^ stops crossedX]. destX := nextDestX + kernDelta. lastIndex := lastIndex + 1. ]. lastIndex := stopIndex. ^ stops endOfRun!

1 0

The Trunk: Multilingual-nice.180.mcz
by commits＠source.squeak.org 28 Sep '13

28 Sep '13

1 0

The Trunk: Multilingual-nice.180.mcz
by commits＠source.squeak.org 28 Sep '13

28 Sep '13

1 0

The Trunk: Multilingual-nice.179.mcz
by commits＠source.squeak.org 27 Sep '13

27 Sep '13

Nicolas Cellier uploaded a new version of Multilingual to project The Trunk: http://source.squeak.org/trunk/Multilingual-nice.179.mcz ==================== Summary ==================== Name: Multilingual-nice.179 Author: nice Time: 27 September 2013, 10:50:01.56 pm UUID: db50e584-fe6f-4a0c-b200-72b2e6074e5c Ancestors: Multilingual-nice.178 Remove usage of baselineY inst. var. (I did not removed the inst var yet). The inst var. where always computed where used, so it can become temp. This makes one difference less with CharacterScanner hierarchy. =============== Diff against Multilingual-nice.178 =============== Item was changed: ----- Method: MultiCanvasCharacterScanner>>setFont (in category 'private') ----- setFont + | baselineY | foregroundColor ifNil: [foregroundColor := Color black]. super setFont. baselineY := lineY + line baseline. destY := baselineY - font ascent.! Item was changed: ----- Method: MultiCharacterBlockScanner>>cr (in category 'stop conditions') ----- cr "Answer a CharacterBlock that specifies the current location of the mouse relative to a carriage return stop condition that has just been encountered. The ParagraphEditor convention is to denote selections by CharacterBlocks, sometimes including the carriage return (cursor is at the end) and sometimes not (cursor is in the middle of the text)." ((characterIndex ~= nil and: [characterIndex > text size]) or: [(line last = text size) and: [(destY + line lineHeight) < characterPoint y]]) ifTrue: ["When off end of string, give data for next character" destY := destY + line lineHeight. - baselineY := line lineHeight. lastCharacter := nil. characterPoint := (nextLeftMargin ifNil: [leftMargin]) @ destY. (lastIndex < text size and: [(text at: lastIndex) = CR and: [(text at: lastIndex+1) = Character lf]]) ifTrue: [lastIndex := lastIndex + 2] ifFalse: [lastIndex := lastIndex + 1]. self lastCharacterExtentSetX: 0. ^ true]. lastCharacter := CR. characterPoint := destX @ destY. self lastCharacterExtentSetX: rightMargin - destX. ^true! Item was changed: ----- Method: MultiCharacterScanner>>measureString:inFont:from:to: (in category 'scanning') ----- measureString: aString inFont: aFont from: startIndex to: stopIndex "WARNING: In order to use this method the receiver has to be set up using #initializeStringMeasurer" destX := destY := lastIndex := 0. - baselineY := aFont ascent. font := aFont. pendingKernX := 0. kern := 0 - font baseKern. spaceWidth := font widthOf: Space. self scanCharactersFrom: startIndex to: stopIndex in: aString rightX: 999999 stopConditions: stopConditions kern: kern. ^destX! Item was changed: ----- Method: MultiDisplayScanner>>displayLine:offset:leftInRun: (in category 'scanning') ----- displayLine: textLine offset: offset leftInRun: leftInRun "The call on the primitive (scanCharactersFrom:to:in:rightX:) will be interrupted according to an array of stop conditions passed to the scanner at which time the code to handle the stop condition is run and the call on the primitive continued until a stop condition returns true (which means the line has terminated). leftInRun is the # of characters left to scan in the current run; when 0, it is time to call setStopConditions." + | stopCondition nowLeftInRun startIndex string lastPos baselineY | - | stopCondition nowLeftInRun startIndex string lastPos | line := textLine. morphicOffset := offset. lineY := line top + offset y. lineHeight := line lineHeight. rightMargin := line rightMargin + offset x. lastIndex := line first. leftInRun <= 0 ifTrue: [self setStopConditions]. leftMargin := (line leftMarginForAlignment: alignment) + offset x. destX := runX := leftMargin. fillBlt == nil ifFalse: ["Not right" fillBlt destX: line left destY: lineY width: line width left height: lineHeight; copyBits]. lastIndex := line first. leftInRun <= 0 ifTrue: [nowLeftInRun := text runLengthFor: lastIndex] ifFalse: [nowLeftInRun := leftInRun]. baselineY := lineY + line baseline. destY := baselineY - font ascent. runStopIndex := lastIndex + (nowLeftInRun - 1) min: line last. spaceCount := 0. string := text string. [ startIndex := lastIndex. lastPos := destX@destY. stopCondition := self scanCharactersFrom: lastIndex to: runStopIndex in: string rightX: rightMargin stopConditions: stopConditions kern: kern. lastIndex >= startIndex ifTrue:[ bitBlt displayString: string from: startIndex "XXXX: The following is an interesting bug. All stopConditions exept #endOfRun have lastIndex past the last character displayed. #endOfRun sets it *on* the character. If we display up until lastIndex then we will also display invisible characters like CR and tab. This problem should be fixed in the scanner (i.e., position lastIndex consistently) but I don't want to deal with the fallout right now so we keep the fix minimally invasive." to: (stopCondition == #endOfRun ifTrue:[lastIndex] ifFalse:[lastIndex-1]) at: lastPos kern: kern baselineY: baselineY font: font]. (emphasisCode allMask: 4) ifTrue:[ font displayUnderlineOn: bitBlt from: lastPos x@baselineY to: destX@baselineY. ]. (emphasisCode allMask: 16) ifTrue:[ font displayStrikeoutOn: bitBlt from: lastPos x@baselineY to: destX@baselineY. ]. "see setStopConditions for stopping conditions for displaying." self perform: stopCondition. "or: [lastIndex > runStopIndex]." ] whileFalse. ^ runStopIndex - lastIndex "Number of characters remaining in the current run"! Item was changed: ----- Method: MultiDisplayScanner>>displayLines:in:clippedBy: (in category 'MVC-compatibility') ----- displayLines: linesInterval in: aParagraph clippedBy: visibleRectangle "The central display routine. The call on the primitive (scanCharactersFrom:to:in:rightX:) will be interrupted according to an array of stop conditions passed to the scanner at which time the code to handle the stop condition is run and the call on the primitive continued until a stop condition returns true (which means the line has terminated)." | leftInRun | "leftInRun is the # of characters left to scan in the current run; when 0, it is time to call 'self setStopConditions'" morphicOffset := 0@0. leftInRun := 0. self initializeFromParagraph: aParagraph clippedBy: visibleRectangle. ignoreColorChanges := false. foregroundColor := paragraphColor := aParagraph foregroundColor. backgroundColor := aParagraph backgroundColor. aParagraph backgroundColor isTransparent ifTrue: [fillBlt := nil] ifFalse: [fillBlt := bitBlt copy. "Blt to fill spaces, tabs, margins" fillBlt sourceForm: nil; sourceOrigin: 0@0. fillBlt fillColor: aParagraph backgroundColor]. rightMargin := aParagraph rightMarginForDisplay. lineY := aParagraph topAtLineIndex: linesInterval first. bitBlt destForm deferUpdatesIn: visibleRectangle while: [ linesInterval do: [:lineIndex | + | runLength stopCondition startIndex string lastPos baselineY | - | runLength stopCondition startIndex string lastPos | leftMargin := aParagraph leftMarginForDisplayForLine: lineIndex alignment: (alignment ifNil:[textStyle alignment]). destX := (runX := leftMargin). line := aParagraph lines at: lineIndex. lineHeight := line lineHeight. fillBlt == nil ifFalse: [fillBlt destX: visibleRectangle left destY: lineY width: visibleRectangle width height: lineHeight; copyBits]. lastIndex := line first. leftInRun <= 0 ifTrue: [self setStopConditions. "also sets the font" leftInRun := text runLengthFor: line first]. baselineY := lineY + line baseline. destY := baselineY - font ascent. "Should have happened in setFont" runLength := leftInRun. runStopIndex := lastIndex + (runLength - 1) min: line last. leftInRun := leftInRun - (runStopIndex - lastIndex + 1). spaceCount := 0. string := text string. self handleIndentation. [ startIndex := lastIndex. lastPos := destX@destY. stopCondition := self scanCharactersFrom: lastIndex to: runStopIndex in: string rightX: rightMargin stopConditions: stopConditions kern: kern. lastIndex >= startIndex ifTrue:[ font displayString: string on: bitBlt from: startIndex to: lastIndex at: lastPos kern: kern baselineY: baselineY]. "see setStopConditions for stopping conditions for displaying." self perform: stopCondition ] whileFalse. fillBlt == nil ifFalse: [fillBlt destX: destX destY: lineY width: visibleRectangle right-destX height: lineHeight; copyBits]. lineY := lineY + lineHeight]]! Item was changed: ----- Method: MultiDisplayScanner>>placeEmbeddedObject: (in category 'scanning') ----- placeEmbeddedObject: anchoredMorph anchoredMorph relativeTextAnchorPosition ifNotNil:[ anchoredMorph position: anchoredMorph relativeTextAnchorPosition + (anchoredMorph owner textBounds origin x @ 0) - (0@morphicOffset y) + (0@lineY). ^true ]. (super placeEmbeddedObject: anchoredMorph) ifFalse: [^ false]. (anchoredMorph isMorph or: [anchoredMorph isPrimitiveCostume]) ifTrue: [ anchoredMorph position: ((destX - anchoredMorph width)@lineY) - morphicOffset + ] ifFalse: [| baselineY | - ] ifFalse: [ destY := lineY. baselineY := lineY + anchoredMorph height.. runX := destX. anchoredMorph displayOn: bitBlt destForm at: destX - anchoredMorph width @ destY clippingBox: bitBlt clipRect rule: Form blend fillColor: Color white ]. ^ true! Item was changed: ----- Method: MultiDisplayScanner>>setFont (in category 'private') ----- setFont foregroundColor := paragraphColor. super setFont. "Sets font and emphasis bits, and maybe foregroundColor" font installOn: bitBlt foregroundColor: foregroundColor backgroundColor: Color transparent. + text ifNotNil:[| baselineY | - text ifNotNil:[ baselineY := lineY + line baseline. destY := baselineY - font ascent]. !

1 0

The Trunk: Multilingual-nice.179.mcz
by commits＠source.squeak.org 27 Sep '13

27 Sep '13

1 0

The Trunk: Multilingual-nice.179.mcz
by commits＠source.squeak.org 27 Sep '13

27 Sep '13

1 0

The Trunk: Morphic-tpr.692.mcz
by commits＠source.squeak.org 27 Sep '13

27 Sep '13

tim Rowledge uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-tpr.692.mcz ==================== Summary ==================== Name: Morphic-tpr.692 Author: tpr Time: 27 September 2013, 1:08:00.67 pm UUID: 5f7e3f38-596a-413e-9c4f-e8bf96dddbac Ancestors: Morphic-nice.691 Payoff time! We get to remove a couple of once irritating classes that are no longer needed =============== Diff against Morphic-nice.691 =============== Item was removed: - NewParagraph subclass: #MultiNewParagraph - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: 'TextConstants' - category: 'Morphic-Multilingual'! Item was removed: - ----- Method: MultiNewParagraph class>>initialize (in category 'class initialization') ----- - initialize - "Prepare our own funeral" - - MultiNewParagraph allInstancesDo:[:mnp| mnp becomeForward: (mnp as: NewParagraph)]! Item was removed: - ----- Method: MultiNewParagraph>>displayOn:using:at: (in category 'fonts-display') ----- - displayOn: aCanvas using: displayScanner at: somePosition - "Send all visible lines to the displayScanner for display" - - | visibleRectangle offset leftInRun line | - visibleRectangle := aCanvas clipRect. - offset := somePosition - positionWhenComposed. - leftInRun := 0. - (self lineIndexForPoint: visibleRectangle topLeft) - to: (self lineIndexForPoint: visibleRectangle bottomRight) - do: [:i | line := lines at: i. - self displaySelectionInLine: line on: aCanvas. - line first <= line last ifTrue: - [leftInRun := displayScanner displayLine: line - offset: offset leftInRun: leftInRun]]. - ! Item was removed: - TextComposer subclass: #MultiTextComposer - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: 'TextConstants' - category: 'Morphic-Multilingual'! - - !MultiTextComposer commentStamp: 'tpr 9/25/2013 13:04' prior: 0! - This is now a null calss we are working on removing completely!

1 0

The Trunk: Morphic-tpr.692.mcz
by commits＠source.squeak.org 27 Sep '13

27 Sep '13

1 0

The Trunk: Morphic-tpr.692.mcz
by commits＠source.squeak.org 27 Sep '13

27 Sep '13

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages September 2013