Squeak-dev March 2022

squeak-dev@lists.squeakfoundation.org

33 participants
303 discussions

The Trunk: Morphic-mt.1926.mcz
by commits＠source.squeak.org 04 Mar '22

04 Mar '22

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1926.mcz ==================== Summary ==================== Name: Morphic-mt.1926 Author: mt Time: 4 March 2022, 2:23:33.61963 pm UUID: d751ffb8-04d8-0440-8c85-85150e3598fd Ancestors: Morphic-mt.1925 No redundant text compositions for shrink-wrapped text morphs anymore. Must recompose so that their paragraph will notice what's going on. =============== Diff against Morphic-mt.1925 =============== Item was changed: + (PackageInfo named: 'Morphic') postscript: '"No redundant text compositions for shrink-wrapped text morphs anymore. Must recompose so that their paragraph will notice what''s going on." + TextMorph allSubInstancesDo: [:tm | tm hResizing = #shrinkWrap ifTrue: [tm composeToBounds]].'! - (PackageInfo named: 'Morphic') postscript: '"Text fields now make room for #keyboardFocusWidth. Can be disabled via #useCompactTextFields:." - UserInterfaceTheme cleanUpAndReset.'!

1 0

The Trunk: Morphic-mt.1925.mcz
by commits＠source.squeak.org 04 Mar '22

04 Mar '22

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1925.mcz ==================== Summary ==================== Name: Morphic-mt.1925 Author: mt Time: 4 March 2022, 12:06:55.474297 pm UUID: c1de3832-5419-5840-b5d6-86794370c969 Ancestors: Morphic-mt.1924 Avoid superfluous re-compositions of paragraphs in shrink-wrapping text morphs. This also fixes the issue where composition "exploded downwards" for too-small containers. For shrink-wrapping, the paragraph will now always use the unadjusted container, for which partial re-composition was never built, and recompose everything. See #compose:style:from:in:. Note that this means that input/composition in (multi-line) text morphs with #hResizing = #shrinkWrap remains more expensive than the ones with #rigid or #spaceFill. For our one-line input fields, it input might now even be a little bit faster than before. Nukes unused #fixLastWithHeight:. =============== Diff against Morphic-mt.1924 =============== Item was changed: Object subclass: #NewParagraph + instanceVariableNames: 'text textStyle firstCharacterIndex container containerUnadjusted lines positionWhenComposed offsetToEnd maxRightX selectionStart selectionStop wantsColumnBreaks focused caretRect showCaret caretColor selectionColor unfocusedSelectionColor' - instanceVariableNames: 'text textStyle firstCharacterIndex container lines positionWhenComposed offsetToEnd maxRightX selectionStart selectionStop wantsColumnBreaks focused caretRect showCaret caretColor selectionColor unfocusedSelectionColor' classVariableNames: '' poolDictionaries: '' category: 'Morphic-Text Support'! !NewParagraph commentStamp: '<historical>' prior: 0! A Paragraph represents text that has been laid out, or composed, in some container. text A Text with encoded per-character emphasis. textStyle A TextStyle with font set, line height and horizontal alignment. firstCharacterIndex The starting index in text for this paragraph, allowing composition of a long text into a number of containers. container A Rectangle or TextContainer that determines where text can go. lines An Array of TextLines comprising the final layout of the text after it has been composed within its container. positionWhenComposed As its name implies. Allows display at new locations without the need to recompose the text. Lines are ordered vertically. However, for a given y, there may be several lines in left to right order. Lines must never be empty, even if text is empty. Notes on yet another hack - 5 Feb 2001 We really need to clean up #composeLinesFrom:to:delta:into:priorLines:atY:!!!!!! I added one more habdful of code to correct: This is an annoying bug that's been around for a couple of years, but I finally figured out how to duplicate the problem, so I figured I'd just report it now. (It doesn't necessarily have to be fixed for 3.0 if it looks messy, but if it's a simple fix, it would be worth it.) In Morphic, if you have the following text in a workspace: This is line 1 This is line 2 **and** you have a return character after line 2, you will normally be able to click the mouse two times below line 2 in order to select all the text. If you edit line 2 (e.g. so that it reads "line number 2"), you can still select all the text by clicking below the second line. However, if you edit line 1, you will not be able to select all the text from the bottom in the same way. Things get messed up such that the last return character seems to be gone. In this state, if you position the cursor immediately after the 2, and press the right arrow, the cursor jumps to the beginning of line 2... oof. (report by Doug Way) While I don't have a very deep understanding of the above mentioned method, I was able to determine that text ending in a CR worked better in the editor when the last entry in <lines> had a start of text size + 1 and a stop of text size. I have accordingly added code near the end to ensure this. It seems to have fixed the problem, but we do need to clean this baby up some day. - Bob ! Item was changed: ----- Method: NewParagraph>>adjustRightXDownTo: (in category 'private') ----- adjustRightXDownTo: minWidth + | shrink minRight | + minRight := container left + minWidth. + shrink := container right - (maxRightX max: minRight). - | shrink | - shrink := container right - maxRightX. lines do: [:line | line paddingWidth: (line paddingWidth - shrink)]. + containerUnadjusted := container. + container := container withRight: (maxRightX + self caretWidth max: minRight).! - container := container withRight: (maxRightX + self caretWidth max: minWidth).! Item was changed: ----- Method: NewParagraph>>compose:style:from:in: (in category 'composition') ----- compose: t style: ts from: startingIndex in: textContainer text := t. textStyle := ts. firstCharacterIndex := startingIndex. offsetToEnd := text size - firstCharacterIndex. container := textContainer. + containerUnadjusted := nil. self composeAll! Item was removed: - ----- Method: NewParagraph>>fixLastWithHeight: (in category 'composition') ----- - fixLastWithHeight: lineHeightGuess - "This awful bit is to ensure that if we have scanned all the text and the last character is a CR that there is a null line at the end of lines. Sometimes this was not happening which caused anomalous selections when selecting all the text. This is implemented as a post-composition fixup because I coul;dn't figure out where to put it in the main logic." - - | oldLastLine newRectangle line | - - (text size > 1 and: [text last = Character cr]) ifFalse: [^self]. - - oldLastLine := lines last. - oldLastLine last - oldLastLine first >= 0 ifFalse: [^self]. - oldLastLine last = text size ifFalse: [^self]. - - newRectangle := oldLastLine left @ oldLastLine bottom - extent: 0@(oldLastLine bottom - oldLastLine top). - "Even though we may be below the bottom of the container, - it is still necessary to compose the last line for consistency..." - - line := TextLine start: text size+1 stop: text size internalSpaces: 0 paddingWidth: 0. - line rectangle: newRectangle. - line lineHeight: lineHeightGuess baseline: textStyle baseline. - lines := lines, (Array with: line). - ! Item was changed: ----- Method: NewParagraph>>recomposeFrom:to:delta: (in category 'composition') ----- recomposeFrom: start to: stop delta: delta "Recompose this paragraph. The altered portion is between start and stop. Recomposition may continue to the end of the text, due to a ripple effect. Delta is the amount by which the current text is longer than it was when its current lines were composed." | startLine newLines | + containerUnadjusted ifNotNil: [ + "Somebody called #adjustRightX. We must recompose everything to avoid strange line breaks and clipping." + container := containerUnadjusted. self composeAll; adjustRightX. ^ self]. + "Have to recompose line above in case a word-break was affected." startLine := (self lineIndexOfCharacterIndex: start) - 1 max: 1. [startLine > 1 and: [(lines at: startLine-1) top = (lines at: startLine) top]] whileTrue: [startLine := startLine - 1]. "Find leftmost of line pieces" newLines := OrderedCollection new: lines size + 1. 1 to: startLine-1 do: [:i | newLines addLast: (lines at: i)]. self composeLinesFrom: (lines at: startLine) first to: stop delta: delta into: newLines priorLines: lines atY: (lines at: startLine) top! Item was changed: ----- Method: TextMorph>>handleInteraction:fromEvent: (in category 'editing') ----- handleInteraction: interactionBlock fromEvent: evt "Perform the changes in interactionBlock, noting any change in selection and possibly a change in the size of the paragraph (ar 9/22/2001 - added for TextPrintIts)" | oldEditor oldParagraph oldText oldSelection | oldEditor := editor. oldParagraph := paragraph. oldText := oldParagraph text copy. oldSelection := oldParagraph selectionRects. "already copy" "Note old selection." self selectionChanged: oldSelection. interactionBlock value. (oldParagraph == paragraph) ifTrue:[ "this will not work if the paragraph changed" editor := oldEditor. "since it may have been changed while in block" ]. "Note new selection." paragraph selectionRects in: [:newSelection | newSelection ~= oldSelection ifTrue: [ self selectionChanged: newSelection]]. (oldText = paragraph text and: [ oldText runs = paragraph text runs ]) + ifFalse: [ self updateFromParagraph ]. - ifFalse:[ - self paragraph composeAll. - self updateFromParagraph ]. self flag: #ImmPlugin. "self setCompositionWindow."! Item was changed: ----- Method: TextMorph>>updateFromParagraph (in category 'private') ----- updateFromParagraph "A change has taken place in my paragraph, as a result of editing and I must be updated. If a line break causes recomposition of the current paragraph, or it the selection has entered a different paragraph, then the current editor will be released, and must be reinstalled with the resulting new paragraph, while retaining any editor state, such as selection, undo state, and current typing emphasis." | newStyle sel oldLast oldEditor back | paragraph ifNil: [^self]. wrapFlag ifNil: [wrapFlag := true]. editor ifNotNil: [oldEditor := editor. sel := editor selectionInterval. editor storeSelectionInParagraph]. text := paragraph text. paragraph textStyle = textStyle ifTrue: [self fit] ifFalse: ["Broadcast style changes to all morphs" newStyle := paragraph textStyle. (self firstInChain text: text textStyle: newStyle) recomposeChain. editor ifNotNil: [self installEditorToReplace: editor]]. + self layoutChanged. - (self isAutoFit and: [self isWrapped not]) - ifTrue: [self extent: self paragraph extent; composeToBounds] - ifFalse: [self layoutChanged]. sel ifNil: [^self]. "If selection is in top line, then recompose predecessor for possible ripple-back" predecessor ifNotNil: [sel first <= (self paragraph lines first last + 1) ifTrue: [oldLast := predecessor lastCharacterIndex. predecessor paragraph recomposeFrom: oldLast to: text size delta: 0. oldLast = predecessor lastCharacterIndex ifFalse: [predecessor changed. "really only last line" self predecessorChanged]]]. ((back := predecessor notNil and: [sel first <= self paragraph firstCharacterIndex]) or: [successor notNil and: [sel first > (self paragraph lastCharacterIndex + 1)]]) ifTrue: ["The selection is no longer inside this paragraph. Pass focus to the paragraph that should be in control." back ifTrue: [predecessor recomposeChain] ifFalse: [self recomposeChain]. self firstInChain withSuccessorsDo: [:m | (sel first between: m firstCharacterIndex and: m lastCharacterIndex + 1) ifTrue: [m installEditorToReplace: oldEditor. ^self passKeyboardFocusTo: m]]. self error: 'Inconsistency in text editor' "Must be somewhere in the successor chain"]. editor ifNil: ["Reinstate selection after, eg, style change" self installEditorToReplace: oldEditor]. self flag: #ImmPlugin. "self setCompositionWindow." !

1 0

The Trunk: Morphic-mt.1924.mcz
by commits＠source.squeak.org 04 Mar '22

04 Mar '22

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1924.mcz ==================== Summary ==================== Name: Morphic-mt.1924 Author: mt Time: 4 March 2022, 10:51:33.827012 am UUID: 0a2bb30e-f3b4-3147-9fcd-97bc6e904cb3 Ancestors: Morphic-mt.1923 Complements Morphic-mt.1923. Sorry for the noise. =============== Diff against Morphic-mt.1923 =============== Item was changed: ----- Method: TextMorph>>createParagraph (in category 'private') ----- createParagraph self setProperty: #CreatingParagraph toValue: true. [ self setDefaultContentsIfNil. "...Code here to recreate the paragraph..." paragraph := (self paragraphClass new textOwner: self owner). paragraph wantsColumnBreaks: successor notNil. paragraph compose: text style: textStyle from: self startingIndex in: self container. wrapFlag ifFalse: ["Was given huge container at first... now adjust" paragraph adjustRightXDownTo: self minCompositionWidth]. paragraph focused: (self currentHand keyboardFocus == self). paragraph - showCaret: self hasFocus; caretColor: self caretColor; selectionColor: self selectionColor; unfocusedSelectionColor: self unfocusedSelectionColor. self fit. ] ensure: [self removeProperty: #CreatingParagraph]. ^ paragraph!

1 0

The Trunk: Morphic-mt.1923.mcz
by commits＠source.squeak.org 04 Mar '22

04 Mar '22

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1923.mcz ==================== Summary ==================== Name: Morphic-mt.1923 Author: mt Time: 4 March 2022, 10:49:45.853012 am UUID: e57a0c3f-e53c-8b45-8dc2-41e01e0412d2 Ancestors: Morphic-mt.1922 Fixes regression regarding text-cursor visibility. =============== Diff against Morphic-mt.1922 =============== Item was changed: ----- Method: NewParagraph>>displaySelectionInLine:on: (in category 'display') ----- displaySelectionInLine: line on: aCanvas | leftX rightX | selectionStart ifNil: [^self]. "No selection" aCanvas isShadowDrawing ifTrue: [ ^self ]. "don't draw selection with shadow" selectionStart = selectionStop ifTrue: ["Only show caret on line where clicked" selectionStart textLine ~= line ifTrue: [^self]] ifFalse: ["Test entire selection before or after here" (selectionStop stringIndex < line first or: [selectionStart stringIndex > (line last + 1)]) ifTrue: [^self]. "No selection on this line" (selectionStop stringIndex = line first and: [selectionStop textLine ~= line]) ifTrue: [^self]. "Selection ends on line above" (selectionStart stringIndex = (line last + 1) and: [selectionStop textLine ~= line]) ifTrue: [^self]]. "Selection begins on line below" leftX := (selectionStart stringIndex <= line first ifTrue: [line ] ifFalse: [selectionStart ])left. rightX := (selectionStop stringIndex > (line last + 1) or: [selectionStop stringIndex = (line last + 1) and: [selectionStop textLine ~= line]]) ifTrue: [line right] ifFalse: [selectionStop left]. selectionStart = selectionStop ifTrue: [ | w pos | w := caretRect ifNotNil: [caretRect width] ifNil: [self caretWidth]. pos := leftX - (w // 2). caretRect := pos @ line top corner: (pos + w) @ line bottom. + (self showCaret and: [self focused]) ifFalse: [^ self]. - self showCaret ifFalse: [^ self "e.g., not #focused"]. Editor dumbbellCursor ifTrue: [self displayDumbbellCursorOn: aCanvas at: pos in: line] ifFalse: [self displaySimpleCursorOn: aCanvas at: pos in: line]] ifFalse: [ caretRect := nil. aCanvas fillRectangle: (leftX @ line top corner: rightX @ line bottom) color: (self focused ifTrue: [self selectionColor] ifFalse: [self unfocusedSelectionColor])]!

1 0

The Trunk: MorphicExtras-mt.308.mcz
by commits＠source.squeak.org 04 Mar '22

04 Mar '22

Marcel Taeumel uploaded a new version of MorphicExtras to project The Trunk: http://source.squeak.org/trunk/MorphicExtras-mt.308.mcz ==================== Summary ==================== Name: MorphicExtras-mt.308 Author: mt Time: 4 March 2022, 9:48:19.711012 am UUID: 3746ad9c-ef1b-f74f-9a95-a03c4c1ac50c Ancestors: MorphicExtras-mt.307 Complements Morphic-mt.1921 and .1922 =============== Diff against MorphicExtras-mt.307 =============== Item was added: + ----- Method: TextOnCurve>>adjustRightXDownTo: (in category 'private') ----- + adjustRightXDownTo: minWidth + "No-op for this class. TextOnCurve have computes bounds differently"!

1 0

The Trunk: Morphic-mt.1922.mcz
by commits＠source.squeak.org 04 Mar '22

04 Mar '22

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1922.mcz ==================== Summary ==================== Name: Morphic-mt.1922 Author: mt Time: 4 March 2022, 9:47:18.204012 am UUID: 6d731344-6f4c-6643-81f0-958843eecd74 Ancestors: Morphic-mt.1921 Complements Morphic-mt.1921. (Note that a checkpoint was added to the update map.) =============== Diff against Morphic-mt.1921 =============== Item was changed: ----- Method: NewParagraph>>adjustRightX (in category 'private') ----- adjustRightX + + self adjustRightXDownTo: 0.! - | shrink | - shrink := container right - maxRightX. - lines do: [:line | line paddingWidth: (line paddingWidth - shrink)]. - container := container withRight: maxRightX + self caretWidth.! Item was changed: ----- Method: TextMorph>>compositionRectangle (in category 'private') ----- compositionRectangle + + | compRect minW minH | - | compRect | compRect := self innerBounds. margins ifNotNil: [compRect := compRect insetBy: margins]. + minW := self minCompositionWidth. + minH := self minCompositionHeight. + compRect width < minW ifTrue: [compRect := compRect withWidth: minW]. + compRect height < minH ifTrue: [compRect := compRect withHeight: minH]. - compRect width < 9 ifTrue: [compRect := compRect withWidth: 9]. - compRect height < 16 ifTrue: [compRect := compRect withHeight: 16]. ^ compRect! Item was changed: ----- Method: TextMorph>>createParagraph (in category 'private') ----- createParagraph self setProperty: #CreatingParagraph toValue: true. [ self setDefaultContentsIfNil. "...Code here to recreate the paragraph..." paragraph := (self paragraphClass new textOwner: self owner). paragraph wantsColumnBreaks: successor notNil. paragraph compose: text style: textStyle from: self startingIndex in: self container. wrapFlag ifFalse: ["Was given huge container at first... now adjust" + paragraph adjustRightXDownTo: self minCompositionWidth]. - paragraph adjustRightX]. paragraph focused: (self currentHand keyboardFocus == self). paragraph showCaret: self hasFocus; caretColor: self caretColor; selectionColor: self selectionColor; unfocusedSelectionColor: self unfocusedSelectionColor. self fit. ] ensure: [self removeProperty: #CreatingParagraph]. ^ paragraph! Item was changed: ----- Method: TextMorph>>minHeight (in category 'layout') ----- minHeight | result | - textStyle ifNil: [^ TextStyle defaultFont height]. - result := (paragraph + ifNil: [self minCompositionHeight] - ifNil: [textStyle lineGrid] ifNotNil: [paragraph lines first lineHeight]) + (self borderWidth*2). margins ifNil: [^ result]. ^ margins isRectangle ifTrue: [result + margins top + margins bottom] ifFalse: [margins isPoint ifTrue: [result + margins y + margins y] ifFalse: [result + (2*margins)]]! Item was changed: ----- Method: TextMorph>>minWidth (in category 'layout') ----- minWidth | result | + result := self minCompositionWidth + (self borderWidth*2). - textStyle ifNil: [^ (TextStyle defaultFont widthOf: $x) * 2]. - - result := (textStyle defaultFont widthOf: $x) * 2 + (self borderWidth*2). margins ifNil: [^ result]. ^ margins isRectangle ifTrue: [result + margins left + margins right] ifFalse: [margins isPoint ifTrue: [result + margins x + margins x] ifFalse: [result + (2*margins)]]!

1 0

The Trunk: Morphic-mt.1921.mcz
by commits＠source.squeak.org 04 Mar '22

04 Mar '22

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1921.mcz ==================== Summary ==================== Name: Morphic-mt.1921 Author: mt Time: 4 March 2022, 9:44:29.912012 am UUID: 6ab07605-527d-ab40-bb4d-8fd5ec253cd4 Ancestors: Morphic-mt.1920 Prepare somewhat of a workaround for awkward paragraph re-composition when the paragraph's container is smaller than a single glyph but those glyphs allow for line breaks, which is the normal case, e.g., in Japanese fonts. (Note that the Western default is break-on-space.) When does this happen? Think of an empty text morph where you start typing something. But instead of typing, you paste something from the clipboard. This is where it breaks, e.g., for Japanese fonts. What happens in that case is that the paragraph composition "explodes" downward until the maximum height is reached. The user will notice an input lag. I will try to hunt down the actual issue but for now it makes sense to communicate the min-width from the TextMorph to the paragraph. =============== Diff against Morphic-mt.1920 =============== Item was added: + ----- Method: NewParagraph>>adjustRightXDownTo: (in category 'private') ----- + adjustRightXDownTo: minWidth + | shrink | + shrink := container right - maxRightX. + lines do: [:line | line paddingWidth: (line paddingWidth - shrink)]. + container := container withRight: (maxRightX + self caretWidth max: minWidth).! Item was added: + ----- Method: TextMorph>>minCompositionHeight (in category 'layout') ----- + minCompositionHeight + + ^ (textStyle ifNil: [TextStyle default]) lineGrid! Item was added: + ----- Method: TextMorph>>minCompositionWidth (in category 'layout') ----- + minCompositionWidth + + ^ ((textStyle ifNil: [TextStyle default]) defaultFont widthOf: $x) * 2!

1 0

The Trunk: Tools-mt.1139.mcz
by commits＠source.squeak.org 03 Mar '22

03 Mar '22

Marcel Taeumel uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-mt.1139.mcz ==================== Summary ==================== Name: Tools-mt.1139 Author: mt Time: 3 March 2022, 2:49:41.991142 pm UUID: b7db1f19-33ca-d44f-8b77-c1ca9f523f88 Ancestors: Tools-mt.1138 Glyph browsing: - use non-breaking space(s) to make zero-width glyphs visible - do not skip empty glyphs anymore - replace #asUnicode with #charCode to just drop the #leadingChar if any; it is not about decoding here =============== Diff against Tools-mt.1138 =============== Item was changed: ----- Method: AbstractFont>>browseAllGlyphsByCategory (in category '*Tools-Browsing') ----- browseAllGlyphsByCategory "Browse glyphs for all printable characters/code-points in the receiver." ^ self browseGlyphsByCategoryOf: ((self minCodePoint max: 32 "space"+1) to: self maxCodePoint) + select: [:char | self hasGlyphOf: char]! - select: [:char | (self hasGlyphOf: char) and: [(self widthOf: char) > 0]]! Item was changed: ----- Method: AbstractFont>>browseGlyphsByCategoryOf:select:label: (in category '*Tools-Browsing') ----- browseGlyphsByCategoryOf: someCodePointsOrCharacters select: aBlock label: aLabelOrNil "Like #browseGlyphsOf:... but group the code points by Unicode category." | sortedCodePoints contents isRange tmp separatorBlock | isRange := isRange := someCodePointsOrCharacters isInterval and: [someCodePointsOrCharacters increment = 1]. separatorBlock := [:codePoints :category | (('\{1}\\' withCRs asText format: { Unicode generalCategoryLabels at: category+1 ifAbsent: ['n/a'] }) addAttribute: (TextFontReference toFont: TextStyle defaultFixedFont); addAttribute: (PluggableTextAttribute evalBlock: [self browseGlyphsByCategoryOf: codePoints select: aBlock label: aLabelOrNil]); yourself) ]. sortedCodePoints := (someCodePointsOrCharacters + collect: [:ea | ea isCharacter ifTrue: [ea charCode] ifFalse: [ea] ] - collect: [:ea | ea isCharacter ifTrue: [ea asUnicode] ifFalse: [ea] ] thenSelect: [:ea | aBlock value: (Character value: ea)]) sorted: [:a :b | | ca cb | (ca := (Unicode generalCategoryOf: a) ifNil: [0]) < (cb := (Unicode generalCategoryOf: b) ifNil: [0]) or: [ca = cb and: [a < b]]]. "Header" contents := (('Family name: {1}{6}\ Emphasis: {2}\ Point size: {3} ({4}ppi {5}px{7})\' withCRs asText format: { self familyName asText addAttribute: (PluggableTextAttribute evalBlock: [self explore]); yourself. [self emphasisString] on: Error do: [self subfamilyName]. self pointSize. self pixelsPerInch. self height. isRange ifTrue: [''] ifFalse: [' (selected code points)']. (self isTTCFont and: [(tmp := self extraGlyphScale) ~= 1]) ifFalse: [''] ifTrue: [' ', (tmp * 100) rounded asString, '%'] }) addAttribute: (TextFontReference toFont: TextStyle defaultFixedFont); yourself). String streamContents: [:s | | priorCategory currentCodePoints | currentCodePoints := OrderedCollection new. sortedCodePoints withIndexDo: [:codePoint :index | | char category | char := Character value: codePoint. category := Unicode generalCategoryOf: codePoint. priorCategory ifNil: [priorCategory := category]. category = priorCategory ifTrue: [ currentCodePoints add: codePoint. s nextPut: char]. (category ~= priorCategory or: [index = sortedCodePoints size]) ifTrue: [ contents := contents, (separatorBlock value: currentCodePoints value: priorCategory). contents := contents, ((s cr; contents) asText addAttribute: (TextFontReference toFont: self); yourself). currentCodePoints := OrderedCollection new. s reset. currentCodePoints add: codePoint. s nextPut: char]. + (self widthOf: char) = 0 ifTrue: [s nextPut: Character nbsp; nextPut: Character nbsp]. priorCategory := category]]. contents editWithLabel: (aLabelOrNil ifNil: [self printString]).! Item was changed: ----- Method: AbstractFont>>browseGlyphsFrom:to: (in category '*Tools-Browsing') ----- browseGlyphsFrom: firstCodePoint to: lastCodePoint "Split range in sub-ranges whenever the receiver has no glyph for a certain code point or when that glyph is not visible. Start with at least a printable character after #space to avoid line breaks in the editor. Note that non-breaking space an similar are skipped as well." ^ self browseGlyphsOf: ((firstCodePoint max: (self minCodePoint max: 32 "space" +1)) to: (lastCodePoint min: self maxCodePoint)) + select: [:char | self hasGlyphOf: char]! - select: [:char | (self hasGlyphOf: char) and: [(self widthOf: char) > 0] - and: [(self characterFormAt: char) bits anySatisfy: [:ea | - ea ~= 0 "transparent" and: [ea ~= 4294967295 "white"]]] - ]! Item was changed: ----- Method: AbstractFont>>browseGlyphsOf:select:label: (in category '*Tools-Browsing') ----- browseGlyphsOf: someCodePointsOrCharacters select: aBlock label: aLabelOrNil "Browse all glyphs in the given collection of code points or characters. Split range in sub-ranges whenever the receiver has no glyph for a certain code point. DO NOT translate user-facing text because this is a debugging tool so that text should only use ASCII." | contents isRange tmp separatorBlock | isRange := someCodePointsOrCharacters isInterval and: [someCodePointsOrCharacters increment = 1]. separatorBlock := [:currentRange | (('\16r{1} to: 16r{2}\\' withCRs asText format: { currentRange first printStringBase: 16 length: 6 padded: true. currentRange last printStringBase: 16 length: 6 padded: true }) addAttribute: (TextFontReference toFont: TextStyle defaultFixedFont); addAttribute: (PluggableTextAttribute evalBlock: [self browseGlyphsFrom: currentRange first to: currentRange last select: aBlock]); yourself)]. "Header" contents := (('Family name: {1}{6}\ Emphasis: {2}\ Point size: {3} ({4}ppi {5}px{7})\' withCRs asText format: { self familyName asText addAttribute: (PluggableTextAttribute evalBlock: [self explore]); yourself. [self emphasisString] on: Error do: [self subfamilyName]. self pointSize. self pixelsPerInch. self height. isRange ifTrue: [''] ifFalse: [' (selected code points)']. (self isTTCFont and: [(tmp := self extraGlyphScale) ~= 1]) ifFalse: [''] ifTrue: [' ', (tmp * 100) rounded asString, '%'] }) addAttribute: (TextFontReference toFont: TextStyle defaultFixedFont); yourself). String streamContents: [:s | | first last | last := someCodePointsOrCharacters last. someCodePointsOrCharacters withIndexDo: [:codePointOrChar :index | | current char valid | + current := codePointOrChar isCharacter ifTrue: [codePointOrChar charCode] ifFalse: [codePointOrChar]. - current := codePointOrChar isCharacter ifTrue: [codePointOrChar asUnicode] ifFalse: [codePointOrChar]. char := Character value: current. (valid := (aBlock value: char)) + ifTrue: [ + s position = 0 ifTrue: [first := current]. + s nextPut: char. + (self widthOf: char) = 0 ifTrue: [s nextPut: Character nbsp; nextPut: Character nbsp] ]. - ifTrue: [s position = 0 ifTrue: [first := current]. s nextPut: char]. (valid not or: [index = someCodePointsOrCharacters size]) ifTrue: [s position = 0 ifFalse: [ isRange ifFalse: [contents := contents, String cr] ifTrue: [ | currentRange | currentRange := first to: (index = someCodePointsOrCharacters size ifTrue: [last] ifFalse: [current-1]). contents := contents, (separatorBlock value: currentRange)]. contents := contents, ((s cr; contents) asText addAttribute: (TextFontReference toFont: self); yourself). s reset]] ]]. contents editWithLabel: (aLabelOrNil ifNil: [self printString]).!

1 0

The Trunk: TrueType-mt.82.mcz
by commits＠source.squeak.org 03 Mar '22

03 Mar '22

Marcel Taeumel uploaded a new version of TrueType to project The Trunk: http://source.squeak.org/trunk/TrueType-mt.82.mcz ==================== Summary ==================== Name: TrueType-mt.82 Author: mt Time: 3 March 2022, 2:46:26.800142 pm UUID: 6689cc3c-69ea-be4f-8670-7af18c18d0e3 Ancestors: TrueType-mt.81 Make fallback glyph in remote fonts more robust by not assuming that code point 0 maps to the fallback glyph. I found a font that just did not do that. =============== Diff against TrueType-mt.81 =============== Item was changed: ----- Method: TTRemoteFontDescription>>fallbackGlyph (in category 'accessing - glyphs') ----- fallbackGlyph + ^ fallbackGlyph ifNil: [fallbackGlyph := self atGlyphIndex: 0]! - ^ fallbackGlyph ifNil: [fallbackGlyph := self at: 0]!

1 0

The Trunk: TrueType-mt.81.mcz
by commits＠source.squeak.org 03 Mar '22

03 Mar '22

Marcel Taeumel uploaded a new version of TrueType to project The Trunk: http://source.squeak.org/trunk/TrueType-mt.81.mcz ==================== Summary ==================== Name: TrueType-mt.81 Author: mt Time: 3 March 2022, 2:15:48.031142 pm UUID: 46619d54-c342-e240-8224-44cee41f77ad Ancestors: TrueType-dtl.80 Bugfixes: - "Install & Load" will now configure the glyphTable with the correct fallback glyph; does not affect remote fonts - kernPairs must keep their glyph indexes bc. multiple code points can map to the same glyph Enhancements: - Install "Unicode BMP" character mapping for our Bitstream Vera fonts bc. we have all the glyphs; limit #maxCodePoint to 255 until we have a better strategy for our glyph-form cache in TTCFont - Increase robustness in TTFontFileHandle against whitespace-typos in family name; e.g., merge "OpenDyslexic 3" and "OpenDyslexic3" to bundle regular and bold face - create a #cmapTable on-the-fly for TTFontDescription using glyphTable - Adds a compression protocol to TTCharacterMappingTable =============== Diff against TrueType-dtl.80 =============== Item was added: + ----- Method: TTCharacterMappingTable class>>fromCompressedBytes:perElement: (in category 'instance creation') ----- + fromCompressedBytes: bytes perElement: bytesPerElement + + | cmap | + cmap := self new platformID: -1; "Squeak" yourself. + cmap setCharacterMapFromCompressedBytes: bytes perElement: bytesPerElement. + cmap encodingID: (cmap size caseOf: { + [256] -> [0 "Latin1"]. + [65536] -> [2 "Unicode BMP"]. + } otherwise: [3 "Unicode full -- wild guess"]). + ^ cmap! Item was added: + ----- Method: TTCharacterMappingTable>>characterMapAsCompressedBytes (in category 'compressing') ----- + characterMapAsCompressedBytes + + | max | + ^ (max := characterMap max) > 16rFFFF + ifTrue: [self characterMapAsCompressedBytes: 4] + ifFalse: [max > 16rFF + ifTrue: [self characterMapAsCompressedBytes: 2] + ifFalse: [self characterMapAsCompressedBytes: 1]]! Item was added: + ----- Method: TTCharacterMappingTable>>characterMapAsCompressedBytes: (in category 'compressing') ----- + characterMapAsCompressedBytes: bytesPerElement + + | bitmap | + bytesPerElement = 4 ifTrue: [ + "Bitmap is a variable-word subclass, which means 4 bytes per element." + ^ (characterMap as: Bitmap) compressToByteArray]. + + bitmap := Bitmap new: (characterMap size asFloat / bytesPerElement) ceiling. + 1 to: bitmap size do: [:i | + | elements x | + elements := (1 to: 4 // bytesPerElement) + collect: [:j | characterMap at: ((i-1)*bytesPerElement)+j ifAbsent: [0 "bc. #ceiling"]]. + x := 0. + 1 to: elements size do: [:e | + x := (x bitShift: bytesPerElement*8) + (elements at: e)]. + bitmap at: i put: x]. + + ^ bitmap compressToByteArray! Item was changed: ----- Method: TTCharacterMappingTable>>createGlyphTableFrom: (in category 'mapping') ----- createGlyphTableFrom: allGlyphsInGlyphIndexOrder "Answer a table that can lookup TrueType glyphs by Unicode code point. Note that allGlyphs *must be* in glyphIndex order or otherwise the resulting table will be incorrect." | mappedGlyphTable fallbackGlyph | self assert: [platformID = -1] description: 'You must call #prepare first!!'. + fallbackGlyph := allGlyphsInGlyphIndexOrder first. - fallbackGlyph := allGlyphsInGlyphIndexOrder. mappedGlyphTable := encodingID = 0 "latin-1" ifTrue: [Array new: 256 withAll: fallbackGlyph] ifFalse: [SparseLargeTable new: characterMap size chunkSize: 256 arrayClass: Array base: 1 defaultValue: fallbackGlyph]. 1 to: characterMap size do: [:i | | glyph glyphIndex | glyphIndex := characterMap at: i. glyph := allGlyphsInGlyphIndexOrder at: glyphIndex+1 ifAbsent: [fallbackGlyph]. mappedGlyphTable at: i put: glyph]. encodingID = 0 ifFalse: [mappedGlyphTable zapDefaultOnlyEntries]. self flag: #todo. "Discard unused glyphs such as ligatures etc. We do not support them." ^ mappedGlyphTable! Item was added: + ----- Method: TTCharacterMappingTable>>setCharacterMapFromCompressedBytes:perElement: (in category 'compressing') ----- + setCharacterMapFromCompressedBytes: bytes perElement: bytesPerElement + + | bitmap numElements | + bitmap := Bitmap decompressFromByteArray: bytes. + numElements := bitmap size * (4 // bytesPerElement). + + numElements = 256 + ifTrue: [characterMap := Array new: numElements] + ifFalse: [characterMap := (SparseLargeTable new: numElements + chunkSize: 256 arrayClass: Array base: 1 + defaultValue: 0)]. + + bytesPerElement = 4 ifTrue: [ + characterMap fillFrom: bitmap with: [:glyphIndex | glyphIndex]. + numElements = 256 ifFalse: [characterMap zapDefaultOnlyEntries]. + ^ self]. + + 1 to: bitmap size do: [:i | + | elements mask x | + x := bitmap at: i. + elements := Array new: 4 // bytesPerElement. + mask := (1 << (bytesPerElement*8)) -1. + elements size to: 1 by: -1 do: [:j | + elements + at: (elements size - j + 1) + put: ((x bitShift: bytesPerElement * 8 * (j-1) * -1) bitAnd: mask)]. + 1 to: elements size do: [:j | + characterMap + at: ((i-1)*bytesPerElement)+j + put: (elements at: j)]]. + + numElements = 256 ifFalse: [characterMap zapDefaultOnlyEntries].! Item was changed: + ----- Method: TTFontDescription>>allGlyphs (in category 'accessing - debugging') ----- - ----- Method: TTFontDescription>>allGlyphs (in category 'accessing') ----- allGlyphs ^ glyphs! Item was added: + ----- Method: TTFontDescription>>allKernPairs (in category 'accessing - debugging') ----- + allKernPairs + + ^ kernPairs! Item was added: + ----- Method: TTFontDescription>>cmapTable (in category 'accessing') ----- + cmapTable + "Construct on-the-fly from glyphTable. Maybe cache later? Maybe there is no need for glyphTable but only cmapTable like in TTRemoteFontDescription?" + + ^ TTCharacterMappingTable new + platformID: -1; "Squeak" + encodingID: (glyphTable size caseOf: { + [256] -> [0 "Latin1"]. + [65536] -> [2 "Unicode BMP"]. + } otherwise: [3 "Unicode full -- wild guess"]); + characterMap: (glyphTable collect: [:glyph | glyph glyphIndex]); + yourself! Item was changed: + ----- Method: TTFontDescription>>maxGlyphIndex (in category 'accessing - debugging') ----- - ----- Method: TTFontDescription>>maxGlyphIndex (in category 'accessing') ----- maxGlyphIndex ^ glyphs size - 1! Item was changed: ----- Method: TTFontDescription>>size (in category 'accessing') ----- size + ^ maxCodePoint ifNil: [glyphTable size]! - ^ glyphTable size. - ! Item was changed: ----- Method: TTFontFileHandle class>>allHandlesFrom: (in category 'support') ----- allHandlesFrom: specs | handles | handles := Dictionary new. "Use family name as #key to accumulate families from files." specs do: [:spec | | familyName subfamilyName fileName fileOffset familyHandle ttc | familyName := spec at: 1. subfamilyName := spec at: 2. fileName := spec at: 3 ifAbsent: nil. "installed but unknown file" fileOffset := spec at: 4 ifAbsent: nil. "installed but unknown file" ttc := spec at: 5 ifAbsent: nil. "already parsed" familyHandle := handles + at: (familyName copyWithout: Character space) "Robustness. Typos are possible" - at: familyName ifAbsentPut: [TTFontFileHandle new fontname: familyName; yourself]. subfamilyName ifNil: [ familyHandle filename: fileName; fileoffset: fileOffset; setFontDescription: ttc] ifNotNil: [ | subfamilyHandle | subfamilyHandle := TTFontFileHandle new fontname: subfamilyName; yourself. subfamilyHandle parent: familyHandle; filename: fileName; fileoffset: fileOffset; setFontDescription: ttc. familyHandle addChild: subfamilyHandle]]. ^ handles! Item was changed: ----- Method: TTFontReader>>processKerningTable (in category 'reading - tables') ----- processKerningTable self checkFontOffset. self peekDuring: [ (self skipToTable: 'kern') ifFalse: [^ self "optional"]. (self peekDuring: [self readKerningTable]) ifFalse: [self readKerningTableForMacintosh]]. "Post-processing. Prefer only #kerning values for #horizontal text layout." kernPairs := kernTables detect: [:table | table first includesAllOf: #(horizontal kerning)] ifFound: [:table | table second] + ifNone: [#()].! - ifNone: [#()]. - - "Map glyph index to a character to be used, e.g., in CharacterScanner." - kernPairs do: [:kp | - kp left: ((cmapTable mapIndex: kp left) - ifNotNil: [:codePoint | Character value: codePoint]). - kp right: ((cmapTable mapIndex: kp right) - ifNotNil: [:codePoint | Character value: codePoint])]. - - "Only work with kerning metrics for glyphs that are referenced in the cmap." - kernPairs := kernPairs select: [:kp | kp left notNil and: [kp right notNil]].! Item was changed: + ----- Method: TTRemoteFontDescription>>maxGlyphIndex (in category 'accessing - debugging') ----- - ----- Method: TTRemoteFontDescription>>maxGlyphIndex (in category 'accessing - glyphs') ----- maxGlyphIndex ^ numGlyphs-1! Item was changed: + (PackageInfo named: 'TrueType') postscript: '"Repair all kern pairs. We must keep glyph indexes in there. TTFontReader was updated, too." + TTFontDescription allSubInstancesDo: [:ttc | | cmap | + cmap := ttc cmapTable. + ttc allKernPairs do: [:kp | + kp left isCharacter ifTrue: [ + kp left: (cmap mapCode: kp left codePoint)]. + kp right isCharacter ifTrue: [ + kp right: (cmap mapCode: kp right codePoint)]] ]. + + "Install Unicode BMP character mapping for Bitstream Vera font families. But limit to maxCodePoint 255 until we find a better strategy for the glyph cache." + [ | cmap | + cmap := ''/wAAgABBAMMAAwAEAAUABgAHAAgACQAKAAsADAANAA4ADwAQABEAEgATABQAFQAWABcAGAAZ + ABoAGwAcAB0AHgAfACAAIQAiACMAJAAlACYAJwAoACkAKgArACwALQAuAC8AMAAxADIAMwA0 + ADUANgA3ADgAOQA6ADsAPAA9AD4APwBAAEEAQgBDAEQARQBGAEcASABJAEoASwBMAE0ATgBP + AFAAUQBSAFMAVABVAFYAVwBYAFkAWgBbAFwAXQBeAF8AYABhAABBAMMArACjAIQAhQC9AJYA + 5wCGAI4AiwCdAKkApAEAAIoA2QCDAJMA8QDyAI0AlwCIAMMA3QDwAJ4AqgDzAPQA9QCiAK0A + yQDHAK4AYgBjAJAAZADLAGUAyADKAM8AzADNAM4A6ABmANIA0ADRAK8AZwDvAJEA1QDTANQA + aADqAOwAiQBqAGkAawBtAGwAbgCgAG8AcQBwAHIAcwB1AHQAdgB3AOkAeAB6AHkAewB9AHwA + uAChAH8AfgCAAIEA6wDtALoNAAcA+wD8CQAPAP0A/gAAAAAAAAD/GQAHAPYA9yEABwD4ANYd + AAsAAADhAOIAAB0ABwCwALEVAAsA+QD6AOMA5C0AEwC7AAAAAAAAAAAA5QDmAAAlAAcApgAA + 4mUABwDXAOAhAA8A2gDbANwA3wDYAN7hlQAHAAAAny0ABwCbAAD/AAA4oQAvAAAAsgCzAAAA + AAAAALYAtwDEAAAAtAC1AMUAAACCAMIAhwAAAAAAAACrAAARAAcAxgAADQALAAAAvgC/AADg + 4QAHAQIAAODpAAcAjAAA4b0ADwCYAAAAAAAAAKgAAA0AJwAAAJoAAACZAO4AAAAAALwAAAAA + AAABAQClAAAAAAAAAJIAABUABwAAAJw5AAcApwAALQAPAI8AAAAAAAAAlACV5skABwC5AAD/ + AAGqaQALAAAAwADBAADp+QA=''. + cmap := TTCharacterMappingTable + fromCompressedBytes: cmap base64Decoded asByteArray + perElement: 2. + + (#(BitstreamVeraSans BitstreamVeraSansMono BitstreamVeraSerif) + gather: [:family | | font | + font := TTCFont familyName: family. + {font ttcDescription}, (font derivativeFonts + select: [:ea | ea isSynthetic not] thenCollect: [:ea | ea ttcDescription])]) + do: [:ttc | + ttc + setGlyphs: ttc allGlyphs mapping: (cmap createGlyphTableFrom: ttc allGlyphs); + setMinCodePoint: 32 maxCodePoint: 255]. + ] value.'! - (PackageInfo named: 'TrueType') postscript: '#( - BitstreamVeraSans 1.059 24 ''Bitstream Vera Sans For Squeak'' - BitstreamVeraSansMono 1.059 24 ''Bitstream Vera Sans Mono For Squeak'' - ) groupsDo: [:name :scale :gap :customName | - (TextStyle named: name) asHandle - rename: customName; - ttExtraScale: scale; ttExtraGap: gap; - installFont].'!

1 0

Jump to page: