Squeak-dev July 2013

squeak-dev@lists.squeakfoundation.org

50 participants
342 discussions

SS3 canary question
by Chris Cunnington 03 Jul '13

03 Jul '13

Hi Tobias, I don't think this (autogenerated) works: (Installerurl:'http://canary.netshed.de/ss/SqueakSource3') addPackage:'SqueakSource-Caching-Core'; addPackage:'SqueakSource-Core'; install This does: (Installer monticello http: 'http://canary.netshed.de/ss/SqueakSource3') addPackage: 'SqueakSource-Caching-Core'; addPackage: 'SqueakSource-Core'; install If I use the 3.0.8 Seaside image from the ftp archive and load SS3, where do I get these? MAObjectTest Announcement WARestfulFilter TWWiki Chris

2 1

Re: [squeak-dev] The Trunk: Multilingual-fbs.164.mcz
by Frank Shearar 03 Jul '13

03 Jul '13

On 2 July 2013 22:18, <commits(a)source.squeak.org> wrote: > Frank Shearar uploaded a new version of Multilingual to project The Trunk: > http://source.squeak.org/trunk/Multilingual-fbs.164.mcz > > ==================== Summary ==================== > > Name: Multilingual-fbs.164 > Author: fbs > Time: 2 July 2013, 10:18:42.84 pm > UUID: 83457f26-4043-914a-b92d-8b34b4a2b37e > Ancestors: Multilingual-fbs.163 > > This nearly severs the Multilingual -> Morphic dependency. > > =============== Diff against Multilingual-fbs.163 =============== The last remaining dependency is: LanguageEnvironment class >> startUp self clearDefault. Clipboard startUp. HandMorph startUp. I am stumped as to how to preserve this behaviour and sever the dependency. Smalltalk at: #HandMorph is _not_ a solution. It makes things worse because you hide the dependency, but it's still there, ready to bite you at a random moment. Inlining the above into Language class >> #startUp's call sites seems... undesirable. Perhaps a startup registry, and HandMorph's and Clipboard's #initialize would say something like LanguageEnvironment registerForStartup: self ? Thoughts? frank

2 2

Modelling a drag & drop between two Browsers
by Frank Shearar 03 Jul '13

03 Jul '13

The problem is this: I like having my Browser remember its place, more or less, when things disappear. Say I have two Browsers open. I want to move a class between system categories so I click on my victim and drag it to the other Browser's system category list. I drop it there, and the move takes place. But I lose my place in the source Browser. I want the source Browser to select the class either immediately before the removed class or immediately after. Not fussed which. Now the process starts in #dragFromClassList: in the source Browser and ends in #dropOnSystemCategories:at: in the target Browser. Calling #selectClassNamed: in the source Browser in #dragFromClassList: is premature because the drag hasn't happened yet, and things get weird. But how can I tell the source Browser "ok, the drag's done; select the class next to where the moved class was" ? frank

2 2

The Inbox: Files-ul.125.mcz
by commits＠source.squeak.org 03 Jul '13

03 Jul '13

