Squeak-dev June 2019

squeak-dev@lists.squeakfoundation.org

40 participants
97 discussions

Some Win32 ClipboardInterpreter still use squeakToMac, why???
by Nicolas Cellier 11 Jun '19

11 Jun '19

It seems to me that Clipboard primitives explicitely use UTF8 encoding on Win32 platforms. See for example https://github.com/OpenSmalltalk/opensmalltalk-vm/blob/aed5e3391301011cc6b9… /* Convert data to Unicode UTF16. */ MultiByteToWideChar( CP_UTF8, 0, cvt, -1, out, wcharsNeeded ); /* Send the Unicode text to the clipboard. */ EmptyClipboard(); SetClipboardData(CF_UNICODETEXT, h); and: /* Get clipboard data in Unicode format */ h = GetClipboardData(CF_UNICODETEXT); src = GlobalLock(h); /* How many bytes do we need to store the UTF8 representation? */ bytesNeeded = WideCharToMultiByte(CP_UTF8, 0, src, -1, NULL, 0, NULL, NULL ); /* Convert Unicode text to UTF8. */ cvt = tmp = malloc(bytesNeeded); WideCharToMultiByte(CP_UTF8, 0, src, -1, tmp, bytesNeeded, NULL, NULL); So it seems to me that: 1) all the squeakToMac sends found in various ClipboardInterpreter subclasses (the Win32 ones at least) are completely obsolete 2) all the exotic ClipboardInterpreter subclasse, but UTF8ClipboardInterpreter, are themselves obsolete and could be simply withdrawn from service Did I miss something, or can I use the high pressure cleaner in this area?

5 6

ScaledDecimal scale after calculation
by Bernhard Pieber 11 Jun '19

11 Jun '19

Hi, For my accounting I like to use ScaledDecimal, knowing it is just a fraction with a scale. I just stumbled upon the following: 0.1s * 0.5s. "0.0s1" The underlying fraction is correct (1/20). However, the scale is 1, which surprised me. Shouldn't the scale be 2? In VA Smalltalk which I use for accounting as well the multiplication results in 0.05s2, which I had expected. (It prints as 0.05, though.) Fraction>>#asScaledDecimal even has the needed code: "Convert the receiver to a ScaledDecimal. If there is a finite decimal representation of the receiver, then use the exact number of decimal places required. Else, use a default number of decimals." (1/20) asScaledDecimal. "0.05s2" Some other strangeness: 3s scale. "0" 3 asScaledDecimal scale. "0" 3s asScaledDecimal scale. "8" ScaledDecimal>>#asScaledDecimal should probably just return self. What do you think? - Bernhard

2 2

The Inbox: System-pre.1067.mcz
by commits＠source.squeak.org 11 Jun '19

11 Jun '19

Patrick Rein uploaded a new version of System to project The Inbox: http://source.squeak.org/inbox/System-pre.1067.mcz ==================== Summary ==================== Name: System-pre.1067 Author: pre Time: 11 June 2019, 4:55:47.644016 pm UUID: c33f640c-7adc-5844-97dc-4d679c4c980b Ancestors: System-fn.1066 Refactors the change set fileout protocol to remove some code duplication. This change would entail further removal of code duplication in ReadWriteStream added through an Etoys method. =============== Diff against System-fn.1066 =============== Item was changed: ----- Method: ChangeSet>>buildMessageForMailOutWithUser: (in category 'fileIn/Out') ----- buildMessageForMailOutWithUser: userName | message compressBuffer compressStream data compressedStream compressTarget | "prepare the message" message := MailMessage empty. message setField: 'from' toString: userName. message setField: 'to' toString: 'squeak-dev(a)lists.squeakfoundation.org'. message setField: 'subject' toString: (self chooseSubjectPrefixForEmail, name). message body: (MIMEDocument contentType: 'text/plain' content: (String streamContents: [ :str | str nextPutAll: 'from preamble:'; cr; cr. self fileOutPreambleOn: str ])). "Prepare the gzipped data" data := WriteStream on: String new. + self fileOutFullOn: data. - data header; timeStamp. - self fileOutPreambleOn: data. - self fileOutOn: data. - self fileOutPostscriptOn: data. - data trailer. data := ReadStream on: data contents. compressBuffer := ByteArray new: 1000. compressStream := GZipWriteStream on: (compressTarget := WriteStream on: (ByteArray new: 1000)). [data atEnd] whileFalse: [compressStream nextPutAll: (data nextInto: compressBuffer)]. compressStream close. compressedStream := ReadStream on: compressTarget contents asString. message addAttachmentFrom: compressedStream withName: (name, '.cs.gz'). ^ message! Item was changed: ----- Method: ChangeSet>>fileOut (in category 'fileIn/Out') ----- fileOut "File out the receiver, to a file whose name is a function of the change-set name and either of the date & time or chosen to have a unique numeric tag, depending on the preference 'changeSetVersionNumbers'" | slips nameToUse | self checkForConversionMethods. ChangeSet promptForDefaultChangeSetDirectoryIfNecessary. nameToUse := Preferences changeSetVersionNumbers ifTrue: [self defaultChangeSetDirectory nextNameFor: self name extension: FileStream cs] ifFalse: [self name , FileDirectory dot , Utilities dateTimeSuffix, FileDirectory dot , FileStream cs]. Cursor write showWhile: [ | internalStream | internalStream := WriteStream on: (String new: 10000). + self fileOutFullOn: internalStream. - internalStream header; timeStamp. - self fileOutPreambleOn: internalStream. - self fileOutOn: internalStream. - self fileOutPostscriptOn: internalStream. - internalStream trailer. FileStream writeSourceCodeFrom: internalStream baseName: (nameToUse copyFrom: 1 to: nameToUse size - 3) isSt: false useHtml: false. ]. Preferences checkForSlips ifFalse: [^ self]. slips := self checkForSlips. (slips size > 0 and: [UIManager default confirm: 'Changeset was filed out. Still, methods in this fileOut have halts\or references to the Transcript or other ''slips'' in them.\Would you like to browse them?' withCRs title: 'Browse Slips?']) ifTrue: [self systemNavigation browseMessageList: slips name: 'Possible slips in ' , name]! Item was added: + ----- Method: ChangeSet>>fileOutFullOn: (in category 'private') ----- + fileOutFullOn: aStream + + aStream header; timeStamp. + self fileOutMainPartOn: aStream. + aStream trailer.! Item was added: + ----- Method: ChangeSet>>fileOutMainPartOn: (in category 'private') ----- + fileOutMainPartOn: aStream + + self + fileOutPreambleOn: aStream; + fileOutOn: aStream; + fileOutPostscriptOn: aStream.! Item was changed: ----- Method: WriteStream>>fileOutChangeSet:andObject: (in category '*System-Object Storage-fileIn/Out') ----- fileOutChangeSet: aChangeSetOrNil andObject: theObject "Write a file that has both the source code for the named class and an object as bits. Any instance-specific object will get its class written automatically." "An experimental version to fileout a changeSet first so that a project can contain its own classes" self setFileTypeToObject. "Type and Creator not to be text, so can attach correctly to an email msg" self header; timeStamp. aChangeSetOrNil ifNotNil: [ + aChangeSetOrNil fileOutMainPartOn: self. - aChangeSetOrNil fileOutPreambleOn: self. - aChangeSetOrNil fileOutOn: self. - aChangeSetOrNil fileOutPostscriptOn: self. ]. self trailer. "Does nothing for normal files. HTML streams will have trouble with object data" "Append the object's raw data" (SmartRefStream on: self) nextPut: theObject; "and all subobjects" close. "also closes me" !

1 0

The Trunk: Tools-pre.848.mcz
by commits＠source.squeak.org 11 Jun '19

11 Jun '19

Patrick Rein uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-pre.848.mcz ==================== Summary ==================== Name: Tools-pre.848 Author: pre Time: 11 June 2019, 4:52:22.536016 pm UUID: 75c0a180-4085-1d40-818c-efa53514ce40 Ancestors: Tools-nice.847 Adds drag support to change sorters =============== Diff against Tools-nice.847 =============== Item was changed: ----- Method: ChangeSorter>>buildWith:in:rect: (in category 'toolbuilder') ----- buildWith: builder in: window rect: rect | csListHeight msgListHeight csMsgListHeight listSpec textSpec | contents := ''. csListHeight := 0.25. msgListHeight := 0.25. csMsgListHeight := csListHeight + msgListHeight. listSpec := builder pluggableListSpec new. listSpec model: self; list: #changeSetList; getSelected: #currentCngSet; setSelected: #showChangeSetNamed:; menu: #changeSetMenu:shifted:; keyPress: #changeSetListKey:from:; + dragItem: #drag:; autoDeselect: false; frame: (((0@0 extent: 0.5@csListHeight) scaleBy: rect extent) translateBy: rect origin). window children add: listSpec. listSpec := builder pluggableListSpec new. listSpec model: self; list: #classList; getSelected: #currentClassName; setSelected: #currentClassName:; menu: #classListMenu:shifted:; keyPress: #classListKey:from:; frame: (((0.5@0 extent: 0.5@csListHeight) scaleBy: rect extent) translateBy: rect origin). window children add: listSpec. listSpec := builder pluggableListSpec new. listSpec model: self; list: #messageList; getSelected: #currentSelector; setSelected: #currentSelector:; menu: #messageMenu:shifted:; keyPress: #messageListKey:from:; frame: (((0@csListHeight extent: 1@msgListHeight) scaleBy: rect extent) translateBy: rect origin). window children add: listSpec. textSpec := builder pluggableTextSpec new. textSpec model: self; getText: #contents; setText: #contents:notifying:; selection: #contentsSelection; menu: #codePaneMenu:shifted:; frame: (((0@csMsgListHeight corner: 1@1) scaleBy: rect extent) translateBy: rect origin). window children add: textSpec. ^window! Item was added: + ----- Method: ChangeSorter>>drag: (in category 'dropping/grabbing') ----- + drag: anIndex + + anIndex = 0 ifTrue: [^ nil]. + ^ ChangesOrganizer changeSetNamed: (self changeSetList at: anIndex) !

1 0

The Inbox: Network-cbc.234.mcz
by commits＠source.squeak.org 11 Jun '19

11 Jun '19

