diff --git a/docs/test_cases/t00036_class.svg b/docs/test_cases/t00036_class.svg
index 8c605353..2b8b0d86 100644
--- a/docs/test_cases/t00036_class.svg
+++ b/docs/test_cases/t00036_class.svg
@@ -1,6 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="527px" preserveAspectRatio="none" style="width:569px;height:527px;" version="1.1" viewBox="0 0 569 527" width="569px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="527px" preserveAspectRatio="none" style="width:476px;height:527px;" version="1.1" viewBox="0 0 476 527" width="476px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1h9fgwvxifeyz" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1a0be38pl476n" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -8,69 +8,66 @@
     </filter>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1h9fgwvxifeyz)" points="115,24.5,150,24.5,157,46.7969,403,46.7969,403,515,115,515,115,24.5" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="115" x2="157" y1="46.7969" y2="46.7969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="119" y="39.4951">ns1</text>
-    <polygon fill="#FFFFFF" filter="url(#f1h9fgwvxifeyz)" points="195,67.5,240,67.5,247,89.7969,379,89.7969,379,491,195,491,195,67.5" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="195" x2="247" y1="89.7969" y2="89.7969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="39" x="199" y="82.4951">ns11</text>
-    <polygon fill="#FFFFFF" filter="url(#f1h9fgwvxifeyz)" points="219,110.5,274,110.5,281,132.7969,355,132.7969,355,367,219,367,219,110.5" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="219" x2="281" y1="132.7969" y2="132.7969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="49" x="223" y="125.4951">ns111</text>
-    <polygon fill="#FFFFFF" filter="url(#f1h9fgwvxifeyz)" points="427,74,462,74,469,96.2969,547,96.2969,547,240,427,240,427,74" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="427" x2="469" y1="96.2969" y2="96.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="431" y="88.9951">ns2</text>
-    <polygon fill="#FFFFFF" filter="url(#f1h9fgwvxifeyz)" points="451,117,496,117,503,139.2969,523,139.2969,523,216,451,216,451,117" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="451" x2="503" y1="139.2969" y2="139.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="39" x="455" y="131.9951">ns22</text>
-    <polygon fill="#FFFFFF" filter="url(#f1h9fgwvxifeyz)" points="6,149.5,82,149.5,89,171.7969,96,171.7969,96,202.0938,6,202.0938,6,149.5" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="6" x2="89" y1="171.7969" y2="171.7969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="70" x="10" y="164.4951">clanguml</text>
-    <rect fill="#FEFECE" filter="url(#f1h9fgwvxifeyz)" height="73.6094" id="C_0000000675" style="stroke: #A80036; stroke-width: 1.5;" width="47" x="131.5" y="139"/>
-    <ellipse cx="149.65" cy="155" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M153.7594,161 L146.0406,161 L146.0406,148.6094 L153.7594,148.6094 L153.7594,150.7656 L148.4938,150.7656 L148.4938,153.4375 L153.2594,153.4375 L153.2594,155.5938 L148.4938,155.5938 L148.4938,158.8438 L153.7594,158.8438 L153.7594,161 Z "/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="164.35" y="159.1543">E</text>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="132.5" x2="177.5" y1="171" y2="171"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="24" x="137.5" y="185.2104">blue</text>
-    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="137.5" y="198.0151">yellow</text>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="132.5" x2="177.5" y1="204.6094" y2="204.6094"/>
-    <rect fill="#FEFECE" filter="url(#f1h9fgwvxifeyz)" height="60.8047" id="C_0000000678" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="261" y="414"/>
-    <ellipse cx="276.45" cy="430" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M279.4188,435.6406 Q278.8406,435.9375 278.2,436.0781 Q277.5594,436.2344 276.8563,436.2344 Q274.3563,436.2344 273.0281,434.5938 Q271.7156,432.9375 271.7156,429.8125 Q271.7156,426.6875 273.0281,425.0313 Q274.3563,423.375 276.8563,423.375 Q277.5594,423.375 278.2,423.5313 Q278.8563,423.6875 279.4188,423.9844 L279.4188,426.7031 Q278.7938,426.125 278.2,425.8594 Q277.6063,425.5781 276.9813,425.5781 Q275.6375,425.5781 274.95,426.6563 Q274.2625,427.7188 274.2625,429.8125 Q274.2625,431.9063 274.95,432.9844 Q275.6375,434.0469 276.9813,434.0469 Q277.6063,434.0469 278.2,433.7813 Q278.7938,433.5 279.4188,432.9219 L279.4188,435.6406 Z "/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="290.55" y="434.1543">A</text>
-    <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="307" y="411"/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="308" y="423.1387">T</text>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="262" x2="312" y1="446" y2="446"/>
-    <ellipse cx="272" cy="457" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="281" y="460.2104">a : T</text>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="262" x2="312" y1="466.8047" y2="466.8047"/>
-    <rect fill="#FEFECE" filter="url(#f1h9fgwvxifeyz)" height="48" id="C_0000000682" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="257" y="303"/>
-    <ellipse cx="272" cy="319" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M274.9688,324.6406 Q274.3906,324.9375 273.75,325.0781 Q273.1094,325.2344 272.4063,325.2344 Q269.9063,325.2344 268.5781,323.5938 Q267.2656,321.9375 267.2656,318.8125 Q267.2656,315.6875 268.5781,314.0313 Q269.9063,312.375 272.4063,312.375 Q273.1094,312.375 273.75,312.5313 Q274.4063,312.6875 274.9688,312.9844 L274.9688,315.7031 Q274.3438,315.125 273.75,314.8594 Q273.1563,314.5781 272.5313,314.5781 Q271.1875,314.5781 270.5,315.6563 Q269.8125,316.7188 269.8125,318.8125 Q269.8125,320.9063 270.5,321.9844 Q271.1875,323.0469 272.5313,323.0469 Q273.1563,323.0469 273.75,322.7813 Q274.3438,322.5 274.9688,321.9219 L274.9688,324.6406 Z "/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="286" y="323.1543">A</text>
-    <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="302" y="300"/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="303" y="312.1387">int</text>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="258" x2="316" y1="335" y2="335"/>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="258" x2="316" y1="343" y2="343"/>
-    <rect fill="#FEFECE" filter="url(#f1h9fgwvxifeyz)" height="60.8047" id="C_0000000681" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="235" y="145.5"/>
-    <ellipse cx="278.8" cy="161.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M281.7688,167.1406 Q281.1906,167.4375 280.55,167.5781 Q279.9094,167.7344 279.2063,167.7344 Q276.7063,167.7344 275.3781,166.0938 Q274.0656,164.4375 274.0656,161.3125 Q274.0656,158.1875 275.3781,156.5313 Q276.7063,154.875 279.2063,154.875 Q279.9094,154.875 280.55,155.0313 Q281.2063,155.1875 281.7688,155.4844 L281.7688,158.2031 Q281.1438,157.625 280.55,157.3594 Q279.9563,157.0781 279.3313,157.0781 Q277.9875,157.0781 277.3,158.1563 Q276.6125,159.2188 276.6125,161.3125 Q276.6125,163.4063 277.3,164.4844 Q277.9875,165.5469 279.3313,165.5469 Q279.9563,165.5469 280.55,165.2813 Q281.1438,165 281.7688,164.4219 L281.7688,167.1406 Z "/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="299.2" y="165.6543">B</text>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="236" x2="338" y1="177.5" y2="177.5"/>
-    <ellipse cx="246" cy="188.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="255" y="191.7104">a_int : A&lt;int&gt;</text>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="236" x2="338" y1="198.3047" y2="198.3047"/>
-    <rect fill="#FEFECE" filter="url(#f1h9fgwvxifeyz)" height="48" id="C_0000000687" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="467" y="152"/>
-    <ellipse cx="482" cy="168" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M484.9688,173.6406 Q484.3906,173.9375 483.75,174.0781 Q483.1094,174.2344 482.4063,174.2344 Q479.9063,174.2344 478.5781,172.5938 Q477.2656,170.9375 477.2656,167.8125 Q477.2656,164.6875 478.5781,163.0313 Q479.9063,161.375 482.4063,161.375 Q483.1094,161.375 483.75,161.5313 Q484.4063,161.6875 484.9688,161.9844 L484.9688,164.7031 Q484.3438,164.125 483.75,163.8594 Q483.1563,163.5781 482.5313,163.5781 Q481.1875,163.5781 480.5,164.6563 Q479.8125,165.7188 479.8125,167.8125 Q479.8125,169.9063 480.5,170.9844 Q481.1875,172.0469 482.5313,172.0469 Q483.1563,172.0469 483.75,171.7813 Q484.3438,171.5 484.9688,170.9219 L484.9688,173.6406 Z "/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="496" y="172.1543">C</text>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="468" x2="506" y1="184" y2="184"/>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="468" x2="506" y1="192" y2="192"/>
-    <path d="M287,351.1 C287,363.36 287,378.92 287,393.77 " fill="none" id="C_0000000682-&gt;C_0000000678" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="294,393.86,287,413.86,280,393.86,294,393.86" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M287,220.15 C287,247.03 287,280.58 287,302.61 " fill="none" id="C_0000000681&lt;-C_0000000682" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="287,206.79,283,212.79,287,218.79,291,212.79,287,206.79" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="293" cy="265.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="300" y="269.0669">a_int</text>
+    <polygon fill="#FFFFFF" filter="url(#f1a0be38pl476n)" points="22,24.5,57,24.5,64,46.7969,310,46.7969,310,515,22,515,22,24.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.7969" y2="46.7969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="39.4951">ns1</text>
+    <polygon fill="#FFFFFF" filter="url(#f1a0be38pl476n)" points="102,67.5,147,67.5,154,89.7969,286,89.7969,286,491,102,491,102,67.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="102" x2="154" y1="89.7969" y2="89.7969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="39" x="106" y="82.4951">ns11</text>
+    <polygon fill="#FFFFFF" filter="url(#f1a0be38pl476n)" points="126,110.5,181,110.5,188,132.7969,262,132.7969,262,367,126,367,126,110.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="126" x2="188" y1="132.7969" y2="132.7969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="49" x="130" y="125.4951">ns111</text>
+    <polygon fill="#FFFFFF" filter="url(#f1a0be38pl476n)" points="334,74,369,74,376,96.2969,454,96.2969,454,240,334,240,334,74" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="334" x2="376" y1="96.2969" y2="96.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="338" y="88.9951">ns2</text>
+    <polygon fill="#FFFFFF" filter="url(#f1a0be38pl476n)" points="358,117,403,117,410,139.2969,430,139.2969,430,216,358,216,358,117" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="358" x2="410" y1="139.2969" y2="139.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="39" x="362" y="131.9951">ns22</text>
+    <rect fill="#FEFECE" filter="url(#f1a0be38pl476n)" height="73.6094" id="C_0000000675" style="stroke: #A80036; stroke-width: 1.5;" width="47" x="38.5" y="139"/>
+    <ellipse cx="56.65" cy="155" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M60.7594,161 L53.0406,161 L53.0406,148.6094 L60.7594,148.6094 L60.7594,150.7656 L55.4938,150.7656 L55.4938,153.4375 L60.2594,153.4375 L60.2594,155.5938 L55.4938,155.5938 L55.4938,158.8438 L60.7594,158.8438 L60.7594,161 Z "/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="71.35" y="159.1543">E</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="39.5" x2="84.5" y1="171" y2="171"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="24" x="44.5" y="185.2104">blue</text>
+    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="44.5" y="198.0151">yellow</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="39.5" x2="84.5" y1="204.6094" y2="204.6094"/>
+    <rect fill="#FEFECE" filter="url(#f1a0be38pl476n)" height="60.8047" id="C_0000000678" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="168" y="414"/>
+    <ellipse cx="183.45" cy="430" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M186.4188,435.6406 Q185.8406,435.9375 185.2,436.0781 Q184.5594,436.2344 183.8563,436.2344 Q181.3563,436.2344 180.0281,434.5938 Q178.7156,432.9375 178.7156,429.8125 Q178.7156,426.6875 180.0281,425.0313 Q181.3563,423.375 183.8563,423.375 Q184.5594,423.375 185.2,423.5313 Q185.8563,423.6875 186.4188,423.9844 L186.4188,426.7031 Q185.7938,426.125 185.2,425.8594 Q184.6063,425.5781 183.9813,425.5781 Q182.6375,425.5781 181.95,426.6563 Q181.2625,427.7188 181.2625,429.8125 Q181.2625,431.9063 181.95,432.9844 Q182.6375,434.0469 183.9813,434.0469 Q184.6063,434.0469 185.2,433.7813 Q185.7938,433.5 186.4188,432.9219 L186.4188,435.6406 Z "/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="197.55" y="434.1543">A</text>
+    <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="214" y="411"/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="215" y="423.1387">T</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="169" x2="219" y1="446" y2="446"/>
+    <ellipse cx="179" cy="457" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="188" y="460.2104">a : T</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="169" x2="219" y1="466.8047" y2="466.8047"/>
+    <rect fill="#FEFECE" filter="url(#f1a0be38pl476n)" height="48" id="C_0000000682" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="164" y="303"/>
+    <ellipse cx="179" cy="319" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M181.9688,324.6406 Q181.3906,324.9375 180.75,325.0781 Q180.1094,325.2344 179.4063,325.2344 Q176.9063,325.2344 175.5781,323.5938 Q174.2656,321.9375 174.2656,318.8125 Q174.2656,315.6875 175.5781,314.0313 Q176.9063,312.375 179.4063,312.375 Q180.1094,312.375 180.75,312.5313 Q181.4063,312.6875 181.9688,312.9844 L181.9688,315.7031 Q181.3438,315.125 180.75,314.8594 Q180.1563,314.5781 179.5313,314.5781 Q178.1875,314.5781 177.5,315.6563 Q176.8125,316.7188 176.8125,318.8125 Q176.8125,320.9063 177.5,321.9844 Q178.1875,323.0469 179.5313,323.0469 Q180.1563,323.0469 180.75,322.7813 Q181.3438,322.5 181.9688,321.9219 L181.9688,324.6406 Z "/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="193" y="323.1543">A</text>
+    <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="209" y="300"/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="210" y="312.1387">int</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="223" y1="335" y2="335"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="223" y1="343" y2="343"/>
+    <rect fill="#FEFECE" filter="url(#f1a0be38pl476n)" height="60.8047" id="C_0000000681" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="142" y="145.5"/>
+    <ellipse cx="185.8" cy="161.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M188.7688,167.1406 Q188.1906,167.4375 187.55,167.5781 Q186.9094,167.7344 186.2063,167.7344 Q183.7063,167.7344 182.3781,166.0938 Q181.0656,164.4375 181.0656,161.3125 Q181.0656,158.1875 182.3781,156.5313 Q183.7063,154.875 186.2063,154.875 Q186.9094,154.875 187.55,155.0313 Q188.2063,155.1875 188.7688,155.4844 L188.7688,158.2031 Q188.1438,157.625 187.55,157.3594 Q186.9563,157.0781 186.3313,157.0781 Q184.9875,157.0781 184.3,158.1563 Q183.6125,159.2188 183.6125,161.3125 Q183.6125,163.4063 184.3,164.4844 Q184.9875,165.5469 186.3313,165.5469 Q186.9563,165.5469 187.55,165.2813 Q188.1438,165 188.7688,164.4219 L188.7688,167.1406 Z "/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="206.2" y="165.6543">B</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="143" x2="245" y1="177.5" y2="177.5"/>
+    <ellipse cx="153" cy="188.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="162" y="191.7104">a_int : A&lt;int&gt;</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="143" x2="245" y1="198.3047" y2="198.3047"/>
+    <rect fill="#FEFECE" filter="url(#f1a0be38pl476n)" height="48" id="C_0000000687" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="374" y="152"/>
+    <ellipse cx="389" cy="168" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M391.9688,173.6406 Q391.3906,173.9375 390.75,174.0781 Q390.1094,174.2344 389.4063,174.2344 Q386.9063,174.2344 385.5781,172.5938 Q384.2656,170.9375 384.2656,167.8125 Q384.2656,164.6875 385.5781,163.0313 Q386.9063,161.375 389.4063,161.375 Q390.1094,161.375 390.75,161.5313 Q391.4063,161.6875 391.9688,161.9844 L391.9688,164.7031 Q391.3438,164.125 390.75,163.8594 Q390.1563,163.5781 389.5313,163.5781 Q388.1875,163.5781 387.5,164.6563 Q386.8125,165.7188 386.8125,167.8125 Q386.8125,169.9063 387.5,170.9844 Q388.1875,172.0469 389.5313,172.0469 Q390.1563,172.0469 390.75,171.7813 Q391.3438,171.5 391.9688,170.9219 L391.9688,173.6406 Z "/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="403" y="172.1543">C</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="375" x2="413" y1="184" y2="184"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="375" x2="413" y1="192" y2="192"/>
+    <path d="M194,351.1 C194,363.36 194,378.92 194,393.77 " fill="none" id="C_0000000682-&gt;C_0000000678" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="201,393.86,194,413.86,187,393.86,201,393.86" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M194,220.15 C194,247.03 194,280.58 194,302.61 " fill="none" id="C_0000000681&lt;-C_0000000682" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="194,206.79,190,212.79,194,218.79,198,212.79,194,206.79" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="200" cy="265.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="207" y="269.0669">a_int</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t30001_package.svg b/docs/test_cases/t30001_package.svg
index 5fe708ff..e44279fb 100644
--- a/docs/test_cases/t30001_package.svg
+++ b/docs/test_cases/t30001_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="207px" preserveAspectRatio="none" style="width:725px;height:207px;" version="1.1" viewBox="0 0 725 207" width="725px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fk8ewrf6dpt0b" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1byhqwu5k027u" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -8,39 +8,39 @@
     </filter>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#fk8ewrf6dpt0b)" points="22,24,39,24,46,46.2969,292,46.2969,292,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1byhqwu5k027u)" points="22,24,39,24,46,46.2969,292,46.2969,292,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="46" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="26" y="38.9951">A</text>