A new version of Files was added to project The Inbox: http://source.squeak.org/inbox/Files-ul.125.mcz ==================== Summary ==================== Name: Files-ul.125 Author: ul Time: 3 July 2013, 7:35:48.693 am UUID: 5a53740b-df37-4fb1-90af-d803dbda9593 Ancestors: Files-fbs.124 FileDirectory >> #directoryTreeDo: uses BFS instead of DFS. FileDirectory >> #statsForDirectoryTree: uses #directoryTreeDo: instead of reimplementing a BFS algorithm. =============== Diff against Files-fbs.124 =============== Item was changed: ----- Method: FileDirectory>>directoryTreeDo: (in category 'enumeration') ----- directoryTreeDo: oneArgBlock "For each file and directory in my tree, value oneArgBlock with an OrderedCollection of the path of DirectoryEntry's leading to the current node. The first element in the collection will be the DirectoryEntryDirectory for myself, the last is the currentNode (a DirectoryEntry)." + "Implementation details: + This is a simple BFS algorithm with additional stuff to ensure that the path to the root directory is available. The elements in the queue (aka the graph nodes) are tuples. Each tuple has 3 elements: a DirectoryEntry, the parent tuple, and the length of the path to the root. Each directory in the tree will have a corresponding tuple. Since each tuple contains a pointer to its parent directory's tuple, therefore large parts of the directory tree (not including files) will be stored in memory. Updating currentPath doesn't take more than visiting all nodes in that tree, so its total runtime cost is O(d), where d is the number of directories in the directory tree, which means that the amortized cost of keeping the path up-to-date is O(1). + The reason why we use BFS instead of DFS (which naturally has the path to the current entry from the root) is because the primitives in FilePlugin work better this way." + + | queue currentPath | + currentPath := OrderedCollection with: self directoryEntry. + oneArgBlock value: currentPath. + queue := OrderedCollection with: { currentPath first. nil. 1 }. + [ queue isEmpty ] whileFalse: [ + | parentTuple fixupTuple newPathLength | + parentTuple := queue removeFirst. + "Update currentPath to contain the entries to parentTuple from the root." + fixupTuple := parentTuple. + currentPath size < fixupTuple third ifTrue: [ "Next row in the tree, extend the path." + currentPath add: fixupTuple first. + fixupTuple := fixupTuple second ]. + [ (currentPath at: fixupTuple third) == fixupTuple first ] whileFalse: [ + currentPath at: fixupTuple third put: fixupTuple first. + fixupTuple := fixupTuple second ]. + "Visit the sub-entries" + newPathLength := parentTuple third + 1. + currentPath add: nil. "Extend the path with a new slot" + parentTuple first asFileDirectory entriesDo: [ :entry | + currentPath atLast: 1 put: entry. + oneArgBlock value: currentPath. + entry isDirectory ifTrue: [ + queue addLast: { entry. parentTuple. newPathLength } ] ]. + currentPath removeLast ]! - |myEntry| - myEntry := OrderedCollection with: self directoryEntry. - oneArgBlock value: myEntry. - self - directoryTreeDo: oneArgBlock - entries: myEntry! Item was removed: - ----- Method: FileDirectory>>directoryTreeDo:entries: (in category 'enumeration') ----- - directoryTreeDo: oneArgBlock entries: entriesCollection - "Value oneArgBlock with the path (an OrderedCollection of FileDirectory's) to each DirectoryEntry and the DirectoryEntry itself." - self entries do: - [ : each | - entriesCollection add: each. - oneArgBlock value: entriesCollection. - each isDirectory ifTrue: - [ | subdir | - subdir := each asFileDirectory. - subdir - directoryTreeDo: oneArgBlock - entries: entriesCollection ]. - entriesCollection removeLast ]! Item was added: + ----- Method: FileDirectory>>entriesDo: (in category 'enumeration') ----- + entriesDo: oneArgumentBlock + "Evaluate oneArgumentBlock with DirectoryEntry objects for the files and directories in this directory." + + ^self directoryContentsFor: pathName do: oneArgumentBlock + ! Item was changed: ----- Method: FileDirectory>>statsForDirectoryTree: (in category 'enumeration') ----- statsForDirectoryTree: rootedPathName "Return the size statistics for the entire directory tree starting at the given root. The result is a three element array of the form: (<number of folders><number of files><total bytes in all files>). This method also serves as an example of how recursively enumerate a directory tree." "FileDirectory default statsForDirectoryTree: '\smalltalk'" + | dirs files bytes | - | dirs files bytes todo entries p | dirs := files := bytes := 0. + (FileDirectory on: rootedPathName) directoryTreeDo: [ :path | + | entry | + entry := path last. + entry isDirectory + ifTrue: [ dirs := dirs + 1 ] + ifFalse: [ + files := files + 1. + bytes := bytes + entry fileSize ] ]. + ^{ dirs. files. bytes } - todo := OrderedCollection with: rootedPathName. - [todo isEmpty] whileFalse: [ - p := todo removeFirst. - entries := self directoryContentsFor: p. - entries do: [:entry | - entry isDirectory - ifTrue: [ - todo addLast: p , self pathNameDelimiter asString , entry name. - dirs := dirs + 1] - ifFalse: [ - files := files + 1. - bytes := bytes + entry fileSize]]]. - ^ Array with: dirs with: files with: bytes !

1 0

Daily Commit Log
by commits＠source.squeak.org 03 Jul '13

