diff --git a/Frameworks/AppKit/Browser.environment/AppKit.sj b/Frameworks/AppKit/Browser.environment/AppKit.sj index 4b6423bec..38296d363 100644 --- a/Frameworks/AppKit/Browser.environment/AppKit.sj +++ b/Frameworks/AppKit/Browser.environment/AppKit.sj @@ -69650,7 +69650,7 @@ class_addMethods(the_class, [new objj_method(sel_getUid("initWithFrame:"), funct ,["void","CPEvent"])]); } (CPFontManager == null ? CPFontManager : (CPFontManager.isa.method_msgSend["setFontPanelFactory:"] || _objj_forward)(CPFontManager, "setFontPanelFactory:", (CPFontPanel.isa.method_msgSend["class"] || _objj_forward)(CPFontPanel, "class"))); -p;17;CPLayoutManager.jt;62539;@STATIC;1.0;i;8;CPText.ji;17;CPTextContainer.ji;11;CGContext.ji;14;CPTypesetter.ji;8;CPFont.jt;62438;objj_executeFile("CPText.j", YES);objj_executeFile("CPTextContainer.j", YES);objj_executeFile("CGContext.j", YES);objj_executeFile("CPTypesetter.j", YES);objj_executeFile("CPFont.j", YES);_isNewlineCharacter = function(chr) +p;17;CPLayoutManager.jt;62601;@STATIC;1.0;i;8;CPText.ji;17;CPTextContainer.ji;11;CGContext.ji;14;CPTypesetter.ji;8;CPFont.jt;62500;objj_executeFile("CPText.j", YES);objj_executeFile("CPTextContainer.j", YES);objj_executeFile("CGContext.j", YES);objj_executeFile("CPTypesetter.j", YES);objj_executeFile("CPFont.j", YES);_isNewlineCharacter = function(chr) { return chr === '\n' || chr === '\r'; } @@ -69894,6 +69894,8 @@ class_addMethods(the_class, [new objj_method(sel_getUid("_lineFragmentFactory"), } if (removeRange.length) self._removeInvalidLineFragmentsRange = CPMakeRangeCopy(removeRange); + else + self._removeInvalidLineFragmentsRange = nil; if (!startIndex) (self.isa.method_msgSend["setExtraLineFragmentRect:usedRect:textContainer:"] || _objj_forward)(self, "setExtraLineFragmentRect:usedRect:textContainer:", CGRectMake(0, 0), CGRectMake(0, 0), nil); ((___r1 = self._typesetter), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["layoutGlyphsInLayoutManager:startingAtGlyphIndex:maxNumberOfLineFragments:nextGlyphIndex:"] || _objj_forward)(___r1, "layoutGlyphsInLayoutManager:startingAtGlyphIndex:maxNumberOfLineFragments:nextGlyphIndex:", self, startIndex, -1, nil)); @@ -74109,7 +74111,7 @@ class_addMethods(the_class, [new objj_method(sel_getUid("setPlaceholderValue:wit ,["void","id","CPString"])]); } -p;14;CPTypesetter.jt;21491;@STATIC;1.0;I;21;Foundation/CPObject.ji;18;CPParagraphStyle.ji;15;CPTextStorage.ji;8;CPFont.jt;21390;objj_executeFile("Foundation/CPObject.j", NO);objj_executeFile("CPParagraphStyle.j", YES);objj_executeFile("CPTextStorage.j", YES);objj_executeFile("CPFont.j", YES);CPTypesetterZeroAdvancementAction = 1 << 0; +p;14;CPTypesetter.jt;21709;@STATIC;1.0;I;21;Foundation/CPObject.ji;18;CPParagraphStyle.ji;15;CPTextStorage.ji;8;CPFont.jt;21608;objj_executeFile("Foundation/CPObject.j", NO);objj_executeFile("CPParagraphStyle.j", YES);objj_executeFile("CPTextStorage.j", YES);objj_executeFile("CPFont.j", YES);CPTypesetterZeroAdvancementAction = 1 << 0; CPTypesetterWhitespaceAction = 1 << 1; CPSTypesetterHorizontalTabAction = 1 << 2; CPTypesetterLineBreakAction = 1 << 3; @@ -74363,6 +74365,11 @@ class_addMethods(the_class, [new objj_method(sel_getUid("layoutManager"), functi wrapWidth = rangeWidth; wrapRange._height = self._lineHeight; wrapRange._base = self._lineBase; + if (theString.charCodeAt(glyphIndex + 1) !== 32) + { + currentAnchor = rangeWidth; + measuringRange = CPMakeRange(glyphIndex + 1, 0); + } break; case 10: case 13: diff --git a/Frameworks/AppKit/CommonJS.environment/AppKit.sj b/Frameworks/AppKit/CommonJS.environment/AppKit.sj index 0e10bd57d..f4d4d2b44 100644 --- a/Frameworks/AppKit/CommonJS.environment/AppKit.sj +++ b/Frameworks/AppKit/CommonJS.environment/AppKit.sj @@ -67521,7 +67521,7 @@ class_addMethods(the_class, [new objj_method(sel_getUid("initWithFrame:"), funct ,["void","CPEvent"])]); } (CPFontManager == null ? CPFontManager : (CPFontManager.isa.method_msgSend["setFontPanelFactory:"] || _objj_forward)(CPFontManager, "setFontPanelFactory:", (CPFontPanel.isa.method_msgSend["class"] || _objj_forward)(CPFontPanel, "class"))); -p;17;CPLayoutManager.jt;60860;@STATIC;1.0;i;8;CPText.ji;17;CPTextContainer.ji;11;CGContext.ji;14;CPTypesetter.ji;8;CPFont.jt;60759;objj_executeFile("CPText.j", YES);objj_executeFile("CPTextContainer.j", YES);objj_executeFile("CGContext.j", YES);objj_executeFile("CPTypesetter.j", YES);objj_executeFile("CPFont.j", YES);_isNewlineCharacter = function(chr) +p;17;CPLayoutManager.jt;60922;@STATIC;1.0;i;8;CPText.ji;17;CPTextContainer.ji;11;CGContext.ji;14;CPTypesetter.ji;8;CPFont.jt;60821;objj_executeFile("CPText.j", YES);objj_executeFile("CPTextContainer.j", YES);objj_executeFile("CGContext.j", YES);objj_executeFile("CPTypesetter.j", YES);objj_executeFile("CPFont.j", YES);_isNewlineCharacter = function(chr) { return chr === '\n' || chr === '\r'; } @@ -67765,6 +67765,8 @@ class_addMethods(the_class, [new objj_method(sel_getUid("_lineFragmentFactory"), } if (removeRange.length) self._removeInvalidLineFragmentsRange = CPMakeRangeCopy(removeRange); + else + self._removeInvalidLineFragmentsRange = nil; if (!startIndex) (self.isa.method_msgSend["setExtraLineFragmentRect:usedRect:textContainer:"] || _objj_forward)(self, "setExtraLineFragmentRect:usedRect:textContainer:", CGRectMake(0, 0), CGRectMake(0, 0), nil); ((___r1 = self._typesetter), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["layoutGlyphsInLayoutManager:startingAtGlyphIndex:maxNumberOfLineFragments:nextGlyphIndex:"] || _objj_forward)(___r1, "layoutGlyphsInLayoutManager:startingAtGlyphIndex:maxNumberOfLineFragments:nextGlyphIndex:", self, startIndex, -1, nil)); @@ -71718,7 +71720,7 @@ class_addMethods(the_class, [new objj_method(sel_getUid("setPlaceholderValue:wit ,["void","id","CPString"])]); } -p;14;CPTypesetter.jt;21491;@STATIC;1.0;I;21;Foundation/CPObject.ji;18;CPParagraphStyle.ji;15;CPTextStorage.ji;8;CPFont.jt;21390;objj_executeFile("Foundation/CPObject.j", NO);objj_executeFile("CPParagraphStyle.j", YES);objj_executeFile("CPTextStorage.j", YES);objj_executeFile("CPFont.j", YES);CPTypesetterZeroAdvancementAction = 1 << 0; +p;14;CPTypesetter.jt;21709;@STATIC;1.0;I;21;Foundation/CPObject.ji;18;CPParagraphStyle.ji;15;CPTextStorage.ji;8;CPFont.jt;21608;objj_executeFile("Foundation/CPObject.j", NO);objj_executeFile("CPParagraphStyle.j", YES);objj_executeFile("CPTextStorage.j", YES);objj_executeFile("CPFont.j", YES);CPTypesetterZeroAdvancementAction = 1 << 0; CPTypesetterWhitespaceAction = 1 << 1; CPSTypesetterHorizontalTabAction = 1 << 2; CPTypesetterLineBreakAction = 1 << 3; @@ -71972,6 +71974,11 @@ class_addMethods(the_class, [new objj_method(sel_getUid("layoutManager"), functi wrapWidth = rangeWidth; wrapRange._height = self._lineHeight; wrapRange._base = self._lineBase; + if (theString.charCodeAt(glyphIndex + 1) !== 32) + { + currentAnchor = rangeWidth; + measuringRange = CPMakeRange(glyphIndex + 1, 0); + } break; case 10: case 13: diff --git a/Resources/recipes.txt b/Resources/recipes.txt index 566d22eb2..b3a41e5f7 100644 --- a/Resources/recipes.txt +++ b/Resources/recipes.txt @@ -1,145 +1,145 @@ -1778090173464|ArrayController1| -1778090173478|ArrayControllerInitialSelectionTest| -1778090173492|ArrayControllerRemovingFirstTest| -1778090173505|AttachedSheet| -1778090173518|AttachedSheet2| -1778090173531|Bindings| -1778090173544|CGCanvasContext| -1778090173557|CGPath| -1778090173571|CPAlertTest| -1778090173584|CPAnimatablePropertyContainerTest| -1778090173597|CPAnimationContextTest| -1778090173611|CPAnimationTest| -1778090173624|CPBinder-echo-bug| -1778090173637|CPBoxCibTest| -1778090173651|CPBoxTest| -1778090173664|CPBrowserTest| -1778090173677|CPButtonBarTest| -1778090173691|CPButtonKeyEquivalentDefaultTest| -1778090173704|CPButtonTest| -1778090173717|CPByteCountFormatter| -1778090173731|CPCollectionViewNibTest| -1778090173744|CPColor-CPImage-description| -1778090173757|CPColorWellBindings| -1778090173770|CPComboBoxTest| -1778090173783|CPControlPerformClickExceptionTest| -1778090173797|CPControlSize| -1778090173810|CPCursor| -1778090173823|CPDateFormatterTest| -1778090173836|CPDatePickerTest| -1778090173850|CPDictionaryControllerTest| -1778090173863|CPDocumentControllerTest| -1778090173876|CPFormatterTest| -1778090173889|CPGraphicsTest| -1778090173902|CPImageAndTextViewImageScaling| -1778090173916|CPImageViewAlignmentScaling| -1778090173929|CPImageViewTest| -1778090173942|CPImageViewbindingsTest| -1778090173955|CPLevelIndicator| -1778090173969|CPLocalizationTest| -1778090173982|CPLogTest| -1778090173995|CPMenuCALayerTest| -1778090174008|CPMenuEnabledBindingsTest| -1778090174022|CPMenuKeyEquivalents| -1778090174035|CPMenuRemoveAllTest| -1778090174048|CPMenuSubmenuPlacementConstraints| -1778090174061|CPMenuTest| -1778090174075|CPOutlineViewCibTest| -1778090174088|CPOutlineViewTest| -1778090174101|CPOutlineViewViewBasedCibTest| -1778090174115|CPPanelTest| -1778090174128|CPPlatformWindow| -1778090174141|CPPlattformWindowMinSize| -1778090174154|CPPopUpButtonBindings| -1778090174167|CPPopUpButtonTest| -1778090174181|CPPopover| -1778090174194|CPPredicateEditorCibTest| -1778090174207|CPProgressIndicator| -1778090174220|CPPropertyListSerializationTest| -1778090174233|CPRadioBindings| -1778090174247|CPRuleEditorCibTest| -1778090174260|CPScrollView| -1778090174273|CPScrollView2| -1778090174286|CPSearchField| -1778090174299|CPSearchFieldPredicateBinding| -1778090174313|CPSegmentedControlBindings| -1778090174326|CPSegmentedControlTest| -1778090174339|CPSoundTest| -1778090174352|CPSplitViewDivider| -1778090174365|CPSplitViewTest| -1778090174379|CPStackViewTest| -1778090174392|CPStepperBindings| -1778090174405|CPStepperNibTest| -1778090174418|CPTabView2| -1778090174431|CPTabViewBindings| -1778090174444|CPTabViewNib| -1778090174457|CPTableViewGroupRows| -1778090174471|CPTextField| -1778090174484|CPTextFieldEditingStyleTest| -1778090174497|CPTextFieldHeightTest| -1778090174510|CPTextFieldMovementsTest| -1778090174524|CPTextFieldMultiline| -1778090174537|CPTextView| -1778090174550|CPTextViewCibTest| -1778090174563|CPTextViewDelegateAndNotifications| -1778090174576|CPTimeZone| -1778090174589|CPTokenFieldTest| -1778090174602|CPToolTip| -1778090174616|CPToolbarTest| -1778090174629|CPTreeControllerTest| -1778090174642|CPURLConnectionAsyncTest| -1778090174655|CPURLConnectionSynchronousTest| -1778090174668|CPUserDefaults| -1778090174681|CPUserDefaultsControllerTest| -1778090174695|CPUserNotificationTest| -1778090174708|CPViewController| -1778090174721|CPVisualEffectViewTest| -1778090174734|CPWebViewTest| -1778090174748|CPWebViewTest2| -1778090174761|CPWindowLiveResizeTest| -1778090174774|CPWindowMovableTest| -1778090174787|CPWindowResizeStyle| -1778090174801|ChildWindows| -1778090174814|CompilationTests| -1778090174827|ContinuouslyUpdatesValueBinding| -1778090174840|CopyAndPaste| -1778090174853|CrossOriginTest| -1778090174867|FF4096Test| -1778090174880|FontEnhancementTest| -1778090174893|FontMetricsExplorer| -1778090174906|KeyEquivalents| -1778090174919|KeyViewLoopTest| -1778090174933|KeyWindowInTheBackgroundActivation| -1778090174946|LayoutTest| -1778090174959|LoadTimeTest| -1778090174972|LongBindings| -1778090174985|MobileTest| -1778090174999|MultipleValueBindings| -1778090175012|NSBoxTest| -1778090175025|NSBrowserTest| -1778090175038|NewTextFieldBezel| -1778090175051|Nib2CibAlignment| -1778090175064|Nib2CibBaselineAlignementTest| -1778090175078|Nib2CibSubviewsOrderTest| -1778090175091|NibAppRemixed| -1778090175104|PatternFillTest| -1778090175117|PlatformWindows| -1778090175130|PopUpButtonEscTest| -1778090175143|ScalingTest| -1778090175157|ScalingTest2| -1778090175170|ScrollviewTheming| -1778090175183|SheetWindowOrderFrontIssue| -1778090175196|SimpleBindings2| -1778090175209|SmartFoldersDemo| -1778090175223|TableTest| -1778090175236|ThemeBrowser| -1778090175249|ThemeKitchenSink| -1778090175262|TrackingArea| -1778090175276|UndoRedoWithMenuUpdate| -1778090175289|UserlandNSTest| -1778090175302|layoutEphemeralSubviewTest| -1778090175316|loadDynamicFrameworks| -1778090175329|performKeyEquivalentTest| -1778090175342|predicateWithFormat| -1778090175355|resignFirstResponder-CPControlTextDidEndEditing| -1778090175368|sizeToFitFix| +1779209606838|ArrayController1| +1779209606852|ArrayControllerInitialSelectionTest| +1779209606865|ArrayControllerRemovingFirstTest| +1779209606879|AttachedSheet| +1779209606892|AttachedSheet2| +1779209606905|Bindings| +1779209606918|CGCanvasContext| +1779209606932|CGPath| +1779209606945|CPAlertTest| +1779209606958|CPAnimatablePropertyContainerTest| +1779209606972|CPAnimationContextTest| +1779209606985|CPAnimationTest| +1779209606998|CPBinder-echo-bug| +1779209607011|CPBoxCibTest| +1779209607025|CPBoxTest| +1779209607038|CPBrowserTest| +1779209607052|CPButtonBarTest| +1779209607065|CPButtonKeyEquivalentDefaultTest| +1779209607079|CPButtonTest| +1779209607092|CPByteCountFormatter| +1779209607106|CPCollectionViewNibTest| +1779209607119|CPColor-CPImage-description| +1779209607132|CPColorWellBindings| +1779209607145|CPComboBoxTest| +1779209607159|CPControlPerformClickExceptionTest| +1779209607172|CPControlSize| +1779209607185|CPCursor| +1779209607199|CPDateFormatterTest| +1779209607212|CPDatePickerTest| +1779209607225|CPDictionaryControllerTest| +1779209607239|CPDocumentControllerTest| +1779209607252|CPFormatterTest| +1779209607265|CPGraphicsTest| +1779209607279|CPImageAndTextViewImageScaling| +1779209607292|CPImageViewAlignmentScaling| +1779209607305|CPImageViewTest| +1779209607318|CPImageViewbindingsTest| +1779209607331|CPLevelIndicator| +1779209607345|CPLocalizationTest| +1779209607358|CPLogTest| +1779209607371|CPMenuCALayerTest| +1779209607384|CPMenuEnabledBindingsTest| +1779209607398|CPMenuKeyEquivalents| +1779209607411|CPMenuRemoveAllTest| +1779209607424|CPMenuSubmenuPlacementConstraints| +1779209607437|CPMenuTest| +1779209607451|CPOutlineViewCibTest| +1779209607464|CPOutlineViewTest| +1779209607477|CPOutlineViewViewBasedCibTest| +1779209607491|CPPanelTest| +1779209607504|CPPlatformWindow| +1779209607517|CPPlattformWindowMinSize| +1779209607530|CPPopUpButtonBindings| +1779209607544|CPPopUpButtonTest| +1779209607557|CPPopover| +1779209607570|CPPredicateEditorCibTest| +1779209607583|CPProgressIndicator| +1779209607596|CPPropertyListSerializationTest| +1779209607610|CPRadioBindings| +1779209607623|CPRuleEditorCibTest| +1779209607636|CPScrollView| +1779209607649|CPScrollView2| +1779209607662|CPSearchField| +1779209607676|CPSearchFieldPredicateBinding| +1779209607689|CPSegmentedControlBindings| +1779209607702|CPSegmentedControlTest| +1779209607715|CPSoundTest| +1779209607729|CPSplitViewDivider| +1779209607742|CPSplitViewTest| +1779209607755|CPStackViewTest| +1779209607769|CPStepperBindings| +1779209607782|CPStepperNibTest| +1779209607795|CPTabView2| +1779209607808|CPTabViewBindings| +1779209607821|CPTabViewNib| +1779209607835|CPTableViewGroupRows| +1779209607848|CPTextField| +1779209607861|CPTextFieldEditingStyleTest| +1779209607874|CPTextFieldHeightTest| +1779209607888|CPTextFieldMovementsTest| +1779209607901|CPTextFieldMultiline| +1779209607914|CPTextView| +1779209607927|CPTextViewCibTest| +1779209607940|CPTextViewDelegateAndNotifications| +1779209607954|CPTimeZone| +1779209607967|CPTokenFieldTest| +1779209607980|CPToolTip| +1779209607994|CPToolbarTest| +1779209608007|CPTreeControllerTest| +1779209608020|CPURLConnectionAsyncTest| +1779209608034|CPURLConnectionSynchronousTest| +1779209608047|CPUserDefaults| +1779209608060|CPUserDefaultsControllerTest| +1779209608074|CPUserNotificationTest| +1779209608087|CPViewController| +1779209608100|CPVisualEffectViewTest| +1779209608113|CPWebViewTest| +1779209608127|CPWebViewTest2| +1779209608140|CPWindowLiveResizeTest| +1779209608153|CPWindowMovableTest| +1779209608167|CPWindowResizeStyle| +1779209608180|ChildWindows| +1779209608193|CompilationTests| +1779209608207|ContinuouslyUpdatesValueBinding| +1779209608220|CopyAndPaste| +1779209608233|CrossOriginTest| +1779209608246|FF4096Test| +1779209608260|FontEnhancementTest| +1779209608273|FontMetricsExplorer| +1779209608286|KeyEquivalents| +1779209608300|KeyViewLoopTest| +1779209608313|KeyWindowInTheBackgroundActivation| +1779209608326|LayoutTest| +1779209608339|LoadTimeTest| +1779209608353|LongBindings| +1779209608366|MobileTest| +1779209608379|MultipleValueBindings| +1779209608392|NSBoxTest| +1779209608406|NSBrowserTest| +1779209608419|NewTextFieldBezel| +1779209608432|Nib2CibAlignment| +1779209608445|Nib2CibBaselineAlignementTest| +1779209608459|Nib2CibSubviewsOrderTest| +1779209608472|NibAppRemixed| +1779209608485|PatternFillTest| +1779209608498|PlatformWindows| +1779209608511|PopUpButtonEscTest| +1779209608525|ScalingTest| +1779209608538|ScalingTest2| +1779209608551|ScrollviewTheming| +1779209608564|SheetWindowOrderFrontIssue| +1779209608578|SimpleBindings2| +1779209608591|SmartFoldersDemo| +1779209608604|TableTest| +1779209608617|ThemeBrowser| +1779209608631|ThemeKitchenSink| +1779209608644|TrackingArea| +1779209608657|UndoRedoWithMenuUpdate| +1779209608670|UserlandNSTest| +1779209608684|layoutEphemeralSubviewTest| +1779209608697|loadDynamicFrameworks| +1779209608710|performKeyEquivalentTest| +1779209608724|predicateWithFormat| +1779209608737|resignFirstResponder-CPControlTextDidEndEditing| +1779209608750|sizeToFitFix|