Chris Cunningham uploaded a new version of Network to project The Inbox: http://source.squeak.org/inbox/Network-cbc.234.mcz ==================== Summary ==================== Name: Network-cbc.234 Author: cbc Time: 7 June 2019, 12:56:17.741581 pm UUID: a2081791-f54f-40fd-bd59-b8da1d52265d Ancestors: Network-pre.233 Password was very specific for ServerDirectory. Re-factor Password into a more generic password holder (usuable in other classes). Create ServerPassword as a sub-class of Password with necessary specilizations moved down to it. Make ServcieDirectory point to ServerPassword. This allows us to use Password generally to store a password in memory (encoded) during a Squeak session, which is cleared out when saving. The intended use case is to not store passwords in code or in the file system - instead prompt the user at first use and cache it for the rest of the life of the session. =============== Diff against Network-pre.233 =============== Item was changed: Object subclass: #Password + instanceVariableNames: 'cache' - instanceVariableNames: 'cache sequence' classVariableNames: '' poolDictionaries: '' category: 'Network-Kernel'! + !Password commentStamp: 'cbc 6/7/2019 11:19' prior: 0! + "Hold a password in memory during a run of the app. - !Password commentStamp: 'pre 12/11/2018 15:53' prior: 0! - "Hold a password. There are three ways to get the password. + After each save (after each startup), when an applicaiton asks for a password, one of two things will happen: + 1> the user will be prompted for the password + 2> If the user was previously prompted, return that password - If there is no password (sequence == nil), ask the user for it. + Passwords are stored encoded. + At shutDown, passwords are cleared (will not be written to disc). - If the user supplied one during this session, return that. It is cleared at shutDown. + The intent for this class is to avoid storing passwords in code or on files on the system. Instead, prompt the user during the running of the application."! - If sequence is a number, get the server passwords off the disk. File 'sqk.info' must be in the same folder 'Squeak.sources' file. Decode the file. Return the password indexed by sequence."! Item was changed: ----- Method: Password>>cache: (in category 'accessing') ----- cache: anObject + "if anObject is nil, then clear out cache - don't store values to disc" + anObject ifNil: [^cache := nil]. + "Otherwise, 'encode' (trivially) the password while it resides in memory - no plain text" + cache := self decode: anObject! - cache := anObject! Item was removed: - ----- Method: Password>>passwordFor: (in category 'accessing') ----- - passwordFor: serverDir - "Returned the password from one of many sources. OK if send in a nil arg." - - | sp msg | - cache ifNotNil: [^ cache]. - sequence ifNotNil: [ - (sp := self serverPasswords) ifNotNil: [ - sequence <= sp size ifTrue: [^ sp at: sequence]]]. - msg := serverDir isRemoteDirectory - ifTrue: [serverDir moniker] - ifFalse: ['this directory']. - (serverDir user = 'anonymous') & (serverDir typeWithDefault == #ftp) ifTrue: [ - ^ cache := UIManager default request: 'Please let this anonymous ftp\server know your email address.\This is the polite thing to do.' withCRs - initialAnswer: 'yourName(a)company.com']. - - ^ cache := UIManager default requestPassword: 'Password for ', serverDir user, ' at ', msg, ':'. - "Diff between empty string and abort?"! Item was added: + ----- Method: Password>>passwordForMessage: (in category 'accessing') ----- + passwordForMessage: msg + cache ifNotNil: [^self decode: cache]. "Our stored value is encoded" + ^self decode: (cache := self decode: (UIManager default requestPassword: 'Password for ', msg, ':')).! Item was removed: - ----- Method: Password>>sequence (in category 'accessing') ----- - sequence - ^sequence! Item was removed: - ----- Method: Password>>sequence: (in category 'accessing') ----- - sequence: anNumber - sequence := anNumber! Item was removed: - ----- Method: Password>>serverPasswords (in category 'accessing') ----- - serverPasswords - "Get the server passwords off the disk and decode them. The file 'sqk.info' must be in some folder that Squeak thinks is special (vm folder, or default directory). (Note: This code works even if you are running with no system sources file.)" - - | sfile | - (sfile := FileDirectory lookInUsualPlaces: 'sqk.info') ifNil: [^ nil]. - "If not there, Caller will ask user for password" - "If you don't have this file, and you really do want to release an update, - contact Ted Kaehler." - ^ (self decode: (sfile contentsOfEntireFile)) lines - ! Item was changed: ----- Method: ServerDirectory>>password (in category 'accessing') ----- password + passwordHolder ifNil: [passwordHolder := ServerPassword new]. - passwordHolder ifNil: [passwordHolder := Password new]. ^ passwordHolder passwordFor: self "may ask the user"! Item was changed: ----- Method: ServerDirectory>>password: (in category 'accessing') ----- password: pp + passwordHolder := ServerPassword new. - passwordHolder := Password new. pp isString ifTrue: [passwordHolder cache: pp. ^ self]. pp isInteger ifTrue: [passwordHolder sequence: pp] ifFalse: [passwordHolder := pp].! Item was changed: ----- Method: ServerDirectory>>passwordSequence: (in category 'accessing') ----- passwordSequence: aNumber + passwordHolder ifNil: [passwordHolder := ServerPassword new]. - passwordHolder ifNil: [passwordHolder := Password new]. passwordHolder sequence: aNumber! Item was added: + Password subclass: #ServerPassword + instanceVariableNames: 'sequence' + classVariableNames: '' + poolDictionaries: '' + category: 'Network-Kernel'! + + !ServerPassword commentStamp: 'cbc 6/7/2019 11:15' prior: 0! + "Hold a password. There are three ways to get the password. + + If there is no password (sequence == nil), ask the user for it. + + If the user supplied one during this session, return that. It is cleared at shutDown. + + If sequence is a number, get the server passwords off the disk. File 'sqk.info' must be in the same folder 'Squeak.sources' file. Decode the file. Return the password indexed by sequence."! Item was added: + ----- Method: ServerPassword>>cache: (in category 'accessing') ----- + cache: anObject + cache := anObject! Item was added: + ----- Method: ServerPassword>>passwordFor: (in category 'accessing') ----- + passwordFor: serverDir + "Returned the password from one of many sources. OK if send in a nil arg." + + | sp msg | + cache ifNotNil: [^ cache]. + sequence ifNotNil: [ + (sp := self serverPasswords) ifNotNil: [ + sequence <= sp size ifTrue: [^ sp at: sequence]]]. + msg := serverDir isRemoteDirectory + ifTrue: [serverDir moniker] + ifFalse: ['this directory']. + (serverDir user = 'anonymous') & (serverDir typeWithDefault == #ftp) ifTrue: [ + ^ cache := UIManager default request: 'Please let this anonymous ftp\server know your email address.\This is the polite thing to do.' withCRs + initialAnswer: 'yourName(a)company.com']. + + ^ cache := UIManager default requestPassword: 'Password for ', serverDir user, ' at ', msg, ':'. + "Diff between empty string and abort?"! Item was added: + ----- Method: ServerPassword>>sequence (in category 'accessing') ----- + sequence + ^sequence! Item was added: + ----- Method: ServerPassword>>sequence: (in category 'accessing') ----- + sequence: anNumber + sequence := anNumber! Item was added: + ----- Method: ServerPassword>>serverPasswords (in category 'accessing') ----- + serverPasswords + "Get the server passwords off the disk and decode them. The file 'sqk.info' must be in some folder that Squeak thinks is special (vm folder, or default directory). (Note: This code works even if you are running with no system sources file.)" + + | sfile | + (sfile := FileDirectory lookInUsualPlaces: 'sqk.info') ifNil: [^ nil]. + "If not there, Caller will ask user for password" + "If you don't have this file, and you really do want to release an update, + contact Ted Kaehler." + ^ (self decode: (sfile contentsOfEntireFile)) lines + !

