Packages September 2013

packages@lists.squeakfoundation.org

1 participants
423 discussions

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

29 Sep '13

Nicolas Cellier uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-nice.236.mcz ==================== Summary ==================== Name: Graphics-nice.236 Author: nice Time: 29 September 2013, 3:37:33.253 am UUID: 38c2e6a3-d9fa-4a5b-b5e1-91a85e4afae6 Ancestors: Graphics-nice.235 Don't setStopConditions twice in CharacterBlockScanner and DisplayScanner in MVC compatibility methods. SharedPools are inherited in Squeak, so don't declare TextConstants in CompositionScanner. =============== Diff against Graphics-nice.235 =============== Item was changed: ----- Method: CharacterBlockScanner>>buildCharacterBlockIn: (in category 'private') ----- buildCharacterBlockIn: para + "This method is used by the MVC version only." + + | lineIndex runLength lineStop stopCondition | - | lineIndex runLength lineStop done stopCondition | "handle nullText" (para numberOfLines = 0 or: [text size = 0]) ifTrue: [^ CharacterBlock new stringIndex: 1 "like being off end of string" text: para text topLeft: (para leftMarginForDisplayForLine: 1 alignment: (alignment ifNil:[textStyle alignment])) @ para compositionRectangle top extent: 0 @ textStyle lineGrid]. "find the line" lineIndex := para lineIndexOfTop: characterPoint y. destY := para topAtLineIndex: lineIndex. line := para lines at: lineIndex. lastIndex := line first. - rightMargin := para rightMarginForDisplay. + self setStopConditions. " also loads the font, alignment and all emphasis attributes " - self setStopConditions. " also loads the font and loads all emphasis attributes " - (lineIndex = para numberOfLines and: [(destY + line lineHeight) < characterPoint y]) ifTrue: ["if beyond lastLine, force search to last character" self characterPointSetX: rightMargin] ifFalse: [characterPoint y < (para compositionRectangle) top ifTrue: ["force search to first line" characterPoint := (para compositionRectangle) topLeft]. characterPoint x > rightMargin ifTrue: [self characterPointSetX: rightMargin]]. + destX := leftMargin := para leftMarginForDisplayForLine: lineIndex alignment: alignment. + nextLeftMargin:= para leftMarginForDisplayForLine: lineIndex+1 alignment: alignment. + runLength := text runLengthFor: line first. + lineStop := characterIndex "scanning for index" + ifNil: [ line last ]. "scanning for point" + runStopIndex := lastIndex + (runLength - 1) min: lineStop. - destX := (leftMargin := para leftMarginForDisplayForLine: lineIndex alignment: (alignment ifNil:[textStyle alignment])). - nextLeftMargin:= para leftMarginForDisplayForLine: lineIndex+1 alignment: (alignment ifNil:[textStyle alignment]). - lastIndex := line first. - - self setStopConditions. "also sets font" - runLength := (text runLengthFor: line first). - characterIndex == nil - ifTrue: [lineStop := line last "characterBlockAtPoint"] - ifFalse: [lineStop := characterIndex "characterBlockForIndex"]. - (runStopIndex := lastIndex + (runLength - 1)) > lineStop - ifTrue: [runStopIndex := lineStop]. lastCharacterExtent := 0 @ line lineHeight. + spaceCount := 0. - spaceCount := 0. done := false. self handleIndentation. - [done] - whileFalse: [stopCondition := self scanCharactersFrom: lastIndex to: runStopIndex in: text string rightX: characterPoint x stopConditions: stopConditions kern: kern. + "see setStopConditions for stopping conditions for character block operations." - - "see setStopConditions for stopping conditions for character block operations." self lastCharacterExtentSetX: (font widthOf: (text at: lastIndex)). + self perform: stopCondition] whileFalse. + + ^characterIndex == nil - (self perform: stopCondition) ifTrue: - [characterIndex == nil ifTrue: ["characterBlockAtPoint" ^ CharacterBlock new stringIndex: lastIndex text: text topLeft: characterPoint + (font descentKern @ 0) extent: lastCharacterExtent] ifFalse: ["characterBlockForIndex" ^ CharacterBlock new stringIndex: lastIndex text: text topLeft: characterPoint + ((font descentKern) - kern @ 0) + extent: lastCharacterExtent]! - extent: lastCharacterExtent]]]! Item was changed: CharacterScanner subclass: #CompositionScanner instanceVariableNames: 'spaceX spaceIndex lineHeight baseline lineHeightAtSpace baselineAtSpace' classVariableNames: '' + poolDictionaries: '' - poolDictionaries: 'TextConstants' category: 'Graphics-Text'! !CompositionScanner commentStamp: '<historical>' prior: 0! CompositionScanners are used to measure text and determine where line breaks and space padding should occur.! Item was changed: ----- Method: DisplayScanner>>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 | + | string startIndex lastPos runLength stopCondition baselineY | - | string startIndex lastPos runLength stopCondition | line := aParagraph lines at: lineIndex. lastIndex := line first. + leftInRun <= 0 + ifTrue: [self setStopConditions. "also sets the font, alignment and emphasisCode" + leftInRun := text runLengthFor: line first]. + leftMargin := aParagraph leftMarginForDisplayForLine: lineIndex alignment: alignment. + destX := runX := leftMargin. - self setStopConditions. " causes an assignment to inst var. alignment " - - 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]. + baselineY := lineY + line baseline. + destY := baselineY - font ascent. "Should have happened in setFont" - lastIndex := line first. - leftInRun <= 0 - ifTrue: [self setStopConditions. "also sets the font" - leftInRun := text runLengthFor: line first]. - destY := lineY + line baseline - 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]. "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]]!