-    <polygon fill="#FFFFFF" filter="url(#fk8ewrf6dpt0b)" points="97,67,125,67,132,89.2969,268,89.2969,268,171,97,171,97,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1byhqwu5k027u)" points="97,67,125,67,132,89.2969,268,89.2969,268,171,97,171,97,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="97" x2="132" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="101" y="81.9951">AA</text>
-    <polygon fill="#FFFFFF" filter="url(#fk8ewrf6dpt0b)" points="433,24,449,24,456,46.2969,703,46.2969,703,195,433,195,433,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1byhqwu5k027u)" points="433,24,449,24,456,46.2969,703,46.2969,703,195,433,195,433,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="433" x2="456" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="437" y="38.9951">B</text>
-    <polygon fill="#FFFFFF" filter="url(#fk8ewrf6dpt0b)" points="508,67,536,67,543,89.2969,679,89.2969,679,171,508,171,508,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1byhqwu5k027u)" points="508,67,536,67,543,89.2969,679,89.2969,679,171,508,171,508,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="508" x2="543" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="512" y="81.9951">AA</text>
-    <polygon fill="#FFFFFF" filter="url(#fk8ewrf6dpt0b)" points="198.5,102,237.5,102,244.5,124.2969,251.5,124.2969,251.5,154.5938,198.5,154.5938,198.5,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1byhqwu5k027u)" points="198.5,102,237.5,102,244.5,124.2969,251.5,124.2969,251.5,154.5938,198.5,154.5938,198.5,102" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="198.5" x2="244.5" y1="124.2969" y2="124.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="202.5" y="116.9951">AAA</text>
-    <polygon fill="#FFFFFF" filter="url(#fk8ewrf6dpt0b)" points="113,102,149,102,156,124.2969,163,124.2969,163,154.5938,113,154.5938,113,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1byhqwu5k027u)" points="113,102,149,102,156,124.2969,163,124.2969,163,154.5938,113,154.5938,113,102" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="113" x2="156" y1="124.2969" y2="124.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="117" y="116.9951">BBB</text>
-    <polygon fill="#FFFFFF" filter="url(#fk8ewrf6dpt0b)" points="38,102,64,102,71,124.2969,78,124.2969,78,154.5938,38,154.5938,38,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1byhqwu5k027u)" points="38,102,64,102,71,124.2969,78,124.2969,78,154.5938,38,154.5938,38,102" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="71" y1="124.2969" y2="124.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="42" y="116.9951">BB</text>
-    <polygon fill="#FFFFFF" filter="url(#fk8ewrf6dpt0b)" points="609.5,102,648.5,102,655.5,124.2969,662.5,124.2969,662.5,154.5938,609.5,154.5938,609.5,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1byhqwu5k027u)" points="609.5,102,648.5,102,655.5,124.2969,662.5,124.2969,662.5,154.5938,609.5,154.5938,609.5,102" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="609.5" x2="655.5" y1="124.2969" y2="124.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="613.5" y="116.9951">AAA</text>
-    <polygon fill="#FFFFFF" filter="url(#fk8ewrf6dpt0b)" points="524,102,560,102,567,124.2969,574,124.2969,574,154.5938,524,154.5938,524,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1byhqwu5k027u)" points="524,102,560,102,567,124.2969,574,124.2969,574,154.5938,524,154.5938,524,102" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="524" x2="567" y1="124.2969" y2="124.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="528" y="116.9951">BBB</text>
-    <polygon fill="#FFFFFF" filter="url(#fk8ewrf6dpt0b)" points="449,102,475,102,482,124.2969,489,124.2969,489,154.5938,449,154.5938,449,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1byhqwu5k027u)" points="449,102,475,102,482,124.2969,489,124.2969,489,154.5938,449,154.5938,449,102" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="449" x2="482" y1="124.2969" y2="124.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="453" y="116.9951">BB</text>
-    <path d="M308,116 L308,141.1328 L414,141.1328 L414,126 L404,116 L308,116 " fill="#FBFB77" filter="url(#fk8ewrf6dpt0b)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M308,116 L308,141.1328 L414,141.1328 L414,126 L404,116 L308,116 " fill="#FBFB77" filter="url(#f1byhqwu5k027u)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M404,116 L404,126 L414,126 L404,116 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="314" y="133.0669">A AAA note...</text>
-    <path d="M251.56,128.5 C270.37,128.5 289.18,128.5 307.99,128.5 " fill="none" id="C_0000000691-GMN542" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M251.56,128.5 C270.37,128.5 289.18,128.5 307.99,128.5 " fill="none" id="C_0000000693-GMN540" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30002_package.svg b/docs/test_cases/t30002_package.svg
index 1c52a720..3fca4f33 100644
--- a/docs/test_cases/t30002_package.svg
+++ b/docs/test_cases/t30002_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:1118px;height:402px;" version="1.1" viewBox="0 0 1118 402" width="1118px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fz24bx4tbiahm" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1dho40njw5wuy" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -8,85 +8,85 @@
     </filter>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="22,219,39,219,46,241.2969,1096,241.2969,1096,390,22,390,22,219" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1dho40njw5wuy)" points="22,219,39,219,46,241.2969,1096,241.2969,1096,390,22,390,22,219" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="46" y1="241.2969" y2="241.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="26" y="233.9951">A</text>
-    <polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="46,262,74,262,81,284.2969,1072,284.2969,1072,366,46,366,46,262" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1dho40njw5wuy)" points="46,262,74,262,81,284.2969,1072,284.2969,1072,366,46,366,46,262" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="81" y1="284.2969" y2="284.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="50" y="276.9951">AA</text>
-    <polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="514,24,530,24,537,46.2969,644,46.2969,644,195,514,195,514,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1dho40njw5wuy)" points="514,24,530,24,537,46.2969,644,46.2969,644,195,514,195,514,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="514" x2="537" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="518" y="38.9951">B</text>
-    <polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="538,67,564,67,571,89.2969,620,89.2969,620,171,538,171,538,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1dho40njw5wuy)" points="538,67,564,67,571,89.2969,620,89.2969,620,171,538,171,538,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="538" x2="571" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="542" y="81.9951">BB</text>
-    <polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="1014.5,297,1041.5,297,1048.5,319.2969,1055.5,319.2969,1055.5,349.5938,1014.5,349.5938,1014.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1dho40njw5wuy)" points="1014.5,297,1041.5,297,1048.5,319.2969,1055.5,319.2969,1055.5,349.5938,1014.5,349.5938,1014.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="1014.5" x2="1048.5" y1="319.2969" y2="319.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1018.5" y="311.9951">A1</text>
-    <polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="938.5,297,965.5,297,972.5,319.2969,979.5,319.2969,979.5,349.5938,938.5,349.5938,938.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1dho40njw5wuy)" points="938.5,297,965.5,297,972.5,319.2969,979.5,319.2969,979.5,349.5938,938.5,349.5938,938.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="938.5" x2="972.5" y1="319.2969" y2="319.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="942.5" y="311.9951">A2</text>
-    <polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="862.5,297,889.5,297,896.5,319.2969,903.5,319.2969,903.5,349.5938,862.5,349.5938,862.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1dho40njw5wuy)" points="862.5,297,889.5,297,896.5,319.2969,903.5,319.2969,903.5,349.5938,862.5,349.5938,862.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="862.5" x2="896.5" y1="319.2969" y2="319.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="866.5" y="311.9951">A3</text>
-    <polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="786.5,297,813.5,297,820.5,319.2969,827.5,319.2969,827.5,349.5938,786.5,349.5938,786.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1dho40njw5wuy)" points="786.5,297,813.5,297,820.5,319.2969,827.5,319.2969,827.5,349.5938,786.5,349.5938,786.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="786.5" x2="820.5" y1="319.2969" y2="319.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="790.5" y="311.9951">A4</text>
-    <polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="710.5,297,737.5,297,744.5,319.2969,751.5,319.2969,751.5,349.5938,710.5,349.5938,710.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1dho40njw5wuy)" points="710.5,297,737.5,297,744.5,319.2969,751.5,319.2969,751.5,349.5938,710.5,349.5938,710.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="710.5" x2="744.5" y1="319.2969" y2="319.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="714.5" y="311.9951">A5</text>
-    <polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="634.5,297,661.5,297,668.5,319.2969,675.5,319.2969,675.5,349.5938,634.5,349.5938,634.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1dho40njw5wuy)" points="634.5,297,661.5,297,668.5,319.2969,675.5,319.2969,675.5,349.5938,634.5,349.5938,634.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="634.5" x2="668.5" y1="319.2969" y2="319.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="638.5" y="311.9951">A6</text>
-    <polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="558.5,297,585.5,297,592.5,319.2969,599.5,319.2969,599.5,349.5938,558.5,349.5938,558.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1dho40njw5wuy)" points="558.5,297,585.5,297,592.5,319.2969,599.5,319.2969,599.5,349.5938,558.5,349.5938,558.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="558.5" x2="592.5" y1="319.2969" y2="319.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="562.5" y="311.9951">A7</text>
-    <polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="482.5,297,509.5,297,516.5,319.2969,523.5,319.2969,523.5,349.5938,482.5,349.5938,482.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1dho40njw5wuy)" points="482.5,297,509.5,297,516.5,319.2969,523.5,319.2969,523.5,349.5938,482.5,349.5938,482.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="482.5" x2="516.5" y1="319.2969" y2="319.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="486.5" y="311.9951">A8</text>
-    <polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="406.5,297,433.5,297,440.5,319.2969,447.5,319.2969,447.5,349.5938,406.5,349.5938,406.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1dho40njw5wuy)" points="406.5,297,433.5,297,440.5,319.2969,447.5,319.2969,447.5,349.5938,406.5,349.5938,406.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="406.5" x2="440.5" y1="319.2969" y2="319.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="410.5" y="311.9951">A9</text>
-    <polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="320.5,297,357.5,297,364.5,319.2969,371.5,319.2969,371.5,349.5938,320.5,349.5938,320.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1dho40njw5wuy)" points="320.5,297,357.5,297,364.5,319.2969,371.5,319.2969,371.5,349.5938,320.5,349.5938,320.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="320.5" x2="364.5" y1="319.2969" y2="319.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="324.5" y="311.9951">A10</text>
-    <polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="234.5,297,271.5,297,278.5,319.2969,285.5,319.2969,285.5,349.5938,234.5,349.5938,234.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1dho40njw5wuy)" points="234.5,297,271.5,297,278.5,319.2969,285.5,319.2969,285.5,349.5938,234.5,349.5938,234.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="234.5" x2="278.5" y1="319.2969" y2="319.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="238.5" y="311.9951">A11</text>
-    <polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="148.5,297,185.5,297,192.5,319.2969,199.5,319.2969,199.5,349.5938,148.5,349.5938,148.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1dho40njw5wuy)" points="148.5,297,185.5,297,192.5,319.2969,199.5,319.2969,199.5,349.5938,148.5,349.5938,148.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="148.5" x2="192.5" y1="319.2969" y2="319.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="152.5" y="311.9951">A12</text>
-    <polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="62.5,297,99.5,297,106.5,319.2969,113.5,319.2969,113.5,349.5938,62.5,349.5938,62.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1dho40njw5wuy)" points="62.5,297,99.5,297,106.5,319.2969,113.5,319.2969,113.5,349.5938,62.5,349.5938,62.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="62.5" x2="106.5" y1="319.2969" y2="319.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="66.5" y="311.9951">A13</text>
-    <polygon fill="#FFFFFF" filter="url(#fz24bx4tbiahm)" points="554,102,590,102,597,124.2969,604,124.2969,604,154.5938,554,154.5938,554,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1dho40njw5wuy)" points="554,102,590,102,597,124.2969,604,124.2969,604,154.5938,554,154.5938,554,102" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="554" x2="597" y1="124.2969" y2="124.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="558" y="116.9951">BBB</text>
-    <path d="M604.25,131.16 C685.35,136.98 937.39,158.99 997,211 C1020.16,231.21 1029.23,266.13 1032.76,291.51 " fill="none" id="C_0000000716-&gt;C_0000000701" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M604.25,131.16 C685.35,136.98 937.39,158.99 997,211 C1020.16,231.21 1029.23,266.13 1032.76,291.51 " fill="none" id="C_0000000720-&gt;C_0000000705" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="1033.43,296.78,1036.2428,287.3413,1032.7888,291.8213,1028.3088,288.3673,1033.43,296.78" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M604.07,132.33 C674.78,140.79 873.7,167.98 921,211 C943.74,231.68 952.88,266.52 956.54,291.75 " fill="none" id="C_0000000716-&gt;C_0000000702" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M604.07,132.33 C674.78,140.79 873.7,167.98 921,211 C943.74,231.68 952.88,266.52 956.54,291.75 " fill="none" id="C_0000000720-&gt;C_0000000706" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="957.25,296.99,960.0326,287.5424,956.5929,292.0334,952.102,288.5937,957.25,296.99" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M604.38,129.96 C656.6,132.28 776.85,144.94 845,211 C866.93,232.26 876.21,266.67 880.13,291.65 " fill="none" id="C_0000000716-&gt;C_0000000703" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M604.38,129.96 C656.6,132.28 776.85,144.94 845,211 C866.93,232.26 876.21,266.67 880.13,291.65 " fill="none" id="C_0000000720-&gt;C_0000000707" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="880.89,296.83,883.5655,287.3515,880.1769,291.8811,875.6473,288.4925,880.89,296.83" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M604.33,133.59 C644.75,141.41 723.88,162.28 769,211 C789.63,233.27 799.11,267.21 803.44,291.79 " fill="none" id="C_0000000716-&gt;C_0000000704" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M604.33,133.59 C644.75,141.41 723.88,162.28 769,211 C789.63,233.27 799.11,267.21 803.44,291.79 " fill="none" id="C_0000000720-&gt;C_0000000708" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="804.28,296.88,806.7325,287.3414,803.4511,291.9492,798.8433,288.6677,804.28,296.88" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M604.31,141.6 C630.08,155.14 669.48,179.37 693,211 C710.88,235.06 720.75,268.12 725.91,291.99 " fill="none" id="C_0000000716-&gt;C_0000000705" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M604.31,141.6 C630.08,155.14 669.48,179.37 693,211 C710.88,235.06 720.75,268.12 725.91,291.99 " fill="none" id="C_0000000720-&gt;C_0000000709" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="726.94,296.93,729.0001,287.299,725.9099,292.0373,721.1717,288.9471,726.94,296.93" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M579,155.13 C579,190.31 579,253.51 579,291.37 " fill="none" id="C_0000000716-&gt;C_0000000707" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M579,155.13 C579,190.31 579,253.51 579,291.37 " fill="none" id="C_0000000720-&gt;C_0000000711" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="579,296.77,583,287.77,579,291.77,575,287.77,579,296.77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M566.13,155.25 C558.4,171.13 548.63,192.03 541,211 C530.15,237.99 519.62,269.41 512.41,292 " fill="none" id="C_0000000716-&gt;C_0000000708" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M566.13,155.25 C558.4,171.13 548.63,192.03 541,211 C530.15,237.99 519.62,269.41 512.41,292 " fill="none" id="C_0000000720-&gt;C_0000000712" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="510.83,296.97,517.3651,289.6016,512.3425,292.2042,509.7399,287.1817,510.83,296.97" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M553.69,141.6 C527.92,155.14 488.52,179.37 465,211 C447.12,235.06 437.25,268.12 432.09,291.99 " fill="none" id="C_0000000716-&gt;C_0000000709" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M553.69,141.6 C527.92,155.14 488.52,179.37 465,211 C447.12,235.06 437.25,268.12 432.09,291.99 " fill="none" id="C_0000000720-&gt;C_0000000713" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="431.06,296.93,436.8283,288.9471,432.0901,292.0373,428.9999,287.299,431.06,296.93" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M591.87,155.25 C599.6,171.13 609.37,192.03 617,211 C627.85,237.99 638.38,269.41 645.59,292 " fill="none" id="C_0000000716-&gt;C_0000000706" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M591.87,155.25 C599.6,171.13 609.37,192.03 617,211 C627.85,237.99 638.38,269.41 645.59,292 " fill="none" id="C_0000000720-&gt;C_0000000710" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="647.17,296.97,648.2601,287.1817,645.6575,292.2042,640.6349,289.6016,647.17,296.97" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M553.89,133.8 C513.78,141.91 435.07,163.18 389,211 C367.63,233.18 356.59,267.13 351.08,291.74 " fill="none" id="C_0000000716-&gt;C_0000000710" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M553.89,133.8 C513.78,141.91 435.07,163.18 389,211 C367.63,233.18 356.59,267.13 351.08,291.74 " fill="none" id="C_0000000720-&gt;C_0000000714" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="349.98,296.84,355.7929,288.8895,351.0374,291.9531,347.9738,287.1976,349.98,296.84" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M553.71,129.84 C500.42,131.92 375.54,144.11 303,211 C280.22,232.01 269.38,266.46 264.31,291.52 " fill="none" id="C_0000000716-&gt;C_0000000711" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M553.71,129.84 C500.42,131.92 375.54,144.11 303,211 C280.22,232.01 269.38,266.46 264.31,291.52 " fill="none" id="C_0000000720-&gt;C_0000000715" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="263.31,296.71,268.9342,288.6249,264.2521,291.7996,261.0775,287.1175,263.31,296.71" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M553.88,132.08 C480.5,140.08 268.39,166.64 217,211 C193.29,231.46 182.59,266.56 177.8,291.91 " fill="none" id="C_0000000716-&gt;C_0000000712" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M553.88,132.08 C480.5,140.08 268.39,166.64 217,211 C193.29,231.46 182.59,266.56 177.8,291.91 " fill="none" id="C_0000000720-&gt;C_0000000716" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="176.92,296.85,182.4259,288.6839,177.7906,291.9264,174.5481,287.291,176.92,296.85" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M553.84,130.9 C469.23,136.06 196.62,156.69 131,211 C106.87,230.97 96.25,266.15 91.59,291.66 " fill="none" id="C_0000000716-&gt;C_0000000713" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M553.84,130.9 C469.23,136.06 196.62,156.69 131,211 C106.87,230.97 96.25,266.15 91.59,291.66 " fill="none" id="C_0000000720-&gt;C_0000000717" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="90.74,296.63,96.1999,288.4331,91.5828,291.7015,88.3143,287.0845,90.74,296.63" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30003_package.svg b/docs/test_cases/t30003_package.svg
index 5c271413..ff4b1151 100644
--- a/docs/test_cases/t30003_package.svg
+++ b/docs/test_cases/t30003_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="351px" preserveAspectRatio="none" style="width:341px;height:351px;" version="1.1" viewBox="0 0 341 351" width="341px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1pqtan3x8or3r" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fn2lwun51d0tj" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -8,27 +8,27 @@
     </filter>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1pqtan3x8or3r)" points="22,235,57,235,64,257.2969,319,257.2969,319,339,22,339,22,235" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fn2lwun51d0tj)" points="22,235,57,235,64,257.2969,319,257.2969,319,339,22,339,22,235" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="257.2969" y2="257.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="249.9951">ns1</text>
-    <polygon fill="#FFFFFF" filter="url(#f1pqtan3x8or3r)" points="183,24,218,24,225,46.2969,313,46.2969,313,211,183,211,183,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fn2lwun51d0tj)" points="183,24,218,24,225,46.2969,313,46.2969,313,211,183,211,183,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="183" x2="225" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="187" y="38.9951">ns3</text>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="203" y="61.292">«deprecated»</text>
-    <polygon fill="#FFFFFF" filter="url(#f1pqtan3x8or3r)" points="207,83,242,83,249,105.2969,289,105.2969,289,187,207,187,207,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fn2lwun51d0tj)" points="207,83,242,83,249,105.2969,289,105.2969,289,187,207,187,207,83" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="207" x2="249" y1="105.2969" y2="105.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="211" y="97.9951">ns1</text>
-    <polygon fill="#FFFFFF" filter="url(#f1pqtan3x8or3r)" points="193.5,270,288.5,270,295.5,292.2969,302.5,292.2969,302.5,322.5938,193.5,322.5938,193.5,270" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fn2lwun51d0tj)" points="193.5,270,288.5,270,295.5,292.2969,302.5,292.2969,302.5,322.5938,193.5,322.5938,193.5,270" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="193.5" x2="295.5" y1="292.2969" y2="292.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="89" x="197.5" y="284.9951">ns2_v1_0_0</text>
-    <polygon fill="#FFFFFF" filter="url(#f1pqtan3x8or3r)" points="38,270,133,270,140,292.2969,158,292.2969,158,322.5938,38,322.5938,38,270" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fn2lwun51d0tj)" points="38,270,133,270,140,292.2969,158,292.2969,158,322.5938,38,322.5938,38,270" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="140" y1="292.2969" y2="292.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="89" x="42" y="284.9951">ns2_v0_9_0</text>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="53" y="307.292">«deprecated»</text>
-    <polygon fill="#FFFFFF" filter="url(#f1pqtan3x8or3r)" points="223.5,118,258.5,118,265.5,140.2969,272.5,140.2969,272.5,170.5938,223.5,170.5938,223.5,118" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fn2lwun51d0tj)" points="223.5,118,258.5,118,265.5,140.2969,272.5,140.2969,272.5,170.5938,223.5,170.5938,223.5,118" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="223.5" x2="265.5" y1="140.2969" y2="140.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="227.5" y="132.9951">ns2</text>
-    <path d="M248,171.29 C248,197.04 248,236.67 248,264.21 " fill="none" id="C_0000000722-&gt;C_0000000718" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M248,171.29 C248,197.04 248,236.67 248,264.21 " fill="none" id="C_0000000728-&gt;C_0000000724" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="248,269.55,252,260.55,248,264.55,244,260.55,248,269.55" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30004_package.svg b/docs/test_cases/t30004_package.svg
index c31fa15a..b3ae59d8 100644
--- a/docs/test_cases/t30004_package.svg
+++ b/docs/test_cases/t30004_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="338px" preserveAspectRatio="none" style="width:701px;height:338px;" version="1.1" viewBox="0 0 701 338" width="701px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1hab37w8l979v" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1slfj4ph0v91v" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -8,40 +8,40 @@
     </filter>
   </defs>
   <g>