2 1

The Trunk: SMBase-nice.142.mcz
by commits＠source.squeak.org 11 Jun '19

11 Jun '19

Nicolas Cellier uploaded a new version of SMBase to project The Trunk: http://source.squeak.org/trunk/SMBase-nice.142.mcz ==================== Summary ==================== Name: SMBase-nice.142 Author: nice Time: 11 June 2019, 11:32:00.824371 am UUID: 28fcc52c-499a-2246-8ad5-49ac6355c95d Ancestors: SMBase-cmm.141 Stop sending squeakToIso =============== Diff against SMBase-cmm.141 =============== Item was changed: ----- Method: SMUtilities class>>mail:subject:message: (in category 'private') ----- mail: anAccount subject: sub message: msg "Send a mail to the holder of <anAccount>." SMTPClient deliverMailFrom: 'squeakmap(a)squeak.org' to: {anAccount email} text: ('From: SqueakMap <squeakmap(a)squeak.org> To: ', anAccount email, ' Subject: ', sub, ' + ', msg, (self randomPhrase), ', SqueakMap') usingServer: MailServer! - ', msg, (self randomPhrase), ', SqueakMap') squeakToIso usingServer: MailServer!

1 0

The Trunk: Network-nice.234.mcz
by commits＠source.squeak.org 11 Jun '19

11 Jun '19

Nicolas Cellier uploaded a new version of Network to project The Trunk: http://source.squeak.org/trunk/Network-nice.234.mcz ==================== Summary ==================== Name: Network-nice.234 Author: nice Time: 11 June 2019, 11:22:42.438371 am UUID: d5e36e0b-da09-e947-8622-e490f6a52f47 Ancestors: Network-pre.233 Stop sending squeakToIso / isoToSqueak. These methods are no longer needed (at least since 2005!!!) I don't know if removing such small spots of rust makes sense when the whole package may already have returned to dust, but such cleaning cannot hurt. =============== Diff against Network-pre.233 =============== Item was changed: ----- Method: PRServerDirectory>>getLines (in category 'private') ----- getLines "private - answer a collection of lines with the server response" | url lines string | url := self urlFromServer: self server directories: {'programmatic'} , self directories. url := url , self slash. string := Cursor read showWhile: [(HTTPSocket httpGetDocument: url) contents]. (string beginsWith: '--OK--') ifFalse: [^ nil]. lines := OrderedCollection new. (string allButFirst: 6) + linesDo: [:line | lines add: line]. - linesDo: [:line | lines add: line squeakToIso]. ^ lines! Item was changed: ----- Method: PRServerDirectory>>getPostArgsFromProject:fileNamed:fromDirectory: (in category 'private') ----- getPostArgsFromProject: aProject fileNamed: fileNameString fromDirectory: localDirectory | args thumbnail uploader | args := Dictionary new. "args at: 'contents' put: {(localDirectory oldFileNamed: fileNameString) contentsOfEntireFile}." args at: 'contents' put: {(StandardFileStream readOnlyFileNamed: (localDirectory fullNameFor: fileNameString)) contentsOfEntireFile}. + args at: 'name' put: {aProject name}. - args at: 'name' put: {aProject name isoToSqueak}. args at: 'version' put: {(Project parseProjectFileName: fileNameString) second asString}. args at: 'language' put: {aProject naturalLanguage asString}. uploader := Utilities authorNamePerSe. uploader isEmptyOrNil ifTrue: [uploader := Utilities authorInitialsPerSe]. uploader isEmptyOrNil ifFalse: [args at: 'uploader' put: {uploader}]. self putSmalltalkInfoInto: args. thumbnail := self getProjectThumbnail: aProject. thumbnail isNil ifFalse: [args at: 'thumbnailcontents' put: {thumbnail}]. self putProjectDetailsFrom: aProject to: args. ^ args! Item was changed: ----- Method: PRServerDirectory>>putProjectDetailsFrom:to: (in category 'private') ----- putProjectDetailsFrom: aProject to: args | projectDetails | projectDetails := aProject world valueOfProperty: #ProjectDetails ifAbsent: [^ self]. "" self flag: #todo. "projectname ?" projectDetails at: 'projectdescription' + ifPresent: [:value | args at: 'description' put: {value}]. - ifPresent: [:value | args at: 'description' put: {value isoToSqueak}]. projectDetails at: 'projectauthor' + ifPresent: [:value | args at: 'author' put: {value}]. - ifPresent: [:value | args at: 'author' put: {value isoToSqueak}]. projectDetails at: 'projectcategory' + ifPresent: [:value | args at: 'category' put: {value}]. - ifPresent: [:value | args at: 'category' put: {value isoToSqueak}]. projectDetails at: 'projectsubcategory' + ifPresent: [:value | args at: 'subcategory' put: {value}]. - ifPresent: [:value | args at: 'subcategory' put: {value isoToSqueak}]. projectDetails at: 'projectkeywords' + ifPresent: [:value | args at: 'keywords' put: {value}]! - ifPresent: [:value | args at: 'keywords' put: {value isoToSqueak}]! Item was changed: ----- Method: PRServerDirectory>>putSmalltalkInfoInto: (in category 'private') ----- putSmalltalkInfoInto: args "private - fills args with information from Smalltalk" self flag: #todo. " lastest small-land changeset / small-land version " #(#datedVersion #osVersion #platformName #platformSubtype #vmPath #vmVersion #imageName #changesName #sourcesName #listBuiltinModules #listLoadedModules #getVMParameters ) do: [:each | | value | value := Smalltalk perform: each. + args at: 'extra-' , each asString put: {value asString}]! - args at: 'extra-' , each asString put: {value asString isoToSqueak}]!

