decorator: remove unused stuff, created basic sample files

diff --git a/ipelets/decorator/test.ipe b/ipelets/decorator/decorator.ipe
similarity index 50%
rename from ipelets/decorator/test.ipe
rename to ipelets/decorator/decorator.ipe
index d3c57e610cce0a0c8dc380689a11f61bccfb7467..33250e9220f1214d824268473fa75156ad0e9a90 100644 (file)
--- a/ipelets/decorator/test.ipe
+++ b/ipelets/decorator/decorator.ipe
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE ipe SYSTEM "ipe.dtd">
 <ipe version="70005" creator="Ipe 7.1.4">
 <?xml version="1.0"?>
 <!DOCTYPE ipe SYSTEM "ipe.dtd">
 <ipe version="70005" creator="Ipe 7.1.4">

-<info created="D:20131216154906" modified="D:20131217184840"/>
-<preamble>\usepackage[english]{babel}
-\usepackage{blindtext}</preamble>
+<info created="D:20140303154143" modified="D:20140303165023"/>

 <ipestyle name="basic">
 <symbol name="arrow/arc(spx)">
 <path stroke="sym-stroke" fill="sym-stroke" pen="sym-pen">
 <ipestyle name="basic">
 <symbol name="arrow/arc(spx)">
 <path stroke="sym-stroke" fill="sym-stroke" pen="sym-pen">


@@ -164,96 +162,6 @@ h
 h
 </path>
 </symbol>
 h
 </path>
 </symbol>

-<symbol name="top-left">
-<group>
-<path fill="gray">
--4 4 m
--4 0 l
-0 0 l
-0 4 l
-h
-</path>
-<path stroke="black">
--4 0 m
--4 4 l
-0 4 l
-</path>
-</group>
-</symbol>
-<symbol name="deco/KIT-simple">
-<path stroke="black" fill="lightgray">
-5 1 m
-4 0 0 4 1 1 1 5 a
--5 5 l
--5 -1 l
-4 0 0 4 -1 -1 -1 -5 a
-5 -5 l
-h
-</path>
-</symbol>
-<symbol name="deco/box">
-<path stroke="black" fill="lightgray">
--5 5 m
--5 -5 l
-5 -5 l
-5 5 l
-h
-</path>
-</symbol>
-<symbol name="deco/box-rounded">
-<path stroke="black" fill="lightgray">
-5 1 m
-4 0 0 4 1 1 1 5 a
--1 5 l
-4 0 0 4 -1 1 -5 1 a
--5 -1 l
-4 0 0 4 -1 -1 -1 -5 a
-1 -5 l
-4 0 0 4 1 -1 5 -1 a
-h
-</path>
-</symbol>
-<symbol name="deco/tabbed-test">
-<path stroke="black" fill="lightgray">
--5 5 m
--5 11 l
-1 11 l
-4 0 0 -4 1 7 5 7 a
-5 5 l
--5 5 m
--5 -1 l
-4 0 0 4 -1 -1 -1 -5 a
-5 -5 l
-5 1 l
-5 5 l
--5 5 m
-5 5 l
-</path>
-</symbol>
-<symbol name="deco/test">
-<group>
-<path matrix="1 0 0 1 10 50" stroke="black" fill="lightgray">
-10 2 m
-8 0 0 8 2 2 2 10 a
--10 10 l
--10 -2 l
-8 0 0 8 -2 -2 -2 -10 a
-10 -10 l
-h
-</path>
-<path matrix="1 0 0 1 10 50" stroke="black">
--10 10 m
-10 -10 l
-</path>
-<path matrix="1 0 0 1 -6 34" stroke="black">
-12 20 m
-12 12 l
-20 12 l
-20 20 l
-h
-</path>
-</group>
-</symbol>

 <pen name="heavier" value="0.8"/>
 <pen name="fat" value="1.2"/>
 <pen name="ultrafat" value="2"/>
 <pen name="heavier" value="0.8"/>
 <pen name="fat" value="1.2"/>
 <pen name="ultrafat" value="2"/>