1 0

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

29 Sep '13

1 0

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

29 Sep '13

Nicolas Cellier uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-nice.235.mcz ==================== Summary ==================== Name: Graphics-nice.235 Author: nice Time: 29 September 2013, 2:38:15.212 am UUID: dc85806a-22af-482b-b058-88acc8259764 Ancestors: Graphics-nice.234 Correct this glitch: when a text was centered or right flush, clicking at the very left of text morph would incorrectly position the text cursor. =============== Diff against Graphics-nice.234 =============== Item was changed: ----- Method: CharacterBlockScanner>>characterBlockAtPoint:index:in: (in category 'scanning') ----- characterBlockAtPoint: aPoint index: index in: textLine "This method is the Morphic characterBlock finder. It combines + MVC's characterBlockAtPoint:, -ForIndex:, and buildCharacterBlockIn:" - MVC's characterBlockAtPoint:, -ForIndex:, and buildCharcterBlock:in:" | runLength lineStop stopCondition | line := textLine. rightMargin := line rightMargin. lastIndex := line first. self setStopConditions. "also sets font" characterIndex := index. " == nil means scanning for point" characterPoint := aPoint. (characterPoint isNil or: [characterPoint y > line bottom]) ifTrue: [characterPoint := line bottomRight]. + destX := leftMargin := line leftMarginForAlignment: alignment. + destY := line top. + (text isEmpty or: [(characterPoint y < destY or: [characterPoint x < destX]) - (text isEmpty or: [(characterPoint y < line top or: [characterPoint x < line left]) or: [characterIndex notNil and: [characterIndex < line first]]]) ifTrue: [^ (CharacterBlock new stringIndex: line first text: text + topLeft: destX@destY extent: 0 @ textStyle lineGrid) - topLeft: line leftMargin@line top extent: 0 @ textStyle lineGrid) textLine: line]. - destX := leftMargin := line leftMarginForAlignment: alignment. - destY := line top. runLength := text runLengthFor: line first. lineStop := characterIndex "scanning for index" ifNil: [ line last ]. "scanning for point" runStopIndex := lastIndex + (runLength - 1) min: lineStop. lastCharacterExtent := 0 @ line lineHeight. spaceCount := 0. [ stopCondition := self scanCharactersFrom: lastIndex to: runStopIndex in: text string rightX: characterPoint x stopConditions: stopConditions kern: kern. "see setStopConditions for stopping conditions for character block operations." self lastCharacterExtentSetX: (specialWidth ifNil: [font widthOf: (text at: lastIndex)] ifNotNil: [specialWidth]). self perform: stopCondition ] whileFalse. characterIndex ifNil: [ "Result for characterBlockAtPoint: " (stopCondition ~~ #cr and: [ lastIndex == line last and: [ aPoint x > ((characterPoint x) + (lastCharacterExtent x / 2)) ]]) ifTrue: [ "Correct for right half of last character in line" ^ (CharacterBlock new stringIndex: lastIndex + 1 text: text topLeft: characterPoint + (lastCharacterExtent x @ 0) + (font descentKern @ 0) extent: 0 @ lastCharacterExtent y) textLine: line ]. ^ (CharacterBlock new stringIndex: lastIndex text: text topLeft: characterPoint + (font descentKern @ 0) extent: lastCharacterExtent - (font baseKern @ 0)) textLine: line] ifNotNil: ["Result for characterBlockForIndex: " ^ (CharacterBlock new stringIndex: characterIndex text: text topLeft: characterPoint + ((font descentKern) - kern @ 0) extent: lastCharacterExtent) textLine: line]!

