From ac44e413372f3681fe50da802aba6dd5fcc9da9c Mon Sep 17 00:00:00 2001 From: daboe01 Date: Wed, 26 Aug 2026 17:09:34 +0000 Subject: [PATCH] =?UTF-8?q?Deploying=20to=20gh-pages=20from=20@=20cappucci?= =?UTF-8?q?no/cappuccino@b6a245c852f5975aa75a3fbae876b218f319d195=20?= =?UTF-8?q?=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppKit/Browser.environment/AppKit.sj | 105 ++++++- .../AppKit/CommonJS.environment/AppKit.sj | 105 ++++++- Resources/recipes.txt | 294 +++++++++--------- 3 files changed, 323 insertions(+), 181 deletions(-) diff --git a/Frameworks/AppKit/Browser.environment/AppKit.sj b/Frameworks/AppKit/Browser.environment/AppKit.sj index 5c5588342..bc719fc7c 100644 --- a/Frameworks/AppKit/Browser.environment/AppKit.sj +++ b/Frameworks/AppKit/Browser.environment/AppKit.sj @@ -73169,7 +73169,7 @@ class_addMethods(the_class, [new objj_method(sel_getUid("initWithParagraphStyle: ,["id","CPZone"])]); } -p;13;CPRulerView.jt;46070;@STATIC;1.0;I;21;Foundation/CPObject.ji;8;CPView.ji;13;CPTextField.ji;9;CPColor.ji;8;CPFont.ji;8;CPMenu.ji;12;CPMenuItem.jt;45940;objj_executeFile("Foundation/CPObject.j", NO);objj_executeFile("CPView.j", YES);objj_executeFile("CPTextField.j", YES);objj_executeFile("CPColor.j", YES);objj_executeFile("CPFont.j", YES);objj_executeFile("CPMenu.j", YES);objj_executeFile("CPMenuItem.j", YES);{var the_typedef = objj_allocateTypeDef("CPRulerOrientation"); +p;13;CPRulerView.jt;46908;@STATIC;1.0;I;21;Foundation/CPObject.ji;8;CPView.ji;13;CPTextField.ji;9;CPColor.ji;8;CPFont.ji;8;CPMenu.ji;12;CPMenuItem.jt;46778;objj_executeFile("Foundation/CPObject.j", NO);objj_executeFile("CPView.j", YES);objj_executeFile("CPTextField.j", YES);objj_executeFile("CPColor.j", YES);objj_executeFile("CPFont.j", YES);objj_executeFile("CPMenu.j", YES);objj_executeFile("CPMenuItem.j", YES);{var the_typedef = objj_allocateTypeDef("CPRulerOrientation"); objj_registerTypeDef(the_typedef); }CPHorizontalRuler = 0; CPVerticalRuler = 1; @@ -73552,9 +73552,11 @@ class_addMethods(the_class, [new objj_method(sel_getUid("scrollView"), function } else { + var client = (self.isa.method_msgSend["clientView"] || _objj_forward)(self, "clientView"); + if (client && (client == null ? client : (client.isa.method_msgSend["respondsToSelector:"] || _objj_forward)(client, "respondsToSelector:", sel_getUid("rulerView:willAddMarker:atLocation:")))) + rulerLocation = (client == null ? client : (client.isa.method_msgSend["rulerView:willAddMarker:atLocation:"] || _objj_forward)(client, "rulerView:willAddMarker:atLocation:", self, nil, rulerLocation)); var newMarker = ((___r1 = (CPRulerMarker.isa.method_msgSend["alloc"] || _objj_forward)(CPRulerMarker, "alloc")), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["initWithRulerView:markerLocation:imageValue:representedObject:"] || _objj_forward)(___r1, "initWithRulerView:markerLocation:imageValue:representedObject:", self, rulerLocation, rulerLocation, nil)); (self.isa.method_msgSend["addMarker:"] || _objj_forward)(self, "addMarker:", newMarker); - var client = (self.isa.method_msgSend["clientView"] || _objj_forward)(self, "clientView"); if (client && (client == null ? client : (client.isa.method_msgSend["respondsToSelector:"] || _objj_forward)(client, "respondsToSelector:", sel_getUid("rulerView:didAddMarker:")))) (client == null ? client : (client.isa.method_msgSend["rulerView:didAddMarker:"] || _objj_forward)(client, "rulerView:didAddMarker:", self, newMarker)); self._draggingMarker = newMarker; @@ -73573,6 +73575,9 @@ class_addMethods(the_class, [new objj_method(sel_getUid("scrollView"), function isHorizontal = self._orientation === CPHorizontalRuler || self._orientation === CPRulerOrientationHorizontal; var delta = isHorizontal ? localPoint.x - self._dragStartPoint.x : localPoint.y - self._dragStartPoint.y, newLocation = Math.max(0.0, self._dragStartLocation + delta); + var client = (self.isa.method_msgSend["clientView"] || _objj_forward)(self, "clientView"); + if (client && (client == null ? client : (client.isa.method_msgSend["respondsToSelector:"] || _objj_forward)(client, "respondsToSelector:", sel_getUid("rulerView:willMoveMarker:toLocation:")))) + newLocation = (client == null ? client : (client.isa.method_msgSend["rulerView:willMoveMarker:toLocation:"] || _objj_forward)(client, "rulerView:willMoveMarker:toLocation:", self, self._draggingMarker, newLocation)); ((___r1 = self._draggingMarker), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["setImageValue:"] || _objj_forward)(___r1, "setImageValue:", newLocation)); (self.isa.method_msgSend["_positionMarker:"] || _objj_forward)(self, "_positionMarker:", self._draggingMarker); var rep = ((___r1 = self._draggingMarker), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["representedObject"] || _objj_forward)(___r1, "representedObject")), @@ -73588,7 +73593,6 @@ class_addMethods(the_class, [new objj_method(sel_getUid("scrollView"), function ((___r1 = self._draggingMarker), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["setAlphaValue:"] || _objj_forward)(___r1, "setAlphaValue:", 1.0)); ((___r1 = ((___r2 = self._draggingMarker), ___r2 == null ? ___r2 : (___r2.isa.method_msgSend["label"] || _objj_forward)(___r2, "label"))), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["setTextColor:"] || _objj_forward)(___r1, "setTextColor:", (CPColor.isa.method_msgSend["colorWithWhite:alpha:"] || _objj_forward)(CPColor, "colorWithWhite:alpha:", 0.2, 1.0))); } - var client = (self.isa.method_msgSend["clientView"] || _objj_forward)(self, "clientView"); if (client && (client == null ? client : (client.isa.method_msgSend["respondsToSelector:"] || _objj_forward)(client, "respondsToSelector:", sel_getUid("rulerView:didMoveMarker:")))) (client == null ? client : (client.isa.method_msgSend["rulerView:didMoveMarker:"] || _objj_forward)(client, "rulerView:didMoveMarker:", self, self._draggingMarker)); var ___r1, ___r2; @@ -74269,7 +74273,7 @@ var meta_class = the_class.isa;class_addMethods(the_class, [new objj_method(sel_ ,["void"])]); } -p;12;CPTextView.jt;228816;@STATIC;1.0;i;8;CPText.ji;14;CPPasteboard.ji;14;CPColorPanel.ji;15;CPFontManager.ji;15;CPTextStorage.ji;17;CPTextContainer.ji;17;CPLayoutManager.ji;18;CPParagraphStyle.ji;14;_CPRTFParser.ji;16;_CPRTFProducer.jt;228598;objj_executeFile("CPText.j", YES);objj_executeFile("CPPasteboard.j", YES);objj_executeFile("CPColorPanel.j", YES);objj_executeFile("CPFontManager.j", YES);objj_executeFile("CPTextStorage.j", YES);objj_executeFile("CPTextContainer.j", YES);objj_executeFile("CPLayoutManager.j", YES);objj_executeFile("CPParagraphStyle.j", YES);objj_executeFile("_CPRTFParser.j", YES);objj_executeFile("_CPRTFProducer.j", YES);; +p;12;CPTextView.jt;234012;@STATIC;1.0;i;8;CPText.ji;14;CPPasteboard.ji;14;CPColorPanel.ji;15;CPFontManager.ji;15;CPTextStorage.ji;17;CPTextContainer.ji;17;CPLayoutManager.ji;18;CPParagraphStyle.ji;14;_CPRTFParser.ji;16;_CPRTFProducer.jt;233794;objj_executeFile("CPText.j", YES);objj_executeFile("CPPasteboard.j", YES);objj_executeFile("CPColorPanel.j", YES);objj_executeFile("CPFontManager.j", YES);objj_executeFile("CPTextStorage.j", YES);objj_executeFile("CPTextContainer.j", YES);objj_executeFile("CPLayoutManager.j", YES);objj_executeFile("CPParagraphStyle.j", YES);objj_executeFile("_CPRTFParser.j", YES);objj_executeFile("_CPRTFProducer.j", YES);; ; ; ; @@ -76585,7 +76589,80 @@ class_addMethods(the_class, [new objj_method(sel_getUid("updateRuler"), function var ___r1; } -,["void","CPRulerView","CPRulerMarker","id"])]); +,["void","CPRulerView","CPRulerMarker","id"]), new objj_method(sel_getUid("rulerView:willMoveMarker:toLocation:"), function $CPTextView__rulerView_willMoveMarker_toLocation_(self, _cmd, aRulerView, aMarker, proposedLocation) +{ + var rep = (aMarker == null ? aMarker : (aMarker.isa.method_msgSend["representedObject"] || _objj_forward)(aMarker, "representedObject")); + if (rep === "CPFirstLineIndent" || rep === "CPHeadIndent" || rep === "CPTailIndent") + return Math.max(0.0, proposedLocation); + var textLength = ((___r1 = self._textStorage), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["length"] || _objj_forward)(___r1, "length")); + if (textLength === 0) + return Math.max(0.0, proposedLocation); + var selectedRange = (self.isa.method_msgSend["selectedRange"] || _objj_forward)(self, "selectedRange"), + targetRange = selectedRange; + if (targetRange.length === 0) + targetRange = (self.isa.method_msgSend["selectionRangeForProposedRange:granularity:"] || _objj_forward)(self, "selectionRangeForProposedRange:granularity:", CPMakeRange(targetRange.location, 0), CPSelectByParagraph); + if (targetRange.length === 0) + return Math.max(0.0, proposedLocation); + ((___r1 = self._layoutManager), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["_validateLayoutAndGlyphs"] || _objj_forward)(___r1, "_validateLayoutAndGlyphs")); + var theString = ((___r1 = self._textStorage), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["string"] || _objj_forward)(___r1, "string")), + minLocation = 0.0, + currentParagraphStyle = ((___r1 = self._textStorage), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["attribute:atIndex:effectiveRange:"] || _objj_forward)(___r1, "attribute:atIndex:effectiveRange:", CPParagraphStyleAttributeName, targetRange.location, nil)) || (CPParagraphStyle.isa.method_msgSend["defaultParagraphStyle"] || _objj_forward)(CPParagraphStyle, "defaultParagraphStyle"), + tabStops = (currentParagraphStyle == null ? currentParagraphStyle : (currentParagraphStyle.isa.method_msgSend["tabStops"] || _objj_forward)(currentParagraphStyle, "tabStops")) || []; + var targetTabIndex = -1; + for (var i = 0; i < (tabStops == null ? tabStops : (tabStops.isa.method_msgSend["count"] || _objj_forward)(tabStops, "count")); i++) + { + var tab = (tabStops == null ? tabStops : (tabStops.isa.method_msgSend["objectAtIndex:"] || _objj_forward)(tabStops, "objectAtIndex:", i)); + if (tab === rep || (tab == null ? tab : (tab.isa.method_msgSend["location"] || _objj_forward)(tab, "location")) === (rep == null ? rep : (rep.isa.method_msgSend["location"] || _objj_forward)(rep, "location")) && (tab == null ? tab : (tab.isa.method_msgSend["alignment"] || _objj_forward)(tab, "alignment")) === (rep == null ? rep : (rep.isa.method_msgSend["alignment"] || _objj_forward)(rep, "alignment"))) + { + targetTabIndex = i; + break; + } + } + var start = targetRange.location, + end = CPMaxRange(targetRange), + tabCountInLine = 0, + lineStart = start; + for (var i = start; i < end; i++) + { + var charCode = theString.charCodeAt(i); + if (charCode === 10 || charCode === 13) + { + tabCountInLine = 0; + lineStart = i + 1; + continue; + } + if (charCode === 9) + { + if (tabCountInLine === targetTabIndex || targetTabIndex === -1) + { + var precedingX = 0.0; + if (i === lineStart) + { + var isFirstLine = lineStart === 0 || theString.charCodeAt(lineStart - 1) === 10 || theString.charCodeAt(lineStart - 1) === 13; + precedingX = isFirstLine ? (currentParagraphStyle == null ? currentParagraphStyle : (currentParagraphStyle.isa.method_msgSend["firstLineHeadIndent"] || _objj_forward)(currentParagraphStyle, "firstLineHeadIndent")) : (currentParagraphStyle == null ? currentParagraphStyle : (currentParagraphStyle.isa.method_msgSend["headIndent"] || _objj_forward)(currentParagraphStyle, "headIndent")); + } + else + { + var glyphRect = ((___r1 = self._layoutManager), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["boundingRectForGlyphRange:inTextContainer:"] || _objj_forward)(___r1, "boundingRectForGlyphRange:inTextContainer:", CPMakeRange(i - 1, 1), self._textContainer)); + precedingX = CGRectGetMaxX(glyphRect); + } + var limit = precedingX + 2.0; + if (limit > minLocation) + minLocation = limit; + } + tabCountInLine++; + } + } + return Math.max(minLocation, proposedLocation); + var ___r1; +} + +,["float","CPRulerView","CPRulerMarker","float"]), new objj_method(sel_getUid("rulerView:willAddMarker:atLocation:"), function $CPTextView__rulerView_willAddMarker_atLocation_(self, _cmd, aRulerView, aMarker, proposedLocation) +{ + return (self.isa.method_msgSend["rulerView:willMoveMarker:toLocation:"] || _objj_forward)(self, "rulerView:willMoveMarker:toLocation:", aRulerView, aMarker, proposedLocation); +} + +,["float","CPRulerView","CPRulerMarker","float"])]); } { var the_class = objj_getClass("CPTextView") @@ -77058,7 +77135,7 @@ class_addMethods(the_class, [new objj_method(sel_getUid("setPlaceholderValue:wit ,["void","id","CPString"])]); } -p;14;CPTypesetter.jt;29295;@STATIC;1.0;I;21;Foundation/CPObject.ji;18;CPParagraphStyle.ji;15;CPTextStorage.ji;8;CPFont.jt;29194;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;28988;@STATIC;1.0;I;21;Foundation/CPObject.ji;18;CPParagraphStyle.ji;15;CPTextStorage.ji;8;CPFont.jt;28887;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; @@ -77145,24 +77222,18 @@ class_addMethods(the_class, [new objj_method(sel_getUid("layoutManager"), functi { var tabStops = ((___r1 = self._currentParagraph), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["tabStops"] || _objj_forward)(___r1, "tabStops")), defaultInterval = ((___r1 = self._currentParagraph), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["defaultTabInterval"] || _objj_forward)(___r1, "defaultTabInterval")) || 28.0; - var nextDefaultLocation = (Math.floor(aWidth / defaultInterval) + 1) * defaultInterval; - var nextCustomTab = nil; - if (tabStops) + var l = tabStops ? (tabStops == null ? tabStops : (tabStops.isa.method_msgSend["count"] || _objj_forward)(tabStops, "count")) : 0; + if (l > 0) { - var l = (tabStops == null ? tabStops : (tabStops.isa.method_msgSend["count"] || _objj_forward)(tabStops, "count")); for (var i = 0; i < l; i++) { var tab = (tabStops == null ? tabStops : (tabStops.isa.method_msgSend["objectAtIndex:"] || _objj_forward)(tabStops, "objectAtIndex:", i)); if ((tab == null ? tab : (tab.isa.method_msgSend["location"] || _objj_forward)(tab, "location")) > aWidth) - { - nextCustomTab = tab; - break; - } + return tab; } } - if (nextCustomTab && (nextCustomTab == null ? nextCustomTab : (nextCustomTab.isa.method_msgSend["location"] || _objj_forward)(nextCustomTab, "location")) <= nextDefaultLocation) - return nextCustomTab; - return ((___r1 = (CPTextTab.isa.method_msgSend["alloc"] || _objj_forward)(CPTextTab, "alloc")), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["initWithType:location:"] || _objj_forward)(___r1, "initWithType:location:", CPLeftTextAlignment, nextDefaultLocation)); + var nextLocation = (Math.floor(aWidth / defaultInterval) + 1) * defaultInterval; + return ((___r1 = (CPTextTab.isa.method_msgSend["alloc"] || _objj_forward)(CPTextTab, "alloc")), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["initWithType:location:"] || _objj_forward)(___r1, "initWithType:location:", CPLeftTextAlignment, nextLocation)); var ___r1; } diff --git a/Frameworks/AppKit/CommonJS.environment/AppKit.sj b/Frameworks/AppKit/CommonJS.environment/AppKit.sj index ef9404995..f0c027160 100644 --- a/Frameworks/AppKit/CommonJS.environment/AppKit.sj +++ b/Frameworks/AppKit/CommonJS.environment/AppKit.sj @@ -71003,7 +71003,7 @@ class_addMethods(the_class, [new objj_method(sel_getUid("initWithParagraphStyle: ,["id","CPZone"])]); } -p;13;CPRulerView.jt;46070;@STATIC;1.0;I;21;Foundation/CPObject.ji;8;CPView.ji;13;CPTextField.ji;9;CPColor.ji;8;CPFont.ji;8;CPMenu.ji;12;CPMenuItem.jt;45940;objj_executeFile("Foundation/CPObject.j", NO);objj_executeFile("CPView.j", YES);objj_executeFile("CPTextField.j", YES);objj_executeFile("CPColor.j", YES);objj_executeFile("CPFont.j", YES);objj_executeFile("CPMenu.j", YES);objj_executeFile("CPMenuItem.j", YES);{var the_typedef = objj_allocateTypeDef("CPRulerOrientation"); +p;13;CPRulerView.jt;46908;@STATIC;1.0;I;21;Foundation/CPObject.ji;8;CPView.ji;13;CPTextField.ji;9;CPColor.ji;8;CPFont.ji;8;CPMenu.ji;12;CPMenuItem.jt;46778;objj_executeFile("Foundation/CPObject.j", NO);objj_executeFile("CPView.j", YES);objj_executeFile("CPTextField.j", YES);objj_executeFile("CPColor.j", YES);objj_executeFile("CPFont.j", YES);objj_executeFile("CPMenu.j", YES);objj_executeFile("CPMenuItem.j", YES);{var the_typedef = objj_allocateTypeDef("CPRulerOrientation"); objj_registerTypeDef(the_typedef); }CPHorizontalRuler = 0; CPVerticalRuler = 1; @@ -71386,9 +71386,11 @@ class_addMethods(the_class, [new objj_method(sel_getUid("scrollView"), function } else { + var client = (self.isa.method_msgSend["clientView"] || _objj_forward)(self, "clientView"); + if (client && (client == null ? client : (client.isa.method_msgSend["respondsToSelector:"] || _objj_forward)(client, "respondsToSelector:", sel_getUid("rulerView:willAddMarker:atLocation:")))) + rulerLocation = (client == null ? client : (client.isa.method_msgSend["rulerView:willAddMarker:atLocation:"] || _objj_forward)(client, "rulerView:willAddMarker:atLocation:", self, nil, rulerLocation)); var newMarker = ((___r1 = (CPRulerMarker.isa.method_msgSend["alloc"] || _objj_forward)(CPRulerMarker, "alloc")), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["initWithRulerView:markerLocation:imageValue:representedObject:"] || _objj_forward)(___r1, "initWithRulerView:markerLocation:imageValue:representedObject:", self, rulerLocation, rulerLocation, nil)); (self.isa.method_msgSend["addMarker:"] || _objj_forward)(self, "addMarker:", newMarker); - var client = (self.isa.method_msgSend["clientView"] || _objj_forward)(self, "clientView"); if (client && (client == null ? client : (client.isa.method_msgSend["respondsToSelector:"] || _objj_forward)(client, "respondsToSelector:", sel_getUid("rulerView:didAddMarker:")))) (client == null ? client : (client.isa.method_msgSend["rulerView:didAddMarker:"] || _objj_forward)(client, "rulerView:didAddMarker:", self, newMarker)); self._draggingMarker = newMarker; @@ -71407,6 +71409,9 @@ class_addMethods(the_class, [new objj_method(sel_getUid("scrollView"), function isHorizontal = self._orientation === CPHorizontalRuler || self._orientation === CPRulerOrientationHorizontal; var delta = isHorizontal ? localPoint.x - self._dragStartPoint.x : localPoint.y - self._dragStartPoint.y, newLocation = Math.max(0.0, self._dragStartLocation + delta); + var client = (self.isa.method_msgSend["clientView"] || _objj_forward)(self, "clientView"); + if (client && (client == null ? client : (client.isa.method_msgSend["respondsToSelector:"] || _objj_forward)(client, "respondsToSelector:", sel_getUid("rulerView:willMoveMarker:toLocation:")))) + newLocation = (client == null ? client : (client.isa.method_msgSend["rulerView:willMoveMarker:toLocation:"] || _objj_forward)(client, "rulerView:willMoveMarker:toLocation:", self, self._draggingMarker, newLocation)); ((___r1 = self._draggingMarker), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["setImageValue:"] || _objj_forward)(___r1, "setImageValue:", newLocation)); (self.isa.method_msgSend["_positionMarker:"] || _objj_forward)(self, "_positionMarker:", self._draggingMarker); var rep = ((___r1 = self._draggingMarker), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["representedObject"] || _objj_forward)(___r1, "representedObject")), @@ -71422,7 +71427,6 @@ class_addMethods(the_class, [new objj_method(sel_getUid("scrollView"), function ((___r1 = self._draggingMarker), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["setAlphaValue:"] || _objj_forward)(___r1, "setAlphaValue:", 1.0)); ((___r1 = ((___r2 = self._draggingMarker), ___r2 == null ? ___r2 : (___r2.isa.method_msgSend["label"] || _objj_forward)(___r2, "label"))), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["setTextColor:"] || _objj_forward)(___r1, "setTextColor:", (CPColor.isa.method_msgSend["colorWithWhite:alpha:"] || _objj_forward)(CPColor, "colorWithWhite:alpha:", 0.2, 1.0))); } - var client = (self.isa.method_msgSend["clientView"] || _objj_forward)(self, "clientView"); if (client && (client == null ? client : (client.isa.method_msgSend["respondsToSelector:"] || _objj_forward)(client, "respondsToSelector:", sel_getUid("rulerView:didMoveMarker:")))) (client == null ? client : (client.isa.method_msgSend["rulerView:didMoveMarker:"] || _objj_forward)(client, "rulerView:didMoveMarker:", self, self._draggingMarker)); var ___r1, ___r2; @@ -72103,7 +72107,7 @@ var meta_class = the_class.isa;class_addMethods(the_class, [new objj_method(sel_ ,["void"])]); } -p;12;CPTextView.jt;213744;@STATIC;1.0;i;8;CPText.ji;14;CPPasteboard.ji;14;CPColorPanel.ji;15;CPFontManager.ji;15;CPTextStorage.ji;17;CPTextContainer.ji;17;CPLayoutManager.ji;18;CPParagraphStyle.ji;14;_CPRTFParser.ji;16;_CPRTFProducer.jt;213526;objj_executeFile("CPText.j", YES);objj_executeFile("CPPasteboard.j", YES);objj_executeFile("CPColorPanel.j", YES);objj_executeFile("CPFontManager.j", YES);objj_executeFile("CPTextStorage.j", YES);objj_executeFile("CPTextContainer.j", YES);objj_executeFile("CPLayoutManager.j", YES);objj_executeFile("CPParagraphStyle.j", YES);objj_executeFile("_CPRTFParser.j", YES);objj_executeFile("_CPRTFProducer.j", YES);; +p;12;CPTextView.jt;218940;@STATIC;1.0;i;8;CPText.ji;14;CPPasteboard.ji;14;CPColorPanel.ji;15;CPFontManager.ji;15;CPTextStorage.ji;17;CPTextContainer.ji;17;CPLayoutManager.ji;18;CPParagraphStyle.ji;14;_CPRTFParser.ji;16;_CPRTFProducer.jt;218722;objj_executeFile("CPText.j", YES);objj_executeFile("CPPasteboard.j", YES);objj_executeFile("CPColorPanel.j", YES);objj_executeFile("CPFontManager.j", YES);objj_executeFile("CPTextStorage.j", YES);objj_executeFile("CPTextContainer.j", YES);objj_executeFile("CPLayoutManager.j", YES);objj_executeFile("CPParagraphStyle.j", YES);objj_executeFile("_CPRTFParser.j", YES);objj_executeFile("_CPRTFProducer.j", YES);; ; ; ; @@ -74376,7 +74380,80 @@ class_addMethods(the_class, [new objj_method(sel_getUid("updateRuler"), function var ___r1; } -,["void","CPRulerView","CPRulerMarker","id"])]); +,["void","CPRulerView","CPRulerMarker","id"]), new objj_method(sel_getUid("rulerView:willMoveMarker:toLocation:"), function $CPTextView__rulerView_willMoveMarker_toLocation_(self, _cmd, aRulerView, aMarker, proposedLocation) +{ + var rep = (aMarker == null ? aMarker : (aMarker.isa.method_msgSend["representedObject"] || _objj_forward)(aMarker, "representedObject")); + if (rep === "CPFirstLineIndent" || rep === "CPHeadIndent" || rep === "CPTailIndent") + return Math.max(0.0, proposedLocation); + var textLength = ((___r1 = self._textStorage), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["length"] || _objj_forward)(___r1, "length")); + if (textLength === 0) + return Math.max(0.0, proposedLocation); + var selectedRange = (self.isa.method_msgSend["selectedRange"] || _objj_forward)(self, "selectedRange"), + targetRange = selectedRange; + if (targetRange.length === 0) + targetRange = (self.isa.method_msgSend["selectionRangeForProposedRange:granularity:"] || _objj_forward)(self, "selectionRangeForProposedRange:granularity:", CPMakeRange(targetRange.location, 0), CPSelectByParagraph); + if (targetRange.length === 0) + return Math.max(0.0, proposedLocation); + ((___r1 = self._layoutManager), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["_validateLayoutAndGlyphs"] || _objj_forward)(___r1, "_validateLayoutAndGlyphs")); + var theString = ((___r1 = self._textStorage), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["string"] || _objj_forward)(___r1, "string")), + minLocation = 0.0, + currentParagraphStyle = ((___r1 = self._textStorage), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["attribute:atIndex:effectiveRange:"] || _objj_forward)(___r1, "attribute:atIndex:effectiveRange:", CPParagraphStyleAttributeName, targetRange.location, nil)) || (CPParagraphStyle.isa.method_msgSend["defaultParagraphStyle"] || _objj_forward)(CPParagraphStyle, "defaultParagraphStyle"), + tabStops = (currentParagraphStyle == null ? currentParagraphStyle : (currentParagraphStyle.isa.method_msgSend["tabStops"] || _objj_forward)(currentParagraphStyle, "tabStops")) || []; + var targetTabIndex = -1; + for (var i = 0; i < (tabStops == null ? tabStops : (tabStops.isa.method_msgSend["count"] || _objj_forward)(tabStops, "count")); i++) + { + var tab = (tabStops == null ? tabStops : (tabStops.isa.method_msgSend["objectAtIndex:"] || _objj_forward)(tabStops, "objectAtIndex:", i)); + if (tab === rep || (tab == null ? tab : (tab.isa.method_msgSend["location"] || _objj_forward)(tab, "location")) === (rep == null ? rep : (rep.isa.method_msgSend["location"] || _objj_forward)(rep, "location")) && (tab == null ? tab : (tab.isa.method_msgSend["alignment"] || _objj_forward)(tab, "alignment")) === (rep == null ? rep : (rep.isa.method_msgSend["alignment"] || _objj_forward)(rep, "alignment"))) + { + targetTabIndex = i; + break; + } + } + var start = targetRange.location, + end = CPMaxRange(targetRange), + tabCountInLine = 0, + lineStart = start; + for (var i = start; i < end; i++) + { + var charCode = theString.charCodeAt(i); + if (charCode === 10 || charCode === 13) + { + tabCountInLine = 0; + lineStart = i + 1; + continue; + } + if (charCode === 9) + { + if (tabCountInLine === targetTabIndex || targetTabIndex === -1) + { + var precedingX = 0.0; + if (i === lineStart) + { + var isFirstLine = lineStart === 0 || theString.charCodeAt(lineStart - 1) === 10 || theString.charCodeAt(lineStart - 1) === 13; + precedingX = isFirstLine ? (currentParagraphStyle == null ? currentParagraphStyle : (currentParagraphStyle.isa.method_msgSend["firstLineHeadIndent"] || _objj_forward)(currentParagraphStyle, "firstLineHeadIndent")) : (currentParagraphStyle == null ? currentParagraphStyle : (currentParagraphStyle.isa.method_msgSend["headIndent"] || _objj_forward)(currentParagraphStyle, "headIndent")); + } + else + { + var glyphRect = ((___r1 = self._layoutManager), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["boundingRectForGlyphRange:inTextContainer:"] || _objj_forward)(___r1, "boundingRectForGlyphRange:inTextContainer:", CPMakeRange(i - 1, 1), self._textContainer)); + precedingX = CGRectGetMaxX(glyphRect); + } + var limit = precedingX + 2.0; + if (limit > minLocation) + minLocation = limit; + } + tabCountInLine++; + } + } + return Math.max(minLocation, proposedLocation); + var ___r1; +} + +,["float","CPRulerView","CPRulerMarker","float"]), new objj_method(sel_getUid("rulerView:willAddMarker:atLocation:"), function $CPTextView__rulerView_willAddMarker_atLocation_(self, _cmd, aRulerView, aMarker, proposedLocation) +{ + return (self.isa.method_msgSend["rulerView:willMoveMarker:toLocation:"] || _objj_forward)(self, "rulerView:willMoveMarker:toLocation:", aRulerView, aMarker, proposedLocation); +} + +,["float","CPRulerView","CPRulerMarker","float"])]); } { var the_class = objj_getClass("CPTextView") @@ -74665,7 +74742,7 @@ class_addMethods(the_class, [new objj_method(sel_getUid("setPlaceholderValue:wit ,["void","id","CPString"])]); } -p;14;CPTypesetter.jt;29295;@STATIC;1.0;I;21;Foundation/CPObject.ji;18;CPParagraphStyle.ji;15;CPTextStorage.ji;8;CPFont.jt;29194;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;28988;@STATIC;1.0;I;21;Foundation/CPObject.ji;18;CPParagraphStyle.ji;15;CPTextStorage.ji;8;CPFont.jt;28887;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; @@ -74752,24 +74829,18 @@ class_addMethods(the_class, [new objj_method(sel_getUid("layoutManager"), functi { var tabStops = ((___r1 = self._currentParagraph), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["tabStops"] || _objj_forward)(___r1, "tabStops")), defaultInterval = ((___r1 = self._currentParagraph), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["defaultTabInterval"] || _objj_forward)(___r1, "defaultTabInterval")) || 28.0; - var nextDefaultLocation = (Math.floor(aWidth / defaultInterval) + 1) * defaultInterval; - var nextCustomTab = nil; - if (tabStops) + var l = tabStops ? (tabStops == null ? tabStops : (tabStops.isa.method_msgSend["count"] || _objj_forward)(tabStops, "count")) : 0; + if (l > 0) { - var l = (tabStops == null ? tabStops : (tabStops.isa.method_msgSend["count"] || _objj_forward)(tabStops, "count")); for (var i = 0; i < l; i++) { var tab = (tabStops == null ? tabStops : (tabStops.isa.method_msgSend["objectAtIndex:"] || _objj_forward)(tabStops, "objectAtIndex:", i)); if ((tab == null ? tab : (tab.isa.method_msgSend["location"] || _objj_forward)(tab, "location")) > aWidth) - { - nextCustomTab = tab; - break; - } + return tab; } } - if (nextCustomTab && (nextCustomTab == null ? nextCustomTab : (nextCustomTab.isa.method_msgSend["location"] || _objj_forward)(nextCustomTab, "location")) <= nextDefaultLocation) - return nextCustomTab; - return ((___r1 = (CPTextTab.isa.method_msgSend["alloc"] || _objj_forward)(CPTextTab, "alloc")), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["initWithType:location:"] || _objj_forward)(___r1, "initWithType:location:", CPLeftTextAlignment, nextDefaultLocation)); + var nextLocation = (Math.floor(aWidth / defaultInterval) + 1) * defaultInterval; + return ((___r1 = (CPTextTab.isa.method_msgSend["alloc"] || _objj_forward)(CPTextTab, "alloc")), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["initWithType:location:"] || _objj_forward)(___r1, "initWithType:location:", CPLeftTextAlignment, nextLocation)); var ___r1; } diff --git a/Resources/recipes.txt b/Resources/recipes.txt index 81c412195..f512288a9 100644 --- a/Resources/recipes.txt +++ b/Resources/recipes.txt @@ -1,147 +1,147 @@ -1787761187068|ArrayController1| -1787761187083|ArrayControllerInitialSelectionTest| -1787761187097|ArrayControllerRemovingFirstTest| -1787761187110|AttachedSheet| -1787761187124|AttachedSheet2| -1787761187138|Bindings| -1787761187151|CGCanvasContext| -1787761187165|CGPath| -1787761187179|CPAlertTest| -1787761187193|CPAnimatablePropertyContainerTest| -1787761187206|CPAnimationContextTest| -1787761187220|CPAnimationTest| -1787761187234|CPBinder-echo-bug| -1787761187248|CPBoxCibTest| -1787761187261|CPBoxTest| -1787761187275|CPBrowserTest| -1787761187289|CPButtonBarTest| -1787761187303|CPButtonKeyEquivalentDefaultTest| -1787761187317|CPButtonTest| -1787761187331|CPByteCountFormatter| -1787761187345|CPCollectionViewNibTest| -1787761187359|CPColor-CPImage-description| -1787761187373|CPColorWellBindings| -1787761187387|CPComboBoxTest| -1787761187401|CPControlPerformClickExceptionTest| -1787761187415|CPControlSize| -1787761187429|CPCursor| -1787761187443|CPDateFormatterTest| -1787761187456|CPDatePickerTest| -1787761187470|CPDictionaryControllerTest| -1787761187484|CPDocumentControllerTest| -1787761187498|CPFormatterTest| -1787761187511|CPGraphicsTest| -1787761187525|CPImageAndTextViewImageScaling| -1787761187539|CPImageViewAlignmentScaling| -1787761187553|CPImageViewTest| -1787761187567|CPImageViewbindingsTest| -1787761187580|CPLevelIndicator| -1787761187594|CPLocalizationTest| -1787761187608|CPLogTest| -1787761187622|CPMarkdownParser| -1787761187635|CPMenuCALayerTest| -1787761187649|CPMenuEnabledBindingsTest| -1787761187663|CPMenuKeyEquivalents| -1787761187677|CPMenuRemoveAllTest| -1787761187691|CPMenuSubmenuPlacementConstraints| -1787761187705|CPMenuTest| -1787761187718|CPOutlineViewCibTest| -1787761187732|CPOutlineViewTest| -1787761187746|CPOutlineViewViewBasedCibTest| -1787761187760|CPPanelTest| -1787761187773|CPPlatformWindow| -1787761187787|CPPlattformWindowMinSize| -1787761187801|CPPopUpButtonBindings| -1787761187815|CPPopUpButtonTest| -1787761187828|CPPopover| -1787761187842|CPPredicateEditorCibTest| -1787761187856|CPProgressIndicator| -1787761187870|CPPropertyListSerializationTest| -1787761187883|CPRadioBindings| -1787761187897|CPRuleEditorCibTest| -1787761187911|CPRuleEditorTestI8N| -1787761187925|CPScrollView| -1787761187939|CPScrollView2| -1787761187952|CPSearchField| -1787761187966|CPSearchFieldPredicateBinding| -1787761187980|CPSegmentedControlBindings| -1787761187994|CPSegmentedControlTest| -1787761188007|CPSoundTest| -1787761188021|CPSplitViewDivider| -1787761188035|CPSplitViewTest| -1787761188049|CPStackViewTest| -1787761188063|CPStepperBindings| -1787761188077|CPStepperNibTest| -1787761188090|CPTabView2| -1787761188104|CPTabViewBindings| -1787761188118|CPTabViewNib| -1787761188131|CPTableViewGroupRows| -1787761188145|CPTextField| -1787761188159|CPTextFieldEditingStyleTest| -1787761188173|CPTextFieldHeightTest| -1787761188186|CPTextFieldMovementsTest| -1787761188200|CPTextFieldMultiline| -1787761188214|CPTextView| -1787761188228|CPTextViewCibTest| -1787761188242|CPTextViewDelegateAndNotifications| -1787761188255|CPTimeZone| -1787761188269|CPTokenFieldTest| -1787761188283|CPToolTip| -1787761188297|CPToolbarTest| -1787761188310|CPTreeControllerTest| -1787761188324|CPURLConnectionAsyncTest| -1787761188338|CPURLConnectionSynchronousTest| -1787761188351|CPUserDefaults| -1787761188365|CPUserDefaultsControllerTest| -1787761188379|CPUserNotificationTest| -1787761188392|CPViewController| -1787761188406|CPVisualEffectViewTest| -1787761188420|CPWebViewTest| -1787761188434|CPWebViewTest2| -1787761188447|CPWindowLiveResizeTest| -1787761188461|CPWindowMovableTest| -1787761188475|CPWindowResizeStyle| -1787761188489|ChildWindows| -1787761188502|CompilationTests| -1787761188516|ContinuouslyUpdatesValueBinding| -1787761188530|CopyAndPaste| -1787761188544|CrossOriginTest| -1787761188557|FF4096Test| -1787761188571|FontEnhancementTest| -1787761188585|FontMetricsExplorer| -1787761188599|KeyEquivalents| -1787761188613|KeyViewLoopTest| -1787761188626|KeyWindowInTheBackgroundActivation| -1787761188640|LayoutTest| -1787761188654|LoadTimeTest| -1787761188667|LongBindings| -1787761188681|MobileTest| -1787761188695|MultipleValueBindings| -1787761188709|NSBoxTest| -1787761188722|NSBrowserTest| -1787761188736|NewTextFieldBezel| -1787761188750|Nib2CibAlignment| -1787761188764|Nib2CibBaselineAlignementTest| -1787761188777|Nib2CibSubviewsOrderTest| -1787761188791|NibAppRemixed| -1787761188805|PatternFillTest| -1787761188818|PlatformWindows| -1787761188832|PopUpButtonEscTest| -1787761188846|ScalingTest| -1787761188860|ScalingTest2| -1787761188873|ScrollviewTheming| -1787761188887|SheetWindowOrderFrontIssue| -1787761188901|SimpleBindings2| -1787761188915|SmartFoldersDemo| -1787761188928|TableTest| -1787761188942|ThemeBrowser| -1787761188956|ThemeKitchenSink| -1787761188969|TrackingArea| -1787761188983|UndoRedoWithMenuUpdate| -1787761188997|UserlandNSTest| -1787761189011|layoutEphemeralSubviewTest| -1787761189024|loadDynamicFrameworks| -1787761189038|performKeyEquivalentTest| -1787761189052|predicateWithFormat| -1787761189066|resignFirstResponder-CPControlTextDidEndEditing| -1787761189079|sizeToFitFix| +1787764167759|ArrayController1| +1787764167775|ArrayControllerInitialSelectionTest| +1787764167789|ArrayControllerRemovingFirstTest| +1787764167804|AttachedSheet| +1787764167818|AttachedSheet2| +1787764167832|Bindings| +1787764167846|CGCanvasContext| +1787764167860|CGPath| +1787764167874|CPAlertTest| +1787764167888|CPAnimatablePropertyContainerTest| +1787764167902|CPAnimationContextTest| +1787764167916|CPAnimationTest| +1787764167930|CPBinder-echo-bug| +1787764167944|CPBoxCibTest| +1787764167958|CPBoxTest| +1787764167973|CPBrowserTest| +1787764167987|CPButtonBarTest| +1787764168001|CPButtonKeyEquivalentDefaultTest| +1787764168015|CPButtonTest| +1787764168029|CPByteCountFormatter| +1787764168044|CPCollectionViewNibTest| +1787764168058|CPColor-CPImage-description| +1787764168072|CPColorWellBindings| +1787764168086|CPComboBoxTest| +1787764168100|CPControlPerformClickExceptionTest| +1787764168114|CPControlSize| +1787764168128|CPCursor| +1787764168142|CPDateFormatterTest| +1787764168156|CPDatePickerTest| +1787764168170|CPDictionaryControllerTest| +1787764168184|CPDocumentControllerTest| +1787764168198|CPFormatterTest| +1787764168212|CPGraphicsTest| +1787764168226|CPImageAndTextViewImageScaling| +1787764168240|CPImageViewAlignmentScaling| +1787764168254|CPImageViewTest| +1787764168268|CPImageViewbindingsTest| +1787764168282|CPLevelIndicator| +1787764168296|CPLocalizationTest| +1787764168309|CPLogTest| +1787764168323|CPMarkdownParser| +1787764168337|CPMenuCALayerTest| +1787764168352|CPMenuEnabledBindingsTest| +1787764168366|CPMenuKeyEquivalents| +1787764168380|CPMenuRemoveAllTest| +1787764168394|CPMenuSubmenuPlacementConstraints| +1787764168407|CPMenuTest| +1787764168421|CPOutlineViewCibTest| +1787764168435|CPOutlineViewTest| +1787764168449|CPOutlineViewViewBasedCibTest| +1787764168462|CPPanelTest| +1787764168476|CPPlatformWindow| +1787764168490|CPPlattformWindowMinSize| +1787764168503|CPPopUpButtonBindings| +1787764168517|CPPopUpButtonTest| +1787764168531|CPPopover| +1787764168545|CPPredicateEditorCibTest| +1787764168559|CPProgressIndicator| +1787764168573|CPPropertyListSerializationTest| +1787764168588|CPRadioBindings| +1787764168602|CPRuleEditorCibTest| +1787764168616|CPRuleEditorTestI8N| +1787764168630|CPScrollView| +1787764168644|CPScrollView2| +1787764168658|CPSearchField| +1787764168672|CPSearchFieldPredicateBinding| +1787764168686|CPSegmentedControlBindings| +1787764168700|CPSegmentedControlTest| +1787764168713|CPSoundTest| +1787764168727|CPSplitViewDivider| +1787764168741|CPSplitViewTest| +1787764168755|CPStackViewTest| +1787764168769|CPStepperBindings| +1787764168783|CPStepperNibTest| +1787764168796|CPTabView2| +1787764168810|CPTabViewBindings| +1787764168824|CPTabViewNib| +1787764168838|CPTableViewGroupRows| +1787764168851|CPTextField| +1787764168865|CPTextFieldEditingStyleTest| +1787764168879|CPTextFieldHeightTest| +1787764168893|CPTextFieldMovementsTest| +1787764168906|CPTextFieldMultiline| +1787764168920|CPTextView| +1787764168934|CPTextViewCibTest| +1787764168947|CPTextViewDelegateAndNotifications| +1787764168961|CPTimeZone| +1787764168975|CPTokenFieldTest| +1787764168989|CPToolTip| +1787764169003|CPToolbarTest| +1787764169016|CPTreeControllerTest| +1787764169030|CPURLConnectionAsyncTest| +1787764169043|CPURLConnectionSynchronousTest| +1787764169057|CPUserDefaults| +1787764169071|CPUserDefaultsControllerTest| +1787764169085|CPUserNotificationTest| +1787764169099|CPViewController| +1787764169113|CPVisualEffectViewTest| +1787764169126|CPWebViewTest| +1787764169140|CPWebViewTest2| +1787764169154|CPWindowLiveResizeTest| +1787764169168|CPWindowMovableTest| +1787764169182|CPWindowResizeStyle| +1787764169196|ChildWindows| +1787764169209|CompilationTests| +1787764169223|ContinuouslyUpdatesValueBinding| +1787764169237|CopyAndPaste| +1787764169250|CrossOriginTest| +1787764169264|FF4096Test| +1787764169278|FontEnhancementTest| +1787764169291|FontMetricsExplorer| +1787764169305|KeyEquivalents| +1787764169318|KeyViewLoopTest| +1787764169332|KeyWindowInTheBackgroundActivation| +1787764169345|LayoutTest| +1787764169359|LoadTimeTest| +1787764169372|LongBindings| +1787764169386|MobileTest| +1787764169399|MultipleValueBindings| +1787764169413|NSBoxTest| +1787764169426|NSBrowserTest| +1787764169440|NewTextFieldBezel| +1787764169453|Nib2CibAlignment| +1787764169467|Nib2CibBaselineAlignementTest| +1787764169480|Nib2CibSubviewsOrderTest| +1787764169494|NibAppRemixed| +1787764169507|PatternFillTest| +1787764169521|PlatformWindows| +1787764169534|PopUpButtonEscTest| +1787764169548|ScalingTest| +1787764169562|ScalingTest2| +1787764169576|ScrollviewTheming| +1787764169589|SheetWindowOrderFrontIssue| +1787764169603|SimpleBindings2| +1787764169617|SmartFoldersDemo| +1787764169631|TableTest| +1787764169645|ThemeBrowser| +1787764169659|ThemeKitchenSink| +1787764169673|TrackingArea| +1787764169688|UndoRedoWithMenuUpdate| +1787764169702|UserlandNSTest| +1787764169718|layoutEphemeralSubviewTest| +1787764169733|loadDynamicFrameworks| +1787764169747|performKeyEquivalentTest| +1787764169761|predicateWithFormat| +1787764169775|resignFirstResponder-CPControlTextDidEndEditing| +1787764169788|sizeToFitFix|