03 Jul '13

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2013-July/006102.html Name: Multilingual-fbs.163 Ancestors: Multilingual-fbs.162 Break the Multilingual <-> TrueType cyclic dependency by moving TTC (TrueType Collection) classes to TrueType and FixedFaceFont to Graphics-Fonts (because this concerns displaying fonts). ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-July/006103.html Name: Graphics-fbs.213 Ancestors: Graphics-fbs.212 Break the Multilingual <-> TrueType cyclic dependency by moving TTC (TrueType Collection) classes to TrueType and FixedFaceFont to Graphics-Fonts (because this concerns displaying fonts). ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-July/006104.html Name: TrueType-fbs.22 Ancestors: TrueType-fbs.21 Break the Multilingual <-> TrueType cyclic dependency by moving TTC (TrueType Collection) classes to TrueType and FixedFaceFont to Graphics-Fonts (because this concerns displaying fonts). ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-July/006105.html Name: Tests-fbs.229 Ancestors: Tests-fbs.228 TrueType -/-> Multilingual. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-July/006106.html Name: ST80Tools-fbs.1 Ancestors: Move Tools' MVC extensions to a separate package, ST80Tools. This makes Tools independent of MVC, at the cost of requiring an extra package to reload/unload MVC. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-July/006107.html Name: Tools-fbs.477 Ancestors: Tools-fbs.476 Move Tools' MVC extensions to a separate package, ST80Tools. This makes Tools independent of MVC, at the cost of requiring an extra package to reload/unload MVC. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-July/006108.html Name: Tools-fbs.478 Ancestors: Tools-fbs.477 Revert accidental commit of alpha quality exploratory hack. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-July/006109.html Name: TrueType-fbs.23 Ancestors: TrueType-fbs.22 Move graphical stuff up into Morphic-Multilingual. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-July/006110.html Name: Multilingual-fbs.164 Ancestors: Multilingual-fbs.163 This nearly severs the Multilingual -> Morphic dependency. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-July/006111.html Name: Morphic-fbs.661 Ancestors: Morphic-fbs.660 This nearly severs the Multilingual -> Morphic dependency. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-July/006112.html Name: Tests-fbs.230 Ancestors: Tests-fbs.229 Record that Tools -/-> ST80. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-July/006113.html Name: Kernel-fbs.779 Ancestors: Kernel-fbs.778 Kernel -/-> Traits. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-July/006114.html Name: Traits-fbs.294 Ancestors: Traits-cwp.293 Kernel -/-> Traits. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2013-July/006115.html Name: Tests-fbs.231 Ancestors: Tests-fbs.230 Kernel -/-> Traits. =============================================

1 0

The Trunk: Tests-fbs.231.mcz
by commits＠source.squeak.org 03 Jul '13

03 Jul '13

Frank Shearar uploaded a new version of Tests to project The Trunk: http://source.squeak.org/trunk/Tests-fbs.231.mcz ==================== Summary ==================== Name: Tests-fbs.231 Author: fbs Time: 2 July 2013, 11:07:16.645 pm UUID: 15143b1b-3518-164c-9f0b-081486d011df Ancestors: Tests-fbs.230 Kernel -/-> Traits. =============== Diff against Tests-fbs.230 =============== Item was changed: ----- Method: PackageDependencyTest>>testKernel (in category 'tests') ----- testKernel self testPackage: 'Kernel' dependsExactlyOn: #( Collections Compiler Compression Environments Files Graphics MorphicExtras Multilingual System 'ToolBuilder-Kernel' Tools - Traits ).!

1 0

The Trunk: Traits-fbs.294.mcz
by commits＠source.squeak.org 03 Jul '13

03 Jul '13