1 0

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

29 Sep '13

1 0

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

29 Sep '13

1 0

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

29 Sep '13

Nicolas Cellier uploaded a new version of Multilingual to project The Trunk: http://source.squeak.org/trunk/Multilingual-nice.181.mcz ==================== Summary ==================== Name: Multilingual-nice.181 Author: nice Time: 29 September 2013, 1:56:56.232 am UUID: f732f734-f926-4d92-b25a-2904485ccd21 Ancestors: Multilingual-nice.180 Find a better replacement for firstDestX inst. var. usage (my previous fix broke selection of first char in the line, because a MultiCharacterBlockScanner would never have set firstDestX). I wonder if this handling is really necessary though... Remove unused presentationText: =============== Diff against Multilingual-nice.180 =============== Item was added: + ----- Method: MultiCharacterScanner>>itsNotTheFirstCharThatCrossedX (in category 'private') ----- + itsNotTheFirstCharThatCrossedX + ^true! 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 | lastIndex := startIndex. lastIndex > stopIndex ifTrue: [lastIndex := stopIndex. ^ stops endOfRun]. startEncoding := (sourceString at: startIndex) leadingChar. [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: [self itsNotTheFirstCharThatCrossedX ifTrue: [^ stops crossedX]]. - nextDestX > rightX ifTrue: [leftMargin ~= 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 | lastIndex := startIndex. lastIndex > stopIndex ifTrue: [lastIndex := stopIndex. ^ stops endOfRun]. startEncoding := (sourceString at: startIndex) leadingChar. 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: [ + self itsNotTheFirstCharThatCrossedX ifTrue: [ - destX ~= leftMargin 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 | lastIndex := startIndex. lastIndex > stopIndex ifTrue: [lastIndex := stopIndex. ^ stops endOfRun]. startEncoding := (sourceString at: startIndex) leadingChar. 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: [self itsNotTheFirstCharThatCrossedX ifTrue: [^stops crossedX]]. - nextDestX > rightX ifTrue: [destX ~= leftMargin 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 added: + ----- Method: MultiCompositionScanner>>itsNotTheFirstCharThatCrossedX (in category 'private') ----- + itsNotTheFirstCharThatCrossedX + "When composing, this is used to avoid wrapping the line if the first char does not fit in composition rectangle" + ^destX ~= leftMargin! Item was removed: - ----- Method: MultiDisplayScanner>>presentationText: (in category 'private') ----- - presentationText: t - - text := t. - !

1 0

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

29 Sep '13

1 0

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

29 Sep '13

1 0

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: Graphics-nice.234.mcz
by commits＠source.squeak.org 28 Sep '13

28 Sep '13

1 0

← Newer
1
2
3
4
5
6
7
8
...
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