From 46b221654d8eb3f59b74ce5e2a5811f4d69fa912 Mon Sep 17 00:00:00 2001 From: Alexander Sohn <39831045+Sohn123@users.noreply.github.com> Date: Sat, 11 Jun 2022 23:11:39 +0200 Subject: [PATCH] Improve styling (#46) --- format.sh | 38 +++++++++++++++++++ .../instance/baseline..st | 4 +- .../SVGEditor.class/instance/buildAndOpen.st | 2 +- .../instance/buildCloseButtonWith..st | 2 +- .../instance/buildInfoPanelWith..st | 3 +- .../instance/buildOpenButtonWith..st | 2 +- .../instance/buildSaveButtonWith..st | 2 +- .../SVGEditor.class/instance/buildWith..st | 4 +- .../instance/actionOpenFile.st | 2 +- .../instance/actionSaveFile.st | 6 +-- .../instance/displayNameOf..st | 2 +- .../instance/selectElement..st | 2 +- .../instance/selectedElement..st | 4 +- .../instance/selectedElement.st | 2 +- .../instance/selectedPath.st | 2 +- .../SVGEditorModel.class/instance/svg..st | 2 +- .../SVGInfoPanelGenerator.class/class/for..st | 2 +- .../instance/initialize.st | 3 +- .../instance/readCircleAttributesOf..st | 2 +- .../instance/readCommonAttributesOf..st | 5 +-- .../instance/readEllipseAttributesOf..st | 2 +- .../instance/readLineAttributesOf..st | 2 +- .../instance/readPointsOf..st | 1 - .../instance/readRectangleAttributesOf..st | 2 +- .../instance/readStylesOf..st | 2 +- .../instance/visitSVGCircle..st | 5 +-- .../instance/visitSVGEllipse..st | 4 +- .../instance/visitSVGGroup..st | 4 +- .../instance/visitSVGLine..st | 4 +- .../instance/visitSVGMorph..st | 2 +- .../instance/visitSVGPath..st | 4 +- .../instance/visitSVGPolygon..st | 2 +- .../instance/visitSVGPolyline..st | 2 +- .../instance/visitSVGRectangle..st | 4 +- .../instance/visitSVGTSpan..st | 2 +- .../instance/visitSVGText..st | 2 +- .../SVGPanel.class/instance/model..st | 4 +- .../SVGPanel.class/instance/updateSVG.st | 10 ++--- .../SVGPanelSpec.class/instance/buildWith..st | 6 +-- ...Segments.color.borderWidth.borderColor..st | 2 +- ...ygon.fillStyle.borderWidth.borderColor..st | 2 +- ...fill.borderWidth.borderColor.transform..st | 4 +- .../instance/asBezier2Segments.st | 3 +- .../instance/asBezier2Shape..st | 5 +-- .../instance/asBezier2Shape.st | 20 +++++----- .../Color.extension/instance/alphaMixed..st | 2 +- .../Color.extension/instance/pixelWord32.st | 2 +- .../instance/compositeScale.st | 4 +- .../instance/compositeSkew.st | 4 +- .../Point.extension/instance/angleWith..st | 4 +- .../instance/upToAny..st | 6 +-- .../instance/boundsWithTransform..st | 4 +- .../instance/renderEllipse.on..st | 8 ++-- .../instance/renderLine.on..st | 2 +- .../instance/renderPolygon.on..st | 4 +- .../instance/renderPolyline.on..st | 2 +- .../instance/renderText.on..st | 6 +-- .../instance/styleIn.fromSVGStyle..st | 4 +- .../instance/createRectangleFromSVG..st | 2 +- .../instance/cachedComposedStyle..st | 2 +- .../instance/createFromSVG..st | 2 +- .../instance/fullDrawOn..st | 6 +-- .../instance/handleBoundsChange..st | 2 +- .../SVGComponentMorph.class/instance/id..st | 2 +- .../instance/initialize.st | 2 +- .../instance/printOn..st | 2 +- .../instance/privateFullMoveBy..st | 2 +- .../instance/renderer..st | 1 - .../instance/style..st | 2 +- .../transformFromSVGAttributeStream..st | 4 +- .../instance/create.fromSVG..st | 3 +- .../createFillFromSVGLinearGradient..st | 10 ++--- .../createFillFromSVGRadialGradient..st | 10 ++--- .../createPolylineFromSVGPolyline..st | 1 - .../instance/createRampFromSVGGradient..st | 2 +- .../instance/drawSubmorphsOn..st | 4 +- .../instance/initialize.st | 2 +- .../instance/setFill.to..st | 2 +- .../instance/containsPoint..st | 6 +-- .../instance/createRectangleFromSVG..st | 4 +- .../SVGEllipseMorph.class/instance/drawOn..st | 2 +- .../instance/addSubmorphsOf.to..st | 2 +- .../instance/applyCircleAttributesOf.on..st | 2 +- .../instance/applyEllipseAttributesOf.on..st | 2 +- .../instance/applyLineAttributesOf.on..st | 2 +- .../instance/applyPathAttributesOf.on..st | 2 +- .../applyPolygonalAttributesOf.on..st | 2 +- .../applyRectangleAttributesOf.on..st | 2 +- .../instance/applySVGAttributesOf.on..st | 11 +++--- .../instance/applyStyleOf.on..st | 4 +- .../instance/applyTSpanAttributesOf.on..st | 13 +++---- .../instance/applyTextAttributesOf.on..st | 2 +- .../instance/applyTransformOf.on..st | 10 ++--- .../SVGExporter.class/instance/initialize.st | 3 +- .../instance/serializeTextChildren.on..st | 6 +-- .../instance/visitSVGCircle..st | 6 +-- .../instance/visitSVGEllipse..st | 6 +-- .../instance/visitSVGGroup..st | 4 +- .../instance/visitSVGLine..st | 6 +-- .../instance/visitSVGMorph..st | 2 +- .../instance/visitSVGPath..st | 6 +-- .../instance/visitSVGPolygon..st | 2 +- .../instance/visitSVGPolygonal..st | 6 +-- .../instance/visitSVGPolyline..st | 2 +- .../instance/visitSVGRectangle..st | 6 +-- .../instance/visitSVGTSpan..st | 2 +- .../instance/visitSVGText..st | 6 +-- .../instance/mappedToBounds..st | 2 +- .../instance/spread..st | 2 +- .../instance/units..st | 2 +- .../instance/computeBounds.st | 8 ++-- .../instance/createFromSVG..st | 2 +- .../instance/createRectangleFromSVG..st | 4 +- .../SVGLineMorph.class/instance/drawOn..st | 2 +- .../SVGMorph.class/class/example.st | 2 +- .../fileReaderServicesForFile.suffix..st | 6 +-- .../SVGMorph.class/class/fromDroppedFile..st | 1 - .../SVGMorph.class/class/fromFile..st | 3 +- .../SVGMorph.class/class/fromString..st | 1 - .../SVGMorph.class/class/services.st | 4 +- .../SVGMorph.class/instance/defaultViewBox.st | 2 +- .../SVGMorph.class/instance/drawOn..st | 4 +- .../instance/drawSubmorphsOn..st | 4 +- .../SVGMorph.class/instance/getFill..st | 2 +- .../SVGMorph.class/instance/initialize.st | 2 +- .../instance/setDimensionsFromSVG..st | 4 +- .../instance/computeBounds.st | 6 +-- .../instance/createArcSegmentFrom.at..st | 16 ++++---- .../createCubicBezierSegmentFrom.at..st | 6 +-- .../instance/createFromSVG..st | 4 +- .../instance/createLineSegmentFrom.at..st | 2 +- .../createQuadraticBezierSegmentFrom.at..st | 6 +-- .../instance/createSegmentsFromSVG..st | 26 ++++++------- .../SVGPathMorph.class/instance/drawOn..st | 2 +- .../SVGPathMorph.class/instance/initialize.st | 2 +- .../SVGPathMorph.class/instance/segments..st | 2 +- .../userSpaceBoundingBoxWithRespectTo..st | 2 +- .../SVGPolygonMorph.class/instance/drawOn..st | 2 +- .../instance/computeBounds.st | 2 +- .../instance/createFromSVG..st | 2 +- .../instance/initialize.st | 2 +- .../instance/pointDataFromSVG..st | 2 +- .../instance/drawOn..st | 2 +- .../instance/createRectangleFromSVG..st | 4 +- .../instance/computeBounds.st | 4 +- .../instance/renderRect.on..st | 2 +- .../instance/renderText.on..st | 2 +- .../class/runsFromSegments..st | 19 +++++----- .../SVGSegmentRun.class/instance/segments..st | 2 +- .../instance/createTextFromSVG..st | 4 +- .../instance/computeBounds.st | 10 ++--- .../instance/createTextFromSVG..st | 2 +- .../SVGTextMorph.class/instance/drawOn..st | 2 +- .../SVGTextMorph.class/instance/fontToUse.st | 2 +- .../SVGTextMorph.class/instance/location..st | 2 +- .../SVGTextMorph.class/instance/text..st | 2 +- .../instance/textForDisplayName.st | 2 +- .../userSpaceBoundingBoxWithRespectTo..st | 12 +++--- .../instance/alpha..st | 2 +- .../String.extension/instance/asSVGNumber.st | 2 +- .../instance/derivativeFont..st | 4 +- .../class/defaultSVGFont.st | 2 +- .../class/defaultSVGTextStyle.st | 2 +- .../class/installDefaultSVGTextStyle.st | 5 +-- .../instance/pixelWord32.st | 2 +- .../instance/actionOpenFile.st | 1 - .../instance/actionSaveFile.st | 1 - .../instance/let.openAFileAt..st | 4 +- .../instance/let.writeFileAt.to..st | 2 +- .../instance/testActionCloseFile.st | 3 +- .../instance/testActionOpenFile.st | 3 +- .../instance/testActionOpenFilePathNil.st | 5 +-- .../instance/testActionSaveFile.st | 5 +-- .../instance/testActionSaveFilePathNil.st | 5 +-- .../instance/testChildrenOf.st | 2 +- .../instance/testDisplayName.st | 2 +- .../instance/testHasChildren.st | 5 +-- .../instance/testTreeRoots.st | 3 +- .../SVGEditorTest.class/instance/setUp.st | 2 +- .../instance/testCloseButtonAction.st | 2 +- .../testCloseButtonActionWithoutSVG.st | 2 +- .../instance/testCloseButtonExists.st | 2 +- .../instance/testDrawingAreaExists.st | 2 +- .../instance/testOpenButtonAction.st | 2 +- .../instance/testOpenButtonExists.st | 2 +- .../instance/testSaveButtonAction.st | 2 +- .../testSaveButtonActionWithoutSVG.st | 2 +- .../instance/testSaveButtonExists.st | 2 +- .../instance/testTreeViewExists.st | 2 +- .../instance/demoSVG.st | 2 +- .../instance/hasValue.atKey.in..st | 3 +- .../instance/testCircle.st | 8 ++-- .../instance/testColor.st | 2 +- .../instance/testEllipse.st | 6 +-- .../instance/testGroup.st | 4 +- .../instance/testID.st | 2 +- .../instance/testLine.st | 10 ++--- .../instance/testPath.st | 3 +- .../instance/testPolygon.st | 6 +-- .../instance/testPolyline.st | 6 +-- .../instance/testRectangle.st | 8 ++-- .../instance/testSVG.st | 4 +- .../instance/testTSpan.st | 6 +-- .../instance/testText.st | 6 +-- .../instance/assert.closeTo..st | 2 +- .../instance/assertMatrix.closeTo..st | 2 +- .../instance/reconstruct.st | 6 +-- .../instance/testRotation.st | 4 +- .../instance/testScale.st | 4 +- .../instance/testSkew.st | 4 +- .../instance/testTranslate.st | 4 +- .../instance/assertExportOf.toBe..st | 6 +-- .../instance/atomTestCase.st | 6 +-- .../instance/circleTestCase.st | 4 +- .../instance/ellipseTestCase.st | 6 +-- .../instance/groupOrderTestCase.st | 6 +-- .../instance/groupTestCase.st | 6 +-- .../instance/idTestCase.st | 4 +- .../instance/lineTestCase.st | 6 +-- .../instance/pathTestCase.st | 4 +- .../instance/polygonTestCase.st | 6 +-- .../instance/polylineTestCase.st | 6 +-- .../instance/rectangleTestCase.st | 4 +- .../instance/rotatedRectangleTestCase.st | 4 +- .../instance/testExportAtom.st | 2 +- .../instance/testExportCircle.st | 2 +- .../instance/testExportEllipse.st | 2 +- .../instance/testExportGroups.st | 2 +- .../instance/testExportGroupsInOrder.st | 2 +- .../instance/testExportHeightWidth.st | 2 +- .../instance/testExportId.st | 2 +- .../instance/testExportLine.st | 2 +- .../instance/testExportPath.st | 2 +- .../instance/testExportPolygon.st | 2 +- .../instance/testExportPolyline.st | 2 +- .../instance/testExportRectangle.st | 2 +- .../instance/testExportRotation.st | 2 +- .../instance/testExportRotationPoint.st | 2 +- .../instance/testExportScaling.st | 2 +- .../instance/testExportSkewX.st | 2 +- .../instance/testExportSkewY.st | 2 +- .../instance/testExportTSpan.st | 2 +- .../instance/testExportText.st | 2 +- .../instance/testExportTranslation.st | 2 +- .../instance/testExportViewBox.st | 2 +- .../instance/testSerializePolygonalPoints.st | 6 +-- .../instance/textTestCase.st | 2 +- .../instance/transformRotatePointTestCase.st | 6 +-- .../instance/transformScaleTestCase.st | 2 +- .../instance/transformSkewXTestCase.st | 4 +- .../instance/transformSkewYTestCase.st | 4 +- .../instance/transformTranslateTestCase.st | 4 +- .../instance/tspanTestCase.st | 2 +- .../instance/viewBoxTestCase.st | 2 +- .../instance/widthHeightTestCase.st | 2 +- .../instance/addRenderer.on..st | 2 +- .../instance/expectedFailures.st | 2 +- .../SVGMorphTest.class/instance/render..st | 2 +- .../instance/submorphBoundsOf..st | 9 ++--- .../instance/testDisplayNameBasic.st | 4 +- .../instance/testDisplayNameOfTSpan.st | 4 +- .../instance/testDisplayNameOfText.st | 4 +- .../instance/testDisplayNameWithId.st | 4 +- .../instance/testSVGCircleBounds.st | 6 +-- .../instance/testSVGCircleExists.st | 4 +- .../instance/testSVGCircleRectangle.st | 6 +-- .../instance/testSVGCircleRendering.st | 9 ++--- .../instance/testSVGEllipseBounds.st | 6 +-- .../instance/testSVGEllipseExists.st | 4 +- .../instance/testSVGEllipseRectangle.st | 6 +-- .../instance/testSVGEllipseRendering.st | 9 ++--- .../instance/testSVGGroup.st | 7 ++-- .../instance/testSVGGroupExists.st | 4 +- .../instance/testSVGLineBounds.st | 6 +-- .../instance/testSVGLineExists.st | 4 +- .../instance/testSVGLineRectangle.st | 6 +-- .../instance/testSVGLineRendering.st | 9 ++--- .../instance/testSVGPathExists.st | 4 +- .../instance/testSVGPathRendering.st | 9 ++--- .../instance/testSVGPolygonExists.st | 4 +- .../instance/testSVGPolygonRendering.st | 9 ++--- .../instance/testSVGPolylineExists.st | 4 +- .../instance/testSVGPolylineRendering.st | 9 ++--- .../instance/testSVGRectangleBounds.st | 6 +-- .../instance/testSVGRectangleExists.st | 4 +- .../instance/testSVGRectangleRectangle.st | 6 +-- .../instance/testSVGRectangleRendering.st | 9 ++--- .../instance/testSVGTSpanExists.st | 4 +- .../instance/testSVGTSpanRendering.st | 9 ++--- .../instance/testSVGTextExists.st | 4 +- .../instance/testSVGTextRendering.st | 9 ++--- .../SVGMorphTests.class/instance/idSVG.st | 2 +- .../instance/idTestCase.st | 2 +- .../instance/testBoundsNegativeViewBox.st | 2 +- .../instance/testFillIn.with..st | 2 +- .../instance/testForBlackStroke.st | 4 +- .../instance/testForBlackStrokeWidth.st | 4 +- .../instance/testForBlueFill.st | 4 +- .../instance/testForBrownStroke.st | 4 +- .../instance/testForBrownStrokeWidth.st | 4 +- .../instance/testForOrangeStroke.st | 4 +- .../instance/testForOrangeStrokeWidth.st | 4 +- .../instance/testForRedFill.st | 4 +- .../instance/testForTransparentFill.st | 4 +- .../instance/testPercentageHeight.st | 2 +- .../instance/testPercentageWidth.st | 2 +- .../instance/testSVGValue.at.against..st | 3 +- .../instance/testStrokeIn.with..st | 2 +- .../instance/testStrokeWidth.with..st | 2 +- .../instance/testWidthHeightEmptySVG.st | 3 +- .../instance/initialize.st | 2 +- .../instance/renderCircle.on..st | 2 +- .../instance/renderEllipse.on..st | 2 +- .../instance/renderLine.on..st | 2 +- .../instance/renderPath.on..st | 2 +- .../instance/renderPolygon.on..st | 2 +- .../instance/renderPolyline.on..st | 4 +- .../instance/renderRect.on..st | 4 +- .../instance/renderTSpan.on..st | 2 +- .../instance/renderText.on..st | 4 +- .../instance/defaultFontSize.st | 2 +- .../instance/testDefaultFont.st | 2 +- .../instance/testDefaultFontInSVGText.st | 6 +-- .../instance/testTextColor.st | 6 +-- .../instance/testTextScaling.st | 9 ++--- .../instance/testTextSize.st | 7 ++-- 326 files changed, 647 insertions(+), 653 deletions(-) create mode 100755 format.sh diff --git a/format.sh b/format.sh new file mode 100755 index 00000000..c23da752 --- /dev/null +++ b/format.sh @@ -0,0 +1,38 @@ +#!/bin/bash +files=$(find . -type f -name "*.st") + +#Trailing whitespace +sed -i -e 's/[ \t]*$//' $files + +#Point before parentheses +sed -i 's/\.)/)/g' $files +sed -i 's/\.]/]/g' $files +sed -i 's/\.}/}/g' $files + +#Space before parentheses +sed -i 's/[ ]\+)/)/g' $files +sed -i 's/[ ]\+]/]/g' $files +sed -i 's/[ ]\+}/}/g' $files + +#Space after parentheses +sed -i 's/\[[ ]\+/[/g' $files +sed -i 's/([ ]\+/(/g' $files +sed -i 's/{[ ]\+/{/g' $files + +#Second Line is new line (Doesn't work with comments) +#sed -i '3,3s/[^"\S]\+/\n&/' $files + +#Remove Space after and before | +sed -i -E 's/\|(\s)*(\S*)(\s)*\|/\|\2\|/g' $files + +#Old syntax to new syntax +sed -i 's/_/:=/g' $files + +#Spaces befor dots (To strict right now) +#sed -i 's/[ ]\+\./\./g' $files + +#Spaces around @ +sed -i 's/[ ]*@[ ]*/ @ /g' $files + +#Dot after return consistency +sed -i '$s/\.$//' $files diff --git a/packages/BaselineOfSVGMorph.package/BaselineOfSVGMorph.class/instance/baseline..st b/packages/BaselineOfSVGMorph.package/BaselineOfSVGMorph.class/instance/baseline..st index 56be6d8d..8ff312a7 100644 --- a/packages/BaselineOfSVGMorph.package/BaselineOfSVGMorph.class/instance/baseline..st +++ b/packages/BaselineOfSVGMorph.package/BaselineOfSVGMorph.class/instance/baseline..st @@ -18,6 +18,6 @@ baseline: spec group: 'editor' with: #('SVG-Editor'); group: 'tests' with: #('Tests-SVG-Morphic' 'Tests-SVG-Editor'); group: 'mtf' with: #('MorphicTestingFramework'); - group: 'swalinter' with: #('SwaLint'); - yourself . + group: 'swalinter' with: #('SwaLint'); + yourself ] diff --git a/packages/SVG-Editor.package/SVGEditor.class/instance/buildAndOpen.st b/packages/SVG-Editor.package/SVGEditor.class/instance/buildAndOpen.st index 73365a85..fb0af12d 100644 --- a/packages/SVG-Editor.package/SVGEditor.class/instance/buildAndOpen.st +++ b/packages/SVG-Editor.package/SVGEditor.class/instance/buildAndOpen.st @@ -1,6 +1,6 @@ toolbuilder buildAndOpen - + | builder windowSpec | builder := ToolBuilder default. windowSpec := self buildWith: builder. diff --git a/packages/SVG-Editor.package/SVGEditor.class/instance/buildCloseButtonWith..st b/packages/SVG-Editor.package/SVGEditor.class/instance/buildCloseButtonWith..st index f3a88688..81ef2f7e 100644 --- a/packages/SVG-Editor.package/SVGEditor.class/instance/buildCloseButtonWith..st +++ b/packages/SVG-Editor.package/SVGEditor.class/instance/buildCloseButtonWith..st @@ -8,4 +8,4 @@ buildCloseButtonWith: aToolBuilder help: 'Close the currently opened file'; enabled: #canCloseFile; action: #actionCloseFile; - yourself \ No newline at end of file + yourself \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGEditor.class/instance/buildInfoPanelWith..st b/packages/SVG-Editor.package/SVGEditor.class/instance/buildInfoPanelWith..st index e5e319be..4ead4ffd 100644 --- a/packages/SVG-Editor.package/SVGEditor.class/instance/buildInfoPanelWith..st +++ b/packages/SVG-Editor.package/SVGEditor.class/instance/buildInfoPanelWith..st @@ -4,5 +4,4 @@ buildInfoPanelWith: aToolBuilder ^ aToolBuilder pluggableMultiColumnListSpec new name: #infoPanel; model: self model; - list: #infoForSelectedElement. - \ No newline at end of file + list: #infoForSelectedElement diff --git a/packages/SVG-Editor.package/SVGEditor.class/instance/buildOpenButtonWith..st b/packages/SVG-Editor.package/SVGEditor.class/instance/buildOpenButtonWith..st index 78668d8d..0bbbf1d6 100644 --- a/packages/SVG-Editor.package/SVGEditor.class/instance/buildOpenButtonWith..st +++ b/packages/SVG-Editor.package/SVGEditor.class/instance/buildOpenButtonWith..st @@ -7,4 +7,4 @@ buildOpenButtonWith: aToolBuilder label: 'Open'; help: 'Open an SVG file for editing'; action: #actionOpenFile; - yourself \ No newline at end of file + yourself \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGEditor.class/instance/buildSaveButtonWith..st b/packages/SVG-Editor.package/SVGEditor.class/instance/buildSaveButtonWith..st index 5590b2cf..0a2bd478 100644 --- a/packages/SVG-Editor.package/SVGEditor.class/instance/buildSaveButtonWith..st +++ b/packages/SVG-Editor.package/SVGEditor.class/instance/buildSaveButtonWith..st @@ -8,4 +8,4 @@ buildSaveButtonWith: aToolBuilder help: 'Save the SVG to a file'; enabled: #canSaveFile; action: #actionSaveFile; - yourself \ No newline at end of file + yourself \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGEditor.class/instance/buildWith..st b/packages/SVG-Editor.package/SVGEditor.class/instance/buildWith..st index fa1ee86d..0b50db2e 100644 --- a/packages/SVG-Editor.package/SVGEditor.class/instance/buildWith..st +++ b/packages/SVG-Editor.package/SVGEditor.class/instance/buildWith..st @@ -1,11 +1,11 @@ toolbuilder buildWith: aToolBuilder - | window | + |window| window := self model buildWindowWith: aToolBuilder specs: { (self switchesFrame) -> (self buildSwitchesWIth: aToolBuilder) . (self panelDrawingFrame) -> (self buildDrawingAreaWith: aToolBuilder) . - (self treeFrame) -> (self buildTreeViewWith: aToolBuilder) . + (self treeFrame) -> (self buildTreeViewWith: aToolBuilder) . (self infoPanelFrame) -> (self buildInfoPanelWith: aToolBuilder) }. diff --git a/packages/SVG-Editor.package/SVGEditorModel.class/instance/actionOpenFile.st b/packages/SVG-Editor.package/SVGEditorModel.class/instance/actionOpenFile.st index 0466e29a..c175181f 100644 --- a/packages/SVG-Editor.package/SVGEditorModel.class/instance/actionOpenFile.st +++ b/packages/SVG-Editor.package/SVGEditorModel.class/instance/actionOpenFile.st @@ -5,6 +5,6 @@ actionOpenFile filename := self askOpenPath. filename ifNil: [^ self]. stream := self getReadStreamForFileNamed: filename. - + [self svg: (SVGMorph fromFileStream: stream)] ensure: [stream close] diff --git a/packages/SVG-Editor.package/SVGEditorModel.class/instance/actionSaveFile.st b/packages/SVG-Editor.package/SVGEditorModel.class/instance/actionSaveFile.st index b5084e3f..e66bbb55 100644 --- a/packages/SVG-Editor.package/SVGEditorModel.class/instance/actionSaveFile.st +++ b/packages/SVG-Editor.package/SVGEditorModel.class/instance/actionSaveFile.st @@ -1,13 +1,13 @@ actions actionSaveFile - + | filename stream | self canSaveFile ifFalse: [^self]. - + filename := self askSavePath. filename ifNil: [^ self]. stream := self getWriteStreamForFileNamed: filename. - + [SVGExporter new visitSVGMorph: self svg; exportOn: stream] diff --git a/packages/SVG-Editor.package/SVGEditorModel.class/instance/displayNameOf..st b/packages/SVG-Editor.package/SVGEditorModel.class/instance/displayNameOf..st index 6f56cfba..c8105401 100644 --- a/packages/SVG-Editor.package/SVGEditorModel.class/instance/displayNameOf..st +++ b/packages/SVG-Editor.package/SVGEditorModel.class/instance/displayNameOf..st @@ -1,4 +1,4 @@ accessing displayNameOf: aNode - + ^ aNode displayName \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGEditorModel.class/instance/selectElement..st b/packages/SVG-Editor.package/SVGEditorModel.class/instance/selectElement..st index 5205f9e9..8a4a96be 100644 --- a/packages/SVG-Editor.package/SVGEditorModel.class/instance/selectElement..st +++ b/packages/SVG-Editor.package/SVGEditorModel.class/instance/selectElement..st @@ -1,6 +1,6 @@ accessing selectElement: anElement - + |current| selectedPath := OrderedCollection new. current := anElement. diff --git a/packages/SVG-Editor.package/SVGEditorModel.class/instance/selectedElement..st b/packages/SVG-Editor.package/SVGEditorModel.class/instance/selectedElement..st index e0cbbf3f..d62a7917 100644 --- a/packages/SVG-Editor.package/SVGEditorModel.class/instance/selectedElement..st +++ b/packages/SVG-Editor.package/SVGEditorModel.class/instance/selectedElement..st @@ -1,7 +1,7 @@ accessing selectedElement: anObject - + selectedElement := anObject. - self + self changed: #selectedElement; changed: #infoForSelectedElement \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGEditorModel.class/instance/selectedElement.st b/packages/SVG-Editor.package/SVGEditorModel.class/instance/selectedElement.st index 779839a6..b4291702 100644 --- a/packages/SVG-Editor.package/SVGEditorModel.class/instance/selectedElement.st +++ b/packages/SVG-Editor.package/SVGEditorModel.class/instance/selectedElement.st @@ -1,4 +1,4 @@ accessing selectedElement - + ^ selectedElement \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGEditorModel.class/instance/selectedPath.st b/packages/SVG-Editor.package/SVGEditorModel.class/instance/selectedPath.st index ef8f74c4..f37e4ae6 100644 --- a/packages/SVG-Editor.package/SVGEditorModel.class/instance/selectedPath.st +++ b/packages/SVG-Editor.package/SVGEditorModel.class/instance/selectedPath.st @@ -1,4 +1,4 @@ accessing selectedPath - + ^ selectedPath \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGEditorModel.class/instance/svg..st b/packages/SVG-Editor.package/SVGEditorModel.class/instance/svg..st index 4ab4b436..505f37ff 100644 --- a/packages/SVG-Editor.package/SVGEditorModel.class/instance/svg..st +++ b/packages/SVG-Editor.package/SVGEditorModel.class/instance/svg..st @@ -2,7 +2,7 @@ accessing svg: anSVGMorph anSVGMorph = self svg ifTrue: [^ self]. - + svg := anSVGMorph. self changed: #svg; diff --git a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/class/for..st b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/class/for..st index 83b96b15..2abc29c5 100644 --- a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/class/for..st +++ b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/class/for..st @@ -1,6 +1,6 @@ accessing for: aMorph - aMorph + aMorph ifNil: [^ Array new]. ^ aMorph accept: self new \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/initialize.st b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/initialize.st index 02c9b765..50316393 100644 --- a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/initialize.st +++ b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/initialize.st @@ -1,7 +1,6 @@ initialize-release initialize - self + self keys: OrderedCollection new; values: OrderedCollection new - \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readCircleAttributesOf..st b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readCircleAttributesOf..st index dfc0de7d..a1905062 100644 --- a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readCircleAttributesOf..st +++ b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readCircleAttributesOf..st @@ -1,6 +1,6 @@ helpers readCircleAttributesOf: aCircle - self + self at: 'Position' put: aCircle rectangle center asString; at: 'Radius' put: (aCircle rectangle width / 2) asString \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readCommonAttributesOf..st b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readCommonAttributesOf..st index 033577a6..714f6ac0 100644 --- a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readCommonAttributesOf..st +++ b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readCommonAttributesOf..st @@ -1,8 +1,7 @@ helpers readCommonAttributesOf: aMorph - self + self at: 'Type' put: aMorph humanReadableClassName; at: 'ID' put: aMorph id; - readStylesOf: aMorph. - \ No newline at end of file + readStylesOf: aMorph diff --git a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readEllipseAttributesOf..st b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readEllipseAttributesOf..st index d42b508a..a30c0b35 100644 --- a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readEllipseAttributesOf..st +++ b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readEllipseAttributesOf..st @@ -1,7 +1,7 @@ helpers readEllipseAttributesOf: anEllipse - self + self at: 'Position' put: anEllipse rectangle center asString; at: 'Horizontal Radius' put: (anEllipse rectangle width / 2) asString; at: 'Vertical Radius' put: (anEllipse rectangle height / 2) asString \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readLineAttributesOf..st b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readLineAttributesOf..st index 82e05f02..bac91d68 100644 --- a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readLineAttributesOf..st +++ b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readLineAttributesOf..st @@ -1,6 +1,6 @@ helpers readLineAttributesOf: aLine - self + self at: 'Start' put: aLine rectangle origin asString; at: 'End' put: aLine rectangle corner asString \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readPointsOf..st b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readPointsOf..st index 9016fda3..0a0fe10a 100644 --- a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readPointsOf..st +++ b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readPointsOf..st @@ -2,4 +2,3 @@ helpers readPointsOf: aPolygonalMorph self at: 'Points' put: (aPolygonalMorph points joinSeparatedBy: ' ') - \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readRectangleAttributesOf..st b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readRectangleAttributesOf..st index b9c28961..f192c4f8 100644 --- a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readRectangleAttributesOf..st +++ b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readRectangleAttributesOf..st @@ -1,7 +1,7 @@ helpers readRectangleAttributesOf: aRectangle - self + self at: 'Position' put: aRectangle rectangle origin asString; at: 'Width' put: (aRectangle rectangle width) asString; at: 'Height' put: (aRectangle rectangle height) asString \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readStylesOf..st b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readStylesOf..st index 8be78a6d..f6f1e9ed 100644 --- a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readStylesOf..st +++ b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/readStylesOf..st @@ -1,5 +1,5 @@ helpers readStylesOf: aMorph - aMorph style keysAndValuesDo: [ :key :value | + aMorph style keysAndValuesDo: [:key :value | self at: key put: value asString] \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGCircle..st b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGCircle..st index 81689eb5..0675491b 100644 --- a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGCircle..st +++ b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGCircle..st @@ -1,8 +1,7 @@ visiting visitSVGCircle: aCircle - - ^ self + + ^ self readCommonAttributesOf: aCircle; readCircleAttributesOf: aCircle; asList - \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGEllipse..st b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGEllipse..st index f83acc77..a31f4c1a 100644 --- a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGEllipse..st +++ b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGEllipse..st @@ -1,7 +1,7 @@ visiting visitSVGEllipse: anEllipse - - ^ self + + ^ self readCommonAttributesOf: anEllipse; readEllipseAttributesOf: anEllipse; asList \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGGroup..st b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGGroup..st index d2890f00..46e2fe67 100644 --- a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGGroup..st +++ b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGGroup..st @@ -1,6 +1,6 @@ visiting visitSVGGroup: aGroup - - ^ self + + ^ self readCommonAttributesOf: aGroup; asList \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGLine..st b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGLine..st index 2af6bfe4..186be567 100644 --- a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGLine..st +++ b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGLine..st @@ -1,7 +1,7 @@ visiting visitSVGLine: aLine - - ^ self + + ^ self readCommonAttributesOf: aLine; readLineAttributesOf: aLine; asList \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGMorph..st b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGMorph..st index e6157e33..caefd6af 100644 --- a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGMorph..st +++ b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGMorph..st @@ -1,6 +1,6 @@ visiting visitSVGMorph: aMorph - ^ self + ^ self readCommonAttributesOf: aMorph; asList \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGPath..st b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGPath..st index 79ac64da..f6d879fc 100644 --- a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGPath..st +++ b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGPath..st @@ -1,6 +1,6 @@ visiting visitSVGPath: aPath - - ^ self + + ^ self readCommonAttributesOf: aPath; asList \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGPolygon..st b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGPolygon..st index 0d083f5a..5ec03f38 100644 --- a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGPolygon..st +++ b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGPolygon..st @@ -1,7 +1,7 @@ visiting visitSVGPolygon: aPolygon - ^ self + ^ self readCommonAttributesOf: aPolygon; readPointsOf: aPolygon; asList \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGPolyline..st b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGPolyline..st index 82733a1d..18e5eb07 100644 --- a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGPolyline..st +++ b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGPolyline..st @@ -1,7 +1,7 @@ visiting visitSVGPolyline: aPolyline - ^ self + ^ self readCommonAttributesOf: aPolyline; readPointsOf: aPolyline; asList \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGRectangle..st b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGRectangle..st index fc76b71c..9bcf79f6 100644 --- a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGRectangle..st +++ b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGRectangle..st @@ -1,7 +1,7 @@ visiting visitSVGRectangle: aRectangle - - ^ self + + ^ self readCommonAttributesOf: aRectangle; readRectangleAttributesOf: aRectangle; asList \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGTSpan..st b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGTSpan..st index 3f38ae45..00fe0c0b 100644 --- a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGTSpan..st +++ b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGTSpan..st @@ -1,7 +1,7 @@ visiting visitSVGTSpan: aTSpan - ^ self + ^ self readCommonAttributesOf: aTSpan; readTextAttributesOf: aTSpan; asList \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGText..st b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGText..st index cb645d72..94aaf3a6 100644 --- a/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGText..st +++ b/packages/SVG-Editor.package/SVGInfoPanelGenerator.class/instance/visitSVGText..st @@ -1,7 +1,7 @@ visiting visitSVGText: aText - ^ self + ^ self readCommonAttributesOf: aText; readTextAttributesOf: aText; asList \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGPanel.class/instance/model..st b/packages/SVG-Editor.package/SVGPanel.class/instance/model..st index cb06ff56..60a77638 100644 --- a/packages/SVG-Editor.package/SVGPanel.class/instance/model..st +++ b/packages/SVG-Editor.package/SVGPanel.class/instance/model..st @@ -1,8 +1,8 @@ accessing model: anObject - + self model = anObject ifTrue: [^ self]. - + self model ifNotNil: [self model removeDependent: self]. model := anObject. self model addDependent: self \ No newline at end of file diff --git a/packages/SVG-Editor.package/SVGPanel.class/instance/updateSVG.st b/packages/SVG-Editor.package/SVGPanel.class/instance/updateSVG.st index 48ec4cb7..bca91ab5 100644 --- a/packages/SVG-Editor.package/SVGPanel.class/instance/updateSVG.st +++ b/packages/SVG-Editor.package/SVGPanel.class/instance/updateSVG.st @@ -2,10 +2,10 @@ updating updateSVG self svg ifNotNil: - [ self removeMorph: self svg ]. - + [self removeMorph: self svg]. + self svg: (self model perform: self svgSelector). - + self svg ifNotNil: - [ self addMorph: self svg - fullFrame: (LayoutFrame fractions: (0@0 corner: 1@1)) ] + [self addMorph: self svg + fullFrame: (LayoutFrame fractions: (0 @ 0 corner: 1 @ 1))] diff --git a/packages/SVG-Editor.package/SVGPanelSpec.class/instance/buildWith..st b/packages/SVG-Editor.package/SVGPanelSpec.class/instance/buildWith..st index 1ad09219..dfc50184 100644 --- a/packages/SVG-Editor.package/SVGPanelSpec.class/instance/buildWith..st +++ b/packages/SVG-Editor.package/SVGPanelSpec.class/instance/buildWith..st @@ -1,7 +1,7 @@ building buildWith: aToolBuilder - | widget | + |widget| widget := SVGPanel new. aToolBuilder register: widget id: self name. @@ -14,6 +14,6 @@ buildWith: aToolBuilder setFrame: self frame in: widget; setLayout: self layout in: widget. aToolBuilder parent ifNotNil:[aToolBuilder add: widget to: aToolBuilder parent]. - aToolBuilder buildHelpFor: widget spec: self. - + aToolBuilder buildHelpFor: widget spec: self. + ^ widget \ No newline at end of file diff --git a/packages/SVG-Morphic.package/BalloonCanvas.extension/instance/drawGeneralSegments.color.borderWidth.borderColor..st b/packages/SVG-Morphic.package/BalloonCanvas.extension/instance/drawGeneralSegments.color.borderWidth.borderColor..st index 1d8509ff..c5d76ab1 100644 --- a/packages/SVG-Morphic.package/BalloonCanvas.extension/instance/drawGeneralSegments.color.borderWidth.borderColor..st +++ b/packages/SVG-Morphic.package/BalloonCanvas.extension/instance/drawGeneralSegments.color.borderWidth.borderColor..st @@ -10,4 +10,4 @@ drawGeneralSegments: segments color: c borderWidth: borderWidth borderColor: bor fill: fillC borderWidth: borderWidth borderColor: borderC - transform: transform. \ No newline at end of file + transform: transform \ No newline at end of file diff --git a/packages/SVG-Morphic.package/BalloonCanvas.extension/instance/drawOpenPolygon.fillStyle.borderWidth.borderColor..st b/packages/SVG-Morphic.package/BalloonCanvas.extension/instance/drawOpenPolygon.fillStyle.borderWidth.borderColor..st index 8711eb44..f40e57fd 100644 --- a/packages/SVG-Morphic.package/BalloonCanvas.extension/instance/drawOpenPolygon.fillStyle.borderWidth.borderColor..st +++ b/packages/SVG-Morphic.package/BalloonCanvas.extension/instance/drawOpenPolygon.fillStyle.borderWidth.borderColor..st @@ -9,4 +9,4 @@ drawOpenPolygon: vertices fillStyle: aFillStyle borderWidth: borderWidth borderC fill: fillC borderWidth: borderWidth borderColor: borderC - transform: transform. \ No newline at end of file + transform: transform \ No newline at end of file diff --git a/packages/SVG-Morphic.package/BalloonEngine.extension/instance/drawGeneralSegments.fill.borderWidth.borderColor.transform..st b/packages/SVG-Morphic.package/BalloonEngine.extension/instance/drawGeneralSegments.fill.borderWidth.borderColor.transform..st index c8835ef6..73e8575f 100644 --- a/packages/SVG-Morphic.package/BalloonEngine.extension/instance/drawGeneralSegments.fill.borderWidth.borderColor.transform..st +++ b/packages/SVG-Morphic.package/BalloonEngine.extension/instance/drawGeneralSegments.fill.borderWidth.borderColor.transform..st @@ -2,7 +2,7 @@ drawGeneralSegments: segments fill: fillStyle borderWidth: borderWidth borderColor: borderFill transform: aTransform "Draw the given segments." - | fills | + |fills| self edgeTransform: aTransform. self resetIfNeeded. fills := self registerFill: fillStyle and: borderFill. @@ -16,4 +16,4 @@ drawGeneralSegments: segments fill: fillStyle borderWidth: borderWidth borderCol ]. "And set the flush bit afterwards" self primFlushNeeded: true. - self postFlushIfNeeded. \ No newline at end of file + self postFlushIfNeeded \ No newline at end of file diff --git a/packages/SVG-Morphic.package/Bezier3Segment.extension/instance/asBezier2Segments.st b/packages/SVG-Morphic.package/Bezier3Segment.extension/instance/asBezier2Segments.st index 7b9fbb70..05ef4a46 100644 --- a/packages/SVG-Morphic.package/Bezier3Segment.extension/instance/asBezier2Segments.st +++ b/packages/SVG-Morphic.package/Bezier3Segment.extension/instance/asBezier2Segments.st @@ -13,5 +13,4 @@ asBezier2Segments from: prev via: (4 * (self valueAt: (c*2-1)*step) - prev - (prev := self valueAt: (c*2)*step)) / 2 to: prev)]. - ^segs. - \ No newline at end of file + ^segs diff --git a/packages/SVG-Morphic.package/Bezier3Segment.extension/instance/asBezier2Shape..st b/packages/SVG-Morphic.package/Bezier3Segment.extension/instance/asBezier2Shape..st index c4de219c..1076d602 100644 --- a/packages/SVG-Morphic.package/Bezier3Segment.extension/instance/asBezier2Shape..st +++ b/packages/SVG-Morphic.package/Bezier3Segment.extension/instance/asBezier2Shape..st @@ -8,7 +8,7 @@ asBezier2Shape: pixelError pts := PointArray new: curves * 3. step := 1.0 / (curves * 2). prev := self start. - 1 to: curves do: [ :c | + 1 to: curves do: [:c | index := 3*c. a := pts at: index-2 put: prev. b := (self valueAt: (c*2-1)*step). @@ -17,5 +17,4 @@ asBezier2Shape: pixelError prev := pts at: index. ]. pts at: pts size put: self end. - ^ pts. - \ No newline at end of file + ^ pts diff --git a/packages/SVG-Morphic.package/Bezier3Segment.extension/instance/asBezier2Shape.st b/packages/SVG-Morphic.package/Bezier3Segment.extension/instance/asBezier2Shape.st index ec06728f..29192a1c 100644 --- a/packages/SVG-Morphic.package/Bezier3Segment.extension/instance/asBezier2Shape.st +++ b/packages/SVG-Morphic.package/Bezier3Segment.extension/instance/asBezier2Shape.st @@ -5,16 +5,16 @@ asBezier2Shape |pts pa pb d c1 c2 c3 c4 a1 a2 a3| pts := PointArray new: 12. - pa _ start interpolateTo: via1 at: 3/4. - pb _ end interpolateTo: via2 at: 3/4. - d _ end - start / 16. - c1 _ start interpolateTo: via1 at: 3/8. - c2 _ (pa interpolateTo: pb at: 3/8) - d. - c3 _ (pb interpolateTo: pa at: 3/8) + d. - c4 _ end interpolateTo: via2 at: 3/8. - a1 _ c1 interpolateTo: c2 at: 1/2. - a2 _ pa interpolateTo: pb at: 1/2. - a3 _ c3 interpolateTo: c4 at: 1/2. + pa := start interpolateTo: via1 at: 3/4. + pb := end interpolateTo: via2 at: 3/4. + d := end - start / 16. + c1 := start interpolateTo: via1 at: 3/8. + c2 := (pa interpolateTo: pb at: 3/8) - d. + c3 := (pb interpolateTo: pa at: 3/8) + d. + c4 := end interpolateTo: via2 at: 3/8. + a1 := c1 interpolateTo: c2 at: 1/2. + a2 := pa interpolateTo: pb at: 1/2. + a3 := c3 interpolateTo: c4 at: 1/2. pts at: 1 put: start; at: 2 put: c1; diff --git a/packages/SVG-Morphic.package/Color.extension/instance/alphaMixed..st b/packages/SVG-Morphic.package/Color.extension/instance/alphaMixed..st index 37954ee9..c5adf204 100644 --- a/packages/SVG-Morphic.package/Color.extension/instance/alphaMixed..st +++ b/packages/SVG-Morphic.package/Color.extension/instance/alphaMixed..st @@ -3,7 +3,7 @@ alphaMixed: proportion "Answer this color with the alpha modified by proportion." ^ Color - r: self red + r: self red g: self green b: self blue alpha: self alpha * proportion \ No newline at end of file diff --git a/packages/SVG-Morphic.package/Color.extension/instance/pixelWord32.st b/packages/SVG-Morphic.package/Color.extension/instance/pixelWord32.st index f356b376..95753eb9 100644 --- a/packages/SVG-Morphic.package/Color.extension/instance/pixelWord32.st +++ b/packages/SVG-Morphic.package/Color.extension/instance/pixelWord32.st @@ -4,7 +4,7 @@ pixelWord32 Transparency: The pixel value zero is reserved for transparent. For depths greater than 8, black maps to the darkest possible blue. Just a little quicker if we are dealing with RGBA colors at 32 bit depth." - | val | + |val| "eight bits per component; top 8 bits set to all ones (opaque alpha)" val := LargePositiveInteger new: 4. val at: 3 put: ((rgb bitShift: -22) bitAnd: 16rFF). diff --git a/packages/SVG-Morphic.package/MatrixTransform2x3.extension/instance/compositeScale.st b/packages/SVG-Morphic.package/MatrixTransform2x3.extension/instance/compositeScale.st index aa6ed052..a20ef207 100644 --- a/packages/SVG-Morphic.package/MatrixTransform2x3.extension/instance/compositeScale.st +++ b/packages/SVG-Morphic.package/MatrixTransform2x3.extension/instance/compositeScale.st @@ -2,8 +2,8 @@ compositeScale "Y-scale is never negative, instead we use 180° rotations." - | matrix | - matrix := self + |matrix| + matrix := self composedWithGlobal: (MatrixTransform2x3 withAngle: self compositeRotation negated). ^ matrix a11 @ matrix a22 \ No newline at end of file diff --git a/packages/SVG-Morphic.package/MatrixTransform2x3.extension/instance/compositeSkew.st b/packages/SVG-Morphic.package/MatrixTransform2x3.extension/instance/compositeSkew.st index f97b44fb..00dbd463 100644 --- a/packages/SVG-Morphic.package/MatrixTransform2x3.extension/instance/compositeSkew.st +++ b/packages/SVG-Morphic.package/MatrixTransform2x3.extension/instance/compositeSkew.st @@ -1,8 +1,8 @@ *SVG-Morphic compositeSkew - | matrix | - matrix := self + |matrix| + matrix := self composedWithGlobal: (MatrixTransform2x3 withAngle: self compositeRotation negated). ^ (matrix a21 / matrix a22) degreeArcTan \ No newline at end of file diff --git a/packages/SVG-Morphic.package/Point.extension/instance/angleWith..st b/packages/SVG-Morphic.package/Point.extension/instance/angleWith..st index 569b3966..81b0ccb0 100644 --- a/packages/SVG-Morphic.package/Point.extension/instance/angleWith..st +++ b/packages/SVG-Morphic.package/Point.extension/instance/angleWith..st @@ -4,8 +4,8 @@ angleWith: aPoint the receiver and aPoint from the origin." |ar ap| - ar _ self angle. - ap _ aPoint angle. + ar := self angle. + ap := aPoint angle. ^ap >= ar ifTrue: [ap - ar] ifFalse: [Float pi * 2 - ar + ap] \ No newline at end of file diff --git a/packages/SVG-Morphic.package/PositionableStream.extension/instance/upToAny..st b/packages/SVG-Morphic.package/PositionableStream.extension/instance/upToAny..st index 37d5d609..d39061d5 100644 --- a/packages/SVG-Morphic.package/PositionableStream.extension/instance/upToAny..st +++ b/packages/SVG-Morphic.package/PositionableStream.extension/instance/upToAny..st @@ -1,7 +1,7 @@ *SVG-Morphic -upToAny: aCollection - "Answer a subcollection from the current access position to the - occurrence (if any, but not inclusive) of any objects in the given coellection in the receiver. If +upToAny: aCollection + "Answer a subcollection from the current access position to the + occurrence (if any, but not inclusive) of any objects in the given coellection in the receiver. If any of these is not in the collection, answer the entire rest of the receiver." | newStream element | newStream := WriteStream on: (collection species new: 100). diff --git a/packages/SVG-Morphic.package/Rectangle.extension/instance/boundsWithTransform..st b/packages/SVG-Morphic.package/Rectangle.extension/instance/boundsWithTransform..st index 87a9ce20..5aed8ee4 100644 --- a/packages/SVG-Morphic.package/Rectangle.extension/instance/boundsWithTransform..st +++ b/packages/SVG-Morphic.package/Rectangle.extension/instance/boundsWithTransform..st @@ -8,5 +8,5 @@ boundsWithTransform: aTransform tr := aTransform transformPoint: self topRight. br := aTransform transformPoint: self bottomRight. bl := aTransform transformPoint: self bottomLeft. - ^(((tl x min: tr x) min: br x) min: bl x)@(((tl y min: tr y) min: br y) min: bl y) - corner: (((tl x max: tr x) max: br x) max: bl x)@(((tl y max: tr y) max: br y) max: bl y) \ No newline at end of file + ^(((tl x min: tr x) min: br x) min: bl x) @ (((tl y min: tr y) min: br y) min: bl y) + corner: (((tl x max: tr x) max: br x) max: bl x) @ (((tl y max: tr y) max: br y) max: bl y) \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/renderEllipse.on..st b/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/renderEllipse.on..st index 8903f8b5..15f9d9c8 100644 --- a/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/renderEllipse.on..st +++ b/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/renderEllipse.on..st @@ -1,19 +1,19 @@ as yet unclassified renderEllipse: anSVGEllipse on: aCanvas "Render the given object on the canvas." - + | fill lineWidth lineColor matrix rectangle scale | fill := anSVGEllipse composedFillStyle. lineColor := anSVGEllipse composedStyle at: 'stroke'. matrix := anSVGEllipse transformFrom: anSVGEllipse world. rectangle := anSVGEllipse rectangle. - + scale := matrix compositeScale. rectangle := rectangle scaleBy: scale . matrix := matrix composedWithLocal: (MatrixTransform2x3 withScale: scale reciprocal). - + lineWidth := ((anSVGEllipse composedStyle at: 'stroke-width') * scale x) rounded clampLow: 1. - + aCanvas preserveStateDuring: [:bc| bc transformBy: matrix during: [:balloonCanvas | balloonCanvas diff --git a/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/renderLine.on..st b/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/renderLine.on..st index 7b0246b9..a373cc60 100644 --- a/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/renderLine.on..st +++ b/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/renderLine.on..st @@ -1,7 +1,7 @@ rendering renderLine: anSVGLine on: aCanvas "Render the given object on the canvas." - + | lineWidth lineColor| lineWidth := (anSVGLine composedStyle at: 'stroke-width') rounded max: 1. lineColor := anSVGLine composedStyle at: 'stroke'. diff --git a/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/renderPolygon.on..st b/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/renderPolygon.on..st index 75c98b4f..c579bc60 100644 --- a/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/renderPolygon.on..st +++ b/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/renderPolygon.on..st @@ -1,7 +1,7 @@ rendering renderPolygon: anSVGPolygon on: aCanvas "Render the given object on the canvas." - + |fill lineWidth lineColor| anSVGPolygon points isEmpty ifTrue: [^anSVGPolygon]. @@ -9,7 +9,7 @@ renderPolygon: anSVGPolygon on: aCanvas lineWidth := anSVGPolygon composedStyle at: 'stroke-width'. lineColor := anSVGPolygon composedStyle at: 'stroke'. aCanvas asBalloonCanvas preserveStateDuring: [:bc| - bc transformBy: (anSVGPolygon transformFrom: anSVGPolygon world ) during: [:balloonCanvas | + bc transformBy: (anSVGPolygon transformFrom: anSVGPolygon world) during: [:balloonCanvas | balloonCanvas aaLevel: anSVGPolygon antialiasingLevel; drawPolygon: anSVGPolygon points asArray diff --git a/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/renderPolyline.on..st b/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/renderPolyline.on..st index 742ecbeb..322898c7 100644 --- a/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/renderPolyline.on..st +++ b/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/renderPolyline.on..st @@ -1,7 +1,7 @@ rendering renderPolyline: anSVGPolyine on: aCanvas "Render the given object on the canvas." - + | lineWidth lineColor| anSVGPolyine points isEmpty ifTrue: [^anSVGPolyine]. diff --git a/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/renderText.on..st b/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/renderText.on..st index 59fe4a18..11c3928c 100644 --- a/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/renderText.on..st +++ b/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/renderText.on..st @@ -7,11 +7,11 @@ renderText: anSVGText on: aCanvas fill := anSVGText composedFontFillStyle. textFont := anSVGText fontToUse. anchor := anSVGText composedStyle at: 'text-anchor'. - offset := 0@textFont ascent. + offset := 0 @ textFont ascent. anchor = 'middle' - ifTrue: [offset := (textFont widthOfString: anSVGText text) // 2@textFont ascent]. + ifTrue: [offset := (textFont widthOfString: anSVGText text) // 2 @ textFont ascent]. anchor = 'end' - ifTrue: [offset := (textFont widthOfString: anSVGText text)@textFont ascent]. + ifTrue: [offset := (textFont widthOfString: anSVGText text) @ textFont ascent]. aCanvas asBalloonCanvas preserveStateDuring: [:bc| bc copy aaLevel: anSVGText antialiasingLevel; diff --git a/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/styleIn.fromSVGStyle..st b/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/styleIn.fromSVGStyle..st index 068bbff9..ca5b9603 100644 --- a/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/styleIn.fromSVGStyle..st +++ b/packages/SVG-Morphic.package/SVGBalloonRenderer.class/instance/styleIn.fromSVGStyle..st @@ -21,7 +21,7 @@ styleIn: aComponent fromSVGStyle: svgStyle ifFalse: [balloonStyle at: 'text-anchor' put: 'start']]. (svgStyle includesKey: 'opacity') ifTrue: [balloonStyle at: 'opacity' put: (svgStyle at: 'opacity'). - regenFill := true.] + regenFill := true] ifFalse: [(balloonStyle includesKey: 'opacity') ifFalse: [balloonStyle at: 'opacity' put: 1.0]]. (svgStyle includesKey: 'fill-opacity') @@ -34,7 +34,7 @@ styleIn: aComponent fromSVGStyle: svgStyle regenFill := true] ifFalse: [(balloonStyle includesKey: 'fill') ifFalse: [balloonStyle at: 'fill' put: Color black]]. - regenFill + regenFill ifTrue: [balloonStyle at: 'fill' put: ((balloonStyle at: 'fill') alphaMixed: (balloonStyle at: 'fill-opacity') * (balloonStyle at: 'opacity'))]. (svgStyle includesKey: 'fill-rule') diff --git a/packages/SVG-Morphic.package/SVGCircleMorph.class/instance/createRectangleFromSVG..st b/packages/SVG-Morphic.package/SVGCircleMorph.class/instance/createRectangleFromSVG..st index 597b26d4..a1284a7e 100644 --- a/packages/SVG-Morphic.package/SVGCircleMorph.class/instance/createRectangleFromSVG..st +++ b/packages/SVG-Morphic.package/SVGCircleMorph.class/instance/createRectangleFromSVG..st @@ -3,5 +3,5 @@ createRectangleFromSVG: anElement "Create the bounding rectangle from the svg circle." self rectangle: (Rectangle - center: (anElement attributeAt: 'cx' ifAbsent: [0]) asSVGNumber@(anElement attributeAt: 'cy' ifAbsent: [0]) asSVGNumber + center: (anElement attributeAt: 'cx' ifAbsent: [0]) asSVGNumber @ (anElement attributeAt: 'cy' ifAbsent: [0]) asSVGNumber extent: (anElement attributeAt: 'r' ifAbsent: [0]) asSVGNumber asPoint * 2) \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/cachedComposedStyle..st b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/cachedComposedStyle..st index 5e4a478e..0443bcf0 100644 --- a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/cachedComposedStyle..st +++ b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/cachedComposedStyle..st @@ -2,4 +2,4 @@ accessing cachedComposedStyle: anObject "Set the value of cachedComposedStyle" - cachedComposedStyle _ anObject \ No newline at end of file + cachedComposedStyle := anObject \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/createFromSVG..st b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/createFromSVG..st index 625e6cd6..9130f388 100644 --- a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/createFromSVG..st +++ b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/createFromSVG..st @@ -5,4 +5,4 @@ createFromSVG: anElement self id: (anElement attributeAt: 'id'); transform: (self transformFromSVGElement: anElement); - setStyleFromSVG: anElement. + setStyleFromSVG: anElement diff --git a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/fullDrawOn..st b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/fullDrawOn..st index 5f6f6769..b6db21d0 100644 --- a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/fullDrawOn..st +++ b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/fullDrawOn..st @@ -6,15 +6,15 @@ fullDrawOn: aCanvas self visible ifFalse: [^ self]. "(aCanvas isVisible: transformedBounds) ifFalse:[^self]." (self hasProperty: #errorOnDraw) ifTrue:[^self drawErrorOn: aCanvas]. - "Note: At some point we should generalize this into some sort of + "Note: At some point we should generalize this into some sort of multi-canvas so that we can cross-optimize some drawing operations." "Pass 1: Draw eventual drop-shadow" self hasDropShadow ifTrue: [self drawDropShadowOn: aCanvas]. (self hasRolloverBorder and: [(aCanvas seesNothingOutside: self bounds) not]) ifTrue: [self drawRolloverBorderOn: aCanvas]. - + "(aCanvas isVisible: transformedBounds) ifTrue:[aCanvas drawMorph: self]." aCanvas drawMorph: self. self drawSubmorphsOn: aCanvas. - self drawOverlayOn: aCanvas. \ No newline at end of file + self drawOverlayOn: aCanvas \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/handleBoundsChange..st b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/handleBoundsChange..st index d4b81ce1..e842a748 100644 --- a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/handleBoundsChange..st +++ b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/handleBoundsChange..st @@ -4,4 +4,4 @@ handleBoundsChange: aBlock oldBounds := bounds. aBlock value. newBounds := bounds. - self boundsChangedFrom: oldBounds to: newBounds. \ No newline at end of file + self boundsChangedFrom: oldBounds to: newBounds \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/id..st b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/id..st index 645e7fc0..5c091f38 100644 --- a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/id..st +++ b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/id..st @@ -2,4 +2,4 @@ accessing id: anObject "Set the value of id" - id _ anObject \ No newline at end of file + id := anObject \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/initialize.st b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/initialize.st index febe88dd..d6d33992 100644 --- a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/initialize.st +++ b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/initialize.st @@ -3,6 +3,6 @@ initialize "Initialize the receiver." super initialize. - self + self style: Dictionary new; renderer: SVGRenderer default diff --git a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/printOn..st b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/printOn..st index 0cc7d95f..d9e0edcf 100644 --- a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/printOn..st +++ b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/printOn..st @@ -3,7 +3,7 @@ printOn: aStream "Print a description of the receiver on the given stream," super printOn: aStream. - aStream + aStream nextPutAll: '(id='; nextPutAll: (self id ifNil: ['']); nextPut: $) \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/privateFullMoveBy..st b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/privateFullMoveBy..st index 5cb93986..fcff66d3 100644 --- a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/privateFullMoveBy..st +++ b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/privateFullMoveBy..st @@ -1,4 +1,4 @@ as yet unclassified privateFullMoveBy: delta self privateMoveBy: delta. - self transform offset: self transform offset + delta. \ No newline at end of file + self transform offset: self transform offset + delta \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/renderer..st b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/renderer..st index 4c138f64..24a73763 100644 --- a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/renderer..st +++ b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/renderer..st @@ -3,4 +3,3 @@ renderer: aRenderer renderer := aRenderer - \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/style..st b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/style..st index 3e8638f3..88556f36 100644 --- a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/style..st +++ b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/style..st @@ -2,4 +2,4 @@ accessing style: anObject "Set the value of style" - style _ anObject \ No newline at end of file + style := anObject \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/transformFromSVGAttributeStream..st b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/transformFromSVGAttributeStream..st index 8decd957..1f4b2199 100644 --- a/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/transformFromSVGAttributeStream..st +++ b/packages/SVG-Morphic.package/SVGComponentMorph.class/instance/transformFromSVGAttributeStream..st @@ -4,7 +4,7 @@ transformFromSVGAttributeStream: str | matrix type argStream args | matrix := MatrixTransform2x3 identity. - type := str upToAny: { $(. Character space . Character tab . Character cr . Character lf}. + type := str upToAny: {$(. Character space . Character tab . Character cr . Character lf}. str upTo: $(. argStream := (str upTo: $)) readStream. args := OrderedCollection new. @@ -38,7 +38,7 @@ transformFromSVGAttributeStream: str ifTrue: [matrix := ((MatrixTransform2x3 withOffset: (args at: 1) @ (args at: 2)) composedWithLocal: matrix) composedWithLocal: (MatrixTransform2x3 withOffset: (args at: 1) @ (args at: 2) negated)]]. - + "The X and Y may seem switched here, however, this is correct for SVG parsing" (type = 'skewX') ifTrue: [matrix diff --git a/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/create.fromSVG..st b/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/create.fromSVG..st index 9a5a0b35..76795fff 100644 --- a/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/create.fromSVG..st +++ b/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/create.fromSVG..st @@ -6,6 +6,5 @@ create: anSVGComponentMorphClass fromSVG: anElement comp := anSVGComponentMorphClass new. self addMorph: comp. ^comp createFromSVG: anElement - - \ No newline at end of file + diff --git a/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/createFillFromSVGLinearGradient..st b/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/createFillFromSVGLinearGradient..st index 4ac6832e..98ba9926 100644 --- a/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/createFillFromSVGLinearGradient..st +++ b/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/createFillFromSVGLinearGradient..st @@ -1,7 +1,7 @@ as yet unclassified createFillFromSVGLinearGradient: anElement "Create a linear fill style from the given element." - + |idg p1 p2 ramp xlink linkFill trans | idg := (anElement attributeAt: 'id') withBlanksTrimmed. trans := self transformFromSVGAttribute: (anElement attributeAt: 'gradientTransform'). @@ -12,11 +12,11 @@ createFillFromSVGLinearGradient: anElement linkFill := self getFill: xlink allButFirst. ramp isEmpty ifTrue: [ramp :=linkFill colorRamp]. - p1 := (anElement attributeAt: 'x1' ifAbsent: [linkFill origin x]) asSVGNumberOrPercentage@(anElement attributeAt: 'y1' ifAbsent: [linkFill origin y]) asSVGNumberOrPercentage. - p2 := (anElement attributeAt: 'x2' ifAbsent: [linkFill direction x]) asSVGNumberOrPercentage@(anElement attributeAt: 'y2' ifAbsent: [linkFill direction y]) asSVGNumberOrPercentage] + p1 := (anElement attributeAt: 'x1' ifAbsent: [linkFill origin x]) asSVGNumberOrPercentage @ (anElement attributeAt: 'y1' ifAbsent: [linkFill origin y]) asSVGNumberOrPercentage. + p2 := (anElement attributeAt: 'x2' ifAbsent: [linkFill direction x]) asSVGNumberOrPercentage @ (anElement attributeAt: 'y2' ifAbsent: [linkFill direction y]) asSVGNumberOrPercentage] ifFalse: [ - p1 := (anElement attributeAt: 'x1' ifAbsent: [0]) asSVGNumberOrPercentage@(anElement attributeAt: 'y1' ifAbsent: [0]) asSVGNumberOrPercentage. - p2 := (anElement attributeAt: 'x2' ifAbsent: [100]) asSVGNumberOrPercentage@(anElement attributeAt: 'y2' ifAbsent: [100]) asSVGNumberOrPercentage]. + p1 := (anElement attributeAt: 'x1' ifAbsent: [0]) asSVGNumberOrPercentage @ (anElement attributeAt: 'y1' ifAbsent: [0]) asSVGNumberOrPercentage. + p2 := (anElement attributeAt: 'x2' ifAbsent: [100]) asSVGNumberOrPercentage @ (anElement attributeAt: 'y2' ifAbsent: [100]) asSVGNumberOrPercentage]. p1 := trans transformPoint: p1. p2 := trans transformPoint: p2 . self setFill: idg to: ((SVGGradientFillStyle ramp: ramp) diff --git a/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/createFillFromSVGRadialGradient..st b/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/createFillFromSVGRadialGradient..st index 677971f1..362f2d00 100644 --- a/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/createFillFromSVGRadialGradient..st +++ b/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/createFillFromSVGRadialGradient..st @@ -1,7 +1,7 @@ as yet unclassified createFillFromSVGRadialGradient: anElement "Create a radial fill style from the given element.." - + |idg p1 p2 ramp xlink linkFill trans origin direction| idg := anElement attributeAt: 'id'. trans := self transformFromSVGAttribute: (anElement attributeAt: 'gradientTransform'). @@ -12,17 +12,17 @@ createFillFromSVGRadialGradient: anElement linkFill := self getFill: xlink copyWithoutFirst. ramp isEmpty ifTrue: [ramp :=linkFill colorRamp]. - p1 := (anElement attributeAt: 'cx' ifAbsent: [linkFill origin x]) asSVGNumberOrPercentage@(anElement attributeAt: 'cy' ifAbsent: [linkFill origin y]) asSVGNumberOrPercentage. + p1 := (anElement attributeAt: 'cx' ifAbsent: [linkFill origin x]) asSVGNumberOrPercentage @ (anElement attributeAt: 'cy' ifAbsent: [linkFill origin y]) asSVGNumberOrPercentage. p2 := (anElement attributeAt: 'r' ifAbsent: [linkFill direction x]) asSVGNumberOrPercentage asPoint] ifFalse: [ - p1 := (anElement attributeAt: 'cx' ifAbsent: [50]) asSVGNumberOrPercentage@(anElement attributeAt: 'cy' ifAbsent: [50]) asSVGNumberOrPercentage. + p1 := (anElement attributeAt: 'cx' ifAbsent: [50]) asSVGNumberOrPercentage @ (anElement attributeAt: 'cy' ifAbsent: [50]) asSVGNumberOrPercentage. p2 := (anElement attributeAt: 'r' ifAbsent: [50]) asSVGNumberOrPercentage asPoint]. origin := trans transformPoint: p1. direction := (trans transformPoint: p2 + p1) - origin. self setFill: idg to: ((SVGGradientFillStyle ramp: ramp) origin: origin; - direction: direction x@0; - normal: 0@direction y; + direction: direction x @ 0; + normal: 0 @ direction y; radial: true; units: (anElement attributeAt: 'gradientUnits' ifAbsent: [#userSpaceOnUse]) asSymbol; spread: (anElement attributeAt: 'spreadMethod' ifAbsent: [#pad]) asSymbol) \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/createPolylineFromSVGPolyline..st b/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/createPolylineFromSVGPolyline..st index edc28e61..00475811 100644 --- a/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/createPolylineFromSVGPolyline..st +++ b/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/createPolylineFromSVGPolyline..st @@ -4,4 +4,3 @@ createPolylineFromSVGPolyline: anElement ^self create: SVGPolylineMorph fromSVG: anElement - \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/createRampFromSVGGradient..st b/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/createRampFromSVGGradient..st index 7f207192..87d8fe8a 100644 --- a/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/createRampFromSVGGradient..st +++ b/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/createRampFromSVGGradient..st @@ -1,7 +1,7 @@ as yet unclassified createRampFromSVGGradient: anElement "Create a color ramp from the given element." - + |ramp stopStyle colour ic io stopColor stopOpacity offset| ramp := OrderedCollection new. anElement tagsNamed: #stop do: [:stop | diff --git a/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/drawSubmorphsOn..st b/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/drawSubmorphsOn..st index c094f4c1..a24ec7cc 100644 --- a/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/drawSubmorphsOn..st +++ b/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/drawSubmorphsOn..st @@ -1,7 +1,7 @@ as yet unclassified -drawSubmorphsOn: aCanvas +drawSubmorphsOn: aCanvas "Display the receiver." - + (self composedStyle at: 'display') ifFalse: [^self]. aCanvas asBalloonCanvas preserveStateDuring:[:balloonCanvas| diff --git a/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/initialize.st b/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/initialize.st index d3ad0693..bb29884f 100644 --- a/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/initialize.st +++ b/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/initialize.st @@ -3,5 +3,5 @@ initialize "Initialize the receiver." super initialize. - self + self fills: Dictionary new \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/setFill.to..st b/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/setFill.to..st index dd0e34d3..4ef9d39a 100644 --- a/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/setFill.to..st +++ b/packages/SVG-Morphic.package/SVGCompositeMorph.class/instance/setFill.to..st @@ -1,7 +1,7 @@ as yet unclassified setFill: name to: aFillStyle "Set the fill with the given name." - + self fills at: name put: aFillStyle \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGEllipseMorph.class/instance/containsPoint..st b/packages/SVG-Morphic.package/SVGEllipseMorph.class/instance/containsPoint..st index 3a114da5..03f6c130 100644 --- a/packages/SVG-Morphic.package/SVGEllipseMorph.class/instance/containsPoint..st +++ b/packages/SVG-Morphic.package/SVGEllipseMorph.class/instance/containsPoint..st @@ -1,6 +1,6 @@ as yet unclassified -containsPoint: aPoint - +containsPoint: aPoint + | semiMin semiMax center i lPoint | lPoint := self transform globalPointToLocal: aPoint. (self bounds containsPoint: aPoint) ifFalse: [^ false]. @@ -8,4 +8,4 @@ containsPoint: aPoint semiMax := self rectangle height asFloat / 2 max: self rectangle width asFloat / 2. center := self rectangle center. i := (((lPoint x - center x)squared asFloat) / (semiMax squared asFloat)) + (((lPoint y - center y)squared asFloat) / (semiMin squared asFloat)). - ^ i <= 1. \ No newline at end of file + ^ i <= 1 \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGEllipseMorph.class/instance/createRectangleFromSVG..st b/packages/SVG-Morphic.package/SVGEllipseMorph.class/instance/createRectangleFromSVG..st index 084c6d79..2831b87f 100644 --- a/packages/SVG-Morphic.package/SVGEllipseMorph.class/instance/createRectangleFromSVG..st +++ b/packages/SVG-Morphic.package/SVGEllipseMorph.class/instance/createRectangleFromSVG..st @@ -3,5 +3,5 @@ createRectangleFromSVG: anElement "Create the bounding rectangle from the svg ellipse." self rectangle: (Rectangle - center: (anElement attributeAt: 'cx' ifAbsent: [0]) asSVGNumber@(anElement attributeAt: 'cy' ifAbsent: [0]) asSVGNumber - extent: (anElement attributeAt: 'rx' ifAbsent: [0]) asSVGNumber@((anElement attributeAt: 'ry' ifAbsent: [0]) asSVGNumber) * 2) \ No newline at end of file + center: (anElement attributeAt: 'cx' ifAbsent: [0]) asSVGNumber @ (anElement attributeAt: 'cy' ifAbsent: [0]) asSVGNumber + extent: (anElement attributeAt: 'rx' ifAbsent: [0]) asSVGNumber @ ((anElement attributeAt: 'ry' ifAbsent: [0]) asSVGNumber) * 2) \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGEllipseMorph.class/instance/drawOn..st b/packages/SVG-Morphic.package/SVGEllipseMorph.class/instance/drawOn..st index da7ed5f7..0bffb91d 100644 --- a/packages/SVG-Morphic.package/SVGEllipseMorph.class/instance/drawOn..st +++ b/packages/SVG-Morphic.package/SVGEllipseMorph.class/instance/drawOn..st @@ -1,7 +1,7 @@ as yet unclassified drawOn: aCanvas "Draw the component on the canvas." - + (self composedStyle at: 'visibility') ifFalse: [^self]. self renderer diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/addSubmorphsOf.to..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/addSubmorphsOf.to..st index 5a4a9516..041aa022 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/addSubmorphsOf.to..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/addSubmorphsOf.to..st @@ -1,5 +1,5 @@ serializer addSubmorphsOf: aGroup to: anElement - aGroup submorphs reversed do: [:morph | + aGroup submorphs reversed do: [:morph | anElement addElement: (morph accept: self)] \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/applyCircleAttributesOf.on..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/applyCircleAttributesOf.on..st index 1a79995d..5083d739 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/applyCircleAttributesOf.on..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/applyCircleAttributesOf.on..st @@ -1,6 +1,6 @@ serializer applyCircleAttributesOf: aCircle on: anElement - + anElement name: 'circle'; attributeAt: 'cx' put: aCircle rectangle center x asString; diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/applyEllipseAttributesOf.on..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/applyEllipseAttributesOf.on..st index 54e5cfc8..39504e2e 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/applyEllipseAttributesOf.on..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/applyEllipseAttributesOf.on..st @@ -1,6 +1,6 @@ serializer applyEllipseAttributesOf: anEllipse on: anElement - + anElement name: 'ellipse'; attributeAt: 'cx' put: anEllipse rectangle center x asString; diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/applyLineAttributesOf.on..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/applyLineAttributesOf.on..st index 991481ed..7158b84c 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/applyLineAttributesOf.on..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/applyLineAttributesOf.on..st @@ -1,6 +1,6 @@ serializer applyLineAttributesOf: aLine on: anElement - + anElement name: 'line'; attributeAt: 'x1' put: aLine rectangle origin x asString; diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/applyPathAttributesOf.on..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/applyPathAttributesOf.on..st index 078856ce..7371514c 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/applyPathAttributesOf.on..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/applyPathAttributesOf.on..st @@ -1,6 +1,6 @@ serializer applyPathAttributesOf: aPath on: anElement - + anElement name: 'path'; attributeAt: 'd' put: aPath d \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/applyPolygonalAttributesOf.on..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/applyPolygonalAttributesOf.on..st index 561a95de..90e3158e 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/applyPolygonalAttributesOf.on..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/applyPolygonalAttributesOf.on..st @@ -1,5 +1,5 @@ serializer applyPolygonalAttributesOf: aPolygonalMorph on: anElement - + anElement attributeAt: 'points' put: (self generatePointString: aPolygonalMorph points) \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/applyRectangleAttributesOf.on..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/applyRectangleAttributesOf.on..st index e51a2c49..14ff0408 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/applyRectangleAttributesOf.on..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/applyRectangleAttributesOf.on..st @@ -1,6 +1,6 @@ serializer applyRectangleAttributesOf: aRectangle on: anElement - + anElement name: 'rect'; attributeAt: 'x' put: aRectangle rectangle origin x asString; diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/applySVGAttributesOf.on..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/applySVGAttributesOf.on..st index cfda2e26..8860d6e2 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/applySVGAttributesOf.on..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/applySVGAttributesOf.on..st @@ -1,15 +1,14 @@ serializer applySVGAttributesOf: aMorph on: anElement - + anElement name: 'svg'; attributeAt: 'version' put: '1.1'; attributeAt: 'xmlns' put: 'http://www.w3.org/2000/svg'. - aMorph svgWidth + aMorph svgWidth ifNotNil: [anElement attributeAt: 'width' put: aMorph svgWidth]. - aMorph svgHeight + aMorph svgHeight ifNotNil: [anElement attributeAt: 'height' put: aMorph svgHeight]. - aMorph viewBox + aMorph viewBox ifNotNil: [anElement attributeAt: 'viewBox' put: aMorph viewBox] - - \ No newline at end of file + diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/applyStyleOf.on..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/applyStyleOf.on..st index 69d8ee60..7e1b3f2c 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/applyStyleOf.on..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/applyStyleOf.on..st @@ -1,12 +1,12 @@ serializer applyStyleOf: aMorph on: anXMLElement - aMorph style keysAndValuesDo: [ :key :value | + aMorph style keysAndValuesDo: [:key :value | |convertedValue| convertedValue := value. ((key = 'stroke') or: [key = 'fill']) ifTrue: [(value isColor) ifTrue: [convertedValue := value asHTMLColor] ifFalse: [self error: 'Gradients not supported yet']]. - + anXMLElement attributeAt: key put: convertedValue asString] \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/applyTSpanAttributesOf.on..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/applyTSpanAttributesOf.on..st index 68434695..036f1416 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/applyTSpanAttributesOf.on..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/applyTSpanAttributesOf.on..st @@ -1,13 +1,12 @@ serializer applyTSpanAttributesOf: aTSpan on: anElement - + anElement name: 'tspan'. - (aTSpan location = aTSpan owner location) - ifFalse: [anElement + (aTSpan location = aTSpan owner location) + ifFalse: [anElement attributeAt: 'x' put: aTSpan location x asString; attributeAt: 'y' put: aTSpan location y asString]. - - - - \ No newline at end of file + + + diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/applyTextAttributesOf.on..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/applyTextAttributesOf.on..st index ffc85a8e..f1d8f645 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/applyTextAttributesOf.on..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/applyTextAttributesOf.on..st @@ -1,6 +1,6 @@ serializer applyTextAttributesOf: aText on: anElement - + anElement name: 'text'; attributeAt: 'x' put: aText location x asString; diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/applyTransformOf.on..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/applyTransformOf.on..st index a162f750..101f7897 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/applyTransformOf.on..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/applyTransformOf.on..st @@ -8,15 +8,15 @@ applyTransformOf: aMorph on: anXMLElement description := OrderedCollection new. temp := transform compositeTranslation. (temp closeTo: 0 @ 0) - ifFalse: [description add: ('translate({1},{2})' format: { self printNum: temp x . self printNum: temp y })]. + ifFalse: [description add: ('translate({1},{2})' format: {self printNum: temp x . self printNum: temp y})]. temp := transform compositeRotation. (temp closeTo: 0) - ifFalse: [description add: ('rotate({1})' format: { self printNum: temp })]. + ifFalse: [description add: ('rotate({1})' format: {self printNum: temp})]. temp := transform compositeScale. (temp closeTo: 1 @ 1) - ifFalse: [description add: ('scale({1},{2})' format: { self printNum: temp x . self printNum: temp y })]. + ifFalse: [description add: ('scale({1},{2})' format: {self printNum: temp x . self printNum: temp y})]. temp := transform compositeSkew. (temp closeTo: 0) - ifFalse: [description add: ('skewY({1})' format: { self printNum: temp })]. - + ifFalse: [description add: ('skewY({1})' format: {self printNum: temp})]. + anXMLElement attributeAt: 'transform' put: (description joinSeparatedBy: ',') \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/initialize.st b/packages/SVG-Morphic.package/SVGExporter.class/instance/initialize.st index 89ef5373..f5658d51 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/initialize.st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/initialize.st @@ -1,5 +1,4 @@ initialization initialize - + self document: SVGXMLElement new - \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/serializeTextChildren.on..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/serializeTextChildren.on..st index 3c94ebaa..bc357d4d 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/serializeTextChildren.on..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/serializeTextChildren.on..st @@ -1,6 +1,6 @@ serializer serializeTextChildren: aText on: anElement - - aText text = '' + + aText text = '' ifTrue: [ self addSubmorphsOf: aText to: anElement] - ifFalse: [anElement addElement: (XMLStringNode string: aText text)]. \ No newline at end of file + ifFalse: [anElement addElement: (XMLStringNode string: aText text)] \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGCircle..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGCircle..st index c46f4145..857b66ae 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGCircle..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGCircle..st @@ -1,10 +1,10 @@ visiting visitSVGCircle: aCircle - + |element| element := SVGXMLElement new. - + self applyCommonAttributesOf: aCircle on: element. self applyCircleAttributesOf: aCircle on: element. - + ^ element \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGEllipse..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGEllipse..st index 9dccaeb5..4cfd9f6b 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGEllipse..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGEllipse..st @@ -1,10 +1,10 @@ visiting visitSVGEllipse: anEllipse - + |element| element := SVGXMLElement new. - + self applyCommonAttributesOf: anEllipse on: element. self applyEllipseAttributesOf: anEllipse on: element. - + ^ element \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGGroup..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGGroup..st index 08f1a406..b022ff0b 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGGroup..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGGroup..st @@ -3,9 +3,9 @@ visitSVGGroup: aGroup |element| element := SVGXMLElement new. - + self applyCommonAttributesOf: aGroup on: element. self applyGroupAttributesOf: aGroup on: element. self addSubmorphsOf: aGroup to: element. - + ^ element \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGLine..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGLine..st index 64e89d64..0d2f0691 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGLine..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGLine..st @@ -1,10 +1,10 @@ visiting visitSVGLine: aLine - + |element| element := SVGXMLElement new. - + self applyCommonAttributesOf: aLine on: element. self applyLineAttributesOf: aLine on: element. - + ^ element \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGMorph..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGMorph..st index b814efcc..3cd949db 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGMorph..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGMorph..st @@ -1,6 +1,6 @@ visiting visitSVGMorph: aMorph - + self applyCommonAttributesOf: aMorph on: self document. self applySVGAttributesOf: aMorph on: self document. self addSubmorphsOf: aMorph to: self document \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGPath..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGPath..st index 707eb7da..b15b7ffd 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGPath..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGPath..st @@ -1,10 +1,10 @@ visiting visitSVGPath: aPath - + |element| element := SVGXMLElement new. - + self applyCommonAttributesOf: aPath on: element. self applyPathAttributesOf: aPath on: element. - + ^ element \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGPolygon..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGPolygon..st index 10b1a44a..44b39c6f 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGPolygon..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGPolygon..st @@ -1,5 +1,5 @@ visiting visitSVGPolygon: aPolygon - + ^ (self visitSVGPolygonal: aPolygon) name: 'polygon' \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGPolygonal..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGPolygonal..st index a39e5c7b..6e542906 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGPolygonal..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGPolygonal..st @@ -1,10 +1,10 @@ visiting visitSVGPolygonal: aPolygonal - + |element| element := SVGXMLElement new. - + self applyCommonAttributesOf: aPolygonal on: element. self applyPolygonalAttributesOf: aPolygonal on: element. - + ^ element \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGPolyline..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGPolyline..st index 7e368ed1..0bdfb29f 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGPolyline..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGPolyline..st @@ -1,5 +1,5 @@ visiting visitSVGPolyline: aPolyline - + ^ (self visitSVGPolygonal: aPolyline) name: 'polyline' \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGRectangle..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGRectangle..st index 9cf34356..e8e5916a 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGRectangle..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGRectangle..st @@ -1,10 +1,10 @@ visiting visitSVGRectangle: aRectangle - + |element| element := SVGXMLElement new. - + self applyCommonAttributesOf: aRectangle on: element. self applyRectangleAttributesOf: aRectangle on: element. - + ^ element \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGTSpan..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGTSpan..st index 9d384f7f..5a1dd396 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGTSpan..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGTSpan..st @@ -1,6 +1,6 @@ visiting visitSVGTSpan: aTSpan - + |element| element := SVGXMLElement new. diff --git a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGText..st b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGText..st index b94e058d..695c2634 100644 --- a/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGText..st +++ b/packages/SVG-Morphic.package/SVGExporter.class/instance/visitSVGText..st @@ -1,11 +1,11 @@ visiting visitSVGText: aText - + |element| element := SVGXMLElement new. - + self applyCommonAttributesOf: aText on: element. self applyTextAttributesOf: aText on: element. self serializeTextChildren: aText on: element. - + ^ element \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGGradientFillStyle.class/instance/mappedToBounds..st b/packages/SVG-Morphic.package/SVGGradientFillStyle.class/instance/mappedToBounds..st index 49dde556..930faf46 100644 --- a/packages/SVG-Morphic.package/SVGGradientFillStyle.class/instance/mappedToBounds..st +++ b/packages/SVG-Morphic.package/SVGGradientFillStyle.class/instance/mappedToBounds..st @@ -5,7 +5,7 @@ mappedToBounds: aRectangle |o| self mapsToObjectBounds ifTrue: [^self copy - origin: (o := aRectangle origin + ( self origin * aRectangle extent)); + origin: (o := aRectangle origin + (self origin * aRectangle extent)); direction: self direction + self origin * aRectangle extent - o; normal: nil]. ^self \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGGradientFillStyle.class/instance/spread..st b/packages/SVG-Morphic.package/SVGGradientFillStyle.class/instance/spread..st index 464fb3eb..2f6adf9c 100644 --- a/packages/SVG-Morphic.package/SVGGradientFillStyle.class/instance/spread..st +++ b/packages/SVG-Morphic.package/SVGGradientFillStyle.class/instance/spread..st @@ -2,4 +2,4 @@ accessing spread: anObject "Set the value of spread" - spread _ anObject \ No newline at end of file + spread := anObject \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGGradientFillStyle.class/instance/units..st b/packages/SVG-Morphic.package/SVGGradientFillStyle.class/instance/units..st index 61642f43..8906231a 100644 --- a/packages/SVG-Morphic.package/SVGGradientFillStyle.class/instance/units..st +++ b/packages/SVG-Morphic.package/SVGGradientFillStyle.class/instance/units..st @@ -2,4 +2,4 @@ accessing units: anObject "Set the value of units" - units _ anObject \ No newline at end of file + units := anObject \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGGroupMorph.class/instance/computeBounds.st b/packages/SVG-Morphic.package/SVGGroupMorph.class/instance/computeBounds.st index 3195c6a6..1a21e89e 100644 --- a/packages/SVG-Morphic.package/SVGGroupMorph.class/instance/computeBounds.st +++ b/packages/SVG-Morphic.package/SVGGroupMorph.class/instance/computeBounds.st @@ -1,13 +1,13 @@ as yet unclassified computeBounds - | box | + |box| (submorphs isNil or:[submorphs isEmpty]) ifTrue:[^self]. box := nil. - submorphs do:[:m| | subBounds | + submorphs do:[:m|| subBounds | subBounds := self transform localBoundsToGlobal: m bounds. - box + box ifNil:[box := subBounds] ifNotNil:[box := box quickMerge: subBounds]. ]. - box ifNil:[box := 0@0 corner: 20@20]. + box ifNil:[box := 0 @ 0 corner: 20 @ 20]. fullBounds := bounds := box \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGGroupMorph.class/instance/createFromSVG..st b/packages/SVG-Morphic.package/SVGGroupMorph.class/instance/createFromSVG..st index a97ec246..66ec432e 100644 --- a/packages/SVG-Morphic.package/SVGGroupMorph.class/instance/createFromSVG..st +++ b/packages/SVG-Morphic.package/SVGGroupMorph.class/instance/createFromSVG..st @@ -1,5 +1,5 @@ as yet unclassified createFromSVG: anElement - + super createFromSVG: anElement. self computeBounds \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGLineMorph.class/instance/createRectangleFromSVG..st b/packages/SVG-Morphic.package/SVGLineMorph.class/instance/createRectangleFromSVG..st index dbca65d0..fab2dd30 100644 --- a/packages/SVG-Morphic.package/SVGLineMorph.class/instance/createRectangleFromSVG..st +++ b/packages/SVG-Morphic.package/SVGLineMorph.class/instance/createRectangleFromSVG..st @@ -3,5 +3,5 @@ createRectangleFromSVG: anElement "Create the segments from the rect." self - rectangle: ((anElement attributeAt: 'x1' ifAbsent: [0]) asSVGNumber@(anElement attributeAt: 'y1' ifAbsent: [0]) asSVGNumber - corner: (anElement attributeAt: 'x2' ifAbsent: [0]) asSVGNumber@(anElement attributeAt: 'y2' ifAbsent: [0]) asSVGNumber) \ No newline at end of file + rectangle: ((anElement attributeAt: 'x1' ifAbsent: [0]) asSVGNumber @ (anElement attributeAt: 'y1' ifAbsent: [0]) asSVGNumber + corner: (anElement attributeAt: 'x2' ifAbsent: [0]) asSVGNumber @ (anElement attributeAt: 'y2' ifAbsent: [0]) asSVGNumber) \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGLineMorph.class/instance/drawOn..st b/packages/SVG-Morphic.package/SVGLineMorph.class/instance/drawOn..st index 08b67cc3..dd939720 100644 --- a/packages/SVG-Morphic.package/SVGLineMorph.class/instance/drawOn..st +++ b/packages/SVG-Morphic.package/SVGLineMorph.class/instance/drawOn..st @@ -1,7 +1,7 @@ as yet unclassified drawOn: aCanvas "Draw the component on the canvas." - + (self composedStyle at: 'visibility') ifFalse: [^self]. self renderer diff --git a/packages/SVG-Morphic.package/SVGMorph.class/class/example.st b/packages/SVG-Morphic.package/SVGMorph.class/class/example.st index a0015c2d..fb5f2c24 100644 --- a/packages/SVG-Morphic.package/SVGMorph.class/class/example.st +++ b/packages/SVG-Morphic.package/SVGMorph.class/class/example.st @@ -11,6 +11,6 @@ example w extent: svg extent. w addMorph: svg - frame: (0@0 corner: 1@1); + frame: (0 @ 0 corner: 1 @ 1); clipSubmorphs: true; openAsIs \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGMorph.class/class/fileReaderServicesForFile.suffix..st b/packages/SVG-Morphic.package/SVGMorph.class/class/fileReaderServicesForFile.suffix..st index d61cda43..7b1773df 100644 --- a/packages/SVG-Morphic.package/SVGMorph.class/class/fileReaderServicesForFile.suffix..st +++ b/packages/SVG-Morphic.package/SVGMorph.class/class/fileReaderServicesForFile.suffix..st @@ -2,6 +2,6 @@ as yet unclassified fileReaderServicesForFile: fullName suffix: suffix "registers the given class as providing services for reading files with Fileservices" - ^({ 'svg' . 'svgz' } includes: suffix) - ifTrue: [ self services ] - ifFalse: [ #() ] + ^({'svg' . 'svgz'} includes: suffix) + ifTrue: [self services] + ifFalse: [#()] diff --git a/packages/SVG-Morphic.package/SVGMorph.class/class/fromDroppedFile..st b/packages/SVG-Morphic.package/SVGMorph.class/class/fromDroppedFile..st index 551f5f11..e69c7080 100644 --- a/packages/SVG-Morphic.package/SVGMorph.class/class/fromDroppedFile..st +++ b/packages/SVG-Morphic.package/SVGMorph.class/class/fromDroppedFile..st @@ -3,4 +3,3 @@ fromDroppedFile:filename "opens a Stream on a given file " ^(self fromFile: filename)openInWorld - \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGMorph.class/class/fromFile..st b/packages/SVG-Morphic.package/SVGMorph.class/class/fromFile..st index 49f9c999..6d6a2906 100644 --- a/packages/SVG-Morphic.package/SVGMorph.class/class/fromFile..st +++ b/packages/SVG-Morphic.package/SVGMorph.class/class/fromFile..st @@ -4,7 +4,6 @@ fromFile: filename | s answer| s := FileStream oldFileNamed: filename. s ifNil: [^nil]. - [answer _ self fromFileStream: s] + [answer := self fromFileStream: s] ensure: [s close]. ^answer - \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGMorph.class/class/fromString..st b/packages/SVG-Morphic.package/SVGMorph.class/class/fromString..st index 491b3cd3..9f0d7d0d 100644 --- a/packages/SVG-Morphic.package/SVGMorph.class/class/fromString..st +++ b/packages/SVG-Morphic.package/SVGMorph.class/class/fromString..st @@ -2,4 +2,3 @@ as yet unclassified fromString: aString "creates SVGMorph from xml string" ^self fromFileStream:(ReadStream on: aString) - \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGMorph.class/class/services.st b/packages/SVG-Morphic.package/SVGMorph.class/class/services.st index 3a8f0c9b..65d009eb 100644 --- a/packages/SVG-Morphic.package/SVGMorph.class/class/services.st +++ b/packages/SVG-Morphic.package/SVGMorph.class/class/services.st @@ -1,7 +1,7 @@ as yet unclassified services -^ {SimpleServiceEntry +^ {SimpleServiceEntry provider: self - label: 'open as SVGMorph' + label: 'open as SVGMorph' selector: #fromDroppedFile:} diff --git a/packages/SVG-Morphic.package/SVGMorph.class/instance/defaultViewBox.st b/packages/SVG-Morphic.package/SVGMorph.class/instance/defaultViewBox.st index 791ec493..054f7f39 100644 --- a/packages/SVG-Morphic.package/SVGMorph.class/instance/defaultViewBox.st +++ b/packages/SVG-Morphic.package/SVGMorph.class/instance/defaultViewBox.st @@ -2,4 +2,4 @@ accessing defaultViewBox "Set the receiver's dimensions from the given svg element." - ^0@0 extent: 300@150 \ No newline at end of file + ^0 @ 0 extent: 300 @ 150 \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGMorph.class/instance/drawOn..st b/packages/SVG-Morphic.package/SVGMorph.class/instance/drawOn..st index b388b994..44886805 100644 --- a/packages/SVG-Morphic.package/SVGMorph.class/instance/drawOn..st +++ b/packages/SVG-Morphic.package/SVGMorph.class/instance/drawOn..st @@ -1,6 +1,6 @@ accessing -drawOn: aCanvas +drawOn: aCanvas "Display the receiver." - + super drawOn: aCanvas. aCanvas frameAndFillRectangle: self bounds fillColor: self color borderWidth: 1 borderColor: Color black \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGMorph.class/instance/drawSubmorphsOn..st b/packages/SVG-Morphic.package/SVGMorph.class/instance/drawSubmorphsOn..st index 14ed187c..266d1a17 100644 --- a/packages/SVG-Morphic.package/SVGMorph.class/instance/drawSubmorphsOn..st +++ b/packages/SVG-Morphic.package/SVGMorph.class/instance/drawSubmorphsOn..st @@ -1,7 +1,7 @@ accessing -drawSubmorphsOn: aCanvas +drawSubmorphsOn: aCanvas "Display the receiver." - + |balloonCanvas| balloonCanvas := aCanvas asBalloonCanvas. super drawSubmorphsOn: balloonCanvas \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGMorph.class/instance/getFill..st b/packages/SVG-Morphic.package/SVGMorph.class/instance/getFill..st index 60aaca21..feff9498 100644 --- a/packages/SVG-Morphic.package/SVGMorph.class/instance/getFill..st +++ b/packages/SVG-Morphic.package/SVGMorph.class/instance/getFill..st @@ -1,5 +1,5 @@ accessing getFill: name "Get the fill with the given name." - + ^self fills at: name \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGMorph.class/instance/initialize.st b/packages/SVG-Morphic.package/SVGMorph.class/instance/initialize.st index 46760e64..8330f135 100644 --- a/packages/SVG-Morphic.package/SVGMorph.class/instance/initialize.st +++ b/packages/SVG-Morphic.package/SVGMorph.class/instance/initialize.st @@ -3,5 +3,5 @@ initialize "Initialize the receiver." super initialize. - self + self clipSubmorphs: true \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGMorph.class/instance/setDimensionsFromSVG..st b/packages/SVG-Morphic.package/SVGMorph.class/instance/setDimensionsFromSVG..st index a436c533..a215ebb1 100644 --- a/packages/SVG-Morphic.package/SVGMorph.class/instance/setDimensionsFromSVG..st +++ b/packages/SVG-Morphic.package/SVGMorph.class/instance/setDimensionsFromSVG..st @@ -9,7 +9,7 @@ setDimensionsFromSVG: anElement viewBox := str isNil ifTrue: [self defaultViewBox] ifFalse: [str := str readStream. - str nextNumber@str nextNumber extent: str nextNumber@str nextNumber]. + str nextNumber @ str nextNumber extent: str nextNumber @ str nextNumber]. (w withBlanksTrimmed endsWith: '%') ifTrue: [viewBox := viewBox withWidth: viewBox width * w asNumber // 100] ifFalse: [(w withBlanksTrimmed endsWith: 'mm') @@ -20,4 +20,4 @@ setDimensionsFromSVG: anElement ifFalse: [(h withBlanksTrimmed endsWith: 'mm') ifTrue: [viewBox := viewBox withHeight: (h asNumber * 3.571429) rounded] ifFalse: [viewBox := viewBox withHeight: h asInteger]]. - fullBounds := bounds := viewBox. \ No newline at end of file + fullBounds := bounds := viewBox \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/computeBounds.st b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/computeBounds.st index c28bac27..99dae74e 100644 --- a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/computeBounds.st +++ b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/computeBounds.st @@ -1,8 +1,8 @@ as yet unclassified computeBounds - - | allPoints | + + |allPoints| allPoints := Array streamContents: [:s | self segments do: [:seg | seg controlPointsDo: [:point | s nextPut: point]]]. allPoints size == 0 ifTrue: [^ self]. - fullBounds := bounds := ((Rectangle encompassing: allPoints) outsetBy: ((self composedStyle at: 'stroke-width')// 2)). \ No newline at end of file + fullBounds := bounds := ((Rectangle encompassing: allPoints) outsetBy: ((self composedStyle at: 'stroke-width')// 2)) \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createArcSegmentFrom.at..st b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createArcSegmentFrom.at..st index ebd52a7a..7868f7a5 100644 --- a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createArcSegmentFrom.at..st +++ b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createArcSegmentFrom.at..st @@ -4,11 +4,11 @@ createArcSegmentFrom: data at: aPoint Evil apporximation required for compatability with Balloon - no arcs!" |position radii angle sweep large sp cp pd num root s cd c theta1 dtheta nSegs delta t ps| - radii := (data first@data second) abs. + radii := (data first @ data second) abs. angle := data third degreesToRadians. large := data fourth = 1. sweep := data fifth = 1. - position := data sixth@data seventh. + position := data sixth @ data seventh. ps := aPoint. position = aPoint @@ -19,7 +19,7 @@ createArcSegmentFrom: data at: aPoint sp := angle sin. cp := angle cos. - pd := (cp * (ps x - position x) + (sp * (ps y - position y)) @ + pd := (cp * (ps x - position x) + (sp * (ps y - position y)) @ (sp negated * (ps x - position x) + (cp * (ps y - position y)))) / 2. num := radii x squared * radii y squared - (radii x squared * pd y squared) - (radii y squared * pd x squared). num < 0 @@ -30,9 +30,9 @@ createArcSegmentFrom: data at: aPoint (num / (radii x squared * pd y squared + (radii y squared * pd x squared))) sqrt]. cd := root * radii * pd transposed / radii transposed. cd := cd x @ cd y negated. - c := cp * cd x - (sp * cd y) + (ps x + position x / 2) @ + c := cp * cd x - (sp * cd y) + (ps x + position x / 2) @ (sp * cd x + (cp * cd y) + (ps y + position y / 2)). - theta1 := 1@0 angleWith: pd - cd / radii. + theta1 := 1 @ 0 angleWith: pd - cd / radii. dtheta := pd - cd / radii angleWith: pd negated - cd / radii. (sweep not and: [dtheta > 0]) ifTrue: [dtheta := dtheta - (2 * Float pi)] @@ -47,11 +47,11 @@ createArcSegmentFrom: data at: aPoint theta2 := theta1 + delta. ct2 := theta2 cos. st2 := theta2 sin. - pe := cp * radii x * ct2 - (sp * radii y * st2) + c x @ + pe := cp * radii x * ct2 - (sp * radii y * st2) + c x @ (sp * radii x * ct2 + (cp * radii y * st2) + c y). - ds := t * ((cp negated * radii x * st1 - (sp * radii y * ct1)) @ + ds := t * ((cp negated * radii x * st1 - (sp * radii y * ct1)) @ (sp negated * radii x * st1 + (cp * radii y*ct1))). - de := t * ((cp * radii x * st2 + (sp * radii y * ct2)) @ + de := t * ((cp * radii x * st2 + (sp * radii y * ct2)) @ (sp * radii x * st2 - (cp * radii y*ct2))). self createCubicBezierSegmentFrom: ps diff --git a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createCubicBezierSegmentFrom.at..st b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createCubicBezierSegmentFrom.at..st index 6f93c5f9..cf46ccac 100644 --- a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createCubicBezierSegmentFrom.at..st +++ b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createCubicBezierSegmentFrom.at..st @@ -5,7 +5,7 @@ createCubicBezierSegmentFrom: data at: aPoint |position| self createCubicBezierSegmentFrom: aPoint - via: data first@data second - and: data third@data fourth - to: (position _ data fifth@data sixth). + via: data first @ data second + and: data third @ data fourth + to: (position := data fifth @ data sixth). ^position \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createFromSVG..st b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createFromSVG..st index ca15ca7f..99586e73 100644 --- a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createFromSVG..st +++ b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createFromSVG..st @@ -6,5 +6,5 @@ createFromSVG: anElement self createSegmentsFromSVG: anElement. self computeBounds. self d: (anElement attributeAt: 'd') - - + + diff --git a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createLineSegmentFrom.at..st b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createLineSegmentFrom.at..st index 0d22a3d2..d8f44410 100644 --- a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createLineSegmentFrom.at..st +++ b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createLineSegmentFrom.at..st @@ -3,5 +3,5 @@ createLineSegmentFrom: data at: aPoint "Create a line segment from the path data (stream) at the given position." |position| - self createLineSegmentFrom: aPoint to: (position _ data first@data second). + self createLineSegmentFrom: aPoint to: (position := data first @ data second). ^position \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createQuadraticBezierSegmentFrom.at..st b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createQuadraticBezierSegmentFrom.at..st index 03888947..2968b05b 100644 --- a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createQuadraticBezierSegmentFrom.at..st +++ b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createQuadraticBezierSegmentFrom.at..st @@ -1,10 +1,10 @@ as yet unclassified createQuadraticBezierSegmentFrom: data at: aPoint "Create a quadratic bezier segment from the path data (stream) at the given position." - + |position| self createQuadraticBezierSegmentFrom: aPoint - via: data first@data second - to: (position _ data third@data fourth). + via: data first @ data second + to: (position := data third @ data fourth). ^position \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createSegmentsFromSVG..st b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createSegmentsFromSVG..st index 408e19b8..82d0121c 100644 --- a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createSegmentsFromSVG..st +++ b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/createSegmentsFromSVG..st @@ -6,7 +6,7 @@ createSegmentsFromSVG: anElement c := nil. initialPosition := nil. data := self pathDataFromSVG: anElement. - position := 0@0. + position := 0 @ 0. data do: [:cmd | ((cmd = $S or: [cmd = $s]) and: ['CcSs' includes: c not]) ifTrue: [lastCubicControl := position]. @@ -15,14 +15,14 @@ createSegmentsFromSVG: anElement c := cmd key. d := cmd value. c = $M - ifTrue: [position := d first@d second. + ifTrue: [position := d first @ d second. initialPosition isNil - ifTrue: [initialPosition := position]. + ifTrue: [initialPosition := position]. subpathStartPosition := position]. c = $m ifTrue: [initialPosition isNil - ifTrue: [position := d first@d second. initialPosition := position] - ifFalse: [position := position + (d first@d second)]. + ifTrue: [position := d first @ d second. initialPosition := position] + ifFalse: [position := position + (d first @ d second)]. subpathStartPosition := position]. c = $A ifTrue: [position := self createArcSegmentFrom: d at: position]. @@ -53,14 +53,14 @@ createSegmentsFromSVG: anElement d at: 2 put: (d second + position y). position := self createLineSegmentFrom: d at: position]. c = $C - ifTrue: [lastCubicControl := d third@d fourth. + ifTrue: [lastCubicControl := d third @ d fourth. position := self createCubicBezierSegmentFrom: d at: position]. c = $c ifTrue: [d at: 1 put: (d first + position x). d at: 2 put: (d second + position y). d at: 3 put: (d third + position x). d at: 4 put: (d fourth + position y). - lastCubicControl := d third@d fourth. + lastCubicControl := d third @ d fourth. d at: 5 put: (d fifth + position x). d at: 6 put: (d sixth + position y). position := self createCubicBezierSegmentFrom: d at: position]. @@ -68,7 +68,7 @@ createSegmentsFromSVG: anElement ifTrue: [lastCubicControl := lastCubicControl reflectedAbout: position. d addFirst: lastCubicControl y. d addFirst: lastCubicControl x. - lastCubicControl := d third@d fourth. + lastCubicControl := d third @ d fourth. position := self createCubicBezierSegmentFrom: d at: position]. c = $s ifTrue: [lastCubicControl := lastCubicControl reflectedAbout: position. @@ -76,17 +76,17 @@ createSegmentsFromSVG: anElement d addFirst: lastCubicControl x. d at: 3 put: (d third + position x). d at: 4 put: (d fourth + position y). - lastCubicControl := d third@d fourth. + lastCubicControl := d third @ d fourth. d at: 5 put: (d fifth + position x). d at: 6 put: (d sixth + position y). position := self createCubicBezierSegmentFrom: d at: position]. c = $Q - ifTrue: [lastQuadraticControl := d first@d second . + ifTrue: [lastQuadraticControl := d first @ d second . position := self createQuadraticBezierSegmentFrom: d at: position]. c = $q ifTrue: [d at: 1 put: (d first + position x). d at: 2 put: (d second + position y). - lastQuadraticControl := d first@d second. + lastQuadraticControl := d first @ d second. d at: 3 put: (d third + position x). d at: 4 put: (d fourth + position y). position := self createQuadraticBezierSegmentFrom: d at: position]. @@ -94,13 +94,13 @@ createSegmentsFromSVG: anElement ifTrue: [lastQuadraticControl := lastQuadraticControl reflectedAbout: position. d addFirst: lastQuadraticControl y. d addFirst: lastQuadraticControl x. - lastQuadraticControl := d first@d second. + lastQuadraticControl := d first @ d second. position := self createQuadraticBezierSegmentFrom: d at: position]. c = $t ifTrue: [lastQuadraticControl := lastQuadraticControl reflectedAbout: position. d addFirst: lastQuadraticControl y. d addFirst: lastQuadraticControl x. - lastQuadraticControl := d first@d second. + lastQuadraticControl := d first @ d second. d at: 3 put: (d third + position x). d at: 4 put: (d fourth + position y). position := self createQuadraticBezierSegmentFrom: d at: position]. diff --git a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/drawOn..st b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/drawOn..st index 4b32c772..b4818401 100644 --- a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/drawOn..st +++ b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/drawOn..st @@ -1,7 +1,7 @@ as yet unclassified drawOn: aCanvas "Draw the component on the canvas." - + (self composedStyle at: 'visibility') ifFalse: [^self]. self renderer diff --git a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/initialize.st b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/initialize.st index 44920897..a544bdaf 100644 --- a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/initialize.st +++ b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/initialize.st @@ -3,5 +3,5 @@ initialize "Initialize the receiver." super initialize. - self + self segments: OrderedCollection new \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/segments..st b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/segments..st index 456e1afc..d40bdf84 100644 --- a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/segments..st +++ b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/segments..st @@ -2,4 +2,4 @@ accessing segments: anObject "Set the value of segments" - segments _ anObject \ No newline at end of file + segments := anObject \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/userSpaceBoundingBoxWithRespectTo..st b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/userSpaceBoundingBoxWithRespectTo..st index 2fd0ff60..a0c77c28 100644 --- a/packages/SVG-Morphic.package/SVGPathMorph.class/instance/userSpaceBoundingBoxWithRespectTo..st +++ b/packages/SVG-Morphic.package/SVGPathMorph.class/instance/userSpaceBoundingBoxWithRespectTo..st @@ -6,7 +6,7 @@ userSpaceBoundingBoxWithRespectTo: aComposite |rect subRect trans| self segments isEmpty ifTrue: [^nil]. - trans := self transformFrom: aComposite. + trans := self transformFrom: aComposite. rect := self segments first boundingBox boundsWithTransform: trans. self segments do: [:s | subRect := s boundingBox. diff --git a/packages/SVG-Morphic.package/SVGPolygonMorph.class/instance/drawOn..st b/packages/SVG-Morphic.package/SVGPolygonMorph.class/instance/drawOn..st index c42425c3..e333bca5 100644 --- a/packages/SVG-Morphic.package/SVGPolygonMorph.class/instance/drawOn..st +++ b/packages/SVG-Morphic.package/SVGPolygonMorph.class/instance/drawOn..st @@ -1,7 +1,7 @@ as yet unclassified drawOn: aCanvas "Draw the component on the canvas." - + (self composedStyle at: 'visibility') ifFalse: [^self]. self renderer diff --git a/packages/SVG-Morphic.package/SVGPolygonalMorph.class/instance/computeBounds.st b/packages/SVG-Morphic.package/SVGPolygonalMorph.class/instance/computeBounds.st index 0b2a71ea..6cb00d14 100644 --- a/packages/SVG-Morphic.package/SVGPolygonalMorph.class/instance/computeBounds.st +++ b/packages/SVG-Morphic.package/SVGPolygonalMorph.class/instance/computeBounds.st @@ -1,4 +1,4 @@ as yet unclassified computeBounds self points size == 0 ifTrue: [^ self]. - bounds := fullBounds := (Rectangle encompassing: (self points))outsetBy: ((self composedStyle at: 'stroke-width') // 2). + bounds := fullBounds := (Rectangle encompassing: (self points))outsetBy: ((self composedStyle at: 'stroke-width') // 2) diff --git a/packages/SVG-Morphic.package/SVGPolygonalMorph.class/instance/createFromSVG..st b/packages/SVG-Morphic.package/SVGPolygonalMorph.class/instance/createFromSVG..st index a396c6dc..77b57ba4 100644 --- a/packages/SVG-Morphic.package/SVGPolygonalMorph.class/instance/createFromSVG..st +++ b/packages/SVG-Morphic.package/SVGPolygonalMorph.class/instance/createFromSVG..st @@ -5,4 +5,4 @@ createFromSVG: anElement super createFromSVG: anElement. self createPointsFromSVG: anElement. self computeBounds - + diff --git a/packages/SVG-Morphic.package/SVGPolygonalMorph.class/instance/initialize.st b/packages/SVG-Morphic.package/SVGPolygonalMorph.class/instance/initialize.st index 99f0e188..b286e743 100644 --- a/packages/SVG-Morphic.package/SVGPolygonalMorph.class/instance/initialize.st +++ b/packages/SVG-Morphic.package/SVGPolygonalMorph.class/instance/initialize.st @@ -3,5 +3,5 @@ initialize "Initialize the receiver." super initialize. - self + self points: OrderedCollection new \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGPolygonalMorph.class/instance/pointDataFromSVG..st b/packages/SVG-Morphic.package/SVGPolygonalMorph.class/instance/pointDataFromSVG..st index 597d370d..22f59b0b 100644 --- a/packages/SVG-Morphic.package/SVGPolygonalMorph.class/instance/pointDataFromSVG..st +++ b/packages/SVG-Morphic.package/SVGPolygonalMorph.class/instance/pointDataFromSVG..st @@ -1,7 +1,7 @@ as yet unclassified pointDataFromSVG: anElement "Answer a collection of points from the polygon data." - + |points stream x y| points := OrderedCollection new. stream := (anElement attributeAt: 'points') readStream. diff --git a/packages/SVG-Morphic.package/SVGPolylineMorph.class/instance/drawOn..st b/packages/SVG-Morphic.package/SVGPolylineMorph.class/instance/drawOn..st index 74d4163d..a16c9b03 100644 --- a/packages/SVG-Morphic.package/SVGPolylineMorph.class/instance/drawOn..st +++ b/packages/SVG-Morphic.package/SVGPolylineMorph.class/instance/drawOn..st @@ -1,7 +1,7 @@ as yet unclassified drawOn: aCanvas "Draw the component on the canvas." - + (self composedStyle at: 'visibility') ifFalse: [^self]. self renderer diff --git a/packages/SVG-Morphic.package/SVGRectMorph.class/instance/createRectangleFromSVG..st b/packages/SVG-Morphic.package/SVGRectMorph.class/instance/createRectangleFromSVG..st index 85ec7e43..7dc88ea5 100644 --- a/packages/SVG-Morphic.package/SVGRectMorph.class/instance/createRectangleFromSVG..st +++ b/packages/SVG-Morphic.package/SVGRectMorph.class/instance/createRectangleFromSVG..st @@ -3,5 +3,5 @@ createRectangleFromSVG: anElement "Create the segments from the rect." self - rectangle: ((anElement attributeAt: 'x' ifAbsent: [0]) asSVGNumber@(anElement attributeAt: 'y' ifAbsent: [0]) asSVGNumber - extent: (anElement attributeAt: 'width') asSVGNumber@(anElement attributeAt: 'height') asSVGNumber) \ No newline at end of file + rectangle: ((anElement attributeAt: 'x' ifAbsent: [0]) asSVGNumber @ (anElement attributeAt: 'y' ifAbsent: [0]) asSVGNumber + extent: (anElement attributeAt: 'width') asSVGNumber @ (anElement attributeAt: 'height') asSVGNumber) \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGRectangularMorph.class/instance/computeBounds.st b/packages/SVG-Morphic.package/SVGRectangularMorph.class/instance/computeBounds.st index 39c67779..ec954efa 100644 --- a/packages/SVG-Morphic.package/SVGRectangularMorph.class/instance/computeBounds.st +++ b/packages/SVG-Morphic.package/SVGRectangularMorph.class/instance/computeBounds.st @@ -1,5 +1,5 @@ as yet unclassified computeBounds - + rectangle ifNil: [^ self]. - fullBounds := bounds := self transform localBoundsToGlobal: rectangle. \ No newline at end of file + fullBounds := bounds := self transform localBoundsToGlobal: rectangle \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGRenderer.class/instance/renderRect.on..st b/packages/SVG-Morphic.package/SVGRenderer.class/instance/renderRect.on..st index 2ef3e3e3..31b94e14 100644 --- a/packages/SVG-Morphic.package/SVGRenderer.class/instance/renderRect.on..st +++ b/packages/SVG-Morphic.package/SVGRenderer.class/instance/renderRect.on..st @@ -1,5 +1,5 @@ as yet unclassified renderRect: anSVGRect on: aCanvas "Render the given object on the canvas." - + self subclassResponsibility \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGRenderer.class/instance/renderText.on..st b/packages/SVG-Morphic.package/SVGRenderer.class/instance/renderText.on..st index 57c92447..d0788491 100644 --- a/packages/SVG-Morphic.package/SVGRenderer.class/instance/renderText.on..st +++ b/packages/SVG-Morphic.package/SVGRenderer.class/instance/renderText.on..st @@ -1,5 +1,5 @@ as yet unclassified renderText: anSVGText on: aCanvas "Render the given object on the canvas." - + self subclassResponsibility \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGSegmentRun.class/class/runsFromSegments..st b/packages/SVG-Morphic.package/SVGSegmentRun.class/class/runsFromSegments..st index 7fe55d86..868a9758 100644 --- a/packages/SVG-Morphic.package/SVGSegmentRun.class/class/runsFromSegments..st +++ b/packages/SVG-Morphic.package/SVGSegmentRun.class/class/runsFromSegments..st @@ -3,21 +3,20 @@ runsFromSegments: aCollection "Answer a collection of runs from the given segments." |answer str seg run runClass position| - answer _ OrderedCollection new. + answer := OrderedCollection new. aCollection isEmpty ifTrue: [^answer]. - str _ aCollection readStream. - run _ str next run. - runClass _ aCollection first runClass. - position _ aCollection first end. + str := aCollection readStream. + run := str next run. + runClass := aCollection first runClass. + position := aCollection first end. [str atEnd] whileFalse: [ - seg _ str next. + seg := str next. (seg runClass ~= runClass or: [seg start ~= position]) ifTrue: [answer add: run. - runClass _ seg runClass. - run _ seg run] + runClass := seg runClass. + run := seg run] ifFalse: [run add: seg run]. - position _ seg end]. + position := seg end]. answer add: run. ^answer - \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGSegmentRun.class/instance/segments..st b/packages/SVG-Morphic.package/SVGSegmentRun.class/instance/segments..st index 456e1afc..d40bdf84 100644 --- a/packages/SVG-Morphic.package/SVGSegmentRun.class/instance/segments..st +++ b/packages/SVG-Morphic.package/SVGSegmentRun.class/instance/segments..st @@ -2,4 +2,4 @@ accessing segments: anObject "Set the value of segments" - segments _ anObject \ No newline at end of file + segments := anObject \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGTSpanMorph.class/instance/createTextFromSVG..st b/packages/SVG-Morphic.package/SVGTSpanMorph.class/instance/createTextFromSVG..st index 1ec5ff55..e09391c1 100644 --- a/packages/SVG-Morphic.package/SVGTSpanMorph.class/instance/createTextFromSVG..st +++ b/packages/SVG-Morphic.package/SVGTSpanMorph.class/instance/createTextFromSVG..st @@ -1,8 +1,8 @@ as yet unclassified createTextFromSVG: anElement "Create the text from the svg text." - + super createTextFromSVG: anElement. self location: - (anElement attributeAt: 'x' ifAbsent: [self owner location x]) asSVGNumber @ + (anElement attributeAt: 'x' ifAbsent: [self owner location x]) asSVGNumber @ (anElement attributeAt: 'y' ifAbsent: [self owner location y]) asSVGNumber diff --git a/packages/SVG-Morphic.package/SVGTextMorph.class/instance/computeBounds.st b/packages/SVG-Morphic.package/SVGTextMorph.class/instance/computeBounds.st index bb0ca880..4d266bc5 100644 --- a/packages/SVG-Morphic.package/SVGTextMorph.class/instance/computeBounds.st +++ b/packages/SVG-Morphic.package/SVGTextMorph.class/instance/computeBounds.st @@ -6,12 +6,12 @@ computeBounds |fontSize textFont anchor offset ptSize| fontSize := (self composedStyle at: 'font-size'). textFont := self composedStyle at: 'font'. - ptSize := (fontSize@0) x rounded - 1 max: 1. + ptSize := (fontSize @ 0) x rounded - 1 max: 1. textFont := TTCFontSet familyName: textFont familyName pointSize: ptSize. anchor := self composedStyle at: 'text-anchor'. - offset := 0@textFont ascent. + offset := 0 @ textFont ascent. anchor = 'middle' - ifTrue: [offset := (textFont widthOfString: self text) // 2@textFont ascent]. + ifTrue: [offset := (textFont widthOfString: self text) // 2 @ textFont ascent]. anchor = 'end' - ifTrue: [offset := (textFont widthOfString: self text)@textFont ascent]. - bounds := fullBounds := self transform localBoundsToGlobal: ((self location) - offset extent: (textFont widthOfString: self text)@textFont height) \ No newline at end of file + ifTrue: [offset := (textFont widthOfString: self text) @ textFont ascent]. + bounds := fullBounds := self transform localBoundsToGlobal: ((self location) - offset extent: (textFont widthOfString: self text) @ textFont height) \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGTextMorph.class/instance/createTextFromSVG..st b/packages/SVG-Morphic.package/SVGTextMorph.class/instance/createTextFromSVG..st index 471d9b81..c85a8df7 100644 --- a/packages/SVG-Morphic.package/SVGTextMorph.class/instance/createTextFromSVG..st +++ b/packages/SVG-Morphic.package/SVGTextMorph.class/instance/createTextFromSVG..st @@ -4,4 +4,4 @@ createTextFromSVG: anElement Doen't handle tspans yet!" self text: anElement characterData. - self location: (anElement attributeAt: 'x' ifAbsent: [0]) asSVGNumber@(anElement attributeAt: 'y' ifAbsent: [0]) asSVGNumber + self location: (anElement attributeAt: 'x' ifAbsent: [0]) asSVGNumber @ (anElement attributeAt: 'y' ifAbsent: [0]) asSVGNumber diff --git a/packages/SVG-Morphic.package/SVGTextMorph.class/instance/drawOn..st b/packages/SVG-Morphic.package/SVGTextMorph.class/instance/drawOn..st index 1a824956..5eaf3dee 100644 --- a/packages/SVG-Morphic.package/SVGTextMorph.class/instance/drawOn..st +++ b/packages/SVG-Morphic.package/SVGTextMorph.class/instance/drawOn..st @@ -1,7 +1,7 @@ as yet unclassified drawOn: aCanvas "Draw the component on the canvas." - + (self composedStyle at: 'visibility') ifFalse: [^self]. self renderer diff --git a/packages/SVG-Morphic.package/SVGTextMorph.class/instance/fontToUse.st b/packages/SVG-Morphic.package/SVGTextMorph.class/instance/fontToUse.st index dedfb778..65d15cc4 100644 --- a/packages/SVG-Morphic.package/SVGTextMorph.class/instance/fontToUse.st +++ b/packages/SVG-Morphic.package/SVGTextMorph.class/instance/fontToUse.st @@ -8,7 +8,7 @@ fontToUse trans := self transformFrom: self world. fontSize := (self composedStyle at: 'font-size'). textFont := self composedStyle at: 'font'. - ptSize := (trans transformDirection: fontSize@0) x rounded max: 1. + ptSize := (trans transformDirection: fontSize @ 0) x rounded max: 1. "textFont := TTCFontSet familyName: textFont familyName pointSize: ptSize." textFont isTTCFont ifTrue: [textFont := (TextStyle named: textFont familyName) addNewFontSize: ptSize] diff --git a/packages/SVG-Morphic.package/SVGTextMorph.class/instance/location..st b/packages/SVG-Morphic.package/SVGTextMorph.class/instance/location..st index 77d24f11..aab3556e 100644 --- a/packages/SVG-Morphic.package/SVGTextMorph.class/instance/location..st +++ b/packages/SVG-Morphic.package/SVGTextMorph.class/instance/location..st @@ -2,4 +2,4 @@ accessing location: anObject "Set the value of location" - location _ anObject \ No newline at end of file + location := anObject \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGTextMorph.class/instance/text..st b/packages/SVG-Morphic.package/SVGTextMorph.class/instance/text..st index 97f551cf..77267f7a 100644 --- a/packages/SVG-Morphic.package/SVGTextMorph.class/instance/text..st +++ b/packages/SVG-Morphic.package/SVGTextMorph.class/instance/text..st @@ -2,4 +2,4 @@ accessing text: anObject "Set the value of text" - text _ anObject \ No newline at end of file + text := anObject \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGTextMorph.class/instance/textForDisplayName.st b/packages/SVG-Morphic.package/SVGTextMorph.class/instance/textForDisplayName.st index ae28ee25..01a9f782 100644 --- a/packages/SVG-Morphic.package/SVGTextMorph.class/instance/textForDisplayName.st +++ b/packages/SVG-Morphic.package/SVGTextMorph.class/instance/textForDisplayName.st @@ -1,6 +1,6 @@ as yet unclassified textForDisplayName - ^ (self text isEmpty) + ^ (self text isEmpty) ifTrue: [''] ifFalse: [' ("' , self text , '")'] \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SVGTextMorph.class/instance/userSpaceBoundingBoxWithRespectTo..st b/packages/SVG-Morphic.package/SVGTextMorph.class/instance/userSpaceBoundingBoxWithRespectTo..st index fc207f3f..5fdf6a83 100644 --- a/packages/SVG-Morphic.package/SVGTextMorph.class/instance/userSpaceBoundingBoxWithRespectTo..st +++ b/packages/SVG-Morphic.package/SVGTextMorph.class/instance/userSpaceBoundingBoxWithRespectTo..st @@ -4,15 +4,15 @@ userSpaceBoundingBoxWithRespectTo: aComposite intervening between the receiver and aComposite." |fontSize textFont anchor offset ptSize trans| - trans _ self transformFrom: aComposite. + trans := self transformFrom: aComposite. fontSize := (self composedStyle at: 'font-size'). textFont := self composedStyle at: 'font'. - ptSize := (trans transformDirection: fontSize@0) x rounded - 1 max: 1. + ptSize := (trans transformDirection: fontSize @ 0) x rounded - 1 max: 1. textFont := TTCFontSet familyName: textFont familyName pointSize: ptSize. anchor := self composedStyle at: 'text-anchor'. - offset := 0@textFont ascent. + offset := 0 @ textFont ascent. anchor = 'middle' - ifTrue: [offset := (textFont widthOfString: self text) // 2@textFont ascent]. + ifTrue: [offset := (textFont widthOfString: self text) // 2 @ textFont ascent]. anchor = 'end' - ifTrue: [offset := (textFont widthOfString: self text)@textFont ascent]. - ^(trans transformPoint: self location) - offset extent: (textFont widthOfString: self text)@textFont height \ No newline at end of file + ifTrue: [offset := (textFont widthOfString: self text) @ textFont ascent]. + ^(trans transformPoint: self location) - offset extent: (textFont widthOfString: self text) @ textFont height \ No newline at end of file diff --git a/packages/SVG-Morphic.package/SolidFillStyle.extension/instance/alpha..st b/packages/SVG-Morphic.package/SolidFillStyle.extension/instance/alpha..st index b605c084..8da0cc0f 100644 --- a/packages/SVG-Morphic.package/SolidFillStyle.extension/instance/alpha..st +++ b/packages/SVG-Morphic.package/SolidFillStyle.extension/instance/alpha..st @@ -2,5 +2,5 @@ alpha: fraction "Answer a new fill with the extra transparency." - ^self copy + ^self copy color: (self color alphaMixed: fraction) \ No newline at end of file diff --git a/packages/SVG-Morphic.package/String.extension/instance/asSVGNumber.st b/packages/SVG-Morphic.package/String.extension/instance/asSVGNumber.st index 5f2e5e2d..a36d027d 100644 --- a/packages/SVG-Morphic.package/String.extension/instance/asSVGNumber.st +++ b/packages/SVG-Morphic.package/String.extension/instance/asSVGNumber.st @@ -1,6 +1,6 @@ *SVG-Morphic asSVGNumber - "Answer the number from the string. + "Answer the number from the string. Number of the form .7 are allowed." ^((self beginsWith: '.') diff --git a/packages/SVG-Morphic.package/TTCFont.extension/instance/derivativeFont..st b/packages/SVG-Morphic.package/TTCFont.extension/instance/derivativeFont..st index a573e4bd..68ab9cac 100644 --- a/packages/SVG-Morphic.package/TTCFont.extension/instance/derivativeFont..st +++ b/packages/SVG-Morphic.package/TTCFont.extension/instance/derivativeFont..st @@ -2,10 +2,10 @@ derivativeFont: aTTCFont "Modified since poping up an inform is really annoying when adding font sizes programatically!" - | index | + |index| index := self indexOfSubfamilyName: aTTCFont subfamilyName. index < 1 ifTrue: [^nil]. self derivativeFont: aTTCFont at: index. - self addLined: aTTCFont. + self addLined: aTTCFont diff --git a/packages/SVG-Morphic.package/TextStyle.extension/class/defaultSVGFont.st b/packages/SVG-Morphic.package/TextStyle.extension/class/defaultSVGFont.st index b0717f60..016294e3 100644 --- a/packages/SVG-Morphic.package/TextStyle.extension/class/defaultSVGFont.st +++ b/packages/SVG-Morphic.package/TextStyle.extension/class/defaultSVGFont.st @@ -1,4 +1,4 @@ *SVG-Morphic defaultSVGFont - ^ self defaultSVGTextStyle defaultFont. \ No newline at end of file + ^ self defaultSVGTextStyle defaultFont \ No newline at end of file diff --git a/packages/SVG-Morphic.package/TextStyle.extension/class/defaultSVGTextStyle.st b/packages/SVG-Morphic.package/TextStyle.extension/class/defaultSVGTextStyle.st index 417c323c..c8cae8a8 100644 --- a/packages/SVG-Morphic.package/TextStyle.extension/class/defaultSVGTextStyle.st +++ b/packages/SVG-Morphic.package/TextStyle.extension/class/defaultSVGTextStyle.st @@ -2,4 +2,4 @@ defaultSVGTextStyle self installDefaultSVGTextStyle. - ^ self named: #OpenSans. \ No newline at end of file + ^ self named: #OpenSans \ No newline at end of file diff --git a/packages/SVG-Morphic.package/TextStyle.extension/class/installDefaultSVGTextStyle.st b/packages/SVG-Morphic.package/TextStyle.extension/class/installDefaultSVGTextStyle.st index cc32271b..fd6a1b23 100644 --- a/packages/SVG-Morphic.package/TextStyle.extension/class/installDefaultSVGTextStyle.st +++ b/packages/SVG-Morphic.package/TextStyle.extension/class/installDefaultSVGTextStyle.st @@ -3,6 +3,5 @@ installDefaultSVGTextStyle (self actualTextStyles includesKey: #OpenSans) ifTrue: [^ self]. - - TTCFont newTextStyleFromTTStream: (ReadStream on:(TextStyle openSansData base64Decoded asByteArray)). - \ No newline at end of file + + TTCFont newTextStyleFromTTStream: (ReadStream on:(TextStyle openSansData base64Decoded asByteArray)) diff --git a/packages/SVG-Morphic.package/TranslucentColor.extension/instance/pixelWord32.st b/packages/SVG-Morphic.package/TranslucentColor.extension/instance/pixelWord32.st index 667b3e07..461215dd 100644 --- a/packages/SVG-Morphic.package/TranslucentColor.extension/instance/pixelWord32.st +++ b/packages/SVG-Morphic.package/TranslucentColor.extension/instance/pixelWord32.st @@ -3,7 +3,7 @@ pixelWord32 "Returns an integer representing the bits that appear in a single pixel of this color in a Form of depth 32. Transparency: The pixel value zero is reserved for transparent. For depths greater than 8, black maps to the darkest possible blue." - | val | + |val| "eight bits per component; top 8 bits set to all ones (opaque alpha)" val := LargePositiveInteger new: 4. val at: 3 put: ((rgb bitShift: -22) bitAnd: 16rFF). diff --git a/packages/Tests-SVG-Editor.package/SVGEditorModelMock.class/instance/actionOpenFile.st b/packages/Tests-SVG-Editor.package/SVGEditorModelMock.class/instance/actionOpenFile.st index 1293b566..1f7e7cd9 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorModelMock.class/instance/actionOpenFile.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorModelMock.class/instance/actionOpenFile.st @@ -2,4 +2,3 @@ actions actionOpenFile self actionOpenFileCount: (self actionOpenFileCount + 1) - \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGEditorModelMock.class/instance/actionSaveFile.st b/packages/Tests-SVG-Editor.package/SVGEditorModelMock.class/instance/actionSaveFile.st index 585c4a8c..22cbd933 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorModelMock.class/instance/actionSaveFile.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorModelMock.class/instance/actionSaveFile.st @@ -2,4 +2,3 @@ actions actionSaveFile self actionSaveFileCount: (self actionSaveFileCount + 1) - \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/let.openAFileAt..st b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/let.openAFileAt..st index e5712a91..02a477d0 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/let.openAFileAt..st +++ b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/let.openAFileAt..st @@ -1,9 +1,9 @@ testing-helpers let: anEditor openAFileAt: aFilePath - | stream | + |stream| stream := ReadStream on: ''. - + anEditor path: aFilePath; stream: stream; diff --git a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/let.writeFileAt.to..st b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/let.writeFileAt.to..st index ac6e54c2..7a1ee131 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/let.writeFileAt.to..st +++ b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/let.writeFileAt.to..st @@ -4,4 +4,4 @@ let: anEditor writeFileAt: aFilePath to: aStream anEditor path: aFilePath; stream: aStream; - actionSaveFile. \ No newline at end of file + actionSaveFile \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testActionCloseFile.st b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testActionCloseFile.st index 8a33a2f6..9ca6d256 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testActionCloseFile.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testActionCloseFile.st @@ -4,7 +4,6 @@ testActionCloseFile self subject svg: #MockSVG; actionCloseFile. - + self assert: self subject svg equals: nil description: 'editor should have removed the svg' - \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testActionOpenFile.st b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testActionOpenFile.st index 6eca26b7..f1ed0a59 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testActionOpenFile.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testActionOpenFile.st @@ -5,8 +5,7 @@ testActionOpenFile editorSubclass := self getSubclassObject. path := '/path/to/svg'. self let: editorSubclass openAFileAt: path. - + self assert: editorSubclass path equals: path description: 'editor should have asked for the file with the given path'; assert: editorSubclass svg notNil description: 'editor should have loaded an svg' - \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testActionOpenFilePathNil.st b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testActionOpenFilePathNil.st index 41547120..928d0bc9 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testActionOpenFilePathNil.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testActionOpenFilePathNil.st @@ -1,10 +1,9 @@ testing testActionOpenFilePathNil - | editorSubclass | + |editorSubclass| editorSubclass := self getSubclassObject. self let: editorSubclass openAFileAt: nil. - + self assert: editorSubclass svg isNil description: 'editor should not have loaded an svg' - \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testActionSaveFile.st b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testActionSaveFile.st index 2e718537..ec93d08f 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testActionSaveFile.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testActionSaveFile.st @@ -4,12 +4,11 @@ testActionSaveFile | editorSubclass path stream | editorSubclass := self getSubclassObject. self let: editorSubclass openAFileAt: '/path/to/svg'. - + path := '/path/to/saved/svg'. stream := WriteStream on: String new. self let: editorSubclass writeFileAt: path to: stream. - + self assert: editorSubclass path equals: path description: 'editor should have asked to create the file with the given path'; assert: (editorSubclass stream contents ~= '') - \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testActionSaveFilePathNil.st b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testActionSaveFilePathNil.st index d07474f3..add70cad 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testActionSaveFilePathNil.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testActionSaveFilePathNil.st @@ -4,10 +4,9 @@ testActionSaveFilePathNil | editorSubclass stream | editorSubclass := self getSubclassObject. self let: editorSubclass openAFileAt: '/path/to/svg'. - + stream := WriteStream on: String new. self let: editorSubclass writeFileAt: nil to: stream. - + self assert: editorSubclass stream contents equals: '' description: 'editor not should create the file' - \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testChildrenOf.st b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testChildrenOf.st index c2b71e7c..691104d0 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testChildrenOf.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testChildrenOf.st @@ -4,5 +4,5 @@ testChildrenOf |svg| svg := self treeViewTestSVG. self subject svg: svg. - + self assert: svg submorphs equals: (self subject getChildrenOf: svg) \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testDisplayName.st b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testDisplayName.st index fd60d1d4..6cd71429 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testDisplayName.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testDisplayName.st @@ -4,5 +4,5 @@ testDisplayName |svg| svg := self treeViewTestSVG. self subject svg: svg. - + self assert: (svg displayName) equals: (self subject displayNameOf: svg) \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testHasChildren.st b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testHasChildren.st index 10c7926f..3f4d968b 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testHasChildren.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testHasChildren.st @@ -4,8 +4,7 @@ testHasChildren |svg| svg := self treeViewTestSVG. self subject svg: svg. - - self + + self assert: true equals: (self subject hasChildren: svg); assert: false equals: (self subject hasChildren: (svg submorphs first)) - \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testTreeRoots.st b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testTreeRoots.st index 7f450a92..14e54c44 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testTreeRoots.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorModelTest.class/instance/testTreeRoots.st @@ -4,6 +4,5 @@ testTreeRoots |svg| svg := self treeViewTestSVG. self subject svg: svg. - + self assert: (Array with: svg) equals: self subject svgTree - \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/setUp.st b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/setUp.st index 0eab609a..f0fa0626 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/setUp.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/setUp.st @@ -9,4 +9,4 @@ setUp model: self modelMock; buildWith: builder. morph := builder build: windowSpec. - self wantsToTest: morph. \ No newline at end of file + self wantsToTest: morph \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testCloseButtonAction.st b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testCloseButtonAction.st index 81b791e2..69d6303e 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testCloseButtonAction.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testCloseButtonAction.st @@ -1,7 +1,7 @@ testing testCloseButtonAction - | button | + |button| self modelMock canCloseFile: true. self assert: self modelMock actionCloseFileCount equals: 0 description: 'button should not yet have called action close'. button := self subject findByName: #closeButton. diff --git a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testCloseButtonActionWithoutSVG.st b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testCloseButtonActionWithoutSVG.st index 4a4757c5..eb901e4d 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testCloseButtonActionWithoutSVG.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testCloseButtonActionWithoutSVG.st @@ -1,7 +1,7 @@ testing testCloseButtonActionWithoutSVG - | button | + |button| self modelMock canCloseFile: false. self assert: self modelMock actionCloseFileCount equals: 0 description: 'button should not yet have called action close'. button := self subject findByName: #closeButton. diff --git a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testCloseButtonExists.st b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testCloseButtonExists.st index d0ead5f2..7bcaf0ee 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testCloseButtonExists.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testCloseButtonExists.st @@ -1,6 +1,6 @@ testing testCloseButtonExists - | button | + |button| button := self subject findByName: #closeButton. self deny: button morphs isEmpty \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testDrawingAreaExists.st b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testDrawingAreaExists.st index 2c743920..aa07d06e 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testDrawingAreaExists.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testDrawingAreaExists.st @@ -1,6 +1,6 @@ testing testDrawingAreaExists - | button | + |button| button := self subject findByName: #drawingArea. self deny: button morphs isEmpty \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testOpenButtonAction.st b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testOpenButtonAction.st index 52f5bd21..5ba0347f 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testOpenButtonAction.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testOpenButtonAction.st @@ -1,7 +1,7 @@ testing testOpenButtonAction - | button | + |button| self assert: self modelMock actionOpenFileCount equals: 0 description: 'button should not yet have called action open'. button := self subject findByName: #openButton. button click. diff --git a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testOpenButtonExists.st b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testOpenButtonExists.st index 0d593334..1ead293a 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testOpenButtonExists.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testOpenButtonExists.st @@ -1,6 +1,6 @@ testing testOpenButtonExists - | button | + |button| button := self subject findByName: #openButton. self deny: button morphs isEmpty \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testSaveButtonAction.st b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testSaveButtonAction.st index 75c299f6..8bc51a7a 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testSaveButtonAction.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testSaveButtonAction.st @@ -1,7 +1,7 @@ testing testSaveButtonAction - | button | + |button| self modelMock canSaveFile: true. self assert: self modelMock actionSaveFileCount equals: 0 description: 'button should not yet have called action save'. button := self subject findByName: #saveButton. diff --git a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testSaveButtonActionWithoutSVG.st b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testSaveButtonActionWithoutSVG.st index 7d0ebec8..2bd1caa2 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testSaveButtonActionWithoutSVG.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testSaveButtonActionWithoutSVG.st @@ -1,7 +1,7 @@ testing testSaveButtonActionWithoutSVG - | button | + |button| self modelMock canSaveFile: false. self assert: self modelMock actionSaveFileCount equals: 0 description: 'button should not yet have called action save'. button := self subject findByName: #saveButton. diff --git a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testSaveButtonExists.st b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testSaveButtonExists.st index 3777c8c2..481aeffb 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testSaveButtonExists.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testSaveButtonExists.st @@ -1,6 +1,6 @@ testing testSaveButtonExists - | button | + |button| button := self subject findByName: #saveButton. self deny: button morphs isEmpty \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testTreeViewExists.st b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testTreeViewExists.st index 0d75cd9b..d9290d21 100644 --- a/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testTreeViewExists.st +++ b/packages/Tests-SVG-Editor.package/SVGEditorTest.class/instance/testTreeViewExists.st @@ -1,6 +1,6 @@ testing testTreeViewExists - | treeView | + |treeView| treeView := self subject findByName: #treeView. self deny: treeView morphs isEmpty \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/demoSVG.st b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/demoSVG.st index ce68ca0d..1f432cd7 100644 --- a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/demoSVG.st +++ b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/demoSVG.st @@ -1,7 +1,7 @@ as yet unclassified demoSVG - ^ + ^ ' diff --git a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/hasValue.atKey.in..st b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/hasValue.atKey.in..st index da5fe5bb..5a6d6f62 100644 --- a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/hasValue.atKey.in..st +++ b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/hasValue.atKey.in..st @@ -4,7 +4,6 @@ hasValue: aValue atKey: aKey in: anArrayOfLists |keys values| keys := anArrayOfLists first. values := anArrayOfLists second. - + self assert: (keys indexOf: aKey ifAbsent: [self fail]) = (values indexOf: aValue ifAbsent: [self fail]) description: 'The value could not be found at the given Key.' - \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testCircle.st b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testCircle.st index dee82603..c1726754 100644 --- a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testCircle.st +++ b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testCircle.st @@ -1,10 +1,10 @@ as yet unclassified testCircle - + |panelInfo| panelInfo := SVGInfoPanelGenerator for: (self subject findByClass: SVGCircleMorph). - - self + + self hasValue: 'Circle' atKey: 'Type' in: panelInfo; - hasValue: '30@40' atKey: 'Position' in: panelInfo; + hasValue: '30 @ 40' atKey: 'Position' in: panelInfo; hasValue: '60' atKey: 'Radius' in: panelInfo \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testColor.st b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testColor.st index dfc12a86..640951a6 100644 --- a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testColor.st +++ b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testColor.st @@ -1,4 +1,4 @@ as yet unclassified testColor - + self hasValue: 'Color black' atKey: 'stroke' in: (SVGInfoPanelGenerator for: (self subject findByClass: SVGRectMorph)) \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testEllipse.st b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testEllipse.st index be3ab3b5..5e1763cc 100644 --- a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testEllipse.st +++ b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testEllipse.st @@ -3,9 +3,9 @@ testEllipse |panelInfo| panelInfo := SVGInfoPanelGenerator for: (self subject findByClass: SVGEllipseMorph). - - self + + self hasValue: 'Ellipse' atKey: 'Type' in: panelInfo; - hasValue: '100@120' atKey: 'Position' in: panelInfo; + hasValue: '100 @ 120' atKey: 'Position' in: panelInfo; hasValue: '20' atKey: 'Horizontal Radius' in: panelInfo; hasValue: '50' atKey: 'Vertical Radius' in: panelInfo \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testGroup.st b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testGroup.st index ae355a64..2f06b50b 100644 --- a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testGroup.st +++ b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testGroup.st @@ -3,6 +3,6 @@ testGroup |panelInfo| panelInfo := SVGInfoPanelGenerator for: (self subject findByClass: SVGGroupMorph). - - self + + self hasValue: 'Group' atKey: 'Type' in: panelInfo \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testID.st b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testID.st index 3b065425..5ce2f6d7 100644 --- a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testID.st +++ b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testID.st @@ -1,4 +1,4 @@ as yet unclassified testID - + self hasValue: 'testID' atKey: 'ID' in: (SVGInfoPanelGenerator for: (self subject findByClass: SVGRectMorph)) \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testLine.st b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testLine.st index 7547cabc..20c6798c 100644 --- a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testLine.st +++ b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testLine.st @@ -1,10 +1,10 @@ as yet unclassified testLine - + |panelData| panelData := SVGInfoPanelGenerator for: (self subject findByClass: SVGLineMorph). - - self + + self hasValue: 'Line' atKey: 'Type' in: panelData; - hasValue: '20@30' atKey: 'Start' in: panelData; - hasValue: '100@170' atKey: 'End' in: panelData \ No newline at end of file + hasValue: '20 @ 30' atKey: 'Start' in: panelData; + hasValue: '100 @ 170' atKey: 'End' in: panelData \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testPath.st b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testPath.st index d5145993..b16d8820 100644 --- a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testPath.st +++ b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testPath.st @@ -1,5 +1,4 @@ as yet unclassified testPath - + self hasValue: 'Path' atKey: 'Type' in: (SVGInfoPanelGenerator for: (self subject findByClass: SVGPathMorph)) - \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testPolygon.st b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testPolygon.st index a26d8a31..26d680dd 100644 --- a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testPolygon.st +++ b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testPolygon.st @@ -3,7 +3,7 @@ testPolygon |panelInfo| panelInfo := SVGInfoPanelGenerator for: (self subject findByClass: SVGPolygonMorph). - - self + + self hasValue: 'Polygon' atKey: 'Type' in: panelInfo; - hasValue: '60@20 100@40 100@80 60@100 20@80 20@40' atKey: 'Points' in: panelInfo \ No newline at end of file + hasValue: '60 @ 20 100 @ 40 100 @ 80 60 @ 100 20 @ 80 20 @ 40' atKey: 'Points' in: panelInfo \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testPolyline.st b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testPolyline.st index bfb564e3..b7652b0e 100644 --- a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testPolyline.st +++ b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testPolyline.st @@ -3,7 +3,7 @@ testPolyline |panelInfo| panelInfo := SVGInfoPanelGenerator for: (self subject findByClass: SVGPolylineMorph). - - self + + self hasValue: 'Polyline' atKey: 'Type' in: panelInfo; - hasValue: '0@100 50@25 50@75 100@0' atKey: 'Points' in: panelInfo \ No newline at end of file + hasValue: '0 @ 100 50 @ 25 50 @ 75 100 @ 0' atKey: 'Points' in: panelInfo \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testRectangle.st b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testRectangle.st index 2a619174..c2d25cc7 100644 --- a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testRectangle.st +++ b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testRectangle.st @@ -1,11 +1,11 @@ as yet unclassified testRectangle - + |panelInfo| panelInfo := SVGInfoPanelGenerator for: (self subject findByClass: SVGRectMorph). - - self + + self hasValue: 'Rectangle' atKey: 'Type' in: panelInfo; - hasValue: '100@100' atKey: 'Position' in: panelInfo; + hasValue: '100 @ 100' atKey: 'Position' in: panelInfo; hasValue: '60' atKey: 'Width' in: panelInfo; hasValue: '50' atKey: 'Height' in: panelInfo \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testSVG.st b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testSVG.st index 51eb8eb8..130c06df 100644 --- a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testSVG.st +++ b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testSVG.st @@ -3,6 +3,6 @@ testSVG |panelInfo| panelInfo := SVGInfoPanelGenerator for: (self subject findByClass: SVGMorph). - - self + + self hasValue: 'SVG' atKey: 'Type' in: panelInfo \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testTSpan.st b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testTSpan.st index 8b338da5..f9f63cae 100644 --- a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testTSpan.st +++ b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testTSpan.st @@ -1,9 +1,9 @@ as yet unclassified testTSpan - + |panelInfo| panelInfo := SVGInfoPanelGenerator for: (self subject findByClass: SVGTSpanMorph). - - self + + self hasValue: 'TSpan' atKey: 'Type' in: panelInfo; hasValue: 'Test2' atKey: 'Text' in: panelInfo \ No newline at end of file diff --git a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testText.st b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testText.st index 99c82b84..3c0666dd 100644 --- a/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testText.st +++ b/packages/Tests-SVG-Editor.package/SVGInfoPanelGeneratorTest.class/instance/testText.st @@ -1,9 +1,9 @@ as yet unclassified testText - + |panelInfo| panelInfo := SVGInfoPanelGenerator for: (self subject findByClass: SVGTextMorph). - - self + + self hasValue: 'Text' atKey: 'Type' in: panelInfo; hasValue: 'Test' atKey: 'Text' in: panelInfo \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/assert.closeTo..st b/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/assert.closeTo..st index 0ae3a519..281a4843 100644 --- a/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/assert.closeTo..st +++ b/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/assert.closeTo..st @@ -1,4 +1,4 @@ helpers assert: expected closeTo: actual - self assert: [expected closeTo: actual] \ No newline at end of file + self assert: [expected closeTo: actual] \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/assertMatrix.closeTo..st b/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/assertMatrix.closeTo..st index 65b7372c..ebe05cab 100644 --- a/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/assertMatrix.closeTo..st +++ b/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/assertMatrix.closeTo..st @@ -1,4 +1,4 @@ helpers assertMatrix: expected closeTo: actual - + self assert: [self matrix: expected approxEqual: actual] \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/reconstruct.st b/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/reconstruct.st index dc33bffb..a793d5c3 100644 --- a/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/reconstruct.st +++ b/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/reconstruct.st @@ -1,12 +1,12 @@ helpers reconstruct - | matrix | + |matrix| matrix := MatrixTransform2x3 identity. - + matrix := matrix composedWithGlobal: (MatrixTransform2x3 withSkew: self subject compositeSkew @ 0). matrix := matrix composedWithGlobal: (MatrixTransform2x3 withScale: self subject compositeScale). matrix := matrix composedWithGlobal: (MatrixTransform2x3 withAngle: self subject compositeRotation). matrix := matrix composedWithGlobal: (MatrixTransform2x3 withOffset: self subject compositeTranslation). - + ^ matrix \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/testRotation.st b/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/testRotation.st index 45b91296..0f886c76 100644 --- a/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/testRotation.st +++ b/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/testRotation.st @@ -1,5 +1,5 @@ test ing - single testRotation - {0 . 1 . 30 . 90 . 120 . 179 . 180 . -1 . -89 . -90 . -120 } - do: [:anAngle | self assert: anAngle closeTo: (MatrixTransform2x3 withAngle: anAngle) compositeRotation]. \ No newline at end of file + {0 . 1 . 30 . 90 . 120 . 179 . 180 . -1 . -89 . -90 . -120} + do: [:anAngle | self assert: anAngle closeTo: (MatrixTransform2x3 withAngle: anAngle) compositeRotation] \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/testScale.st b/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/testScale.st index 6e5b9ab6..a998f7e2 100644 --- a/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/testScale.st +++ b/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/testScale.st @@ -1,5 +1,5 @@ test ing - single testScale - { 1 @ 1 . 1 @ 2 . 2 @ 1 . -2 @ 1 . 1000 @ 5000 . 0 @ 1 . 0.45 @ 0.867} - do: [:aPoint | self assert: aPoint closeTo: (MatrixTransform2x3 withScale: aPoint) compositeScale]. \ No newline at end of file + {1 @ 1 . 1 @ 2 . 2 @ 1 . -2 @ 1 . 1000 @ 5000 . 0 @ 1 . 0.45 @ 0.867} + do: [:aPoint | self assert: aPoint closeTo: (MatrixTransform2x3 withScale: aPoint) compositeScale] \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/testSkew.st b/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/testSkew.st index 84c035bb..a93a31f4 100644 --- a/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/testSkew.st +++ b/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/testSkew.st @@ -1,5 +1,5 @@ test ing - single testSkew - {0 . 1 . 30 . 89 . -1 . -30 . -80 } - do: [:anAngle | self assert: anAngle closeTo: (MatrixTransform2x3 withSkew: anAngle @ 0 ) compositeSkew]. \ No newline at end of file + {0 . 1 . 30 . 89 . -1 . -30 . -80} + do: [:anAngle | self assert: anAngle closeTo: (MatrixTransform2x3 withSkew: anAngle @ 0) compositeSkew] \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/testTranslate.st b/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/testTranslate.st index 85fa5ac2..00107b3a 100644 --- a/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/testTranslate.st +++ b/packages/Tests-SVG-Morphic.package/MatrixTransfomr2x3DecomposeTest.class/instance/testTranslate.st @@ -1,5 +1,5 @@ test ing - single testTranslate - { 1 @ 1 . 1 @ 2 . 2 @ 1 . -2 @ 1 . 1000 @ 5000 . 0 @ 1} - do: [:aPoint | self assert: aPoint closeTo: (MatrixTransform2x3 withOffset: aPoint) compositeTranslation]. \ No newline at end of file + {1 @ 1 . 1 @ 2 . 2 @ 1 . -2 @ 1 . 1000 @ 5000 . 0 @ 1} + do: [:aPoint | self assert: aPoint closeTo: (MatrixTransform2x3 withOffset: aPoint) compositeTranslation] \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/assertExportOf.toBe..st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/assertExportOf.toBe..st index 1bf782b9..39b2e291 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/assertExportOf.toBe..st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/assertExportOf.toBe..st @@ -1,10 +1,10 @@ assertions assertExportOf: anXMLString toBe: anotherXMLString - + |morph exportedString| morph := SVGMorph fromString: anXMLString. - - exportedString := SVGExporter new + + exportedString := SVGExporter new visitSVGMorph: morph; exportString. self assert: anotherXMLString equals: exportedString \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/atomTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/atomTestCase.st index 0f07be3f..9aca033c 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/atomTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/atomTestCase.st @@ -1,8 +1,8 @@ test cases atomTestCase - ^ SVGExportTestCase - for: + ^ SVGExportTestCase + for: ' @@ -17,5 +17,5 @@ atomTestCase ' - toBe: + toBe: '' \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/circleTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/circleTestCase.st index ce88a746..4ccd0b3b 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/circleTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/circleTestCase.st @@ -1,8 +1,8 @@ test cases circleTestCase - ^ SVGExportTestCase - for: + ^ SVGExportTestCase + for: ' ' diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/ellipseTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/ellipseTestCase.st index 7ad5a656..90d72cfb 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/ellipseTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/ellipseTestCase.st @@ -1,10 +1,10 @@ test cases ellipseTestCase - ^ SVGExportTestCase - for: + ^ SVGExportTestCase + for: ' ' - toBe: + toBe: '' \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/groupOrderTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/groupOrderTestCase.st index 20cda18c..8fe181fc 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/groupOrderTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/groupOrderTestCase.st @@ -1,7 +1,7 @@ test cases groupOrderTestCase - - ^ SVGExportTestCase + + ^ SVGExportTestCase for: ' @@ -9,5 +9,5 @@ groupOrderTestCase ' - toBe: + toBe: '' \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/groupTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/groupTestCase.st index 7a41fb1e..0fe21eb0 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/groupTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/groupTestCase.st @@ -1,12 +1,12 @@ test cases groupTestCase - ^SVGExportTestCase - for: + ^SVGExportTestCase + for: ' ' - toBe: + toBe: '' \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/idTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/idTestCase.st index 8521b98d..d3ed01fa 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/idTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/idTestCase.st @@ -1,7 +1,7 @@ test cases idTestCase - - ^ SVGExportTestCase + + ^ SVGExportTestCase for: '' toBe: diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/lineTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/lineTestCase.st index fa0dc19b..51389a85 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/lineTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/lineTestCase.st @@ -1,10 +1,10 @@ test cases lineTestCase - ^ SVGExportTestCase - for: + ^ SVGExportTestCase + for: ' ' - toBe: + toBe: '' \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/pathTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/pathTestCase.st index 04b775fe..8cc1d8ad 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/pathTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/pathTestCase.st @@ -1,8 +1,8 @@ test cases pathTestCase - ^ SVGExportTestCase - for: + ^ SVGExportTestCase + for: ' ' diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/polygonTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/polygonTestCase.st index 34bab560..4e118c71 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/polygonTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/polygonTestCase.st @@ -1,10 +1,10 @@ test cases polygonTestCase - ^ SVGExportTestCase - for: + ^ SVGExportTestCase + for: ' ' - toBe: + toBe: '' \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/polylineTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/polylineTestCase.st index ed801667..5058e5de 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/polylineTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/polylineTestCase.st @@ -1,10 +1,10 @@ test cases polylineTestCase - ^ SVGExportTestCase - for: + ^ SVGExportTestCase + for: ' ' - toBe: + toBe: '' \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/rectangleTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/rectangleTestCase.st index 953380a9..a122fdce 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/rectangleTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/rectangleTestCase.st @@ -1,10 +1,10 @@ test cases rectangleTestCase - ^ SVGExportTestCase + ^ SVGExportTestCase for: ' ' - toBe: + toBe: '' \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/rotatedRectangleTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/rotatedRectangleTestCase.st index c628ce97..c60a5a20 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/rotatedRectangleTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/rotatedRectangleTestCase.st @@ -1,10 +1,10 @@ test cases rotatedRectangleTestCase - ^ SVGExportTestCase + ^ SVGExportTestCase for: ' ' - toBe: + toBe: '' \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportAtom.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportAtom.st index e1b4355f..1821485c 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportAtom.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportAtom.st @@ -1,4 +1,4 @@ tests testExportAtom - + self assertTestCaseToBeCorrect: self atomTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportCircle.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportCircle.st index 2f4ff0c0..5b0fc8b4 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportCircle.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportCircle.st @@ -1,4 +1,4 @@ tests testExportCircle - + self assertTestCaseToBeCorrect: self circleTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportEllipse.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportEllipse.st index f07addce..3a3da629 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportEllipse.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportEllipse.st @@ -1,4 +1,4 @@ tests testExportEllipse - + self assertTestCaseToBeCorrect: self ellipseTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportGroups.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportGroups.st index 3c798498..929791fb 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportGroups.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportGroups.st @@ -1,4 +1,4 @@ tests testExportGroups - + self assertTestCaseToBeCorrect: self groupTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportGroupsInOrder.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportGroupsInOrder.st index a20d1bbb..9d401fc4 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportGroupsInOrder.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportGroupsInOrder.st @@ -1,4 +1,4 @@ tests testExportGroupsInOrder - + self assertTestCaseToBeCorrect: self groupOrderTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportHeightWidth.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportHeightWidth.st index bbc261be..7c43efc3 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportHeightWidth.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportHeightWidth.st @@ -1,4 +1,4 @@ tests testExportHeightWidth - + self assertTestCaseToBeCorrect: self widthHeightTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportId.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportId.st index a9dd500d..b6974192 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportId.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportId.st @@ -1,4 +1,4 @@ tests testExportId - + self assertTestCaseToBeCorrect: self idTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportLine.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportLine.st index d57a3de1..23b8d35e 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportLine.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportLine.st @@ -1,4 +1,4 @@ tests testExportLine - + self assertTestCaseToBeCorrect: self lineTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportPath.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportPath.st index ebe305fe..9c387a29 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportPath.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportPath.st @@ -1,4 +1,4 @@ tests testExportPath - + self assertTestCaseToBeCorrect: self pathTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportPolygon.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportPolygon.st index d6aee4d8..7178e71e 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportPolygon.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportPolygon.st @@ -1,4 +1,4 @@ tests testExportPolygon - + self assertTestCaseToBeCorrect: self polygonTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportPolyline.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportPolyline.st index 7caf5a89..49e10c71 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportPolyline.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportPolyline.st @@ -1,4 +1,4 @@ tests testExportPolyline - + self assertTestCaseToBeCorrect: self polylineTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportRectangle.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportRectangle.st index 307826be..91be7e67 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportRectangle.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportRectangle.st @@ -1,4 +1,4 @@ tests testExportRectangle - + self assertTestCaseToBeCorrect: self rectangleTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportRotation.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportRotation.st index be2ff064..b1bc2fcb 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportRotation.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportRotation.st @@ -1,4 +1,4 @@ tests testExportRotation - + self assertTestCaseToBeCorrect: self rotatedRectangleTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportRotationPoint.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportRotationPoint.st index e94916e4..82c0d540 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportRotationPoint.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportRotationPoint.st @@ -1,4 +1,4 @@ tests testExportRotationPoint - + self assertTestCaseToBeCorrect: self transformRotatePointTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportScaling.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportScaling.st index 86d36780..bbf3c249 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportScaling.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportScaling.st @@ -1,4 +1,4 @@ tests testExportScaling - + self assertTestCaseToBeCorrect: self transformScaleTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportSkewX.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportSkewX.st index 900f2491..d0a2b118 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportSkewX.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportSkewX.st @@ -1,4 +1,4 @@ tests testExportSkewX - + self assertTestCaseToBeCorrect: self transformSkewXTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportSkewY.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportSkewY.st index 293cc060..8fa23fdc 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportSkewY.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportSkewY.st @@ -1,4 +1,4 @@ tests testExportSkewY - + self assertTestCaseToBeCorrect: self transformSkewYTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportTSpan.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportTSpan.st index fd61ffb0..b3843b6c 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportTSpan.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportTSpan.st @@ -1,4 +1,4 @@ tests testExportTSpan - + self assertTestCaseToBeCorrect: self tspanTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportText.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportText.st index aa589572..cac1f67b 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportText.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportText.st @@ -1,4 +1,4 @@ tests testExportText - + self assertTestCaseToBeCorrect: self textTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportTranslation.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportTranslation.st index 7fc3122b..adebc982 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportTranslation.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportTranslation.st @@ -1,4 +1,4 @@ tests testExportTranslation - + self assertTestCaseToBeCorrect: self transformTranslateTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportViewBox.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportViewBox.st index deb8b492..57701897 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportViewBox.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testExportViewBox.st @@ -1,4 +1,4 @@ tests testExportViewBox - + self assertTestCaseToBeCorrect: self viewBoxTestCase \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testSerializePolygonalPoints.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testSerializePolygonalPoints.st index ceed6c89..47cbfd0e 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testSerializePolygonalPoints.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/testSerializePolygonalPoints.st @@ -3,12 +3,12 @@ testSerializePolygonalPoints |points serializedPoints| points := OrderedCollection new. - points + points add: 1 @ 2; add: 4 @ 5; add: -12000 @ 999; add: 1234 @ 5678. - + serializedPoints := SVGExporter new generatePointString: points. - + self assert: '1,2 4,5 -12000,999 1234,5678' equals: serializedPoints \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/textTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/textTestCase.st index a09c1328..f67ab362 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/textTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/textTestCase.st @@ -1,7 +1,7 @@ test cases textTestCase - ^ SVGExportTestCase + ^ SVGExportTestCase for: ' Test diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/transformRotatePointTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/transformRotatePointTestCase.st index d5da6054..5a4c7476 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/transformRotatePointTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/transformRotatePointTestCase.st @@ -1,10 +1,10 @@ test cases transformRotatePointTestCase - ^ SVGExportTestCase - for: + ^ SVGExportTestCase + for: ' ' - toBe: + toBe: '' \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/transformScaleTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/transformScaleTestCase.st index 02a233e4..0ff3618a 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/transformScaleTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/transformScaleTestCase.st @@ -1,7 +1,7 @@ test cases transformScaleTestCase - ^ SVGExportTestCase + ^ SVGExportTestCase for: ' diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/transformSkewXTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/transformSkewXTestCase.st index 0c6d70a5..cd55189d 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/transformSkewXTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/transformSkewXTestCase.st @@ -1,10 +1,10 @@ test cases transformSkewXTestCase - ^ SVGExportTestCase + ^ SVGExportTestCase for: ' ' - toBe: + toBe: '' \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/transformSkewYTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/transformSkewYTestCase.st index 4423d9a3..b84091af 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/transformSkewYTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/transformSkewYTestCase.st @@ -1,10 +1,10 @@ test cases transformSkewYTestCase - ^ SVGExportTestCase + ^ SVGExportTestCase for: ' ' - toBe: + toBe: '' \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/transformTranslateTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/transformTranslateTestCase.st index 855a8108..45706d41 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/transformTranslateTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/transformTranslateTestCase.st @@ -1,10 +1,10 @@ test cases transformTranslateTestCase - ^ SVGExportTestCase + ^ SVGExportTestCase for: ' ' - toBe: + toBe: '' \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/tspanTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/tspanTestCase.st index 3b806a31..88f4e35c 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/tspanTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/tspanTestCase.st @@ -1,7 +1,7 @@ test cases tspanTestCase - ^ SVGExportTestCase + ^ SVGExportTestCase for: ' diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/viewBoxTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/viewBoxTestCase.st index 8b614338..48cf522c 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/viewBoxTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/viewBoxTestCase.st @@ -1,6 +1,6 @@ test cases viewBoxTestCase - ^ SVGExportTestCase + ^ SVGExportTestCase for: '' toBe: '' \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/widthHeightTestCase.st b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/widthHeightTestCase.st index 7578a7d2..9c00c910 100644 --- a/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/widthHeightTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGExportTest.class/instance/widthHeightTestCase.st @@ -1,6 +1,6 @@ test cases widthHeightTestCase - ^ SVGExportTestCase + ^ SVGExportTestCase for: '' toBe: '' \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/addRenderer.on..st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/addRenderer.on..st index 3278394a..ce1aff27 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/addRenderer.on..st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/addRenderer.on..st @@ -1,4 +1,4 @@ testing - rendering addRenderer: aSVGRenderer on: aSVGComponentClass - (self subject findByClass: aSVGComponentClass) renderer: aSVGRenderer. \ No newline at end of file + (self subject findByClass: aSVGComponentClass) renderer: aSVGRenderer \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/expectedFailures.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/expectedFailures.st index db216902..c1be4032 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/expectedFailures.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/expectedFailures.st @@ -1,5 +1,5 @@ testing - printing expectedFailures - + "Bounds calculation is broken in the current version, to allow for a CI that tests everything else, these tests have been marked as invalid" ^ #(#testSVGCircleBounds #testSVGGroup) \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/render..st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/render..st index 123d7496..228c7e09 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/render..st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/render..st @@ -1,4 +1,4 @@ testing - rendering render: aSVGComponentClass - (self subject findByClass: aSVGComponentClass) drawOn: PluggableCanvas new. \ No newline at end of file + (self subject findByClass: aSVGComponentClass) drawOn: PluggableCanvas new \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/submorphBoundsOf..st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/submorphBoundsOf..st index c940a88f..70c092a3 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/submorphBoundsOf..st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/submorphBoundsOf..st @@ -1,8 +1,7 @@ testing - properties submorphBoundsOf: aMorph - ^ ((aMorph submorphs collect: [ :submorph | submorph bounds origin x]) asSortedArray first) @ - ((aMorph submorphs collect: [ :submorph | submorph bounds origin y]) asSortedArray first) - corner: ((aMorph submorphs collect: [ :submorph | submorph bounds corner x]) asSortedArray last) @ - ((aMorph submorphs collect: [ :submorph | submorph bounds corner y]) asSortedArray last). - \ No newline at end of file + ^ ((aMorph submorphs collect: [:submorph | submorph bounds origin x]) asSortedArray first) @ + ((aMorph submorphs collect: [:submorph | submorph bounds origin y]) asSortedArray first) + corner: ((aMorph submorphs collect: [:submorph | submorph bounds corner x]) asSortedArray last) @ + ((aMorph submorphs collect: [:submorph | submorph bounds corner y]) asSortedArray last) diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testDisplayNameBasic.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testDisplayNameBasic.st index 633986e2..f0557757 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testDisplayNameBasic.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testDisplayNameBasic.st @@ -1,8 +1,8 @@ testing - printing testDisplayNameBasic - | rectangle | + |rectangle| self wantsToTestRectangle. - + rectangle := self subject findByClass: SVGRectMorph. self assert: 'Rectangle' equals: (rectangle displayName) \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testDisplayNameOfTSpan.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testDisplayNameOfTSpan.st index 2747642a..b5f6441e 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testDisplayNameOfTSpan.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testDisplayNameOfTSpan.st @@ -1,8 +1,8 @@ testing - printing testDisplayNameOfTSpan - | text | + |text| self wantsToTestTSpan. - + text := self subject findByClass: SVGTSpanMorph. self assert: 'TSpan ("not")' equals: (text displayName) \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testDisplayNameOfText.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testDisplayNameOfText.st index 88587d73..b5e1fd88 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testDisplayNameOfText.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testDisplayNameOfText.st @@ -1,8 +1,8 @@ testing - printing testDisplayNameOfText - | text | + |text| self wantsToTestText. - + text := self subject findByClass: SVGTextMorph. self assert: 'Text ("Test")' equals: (text displayName) \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testDisplayNameWithId.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testDisplayNameWithId.st index a141b731..6be0d7cc 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testDisplayNameWithId.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testDisplayNameWithId.st @@ -1,8 +1,8 @@ testing - printing testDisplayNameWithId - | circle | + |circle| self wantsToTestCircle. - + circle := self subject findByClass: SVGCircleMorph. self assert: 'Circle #TestCircle' equals: (circle displayName) \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGCircleBounds.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGCircleBounds.st index 17cf3205..b6d30023 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGCircleBounds.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGCircleBounds.st @@ -1,12 +1,12 @@ testing - properties testSVGCircleBounds - | bounds | - + |bounds| + self wantsToTestCircle. bounds := (self subject findByClass: SVGCircleMorph) bounds. self assert: -30 equals: bounds origin x; assert: -20 equals: bounds origin y ; assert: 90 equals: bounds corner x ; - assert: 100 equals: bounds corner y. \ No newline at end of file + assert: 100 equals: bounds corner y \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGCircleExists.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGCircleExists.st index 638c284f..ace657b7 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGCircleExists.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGCircleExists.st @@ -1,8 +1,8 @@ testing - existence testSVGCircleExists - | circle | + |circle| self wantsToTestCircle. - + circle := self subject findByClass: SVGCircleMorph. self deny: circle morphs isEmpty \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGCircleRectangle.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGCircleRectangle.st index a54460fc..7848a0cc 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGCircleRectangle.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGCircleRectangle.st @@ -1,12 +1,12 @@ testing - properties testSVGCircleRectangle - | rectangle | - + |rectangle| + self wantsToTestCircle. rectangle := (self subject findByClass: SVGCircleMorph) rectangle. self assert: -30 equals: rectangle origin x; assert: -20 equals: rectangle origin y; assert: 90 equals: rectangle corner x; - assert: 100 equals: rectangle corner y. \ No newline at end of file + assert: 100 equals: rectangle corner y \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGCircleRendering.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGCircleRendering.st index ed21583a..c02dc795 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGCircleRendering.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGCircleRendering.st @@ -1,14 +1,13 @@ testing - rendering testSVGCircleRendering - | renderer | - + |renderer| + renderer := SVGRendererMock new. - self + self wantsToTestCircle; addRenderer: renderer on: SVGCircleMorph; render: SVGCircleMorph; assert: (renderer renderCount at: #renderEllipse ifAbsent: 0) equals: 1. - - \ No newline at end of file + diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGEllipseBounds.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGEllipseBounds.st index 51ef587e..63b4cf44 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGEllipseBounds.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGEllipseBounds.st @@ -1,12 +1,12 @@ testing - properties testSVGEllipseBounds - | bounds | - + |bounds| + self wantsToTestEllipse. bounds := (self subject findByClass: SVGEllipseMorph) bounds. self assert: 80 equals: bounds origin x; assert: 70 equals: bounds origin y ; assert: 120 equals: bounds corner x ; - assert: 170 equals: bounds corner y. \ No newline at end of file + assert: 170 equals: bounds corner y \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGEllipseExists.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGEllipseExists.st index 2deaa96d..67d0ea3b 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGEllipseExists.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGEllipseExists.st @@ -1,8 +1,8 @@ testing - existence testSVGEllipseExists - | ellipse | + |ellipse| self wantsToTestEllipse. - + ellipse := self subject findByClass: SVGEllipseMorph. self deny: ellipse morphs isEmpty \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGEllipseRectangle.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGEllipseRectangle.st index fd19fe26..0ea5ff53 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGEllipseRectangle.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGEllipseRectangle.st @@ -1,12 +1,12 @@ testing - properties testSVGEllipseRectangle - | rectangle | - + |rectangle| + self wantsToTestEllipse. rectangle := (self subject findByClass: SVGEllipseMorph) rectangle. self assert: 80 equals: rectangle origin x; assert: 70 equals: rectangle origin y; assert: 120 equals: rectangle corner x; - assert: 170 equals: rectangle corner y. \ No newline at end of file + assert: 170 equals: rectangle corner y \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGEllipseRendering.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGEllipseRendering.st index 0637a420..c3f7addb 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGEllipseRendering.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGEllipseRendering.st @@ -1,14 +1,13 @@ testing - rendering testSVGEllipseRendering - | renderer | - + |renderer| + renderer := SVGRendererMock new. - self + self wantsToTestEllipse; addRenderer: renderer on: SVGEllipseMorph; render: SVGEllipseMorph; assert: (renderer renderCount at: #renderEllipse ifAbsent: 0) equals: 1. - - \ No newline at end of file + diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGGroup.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGGroup.st index 1b316b32..6ffad3b2 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGGroup.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGGroup.st @@ -2,15 +2,14 @@ testing - properties testSVGGroup | bounds morph submorphBounds | - + self wantsToTestGroup. morph := self subject findByClass: SVGGroupMorph. bounds := morph bounds. submorphBounds := self submorphBoundsOf: morph. - + self assert: submorphBounds origin x equals: bounds origin x; assert: submorphBounds origin y equals: bounds origin y ; assert: submorphBounds corner x equals: bounds corner x ; - assert: submorphBounds corner y equals: bounds corner y. - \ No newline at end of file + assert: submorphBounds corner y equals: bounds corner y diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGGroupExists.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGGroupExists.st index fe7e86ba..ddc609b4 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGGroupExists.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGGroupExists.st @@ -1,8 +1,8 @@ testing - existence testSVGGroupExists - | group | + |group| self wantsToTestGroup. - + group := self subject findByClass: SVGGroupMorph. self deny: group morphs isEmpty \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGLineBounds.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGLineBounds.st index 988e180c..cc832616 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGLineBounds.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGLineBounds.st @@ -1,12 +1,12 @@ testing - properties testSVGLineBounds - | bounds | - + |bounds| + self wantsToTestLine. bounds := (self subject findByClass: SVGLineMorph) bounds. self assert: 20 equals: bounds origin x; assert: 30 equals: bounds origin y ; assert: 100 equals: bounds corner x ; - assert: 170 equals: bounds corner y. \ No newline at end of file + assert: 170 equals: bounds corner y \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGLineExists.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGLineExists.st index bc2ef9ef..a0b87d2a 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGLineExists.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGLineExists.st @@ -1,8 +1,8 @@ testing - existence testSVGLineExists - | line | + |line| self wantsToTestLine. - + line := self subject findByClass: SVGLineMorph. self deny: line morphs isEmpty \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGLineRectangle.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGLineRectangle.st index 08117a4d..43129fd7 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGLineRectangle.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGLineRectangle.st @@ -1,12 +1,12 @@ testing - properties testSVGLineRectangle - | rectangle | - + |rectangle| + self wantsToTestLine. rectangle := (self subject findByClass: SVGLineMorph) rectangle. self assert: 20 equals: rectangle origin x; assert: 30 equals: rectangle origin y ; assert: 100 equals: rectangle corner x ; - assert: 170 equals: rectangle corner y. \ No newline at end of file + assert: 170 equals: rectangle corner y \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGLineRendering.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGLineRendering.st index ae05b8cb..62ed6734 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGLineRendering.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGLineRendering.st @@ -1,14 +1,13 @@ testing - rendering testSVGLineRendering - | renderer | - + |renderer| + renderer := SVGRendererMock new. - self + self wantsToTestLine; addRenderer: renderer on: SVGLineMorph; render: SVGLineMorph; assert: (renderer renderCount at: #renderLine ifAbsent: 0) equals: 1. - - \ No newline at end of file + diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPathExists.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPathExists.st index 3275bf64..c2367233 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPathExists.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPathExists.st @@ -1,8 +1,8 @@ testing - existence testSVGPathExists - | path | + |path| self wantsToTestPath. - + path := self subject findByClass: SVGPathMorph. self deny: path morphs isEmpty \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPathRendering.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPathRendering.st index 86ce1050..b610af6a 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPathRendering.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPathRendering.st @@ -1,14 +1,13 @@ testing - rendering testSVGPathRendering - | renderer | - + |renderer| + renderer := SVGRendererMock new. - self + self wantsToTestPath; addRenderer: renderer on: SVGPathMorph; render: SVGPathMorph; assert: (renderer renderCount at: #renderPath ifAbsent: 0) equals: 1. - - \ No newline at end of file + diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPolygonExists.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPolygonExists.st index 1ac2c207..51be1c33 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPolygonExists.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPolygonExists.st @@ -1,8 +1,8 @@ testing - existence testSVGPolygonExists - | polygon | + |polygon| self wantsToTestPolygon. - + polygon := self subject findByClass: SVGPolygonMorph. self deny: polygon morphs isEmpty \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPolygonRendering.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPolygonRendering.st index 122efef0..3a4d4814 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPolygonRendering.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPolygonRendering.st @@ -1,14 +1,13 @@ testing - rendering testSVGPolygonRendering - | renderer | - + |renderer| + renderer := SVGRendererMock new. - self + self wantsToTestPolygon; addRenderer: renderer on: SVGPolygonMorph; render: SVGPolygonMorph; assert: (renderer renderCount at: #renderPolygon ifAbsent: 0) equals: 1. - - \ No newline at end of file + diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPolylineExists.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPolylineExists.st index 885ad661..82df574d 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPolylineExists.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPolylineExists.st @@ -1,8 +1,8 @@ testing - existence testSVGPolylineExists - | polyline | + |polyline| self wantsToTestPolyline. - + polyline := self subject findByClass: SVGPolylineMorph. self deny: polyline morphs isEmpty \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPolylineRendering.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPolylineRendering.st index ea411219..9002dc30 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPolylineRendering.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGPolylineRendering.st @@ -1,14 +1,13 @@ testing - rendering testSVGPolylineRendering - | renderer | - + |renderer| + renderer := SVGRendererMock new. - self + self wantsToTestPolyline; addRenderer: renderer on: SVGPolylineMorph; render: SVGPolylineMorph; assert: (renderer renderCount at: #renderPolyline ifAbsent: 0) equals: 1. - - \ No newline at end of file + diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGRectangleBounds.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGRectangleBounds.st index 60a11cba..4cb2c5c8 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGRectangleBounds.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGRectangleBounds.st @@ -1,12 +1,12 @@ testing - properties testSVGRectangleBounds - | bounds | - + |bounds| + self wantsToTestRectangle. bounds := (self subject findByClass: SVGRectMorph) bounds. self assert: 50 equals: bounds origin x; assert: 50 equals: bounds origin y ; assert: 80 equals: bounds corner x ; - assert: 90 equals: bounds corner y. \ No newline at end of file + assert: 90 equals: bounds corner y \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGRectangleExists.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGRectangleExists.st index ab4ead32..074e25ba 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGRectangleExists.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGRectangleExists.st @@ -1,8 +1,8 @@ testing - existence testSVGRectangleExists - | rectangle | + |rectangle| self wantsToTestRectangle. - + rectangle := self subject findByClass: SVGRectMorph. self deny: rectangle morphs isEmpty \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGRectangleRectangle.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGRectangleRectangle.st index 670a3df9..fd1c5033 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGRectangleRectangle.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGRectangleRectangle.st @@ -1,12 +1,12 @@ testing - properties testSVGRectangleRectangle - | rectangle | - + |rectangle| + self wantsToTestRectangle. rectangle := (self subject findByClass: SVGRectMorph) rectangle. self assert: 50 equals: rectangle origin x; assert: 50 equals: rectangle origin y ; assert: 80 equals: rectangle corner x ; - assert: 90 equals: rectangle corner y. \ No newline at end of file + assert: 90 equals: rectangle corner y \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGRectangleRendering.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGRectangleRendering.st index 58766528..f56234f6 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGRectangleRendering.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGRectangleRendering.st @@ -1,14 +1,13 @@ testing - rendering testSVGRectangleRendering - | renderer | - + |renderer| + renderer := SVGRendererMock new. - self + self wantsToTestRectangle; addRenderer: renderer on: SVGRectMorph; render: SVGRectMorph; assert: (renderer renderCount at: #renderRect ifAbsent: 0) equals: 1. - - \ No newline at end of file + diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGTSpanExists.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGTSpanExists.st index 2baf756d..e4155979 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGTSpanExists.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGTSpanExists.st @@ -1,8 +1,8 @@ testing - existence testSVGTSpanExists - | tSpan | + |tSpan| self wantsToTestTSpan. - + tSpan := self subject findByClass: SVGTSpanMorph. self deny: tSpan morphs isEmpty \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGTSpanRendering.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGTSpanRendering.st index 2f48ff54..47f58d4f 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGTSpanRendering.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGTSpanRendering.st @@ -1,14 +1,13 @@ testing - rendering testSVGTSpanRendering - | renderer | - + |renderer| + renderer := SVGRendererMock new. - self + self wantsToTestTSpan; addRenderer: renderer on: SVGTSpanMorph; render: SVGTSpanMorph; assert: (renderer renderCount at: #renderText ifAbsent: 0) equals: 1. - - \ No newline at end of file + diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGTextExists.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGTextExists.st index 4225291c..8371789c 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGTextExists.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGTextExists.st @@ -1,8 +1,8 @@ testing - existence testSVGTextExists - | text | + |text| self wantsToTestText. - + text := self subject findByClass: SVGTextMorph. self deny: text morphs isEmpty \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGTextRendering.st b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGTextRendering.st index 25927f09..9ab10aee 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGTextRendering.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTest.class/instance/testSVGTextRendering.st @@ -1,14 +1,13 @@ testing - rendering testSVGTextRendering - | renderer | - + |renderer| + renderer := SVGRendererMock new. - self + self wantsToTestText; addRenderer: renderer on: SVGTextMorph; render: SVGTextMorph; assert: (renderer renderCount at: #renderText ifAbsent: 0) equals: 1. - - \ No newline at end of file + diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/idSVG.st b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/idSVG.st index ca7aeaa0..270f3fa6 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/idSVG.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/idSVG.st @@ -1,4 +1,4 @@ SVGTestMorphs idSVG - + ^ '' \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/idTestCase.st b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/idTestCase.st index dc6876df..a63f293b 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/idTestCase.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/idTestCase.st @@ -1,4 +1,4 @@ SVGTestMorphs idTestCase - + ^ '' \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testBoundsNegativeViewBox.st b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testBoundsNegativeViewBox.st index b7b7b7c2..a1802d02 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testBoundsNegativeViewBox.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testBoundsNegativeViewBox.st @@ -2,4 +2,4 @@ width, height, viewBox parsing testBoundsNegativeViewBox |sv| sv := SVGMorph fromString: self negativeViewBoxSVG. - self assert: (Rectangle origin: ( -200 @ -50) extent: 100 @ 100) equals: sv bounds. \ No newline at end of file + self assert: (Rectangle origin: (-200 @ -50) extent: 100 @ 100) equals: sv bounds \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testFillIn.with..st b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testFillIn.with..st index 75f96262..897631a2 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testFillIn.with..st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testFillIn.with..st @@ -1,4 +1,4 @@ SVG colors (fill, stroke, width) testFillIn: aSVGMorph with: aColor -^self testColorIn: aSVGMorph with: aColor at: 'fill'. \ No newline at end of file +^self testColorIn: aSVGMorph with: aColor at: 'fill' \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForBlackStroke.st b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForBlackStroke.st index 1f6f60cf..35962eb8 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForBlackStroke.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForBlackStroke.st @@ -3,5 +3,5 @@ testForBlackStroke |blackStrokeObjects blackStrokeMorphs| blackStrokeObjects := self blackStrokeObjects. -blackStrokeMorphs := blackStrokeObjects collect: [ :aSVGMorph| (SVGMorph fromString: (self perform: aSVGMorph)) submorphs first]. -^blackStrokeMorphs do: [ :aSVGMorph| self testStrokeIn: aSVGMorph with: Color black.]. \ No newline at end of file +blackStrokeMorphs := blackStrokeObjects collect: [:aSVGMorph| (SVGMorph fromString: (self perform: aSVGMorph)) submorphs first]. +^blackStrokeMorphs do: [:aSVGMorph| self testStrokeIn: aSVGMorph with: Color black] \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForBlackStrokeWidth.st b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForBlackStrokeWidth.st index f605aeb7..5d42df95 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForBlackStrokeWidth.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForBlackStrokeWidth.st @@ -3,5 +3,5 @@ testForBlackStrokeWidth |blackStrokeObjects blackStrokeMorphs| blackStrokeObjects := self blackStrokeObjects. -blackStrokeMorphs := blackStrokeObjects collect: [ :aSVGMorph| (SVGMorph fromString: (self perform: aSVGMorph)) submorphs first]. -^blackStrokeMorphs do: [ :aSVGMorph| self testStrokeWidth: aSVGMorph with: 5.]. \ No newline at end of file +blackStrokeMorphs := blackStrokeObjects collect: [:aSVGMorph| (SVGMorph fromString: (self perform: aSVGMorph)) submorphs first]. +^blackStrokeMorphs do: [:aSVGMorph| self testStrokeWidth: aSVGMorph with: 5] \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForBlueFill.st b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForBlueFill.st index 40a0a977..77ef40ae 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForBlueFill.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForBlueFill.st @@ -3,6 +3,6 @@ testForBlueFill |blueFillObjects blueFillMorphs| blueFillObjects := self blueFillObjects. -blueFillMorphs := blueFillObjects collect: [ :aSVGMorph| (SVGMorph fromString: (self perform: aSVGMorph)) submorphs first]. -^blueFillMorphs do: [ :aSVGMorph| self testFillIn: aSVGMorph with: Color blue.]. +blueFillMorphs := blueFillObjects collect: [:aSVGMorph| (SVGMorph fromString: (self perform: aSVGMorph)) submorphs first]. +^blueFillMorphs do: [:aSVGMorph| self testFillIn: aSVGMorph with: Color blue]. diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForBrownStroke.st b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForBrownStroke.st index 1a81ec96..19a40460 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForBrownStroke.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForBrownStroke.st @@ -4,5 +4,5 @@ testForBrownStroke |brownStrokeobjects brownStrokeMorphs| brownStrokeobjects := self brownStrokeObjects. -brownStrokeMorphs := brownStrokeobjects collect: [ :aSVGMorph| (SVGMorph fromString: (self perform: aSVGMorph)) submorphs first]. -^brownStrokeMorphs do: [ :aSVGMorph| self testStrokeIn: aSVGMorph with: (Color r: 0.647 g: 0.164 b: 0.164).]. \ No newline at end of file +brownStrokeMorphs := brownStrokeobjects collect: [:aSVGMorph| (SVGMorph fromString: (self perform: aSVGMorph)) submorphs first]. +^brownStrokeMorphs do: [:aSVGMorph| self testStrokeIn: aSVGMorph with: (Color r: 0.647 g: 0.164 b: 0.164)] \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForBrownStrokeWidth.st b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForBrownStrokeWidth.st index 5b15f884..30d5d691 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForBrownStrokeWidth.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForBrownStrokeWidth.st @@ -3,5 +3,5 @@ testForBrownStrokeWidth |brownStrokeObjects brownStrokeMorphs| brownStrokeObjects := self brownStrokeObjects. -brownStrokeMorphs := brownStrokeObjects collect: [ :aSVGMorph| (SVGMorph fromString: (self perform: aSVGMorph)) submorphs first]. -^brownStrokeMorphs do: [ :aSVGMorph| self testStrokeWidth: aSVGMorph with: 50.]. \ No newline at end of file +brownStrokeMorphs := brownStrokeObjects collect: [:aSVGMorph| (SVGMorph fromString: (self perform: aSVGMorph)) submorphs first]. +^brownStrokeMorphs do: [:aSVGMorph| self testStrokeWidth: aSVGMorph with: 50] \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForOrangeStroke.st b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForOrangeStroke.st index 2c661d8e..b7f9e744 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForOrangeStroke.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForOrangeStroke.st @@ -4,5 +4,5 @@ testForOrangeStroke |orangeStrokeObjects orangeStrokeMorphs| orangeStrokeObjects := self orangeStrokeObjects. -orangeStrokeMorphs := orangeStrokeObjects collect: [ :aSVGMorph| (SVGMorph fromString: (self perform: aSVGMorph)) submorphs first]. -^orangeStrokeMorphs do: [ :aSVGMorph| self testStrokeIn: aSVGMorph with: (Color r: 1 g: 0.647 b: 0.0).]. \ No newline at end of file +orangeStrokeMorphs := orangeStrokeObjects collect: [:aSVGMorph| (SVGMorph fromString: (self perform: aSVGMorph)) submorphs first]. +^orangeStrokeMorphs do: [:aSVGMorph| self testStrokeIn: aSVGMorph with: (Color r: 1 g: 0.647 b: 0.0)] \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForOrangeStrokeWidth.st b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForOrangeStrokeWidth.st index 5336498f..84239c8f 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForOrangeStrokeWidth.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForOrangeStrokeWidth.st @@ -3,5 +3,5 @@ testForOrangeStrokeWidth |orangeStrokeObjects orangeStrokeMorphs| orangeStrokeObjects := self orangeStrokeObjects. -orangeStrokeMorphs := orangeStrokeObjects collect: [ :aSVGMorph| (SVGMorph fromString: (self perform: aSVGMorph)) submorphs first]. -^orangeStrokeMorphs do: [ :aSVGMorph| self testStrokeWidth: aSVGMorph with: 10.]. \ No newline at end of file +orangeStrokeMorphs := orangeStrokeObjects collect: [:aSVGMorph| (SVGMorph fromString: (self perform: aSVGMorph)) submorphs first]. +^orangeStrokeMorphs do: [:aSVGMorph| self testStrokeWidth: aSVGMorph with: 10] \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForRedFill.st b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForRedFill.st index 5760d27e..4ce75cf2 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForRedFill.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForRedFill.st @@ -3,5 +3,5 @@ testForRedFill |redFillObjects redFillMorphs| redFillObjects := self redFillObjects. -redFillMorphs:= redFillObjects collect: [ :aSVGMorph| (SVGMorph fromString: (self perform: aSVGMorph)) submorphs first]. -^redFillMorphs do: [ :aSVGMorph| self testFillIn: aSVGMorph with: Color red]. \ No newline at end of file +redFillMorphs:= redFillObjects collect: [:aSVGMorph| (SVGMorph fromString: (self perform: aSVGMorph)) submorphs first]. +^redFillMorphs do: [:aSVGMorph| self testFillIn: aSVGMorph with: Color red] \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForTransparentFill.st b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForTransparentFill.st index 22c6d8c8..5cf78c79 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForTransparentFill.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testForTransparentFill.st @@ -3,5 +3,5 @@ testForTransparentFill |transparentFillObjects transparentFillMorphs| transparentFillObjects := self transparentFillObjects. -transparentFillMorphs := transparentFillObjects collect: [ :aSVGMorph| (SVGMorph fromString: (self perform: aSVGMorph)) submorphs first]. -^transparentFillMorphs do: [ :aSVGMorph| self testFillIn: aSVGMorph with: Color transparent.]. \ No newline at end of file +transparentFillMorphs := transparentFillObjects collect: [:aSVGMorph| (SVGMorph fromString: (self perform: aSVGMorph)) submorphs first]. +^transparentFillMorphs do: [:aSVGMorph| self testFillIn: aSVGMorph with: Color transparent] \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testPercentageHeight.st b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testPercentageHeight.st index a6e4e2b7..37b155b5 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testPercentageHeight.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testPercentageHeight.st @@ -2,4 +2,4 @@ width, height, viewBox parsing testPercentageHeight |sv| sv := SVGMorph fromString: self percentageHeight. - self assert: 10 equals: sv height. \ No newline at end of file + self assert: 10 equals: sv height \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testPercentageWidth.st b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testPercentageWidth.st index 5ba95a4d..aa56024f 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testPercentageWidth.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testPercentageWidth.st @@ -2,4 +2,4 @@ width, height, viewBox parsing testPercentageWidth |sv| sv := SVGMorph fromString: self percentageWidth. - self assert: 80 equals: sv width. \ No newline at end of file + self assert: 80 equals: sv width \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testSVGValue.at.against..st b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testSVGValue.at.against..st index 0d151143..644a6cb8 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testSVGValue.at.against..st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testSVGValue.at.against..st @@ -1,5 +1,4 @@ SVG colors (fill, stroke, width) testSVGValue: aSVGMorph at: aSVGMorphAttribute against: anotherValue -^self assert: (aSVGMorph composedStyle at: aSVGMorphAttribute) equals: anotherValue. - \ No newline at end of file +^self assert: (aSVGMorph composedStyle at: aSVGMorphAttribute) equals: anotherValue diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testStrokeIn.with..st b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testStrokeIn.with..st index 38ff0535..27b2487c 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testStrokeIn.with..st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testStrokeIn.with..st @@ -1,4 +1,4 @@ SVG colors (fill, stroke, width) testStrokeIn: aSVGMorph with: aColor -^self testColorIn: aSVGMorph with: aColor at: 'stroke'. \ No newline at end of file +^self testColorIn: aSVGMorph with: aColor at: 'stroke' \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testStrokeWidth.with..st b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testStrokeWidth.with..st index 0e91f3ac..926071e4 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testStrokeWidth.with..st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testStrokeWidth.with..st @@ -1,4 +1,4 @@ SVG colors (fill, stroke, width) testStrokeWidth: aSVGMorph with: aStrokeWidth - ^self testSVGValue: aSVGMorph at: 'stroke-width' against: aStrokeWidth. \ No newline at end of file + ^self testSVGValue: aSVGMorph at: 'stroke-width' against: aStrokeWidth \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testWidthHeightEmptySVG.st b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testWidthHeightEmptySVG.st index c8d5ab08..88823b28 100644 --- a/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testWidthHeightEmptySVG.st +++ b/packages/Tests-SVG-Morphic.package/SVGMorphTests.class/instance/testWidthHeightEmptySVG.st @@ -2,5 +2,4 @@ width, height, viewBox parsing testWidthHeightEmptySVG |svgMorph| svgMorph :=SVGMorph fromString: self emptySVG. - self assert: (Rectangle origin: 0@0 corner: 300 @ 150) equals: svgMorph bounds. - \ No newline at end of file + self assert: (Rectangle origin: 0 @ 0 corner: 300 @ 150) equals: svgMorph bounds diff --git a/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/initialize.st b/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/initialize.st index 0dc6e58f..dfbc0dd7 100644 --- a/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/initialize.st +++ b/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/initialize.st @@ -2,4 +2,4 @@ initialize-release initialize super initialize. - self renderCount: Dictionary new. \ No newline at end of file + self renderCount: Dictionary new \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderCircle.on..st b/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderCircle.on..st index 733d95cb..423a4bc6 100644 --- a/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderCircle.on..st +++ b/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderCircle.on..st @@ -1,4 +1,4 @@ as yet unclassified renderCircle: anSVGLine on: aCanvas - self increment: #renderCircle. \ No newline at end of file + self increment: #renderCircle \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderEllipse.on..st b/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderEllipse.on..st index 155004ac..afee1e1d 100644 --- a/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderEllipse.on..st +++ b/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderEllipse.on..st @@ -1,4 +1,4 @@ as yet unclassified renderEllipse: anSVGEllipse on: aCanvas - self increment: #renderEllipse. \ No newline at end of file + self increment: #renderEllipse \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderLine.on..st b/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderLine.on..st index 116e0afd..edbbc49f 100644 --- a/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderLine.on..st +++ b/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderLine.on..st @@ -1,4 +1,4 @@ as yet unclassified renderLine: anSVGLine on: aCanvas - self increment: #renderLine. \ No newline at end of file + self increment: #renderLine \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderPath.on..st b/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderPath.on..st index 3e17f41f..59f46022 100644 --- a/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderPath.on..st +++ b/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderPath.on..st @@ -1,4 +1,4 @@ as yet unclassified renderPath: anSVGPath on: aCanvas - self increment: #renderPath. \ No newline at end of file + self increment: #renderPath \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderPolygon.on..st b/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderPolygon.on..st index e7ba9b93..87095ca7 100644 --- a/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderPolygon.on..st +++ b/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderPolygon.on..st @@ -1,4 +1,4 @@ as yet unclassified renderPolygon: anSVGPolygon on: aCanvas - self increment: #renderPolygon. \ No newline at end of file + self increment: #renderPolygon \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderPolyline.on..st b/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderPolyline.on..st index 5a5a697c..1fe1aeff 100644 --- a/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderPolyline.on..st +++ b/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderPolyline.on..st @@ -1,4 +1,4 @@ as yet unclassified renderPolyline: anSVGPolyine on: aCanvas - - self increment: #renderPolyline. \ No newline at end of file + + self increment: #renderPolyline \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderRect.on..st b/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderRect.on..st index 70cf49c7..81025157 100644 --- a/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderRect.on..st +++ b/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderRect.on..st @@ -1,4 +1,4 @@ as yet unclassified renderRect: anSVGRect on: aCanvas - - self increment: #renderRect. \ No newline at end of file + + self increment: #renderRect \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderTSpan.on..st b/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderTSpan.on..st index 063eff6f..3cf59e52 100644 --- a/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderTSpan.on..st +++ b/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderTSpan.on..st @@ -1,4 +1,4 @@ as yet unclassified renderTSpan: anSVGTSpan on: aCanvas - self increment: #renderTSpan. \ No newline at end of file + self increment: #renderTSpan \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderText.on..st b/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderText.on..st index cb6fe8db..dc93e9cd 100644 --- a/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderText.on..st +++ b/packages/Tests-SVG-Morphic.package/SVGRendererMock.class/instance/renderText.on..st @@ -1,4 +1,4 @@ as yet unclassified renderText: anSVGText on: aCanvas - - self increment: #renderText. \ No newline at end of file + + self increment: #renderText \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/defaultFontSize.st b/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/defaultFontSize.st index 3e38eef1..149d0bfc 100644 --- a/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/defaultFontSize.st +++ b/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/defaultFontSize.st @@ -1,4 +1,4 @@ textSize defaultFontSize - + ^ 16 \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testDefaultFont.st b/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testDefaultFont.st index b9414d9a..04f32eec 100644 --- a/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testDefaultFont.st +++ b/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testDefaultFont.st @@ -2,4 +2,4 @@ defaultFont testDefaultFont self assert: TextStyle defaultSVGFont isTTCFont. - self assert: self defaultFont equals: TextStyle defaultSVGFont ttcDescription familyName. \ No newline at end of file + self assert: self defaultFont equals: TextStyle defaultSVGFont ttcDescription familyName \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testDefaultFontInSVGText.st b/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testDefaultFontInSVGText.st index 42438224..f7568b37 100644 --- a/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testDefaultFontInSVGText.st +++ b/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testDefaultFontInSVGText.st @@ -1,8 +1,8 @@ defaultFont testDefaultFontInSVGText - | svgTextMorph | - + |svgTextMorph| + svgTextMorph := SVGMorph fromString: self basicTextSVG. - self assert: self defaultFont equals: svgTextMorph submorphs first fontToUse ttcDescription familyName . \ No newline at end of file + self assert: self defaultFont equals: svgTextMorph submorphs first fontToUse ttcDescription familyName \ No newline at end of file diff --git a/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testTextColor.st b/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testTextColor.st index 119f9ecb..0aa275da 100644 --- a/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testTextColor.st +++ b/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testTextColor.st @@ -2,8 +2,8 @@ defaultColor testTextColor | svgTextMorph expectedColors | - + svgTextMorph := SVGMorph fromString: self basicColorTextSVG. - expectedColors := OrderedCollection newFrom: {'#29A700'. 'red'. 'black'. self defaultColor.}. - + expectedColors := OrderedCollection newFrom: {'#29A700'. 'red'. 'black'. self defaultColor}. + (1 to: 4) do: [:i | self assert: (Color fromString: (expectedColors at: i)) equals: ((svgTextMorph submorphs at: i) composedStyle at: 'fill')] diff --git a/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testTextScaling.st b/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testTextScaling.st index a8b88e7d..732b6281 100644 --- a/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testTextScaling.st +++ b/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testTextScaling.st @@ -2,11 +2,10 @@ scaledText testTextScaling | svgTextMorph expectedSizes | - + svgTextMorph := SVGMorph fromString: self scalingTextSVG. - + expectedSizes := OrderedCollection newFrom: {21. 20. 1. 1. 100. 10}. - + (1 to: 6) do: [:i | self assert: (expectedSizes at: i) equals: (svgTextMorph submorphs at: i) fontToUse pointSize] - - \ No newline at end of file + diff --git a/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testTextSize.st b/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testTextSize.st index 6e10d108..3fd55c3b 100644 --- a/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testTextSize.st +++ b/packages/Tests-SVG-Morphic.package/SVGTextMorphTests.class/instance/testTextSize.st @@ -2,10 +2,9 @@ textSize testTextSize | svgTextMorph expectedSizes | - + svgTextMorph := SVGMorph fromString: self basicSizeTextSVG. expectedSizes := OrderedCollection newFrom: {1. 1. 187. 10. self defaultFontSize}. - + (1 to: 5) do: [:i | self assert: (expectedSizes at: i) equals: (svgTextMorph submorphs at: i) fontToUse pointSize] - - \ No newline at end of file +