1 0

The Trunk: Multilingual-nice.244.mcz
by commits＠source.squeak.org 11 Jun '19

11 Jun '19

Nicolas Cellier uploaded a new version of Multilingual to project The Trunk: http://source.squeak.org/trunk/Multilingual-nice.244.mcz ==================== Summary ==================== Name: Multilingual-nice.244 Author: nice Time: 11 June 2019, 11:15:08.896371 am UUID: 94dda6ba-be79-f343-a57a-58cd0d96a0fb Ancestors: Multilingual-nice.243 Move Etoys specific font reading methods back to Etoys package. Note that those methods depends on other methods that did remain in Etoys package: we need to move either all, or none of these specific methods, but better not some. =============== Diff against Multilingual-nice.243 =============== Item was removed: - ----- Method: EFontBDFFontReaderForRanges>>readCharactersInRanges2:storeInto: (in category 'reading') ----- - readCharactersInRanges2: ranges storeInto: chars - - | array form code rangeStream in | - rangeStream := ReadStream on: ranges. - [true] whileTrue: [ - array := self readOneCharacter. - array second ifNil: [^ self]. - code := array at: 2. - in := false. - ranges do: [:range | - (code between: range first and: range last) ifTrue: [ - in := true. - ]. - ]. - in ifTrue: [ - form := array at: 1. - form ifNotNil: [ - chars add: array. - ]. - ]. - ]. - ! Item was removed: - ----- Method: EFontBDFFontReaderForRanges>>readRangesForSimplifiedChinese:overrideWith:otherRanges:additionalOverrideRange: (in category 'reading') ----- - readRangesForSimplifiedChinese: ranges overrideWith: otherFileName otherRanges: otherRanges additionalOverrideRange: additionalRange - - | xTable strikeWidth glyphs ascent descent minAscii maxAscii maxWidth chars charsNum height form encoding bbx width blt lastAscii pointSize ret lastValue start end | - form := encoding := bbx := nil. - self initialize. - self readAttributes. - height := Integer readFromString: ((properties at: #FONTBOUNDINGBOX) at: 2). - ascent := Integer readFromString: (properties at: 'FONT_ASCENT' asSymbol) first. - descent := Integer readFromString: (properties at: 'FONT_DESCENT' asSymbol) first. - (properties includesKey: 'POINT_SIZE' asSymbol) ifTrue: [ - pointSize := (Integer readFromString: (properties at: 'POINT_SIZE' asSymbol) first) // 10. - ] ifFalse: [ - pointSize := (ascent + descent) * 72 // 96. - ]. - - - maxWidth := 0. - minAscii := 16r200000. - strikeWidth := 0. - maxAscii := 0. - - charsNum := Integer readFromString: (properties at: #CHARS) first. - chars := Set new: charsNum. - - self readCharactersInRanges2: ranges storeInto: chars. - chars := self override2: chars with: otherFileName ranges: otherRanges transcodingTable: (UCSTable jisx0208Table) additionalRange: additionalRange. - - chars := chars sorted: [:x :y | (x at: 2) <= (y at: 2)]. - charsNum := chars size. "undefined encodings make this different" - - chars do: [:array | - encoding := array at: 2. - bbx := array at: 3.. - width := bbx at: 1. - maxWidth := maxWidth max: width. - minAscii := minAscii min: encoding. - maxAscii := maxAscii max: encoding. - strikeWidth := strikeWidth + width. - ]. - - glyphs := Form extent: strikeWidth@height. - blt := BitBlt toForm: glyphs. - start := ((ranges collect: [:r | r first]), (additionalRange collect: [:r2 | r2 first])) min. - end := ((ranges collect: [:r | r second]), (additionalRange collect: [:r2 | r2 second])) max + 3. - "xRange := Array with: (Array with: ((ranges collect: [:r | r first]), (additionalRange collect: [:r2 | r2 first])) min - with: (((ranges collect: [:r | r second]), (additionalRange collect: [:r2 | r2 second])) max + 2))." - "xTable := XTableForUnicodeFont new - ranges: xRange." - xTable := SparseLargeTable new: end chunkSize: 64 arrayClass: Array base: start defaultValue: -1. - lastAscii := start. - xTable at: lastAscii + 2 put: 0. - 1 to: charsNum do: [:i | - form := (chars at: i) first. - encoding := (chars at: i) second. - bbx := (chars at: i) third. - "lastAscii+1 to: encoding-1 do: [:a | xTable at: a+2 put: (xTable at: a+1)]." - lastValue := xTable at: lastAscii + 1 + 1. - xTable at: encoding + 1 put: lastValue. - blt copy: (((xTable at: encoding+1)@(ascent - (bbx at: 2) - (bbx at: 4))) - extent: (bbx at: 1)@(bbx at: 2)) - from: 0@0 in: form. - xTable at: encoding+2 put: (xTable at: encoding+1)+(bbx at: 1). - lastAscii := encoding. - ]. - xTable at: xTable size put: (xTable at: xTable size - 1). - xTable zapDefaultOnlyEntries. - ret := Array new: 8. - ret at: 1 put: xTable. - ret at: 2 put: glyphs. - ret at: 3 put: minAscii. - ret at: 4 put: maxAscii. - ret at: 5 put: maxWidth. - ret at: 6 put: ascent. - ret at: 7 put: descent. - ret at: 8 put: pointSize. - ^ret. - " ^{xTable. glyphs. minAscii. maxAscii. maxWidth. ascent. descent. pointSize}" - !

1 0

The Trunk: EToys-nice.343.mcz
by commits＠source.squeak.org 11 Jun '19

11 Jun '19

Nicolas Cellier uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-nice.343.mcz ==================== Summary ==================== Name: EToys-nice.343 Author: nice Time: 11 June 2019, 11:08:46.028371 am UUID: 31d65fd7-f312-e74b-b70f-7c2ef66d97b6 Ancestors: EToys-cmm.342 1) Classify Etoys specific font reading methods back to Etoys. We can either move all the methods to Multilingual, or none, but not some... 2) Stop sending squeakToIso and isoToSqueak which are no longer needed at least since 2005. =============== Diff against EToys-cmm.342 =============== Item was changed: + ----- Method: EFontBDFFontReaderForRanges>>additionalRangesForSimplifiedChinese (in category '*Etoys-Squeakland-font reading') ----- - ----- Method: EFontBDFFontReaderForRanges>>additionalRangesForSimplifiedChinese (in category '*Etoys-Squeakland-as yet unclassified') ----- additionalRangesForSimplifiedChinese | basics | basics := { {16rFF00. 16rFF60} }. ^ basics ! Item was changed: + ----- Method: EFontBDFFontReaderForRanges>>override2:with:ranges:transcodingTable:additionalRange: (in category '*Etoys-Squeakland-font reading') ----- - ----- Method: EFontBDFFontReaderForRanges>>override2:with:ranges:transcodingTable:additionalRange: (in category '*Etoys-Squeakland-as yet unclassified') ----- override2: chars with: otherFileName ranges: pairArray transcodingTable: table additionalRange: additionalRanges | other newChars form u j in newArray | other := BDFFontReader readOnlyFileNamed: otherFileName. newChars := PluggableSet new. newChars hashBlock: [:elem | (elem at: 2) hash]. newChars equalBlock: [:a :b | (a at: 2) = (b at: 2)]. other readChars do: [:array | j := array at: 2. u := table at: (((j // 256) - 33 * 94 + ((j \\ 256) - 33)) + 1). u ~= -1 ifTrue: [ u hex printString displayAt: 0@0. in := false. pairArray do: [:pair | (u between: pair first and: pair second) ifTrue: [ in := true ] ]. in ifTrue: [ form := array at: 1. form ifNotNil: [ newArray := array shallowCopy. newArray at: 2 put: u. newChars add: newArray. ]. ]. ]. ]. newChars addAll: chars. ^ newChars. ! Item was changed: + ----- Method: EFontBDFFontReaderForRanges>>rangesForSimplifiedChinese (in category '*Etoys-Squeakland-font reading') ----- - ----- Method: EFontBDFFontReaderForRanges>>rangesForSimplifiedChinese (in category '*Etoys-Squeakland-as yet unclassified') ----- rangesForSimplifiedChinese | basics etc | basics := { Array with: 16rA1 with: 16rFF }. etc := { Array with: 16r100 with: 16r17F. "extended latin" Array with: 16r370 with: 16r3FF. "greek" Array with: 16r400 with: 16r52F. "cyrillic" Array with: 16r2000 with: 16r206F. "general punctuation" Array with: 16r2100 with: 16r214F. "letterlike" Array with: 16r2150 with: 16r218F. "number form" Array with: 16r2190 with: 16r21FF. "arrows" Array with: 16r2200 with: 16r22FF. "math operators" Array with: 16r2300 with: 16r23FF. "misc tech" Array with: 16r2460 with: 16r24FF. "enclosed alnum" Array with: 16r2500 with: 16r257F. "box drawing" Array with: 16r2580 with: 16r259F. "box elem" Array with: 16r25A0 with: 16r25FF. "geometric shapes" Array with: 16r2600 with: 16r26FF. "misc symbols" Array with: 16r3000 with: 16r303F. "cjk symbols" Array with: 16r3040 with: 16r309F. "hiragana" Array with: 16r30A0 with: 16r30FF. "katakana" Array with: 16r3190 with: 16r319F. "kanbun" Array with: 16r31F0 with: 16r31FF. "katakana extension" Array with: 16r3200 with: 16r32FF. "enclosed CJK" Array with: 16r3300 with: 16r33FF. "CJK compatibility" Array with: 16r4E00 with: 16r9FAF. "CJK ideograph" Array with: 16rAC00 with: 16rD7AF. "Hangul Syllables" Array with: 16rF900 with: 16rFAFF. "CJK compatiblity ideograph" Array with: 16rFF00 with: 16rFFEF. "half and full" }. ^ basics, etc. ! Item was changed: + ----- Method: EFontBDFFontReaderForRanges>>readCharactersInRanges2:storeInto: (in category '*Etoys-Squeakland-font reading') ----- - ----- Method: EFontBDFFontReaderForRanges>>readCharactersInRanges2:storeInto: (in category '*Etoys-Squeakland-as yet unclassified') ----- readCharactersInRanges2: ranges storeInto: chars | array form code rangeStream in | rangeStream := ReadStream on: ranges. [true] whileTrue: [ array := self readOneCharacter. array second ifNil: [^ self]. code := array at: 2. in := false. ranges do: [:range | (code between: range first and: range last) ifTrue: [ in := true. ]. ]. in ifTrue: [ form := array at: 1. form ifNotNil: [ chars add: array. ]. ]. ]. ! Item was changed: + ----- Method: EFontBDFFontReaderForRanges>>readRangesForSimplifiedChinese:overrideWith:otherRanges:additionalOverrideRange: (in category '*Etoys-Squeakland-font reading') ----- - ----- Method: EFontBDFFontReaderForRanges>>readRangesForSimplifiedChinese:overrideWith:otherRanges:additionalOverrideRange: (in category '*Etoys-Squeakland-as yet unclassified') ----- readRangesForSimplifiedChinese: ranges overrideWith: otherFileName otherRanges: otherRanges additionalOverrideRange: additionalRange | xTable strikeWidth glyphs ascent descent minAscii maxAscii maxWidth chars charsNum height form encoding bbx width blt lastAscii pointSize ret lastValue start end | form := encoding := bbx := nil. self initialize. self readAttributes. height := Integer readFromString: ((properties at: #FONTBOUNDINGBOX) at: 2). ascent := Integer readFromString: (properties at: 'FONT_ASCENT' asSymbol) first. descent := Integer readFromString: (properties at: 'FONT_DESCENT' asSymbol) first. (properties includesKey: 'POINT_SIZE' asSymbol) ifTrue: [ pointSize := (Integer readFromString: (properties at: 'POINT_SIZE' asSymbol) first) // 10. ] ifFalse: [ pointSize := (ascent + descent) * 72 // 96. ]. maxWidth := 0. minAscii := 16r200000. strikeWidth := 0. maxAscii := 0. charsNum := Integer readFromString: (properties at: #CHARS) first. chars := Set new: charsNum. self readCharactersInRanges2: ranges storeInto: chars. chars := self override2: chars with: otherFileName ranges: otherRanges transcodingTable: (UCSTable jisx0208Table) additionalRange: additionalRange. chars := chars sorted: [:x :y | (x at: 2) <= (y at: 2)]. charsNum := chars size. "undefined encodings make this different" chars do: [:array | encoding := array at: 2. bbx := array at: 3.. width := bbx at: 1. maxWidth := maxWidth max: width. minAscii := minAscii min: encoding. maxAscii := maxAscii max: encoding. strikeWidth := strikeWidth + width. ]. glyphs := Form extent: strikeWidth@height. blt := BitBlt toForm: glyphs. start := ((ranges collect: [:r | r first]), (additionalRange collect: [:r2 | r2 first])) min. end := ((ranges collect: [:r | r second]), (additionalRange collect: [:r2 | r2 second])) max + 3. "xRange := Array with: (Array with: ((ranges collect: [:r | r first]), (additionalRange collect: [:r2 | r2 first])) min with: (((ranges collect: [:r | r second]), (additionalRange collect: [:r2 | r2 second])) max + 2))." "xTable := XTableForUnicodeFont new ranges: xRange." xTable := SparseLargeTable new: end chunkSize: 64 arrayClass: Array base: start defaultValue: -1. lastAscii := start. xTable at: lastAscii + 2 put: 0. 1 to: charsNum do: [:i | form := (chars at: i) first. encoding := (chars at: i) second. bbx := (chars at: i) third. "lastAscii+1 to: encoding-1 do: [:a | xTable at: a+2 put: (xTable at: a+1)]." lastValue := xTable at: lastAscii + 1 + 1. xTable at: encoding + 1 put: lastValue. blt copy: (((xTable at: encoding+1)@(ascent - (bbx at: 2) - (bbx at: 4))) extent: (bbx at: 1)@(bbx at: 2)) from: 0@0 in: form. xTable at: encoding+2 put: (xTable at: encoding+1)+(bbx at: 1). lastAscii := encoding. ]. xTable at: xTable size put: (xTable at: xTable size - 1). xTable zapDefaultOnlyEntries. ret := Array new: 8. ret at: 1 put: xTable. ret at: 2 put: glyphs. ret at: 3 put: minAscii. ret at: 4 put: maxAscii. ret at: 5 put: maxWidth. ret at: 6 put: ascent. ret at: 7 put: descent. ret at: 8 put: pointSize. ^ret. " ^{xTable. glyphs. minAscii. maxAscii. maxWidth. ascent. descent. pointSize}" ! Item was changed: ----- Method: String>>replaceHtmlCharRefs (in category '*Etoys-internet') ----- replaceHtmlCharRefs | pos ampIndex scIndex special specialValue outString outPos newOutPos | outString := String new: self size. outPos := 0. pos := 1. [ pos <= self size ] whileTrue: [ "read up to the next ampersand" ampIndex := self indexOf: $& startingAt: pos ifAbsent: [0]. ampIndex = 0 ifTrue: [ pos = 1 ifTrue: [ ^self ] ifFalse: [ ampIndex := self size+1 ] ]. newOutPos := outPos + ampIndex - pos. outString replaceFrom: outPos + 1 to: newOutPos with: self startingAt: pos. outPos := newOutPos. pos := ampIndex. ampIndex <= self size ifTrue: [ "find the $;" scIndex := self indexOf: $; startingAt: ampIndex ifAbsent: [ self size + 1 ]. special := self copyFrom: ampIndex+1 to: scIndex-1. specialValue := HtmlEntity valueOfHtmlEntity: special. specialValue ifNil: [ "not a recognized entity. wite it back" scIndex > self size ifTrue: [ scIndex := self size ]. newOutPos := outPos + scIndex - ampIndex + 1. outString replaceFrom: outPos+1 to: newOutPos with: self startingAt: ampIndex. outPos := newOutPos.] ifNotNil: [ outPos := outPos + 1. + outString at: outPos put: specialValue]. - outString at: outPos put: specialValue isoToSqueak.]. pos := scIndex + 1. ]. ]. ^outString copyFrom: 1 to: outPos! Item was changed: ----- Method: UTF32CNInputInterpreter>>nextCharFrom:firstEvt: (in category 'as yet unclassified') ----- nextCharFrom: sensor firstEvt: evtBuf | keyValue | keyValue := evtBuf at: 6. keyValue < 256 + ifTrue: [^Character value: keyValue]. - ifTrue: [^ (Character value: keyValue) squeakToIso]. ^ Character leadingChar: SimplifiedChineseEnvironment leadingChar code: keyValue! Item was changed: ----- Method: UTF32GreekInputInterpreter>>nextCharFrom:firstEvt: (in category 'as yet unclassified') ----- nextCharFrom: sensor firstEvt: evtBuf | keyValue | keyValue := evtBuf at: 6. keyValue < 256 + ifTrue: [^Character value: keyValue]. - ifTrue: [^ (Character value: keyValue) squeakToIso]. ^ Character leadingChar: GreekEnvironment leadingChar code: keyValue! Item was changed: ----- Method: UTF32NPInputInterpreter>>nextCharFrom:firstEvt: (in category 'all') ----- nextCharFrom: sensor firstEvt: evtBuf | keyValue | keyValue := evtBuf at: 6. keyValue < 256 + ifTrue: [^Character value: keyValue]. - ifTrue: [^ (Character value: keyValue) squeakToIso]. ^ Character leadingChar: NepaleseEnvironment leadingChar code: keyValue!

1 0

The Trunk: Multilingual-nice.243.mcz
by commits＠source.squeak.org 11 Jun '19

11 Jun '19

Nicolas Cellier uploaded a new version of Multilingual to project The Trunk: http://source.squeak.org/trunk/Multilingual-nice.243.mcz ==================== Summary ==================== Name: Multilingual-nice.243 Author: nice Time: 11 June 2019, 10:45:54.414371 am UUID: 94df4c4d-9cfc-0f4d-a971-221a81efe382 Ancestors: Multilingual-pre.242 As its comment tells, squeakToIso is no longer needed, at least since 2005. The grace delay has been exceptionnally long, but time has come to stop sending it, YAGNI. Both squeakToIso and isToSqueak are good candidates for deprecation. =============== Diff against Multilingual-pre.242 =============== Item was changed: ----- Method: MacUnicodeInputInterpreter>>nextCharFrom:firstEvt: (in category 'keyboard') ----- nextCharFrom: sensor firstEvt: evtBuf | keyValue mark | keyValue := evtBuf at: 6. mark := self japaneseSpecialMark: keyValue. mark notNil ifTrue: [^ mark]. keyValue < 256 + ifTrue: [^Character value: keyValue]. - ifTrue: [^ (Character value: keyValue) squeakToIso]. "Smalltalk systemLanguage charsetClass charFromUnicode: keyValue." ^ Unicode value: keyValue! Item was changed: ----- Method: UTF32JPInputInterpreter>>nextCharFrom:firstEvt: (in category 'keyboard') ----- nextCharFrom: sensor firstEvt: evtBuf | keyValue mark | keyValue := evtBuf at: 6. keyValue = 0 ifTrue: [keyValue := evtBuf at: 3]. mark := self japaneseSpecialMark: keyValue. mark notNil ifTrue: [^ mark]. keyValue < 256 + ifTrue: [^Character value: keyValue]. - ifTrue: [^ (Character value: keyValue) squeakToIso]. ^ Character leadingChar: JapaneseEnvironment leadingChar code: keyValue! Item was changed: ----- Method: UTF32RussianInputInterpreter>>nextCharFrom:firstEvt: (in category 'keyboard') ----- nextCharFrom: sensor firstEvt: evtBuf | keyValue | keyValue := evtBuf at: 6. keyValue < 256 + ifTrue: [^Character value: keyValue]. - ifTrue: [^ (Character value: keyValue) squeakToIso]. ^ Character leadingChar: RussianEnvironment leadingChar code: keyValue!

1 0

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