@@ -263,8 +171,6 @@ h
 <arrowsize name="large" value="10"/>
 <arrowsize name="small" value="5"/>
 <arrowsize name="tiny" value="3"/>
 <arrowsize name="large" value="10"/>
 <arrowsize name="small" value="5"/>
 <arrowsize name="tiny" value="3"/>

-<color name="gray" value="0.745"/>
-<color name="lightgray" value="0.827"/>

 <color name="red" value="1 0 0"/>
 <color name="green" value="0 1 0"/>
 <color name="blue" value="0 0 1"/>
 <color name="red" value="1 0 0"/>
 <color name="green" value="0 1 0"/>
 <color name="blue" value="0 0 1"/>


@@ -272,6 +178,7 @@ h
 <color name="orange" value="1 0.647 0"/>
 <color name="gold" value="1 0.843 0"/>
 <color name="purple" value="0.627 0.125 0.941"/>
 <color name="orange" value="1 0.647 0"/>
 <color name="gold" value="1 0.843 0"/>
 <color name="purple" value="0.627 0.125 0.941"/>

+<color name="gray" value="0.745"/>

 <color name="brown" value="0.647 0.165 0.165"/>
 <color name="navy" value="0 0 0.502"/>
 <color name="pink" value="1 0.753 0.796"/>
 <color name="brown" value="0.647 0.165 0.165"/>
 <color name="navy" value="0 0 0.502"/>
 <color name="pink" value="1 0.753 0.796"/>


@@ -287,6 +194,7 @@ h
 <color name="darkred" value="0.545 0 0"/>
 <color name="lightblue" value="0.678 0.847 0.902"/>
 <color name="lightcyan" value="0.878 1 1"/>
 <color name="darkred" value="0.545 0 0"/>
 <color name="lightblue" value="0.678 0.847 0.902"/>
 <color name="lightcyan" value="0.878 1 1"/>

+<color name="lightgray" value="0.827"/>

 <color name="lightgreen" value="0.565 0.933 0.565"/>
 <color name="lightyellow" value="1 1 0.878"/>
 <dashstyle name="dashed" value="[4] 0"/>
 <color name="lightgreen" value="0.565 0.933 0.565"/>
 <color name="lightyellow" value="1 1 0.878"/>
 <dashstyle name="dashed" value="[4] 0"/>


@@ -314,6 +222,7 @@ h
 <gridsize name="28 pts (~10 mm)" value="28"/>
 <gridsize name="56 pts (~20 mm)" value="56"/>
 <gridsize name="1 pts" value="1"/>
 <gridsize name="28 pts (~10 mm)" value="28"/>
 <gridsize name="56 pts (~20 mm)" value="56"/>
 <gridsize name="1 pts" value="1"/>

+<gridsize name="2 pts" value="2"/>

 <anglesize name="90 deg" value="90"/>
 <anglesize name="60 deg" value="60"/>
 <anglesize name="45 deg" value="45"/>
 <anglesize name="90 deg" value="90"/>
 <anglesize name="60 deg" value="60"/>
 <anglesize name="45 deg" value="45"/>


@@ -322,112 +231,478 @@ h
 <tiling name="falling" angle="-60" step="4" width="1"/>
 <tiling name="rising" angle="30" step="4" width="1"/>
 </ipestyle>
 <tiling name="falling" angle="-60" step="4" width="1"/>
 <tiling name="rising" angle="30" step="4" width="1"/>
 </ipestyle>

-<page>
-<layer name="alpha"/>
-<view layers="alpha" active="alpha"/>
-<group layer="alpha">
-<path stroke="black" fill="lightgray">
-582 166 m
-8 0 0 8 574 166 574 174 a
-266 174 l
-266 65.503 l
-8 0 0 8 274 65.503 274 57.503 a
-582 57.503 l
+<ipestyle name="decorator">
+<symbol name="deco/box-margin-8">
+<group>
+<path stroke="black" fill="gray">
+0 64 m
+0 0 l
+64 0 l
+64 64 l

 h
 </path>
 <path stroke="black">
 h
 </path>
 <path stroke="black">

-266 174 m
-582 57.503 l
+8 56 m
+8 8 l
+56 8 l
+56 56 l
+h

 </path>
 </group>
 </path>
 </group>

+</symbol>
+<symbol name="deco/box-margin-4">

 <group>
 <group>

-<path stroke="black" fill="lightgray">
-86 62 m
-8 0 0 8 78 62 78 70 a
-42 70 l
-42 34 l
-8 0 0 8 50 34 50 26 a
-86 26 l
+<path stroke="black" fill="gray">
+0 64 m
+0 0 l
+64 0 l
+64 64 l

 h
 </path>
 <path stroke="black">
 h
 </path>
 <path stroke="black">

-42 70 m
-86 26 l
+4 60 m
+4 4 l
+60 4 l
+60 60 l
+h

 </path>
 </group>
 </path>
 </group>

-<path stroke="black" fill="lightgray">
-469 369 m
-4 0 0 4 465 369 465 373 a
-159 373 l
-4 0 0 4 159 369 155 369 a
-155 262.503 l
-4 0 0 4 159 262.503 159 258.503 a
-465 258.503 l
-4 0 0 4 465 262.503 469 262.503 a
+</symbol>
+<symbol name="deco/box-margin-2">
+<group>
+<path stroke="black" fill="gray">
+0 64 m
+0 0 l
+64 0 l
+64 64 l

 h
 </path>
 h
 </path>

-<path stroke="black" fill="lightgray">
-139 501 m
-139 386.503 l
-453 386.503 l
-453 501 l
+<path stroke="black">
+2 62 m
+2 2 l
+62 2 l
+62 62 l

 h
 </path>
 h
 </path>

-<path stroke="black" fill="lightgray">
-469 625 m
-4 0 0 4 465 625 465 629 a
-155 629 l
-155 518.503 l
-4 0 0 4 159 518.503 159 514.503 a
-469 514.503 l
+</group>
+</symbol>
+<symbol name="deco/box-margin-1">
+<group>
+<path stroke="black" fill="gray">
+0 64 m
+0 0 l
+64 0 l
+64 64 l
+h
+</path>
+<path stroke="black">
+1 63 m
+1 1 l
+63 1 l
+63 63 l
+h
+</path>
+</group>
+</symbol>
+<symbol name="deco/rounded-box-margin-4-radius-4">
+<group>
+<path stroke="black" fill="gray">
+64 60 m
+4 0 0 4 60 60 60 64 a
+4 64 l
+4 0 0 4 4 60 0 60 a
+0 4 l
+4 0 0 4 4 4 4 0 a
+60 0 l
+4 0 0 4 60 4 64 4 a
+h
+</path>
+<path stroke="black">
+4 60 m
+4 4 l
+60 4 l
+60 60 l
+h
+</path>
+</group>
+</symbol>
+<symbol name="deco/rounded-box-margin-8-radius-4">
+<group>
+<path stroke="black" fill="gray">
+64 60 m
+4 0 0 4 60 60 60 64 a
+4 64 l
+4 0 0 4 4 60 0 60 a
+0 4 l
+4 0 0 4 4 4 4 0 a
+60 0 l
+4 0 0 4 60 4 64 4 a
+h
+</path>
+<path stroke="black">
+8 56 m
+8 8 l
+56 8 l
+56 56 l

 h
 </path>
 h
 </path>