Frank Shearar uploaded a new version of Traits to project The Trunk: http://source.squeak.org/trunk/Traits-fbs.294.mcz ==================== Summary ==================== Name: Traits-fbs.294 Author: fbs Time: 2 July 2013, 11:06:19.239 pm UUID: 60a845d0-af1d-3548-92b7-e429166ba097 Ancestors: Traits-cwp.293 Kernel -/-> Traits. =============== Diff against Traits-cwp.293 =============== Item was added: + ----- Method: ClassDescription class>>allTraitsDo: (in category '*Traits') ----- + allTraitsDo: aBlock + "Evaluate aBlock with all the instance and class traits present in the system" + TraitImpl ifNotNil:[TraitImpl allTraitsDo: aBlock].! Item was added: + ----- Method: ClassDescription class>>newTraitComposition (in category '*Traits') ----- + newTraitComposition + "Answer a new trait composition. If no current trait implementation + is installed, return an empty array" + ^TraitImpl ifNil:[#()] ifNotNil:[TraitImpl newTraitComposition].! Item was added: + ----- Method: ClassDescription class>>newTraitNamed:uses:category: (in category '*Traits') ----- + newTraitNamed: aSymbol uses: aTraitCompositionOrCollection category: aString + "Creates a new trait. If no current trait implementation + is installed, raise an error." + ^TraitImpl + ifNil:[self error: 'Traits are not installed'] + ifNotNil:[TraitImpl newTraitNamed: aSymbol uses: aTraitCompositionOrCollection category: aString]! Item was added: + ----- Method: ClassDescription class>>newTraitTemplateIn: (in category '*Traits') ----- + newTraitTemplateIn: categoryString + ^TraitImpl ifNil:[''] ifNotNil:[TraitImpl newTemplateIn: categoryString].! Item was added: + ----- Method: ClassDescription class>>traitImpl (in category '*Traits') ----- + traitImpl + "Answer the default implementor of traits" + ^TraitImpl! Item was added: + ----- Method: ClassDescription class>>traitImpl: (in category '*Traits') ----- + traitImpl: aTraitClass + "Make the given trait class the default implementor of traits" + TraitImpl := aTraitClass.!

1 0

The Trunk: Kernel-fbs.779.mcz
by commits＠source.squeak.org 03 Jul '13

03 Jul '13