-    <polygon fill="#008000" filter="url(#f1hab37w8l979v)" points="22,24,39,24,46,46.2969,679,46.2969,679,326,22,326,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#008000" filter="url(#f1slfj4ph0v91v)" points="22,24,39,24,46,46.2969,679,46.2969,679,326,22,326,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="46" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="26" y="38.9951">A</text>
-    <path d="M38,186 L38,211.1328 L148,211.1328 L148,196 L138,186 L38,186 " fill="#FBFB77" filter="url(#f1hab37w8l979v)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M38,186 L38,211.1328 L148,211.1328 L148,196 L138,186 L38,186 " fill="#FBFB77" filter="url(#f1slfj4ph0v91v)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M138,186 L138,196 L148,196 L138,186 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="44" y="203.0669">Package AAA.</text>
-    <path d="M553,73 L553,98.1328 L663,98.1328 L663,83 L653,73 L553,73 " fill="#FBFB77" filter="url(#f1hab37w8l979v)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M553,73 L553,98.1328 L663,98.1328 L663,83 L653,73 L553,73 " fill="#FBFB77" filter="url(#f1slfj4ph0v91v)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M653,73 L653,83 L663,83 L653,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="559" y="90.0669">Package BBB.</text>
-    <path d="M287,285 L287,310.1328 L439,310.1328 L439,295 L429,285 L287,285 " fill="#FBFB77" filter="url(#f1hab37w8l979v)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M287,285 L287,310.1328 L439,310.1328 L439,295 L429,285 L287,285 " fill="#FBFB77" filter="url(#f1slfj4ph0v91v)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M429,285 L429,295 L439,295 L429,285 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="293" y="302.0669">CCCC package note.</text>
-    <path d="M293,73 L293,98.1328 L433,98.1328 L433,83 L423,73 L293,73 " fill="#FBFB77" filter="url(#f1hab37w8l979v)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M293,73 L293,98.1328 L433,98.1328 L433,83 L423,73 L293,73 " fill="#FBFB77" filter="url(#f1slfj4ph0v91v)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M423,73 L423,83 L433,83 L423,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="119" x="299" y="90.0669">Another CCC note.</text>
-    <path d="M126.5,73 L126.5,98.1328 L257.5,98.1328 L257.5,83 L247.5,73 L126.5,73 " fill="#FBFB77" filter="url(#f1hab37w8l979v)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M126.5,73 L126.5,98.1328 L257.5,98.1328 L257.5,83 L247.5,73 L126.5,73 " fill="#FBFB77" filter="url(#f1slfj4ph0v91v)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M247.5,73 L247.5,83 L257.5,83 L247.5,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="110" x="132.5" y="90.0669">We skipped DDD.</text>
-    <polygon fill="#FFFFFF" filter="url(#f1hab37w8l979v)" points="38.5,59,77.5,59,84.5,81.2969,91.5,81.2969,91.5,111.5938,38.5,111.5938,38.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1slfj4ph0v91v)" points="38.5,59,77.5,59,84.5,81.2969,91.5,81.2969,91.5,111.5938,38.5,111.5938,38.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="84.5" y1="81.2969" y2="81.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="42.5" y="73.9951">AAA</text>
-    <polygon fill="#FFFFFF" filter="url(#f1hab37w8l979v)" points="468,59,504,59,511,81.2969,518,81.2969,518,111.5938,468,111.5938,468,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1slfj4ph0v91v)" points="468,59,504,59,511,81.2969,518,81.2969,518,111.5938,468,111.5938,468,59" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="468" x2="511" y1="81.2969" y2="81.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="472" y="73.9951">BBB</text>
-    <polygon fill="#FFFFFF" filter="url(#f1hab37w8l979v)" points="336.5,172,375.5,172,382.5,194.2969,389.5,194.2969,389.5,224.5938,336.5,224.5938,336.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1slfj4ph0v91v)" points="336.5,172,375.5,172,382.5,194.2969,389.5,194.2969,389.5,224.5938,336.5,224.5938,336.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="336.5" x2="382.5" y1="194.2969" y2="194.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="340.5" y="186.9951">CCC</text>
-    <polygon fill="#FFC0CB" filter="url(#f1hab37w8l979v)" points="183.5,172,216.5,172,223.5,194.2969,230.5,194.2969,230.5,224.5938,183.5,224.5938,183.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFC0CB" filter="url(#f1slfj4ph0v91v)" points="183.5,172,216.5,172,223.5,194.2969,230.5,194.2969,230.5,224.5938,183.5,224.5938,183.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="183.5" x2="223.5" y1="194.2969" y2="194.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="27" x="187.5" y="186.9951">EEE</text>
-    <path d="M71.49,112.24 C77.34,135.43 85.67,168.45 90.05,185.8 " fill="none" id="C_0000000724-GMN608" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M518.16,85.5 C529.74,85.5 541.32,85.5 552.9,85.5 " fill="none" id="C_0000000725-GMN612" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M363,225.24 C363,244.55 363,270.08 363,284.75 " fill="none" id="C_0000000726-GMN616" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M363,98.38 C363,115.83 363,148.82 363,171.93 " fill="none" id="GMN619-C_0000000726" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M193.61,98.38 C195.96,115.83 200.42,148.82 203.54,171.93 " fill="none" id="GMN623-C_0000000728" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M71.49,112.24 C77.34,135.43 85.67,168.45 90.05,185.8 " fill="none" id="C_0000000732-GMN606" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M518.16,85.5 C529.74,85.5 541.32,85.5 552.9,85.5 " fill="none" id="C_0000000733-GMN610" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M363,225.24 C363,244.55 363,270.08 363,284.75 " fill="none" id="C_0000000734-GMN614" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M363,98.38 C363,115.83 363,148.82 363,171.93 " fill="none" id="GMN617-C_0000000734" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M193.61,98.38 C195.96,115.83 200.42,148.82 203.54,171.93 " fill="none" id="GMN621-C_0000000736" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30005_package.svg b/docs/test_cases/t30005_package.svg
index 961fed2c..6c275b65 100644
--- a/docs/test_cases/t30005_package.svg
+++ b/docs/test_cases/t30005_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:332px;height:402px;" version="1.1" viewBox="0 0 332 402" width="332px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f6lu3aa03o8np" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f104zankkvq8ac" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -8,36 +8,36 @@
     </filter>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f6lu3aa03o8np)" points="98,219,115,219,122,241.2969,232,241.2969,232,390,98,390,98,219" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f104zankkvq8ac)" points="98,219,115,219,122,241.2969,232,241.2969,232,390,98,390,98,219" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="98" x2="122" y1="241.2969" y2="241.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="102" y="233.9951">A</text>