-<text matrix="1 0 0 1 32 112" transformations="translations" pos="128 512" stroke="black" type="minipage" width="304" height="54.687" depth="49.81" valign="top">\blindtext</text>
-<text matrix="1 0 0 1 16 -16" transformations="translations" pos="128 512" stroke="black" type="minipage" width="304" height="54.687" depth="49.81" valign="top">\blindtext</text>
-<text matrix="1 0 0 1 32 -144" transformations="translations" pos="128 512" stroke="black" type="minipage" width="304" height="54.687" depth="49.81" valign="top">\blindtext</text>
-<text matrix="1 0 0 1 144 -344" transformations="translations" pos="128 512" stroke="black" type="minipage" width="304" height="54.687" depth="49.81" valign="top">\blindtext</text>
-<path matrix="1 0 0 1 -32 80" stroke="black">
-48 128 m
-48 96 l
-80 96 l
-80 128 l
+</group>
+</symbol>
+<symbol name="deco/rounded-box-margin-2-radius-4">
+<group>
+<path stroke="black" fill="gray">
+64 60 m
+4 0 0 4 60 60 60 64 a
+4 64 l
+4 0 0 4 4 60 0 60 a
+0 4 l
+4 0 0 4 4 4 4 0 a
+60 0 l
+4 0 0 4 60 4 64 4 a

 h
 </path>
 <path stroke="black">
 h
 </path>
 <path stroke="black">

-48 64 m
-48 32 l
-80 32 l
-80 64 l
+2 62 m
+2 2 l
+62 2 l
+62 62 l
+h
+</path>
+</group>
+</symbol>
+<symbol name="deco/rounded-box-margin-1-radius-4">
+<group>
+<path stroke="black" fill="gray">
+64 60 m
+4 0 0 4 60 60 60 64 a
+4 64 l
+4 0 0 4 4 60 0 60 a
+0 4 l
+4 0 0 4 4 4 4 0 a
+60 0 l
+4 0 0 4 60 4 64 4 a

 h
 </path>
 <path stroke="black">
 h
 </path>
 <path stroke="black">

-12 28 m
-12 26 l
-14 26 l
-14 28 l
+1 63 m
+1 1 l
+63 1 l
+63 63 l

 h
 </path>
 h
 </path>

+</group>
+</symbol>
+<symbol name="deco/rounded-box-margin-8-radius-2">

 <group>
 <group>

-<path matrix="1 0 0 1 10 50" stroke="black" fill="lightgray">
-10 2 m
-8 0 0 8 2 2 2 10 a
--10 10 l
--10 -2 l
-8 0 0 8 -2 -2 -2 -10 a
-10 -10 l
+<path stroke="black" fill="gray">
+64 62 m
+2 0 0 2 62 62 62 64 a
+2 64 l
+2 0 0 2 2 62 0 62 a
+0 2 l
+2 0 0 2 2 2 2 0 a
+62 0 l
+2 0 0 2 62 2 64 2 a

 h
 </path>
 h
 </path>

-<path matrix="1 0 0 1 10 50" stroke="black">
--10 10 m
-10 -10 l
+<path stroke="black">
+8 56 m
+8 8 l
+56 8 l
+56 56 l
+h

 </path>
 </path>

-<path matrix="1 0 0 1 -6 34" stroke="black">
-12 20 m
-12 12 l
-20 12 l
-20 20 l
+</group>
+</symbol>
+<symbol name="deco/rounded-box-margin-4-radius-2">
+<group>
+<path stroke="black" fill="gray">
+64 62 m
+2 0 0 2 62 62 62 64 a
+2 64 l
+2 0 0 2 2 62 0 62 a
+0 2 l
+2 0 0 2 2 2 2 0 a
+62 0 l
+2 0 0 2 62 2 64 2 a

 h
 </path>
 h
 </path>

+<path stroke="black">
+4 60 m
+4 4 l
+60 4 l
+60 60 l
+h
+</path>
+</group>
+</symbol>
+<symbol name="deco/rounded-box-margin-2-radius-2">
+<group>
+<path stroke="black" fill="gray">
+64 62 m
+2 0 0 2 62 62 62 64 a
+2 64 l
+2 0 0 2 2 62 0 62 a
+0 2 l
+2 0 0 2 2 2 2 0 a
+62 0 l
+2 0 0 2 62 2 64 2 a
+h
+</path>
+<path stroke="black">
+2 62 m
+2 2 l
+62 2 l
+62 62 l
+h
+</path>
+</group>
+</symbol>
+<symbol name="deco/rounded-box-margin-1-radius-2">
+<group>
+<path stroke="black" fill="gray">
+64 62 m
+2 0 0 2 62 62 62 64 a
+2 64 l
+2 0 0 2 2 62 0 62 a
+0 2 l
+2 0 0 2 2 2 2 0 a
+62 0 l
+2 0 0 2 62 2 64 2 a
+h
+</path>
+<path stroke="black">
+1 63 m
+1 1 l
+63 1 l
+63 63 l
+h
+</path>
+</group>
+</symbol>
+</ipestyle>
+<page>
+<layer name="alpha"/>
+<view layers="alpha" active="alpha"/>
+<group layer="alpha">
+<path stroke="black" fill="gray">
+216 230 m
+2 0 0 2 214 230 214 232 a
+186 232 l
+2 0 0 2 186 230 184 230 a
+184 186 l
+2 0 0 2 186 186 186 184 a
+214 184 l
+2 0 0 2 214 186 216 186 a
+h
+</path>
+</group>
+<group>
+<path stroke="black" fill="gray">
+190 226 m
+190 190 l
+210 190 l
+210 226 l
+h
+</path>
+</group>
+<group>
+<path stroke="black" fill="gray">
+304 118 m
+2 0 0 2 302 118 302 120 a
+274 120 l
+2 0 0 2 274 118 272 118 a
+272 74 l
+2 0 0 2 274 74 274 72 a
+302 72 l
+2 0 0 2 302 74 304 74 a
+h
+</path>
+</group>
+<group>
+<path stroke="black" fill="gray">
+300 114 m
+2 0 0 2 298 114 298 116 a
+278 116 l
+2 0 0 2 278 114 276 114 a
+276 78 l
+2 0 0 2 278 78 278 76 a
+298 76 l
+2 0 0 2 298 78 300 78 a
+h
+</path>
+</group>
+<group>
+<path stroke="black" fill="gray">
+298 112 m
+2 0 0 2 296 112 296 114 a
+280 114 l
+2 0 0 2 280 112 278 112 a
+278 80 l
+2 0 0 2 280 80 280 78 a
+296 78 l
+2 0 0 2 296 80 298 80 a
+h
+</path>
+</group>
+<group>
+<path stroke="black" fill="gray">
+297 111 m
+2 0 0 2 295 111 295 113 a
+281 113 l
+2 0 0 2 281 111 279 111 a
+279 81 l
+2 0 0 2 281 81 281 79 a
+295 79 l
+2 0 0 2 295 81 297 81 a
+h
+</path>
+</group>
+<group>
+<path stroke="black" fill="gray">
+248 116 m
+4 0 0 4 244 116 244 120 a
+220 120 l
+4 0 0 4 220 116 216 116 a
+216 76 l
+4 0 0 4 220 76 220 72 a
+244 72 l
+4 0 0 4 244 76 248 76 a
+h
+</path>
+</group>
+<group>
+<path stroke="black" fill="gray">
+244 112 m
+4 0 0 4 240 112 240 116 a
+224 116 l
+4 0 0 4 224 112 220 112 a
+220 80 l
+4 0 0 4 224 80 224 76 a
+240 76 l
+4 0 0 4 240 80 244 80 a
+h
+</path>
+</group>
+<group>
+<path stroke="black" fill="gray">
+242 110 m
+4 0 0 4 238 110 238 114 a
+226 114 l
+4 0 0 4 226 110 222 110 a
+222 82 l
+4 0 0 4 226 82 226 78 a
+238 78 l
+4 0 0 4 238 82 242 82 a
+h
+</path>
+</group>
+<group>
+<path stroke="black" fill="gray">
+241 109 m
+4 0 0 4 237 109 237 113 a
+227 113 l
+4 0 0 4 227 109 223 109 a
+223 83 l
+4 0 0 4 227 83 227 79 a
+237 79 l
+4 0 0 4 237 83 241 83 a
+h
+</path>
+</group>
+<group>
+<path stroke="black" fill="gray">
+160 120 m
+160 72 l
+192 72 l
+192 120 l
+h
+</path>
+</group>
+<group>
+<path stroke="black" fill="gray">
+164 116 m
+164 76 l
+188 76 l
+188 116 l
+h
+</path>
+</group>
+<group>
+<path stroke="black" fill="gray">
+166 114 m
+166 78 l
+186 78 l
+186 114 l
+h
+</path>
+</group>
+<group>
+<path stroke="black" fill="gray">
+167 113 m
+167 79 l
+185 79 l
+185 113 l
+h
+</path>
+</group>
+<group matrix="1 0 0 1 29 -2">
+<path matrix="1 0 0 1 27 2" stroke="black" fill="gray">
+176 112 m
+176 80 l
+</path>
+<path matrix="1 0 0 1 27 3" stroke="black" fill="gray">
+168 95 m
+184 95 l
+</path>
+</group>
+<group matrix="1 0 0 1 -27 -2">
+<path matrix="1 0 0 1 27 2" stroke="black" fill="gray">
+176 112 m
+176 80 l
+</path>
+<path matrix="1 0 0 1 27 3" stroke="black" fill="gray">
+168 95 m
+184 95 l
+</path>
+</group>
+<path stroke="black" fill="gray">
+64 62 m
+2 0 0 2 62 62 62 64 a
+2 64 l
+2 0 0 2 2 62 0 62 a
+0 2 l
+2 0 0 2 2 2 2 0 a
+62 0 l
+1.76777 0 0 1.76777 62.25 1.75 64 2 a
+h
+</path>
+<path stroke="black">
+8 56 m
+8 8 l
+56 8 l
+56 56 l
+h
+</path>
+<group matrix="1 0 0 1 85 -2">
+<path matrix="1 0 0 1 27 2" stroke="black" fill="gray">
+176 112 m
+176 80 l
+</path>
+<path matrix="1 0 0 1 27 3" stroke="black" fill="gray">
+168 95 m
+184 95 l
+</path>
+</group>
+<group matrix="1 0 0 1 -3 110">
+<path matrix="1 0 0 1 27 2" stroke="black" fill="gray">
+176 112 m
+176 80 l
+</path>
+<path matrix="1 0 0 1 27 3" stroke="black" fill="gray">
+168 95 m
+184 95 l
+</path>

 </group>
 </page>
 </ipe>
 </group>
 </page>
 </ipe>

diff --git a/ipelets/decorator/decorator.isy b/ipelets/decorator/decorator.isy
new file mode 100644 (file)
index 0000000..a5e7834
--- /dev/null
+++ b/ipelets/decorator/decorator.isy
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE ipestyle SYSTEM "ipe.dtd">
+<ipestyle name="decorator">
+  <symbol name="deco/box-margin-8">
+    <group>
+      <path stroke="black" fill="white">
+       -16 16 m
+       -16 -16 l
+       16 -16 l
+       16 16 l
+       h
+      </path>
+      <path stroke="black">
+       -8 8 m
+       -8 -8 l
+       8 -8 l
+       8 8 l
+       h
+      </path>
+    </group>
+  </symbol>
+</ipestyle>

diff --git a/ipelets/decorator/decorator.lua b/ipelets/decorator/decorator.lua
index cffa3b515ba464815844960b450c8a6aeef96bfc..389a26060d1cd1774212d2a8e445c1a9f20e1098 100644 (file)
--- a/ipelets/decorator/decorator.lua
+++ b/ipelets/decorator/decorator.lua
@@ -93,9 +93,14 @@ end
 function run_fancy_decorator (model)
    local p = model:page()
    local prim = p:primarySelection()
 function run_fancy_decorator (model)
    local p = model:page()
    local prim = p:primarySelection()

+   if (not prim) then
+      report_problem(model, "You must select somethings.")
+      return
+   end

    local bbox_target = p:bbox(prim)
 
    local deco_obj_group = ask_for_decorator(model)
    local bbox_target = p:bbox(prim)
 
    local deco_obj_group = ask_for_decorator(model)

+   if (not deco_obj_group) then return end   

    if (deco_obj_group:type() ~= "group") then
       report_problem(model, "The decoration must be a group.")
       return
    if (deco_obj_group:type() ~= "group") then
       report_problem(model, "The decoration must be a group.")
       return


@@ -106,7 +111,11 @@ function run_fancy_decorator (model)
    local bbox_source = bbox(last_obj, p)
    local center = ipe.Vector(bbox_source:left() + 0.5 * bbox_source:width(),
                             bbox_source:bottom() + 0.5 * bbox_source:height())
    local bbox_source = bbox(last_obj, p)
    local center = ipe.Vector(bbox_source:left() + 0.5 * bbox_source:width(),
                             bbox_source:bottom() + 0.5 * bbox_source:height())

-   
+
+   if (#objects == 0) then
+      report_problem(model, "The decoration must be a group of at least two elements.")
+      return
+   end

    for i,deco_obj in ipairs(objects) do
       if (deco_obj:type() ~= "path") then
         report_problem(model, "Each decoration object needs to be a path.")
    for i,deco_obj in ipairs(objects) do
       if (deco_obj:type() ~= "path") then
         report_problem(model, "Each decoration object needs to be a path.")


@@ -141,53 +150,6 @@ function ask_for_decorator(model)
    return symbol:clone()
 end
 
    return symbol:clone()
 end
 

--- Decorate something given by its bounding box with a given deco
--- object, which needs to be a path.
-function decorate(model, bbox, deco)
-   if (deco:type() ~= "path") then
-      report_problem(model, "The decoration needs to be a path.")
-      return
-   end
-
-   local shape = deco:shape()
-   local m = deco:matrix()
-   for _,path in pairs(shape) do
-      for _,subpath in ipairs(path) do  
-        -- move all points
-        for i,point in ipairs(subpath) do
-           subpath[i] = translation(bbox, m*point) * m*point
-        end
-
-        -- for acs, the center must be translated separately
-        if (subpath["type"] == "arc") then
-           local arc = subpath["arc"]
-           local arc_pos = arc:matrix():translation()
-           subpath["arc"] = translation(bbox, m*arc_pos) * m * arc
-        end
-      end
-   end
-   -- update model
-   deco:setShape(shape)
-   deco:setMatrix(ipe.Matrix())
-   model:creation("create", deco)
-end
-
--- The translation matrix that should be applied to a given point when
--- doing the decoration.
-function translation(bbox, point)
-   local dx = 0
-   local dy = 0
-   if (point.x > 0) then
-      dx = dx + bbox:width()
-   end
-   if (point.y > 0) then
-      dy = dy + bbox:height()
-   end
-   dx = dx + bbox:left()
-   dy = dy + bbox:bottom()
-   return ipe.Translation(dx, dy)
-end
-

 function mainWindow(model)
    if model.ui.win == nil then
       return model.ui
 function mainWindow(model)
    if model.ui.win == nil then
       return model.ui


@@ -196,34 +158,7 @@ function mainWindow(model)
    end
 end
 
    end
 end
 

-function run_decorator(model)
-   -- get bbox of primary selection
-   local p = model:page()
-   local prim = p:primarySelection()
-   if not prim then
-      model.ui:explain("An object must be selected.")
-      return
-   end
-   local bbox = p:bbox(prim)
-
-   -- create decorator object
-   local dialog = ipeui.Dialog(mainWindow(model), "Select a decorator.")
-   local decorators = decorator_names(model)
-   dialog:add("deco", "combo", decorators, 1, 1, 1, 2)
-   dialog:add("ok", "button", { label="&Ok", action="accept" }, 2, 2)
-   dialog:add("cancel", "button", { label="&Cancel", action="reject" }, 2, 1)
-   local r = dialog:execute()
-   if not r then return end
-   local deco_name = decorators[dialog:get("deco")]
-   local symbol = model.doc:sheets():find("symbol", deco_name)
-   local deco = symbol:clone()
-
-   -- run the decoration
-   decorate(model, bbox, deco)
-end
-

 label = "Decorator"
 methods = {
 label = "Decorator"
 methods = {

-  { label = "Decorate", run=run_decorator},

   { label = "Fancy decorator", run=run_fancy_decorator},
 }
   { label = "Fancy decorator", run=run_fancy_decorator},
 }