Frank Shearar uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-fbs.779.mcz ==================== Summary ==================== Name: Kernel-fbs.779 Author: fbs Time: 2 July 2013, 11:05:26.126 pm UUID: e6029c34-53d1-a24e-8961-bb7c1cd4ad2a Ancestors: Kernel-fbs.778 Kernel -/-> Traits. =============== Diff against Kernel-fbs.778 =============== Item was removed: - ----- Method: ClassDescription class>>allTraitsDo: (in category 'traits') ----- - allTraitsDo: aBlock - "Evaluate aBlock with all the instance and class traits present in the system" - TraitImpl ifNotNil:[TraitImpl allTraitsDo: aBlock].! Item was removed: - ----- Method: ClassDescription class>>newTraitComposition (in category 'traits') ----- - newTraitComposition - "Answer a new trait composition. If no current trait implementation - is installed, return an empty array" - ^TraitImpl ifNil:[#()] ifNotNil:[TraitImpl newTraitComposition].! Item was removed: - ----- Method: ClassDescription class>>newTraitNamed:uses:category: (in category 'traits') ----- - newTraitNamed: aSymbol uses: aTraitCompositionOrCollection category: aString - "Creates a new trait. If no current trait implementation - is installed, raise an error." - ^TraitImpl - ifNil:[self error: 'Traits are not installed'] - ifNotNil:[TraitImpl newTraitNamed: aSymbol uses: aTraitCompositionOrCollection category: aString]! Item was removed: - ----- Method: ClassDescription class>>newTraitTemplateIn: (in category 'traits') ----- - newTraitTemplateIn: categoryString - ^TraitImpl ifNil:[''] ifNotNil:[TraitImpl newTemplateIn: categoryString].! Item was removed: - ----- Method: ClassDescription class>>traitImpl (in category 'traits') ----- - traitImpl - "Answer the default implementor of traits" - ^TraitImpl! Item was removed: - ----- Method: ClassDescription class>>traitImpl: (in category 'traits') ----- - traitImpl: aTraitClass - "Make the given trait class the default implementor of traits" - TraitImpl := aTraitClass.!

1 0

The Trunk: Tests-fbs.230.mcz
by commits＠source.squeak.org 02 Jul '13

02 Jul '13

Frank Shearar uploaded a new version of Tests to project The Trunk: http://source.squeak.org/trunk/Tests-fbs.230.mcz ==================== Summary ==================== Name: Tests-fbs.230 Author: fbs Time: 2 July 2013, 10:24:25.456 pm UUID: 669a08b1-3d7f-7d45-af59-4f19e381dca5 Ancestors: Tests-fbs.229 Record that Tools -/-> ST80. =============== Diff against Tests-fbs.229 =============== Item was changed: ----- Method: PackageDependencyTest>>testTools (in category 'tests') ----- testTools self testPackage: 'Tools' dependsExactlyOn: #( Collections Compiler Compression Exceptions Files Graphics Kernel Morphic MorphicExtras Multilingual Network 'PackageInfo-Base' - ST80 System 'ToolBuilder-Kernel' ).!

1 0

The Trunk: Morphic-fbs.661.mcz
by commits＠source.squeak.org 02 Jul '13

02 Jul '13

Frank Shearar uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-fbs.661.mcz ==================== Summary ==================== Name: Morphic-fbs.661 Author: fbs Time: 2 July 2013, 10:19:47.213 pm UUID: 8fa711eb-1495-b14c-aa55-5b7e25d6f96a Ancestors: Morphic-fbs.660 This nearly severs the Multilingual -> Morphic dependency. =============== Diff against Morphic-fbs.660 =============== Item was changed: SystemOrganization addCategory: #'Morphic-Balloon'! SystemOrganization addCategory: #'Morphic-Basic'! SystemOrganization addCategory: #'Morphic-Basic-NewCurve'! SystemOrganization addCategory: #'Morphic-Borders'! SystemOrganization addCategory: #'Morphic-Collections-Arrayed'! SystemOrganization addCategory: #'Morphic-Demo'! SystemOrganization addCategory: #'Morphic-Events'! SystemOrganization addCategory: #'Morphic-Explorer'! SystemOrganization addCategory: #'Morphic-Kernel'! SystemOrganization addCategory: #'Morphic-Layouts'! SystemOrganization addCategory: #'Morphic-Menus'! SystemOrganization addCategory: #'Morphic-Menus-DockingBar'! SystemOrganization addCategory: #'Morphic-Models'! SystemOrganization addCategory: #'Morphic-Pluggable Widgets'! SystemOrganization addCategory: #'Morphic-Support'! + SystemOrganization addCategory: #'Morphic-Multilingual'! SystemOrganization addCategory: #'Morphic-Text Support'! + SystemOrganization addCategory: #'Morphic-ToolBuilder'! SystemOrganization addCategory: #'Morphic-TrueType'! SystemOrganization addCategory: #'Morphic-Widgets'! SystemOrganization addCategory: #'Morphic-Windows'! SystemOrganization addCategory: #'Morphic-Worlds'! - SystemOrganization addCategory: #'Morphic-ToolBuilder'! Item was added: + ----- Method: LinedTTCFont>>computeForm: (in category '*Morphic-Multilingual') ----- + computeForm: char + + | ttGlyph scale | + + char = Character tab ifTrue: [^ super computeForm: char]. + + "char = $U ifTrue: [self doOnlyOnce: [self halt]]." + scale := self pixelSize asFloat / (ttcDescription ascender - ttcDescription descender). + ttGlyph := ttcDescription at: char. + ^ ttGlyph asFormWithScale: scale ascender: ttcDescription ascender descender: ttcDescription descender fgColor: foregroundColor bgColor: Color transparent depth: self depth replaceColor: false lineGlyph: lineGlyph lingGlyphWidth: contourWidth emphasis: emphasis! Item was added: + ----- Method: MultiCompositionScanner>>composeFrom:inRectangle:firstLine:leftSide:rightSide: (in category '*Morphic-Text Support-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. + presentationLine := (TextLine start: lastIndex stop: 0 internalSpaces: 0 paddingWidth: 0) + rectangle: lineRectangle. + numOfComposition := 0. + spaceCount := 0. + self handleIndentation. + leftMargin := destX. + line leftMargin: leftMargin. + presentationLine leftMargin: leftMargin. + + presentation := TextStream on: (Text fromString: (WideString new: text size)). + + [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) + ifTrue: [presentationLine lineHeight: lineHeight + textStyle leading + baseline: baseline + textStyle leading. + ^ line lineHeight: lineHeight + textStyle leading + baseline: baseline + textStyle leading]] repeat! Item was added: + ----- Method: MultiCompositionScanner>>setFont (in category '*Morphic-Multilingual') ----- + setFont + super setFont. + breakAtSpace := false. + wantsColumnBreaks == true ifTrue: [ + stopConditions := stopConditions copy. + stopConditions at: TextComposer characterForColumnBreak asciiValue + 1 put: #columnBreak. + ]. + ! Item was added: + NewParagraph subclass: #MultiNewParagraph + instanceVariableNames: 'presentationText presentationLines' + classVariableNames: '' + poolDictionaries: 'TextConstants' + category: 'Morphic-Multilingual'! Item was added: + ----- 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 added: + ----- Method: MultiNewParagraph>>displayOnTest:using:at: (in category 'fonts-display') ----- + displayOnTest: aCanvas using: displayScanner at: somePosition + "Send all visible lines to the displayScanner for display" + + | visibleRectangle offset leftInRun line | + (presentationText isNil or: [presentationLines isNil]) ifTrue: [ + ^ self displayOn: aCanvas using: displayScanner at: somePosition. + ]. + visibleRectangle := aCanvas clipRect. + offset := somePosition - positionWhenComposed. + leftInRun := 0. + (self lineIndexForPoint: visibleRectangle topLeft) + to: (self lineIndexForPoint: visibleRectangle bottomRight) + do: [:i | line := presentationLines at: i. + self displaySelectionInLine: line on: aCanvas. + line first <= line last ifTrue: + [leftInRun := displayScanner displayLine: line + offset: offset leftInRun: leftInRun]]. + ! Item was added: + ----- Method: MultiNewParagraph>>multiComposeLinesFrom:to:delta:into:priorLines:atY: (in category 'composition') ----- + multiComposeLinesFrom: start to: stop delta: delta into: lineColl priorLines: priorLines + atY: startingY + "While the section from start to stop has changed, composition may ripple all the way to the end of the text. However in a rectangular container, if we ever find a line beginning with the same character as before (ie corresponding to delta in the old lines), then we can just copy the old lines from there to the end of the container, with adjusted indices and y-values" + + | newResult composer presentationInfo | + + composer := MultiTextComposer new. + presentationLines := nil. + presentationText := nil. + newResult := composer + multiComposeLinesFrom: start + to: stop + delta: delta + into: lineColl + priorLines: priorLines + atY: startingY + textStyle: textStyle + text: text + container: container + wantsColumnBreaks: wantsColumnBreaks == true. + lines := newResult first asArray. + maxRightX := newResult second. + presentationInfo := composer getPresentationInfo. + presentationLines := presentationInfo first asArray. + presentationText := presentationInfo second. + "maxRightX printString displayAt: 0@0." + ^maxRightX + ! Item was added: + ----- Method: MultiNewParagraph>>presentationLines (in category 'accessing') ----- + presentationLines + + ^ presentationLines. + ! Item was added: + ----- Method: MultiNewParagraph>>presentationText (in category 'accessing') ----- + presentationText + + ^ presentationText. + ! Item was added: + TextComposer subclass: #MultiTextComposer + instanceVariableNames: 'presentation presentationLines' + classVariableNames: '' + poolDictionaries: 'TextConstants' + category: 'Morphic-Multilingual'! Item was added: + ----- Method: MultiTextComposer>>composeEachRectangleIn: (in category 'as yet unclassified') ----- + composeEachRectangleIn: rectangles + + | myLine lastChar | + + 1 to: rectangles size do: [:i | + currCharIndex <= theText size ifFalse: [^false]. + myLine := scanner + composeFrom: currCharIndex + inRectangle: (rectangles at: i) + firstLine: isFirstLine + leftSide: i=1 + rightSide: i=rectangles size. + lines addLast: myLine. + presentationLines addLast: scanner getPresentationLine. + presentation ifNil: [presentation := scanner getPresentation] + ifNotNil: [presentation := presentation, scanner getPresentation]. + actualHeight := actualHeight max: myLine lineHeight. "includes font changes" + currCharIndex := myLine last + 1. + lastChar := theText at: myLine last. + (CharacterSet crlf includes: lastChar) ifTrue: [^#cr]. + wantsColumnBreaks ifTrue: [ + lastChar = TextComposer characterForColumnBreak ifTrue: [^#columnBreak]. + ]. + ]. + ^false! Item was added: + ----- Method: MultiTextComposer>>getPresentationInfo (in category 'as yet unclassified') ----- + getPresentationInfo + + ^ Array with: presentationLines with: presentation. + ! Item was added: + ----- Method: MultiTextComposer>>multiComposeLinesFrom:to:delta:into:priorLines:atY:textStyle:text:container:wantsColumnBreaks: (in category 'as yet unclassified') ----- + multiComposeLinesFrom: argStart to: argStop delta: argDelta into: argLinesCollection priorLines: argPriorLines atY: argStartY textStyle: argTextStyle text: argText container: argContainer wantsColumnBreaks: argWantsColumnBreaks + + wantsColumnBreaks := argWantsColumnBreaks. + lines := argLinesCollection. + presentationLines := argLinesCollection copy. + theTextStyle := argTextStyle. + theText := argText. + theContainer := argContainer. + deltaCharIndex := argDelta. + currCharIndex := startCharIndex := argStart. + stopCharIndex := argStop. + prevLines := argPriorLines. + currentY := argStartY. + defaultLineHeight := theTextStyle lineGrid. + maxRightX := theContainer left. + possibleSlide := stopCharIndex < theText size and: [theContainer isMemberOf: Rectangle]. + nowSliding := false. + prevIndex := 1. + scanner := MultiCompositionScanner new text: theText textStyle: theTextStyle. + scanner wantsColumnBreaks: wantsColumnBreaks. + isFirstLine := true. + self composeAllLines. + isFirstLine ifTrue: ["No space in container or empty text" + self + addNullLineWithIndex: startCharIndex + andRectangle: (theContainer topLeft extent: 0@defaultLineHeight) + ] ifFalse: [ + self fixupLastLineIfCR + ]. + ^{lines asArray. maxRightX} + + ! Item was added: + ----- Method: TTCFont>>computeForm: (in category '*Morphic-Multilingual') ----- + computeForm: char + "Compute the glyph form for the given character" + ^ttcDescription renderGlyph: char height: self height fgColor: foregroundColor bgColor: Color transparent depth: self depth! Item was added: + ----- Method: TTGlyph>>asFormWithScale:ascender:descender:fgColor:bgColor:depth:replaceColor:lineGlyph:lingGlyphWidth:emphasis: (in category '*Morphic-Multilingual') ----- + asFormWithScale: scale ascender: ascender descender: descender fgColor: fgColor bgColor: bgColor depth: depth replaceColor: replaceColorFlag lineGlyph: lineGlyph lingGlyphWidth: lWidth emphasis: code + + | form canvas newScale | + form := Form extent: (advanceWidth @ (ascender - descender) * scale) rounded depth: depth. + form fillColor: bgColor. + canvas := BalloonCanvas on: form. + canvas aaLevel: 4. + canvas transformBy: (MatrixTransform2x3 withScale: scale asPoint * (1 @ -1)). + canvas transformBy: (MatrixTransform2x3 withOffset: 0 @ ascender negated). + canvas + drawGeneralBezierShape: self contours + color: fgColor + borderWidth: 0 + borderColor: fgColor. + ((code bitAnd: 4) ~= 0 or: [(code bitAnd: 16) ~= 0]) ifTrue: [ + newScale := (form width + 1) asFloat / lineGlyph calculateWidth asFloat. + canvas transformBy: (MatrixTransform2x3 withScale: (newScale / scale)(a)1.0). + + (code bitAnd: 4) ~= 0 ifTrue: [ + canvas + drawGeneralBezierShape: lineGlyph contours + color: fgColor + borderWidth: 0 + borderColor: fgColor. + ]. + + (code bitAnd: 16) ~= 0 ifTrue: [ + canvas transformBy: (MatrixTransform2x3 withOffset: 0@(ascender // 2)). + canvas + drawGeneralBezierShape: lineGlyph contours + color: fgColor + borderWidth: 0 + borderColor: fgColor. + ]. + ]. + + replaceColorFlag ifTrue: [ + form replaceColor: bgColor withColor: Color transparent. + ]. + ^ form!

1 0

Jump to page: