diff --git a/docs/test_cases/t00038_class.svg b/docs/test_cases/t00038_class.svg
index 6422a395..94f88878 100644
--- a/docs/test_cases/t00038_class.svg
+++ b/docs/test_cases/t00038_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="321px" preserveAspectRatio="none" style="width:2230px;height:321px;" version="1.1" viewBox="0 0 2230 321" width="2230px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f17jo3kejapv3w" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1bjjx8uogobse" 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,7 +8,7 @@
     </filter>
   </defs>
   <g>
-    <rect fill="#FEFECE" filter="url(#f17jo3kejapv3w)" height="86.4141" id="C_0000000699" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="187" y="224"/>
+    <rect fill="#FEFECE" filter="url(#f1bjjx8uogobse)" height="86.4141" id="C_0000000699" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="187" y="224"/>
     <ellipse cx="202" cy="240" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M206.1094,246 L198.3906,246 L198.3906,233.6094 L206.1094,233.6094 L206.1094,235.7656 L200.8438,235.7656 L200.8438,238.4375 L205.6094,238.4375 L205.6094,240.5938 L200.8438,240.5938 L200.8438,243.8438 L206.1094,243.8438 L206.1094,246 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="142" x="216" y="244.1543">thirdparty::ns1::color_t</text>
@@ -17,13 +17,13 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="193" y="283.0151">green</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="24" x="193" y="295.8198">blue</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="188" x2="360" y1="302.4141" y2="302.4141"/>
-    <rect fill="#FEFECE" filter="url(#f17jo3kejapv3w)" height="48" id="C_0000000701" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="1959" y="8"/>
-    <ellipse cx="1974" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1976.9688,29.6406 Q1976.3906,29.9375 1975.75,30.0781 Q1975.1094,30.2344 1974.4063,30.2344 Q1971.9063,30.2344 1970.5781,28.5938 Q1969.2656,26.9375 1969.2656,23.8125 Q1969.2656,20.6875 1970.5781,19.0313 Q1971.9063,17.375 1974.4063,17.375 Q1975.1094,17.375 1975.75,17.5313 Q1976.4063,17.6875 1976.9688,17.9844 L1976.9688,20.7031 Q1976.3438,20.125 1975.75,19.8594 Q1975.1563,19.5781 1974.5313,19.5781 Q1973.1875,19.5781 1972.5,20.6563 Q1971.8125,21.7188 1971.8125,23.8125 Q1971.8125,25.9063 1972.5,26.9844 Q1973.1875,28.0469 1974.5313,28.0469 Q1975.1563,28.0469 1975.75,27.7813 Q1976.3438,27.5 1976.9688,26.9219 L1976.9688,29.6406 Z "/>
-    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="108" x="1988" y="28.1543">thirdparty::ns1::E</text>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="1960" x2="2098" y1="40" y2="40"/>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="1960" x2="2098" y1="48" y2="48"/>
-    <rect fill="#FEFECE" filter="url(#f17jo3kejapv3w)" height="86.4141" id="C_0000000705" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="1251" y="224"/>
+    <rect fill="#FEFECE" filter="url(#f1bjjx8uogobse)" height="48" id="C_0000000701" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="204" y="8"/>
+    <ellipse cx="219" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M221.9688,29.6406 Q221.3906,29.9375 220.75,30.0781 Q220.1094,30.2344 219.4063,30.2344 Q216.9063,30.2344 215.5781,28.5938 Q214.2656,26.9375 214.2656,23.8125 Q214.2656,20.6875 215.5781,19.0313 Q216.9063,17.375 219.4063,17.375 Q220.1094,17.375 220.75,17.5313 Q221.4063,17.6875 221.9688,17.9844 L221.9688,20.7031 Q221.3438,20.125 220.75,19.8594 Q220.1563,19.5781 219.5313,19.5781 Q218.1875,19.5781 217.5,20.6563 Q216.8125,21.7188 216.8125,23.8125 Q216.8125,25.9063 217.5,26.9844 Q218.1875,28.0469 219.5313,28.0469 Q220.1563,28.0469 220.75,27.7813 Q221.3438,27.5 221.9688,26.9219 L221.9688,29.6406 Z "/>
+    <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="108" x="233" y="28.1543">thirdparty::ns1::E</text>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="205" x2="343" y1="40" y2="40"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="205" x2="343" y1="48" y2="48"/>
+    <rect fill="#FEFECE" filter="url(#f1bjjx8uogobse)" height="86.4141" id="C_0000000705" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="1251" y="224"/>
     <ellipse cx="1266" cy="240" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1270.1094,246 L1262.3906,246 L1262.3906,233.6094 L1270.1094,233.6094 L1270.1094,235.7656 L1264.8438,235.7656 L1264.8438,238.4375 L1269.6094,238.4375 L1269.6094,240.5938 L1264.8438,240.5938 L1264.8438,243.8438 L1270.1094,243.8438 L1270.1094,246 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="1280" y="244.1543">property_t</text>
@@ -32,25 +32,25 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="1257" y="283.0151">property_b</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="60" x="1257" y="295.8198">property_c</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1252" x2="1346" y1="302.4141" y2="302.4141"/>
-    <rect fill="#FEFECE" filter="url(#f17jo3kejapv3w)" height="48" id="C_0000000707" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="772" y="8"/>
+    <rect fill="#FEFECE" filter="url(#f1bjjx8uogobse)" height="48" id="C_0000000707" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="772" y="8"/>
     <ellipse cx="787" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M789.9688,29.6406 Q789.3906,29.9375 788.75,30.0781 Q788.1094,30.2344 787.4063,30.2344 Q784.9063,30.2344 783.5781,28.5938 Q782.2656,26.9375 782.2656,23.8125 Q782.2656,20.6875 783.5781,19.0313 Q784.9063,17.375 787.4063,17.375 Q788.1094,17.375 788.75,17.5313 Q789.4063,17.6875 789.9688,17.9844 L789.9688,20.7031 Q789.3438,20.125 788.75,19.8594 Q788.1563,19.5781 787.5313,19.5781 Q786.1875,19.5781 785.5,20.6563 Q784.8125,21.7188 784.8125,23.8125 Q784.8125,25.9063 785.5,26.9844 Q786.1875,28.0469 787.5313,28.0469 Q788.1563,28.0469 788.75,27.7813 Q789.3438,27.5 789.9688,26.9219 L789.9688,29.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="801" y="28.1543">A</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="773" x2="811" y1="40" y2="40"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="773" x2="811" y1="48" y2="48"/>
-    <rect fill="#FEFECE" filter="url(#f17jo3kejapv3w)" height="48" id="C_0000000709" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1279" y="8"/>
+    <rect fill="#FEFECE" filter="url(#f1bjjx8uogobse)" height="48" id="C_0000000709" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1279" y="8"/>
     <ellipse cx="1294" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1296.9688,29.6406 Q1296.3906,29.9375 1295.75,30.0781 Q1295.1094,30.2344 1294.4063,30.2344 Q1291.9063,30.2344 1290.5781,28.5938 Q1289.2656,26.9375 1289.2656,23.8125 Q1289.2656,20.6875 1290.5781,19.0313 Q1291.9063,17.375 1294.4063,17.375 Q1295.1094,17.375 1295.75,17.5313 Q1296.4063,17.6875 1296.9688,17.9844 L1296.9688,20.7031 Q1296.3438,20.125 1295.75,19.8594 Q1295.1563,19.5781 1294.5313,19.5781 Q1293.1875,19.5781 1292.5,20.6563 Q1291.8125,21.7188 1291.8125,23.8125 Q1291.8125,25.9063 1292.5,26.9844 Q1293.1875,28.0469 1294.5313,28.0469 Q1295.1563,28.0469 1295.75,27.7813 Q1296.3438,27.5 1296.9688,26.9219 L1296.9688,29.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1308" y="28.1543">B</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1280" x2="1318" y1="40" y2="40"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1280" x2="1318" y1="48" y2="48"/>
-    <rect fill="#FEFECE" filter="url(#f17jo3kejapv3w)" height="48" id="C_0000000711" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1884" y="8"/>
+    <rect fill="#FEFECE" filter="url(#f1bjjx8uogobse)" height="48" id="C_0000000711" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1884" y="8"/>
     <ellipse cx="1899" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1901.9688,29.6406 Q1901.3906,29.9375 1900.75,30.0781 Q1900.1094,30.2344 1899.4063,30.2344 Q1896.9063,30.2344 1895.5781,28.5938 Q1894.2656,26.9375 1894.2656,23.8125 Q1894.2656,20.6875 1895.5781,19.0313 Q1896.9063,17.375 1899.4063,17.375 Q1900.1094,17.375 1900.75,17.5313 Q1901.4063,17.6875 1901.9688,17.9844 L1901.9688,20.7031 Q1901.3438,20.125 1900.75,19.8594 Q1900.1563,19.5781 1899.5313,19.5781 Q1898.1875,19.5781 1897.5,20.6563 Q1896.8125,21.7188 1896.8125,23.8125 Q1896.8125,25.9063 1897.5,26.9844 Q1898.1875,28.0469 1899.5313,28.0469 Q1900.1563,28.0469 1900.75,27.7813 Q1901.3438,27.5 1901.9688,26.9219 L1901.9688,29.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1913" y="28.1543">C</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1885" x2="1923" y1="40" y2="40"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1885" x2="1923" y1="48" y2="48"/>
-    <rect fill="#FEFECE" filter="url(#f17jo3kejapv3w)" height="60.8047" id="C_0000000713" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="1846" y="236.5"/>
+    <rect fill="#FEFECE" filter="url(#f1bjjx8uogobse)" height="60.8047" id="C_0000000713" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="1846" y="236.5"/>
     <ellipse cx="1884.4" cy="252.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1887.3688,258.1406 Q1886.7906,258.4375 1886.15,258.5781 Q1885.5094,258.7344 1884.8063,258.7344 Q1882.3063,258.7344 1880.9781,257.0938 Q1879.6656,255.4375 1879.6656,252.3125 Q1879.6656,249.1875 1880.9781,247.5313 Q1882.3063,245.875 1884.8063,245.875 Q1885.5094,245.875 1886.15,246.0313 Q1886.8063,246.1875 1887.3688,246.4844 L1887.3688,249.2031 Q1886.7438,248.625 1886.15,248.3594 Q1885.5563,248.0781 1884.9313,248.0781 Q1883.5875,248.0781 1882.9,249.1563 Q1882.2125,250.2188 1882.2125,252.3125 Q1882.2125,254.4063 1882.9,255.4844 Q1883.5875,256.5469 1884.9313,256.5469 Q1885.5563,256.5469 1886.15,256.2813 Q1886.7438,256 1887.3688,255.4219 L1887.3688,258.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1903.6" y="256.6543">key_t</text>
@@ -58,7 +58,7 @@
     <ellipse cx="1857" cy="279.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="90" x="1866" y="282.7104">key : std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1847" x2="1961" y1="289.3047" y2="289.3047"/>
-    <rect fill="#FEFECE" filter="url(#f17jo3kejapv3w)" height="48" id="C_0000000715" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="951" y="243"/>
+    <rect fill="#FEFECE" filter="url(#f1bjjx8uogobse)" height="48" id="C_0000000715" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="951" y="243"/>
     <ellipse cx="966" cy="259" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M968.9688,264.6406 Q968.3906,264.9375 967.75,265.0781 Q967.1094,265.2344 966.4063,265.2344 Q963.9063,265.2344 962.5781,263.5938 Q961.2656,261.9375 961.2656,258.8125 Q961.2656,255.6875 962.5781,254.0313 Q963.9063,252.375 966.4063,252.375 Q967.1094,252.375 967.75,252.5313 Q968.4063,252.6875 968.9688,252.9844 L968.9688,255.7031 Q968.3438,255.125 967.75,254.8594 Q967.1563,254.5781 966.5313,254.5781 Q965.1875,254.5781 964.5,255.6563 Q963.8125,256.7188 963.8125,258.8125 Q963.8125,260.9063 964.5,261.9844 Q965.1875,263.0469 966.5313,263.0469 Q967.1563,263.0469 967.75,262.7813 Q968.3438,262.5 968.9688,261.9219 L968.9688,264.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="980" y="263.1543">map</text>
@@ -66,7 +66,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1016" y="252.1387">T</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="952" x2="1020" y1="275" y2="275"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="952" x2="1020" y1="283" y2="283"/>
-    <rect fill="#FEFECE" filter="url(#f17jo3kejapv3w)" height="48" id="C_0000000717" style="stroke: #A80036; stroke-width: 1.5;" width="536" x="6" y="116"/>
+    <rect fill="#FEFECE" filter="url(#f1bjjx8uogobse)" height="48" id="C_0000000717" style="stroke: #A80036; stroke-width: 1.5;" width="536" x="6" y="116"/>
     <ellipse cx="21" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M23.9688,137.6406 Q23.3906,137.9375 22.75,138.0781 Q22.1094,138.2344 21.4063,138.2344 Q18.9063,138.2344 17.5781,136.5938 Q16.2656,134.9375 16.2656,131.8125 Q16.2656,128.6875 17.5781,127.0313 Q18.9063,125.375 21.4063,125.375 Q22.1094,125.375 22.75,125.5313 Q23.4063,125.6875 23.9688,125.9844 L23.9688,128.7031 Q23.3438,128.125 22.75,127.8594 Q22.1563,127.5781 21.5313,127.5781 Q20.1875,127.5781 19.5,128.6563 Q18.8125,129.7188 18.8125,131.8125 Q18.8125,133.9063 19.5,134.9844 Q20.1875,136.0469 21.5313,136.0469 Q22.1563,136.0469 22.75,135.7813 Q23.3438,135.5 23.9688,134.9219 L23.9688,137.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="35" y="136.1543">map</text>
@@ -74,7 +74,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="473" x="71" y="125.1387">std::integral_constant&lt;thirdparty::ns1::color_t,thirdparty::ns1::color_t::red&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="541" y1="148" y2="148"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="541" y1="156" y2="156"/>
-    <rect fill="#FEFECE" filter="url(#f17jo3kejapv3w)" height="48" id="C_0000000721" style="stroke: #A80036; stroke-width: 1.5;" width="429" x="577.5" y="116"/>
+    <rect fill="#FEFECE" filter="url(#f1bjjx8uogobse)" height="48" id="C_0000000721" style="stroke: #A80036; stroke-width: 1.5;" width="429" x="577.5" y="116"/>
     <ellipse cx="592.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M595.4688,137.6406 Q594.8906,137.9375 594.25,138.0781 Q593.6094,138.2344 592.9063,138.2344 Q590.4063,138.2344 589.0781,136.5938 Q587.7656,134.9375 587.7656,131.8125 Q587.7656,128.6875 589.0781,127.0313 Q590.4063,125.375 592.9063,125.375 Q593.6094,125.375 594.25,125.5313 Q594.9063,125.6875 595.4688,125.9844 L595.4688,128.7031 Q594.8438,128.125 594.25,127.8594 Q593.6563,127.5781 593.0313,127.5781 Q591.6875,127.5781 591,128.6563 Q590.3125,129.7188 590.3125,131.8125 Q590.3125,133.9063 591,134.9844 Q591.6875,136.0469 593.0313,136.0469 Q593.6563,136.0469 594.25,135.7813 Q594.8438,135.5 595.4688,134.9219 L595.4688,137.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="606.5" y="136.1543">map</text>
@@ -82,7 +82,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="366" x="642.5" y="125.1387">std::integral_constant&lt;property_t,property_t::property_a&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="578.5" x2="1005.5" y1="148" y2="148"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="578.5" x2="1005.5" y1="156" y2="156"/>
-    <rect fill="#FEFECE" filter="url(#f17jo3kejapv3w)" height="48" id="C_0000000725" style="stroke: #A80036; stroke-width: 1.5;" width="515" x="1041.5" y="116"/>
+    <rect fill="#FEFECE" filter="url(#f1bjjx8uogobse)" height="48" id="C_0000000725" style="stroke: #A80036; stroke-width: 1.5;" width="515" x="1041.5" y="116"/>
     <ellipse cx="1056.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1059.4688,137.6406 Q1058.8906,137.9375 1058.25,138.0781 Q1057.6094,138.2344 1056.9063,138.2344 Q1054.4063,138.2344 1053.0781,136.5938 Q1051.7656,134.9375 1051.7656,131.8125 Q1051.7656,128.6875 1053.0781,127.0313 Q1054.4063,125.375 1056.9063,125.375 Q1057.6094,125.375 1058.25,125.5313 Q1058.9063,125.6875 1059.4688,125.9844 L1059.4688,128.7031 Q1058.8438,128.125 1058.25,127.8594 Q1057.6563,127.5781 1057.0313,127.5781 Q1055.6875,127.5781 1055,128.6563 Q1054.3125,129.7188 1054.3125,131.8125 Q1054.3125,133.9063 1055,134.9844 Q1055.6875,136.0469 1057.0313,136.0469 Q1057.6563,136.0469 1058.25,135.7813 Q1058.8438,135.5 1059.4688,134.9219 L1059.4688,137.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1070.5" y="136.1543">map</text>
@@ -90,7 +90,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="452" x="1106.5" y="125.1387">std::vector&lt;std::integral_constant&lt;property_t,property_t::property_b&gt;&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1042.5" x2="1555.5" y1="148" y2="148"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1042.5" x2="1555.5" y1="156" y2="156"/>
-    <rect fill="#FEFECE" filter="url(#f17jo3kejapv3w)" height="48" id="C_0000000729" style="stroke: #A80036; stroke-width: 1.5;" width="625" x="1591.5" y="116"/>
+    <rect fill="#FEFECE" filter="url(#f1bjjx8uogobse)" height="48" id="C_0000000729" style="stroke: #A80036; stroke-width: 1.5;" width="625" x="1591.5" y="116"/>
     <ellipse cx="1606.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1609.4688,137.6406 Q1608.8906,137.9375 1608.25,138.0781 Q1607.6094,138.2344 1606.9063,138.2344 Q1604.4063,138.2344 1603.0781,136.5938 Q1601.7656,134.9375 1601.7656,131.8125 Q1601.7656,128.6875 1603.0781,127.0313 Q1604.4063,125.375 1606.9063,125.375 Q1607.6094,125.375 1608.25,125.5313 Q1608.9063,125.6875 1609.4688,125.9844 L1609.4688,128.7031 Q1608.8438,128.125 1608.25,127.8594 Q1607.6563,127.5781 1607.0313,127.5781 Q1605.6875,127.5781 1605,128.6563 Q1604.3125,129.7188 1604.3125,131.8125 Q1604.3125,133.9063 1605,134.9844 Q1605.6875,136.0469 1607.0313,136.0469 Q1607.6563,136.0469 1608.25,135.7813 Q1608.8438,135.5 1609.4688,134.9219 L1609.4688,137.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1620.5" y="136.1543">map</text>
@@ -102,6 +102,8 @@
     <polygon fill="#A80036" points="274,223.94,278,214.94,274,218.94,270,214.94,274,223.94" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M405.42,164.07 C562.83,191.71 819.25,236.73 931.02,256.35 " fill="none" id="C_0000000717-&gt;C_0000000715" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="none" points="932.27,249.46,950.76,259.81,929.85,263.25,932.27,249.46" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M274,76.02 C274,89.58 274,104.04 274,115.68 " fill="none" id="C_0000000701&lt;-C_0000000717" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="267,76,274,56,281,76,267,76" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M885.58,164.07 C991.48,190.18 1160.32,231.81 1245.76,252.87 " fill="none" id="C_0000000721-&gt;C_0000000705" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="1250.76,254.11,1242.9821,248.0681,1245.9059,252.9108,1241.0633,255.8346,1250.76,254.11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M828.04,164.22 C857.76,183.37 900.32,210.8 933.78,232.35 " fill="none" id="C_0000000721-&gt;C_0000000715" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t30001_package.svg b/docs/test_cases/t30001_package.svg
index 3de96c8a..0ed4b719 100644
--- a/docs/test_cases/t30001_package.svg
+++ b/docs/test_cases/t30001_package.svg
@@ -41,6 +41,6 @@
     <path d="M308,116 L308,141.1328 L414,141.1328 L414,126 L404,116 L308,116 " fill="#FBFB77" filter="url(#f1fn6b8y2p2z18)" 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_0000000737-GMN570" 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_0000000737-GMN571" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30004_package.svg b/docs/test_cases/t30004_package.svg
index c63ca8b5..30bb4f79 100644
--- a/docs/test_cases/t30004_package.svg
+++ b/docs/test_cases/t30004_package.svg
@@ -38,10 +38,10 @@
     <polygon fill="#FFC0CB" filter="url(#fn900lavemmer)" 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_0000000776-GMN636" 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_0000000777-GMN640" 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_0000000778-GMN644" 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="GMN647-C_0000000778" 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="GMN651-C_0000000780" 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_0000000776-GMN637" 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_0000000777-GMN641" 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_0000000778-GMN645" 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="GMN648-C_0000000778" 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="GMN652-C_0000000780" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30006_package.svg b/docs/test_cases/t30006_package.svg
index 57c723ed..8ea18eea 100644
--- a/docs/test_cases/t30006_package.svg
+++ b/docs/test_cases/t30006_package.svg
@@ -23,8 +23,8 @@
     <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(#f7lkbzh9u8xk)" 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="GMN674-C_0000000796" 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_0000000796-GMN677" 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="GMN675-C_0000000796" 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_0000000796-GMN678" 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_0000000796-&gt;C_0000000795" 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_0000000796-&gt;C_0000000797" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t30007_package.svg b/docs/test_cases/t30007_package.svg
index 6ffe8463..3d42f821 100644
--- a/docs/test_cases/t30007_package.svg
+++ b/docs/test_cases/t30007_package.svg
@@ -26,8 +26,8 @@
     <path d="M138,227 L138,252.1328 L257,252.1328 L257,237 L247,227 L138,227 " fill="#FBFB77" filter="url(#f1bfevt9p6j6it)" 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="GMN689-C_0000000802" 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_0000000802-GMN692" 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="GMN690-C_0000000802" 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_0000000802-GMN693" 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_0000000803-&gt;C_0000000801" 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_0000000803-&gt;C_0000000804" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>