-    <polygon fill="#FFFFFF" filter="url(#f6lu3aa03o8np)" points="122,262,150,262,157,284.2969,208,284.2969,208,366,122,366,122,262" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f104zankkvq8ac)" points="122,262,150,262,157,284.2969,208,284.2969,208,366,122,366,122,262" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="122" x2="157" y1="284.2969" y2="284.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="126" y="276.9951">AA</text>
-    <polygon fill="#FFFFFF" filter="url(#f6lu3aa03o8np)" points="22,24,38,24,45,46.2969,152,46.2969,152,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f104zankkvq8ac)" points="22,24,38,24,45,46.2969,152,46.2969,152,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="45" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="26" y="38.9951">B</text>
-    <polygon fill="#FFFFFF" filter="url(#f6lu3aa03o8np)" points="46,67,72,67,79,89.2969,128,89.2969,128,171,46,171,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f104zankkvq8ac)" points="46,67,72,67,79,89.2969,128,89.2969,128,171,46,171,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="79" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="50" y="81.9951">BB</text>
-    <polygon fill="#FFFFFF" filter="url(#f6lu3aa03o8np)" points="176,24,193,24,200,46.2969,310,46.2969,310,195,176,195,176,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f104zankkvq8ac)" points="176,24,193,24,200,46.2969,310,46.2969,310,195,176,195,176,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="176" x2="200" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="180" y="38.9951">C</text>
-    <polygon fill="#FFFFFF" filter="url(#f6lu3aa03o8np)" points="200,67,228,67,235,89.2969,286,89.2969,286,171,200,171,200,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f104zankkvq8ac)" points="200,67,228,67,235,89.2969,286,89.2969,286,171,200,171,200,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="200" x2="235" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="204" y="81.9951">CC</text>
-    <polygon fill="#FFFFFF" filter="url(#f6lu3aa03o8np)" points="138.5,297,177.5,297,184.5,319.2969,191.5,319.2969,191.5,349.5938,138.5,349.5938,138.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f104zankkvq8ac)" points="138.5,297,177.5,297,184.5,319.2969,191.5,319.2969,191.5,349.5938,138.5,349.5938,138.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="138.5" x2="184.5" y1="319.2969" y2="319.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="142.5" y="311.9951">AAA</text>
-    <polygon fill="#FFFFFF" filter="url(#f6lu3aa03o8np)" points="62,102,98,102,105,124.2969,112,124.2969,112,154.5938,62,154.5938,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f104zankkvq8ac)" points="62,102,98,102,105,124.2969,112,124.2969,112,154.5938,62,154.5938,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="62" x2="105" y1="124.2969" y2="124.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="66" y="116.9951">BBB</text>
-    <polygon fill="#FFFFFF" filter="url(#f6lu3aa03o8np)" points="216.5,102,255.5,102,262.5,124.2969,269.5,124.2969,269.5,154.5938,216.5,154.5938,216.5,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f104zankkvq8ac)" points="216.5,102,255.5,102,262.5,124.2969,269.5,124.2969,269.5,154.5938,216.5,154.5938,216.5,102" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="216.5" x2="262.5" y1="124.2969" y2="124.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="220.5" y="116.9951">CCC</text>
-    <path d="M97.36,155.13 C111.64,190.46 137.33,254.03 152.61,291.83 " fill="none" id="C_0000000735-&gt;C_0000000732" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M97.36,155.13 C111.64,190.46 137.33,254.03 152.61,291.83 " fill="none" id="C_0000000745-&gt;C_0000000742" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="154.6,296.77,154.9193,286.9263,152.7185,292.1375,147.5073,289.9367,154.6,296.77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M232.64,155.13 C218.36,190.46 192.67,254.03 177.39,291.83 " fill="none" id="C_0000000738-&gt;C_0000000732" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M232.64,155.13 C218.36,190.46 192.67,254.03 177.39,291.83 " fill="none" id="C_0000000748-&gt;C_0000000742" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="175.4,296.77,182.4927,289.9367,177.2815,292.1375,175.0807,286.9263,175.4,296.77" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30006_package.svg b/docs/test_cases/t30006_package.svg
index bdb0cbb4..70c21ea4 100644
--- a/docs/test_cases/t30006_package.svg
+++ b/docs/test_cases/t30006_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="270px" preserveAspectRatio="none" style="width:268px;height:270px;" version="1.1" viewBox="0 0 268 270" width="268px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fmo0wqdzpar6h" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f182d26j1m2fjs" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -8,26 +8,26 @@
     </filter>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#fmo0wqdzpar6h)" points="6,206,22,206,29,228.2969,36,228.2969,36,258.5938,6,258.5938,6,206" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f182d26j1m2fjs)" points="6,206,22,206,29,228.2969,36,228.2969,36,258.5938,6,258.5938,6,206" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="6" x2="29" y1="228.2969" y2="228.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="10" y="220.9951">B</text>
-    <polygon fill="#FFFFFF" filter="url(#fmo0wqdzpar6h)" points="71.5,93,88.5,93,95.5,115.2969,102.5,115.2969,102.5,145.5938,71.5,145.5938,71.5,93" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f182d26j1m2fjs)" points="71.5,93,88.5,93,95.5,115.2969,102.5,115.2969,102.5,145.5938,71.5,145.5938,71.5,93" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="71.5" x2="95.5" y1="115.2969" y2="115.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="75.5" y="107.9951">A</text>
-    <polygon fill="#FFFFFF" filter="url(#fmo0wqdzpar6h)" points="71.5,206,88.5,206,95.5,228.2969,102.5,228.2969,102.5,258.5938,71.5,258.5938,71.5,206" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f182d26j1m2fjs)" points="71.5,206,88.5,206,95.5,228.2969,102.5,228.2969,102.5,258.5938,71.5,258.5938,71.5,206" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="71.5" x2="95.5" y1="228.2969" y2="228.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="75.5" y="220.9951">C</text>
-    <path d="M40,8 L40,33.1328 L134,33.1328 L134,18 L124,8 L40,8 " fill="#FBFB77" filter="url(#fmo0wqdzpar6h)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M40,8 L40,33.1328 L134,33.1328 L134,18 L124,8 L40,8 " fill="#FBFB77" filter="url(#f182d26j1m2fjs)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M124,8 L124,18 L134,18 L124,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="73" x="46" y="25.0669">Top A note.</text>
-    <path d="M137.5,220 L137.5,245.1328 L256.5,245.1328 L256.5,230 L246.5,220 L137.5,220 " fill="#FBFB77" filter="url(#fmo0wqdzpar6h)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M137.5,220 L137.5,245.1328 L256.5,245.1328 L256.5,230 L246.5,220 L137.5,220 " fill="#FBFB77" filter="url(#f182d26j1m2fjs)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M246.5,220 L246.5,230 L256.5,230 L246.5,220 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="143.5" y="237.0669">Bottom A note.</text>
-    <path d="M87,33.01 C87,47.66 87,73.41 87,92.83 " fill="none" id="GMN646-C_0000000740" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M102.76,136.4 C125.1,158.94 165.45,199.66 185.31,219.71 " fill="none" id="C_0000000740-GMN649" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M71.69,146.24 C61.86,162.78 49.06,184.31 38.78,201.6 " fill="none" id="C_0000000740-&gt;C_0000000739" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M87,33.01 C87,47.66 87,73.41 87,92.83 " fill="none" id="GMN644-C_0000000752" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M102.76,136.4 C125.1,158.94 165.45,199.66 185.31,219.71 " fill="none" id="C_0000000752-GMN647" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M71.69,146.24 C61.86,162.78 49.06,184.31 38.78,201.6 " fill="none" id="C_0000000752-&gt;C_0000000751" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="36.22,205.89,44.2665,200.2108,38.7819,201.5962,37.3965,196.1117,36.22,205.89" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M87,146.24 C87,162.5 87,183.58 87,200.71 " fill="none" id="C_0000000740-&gt;C_0000000741" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M87,146.24 C87,162.5 87,183.58 87,200.71 " fill="none" id="C_0000000752-&gt;C_0000000753" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="87,205.89,91.0257,196.9015,87.0143,200.89,83.0257,196.8786,87,205.89" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30007_package.svg b/docs/test_cases/t30007_package.svg
index 5ab9d3b9..273ed380 100644
--- a/docs/test_cases/t30007_package.svg
+++ b/docs/test_cases/t30007_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="277px" preserveAspectRatio="none" style="width:269px;height:277px;" version="1.1" viewBox="0 0 269 277" width="269px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fxdcq8s9hnnhp" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f6p99a2yii9jj" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -8,29 +8,29 @@
     </filter>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#fxdcq8s9hnnhp)" points="42.5,57,59.5,57,66.5,79.2969,151.5,79.2969,151.5,177,42.5,177,42.5,57" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f6p99a2yii9jj)" points="42.5,57,59.5,57,66.5,79.2969,151.5,79.2969,151.5,177,42.5,177,42.5,57" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="42.5" x2="66.5" y1="79.2969" y2="79.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="46.5" y="71.9951">A</text>
-    <polygon fill="#FFFFFF" filter="url(#fxdcq8s9hnnhp)" points="72.5,213,88.5,213,95.5,235.2969,102.5,235.2969,102.5,265.5938,72.5,265.5938,72.5,213" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f6p99a2yii9jj)" points="72.5,213,88.5,213,95.5,235.2969,102.5,235.2969,102.5,265.5938,72.5,265.5938,72.5,213" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="72.5" x2="95.5" y1="235.2969" y2="235.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="76.5" y="227.9951">B</text>
-    <polygon fill="#FFFFFF" filter="url(#fxdcq8s9hnnhp)" points="66.5,100,94.5,100,101.5,122.2969,108.5,122.2969,108.5,152.5938,66.5,152.5938,66.5,100" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f6p99a2yii9jj)" points="66.5,100,94.5,100,101.5,122.2969,108.5,122.2969,108.5,152.5938,66.5,152.5938,66.5,100" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="66.5" x2="101.5" y1="122.2969" y2="122.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="70.5" y="114.9951">AA</text>
-    <polygon fill="#FFFFFF" filter="url(#fxdcq8s9hnnhp)" points="6,213,23,213,30,235.2969,37,235.2969,37,265.5938,6,265.5938,6,213" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f6p99a2yii9jj)" points="6,213,23,213,30,235.2969,37,235.2969,37,265.5938,6,265.5938,6,213" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="6" x2="30" y1="235.2969" y2="235.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="10" y="227.9951">C</text>
-    <path d="M41,8 L41,33.1328 L246,33.1328 L246,18 L236,8 L41,8 " fill="#FBFB77" filter="url(#fxdcq8s9hnnhp)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M41,8 L41,33.1328 L246,33.1328 L246,18 L236,8 L41,8 " fill="#FBFB77" filter="url(#f6p99a2yii9jj)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M236,8 L236,18 L246,18 L236,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="184" x="47" y="25.0669">Compare layout with t30006.</text>
-    <path d="M138,227 L138,252.1328 L257,252.1328 L257,237 L247,227 L138,227 " fill="#FBFB77" filter="url(#fxdcq8s9hnnhp)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M138,227 L138,252.1328 L257,252.1328 L257,237 L247,227 L138,227 " fill="#FBFB77" filter="url(#f6p99a2yii9jj)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M247,227 L247,237 L257,237 L247,227 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="144" y="244.0669">Bottom A note.</text>
-    <path d="M143.5,33.03 C143.5,36.3613 143.5,40.2728 143.5,44.5714 C143.5,46.7207 143.5,48.9668 143.5,51.2855 C143.5,52.4448 143.5,53.6223 143.5,54.8149 C143.5,55.4112 143.5,56.0113 143.5,56.6148 " fill="none" id="GMN661-C_0000000744" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M151.6607,144.277 C151.7219,144.403 151.7835,144.5295 151.8453,144.6565 C152.0924,145.1647 152.3437,145.6812 152.5988,146.2057 C153.6194,148.3036 154.7021,150.5292 155.8341,152.8563 C158.0983,157.5105 160.56,162.5706 163.1175,167.8275 C173.3475,188.855 185.11,213.03 191.89,226.96 " fill="none" id="C_0000000744-GMN664" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M87.5,153.24 C87.5,169.5 87.5,190.58 87.5,207.71 " fill="none" id="C_0000000745-&gt;C_0000000743" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M143.5,33.03 C143.5,36.3613 143.5,40.2728 143.5,44.5714 C143.5,46.7207 143.5,48.9668 143.5,51.2855 C143.5,52.4448 143.5,53.6223 143.5,54.8149 C143.5,55.4112 143.5,56.0113 143.5,56.6148 " fill="none" id="GMN659-C_0000000758" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M151.6607,144.277 C151.7219,144.403 151.7835,144.5295 151.8453,144.6565 C152.0924,145.1647 152.3437,145.6812 152.5988,146.2057 C153.6194,148.3036 154.7021,150.5292 155.8341,152.8563 C158.0983,157.5105 160.56,162.5706 163.1175,167.8275 C173.3475,188.855 185.11,213.03 191.89,226.96 " fill="none" id="C_0000000758-GMN662" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M87.5,153.24 C87.5,169.5 87.5,190.58 87.5,207.71 " fill="none" id="C_0000000759-&gt;C_0000000757" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="87.5,212.89,91.5257,203.9015,87.5143,207.89,83.5257,203.8786,87.5,212.89" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M66.45,146.33 C53.17,163.28 37.63,188.49 27.99,208.26 " fill="none" id="C_0000000745-&gt;C_0000000746" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M66.45,146.33 C53.17,163.28 37.63,188.49 27.99,208.26 " fill="none" id="C_0000000759-&gt;C_0000000760" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="25.78,212.9,33.2451,206.4757,27.9186,208.3804,26.0138,203.0539,25.78,212.9" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>